From: Evan Shaw <chickencha@gmail.com>
Date: Thu, 15 Jul 2010 00:17:04 +0000 (-0700)
Subject: codereview: Fix for Mercurial >= 1.6
X-Git-Tag: weekly.2010-07-14~5
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e8fcf600939997d0d77f404ad082728e921a15c3;p=gostls13.git

codereview: Fix for Mercurial >= 1.6

R=rsc, adg, rsc1
CC=golang-dev
https://golang.org/cl/1804041
---

diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index 2d0977caae..750ae871ca 100644
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -592,7 +592,11 @@ def getremote(ui, repo, opts):
 	# delete it in an attempt to "help"
 	proxy = os.environ.get('http_proxy')
 	source = hg.parseurl(ui.expandpath("default"), None)[0]
-	other = hg.repository(cmdutil.remoteui(repo, opts), source)
+	try:
+		remoteui = hg.remoteui # hg 1.6
+        except:
+		remoteui = cmdutil.remoteui
+	other = hg.repository(remoteui(repo, opts), source)
 	if proxy is not None:
 		os.environ['http_proxy'] = proxy
 	return other
@@ -2856,7 +2860,7 @@ class MercurialVCS(VersionControlSystem):
       if not err:
         self.base_rev = mqparent
       else:
-        self.base_rev = RunShell(["hg", "parent", "-q"]).split(':')[1].strip()
+        self.base_rev = RunShell(["hg", "parents", "-q"]).split(':')[1].strip()
   def _GetRelPath(self, filename):
     """Get relative path of a file according to the current directory,
     given its logical path in the repo."""