codereview: make 'hg submit' work with Mercurial 1.6

R=r
CC=golang-dev
https://golang.org/cl/1841044

diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index 4aeff90678b8abd6773d38ceb0f6bc8de98ce96d..baed951225d9adbe4a91514974934c88fc3b3e85 100644 (file)
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -54,6 +54,12 @@ except:
        from mercurial.version import version as v
        hgversion = v.get_version()
 
+try:
+       from mercurial.discovery import findcommonincoming
+except:
+       def findcommonincoming(repo, remote):
+               return repo.findcommonincoming(remote)
+
 oldMessage = """
 The code review extension requires Mercurial 1.3 or newer.
 
@@ -602,7 +608,7 @@ def getremote(ui, repo, opts):
        return other
 
 def Incoming(ui, repo, opts):
-       _, incoming, _ = repo.findcommonincoming(getremote(ui, repo, opts))
+       _, incoming, _ = findcommonincoming(repo, getremote(ui, repo, opts))
        return incoming
 
 def EditCL(ui, repo, cl):