diff options
| author | Russ Cox <rsc@golang.org> | 2014-08-06 15:25:17 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-08-06 15:25:17 -0400 |
| commit | c1fcdb0e00f9163bc3f60069182f231afb83523e (patch) | |
| tree | 11fb4eabebaeaf33b488ef3570f4b81ba1cf87b3 /lib | |
| parent | 6ff5c317ebf30d5d6879a2b0cd0c5ce34b97f97d (diff) | |
| download | go-c1fcdb0e00f9163bc3f60069182f231afb83523e.tar.gz go-c1fcdb0e00f9163bc3f60069182f231afb83523e.zip | |
codereview: handle upload of merge
LGTM=minux
R=minux
CC=golang-codereviews
https://golang.org/cl/118690043
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/codereview/codereview.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index 1b45518890..a64401533c 100644 --- a/lib/codereview/codereview.py +++ b/lib/codereview/codereview.py @@ -3478,11 +3478,23 @@ class MercurialVCS(VersionControlSystem): if not err and mqparent != "": self.base_rev = mqparent else: - out = RunShell(["hg", "parents", "-q"], silent_ok=True).strip() + out = RunShell(["hg", "parents", "-q", "--template={node} {branch}"], silent_ok=True).strip() if not out: # No revisions; use 0 to mean a repository with nothing. - out = "0:0" - self.base_rev = out.split(':')[1].strip() + out = "0:0 default" + + # Find parent along current branch. + branch = repo[None].branch() + base = "" + for line in out.splitlines(): + fields = line.strip().split(' ') + if fields[1] == branch: + base = fields[0] + break + if base == "": + # Use the first parent + base = out.strip().split(' ')[0] + self.base_rev = base def _GetRelPath(self, filename): """Get relative path of a file according to the current directory, |