mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
92f6f35e7a
Summary: This diff marks **ALL** mercurial tests requiring Python 2 feature. After you fixes some tests, simply remove the `py2` feature requirement and that tests will be continuously run after your diff is landed. To bypass this feature requirement, run the tests command with `HGTEST_FORCE_PY2=1`. For example: ``` HGTEST_FORCE_PY2=1 buck test //eden/scm/tests:hg_run_tests ``` or ``` HGTEST_FORCE_PY2=1 python run-tests.py ``` ---- Basically this diff are created with the following commands: ``` $ sed -i 's/import feature\(.*\)$/import feature\1\n\nfeature.require(["py2"])/' test-*-t.py $ sed -i '1s/^/#require py2\n/' test-*.t $ ls | grep -P "^test.*(?<\!-t)\.py$" > list && vim -p $(cat list) # manually adding feature requires for these Python tests. ``` (Note: this ignores all push blocking failures!) ignore-conflict-markers Reviewed By: singhsrb Differential Revision: D19655148 fbshipit-source-id: 985e3ccb4010cc559049f1d89f8909bc2d9b5e20
392 lines
9.2 KiB
Perl
392 lines
9.2 KiB
Perl
#require py2
|
|
#chg-compatible
|
|
|
|
$ disable treemanifest
|
|
TODO: configure mutation
|
|
$ configure noevolution
|
|
$ enable rebase
|
|
$ setconfig format.usegeneraldelta=yes
|
|
$ readconfig <<EOF
|
|
> [revsetalias]
|
|
> dev=desc("dev")
|
|
> def=desc("def")
|
|
> EOF
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo A > a
|
|
$ echo >> a
|
|
$ hg ci -Am A
|
|
adding a
|
|
|
|
$ echo B > a
|
|
$ echo >> a
|
|
$ hg ci -m B
|
|
|
|
$ echo C > a
|
|
$ echo >> a
|
|
$ hg ci -m C
|
|
|
|
$ hg up -q -C 0
|
|
|
|
$ echo D >> a
|
|
$ hg ci -Am AD
|
|
|
|
$ tglog
|
|
@ 3: 3878212183bd 'AD'
|
|
|
|
|
| o 2: 30ae917c0e4f 'C'
|
|
| |
|
|
| o 1: 0f4f7cb4f549 'B'
|
|
|/
|
|
o 0: 1e635d440a73 'A'
|
|
|
|
$ hg rebase -s 1 -d 3
|
|
rebasing 0f4f7cb4f549 "B"
|
|
merging a
|
|
rebasing 30ae917c0e4f "C"
|
|
merging a
|
|
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg
|
|
|
|
$ tglog
|
|
o 3: 25773bc4b4b0 'C'
|
|
|
|
|
o 2: c09015405f75 'B'
|
|
|
|
|
@ 1: 3878212183bd 'AD'
|
|
|
|
|
o 0: 1e635d440a73 'A'
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
Test rebasing of merges with ancestors of the rebase destination - a situation
|
|
that often happens when trying to recover from repeated merging with a mainline
|
|
branch.
|
|
|
|
The test case creates a dev branch that contains a couple of merges from the
|
|
default branch. When rebasing to the default branch, these merges would be
|
|
merges with ancestors on the same branch. The merges _could_ contain some
|
|
interesting conflict resolutions or additional changes in the merge commit, but
|
|
that is mixed up with the actual merge stuff and there is in general no way to
|
|
separate them.
|
|
|
|
Note: The dev branch contains _no_ changes to f-default. It might be unclear
|
|
how rebasing of ancestor merges should be handled, but the current behavior
|
|
with spurious prompts for conflicts in files that didn't change seems very
|
|
wrong.
|
|
|
|
The branches are emulated using commit messages.
|
|
|
|
$ hg init ancestor-merge
|
|
$ cd ancestor-merge
|
|
|
|
$ drawdag <<'EOS'
|
|
> o default4
|
|
> |
|
|
> | o devmerge2
|
|
> |/|
|
|
> o | default3
|
|
> | |
|
|
> | o devmerge1
|
|
> |/|
|
|
> o | default2
|
|
> | |
|
|
> | o dev2
|
|
> | |
|
|
> | o dev1
|
|
> |/
|
|
> o default1
|
|
> EOS
|
|
$ hg clone -qU . ../ancestor-merge-2
|
|
|
|
Full rebase all the way back from branching point:
|
|
|
|
$ hg rebase -r 'only(dev,def)' -d $default4 --config ui.interactive=True << EOF
|
|
> c
|
|
> EOF
|
|
rebasing 1e48f4172d62 "dev1"
|
|
rebasing aeae94a564c6 "dev2"
|
|
rebasing da5b1609fcb1 "devmerge1"
|
|
note: rebase of 6:da5b1609fcb1 created no changes to commit
|
|
rebasing bea5bcfda5f9 "devmerge2"
|
|
note: rebase of 7:bea5bcfda5f9 created no changes to commit
|
|
saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1e48f4172d62-cc446d63-rebase.hg
|
|
$ tglog
|
|
o 5: f66b059fae0f 'dev2'
|
|
|
|
|
o 4: 1073bfc4c1ed 'dev1'
|
|
|
|
|
o 3: 22e5a3eb70f1 'default4'
|
|
|
|
|
o 2: a51061c4b2cb 'default3'
|
|
|
|
|
o 1: dfbdae6572c4 'default2'
|
|
|
|
|
o 0: 6ee4113c6616 'default1'
|
|
|
|
Grafty cherry picking rebasing:
|
|
|
|
$ cd ../ancestor-merge-2
|
|
|
|
$ hg phase -fdr0:
|
|
$ hg rebase -r 'children(only(dev,def))' -d $default4 --config ui.interactive=True << EOF
|
|
> c
|
|
> EOF
|
|
rebasing aeae94a564c6 "dev2"
|
|
rebasing da5b1609fcb1 "devmerge1"
|
|
note: rebase of 6:da5b1609fcb1 created no changes to commit
|
|
rebasing bea5bcfda5f9 "devmerge2"
|
|
note: rebase of 7:bea5bcfda5f9 created no changes to commit
|
|
saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/aeae94a564c6-2b0faa8a-rebase.hg
|
|
$ tglog
|
|
o 5: 9cdc50ee9a9d 'dev2'
|
|
|
|
|
o 4: 22e5a3eb70f1 'default4'
|
|
|
|
|
o 3: a51061c4b2cb 'default3'
|
|
|
|
|
| o 2: 1e48f4172d62 'dev1'
|
|
| |
|
|
o | 1: dfbdae6572c4 'default2'
|
|
|/
|
|
o 0: 6ee4113c6616 'default1'
|
|
|
|
$ cd ..
|
|
|
|
|
|
Test order of parents of rebased merged with un-rebased changes as p1.
|
|
|
|
$ hg init parentorder
|
|
$ cd parentorder
|
|
$ touch f
|
|
$ hg ci -Aqm common
|
|
$ touch change
|
|
$ hg ci -Aqm change
|
|
$ touch target
|
|
$ hg ci -Aqm target
|
|
$ hg up -qr 0
|
|
$ touch outside
|
|
$ hg ci -Aqm outside
|
|
$ hg merge -qr 1
|
|
$ hg ci -m 'merge p1 3=outside p2 1=ancestor'
|
|
$ hg par
|
|
changeset: 4:6990226659be
|
|
parent: 3:f59da8fc0fcf
|
|
parent: 1:dd40c13f7a6f
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: merge p1 3=outside p2 1=ancestor
|
|
|
|
$ hg up -qr 1
|
|
$ hg merge -qr 3
|
|
$ hg ci -qm 'merge p1 1=ancestor p2 3=outside'
|
|
$ hg par
|
|
changeset: 5:a57575f79074
|
|
parent: 1:dd40c13f7a6f
|
|
parent: 3:f59da8fc0fcf
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: merge p1 1=ancestor p2 3=outside
|
|
|
|
$ tglog
|
|
@ 5: a57575f79074 'merge p1 1=ancestor p2 3=outside'
|
|
|\
|
|
+---o 4: 6990226659be 'merge p1 3=outside p2 1=ancestor'
|
|
| |/
|
|
| o 3: f59da8fc0fcf 'outside'
|
|
| |
|
|
+---o 2: a60552eb93fb 'target'
|
|
| |
|
|
o | 1: dd40c13f7a6f 'change'
|
|
|/
|
|
o 0: 02f0f58d5300 'common'
|
|
|
|
$ hg rebase -r 4 -d 2
|
|
rebasing 6990226659be "merge p1 3=outside p2 1=ancestor"
|
|
saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-rebase.hg
|
|
$ hg tip
|
|
changeset: 5:cca50676b1c5
|
|
parent: 2:a60552eb93fb
|
|
parent: 3:f59da8fc0fcf
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: merge p1 3=outside p2 1=ancestor
|
|
|
|
$ hg rebase -r 4 -d 2
|
|
rebasing a57575f79074 "merge p1 1=ancestor p2 3=outside"
|
|
saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-rebase.hg
|
|
$ hg tip
|
|
changeset: 5:f9daf77ffe76
|
|
parent: 2:a60552eb93fb
|
|
parent: 3:f59da8fc0fcf
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
summary: merge p1 1=ancestor p2 3=outside
|
|
|
|
$ tglog
|
|
@ 5: f9daf77ffe76 'merge p1 1=ancestor p2 3=outside'
|
|
|\
|
|
+---o 4: cca50676b1c5 'merge p1 3=outside p2 1=ancestor'
|
|
| |/
|
|
| o 3: f59da8fc0fcf 'outside'
|
|
| |
|
|
o | 2: a60552eb93fb 'target'
|
|
| |
|
|
o | 1: dd40c13f7a6f 'change'
|
|
|/
|
|
o 0: 02f0f58d5300 'common'
|
|
|
|
rebase of merge of ancestors
|
|
|
|
$ hg up -qr 2
|
|
$ hg merge -qr 3
|
|
$ echo 'other change while merging future "rebase ancestors"' > other
|
|
$ hg ci -Aqm 'merge rebase ancestors'
|
|
$ hg rebase -d 5 -v
|
|
rebasing 4c5f12f25ebe "merge rebase ancestors"
|
|
resolving manifests
|
|
removing other
|
|
note: merging f9daf77ffe76+ and 4c5f12f25ebe using bids from ancestors a60552eb93fb and f59da8fc0fcf
|
|
|
|
calculating bids for ancestor a60552eb93fb
|
|
resolving manifests
|
|
|
|
calculating bids for ancestor f59da8fc0fcf
|
|
resolving manifests
|
|
|
|
auction for merging merge bids
|
|
other: consensus for g
|
|
end of auction
|
|
|
|
getting other
|
|
committing files:
|
|
other
|
|
committing manifest
|
|
committing changelog
|
|
rebase merging completed
|
|
1 changesets found
|
|
uncompressed size of bundle content:
|
|
199 (changelog)
|
|
216 (manifests)
|
|
182 other
|
|
saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-rebase.hg
|
|
1 changesets found
|
|
uncompressed size of bundle content:
|
|
254 (changelog)
|
|
167 (manifests)
|
|
182 other
|
|
adding branch
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
rebase completed
|
|
$ tglog
|
|
@ 6: 113755df812b 'merge rebase ancestors'
|
|
|
|
|
o 5: f9daf77ffe76 'merge p1 1=ancestor p2 3=outside'
|
|
|\
|
|
+---o 4: cca50676b1c5 'merge p1 3=outside p2 1=ancestor'
|
|
| |/
|
|
| o 3: f59da8fc0fcf 'outside'
|
|
| |
|
|
o | 2: a60552eb93fb 'target'
|
|
| |
|
|
o | 1: dd40c13f7a6f 'change'
|
|
|/
|
|
o 0: 02f0f58d5300 'common'
|
|
|
|
Due to the limitation of 3-way merge algorithm (1 merge base), rebasing a merge
|
|
may include unwanted content:
|
|
|
|
$ hg init $TESTTMP/dual-merge-base1
|
|
$ cd $TESTTMP/dual-merge-base1
|
|
$ hg debugdrawdag <<'EOS'
|
|
> F
|
|
> /|
|
|
> D E
|
|
> | |
|
|
> B C
|
|
> |/
|
|
> A Z
|
|
> |/
|
|
> R
|
|
> EOS
|
|
$ hg rebase -r D+E+F -d Z
|
|
rebasing 5f2c926dfecf "D" (D)
|
|
rebasing b296604d9846 "E" (E)
|
|
rebasing caa9781e507d "F" (F)
|
|
abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d
|
|
[255]
|
|
|
|
The warning does not get printed if there is no unwanted change detected:
|
|
|
|
$ hg init $TESTTMP/dual-merge-base2
|
|
$ cd $TESTTMP/dual-merge-base2
|
|
$ hg debugdrawdag <<'EOS'
|
|
> D
|
|
> /|
|
|
> B C
|
|
> |/
|
|
> A Z
|
|
> |/
|
|
> R
|
|
> EOS
|
|
$ hg rebase -r B+C+D -d Z
|
|
rebasing c1e6b162678d "B" (B)
|
|
rebasing d6003a550c2c "C" (C)
|
|
rebasing c8f78076273e "D" (D)
|
|
saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg
|
|
$ hg manifest -r 'desc(D)'
|
|
B
|
|
C
|
|
R
|
|
Z
|
|
|
|
The merge base could be different from old p1 (changed parent becomes new p1):
|
|
|
|
$ hg init $TESTTMP/chosen-merge-base1
|
|
$ cd $TESTTMP/chosen-merge-base1
|
|
$ hg debugdrawdag <<'EOS'
|
|
> F
|
|
> /|
|
|
> D E
|
|
> | |
|
|
> B C Z
|
|
> EOS
|
|
$ hg rebase -r D+F -d Z
|
|
rebasing 004dc1679908 "D" (D)
|
|
rebasing 4be4cbf6f206 "F" (F)
|
|
saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg
|
|
$ hg manifest -r 'desc(F)'
|
|
C
|
|
D
|
|
E
|
|
Z
|
|
$ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n'
|
|
D
|
|
|
|
$ hg init $TESTTMP/chosen-merge-base2
|
|
$ cd $TESTTMP/chosen-merge-base2
|
|
$ hg debugdrawdag <<'EOS'
|
|
> F
|
|
> /|
|
|
> D E
|
|
> | |
|
|
> B C Z
|
|
> EOS
|
|
$ hg rebase -r E+F -d Z
|
|
rebasing 974e4943c210 "E" (E)
|
|
rebasing 4be4cbf6f206 "F" (F)
|
|
saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg
|
|
$ hg manifest -r 'desc(F)'
|
|
B
|
|
D
|
|
E
|
|
Z
|
|
$ hg log -r `hg log -r 'desc(F)' -T '{p1node}'` -T '{desc}\n'
|
|
E
|