Augie Fackler avatar Augie Fackler committed 527c2e4

--outgoing: adjust to work with new discovery code

Inspired in part by a patch from Luke Plant <L.Plant.98@cantab.net>;.

Comments (0)

Files changed (1)

             # hg >= 1.6
             revs, checkout = hg.addbranchrevs(repo, repo, revs, None)
             other = hg.repository(hg.remoteui(repo, opts), dest)
-            try:
-                # hg >= 1.9
-                findoutgoing = discovery.findcommonoutgoing
-            except AttributeError:
-                findoutgoing = discovery.findoutgoing
+            # hg >= 1.9
+            findoutgoing = getattr(discovery, 'findoutgoing', None)
+            if findoutgoing is None:
+                def findoutgoing(repo, other, force=False):
+                    common, outheads = discovery.findcommonoutgoing(
+                        repo, other, [], force=force)
+                    return repo.changelog.findmissing(common, outheads)[0:1]
         else:
             other = hg.repository(ui, dest)
             def findoutgoing(repo, other, force=False):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.