diff options
Diffstat (limited to 'lib/codereview/codereview.py')
| -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, |