From 08e65f79c17d29eb10c4c4c6a0c8b9aaf8339311 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 16 Jul 2010 18:54:38 -0700 Subject: [PATCH] codereview: make 'hg submit' work with Mercurial 1.6 R=r CC=golang-dev https://golang.org/cl/1841044 --- lib/codereview/codereview.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py index 4aeff90678..baed951225 100644 --- 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): -- 2.48.1