This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6937

copies: move file input processsing early
ClosedPublic

Authored by marmoute on Oct 1 2019, 8:33 AM.

Details

Reviewers
martinvonz
durin42
Group Reviewers
hg-reviewers
Commits
rHG041f042afcc5: copies: move file input processsing early
Summary

If we are to store the same kind of data outside of extra, we need to explicitly
prepare them before that.

On the long run, other storage (eg: sidedata) might use a different encoding to store this
information, since the constraint from extra does not apply to it.

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

marmoute created this revision.Oct 1 2019, 8:33 AM
marmoute added a commit: rHG041f042afcc5: copies: move file input processsing early.Oct 1 2019, 1:07 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG041f042afcc5: copies: move file input processsing early (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (16 lines)

Diff 16756

mercurial/changelog.py

del extra["branch"] del extra["branch"]
elif branch in (".", "null", "tip"): elif branch in (".", "null", "tip"):
raise error.StorageError(_('the name \'%s\' is reserved') raise error.StorageError(_('the name \'%s\' is reserved')
% branch) % branch)
sortedfiles = sorted(files) sortedfiles = sorted(files)
if extra is not None: if extra is not None:
for name in ('p1copies', 'p2copies', 'filesadded', 'filesremoved'): for name in ('p1copies', 'p2copies', 'filesadded', 'filesremoved'):
extra.pop(name, None) extra.pop(name, None)
if p1copies is not None:
p1copies = encodecopies(sortedfiles, p1copies)
if p2copies is not None:
p2copies = encodecopies(sortedfiles, p2copies)
if filesadded is not None:
filesadded = encodefileindices(sortedfiles, filesadded)
if filesremoved is not None:
filesremoved = encodefileindices(sortedfiles, filesremoved)
if self._copiesstorage == 'extra': if self._copiesstorage == 'extra':
extrasentries = p1copies, p2copies, filesadded, filesremoved extrasentries = p1copies, p2copies, filesadded, filesremoved
if extra is None and any(x is not None for x in extrasentries): if extra is None and any(x is not None for x in extrasentries):
extra = {} extra = {}
if p1copies is not None: if p1copies is not None:
extra['p1copies'] = encodecopies(sortedfiles, p1copies) extra['p1copies'] = p1copies
if p2copies is not None: if p2copies is not None:
extra['p2copies'] = encodecopies(sortedfiles, p2copies) extra['p2copies'] = p2copies
if filesadded is not None: if filesadded is not None:
extra['filesadded'] = encodefileindices(sortedfiles, filesadded) extra['filesadded'] = filesadded
if filesremoved is not None: if filesremoved is not None:
extra['filesremoved'] = encodefileindices(sortedfiles, filesremoved) extra['filesremoved'] = filesremoved
if extra: if extra:
extra = encodeextra(extra) extra = encodeextra(extra)
parseddate = "%s %s" % (parseddate, extra) parseddate = "%s %s" % (parseddate, extra)
l = [hex(manifest), user, parseddate] + sortedfiles + ["", desc] l = [hex(manifest), user, parseddate] + sortedfiles + ["", desc]
text = "\n".join(l) text = "\n".join(l)
return self.addrevision(text, transaction, len(self), p1, p2) return self.addrevision(text, transaction, len(self), p1, p2)