( )⚙ D6431 copies: also encode p[12]copies destination as index into "files" list

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6431

copies: also encode p[12]copies destination as index into "files" list
ClosedPublic

Authored by martinvonz on May 22 2019, 1:02 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa1f87294471f: copies: also encode p[12]copies destination as index into "files" list
Summary

This is mostly for consistency with the filesaddes/filesremoved
fields, but it should also save a bit of space.

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

Diff 15375

mercurial/changelog.py

def encodeextra(d): def encodeextra(d):
# keys must be sorted to produce a deterministic changelog entry # keys must be sorted to produce a deterministic changelog entry
items = [ items = [
_string_escape('%s:%s' % (k, pycompat.bytestr(d[k]))) _string_escape('%s:%s' % (k, pycompat.bytestr(d[k])))
for k in sorted(d) for k in sorted(d)
] ]
return "\0".join(items) return "\0".join(items)
def encodecopies(copies): def encodecopies(files, copies):
items = [ items = []
'%s\0%s' % (k, copies[k]) for i, dst in enumerate(files):
for k in sorted(copies) if dst in copies:
] items.append('%d\0%s' % (i, copies[dst]))
if len(items) != len(copies):
raise error.ProgrammingError('some copy targets missing from file list')
return "\n".join(items) return "\n".join(items)
def decodecopies(data): def decodecopies(files, data):
try: try:
copies = {} copies = {}
for l in data.split('\n'): for l in data.split('\n'):
k, v = l.split('\0') strindex, src = l.split('\0')
copies[k] = v i = int(strindex)
dst = files[i]
copies[dst] = src
return copies return copies
except ValueError: 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):
@property @property
def filesremoved(self): def filesremoved(self):
rawindices = self.extra.get('filesremoved') rawindices = self.extra.get('filesremoved')
return rawindices and decodefileindices(self.files, rawindices) return rawindices and decodefileindices(self.files, rawindices)
@property @property
def p1copies(self): def p1copies(self):
rawcopies = self.extra.get('p1copies') rawcopies = self.extra.get('p1copies')
return rawcopies and decodecopies(rawcopies) return rawcopies and decodecopies(self.files, rawcopies)
@property @property
def p2copies(self): def p2copies(self):
rawcopies = self.extra.get('p2copies') rawcopies = self.extra.get('p2copies')
return rawcopies and decodecopies(rawcopies) return rawcopies and decodecopies(self.files, rawcopies)
@property @property
def description(self): def description(self):
return encoding.tolocal(self._text[self._offsets[3] + 2:]) return encoding.tolocal(self._text[self._offsets[3] + 2:])
class changelog(revlog.revlog): class changelog(revlog.revlog):
def __init__(self, opener, trypending=False): def __init__(self, opener, trypending=False):
"""Load a changelog revlog using an opener. """Load a changelog revlog using an opener.
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)
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 = {}
sortedfiles = sorted(files)
if p1copies is not None: if p1copies is not None:
extra['p1copies'] = encodecopies(p1copies) extra['p1copies'] = encodecopies(sortedfiles, p1copies)
if p2copies is not None: if p2copies is not None:
extra['p2copies'] = encodecopies(p2copies) extra['p2copies'] = encodecopies(sortedfiles, p2copies)
sortedfiles = sorted(files)
if filesadded is not None: if filesadded is not None:
extra['filesadded'] = encodefileindices(sortedfiles, filesadded) extra['filesadded'] = encodefileindices(sortedfiles, filesadded)
if filesremoved is not None: if filesremoved is not None:
extra['filesremoved'] = encodefileindices(sortedfiles, filesremoved) extra['filesremoved'] = encodefileindices(sortedfiles, filesremoved)
if extra: if extra:
extra = encodeextra(extra) extra = encodeextra(extra)
parseddate = "%s %s" % (parseddate, extra) parseddate = "%s %s" % (parseddate, extra)

tests/test-copies-in-changeset.t

$ hg cp a b $ hg cp a b
$ hg cp a c $ hg cp a c
$ hg cp a d $ hg cp a d
$ hg ci -m 'copy a to b, c, and d' $ hg ci -m 'copy a to b, c, and d'
$ hg changesetcopies $ hg changesetcopies
files: b c d files: b c d
filesadded: 0\x001\x002 (esc) filesadded: 0\x001\x002 (esc)
p1copies: b\x00a (esc) p1copies: 0\x00a (esc)
c\x00a (esc) 1\x00a (esc)
d\x00a (esc) 2\x00a (esc)
$ hg showcopies $ hg showcopies
a -> b a -> b
a -> c a -> c
a -> d a -> d
$ hg showcopies --config experimental.copies.read-from=compatibility $ hg showcopies --config experimental.copies.read-from=compatibility
a -> b a -> b
a -> c a -> c
a -> d a -> d
$ hg showcopies --config experimental.copies.read-from=filelog-only $ hg showcopies --config experimental.copies.read-from=filelog-only
Check that renames are recorded correctly Check that renames are recorded correctly
$ hg mv b b2 $ hg mv b b2
$ hg ci -m 'rename b to b2' $ hg ci -m 'rename b to b2'
$ hg changesetcopies $ hg changesetcopies
files: b b2 files: b b2
filesadded: 1 filesadded: 1
filesremoved: 0 filesremoved: 0
p1copies: b2\x00b (esc) p1copies: 1\x00b (esc)
$ hg showcopies $ hg showcopies
b -> b2 b -> b2
Rename onto existing file. This should get recorded in the changeset files list and in the extras, Rename onto existing file. This should get recorded in the changeset files list and in the extras,
even though there is no filelog entry. even though there is no filelog entry.
$ hg cp b2 c --force $ hg cp b2 c --force
$ hg st --copies $ hg st --copies
M c M c
b2 b2
$ hg debugindex c $ hg debugindex c
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 1 b789fdd96dc2 000000000000 000000000000 0 1 b789fdd96dc2 000000000000 000000000000
$ hg ci -m 'move b onto d' $ hg ci -m 'move b onto d'
$ hg changesetcopies $ hg changesetcopies
files: c files: c
p1copies: c\x00b2 (esc) p1copies: 0\x00b2 (esc)
$ hg showcopies $ hg showcopies
b2 -> c b2 -> c
$ hg debugindex c $ hg debugindex c
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 1 b789fdd96dc2 000000000000 000000000000 0 1 b789fdd96dc2 000000000000 000000000000
Create a merge commit with copying done during merge. Create a merge commit with copying done during merge.
$ hg cp d h $ hg cp d h
File 'f' exists only in p1, so 'i' should be from p1 File 'f' exists only in p1, so 'i' should be from p1
$ hg cp f i $ hg cp f i
$ hg ci -m 'merge' $ hg ci -m 'merge'
$ hg changesetcopies $ hg changesetcopies
files: g h i files: g h i
filesadded: 0\x001\x002 (esc) filesadded: 0\x001\x002 (esc)
p1copies: g\x00a (esc) p1copies: 0\x00a (esc)
i\x00f (esc) 2\x00f (esc)
p2copies: h\x00d (esc) p2copies: 1\x00d (esc)
$ hg showcopies $ hg showcopies
a -> g a -> g
d -> h d -> h
f -> i f -> i
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
filesadded: 0 filesadded: 0
filesremoved: filesremoved:
p1copies: j\x00a (esc) p1copies: 0\x00a (esc)
p2copies: 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
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'
$ echo a2 > a $ echo a2 > a
$ hg ci -m 'modify a' $ hg ci -m 'modify a'
$ hg co -q 0 $ hg co -q 0
$ hg mv a b $ hg mv a b
$ hg ci -qm 'rename a to b' $ hg ci -qm 'rename a to b'
$ hg rebase -d 1 --config rebase.experimental.inmemory=yes $ hg rebase -d 1 --config rebase.experimental.inmemory=yes
rebasing 2:acfc33f3aa6d "rename a to b" (tip) rebasing 2:fc7287ac5b9b "rename a to b" (tip)
merging a and b to b merging a and b to b
saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/acfc33f3aa6d-81d0180d-rebase.hg saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/fc7287ac5b9b-8f2a95ec-rebase.hg
$ hg st --change . --copies $ hg st --change . --copies
A b A b
a a
R a R a
$ cd .. $ cd ..

tests/test-copies.t

grafting 4:af28412ec03c "added d, modified b" (tip) (no-changeset !) grafting 4:af28412ec03c "added d, modified b" (tip) (no-changeset !)
grafting 4:6325ca0b7a1c "added d, modified b" (tip) (changeset !) grafting 4:6325ca0b7a1c "added d, modified b" (tip) (changeset !)
merging b1 and b to b1 merging b1 and b to b1
$ hg l -l1 -p $ hg l -l1 -p
@ 5 added d, modified b @ 5 added d, modified b
| b1 | b1
~ diff -r 5a4825cc2926 -r 94a2f1a0e8e2 b1 (no-changeset !) ~ diff -r 5a4825cc2926 -r 94a2f1a0e8e2 b1 (no-changeset !)
~ diff -r df722b7fe2d5 -r ba3ddbbdfd96 b1 (changeset !) ~ diff -r 0a0ed3b3251c -r d544fb655520 b1 (changeset !)
--- a/b1 Thu Jan 01 00:00:00 1970 +0000 --- a/b1 Thu Jan 01 00:00:00 1970 +0000
+++ b/b1 Thu Jan 01 00:00:00 1970 +0000 +++ b/b1 Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
b b
+baba +baba
Test to make sure that fullcopytracing algorithm doesn't fail when neither of the Test to make sure that fullcopytracing algorithm doesn't fail when neither of the
merging csets is a descendant of the base. merging csets is a descendant of the base.