This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7859

graftcopies: use _filter() for filtering out invalid copies
ClosedPublic

Authored by martinvonz on Jan 14 2020, 12:06 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3df0bd706c40: graftcopies: use _filter() for filtering out invalid copies
Summary

graftcopies() (formerly called duplicatecopies()) checked that the
copy destination existed in the working copy, but it didn't check that
copy source existed in the parent of the working copy. In
test-graft.t we can see that as warnings about not finding ancestors
of the copied files, and also empty commits getting created.

This patch uses the existing _filter() function for filtering out
invalid copies. In addition to the aforementioned types, that also
includes copies where source and destination is the same.

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

PathPackages
Mmercurial/copies.py (7 lines)
Mtests/test-graft-rename.t (9 lines)
Mtests/test-graft.t (53 lines)
Mtests/test-issue1175.t (1 line)

Diff 19370

mercurial/copies.py

if skip is not None and ( if skip is not None and (
ctraceconfig == b'heuristics' or bctrace or bctrace is None ctraceconfig == b'heuristics' or bctrace or bctrace is None
): ):
# copytrace='off' skips this line, but not the entire function because # copytrace='off' skips this line, but not the entire function because
# the line below is O(size of the repo) during a rebase, while the rest # the line below is O(size of the repo) during a rebase, while the rest
# of the function is much faster (and is required for carrying copy # of the function is much faster (and is required for carrying copy
# metadata across the rebase anyway). # metadata across the rebase anyway).
exclude = pathcopies(base, skip) exclude = pathcopies(base, skip)
for dst, src in pycompat.iteritems(pathcopies(base, ctx)): new_copies = pathcopies(base, ctx)
_filter(wctx.p1(), wctx, new_copies)
for dst, src in pycompat.iteritems(new_copies):
if dst in exclude: if dst in exclude:
continue continue
if dst in wctx:
wctx[dst].markcopied(src) wctx[dst].markcopied(src)
def computechangesetfilesadded(ctx): def computechangesetfilesadded(ctx):
"""return the list of files added in a changeset """return the list of files added in a changeset
""" """
added = [] added = []
for f in ctx.files(): for f in ctx.files():
if not any(f in p for p in ctx.parents()): if not any(f in p for p in ctx.parents()):

tests/test-graft-rename.t

Test the cases A.2 (f1x), A.3 (f2x) and a special case of A.6 (f5x) where the Test the cases A.2 (f1x), A.3 (f2x) and a special case of A.6 (f5x) where the
two renames actually converge to the same name (thus no actual divergence). two renames actually converge to the same name (thus no actual divergence).
$ hg up -q 'desc("A0")' $ hg up -q 'desc("A0")'
$ HGEDITOR="echo C1 >" hg graft -r 'desc("C0")' --edit $ HGEDITOR="echo C1 >" hg graft -r 'desc("C0")' --edit
grafting 2:f58c7e2b28fa "C0" grafting 2:f58c7e2b28fa "C0"
merging f1a and f1b to f1a merging f1a and f1b to f1a
merging f5a merging f5a
warning: can't find ancestor for 'f5a' copied from 'f5b'!
$ hg status --change . $ hg status --change .
M f1a M f1a
M f5a M f5a
A f2c A f2c
R f2a R f2a
$ hg cat f1a $ hg cat f1a
c1c c1c
$ hg cat f1b $ hg cat f1b
f1b: no such file in rev c9763722f9bd f1b: no such file in rev c9763722f9bd
[1] [1]
Test the cases A.0 (f4x) and A.6 (f3x) Test the cases A.0 (f4x) and A.6 (f3x)
$ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit
grafting 3:b69f5839d2d9 "D0" grafting 3:b69f5839d2d9 "D0"
note: possible conflict - f3b was renamed multiple times to: note: possible conflict - f3b was renamed multiple times to:
f3a f3a
f3d f3d
warning: can't find ancestor for 'f3d' copied from 'f3b'!
Set up the repository for some further tests Set up the repository for some further tests
$ hg up -q "min(desc("A0"))" $ hg up -q "min(desc("A0"))"
$ hg mv f1a f1e $ hg mv f1a f1e
$ echo c2e > f2a $ echo c2e > f2a
$ hg mv f3a f3e $ hg mv f3a f3e
$ hg mv f4a f4e $ hg mv f4a f4e
Test the cases A.1 (f4x) and A.7 (f3x). Test the cases A.1 (f4x) and A.7 (f3x).
$ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit $ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit
grafting 3:b69f5839d2d9 "D0" grafting 3:b69f5839d2d9 "D0"
note: possible conflict - f3b was renamed multiple times to: note: possible conflict - f3b was renamed multiple times to:
f3d f3d
f3e f3e
merging f4e and f4a to f4e merging f4e and f4a to f4e
warning: can't find ancestor for 'f3d' copied from 'f3b'!
$ hg cat f2c $ hg cat f2c
c2e c2e
Test the case A.5 (move case, f1x). Test the case A.5 (move case, f1x).
$ hg up -q "desc("C0")" $ hg up -q "desc("C0")"
BROKEN: Shouldn't get the warning about missing ancestor
$ HGEDITOR="echo E1 >" hg graft -r 'desc("E0")' --edit $ HGEDITOR="echo E1 >" hg graft -r 'desc("E0")' --edit
grafting 6:6bd1736cab86 "E0" grafting 6:6bd1736cab86 "E0"
note: possible conflict - f1a was renamed multiple times to: note: possible conflict - f1a was renamed multiple times to:
f1b f1b
f1e f1e
note: possible conflict - f3a was renamed multiple times to: note: possible conflict - f3a was renamed multiple times to:
f3b f3b
f3e f3e
merging f2c and f2a to f2c merging f2c and f2a to f2c
merging f5a and f5b to f5b merging f5a and f5b to f5b
warning: can't find ancestor for 'f1e' copied from 'f1a'!
warning: can't find ancestor for 'f3e' copied from 'f3a'!
$ cat f1e $ cat f1e
c1a c1a
Test the case A.5 (copy case, f1x). Test the case A.5 (copy case, f1x).
$ hg up -q "desc("C0")" $ hg up -q "desc("C0")"
BROKEN: Shouldn't get the warning about missing ancestor
$ HGEDITOR="echo F1 >" hg graft -r 'desc("F0")' --edit $ HGEDITOR="echo F1 >" hg graft -r 'desc("F0")' --edit
grafting 7:d376ab0d7fda "F0" grafting 7:d376ab0d7fda "F0"
warning: can't find ancestor for 'f1f' copied from 'f1a'!
BROKEN: f1f should be marked a copy from f1b BROKEN: f1f should be marked a copy from f1b
$ hg st --copies --change . $ hg st --copies --change .
A f1f A f1f
BROKEN: f1f should have the new content from f1b (i.e. "c1c") BROKEN: f1f should have the new content from f1b (i.e. "c1c")
$ cat f1f $ cat f1f
c1a c1a
Test the case A.5 (copy+modify case, f1x). Test the case A.5 (copy+modify case, f1x).
$ hg up -q "desc("C0")" $ hg up -q "desc("C0")"
BROKEN: We should get a merge conflict from the 3-way merge between f1b in C0 BROKEN: We should get a merge conflict from the 3-way merge between f1b in C0
(content "c1c") and f1g in G0 (content "c1g") with f1a in A0 as base (content (content "c1c") and f1g in G0 (content "c1g") with f1a in A0 as base (content
"c1a") "c1a")
$ HGEDITOR="echo G1 >" hg graft -r 'desc("G0")' --edit $ HGEDITOR="echo G1 >" hg graft -r 'desc("G0")' --edit
grafting 8:ba67f08fb15a "G0" grafting 8:ba67f08fb15a "G0"
warning: can't find ancestor for 'f1g' copied from 'f1a'!
Check the results of the grafts tested Check the results of the grafts tested
$ hg log -CGv --patch --git $ hg log -CGv --patch --git
@ changeset: 13:ef3adf6c20a4 @ changeset: 13:ef3adf6c20a4
| tag: tip | tag: tip
| parent: 2:f58c7e2b28fa | parent: 2:f58c7e2b28fa
| user: test | user: test

tests/test-graft.t

skipping already grafted revision 13:7a4785234d87 (7:ef0ef43d49e7 also has origin 2:5c095ad7e90f) skipping already grafted revision 13:7a4785234d87 (7:ef0ef43d49e7 also has origin 2:5c095ad7e90f)
[255] [255]
Graft with --log Graft with --log
$ hg up -Cq 1 $ hg up -Cq 1
$ hg graft 3 --log -u foo $ hg graft 3 --log -u foo
grafting 3:4c60f11aa304 "3" grafting 3:4c60f11aa304 "3"
warning: can't find ancestor for 'c' copied from 'b'!
$ hg log --template '{rev}:{node|short} {parents} {desc}\n' -r tip $ hg log --template '{rev}:{node|short} {parents} {desc}\n' -r tip
14:0c921c65ef1e 1:5d205f8b35b6 3 14:0c921c65ef1e 1:5d205f8b35b6 3
(grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8) (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8)
Resolve conflicted graft Resolve conflicted graft
$ hg up -q 0 $ hg up -q 0
$ echo b > a $ echo b > a
$ hg ci -m 8 $ hg ci -m 8
grafting 13:7a4785234d87 "2" grafting 13:7a4785234d87 "2"
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: True, partial: False branchmerge: True, force: True, partial: False
ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
committing files: note: graft of 13:7a4785234d87 created no changes to commit
b
warning: can't find ancestor for 'b' copied from 'a'!
reusing manifest from p1 (listed files actually unchanged)
committing changelog
updating the branch cache
$ hg log -r 'destination(13)' $ hg log -r 'destination(13)'
All copies of a cset All copies of a cset
$ hg log -r 'origin(13) or destination(origin(13))' $ hg log -r 'origin(13) or destination(origin(13))'
changeset: 2:5c095ad7e90f changeset: 2:5c095ad7e90f
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 2 summary: 2
changeset: 19:9627f653b421 changeset: 19:9627f653b421
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 2 summary: 2
changeset: 21:7e61b508e709 changeset: 21:7e61b508e709
branch: dev branch: dev
user: foo
date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
changeset: 22:3a4e92d81b97
branch: dev
tag: tip tag: tip
user: foo user: foo
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 2 summary: 2
graft skips ancestors graft skips ancestors
$ hg graft 21 3 $ hg graft 21 3
skipping ancestor revision 21:7e61b508e709 skipping ancestor revision 21:7e61b508e709
grafting 3:4c60f11aa304 "3" grafting 3:4c60f11aa304 "3"
merging b and c to c merging b and c to c
graft with --force (still doesn't graft merges) graft with --force (still doesn't graft merges)
$ hg graft 19 0 6 $ hg graft 19 0 6
skipping ungraftable merge revision 6 skipping ungraftable merge revision 6
skipping ancestor revision 0:68795b066622 skipping ancestor revision 0:68795b066622
skipping already grafted revision 19:9627f653b421 (22:3a4e92d81b97 also has origin 2:5c095ad7e90f) grafting 19:9627f653b421 "2"
[255] merging b
note: graft of 19:9627f653b421 created no changes to commit
$ hg graft 19 0 6 --force $ hg graft 19 0 6 --force
skipping ungraftable merge revision 6 skipping ungraftable merge revision 6
grafting 19:9627f653b421 "2" grafting 19:9627f653b421 "2"
merging b merging b
warning: can't find ancestor for 'b' copied from 'a'! note: graft of 19:9627f653b421 created no changes to commit
grafting 0:68795b066622 "0" grafting 0:68795b066622 "0"
graft --force after backout graft --force after backout
$ echo abc > a $ echo abc > a
$ hg ci -m 26 $ hg ci -m 24
$ hg backout 26 $ hg backout 24
reverting a reverting a
changeset 27:e25e17192dc4 backs out changeset 26:44f862488a35 changeset 25:71c4e63d4f98 backs out changeset 24:2e7ea477be26
$ hg graft 26 $ hg graft 24
skipping ancestor revision 26:44f862488a35 skipping ancestor revision 24:2e7ea477be26
[255] [255]
$ hg graft 26 --force $ hg graft 24 --force
grafting 26:44f862488a35 "26" grafting 24:2e7ea477be26 "24"
merging a merging a
$ cat a $ cat a
abc abc
graft --continue after --force graft --continue after --force
$ echo def > a $ echo def > a
$ hg ci -m 29 $ hg ci -m 27
$ hg graft 26 --force --tool internal:fail $ hg graft 24 --force --tool internal:fail
grafting 26:44f862488a35 "26" grafting 24:2e7ea477be26 "24"
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[255] [255]
$ hg resolve --all $ hg resolve --all
merging a merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1] [1]
$ echo abc > a $ echo abc > a
$ hg resolve -m a $ hg resolve -m a
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft -c $ hg graft -c
grafting 26:44f862488a35 "26" grafting 24:2e7ea477be26 "24"
$ cat a $ cat a
abc abc
Continue testing same origin policy, using revision numbers from test above Continue testing same origin policy, using revision numbers from test above
but do some destructive editing of the repo: but do some destructive editing of the repo:
$ hg up -qC 7 $ hg up -qC 7
$ hg tag -l -r 13 tmp $ hg tag -l -r 13 tmp
$ hg --config extensions.strip= strip 2 $ hg --config extensions.strip= strip 2
saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg
$ hg graft tmp $ hg graft tmp
skipping already grafted revision 8:7a4785234d87 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f) skipping already grafted revision 8:7a4785234d87 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f)
[255] [255]
Empty graft Empty graft
$ hg up -qr 24 $ hg up -qr 22
$ hg tag -f something $ hg tag -f something
$ hg graft -qr 25 $ hg graft -qr 23
$ hg graft -f 25 $ hg graft -f 23
grafting 25:bd0c98709948 "26" grafting 23:72d9c7c75bcc "24"
note: graft of 25:bd0c98709948 created no changes to commit note: graft of 23:72d9c7c75bcc created no changes to commit
$ cd .. $ cd ..
Graft to duplicate a commit Graft to duplicate a commit
$ hg init graftsibling $ hg init graftsibling
$ cd graftsibling $ cd graftsibling
$ touch a $ touch a

tests/test-issue1175.t

[255] [255]
$ echo a > b $ echo a > b
$ echo b3 >> b $ echo b3 >> b
$ hg resolve --mark b $ hg resolve --mark b
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue
$ hg graft --continue $ hg graft --continue
grafting 1:5974126fad84 "b1" grafting 1:5974126fad84 "b1"
warning: can't find ancestor for 'b' copied from 'a'!
$ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n'
changeset: 3:376d30ccffc0 changeset: 3:376d30ccffc0
summary: b1 summary: b1
changeset: 2:416baaa2e5e4 changeset: 2:416baaa2e5e4
summary: b2 summary: b2
changeset: 0:3903775176ed changeset: 0:3903775176ed
summary: a summary: a