Patchwork D330: Backed out changeset c34532365b38

login
register
mail settings
Submitter phabricator
Date Aug. 11, 2017, 1:19 a.m.
Message ID <differential-rev-PHID-DREV-xluo4loebylvuwpcwpqe-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/22838/
State Superseded
Headers show

Comments

phabricator - Aug. 11, 2017, 1:19 a.m.
glandium created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Old versions of python 2.7 don't like that the second argument to
  struct.unpack_from is a bytearray, so the change removing the util.buffer
  around that argument in branchmap broke running on older versions of python
  2.7.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D330

AFFECTED FILES
  mercurial/branchmap.py

CHANGE DETAILS




To: glandium, #hg-reviewers
Cc: mercurial-devel
phabricator - Aug. 11, 2017, 1:35 a.m.
quark accepted this revision.
quark added a comment.


  LGTM.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D330

To: glandium, #hg-reviewers, quark
Cc: quark, mercurial-devel
phabricator - Aug. 11, 2017, 1:44 a.m.
indygreg accepted this revision.
indygreg added a comment.
This revision is now accepted and ready to land.


  This looks good. I'll queue this for stable when I get home.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D330

To: glandium, #hg-reviewers, quark, indygreg
Cc: indygreg, quark, mercurial-devel

Patch

diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py
--- a/mercurial/branchmap.py
+++ b/mercurial/branchmap.py
@@ -406,7 +406,8 @@ 
 
         # fast path: extract data from cache, use it if node is matching
         reponode = changelog.node(rev)[:_rbcnodelen]
-        cachenode, branchidx = unpack_from(_rbcrecfmt, self._rbcrevs, rbcrevidx)
+        cachenode, branchidx = unpack_from(
+            _rbcrecfmt, util.buffer(self._rbcrevs), rbcrevidx)
         close = bool(branchidx & _rbccloseflag)
         if close:
             branchidx &= _rbcbranchidxmask