This is an archive of the discontinued Mercurial Phabricator instance.

Differential D330

Backed out changeset c34532365b38
ClosedPublic

Authored by glandium on Aug 10 2017, 9:19 PM.

Details

Reviewers
quark
indygreg
Group Reviewers
hg-reviewers
Commits
rHG1814ca418b30: branchmap: revert c34532365b38 for Python 2.7 compatibility
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

glandium created this revision.Aug 10 2017, 9:19 PM
quark accepted this revision.Aug 10 2017, 9:35 PM
quark added a subscriber: quark.

LGTM.

indygreg accepted this revision.Aug 10 2017, 9:44 PM
indygreg added a subscriber: indygreg.

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

This revision is now accepted and ready to land.Aug 10 2017, 9:44 PM
Closed by commit rHG1814ca418b30: branchmap: revert c34532365b38 for Python 2.7 compatibility (authored by glandium). · Explain WhyAug 10 2017, 11:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/branchmap.py (3 lines)

Diff 755

mercurial/branchmap.py

return changelog.branchinfo(rev) return changelog.branchinfo(rev)
# if requested rev isn't allocated, grow and cache the rev info # if requested rev isn't allocated, grow and cache the rev info
if len(self._rbcrevs) < rbcrevidx + _rbcrecsize: if len(self._rbcrevs) < rbcrevidx + _rbcrecsize:
return self._branchinfo(rev) return self._branchinfo(rev)
# fast path: extract data from cache, use it if node is matching # fast path: extract data from cache, use it if node is matching
reponode = changelog.node(rev)[:_rbcnodelen] 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) close = bool(branchidx & _rbccloseflag)
if close: if close:
branchidx &= _rbcbranchidxmask branchidx &= _rbcbranchidxmask
if cachenode == '\0\0\0\0': if cachenode == '\0\0\0\0':
pass pass
elif cachenode == reponode: elif cachenode == reponode:
try: try:
return self._names[branchidx], close return self._names[branchidx], close