bundle: factor the 'getchangegroup' out
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 04 May 2017 12:48:45 +0200
changeset 32219 b9d97bf96f61
parent 32218 aeb060dd7ac9
child 32220 fb9b6bfb54b5
bundle: factor the 'getchangegroup' out The call in the two branches is identical, so we can just issue it outside of the conditional.
mercurial/commands.py
--- a/mercurial/commands.py	Thu May 04 12:47:27 2017 +0200
+++ b/mercurial/commands.py	Thu May 04 12:48:45 2017 +0200
@@ -1357,8 +1357,6 @@
         common = [repo.lookup(rev) for rev in base]
         heads = revs and map(repo.lookup, revs) or None
         outgoing = discovery.outgoing(repo, common, heads)
-        cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
-                                        version=cgversion)
     else:
         dest = ui.expandpath(dest or 'default-push', dest or 'default')
         dest, branches = hg.parseurl(dest, opts.get('branch'))
@@ -1369,8 +1367,7 @@
                                                 onlyheads=heads,
                                                 force=opts.get('force'),
                                                 portable=True)
-        cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
-                                             version=cgversion)
+    cg = changegroup.getchangegroup(repo, 'bundle', outgoing, version=cgversion)
     if not cg:
         scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
         return 1