# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1327197952 21600
# Node ID 8cf8ff0f52fedcd67af92c5f47f324862bb3558e
# Parent  95d040755254c2eca7d074191abcacf679315822
outgoing: fix for hg change cd956049fc14

diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -1,6 +1,7 @@
 from hgext import rebase as hgrebase
 
 from mercurial import cmdutil
+from mercurial import discovery
 from mercurial import patch
 from mercurial import hg
 from mercurial import util as hgutil
@@ -90,7 +91,13 @@ def findcommonoutgoing(repo, other, only
     meta = repo.svnmeta(svn.uuid, svn.subdir)
     parent = repo.parents()[0].node()
     hashes = meta.revmap.hashes()
-    return util.outgoing_common_and_heads(repo, hashes, parent)
+    common, heads = util.outgoing_common_and_heads(repo, hashes, parent)
+    outobj = getattr(discovery, 'outgoing', None)
+    if outobj is not None:
+        # Mercurial 2.1 and later
+        return outobj(repo.changelog, common, heads)
+    # Mercurial 2.0 and earlier
+    return common, heads
 
 
 def findoutgoing(repo, dest=None, heads=None, force=False):