This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6306

copies: write empty entries in changeset when also writing to filelog
ClosedPublic

Authored by martinvonz on Apr 23 2019, 4:32 PM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHG278dcb24e535: copies: write empty entries in changeset when also writing to filelog
Summary

When writing to both changeset and filelog (during transition), we
don't want the reader to waste time by falling back to reading from
the filelog when there is no copy metadata. Let's write out empty copy
metadata instead (the read path is already prepared for this
case). Thanks to Greg for pointing this out.

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.Apr 23 2019, 4:32 PM
indygreg accepted this revision.Apr 24 2019, 10:21 PM
This revision is now accepted and ready to land.Apr 24 2019, 10:21 PM
martinvonz updated this revision to Diff 15018.May 5 2019, 1:23 AM
martinvonz updated this revision to Diff 15083.May 14 2019, 8:11 PM
pulkit accepted this revision.May 15 2019, 1:59 PM
Closed by commit rHG278dcb24e535: copies: write empty entries in changeset when also writing to filelog (authored by martinvonz). · Explain WhyMay 15 2019, 2:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15110

mercurial/changelog.py

parseddate = "%d %d" % dateutil.makedate() parseddate = "%d %d" % dateutil.makedate()
if extra: if extra:
branch = extra.get("branch") branch = extra.get("branch")
if branch in ("default", ""): if branch in ("default", ""):
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)
if (p1copies or p2copies) and extra is None: if (p1copies is not None or p2copies is not None) and extra is None:
extra = {} extra = {}
if p1copies: if p1copies is not None:
extra['p1copies'] = encodecopies(p1copies) extra['p1copies'] = encodecopies(p1copies)
if p2copies: if p2copies is not None:
extra['p2copies'] = encodecopies(p2copies) extra['p2copies'] = encodecopies(p2copies)
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] + sorted(files) + ["", desc] l = [hex(manifest), user, parseddate] + sorted(files) + ["", 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)

mercurial/localrepo.py

self.ui.debug('reusing manifest from p1 (listed files ' self.ui.debug('reusing manifest from p1 (listed files '
'actually unchanged)\n') 'actually unchanged)\n')
mn = p1.manifestnode() mn = p1.manifestnode()
else: else:
self.ui.debug('reusing manifest from p1 (no file change)\n') self.ui.debug('reusing manifest from p1 (no file change)\n')
mn = p1.manifestnode() mn = p1.manifestnode()
files = [] files = []
if writecopiesto == 'changeset-only':
# If writing only to changeset extras, use None to indicate that
# no entry should be written. If writing to both, write an empty
# entry to prevent the reader from falling back to reading
# filelogs.
p1copies = p1copies or None
p2copies = p2copies or None
# update changelog # update changelog
self.ui.note(_("committing changelog\n")) self.ui.note(_("committing changelog\n"))
self.changelog.delayupdate(tr) self.changelog.delayupdate(tr)
n = self.changelog.add(mn, files, ctx.description(), n = self.changelog.add(mn, files, ctx.description(),
trp, p1.node(), p2.node(), trp, p1.node(), p2.node(),
user, ctx.date(), ctx.extra().copy(), user, ctx.date(), ctx.extra().copy(),
p1copies, p2copies) p1copies, p2copies)
xp1, xp2 = p1.hex(), p2 and p2.hex() or '' xp1, xp2 = p1.hex(), p2 and p2.hex() or ''

tests/test-copies-in-changeset.t

Test writing to both changeset and filelog Test writing to both changeset and filelog
$ hg cp a j $ hg cp a j
$ hg ci -m 'copy a to j' --config experimental.copies.write-to=compatibility $ hg ci -m 'copy a to j' --config experimental.copies.write-to=compatibility
$ hg changesetcopies $ hg changesetcopies
files: j files: j
p1copies: j\x00a (esc) p1copies: j\x00a (esc)
p2copies:
$ hg debugdata j 0 $ hg debugdata j 0
\x01 (esc) \x01 (esc)
copy: a copy: a
copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
\x01 (esc) \x01 (esc)
a a
$ hg showcopies $ hg showcopies
a -> j a -> j
$ hg showcopies --config experimental.copies.read-from=compatibility $ hg showcopies --config experimental.copies.read-from=compatibility
a -> j a -> j
$ hg showcopies --config experimental.copies.read-from=filelog-only $ hg showcopies --config experimental.copies.read-from=filelog-only
a -> j a -> j
The entries should be written to extras even if they're empty (so the client
won't have to fall back to reading from filelogs)
$ echo x >> j
$ hg ci -m 'modify j' --config experimental.copies.write-to=compatibility
$ hg changesetcopies
files: j
p1copies:
p2copies:
Test writing only to filelog Test writing only to filelog
$ hg cp a k $ hg cp a k
$ hg ci -m 'copy a to k' --config experimental.copies.write-to=filelog-only $ hg ci -m 'copy a to k' --config experimental.copies.write-to=filelog-only
$ hg changesetcopies $ hg changesetcopies
files: k files: k
$ hg debugdata k 0 $ hg debugdata k 0