( )⚙ D6373 tests: avoid the word "dirty" to mean "not a descendant of merge base"

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6373

tests: avoid the word "dirty" to mean "not a descendant of merge base"
ClosedPublic

Authored by martinvonz on May 14 2019, 12:48 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGcbff7f996dc4: tests: avoid the word "dirty" to mean "not a descendant of merge base"
Summary

The term "dirty" is no longer used in the code since 57203e0210f8
(copies: calculate mergecopies() based on pathcopies(), 2019-04-11).

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.May 14 2019, 12:48 PM
pulkit accepted this revision.May 14 2019, 1:00 PM
Closed by commit rHGcbff7f996dc4: tests: avoid the word "dirty" to mean "not a descendant of merge base" (authored by martinvonz). · Explain WhyMay 14 2019, 1:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies.t (14 lines)

Diff 15075

tests/test-copies.t

x -> z (filelog !) x -> z (filelog !)
y -> z (compatibility !) y -> z (compatibility !)
$ hg debugpathcopies 1 5 $ hg debugpathcopies 1 5
$ hg debugpathcopies 2 5 $ hg debugpathcopies 2 5
$ hg debugpathcopies 0 5 $ hg debugpathcopies 0 5
x -> z x -> z
Test for a case in fullcopytracing algorithm where both the merging csets are Test for a case in fullcopytracing algorithm where neither of the merging csets
"dirty"; where a dirty cset means that cset is descendant of merge base. This is a descendant of the merge base. This test reflects that the algorithm
test reflect that for this particular case this algorithm correctly find the copies: correctly finds the copies:
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.allowunstable=True > evolution.allowunstable=True
> EOF > EOF
$ newrepo $ newrepo
~ diff -r 5a4825cc2926 -r 94a2f1a0e8e2 b1 (no-changeset !) ~ diff -r 5a4825cc2926 -r 94a2f1a0e8e2 b1 (no-changeset !)
~ diff -r f5474f5023a8 -r ef7c02d69f3d b1 (changeset !) ~ diff -r f5474f5023a8 -r ef7c02d69f3d 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 don't fail when both the merging csets are dirty Test to make sure that fullcopytracing algorithm doesn't fail when neither of the
(a dirty cset is one who is not the descendant of merge base) merging csets is a descendant of the base.
------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------
$ newrepo $ newrepo
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg ci -m "added a" $ hg ci -m "added a"
$ echo b > b $ echo b > b
$ hg add b $ hg add b
| | 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 cset revision 3 and 6 using base revision 4, in this case Now if we trigger a merge between revision 3 and 6 using base revision 4,
both the merging csets will be dirty as no one is descendent of 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) grafting 6:99802e4f1e46 "added willconflict and d" (tip)