Mercurial > hg-stable

changeset 32218:aeb060dd7ac9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle: avoid reset of the 'outgoing' variable We have a cleaner way to achieve the same effect. Not resetting the variable will help us to simplify the code.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 04 May 2017 12:47:27 +0200
parents 4e6aab69a98b
children b9d97bf96f61
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Thu May 04 12:43:41 2017 +0200
+++ b/mercurial/commands.py	Thu May 04 12:47:27 2017 +0200
@@ -1359,7 +1359,6 @@
         outgoing = discovery.outgoing(repo, common, heads)
         cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
                                         version=cgversion)
-        outgoing = None
     else:
         dest = ui.expandpath(dest or 'default-push', dest or 'default')
         dest, branches = hg.parseurl(dest, opts.get('branch'))
@@ -1373,7 +1372,7 @@
         cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
                                              version=cgversion)
     if not cg:
-        scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
+        scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
         return 1
 
     if cgversion == '01': #bundle1