This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7804

tests: avoid grafting the same change over and over
ClosedPublic

Authored by martinvonz on Jan 6 2020, 7:58 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf3ad014b6a53: tests: avoid grafting the same change over and over
Summary

The test case added in a1381eea7c7d (graft: do not use .remove on a
smart set (regression), 2014-04-28) added a test case that grafted the
same change (renaming 'a' to 'b') three times over. It had description
"graft works on complex revset", but AFACT, all that it cared about
was that some ancestor of the working copy was in the set of revisions
to graft. So this patch changes the test to do that instead.

(I plan to later make it so that grafting these renames on top of each
won't create the empty commits they currently create.)

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.Jan 6 2020, 7:58 PM
pulkit accepted this revision.Jan 9 2020, 9:33 AM
This revision is now accepted and ready to land.Jan 9 2020, 9:33 AM
martinvonz added a commit: rHGf3ad014b6a53: tests: avoid grafting the same change over and over.Jan 9 2020, 9:57 AM
Closed by commit rHGf3ad014b6a53: tests: avoid grafting the same change over and over (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-graft.t (47 lines)

Diff 19128

tests/test-graft.t

changeset: 22:3a4e92d81b97 changeset: 22:3a4e92d81b97
branch: dev 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 works on complex revset graft skips ancestors
$ hg graft 'origin(13) or destination(origin(13))' $ hg graft 21 3
skipping ancestor revision 21:7e61b508e709 skipping ancestor revision 21:7e61b508e709
skipping ancestor revision 22:3a4e92d81b97 grafting 3:4c60f11aa304 "3"
skipping revision 2:5c095ad7e90f (already grafted to 22:3a4e92d81b97) merging b and c to c
grafting 7:ef0ef43d49e7 "2"
warning: can't find ancestor for 'b' copied from 'a'!
grafting 13:7a4785234d87 "2"
warning: can't find ancestor for 'b' copied from 'a'!
grafting 19:9627f653b421 "2"
merging b
warning: can't find ancestor for 'b' copied from 'a'!
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) skipping already grafted revision 19:9627f653b421 (22:3a4e92d81b97 also has origin 2:5c095ad7e90f)
[255] [255]
$ 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'! warning: can't find ancestor for 'b' copied from 'a'!
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 28 $ hg ci -m 26
$ hg backout 28 $ hg backout 26
reverting a reverting a
changeset 29:9d95e865b00c backs out changeset 28:cc20d29aec8d changeset 27:e25e17192dc4 backs out changeset 26:44f862488a35
$ hg graft 28 $ hg graft 26
skipping ancestor revision 28:cc20d29aec8d skipping ancestor revision 26:44f862488a35
[255] [255]
$ hg graft 28 --force $ hg graft 26 --force
grafting 28:cc20d29aec8d "28" grafting 26:44f862488a35 "26"
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 31 $ hg ci -m 29
$ hg graft 28 --force --tool internal:fail $ hg graft 26 --force --tool internal:fail
grafting 28:cc20d29aec8d "28" grafting 26:44f862488a35 "26"
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 28:cc20d29aec8d "28" grafting 26:44f862488a35 "26"
$ 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 26 $ hg up -qr 24
$ hg tag -f something $ hg tag -f something
$ hg graft -qr 27 $ hg graft -qr 25
$ hg graft -f 27 $ hg graft -f 25
grafting 27:17d42b8f5d50 "28" grafting 25:bd0c98709948 "26"
note: graft of 27:17d42b8f5d50 created no changes to commit note: graft of 25:bd0c98709948 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