qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 21:47:59 -07:00
Code Releases Activity

codereview: work better with mq

Browse Source 
R=rsc
CC=golang-dev
https://golang.org/cl/1140043
This commit is contained in:
Peter Williams 2010-05-24 14:37:00 -07:00 committed by Russ Cox
parent e30bf71b6c
commit 1d6eb74697
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/codereview/codereview.py
View File

@ -533,11 +533,18 @@ _change_prolog = """# Change list.
####################################################################### #######################################################################
# Mercurial helper functions # Mercurial helper functions
# Get effective change nodes taking into account applied MQ patches
def effective_revpair(repo):
try:
return cmdutil.revpair(repo, ['qparent'])
except:
return cmdutil.revpair(repo, None)
# Return list of changed files in repository that match pats. # Return list of changed files in repository that match pats.
def ChangedFiles(ui, repo, pats, opts): def ChangedFiles(ui, repo, pats, opts):
# Find list of files being operated on. # Find list of files being operated on.
matcher = cmdutil.match(repo, pats, opts) matcher = cmdutil.match(repo, pats, opts)
node1, node2 = cmdutil.revpair(repo, None) node1, node2 = effective_revpair(repo)
modified, added, removed = repo.status(node1, node2, matcher)[:3] modified, added, removed = repo.status(node1, node2, matcher)[:3]
l = modified + added + removed l = modified + added + removed
l.sort() l.sort()
@ -546,7 +553,7 @@ def ChangedFiles(ui, repo, pats, opts):
# Return list of changed files in repository that match pats and still exist. # Return list of changed files in repository that match pats and still exist.
def ChangedExistingFiles(ui, repo, pats, opts): def ChangedExistingFiles(ui, repo, pats, opts):
matcher = cmdutil.match(repo, pats, opts) matcher = cmdutil.match(repo, pats, opts)
node1, node2 = cmdutil.revpair(repo, None) node1, node2 = effective_revpair(repo)
modified, added, _ = repo.status(node1, node2, matcher)[:3] modified, added, _ = repo.status(node1, node2, matcher)[:3]
l = modified + added l = modified + added
l.sort() l.sort()
@ -2827,9 +2834,12 @@ class MercurialVCS(VersionControlSystem):
self.subdir = cwd[len(self.repo_dir):].lstrip(r"\/") self.subdir = cwd[len(self.repo_dir):].lstrip(r"\/")
if self.options.revision: if self.options.revision:
self.base_rev = self.options.revision self.base_rev = self.options.revision
else:
mqparent, err = RunShellWithReturnCode(['hg', 'log', '--rev', 'qparent', '--template={node}'])
if not err:
self.base_rev = mqparent
else: else:
self.base_rev = RunShell(["hg", "parent", "-q"]).split(':')[1].strip() self.base_rev = RunShell(["hg", "parent", "-q"]).split(':')[1].strip()
def _GetRelPath(self, filename): def _GetRelPath(self, filename):
"""Get relative path of a file according to the current directory, """Get relative path of a file according to the current directory,
given its logical path in the repo.""" given its logical path in the repo."""