Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 37768:5527aa808dea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundlespec: drop externalnames flag Always provide the human readable version of compression and version. Add the translated wire format name in the new wirecompression and wireversion fields. Differential Revision: https://phab.mercurial-scm.org/D3392
author Joerg Sonnenberger <joerg@bec.de>
date Tue, 17 Apr 2018 02:41:25 +0200
parents 9b3a348c9b2f
children 6a7ff5816c5f
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Apr 16 23:29:09 2018 -0700
+++ b/mercurial/commands.py	Tue Apr 17 02:41:25 2018 +0200
@@ -1245,14 +1245,12 @@
         scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
         return 1
 
-    bcompression = bundlespec.compression
     if cgversion == '01': #bundle1
-        if bcompression is None:
-            bcompression = 'UN'
-        bversion = 'HG10' + bcompression
+        bversion = 'HG10' + bundlespec.wirecompression
         bcompression = None
     elif cgversion in ('02', '03'):
         bversion = 'HG20'
+        bcompression = bundlespec.wirecompression
     else:
         raise error.ProgrammingError(
             'bundle: unexpected changegroup version %s' % cgversion)