Mercurial > hg

changeset 40372:81c80ed7c991

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: fix broken compression engine assertion bundletype() is a function, so it needs to be called, and it is documented to return a 2-tuple. This code is untested, so that's why we haven't noticed the bad assertion. Differential Revision: https://phab.mercurial-scm.org/D5155
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 17 Nov 2016 15:51:33 -0800
parents 5a81c4aa6313
children c3ab0a89331d
files mercurial/bundle2.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bundle2.py	Thu Oct 18 17:54:07 2018 -0400
+++ b/mercurial/bundle2.py	Thu Nov 17 15:51:33 2016 -0800
@@ -839,7 +839,7 @@
             params = self._readexact(paramssize)
             self._processallparams(params)
             yield params
-            assert self._compengine.bundletype == 'UN'
+            assert self._compengine.bundletype()[1] == 'UN'
         # From there, payload might need to be decompressed
         self._fp = self._compengine.decompressorreader(self._fp)
         emptycount = 0