incoming: unify code for incoming and graphlog.incoming

hgext/graphlog.py

@@ -17,7 +17,7 from mercurial.cmdutil import revrange,
 from mercurial.commands import templateopts
 from mercurial.i18n import _
 from mercurial.node import nullrev
-from mercurial import bundlerepo, changegroup, cmdutil, commands, extensions
+from mercurial import cmdutil, commands, extensions
 from mercurial import hg, url, util, graphmod, discovery
 
 ASCIIDATA = 'ASC'
@@ -307,54 +307,16 def gincoming(ui, repo, source="default"
     Nodes printed as an @ character are parents of the working
     directory.
     """
+    def subreporecurse():
+        return 1
 
     check_unsupported_flags(opts)
-    source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
-    other = hg.repository(hg.remoteui(repo, opts), source)
-    revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
-    ui.status(_('comparing with %s\n') % url.hidepassword(source))
-    if revs:
-        revs = [other.lookup(rev) for rev in revs]
-    incoming = discovery.findincoming(repo, other, heads=revs,
-                                      force=opts["force"])
-    if not incoming:
-        try:
-            os.unlink(opts["bundle"])
-        except:
-            pass
-        ui.status(_("no changes found\n"))
-        return
-
-    cleanup = None
-    try:
-
-        fname = opts["bundle"]
-        if fname or not other.local():
-            # create a bundle (uncompressed if other repo is not local)
-            if revs is None:
-                cg = other.changegroup(incoming, "incoming")
-            else:
-                cg = other.changegroupsubset(incoming, revs, 'incoming')
-            bundletype = other.local() and "HG10BZ" or "HG10UN"
-            fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
-            # keep written bundle?
-            if opts["bundle"]:
-                cleanup = None
-            if not other.local():
-                # use the created uncompressed bundlerepo
-                other = bundlerepo.bundlerepository(ui, repo.root, fname)
-
-        chlist = other.changelog.nodesbetween(incoming, revs)[0]
+    def display(other, chlist, displayer):
         revdag = graphrevs(other, chlist, opts)
-        displayer = show_changeset(ui, other, opts, buffered=True)
         showparents = [ctx.node() for ctx in repo[None].parents()]
         generate(ui, revdag, displayer, showparents, asciiedges)
 
-    finally:
-        if hasattr(other, 'close'):
-            other.close()
-        if cleanup:
-            os.unlink(cleanup)
+    hg._incoming(display, subreporecurse, ui, repo, source, opts, buffered=True)
 
 def uisetup(ui):
     '''Initialize the extension.'''

mercurial/hg.py

@@ -408,39 +408,35 def merge(repo, node, force=None, remind
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))
     return stats[3] > 0
 
-def incoming(ui, repo, source, opts):
-    def recurse():
-        ret = 1
-        if opts.get('subrepos'):
-            ctx = repo[None]
-            for subpath in sorted(ctx.substate):
-                sub = ctx.sub(subpath)
-                ret = min(ret, sub.incoming(ui, source, opts))
-        return ret
-
-    limit = cmdutil.loglimit(opts)
+def _incoming(displaychlist, subreporecurse, ui, repo, source,
+        opts, buffered=False):
+    """
+    Helper for incoming / gincoming.
+    displaychlist gets called with
+        (remoterepo, incomingchangesetlist, displayer) parameters,
+    and is supposed to contain only code that can't be unified.
+    """
     source, branches = parseurl(ui.expandpath(source), opts.get('branch'))
     other = repository(remoteui(repo, opts), source)
     ui.status(_('comparing with %s\n') % url.hidepassword(source))
     revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev'))
+
     if revs:
         revs = [other.lookup(rev) for rev in revs]
-
-    tmp = discovery.findcommonincoming(repo, other, heads=revs,
-                                       force=opts.get('force'))
+    bundlename = opts["bundle"]
+    force = opts["force"]
+    tmp = discovery.findcommonincoming(repo, other, heads=revs, force=force)
     common, incoming, rheads = tmp
     if not incoming:
         try:
-            os.unlink(opts["bundle"])
+            os.unlink(bundlename)
         except:
             pass
         ui.status(_("no changes found\n"))
-        return recurse()
+        return subreporecurse()
 
-    cleanup = None
-    try:
-        fname = opts["bundle"]
-        if fname or not other.local():
+    bundle = None
+    if bundlename or not other.local():
             # create a bundle (uncompressed if other repo is not local)
 
             if revs is None and other.capable('changegroupsubset'):
@@ -451,18 +447,45 def incoming(ui, repo, source, opts):
             else:
                 cg = other.changegroupsubset(incoming, revs, 'incoming')
             bundletype = other.local() and "HG10BZ" or "HG10UN"
-            fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
+        fname = bundle = changegroup.writebundle(cg, bundlename, bundletype)
             # keep written bundle?
-            if opts["bundle"]:
-                cleanup = None
+        if bundlename:
+            bundle = None
             if not other.local():
                 # use the created uncompressed bundlerepo
                 other = bundlerepo.bundlerepository(ui, repo.root, fname)
 
+    try:
         chlist = other.changelog.nodesbetween(incoming, revs)[0]
+        displayer = cmdutil.show_changeset(ui, other, opts, buffered)
+
+        # XXX once graphlog extension makes it into core,
+        # should be replaced by a if graph/else
+        displaychlist(other, chlist, displayer)
+
+        displayer.close()
+    finally:
+        if hasattr(other, 'close'):
+            other.close()
+        if bundle:
+            os.unlink(bundle)
+    subreporecurse()
+    return 0 # exit code is zero since we found incoming changes
+
+def incoming(ui, repo, source, opts):
+    def subreporecurse():
+        ret = 1
+        if opts.get('subrepos'):
+            ctx = repo[None]
+            for subpath in sorted(ctx.substate):
+                sub = ctx.sub(subpath)
+                ret = min(ret, sub.incoming(ui, source, opts))
+        return ret
+
+    def display(other, chlist, displayer):
+        limit = cmdutil.loglimit(opts)
         if opts.get('newest_first'):
             chlist.reverse()
-        displayer = cmdutil.show_changeset(ui, other, opts)
         count = 0
         for n in chlist:
             if limit is not None and count >= limit:
@@ -472,14 +495,7 def incoming(ui, repo, source, opts):
                 continue
             count += 1
             displayer.show(other[n])
-        displayer.close()
-    finally:
-        if hasattr(other, 'close'):
-            other.close()
-        if cleanup:
-            os.unlink(cleanup)
-    recurse()
-    return 0 # exit code is zero since we found incoming changes
+    return _incoming(display, subreporecurse, ui, repo, source, opts)
 
 def outgoing(ui, repo, dest, opts):
     def recurse():