This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6595

changelog: fix handling of empty copy entries in changeset
ClosedPublic

Authored by martinvonz on Jul 1 2019, 7:28 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe3df1e15bee9: changelog: fix handling of empty copy entries in changeset
Summary

Before this patch, when an empty value was found in the changeset, we
would get a ValueError, which would result in None being returned for
addedfiles/removedfiles and p1copies/p2copies. That made 278dcb24e535
(copies: write empty entries in changeset when also writing to
filelog, 2019-04-23) ineffective at helping the read path not look for
copies in the filelogs.

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

martinvonz created this revision.Jul 1 2019, 7:28 PM
pulkit accepted this revision.Jul 2 2019, 6:28 PM
This revision is now accepted and ready to land.Jul 2 2019, 6:28 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (4 lines)

Diff 15759

mercurial/changelog.py

items.append('%d\0%s' % (i, copies[dst])) items.append('%d\0%s' % (i, copies[dst]))
if len(items) != len(copies): if len(items) != len(copies):
raise error.ProgrammingError('some copy targets missing from file list') raise error.ProgrammingError('some copy targets missing from file list')
return "\n".join(items) return "\n".join(items)
def decodecopies(files, data): def decodecopies(files, data):
try: try:
copies = {} copies = {}
if not data:
return copies
for l in data.split('\n'): for l in data.split('\n'):
strindex, src = l.split('\0') strindex, src = l.split('\0')
i = int(strindex) i = int(strindex)
dst = files[i] dst = files[i]
copies[dst] = src copies[dst] = src
return copies return copies
except (ValueError, IndexError): except (ValueError, IndexError):
# Perhaps someone had chosen the same key name (e.g. "p1copies") and # Perhaps someone had chosen the same key name (e.g. "p1copies") and
# used different syntax for the value. # used different syntax for the value.
return None return None
def encodefileindices(files, subset): def encodefileindices(files, subset):
subset = set(subset) subset = set(subset)
indices = [] indices = []
for i, f in enumerate(files): for i, f in enumerate(files):
if f in subset: if f in subset:
indices.append('%d' % i) indices.append('%d' % i)
return '\n'.join(indices) return '\n'.join(indices)
def decodefileindices(files, data): def decodefileindices(files, data):
try: try:
subset = [] subset = []
if not data:
return subset
for strindex in data.split('\n'): for strindex in data.split('\n'):
i = int(strindex) i = int(strindex)
if i < 0 or i >= len(files): if i < 0 or i >= len(files):
return None return None
subset.append(files[i]) subset.append(files[i])
return subset return subset
except (ValueError, IndexError): except (ValueError, IndexError):
# Perhaps someone had chosen the same key name (e.g. "added") and # Perhaps someone had chosen the same key name (e.g. "added") and