This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4155

changegroup: restore original behavior of _nextclrevtolocalrev
ClosedPublic

Authored by indygreg on Aug 7 2018, 1:25 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4f06e0360bad: changegroup: restore original behavior of _nextclrevtolocalrev
Summary

0548f696795b accidentally changed the behavior of cgpacker._close().
The old behavior moved _nextclrevtolocalrev to _clrevtolocalrev only
when _nextclrevtolocalrev was present and then removed
_nextclrevtolocalrev. The bad behavior performed this move
then cleared _clrevtolocalrev because it was the same object as
_nextclrevtolocalrev.

This commit restores the previous behavior.

Surprisingly, no tests changed as a result of this bad logic. I'm
not sure why.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (4 lines)

Diff 10138

mercurial/changegroup.py

# Maps changelog nodes to changelog revs. Filled in once # Maps changelog nodes to changelog revs. Filled in once
# during changelog stage and then left unmodified. # during changelog stage and then left unmodified.
self._clnodetorev = {} self._clnodetorev = {}
def _close(self): def _close(self):
# Ellipses serving mode. # Ellipses serving mode.
self._clrevtolocalrev.clear() self._clrevtolocalrev.clear()
if self._nextclrevtolocalrev: if self._nextclrevtolocalrev is not None:
self._clrevtolocalrev = self._nextclrevtolocalrev self._clrevtolocalrev = self._nextclrevtolocalrev
self._nextclrevtolocalrev.clear() self._nextclrevtolocalrev = None
self._changelogdone = True self._changelogdone = True
return closechunk() return closechunk()
def _fileheader(self, fname): def _fileheader(self, fname):
return chunkheader(len(fname)) + fname return chunkheader(len(fname)) + fname
# Extracted both for clarity and for overriding in extensions. # Extracted both for clarity and for overriding in extensions.