Mercurial > hg

changeset 26802:42f705f2c02d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: make unbundle.compressed return True when compressed We were returning 'False' in all cases, even when the bundle2 was actually compressed.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 02 Oct 2015 23:21:39 -0700
parents 73bf76bf6f14
children ed41ce89822d
files mercurial/bundle2.py
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bundle2.py	Mon Oct 19 18:04:08 2015 +0200
+++ b/mercurial/bundle2.py	Fri Oct 02 23:21:39 2015 -0700
@@ -656,6 +656,7 @@
         """If header is specified, we do not read it out of the stream."""
         self.ui = ui
         self._decompressor = util.decompressors[None]
+        self._compressed = None
         super(unbundle20, self).__init__(fp)
 
     @util.propertycache
@@ -778,7 +779,8 @@
         return None
 
     def compressed(self):
-        return False
+        self.params # load params
+        return self._compressed
 
 formatmap = {'20': unbundle20}
 
@@ -799,6 +801,8 @@
         raise error.BundleUnknownFeatureError(params=(param,),
                                               values=(value,))
     unbundler._decompressor = util.decompressors[value]
+    if value is not None:
+        unbundler._compressed = True
 
 class bundlepart(object):
     """A bundle2 part contains application level payload