Commits

Alexander Solovyov committed 6fa30d7

fix findincoming to support hg 1.7

Comments (0)

Files changed (1)

 '''
 
 from mercurial.i18n import _
-from mercurial import bundlerepo, changegroup, cmdutil, commands, hg, patch
+from mercurial import changegroup, cmdutil, commands, hg, patch
 from mercurial import util
 
 import os
 def findincomingfn(repo):
     try:
         from mercurial import discovery
-        discovery.findincoming
+        discovery.findcommonincoming
         def fi(*args, **opts):
-            return discovery.findincoming(repo, *args, **opts)
+            return discovery.findcommonincoming(repo, *args, **opts)[1]
         return fi
     except ImportError:
         return repo.findincoming