( )⚙ D6486 copies: separate added/removed files by newline instead of null

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6486

copies: separate added/removed files by newline instead of null
ClosedPublic

Authored by martinvonz on Jun 6 2019, 1:11 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG027f1567f97f: copies: separate added/removed files by newline instead of null
Summary

This makes it more consistent with how we encode copies
(newline-separated lists of null-separated pairs). This perhaps makes
{extras} a little less readable (?) despite avoiding the escaping. I
don't know how I feel about this patch. I'm okay with it being queued
or dropped.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 15358

mercurial/changelog.py

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 '\0'.join(indices) return '\n'.join(indices)
def decodefileindices(files, data): def decodefileindices(files, data):
try: try:
subset = [] subset = []
for strindex in data.split('\0'): 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
# used different syntax for the value. # used different syntax for the value.

tests/test-copies-in-changeset.t

$ hg add a $ hg add a
$ hg ci -m initial $ hg ci -m initial
$ 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
1
2
p1copies: 0\x00a (esc) p1copies: 0\x00a (esc)
1\x00a (esc) 1\x00a (esc)
2\x00a (esc) 2\x00a (esc)
$ hg showcopies $ hg showcopies
a -> b a -> b
a -> c a -> c
a -> d a -> d
$ hg cp a g $ hg cp a g
File 'd' exists only in p2, so 'h' should be from p2 File 'd' exists only in p2, so 'h' should be from p2
$ 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
1
2
p1copies: 0\x00a (esc) p1copies: 0\x00a (esc)
2\x00f (esc) 2\x00f (esc)
p2copies: 1\x00d (esc) p2copies: 1\x00d (esc)
$ hg showcopies $ hg showcopies
a -> g a -> g
d -> h d -> h
f -> i f -> i

tests/test-copies.t

|/ willconflict |/ willconflict
o 1 added b o 1 added b
| b | b
o 0 added a o 0 added a
a a
$ hg rebase -r . -d 2 -t :other $ hg rebase -r . -d 2 -t :other
rebasing 5:5018b1509e94 "added willconflict and d" (tip) (no-changeset !) rebasing 5:5018b1509e94 "added willconflict and d" (tip) (no-changeset !)
rebasing 5:619047c26bf8 "added willconflict and d" (tip) (changeset !) rebasing 5:af8d273bf580 "added willconflict and d" (tip) (changeset !)
$ hg up 3 -q $ hg up 3 -q
$ hg l --hidden $ hg l --hidden
o 6 added willconflict and d o 6 added willconflict and d
| d willconflict | d willconflict
| x 5 added willconflict and d | x 5 added willconflict and d
| | d willconflict | | d willconflict
| | x 4 added d | | x 4 added d
| |/ d | |/ d
+---@ 3 added c +---@ 3 added c
| | c | | c
o | 2 added willconflict o | 2 added willconflict
|/ willconflict |/ willconflict
o 1 added b o 1 added b
| b | b
o 0 added a o 0 added a
a a
Now if we trigger a merge between revision 3 and 6 using base revision 4, Now if we trigger a merge between revision 3 and 6 using base revision 4,
neither of the merging csets will be a descendant of the base revision: neither of the merging csets will be a descendant of the base revision:
$ hg graft -r 6 --base 4 --hidden -t :other $ hg graft -r 6 --base 4 --hidden -t :other
grafting 6:99802e4f1e46 "added willconflict and d" (tip) (no-changeset !) grafting 6:99802e4f1e46 "added willconflict and d" (tip) (no-changeset !)
grafting 6:9ddc6fb3b691 "added willconflict and d" (tip) (changeset !) grafting 6:b19f0df72728 "added willconflict and d" (tip) (changeset !)