Mercurial > hg
view tests/test-rebase-collapse.t @ 46582:b0a3ca02d17a
copies-rust: implement PartialEqual manually
Now that we know that each (dest, rev) pair has at most a unique CopySource, we
can simplify comparison a lot.
This "simple" step buy a good share of the previous slowdown back in some case:
Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev
---------------------------------------------------------------------------------------------------------------------------------------------------------------
mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 43.304637 s, 34.443661 s, -8.860976 s, × 0.7954, 90 µs/rev
Full benchmark:
Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev
---------------------------------------------------------------------------------------------------------------------------------------------------------------
mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000043 s, 0.000043 s, +0.000000 s, × 1.0000, 43 µs/rev
mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000114 s, 0.000117 s, +0.000003 s, × 1.0263, 19 µs/rev
mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.004937 s, 0.004892 s, -0.000045 s, × 0.9909, 4 µs/rev
pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000339 s, 0.000196 s, -0.000143 s, × 0.5782, 21 µs/rev
pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000049 s, 0.000050 s, +0.000001 s, × 1.0204, 50 µs/rev
pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000202 s, 0.000117 s, -0.000085 s, × 0.5792, 16 µs/rev
pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.000409 s, 0.6f1f4a s, -0.000087 s, × 0.7873, 322 µs/rev
pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.011984 s, 0.011949 s, -0.000035 s, × 0.9971, 1991 µs/rev
pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.050820 s, 0.050802 s, -0.000018 s, × 0.9996, 10 µs/rev
pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.087953 s, 0.088090 s, +0.000137 s, × 1.0016, 12 µs/rev
pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.062902 s, 0.062079 s, -0.000823 s, × 0.9869, 11 µs/rev
pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43645 revs, 0.679234 s, 0.635337 s, -0.043897 s, × 0.9354, 14 µs/rev
pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 2 revs, 0.013095 s, 0.013262 s, +0.000167 s, × 1.0128, 6631 µs/rev
pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.120910 s, 0.120085 s, -0.000825 s, × 0.9932, 10 µs/rev
netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000087 s, 0.000085 s, -0.000002 s, × 0.9770, 42 µs/rev
netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000107 s, 0.000110 s, +0.000003 s, × 1.0280, 55 µs/rev
netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000186 s, 0.000177 s, -0.000009 s, × 0.9516, 59 µs/rev
netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.000754 s, 0.000743 s, -0.000011 s, × 0.9854, 82 µs/rev
netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.010443 s, 0.010168 s, -0.000275 s, × 0.9737, 7 µs/rev
netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.015697 s, 0.015946 s, +0.000249 s, × 1.0159, 10 µs/rev
netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.063528 s, 0.062712 s, -0.000816 s, × 0.9872, 10 µs/rev
netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 66949 revs, 0.545515 s, 0.523832 s, -0.021683 s, × 0.9603, 7 µs/rev
mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000089 s, 0.000090 s, +0.000001 s, × 1.0112, 45 µs/rev
mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000265 s, 0.000264 s, -0.000001 s, × 0.9962, 33 µs/rev
mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000381 s, 0.000187 s, -0.000194 s, × 0.4908, 20 µs/rev
mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.000672 s, 0.000665 s, -0.000007 s, × 0.9896, 95 µs/rev
mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.003497 s, 0.003556 s, +0.000059 s, × 1.0169, 1185 µs/rev
mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.073204 s, 0.071345 s, -0.001859 s, × 0.9746, 11890 µs/rev
mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.006482 s, 0.006551 s, +0.000069 s, × 1.0106, 4 µs/rev
mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.005066 s, 0.005078 s, +0.000012 s, × 1.0024, 123 µs/rev
mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.065707 s, 0.065823 s, +0.000116 s, × 1.0018, 8 µs/rev
mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.026800 s, 0.027050 s, +0.000250 s, × 1.0093, 43 µs/rev
mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.203856 s, 0.202443 s, -0.001413 s, × 0.9931, 6 µs/rev
mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 1.293394 s, 1.261583 s, -0.031811 s, × 0.9754, 8 µs/rev
mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 204976 revs, 1.698239 s, 1.643869 s, -0.054370 s, × 0.9680, 8 µs/rev
mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.000875 s, 0.000868 s, -0.000007 s, × 0.9920, 434 µs/rev
mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.000891 s, 0.000887 s, -0.000004 s, × 0.9955, 443 µs/rev
mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000292 s, 0.000168 s, -0.000124 s, × 0.5753, 42 µs/rev
mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.003939 s, 0.001160 s, -0.002779 s, × 0.2945, 580 µs/rev
mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.033027 s, 0.033016 s, -0.000011 s, × 0.9997, 33016 µs/rev
mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.073703 s, 0.073312 s, -0.39ae31 s, × 0.9947, 12218 µs/rev
mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.006469 s, 0.006485 s, +0.000016 s, × 1.0025, 4 µs/rev
mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.005278 s, 0.005494 s, +0.000216 s, × 1.0409, 134 µs/rev
mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.064995 s, 0.064879 s, -0.000116 s, × 0.9982, 9 µs/rev
mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.301041 s, 0.301469 s, +0.000428 s, × 1.0014, 7 µs/rev
mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.285575 s, 0.297113 s, +0.011538 s, × 1.0404, 7 µs/rev
mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.085597 s, 0.085890 s, +0.000293 s, × 1.0034, 9 µs/rev
mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.027118 s, 0.027718 s, +0.000600 s, × 1.0221, 45 µs/rev
mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 2.119204 s, 2.048949 s, -0.070255 s, × 0.9668, 21 µs/rev
mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 0.701479 s, 0.685924 s, -0.015555 s, × 0.9778, 13 µs/rev
mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 4.482399 s, 4.482891 s, +0.000492 s, × 1.0001, 12 µs/rev
mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.574082 s, 0.577633 s, +0.003551 s, × 1.0062, 16 µs/rev
mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 4.480366 s, 4.397816 s, -0.082550 s, × 0.9816, 12 µs/rev
mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 4.369070 s, 4.370538 s, +0.001468 s, × 1.0003, 12 µs/rev
mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 1.592506 s, 1.570439 s, -0.022067 s, × 0.9861, 8 µs/rev
mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 87.824489 s, 88.388512 s, +0.564023 s, × 1.0064, 386 µs/rev
mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 43.304637 s, 34.443661 s, -8.860976 s, × 0.7954, 90 µs/rev
private : 459513 revs, 33.853687 s, 27.370148 s, -6.483539 s, × 0.8085, 59 µs/rev
Differential Revision: https://phab.mercurial-scm.org/D9653
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Dec 2020 11:11:05 +0100 |
parents | ac362d5a7893 |
children | 9989a276712f |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > rebase= > mq= > drawdag=$TESTDIR/drawdag.py > > [phases] > publish=False > > [alias] > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" > tglogp = log -G --template "{rev}: {node|short} {phase} '{desc}' {branches}\n" > EOF Highest phase of source commits is used: $ hg init phase $ cd phase $ hg debugdrawdag << 'EOF' > D > | > F C > | | > E B > |/ > A > EOF $ hg phase --force --secret D $ cat > $TESTTMP/editor.sh <<EOF > echo "==== before editing" > cat \$1 > echo "====" > echo "edited manually" >> \$1 > EOF $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --source B --dest F rebasing 1:112478962961 B "B" rebasing 3:26805aba1e60 C "C" rebasing 5:f585351a92f8 D tip "D" ==== before editing Collapsed revision * B * C * D HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Leave message empty to abort commit. HG: -- HG: user: test HG: branch 'default' HG: added B HG: added C HG: added D ==== saved backup bundle to $TESTTMP/phase/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg $ hg tglogp o 3: 92fa5f5fe108 secret 'Collapsed revision | * B | * C | * D | | | edited manually' o 2: 64a8289d2492 draft 'F' | o 1: 7fb047a69f22 draft 'E' | o 0: 426bada5c675 draft 'A' $ hg manifest --rev tip A B C D E F $ cd .. Merge gets linearized: $ hg init linearized-merge $ cd linearized-merge $ hg debugdrawdag << 'EOF' > F D > |/| > C B > |/ > A > EOF $ hg phase --force --secret D $ hg rebase --source B --collapse --dest F rebasing 1:112478962961 B "B" rebasing 3:4e4f9194f9f1 D "D" saved backup bundle to $TESTTMP/linearized-merge/.hg/strip-backup/112478962961-e389075b-rebase.hg $ hg tglog o 3: 5bdc08b7da2b 'Collapsed revision | * B | * D' o 2: afc707c82df0 'F' | o 1: dc0947a82db8 'C' | o 0: 426bada5c675 'A' $ hg manifest --rev tip A B C F $ cd .. Custom message: $ hg init message $ cd message $ hg debugdrawdag << 'EOF' > C > | > D B > |/ > A > EOF $ hg rebase --base B -m 'custom message' abort: message can only be specified with collapse [255] $ cat > $TESTTMP/checkeditform.sh <<EOF > env | grep HGEDITFORM > true > EOF $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --source B --collapse -m 'custom message' -e --dest D rebasing 1:112478962961 B "B" rebasing 3:26805aba1e60 C tip "C" HGEDITFORM=rebase.collapse saved backup bundle to $TESTTMP/message/.hg/strip-backup/112478962961-f4131707-rebase.hg $ hg tglog o 2: 2f197b9a08f3 'custom message' | o 1: b18e25de2cf5 'D' | o 0: 426bada5c675 'A' $ hg manifest --rev tip A B C D $ cd .. Rebase and collapse - more than one external (fail): $ hg init multiple-external-parents $ cd multiple-external-parents $ hg debugdrawdag << 'EOF' > G > |\ > | F > | | > D E > |\| > H C B > \|/ > A > EOF $ hg rebase -s C --dest H --collapse abort: unable to collapse on top of 3, there is more than one external parent: 1, 6 [255] Rebase and collapse - E onto H: $ hg rebase -s E --dest H --collapse # root (E) is not a merge rebasing 5:49cb92066bfd E "E" rebasing 6:11abe3fb10b8 F "F" rebasing 7:64e264db77f0 G tip "G" saved backup bundle to $TESTTMP/multiple-external-parents/.hg/strip-backup/49cb92066bfd-ee8a8a79-rebase.hg $ hg tglog o 5: 8b2315790719 'Collapsed revision |\ * E | | * F | | * G' | o 4: 4e4f9194f9f1 'D' | |\ o | | 3: 575c4b5ec114 'H' | | | +---o 2: dc0947a82db8 'C' | | | o 1: 112478962961 'B' |/ o 0: 426bada5c675 'A' $ hg manifest --rev tip A C E F H $ cd .. Test that branchheads cache is updated correctly when doing a strip in which the parent of the ancestor node to be stripped does not become a head and also, the parent of a node that is a child of the node stripped becomes a head (node 3). The code is now much simpler and we could just test a simpler scenario We keep it the test this way in case new complexity is injected. Create repo b: $ hg init branch-heads $ cd branch-heads $ hg debugdrawdag << 'EOF' > G > |\ > | F > | | > D E > |\| > H C B > \|/ > A > EOF $ hg heads --template="{rev}:{node} {branch}\n" 7:64e264db77f061f16d9132b70c5a58e2461fb630 default 3:575c4b5ec114d64b681d33f8792853568bfb2b2c default $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served 64e264db77f061f16d9132b70c5a58e2461fb630 7 575c4b5ec114d64b681d33f8792853568bfb2b2c o default 64e264db77f061f16d9132b70c5a58e2461fb630 o default $ hg strip 4 saved backup bundle to $TESTTMP/branch-heads/.hg/strip-backup/4e4f9194f9f1-5ec4b5e6-backup.hg $ cat $TESTTMP/branch-heads/.hg/cache/branch2-served 11abe3fb10b8689b560681094b17fe161871d043 5 dc0947a82db884575bb76ea10ac97b08536bfa03 o default 575c4b5ec114d64b681d33f8792853568bfb2b2c o default 11abe3fb10b8689b560681094b17fe161871d043 o default $ hg heads --template="{rev}:{node} {branch}\n" 5:11abe3fb10b8689b560681094b17fe161871d043 default 3:575c4b5ec114d64b681d33f8792853568bfb2b2c default 2:dc0947a82db884575bb76ea10ac97b08536bfa03 default $ cd .. Preserves external parent $ hg init external-parent $ cd external-parent $ hg debugdrawdag << 'EOF' > H > |\ > | G > | | > | F # F/E = F\n > | | > D E # D/D = D\n > |\| > I C B > \|/ > A > EOF $ hg rebase -s F --dest I --collapse # root (F) is not a merge rebasing 6:c82b08f646f1 F "F" file 'E' was deleted in local [dest] but was modified in other [source]. You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. What do you want to do? u unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [240] $ echo F > E $ hg resolve -m (no more unresolved files) continue: hg rebase --continue $ hg rebase -c rebasing 6:c82b08f646f1 F "F" rebasing 7:a6db7fa104e1 G "G" rebasing 8:e1d201b72d91 H tip "H" saved backup bundle to $TESTTMP/external-parent/.hg/strip-backup/c82b08f646f1-f2721fbf-rebase.hg $ hg tglog o 6: 681daa3e686d 'Collapsed revision |\ * F | | * G | | * H' | | o 5: 49cb92066bfd 'E' | | | | o | 4: 09143c0bf13e 'D' | |\| o | | 3: 08ebfeb61bac 'I' | | | | o | 2: dc0947a82db8 'C' |/ / | o 1: 112478962961 'B' |/ o 0: 426bada5c675 'A' $ hg manifest --rev tip A C D E F G I $ hg up tip -q $ cat E F $ cd .. Rebasing from multiple bases: $ hg init multiple-bases $ cd multiple-bases $ hg debugdrawdag << 'EOF' > C B > D |/ > |/ > A > EOF $ hg rebase --collapse -r 'B+C' -d D rebasing 1:fc2b737bb2e5 B "B" rebasing 2:dc0947a82db8 C "C" saved backup bundle to $TESTTMP/multiple-bases/.hg/strip-backup/dc0947a82db8-b0c1a7ea-rebase.hg $ hg tglog o 2: 2127ae44d291 'Collapsed revision | * B | * C' o 1: b18e25de2cf5 'D' | o 0: 426bada5c675 'A' $ cd .. With non-contiguous commits: $ hg init non-contiguous $ cd non-contiguous $ cat >> .hg/hgrc <<EOF > [experimental] > evolution=all > EOF $ hg debugdrawdag << 'EOF' > F > | > E > | > D > | > C > | > B G > |/ > A > EOF BROKEN: should be allowed $ hg rebase --collapse -r 'B+D+F' -d G abort: unable to collapse on top of 2, there is more than one external parent: 3, 5 [255] $ cd .. $ hg init multiple-external-parents-2 $ cd multiple-external-parents-2 $ hg debugdrawdag << 'EOF' > D G > |\ /| > B C E F > \| |/ > \ H / > \|/ > A > EOF $ hg rebase --collapse -d H -s 'B+F' abort: unable to collapse on top of 5, there is more than one external parent: 1, 3 [255] $ cd .. With internal merge: $ hg init internal-merge $ cd internal-merge $ hg debugdrawdag << 'EOF' > E > |\ > C D > |/ > F B > |/ > A > EOF $ hg rebase -s B --collapse --dest F rebasing 1:112478962961 B "B" rebasing 3:26805aba1e60 C "C" rebasing 4:be0ef73c17ad D "D" rebasing 5:02c4367d6973 E tip "E" saved backup bundle to $TESTTMP/internal-merge/.hg/strip-backup/112478962961-1dfb057b-rebase.hg $ hg tglog o 2: c0512a1797b0 'Collapsed revision | * B | * C | * D | * E' o 1: 8908a377a434 'F' | o 0: 426bada5c675 'A' $ hg manifest --rev tip A B C D F $ cd .. Interactions between collapse and keepbranches $ hg init e $ cd e $ echo 'a' > a $ hg ci -Am 'A' adding a $ hg branch 'one' marked working directory as branch one (branches are permanent and global, did you want a bookmark?) $ echo 'b' > b $ hg ci -Am 'B' adding b $ hg branch 'two' marked working directory as branch two $ echo 'c' > c $ hg ci -Am 'C' adding c $ hg up -q 0 $ echo 'd' > d $ hg ci -Am 'D' adding d $ hg tglog @ 3: 41acb9dca9eb 'D' | | o 2: 8ac4a08debf1 'C' two | | | o 1: 1ba175478953 'B' one |/ o 0: 1994f17a630e 'A' $ hg rebase --keepbranches --collapse -s 1 -d 3 abort: cannot collapse multiple named branches [255] $ cd .. Rebase, collapse and copies $ hg init copies $ cd copies $ hg unbundle "$TESTDIR/bundles/renames.hg" adding changesets adding manifests adding file changes added 4 changesets with 11 changes to 7 files (+1 heads) new changesets f447d5abf5ea:338e84e2e558 (4 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q tip $ hg tglog @ 3: 338e84e2e558 'move2' | o 2: 6e7340ee38c0 'move1' | | o 1: 1352765a01d4 'change' |/ o 0: f447d5abf5ea 'add' $ hg rebase --collapse -d 1 rebasing 2:6e7340ee38c0 "move1" merging a and d to d merging b and e to e merging c and f to f rebasing 3:338e84e2e558 tip "move2" merging f and c to c merging e and g to g saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-rebase.hg $ hg st $ hg st --copies --change tip A d a A g b R b $ hg up tip -q $ cat c c c $ cat d a a $ cat g b b $ hg log -r . --template "{file_copies}\n" d (a)g (b) Test collapsing a middle revision in-place $ hg tglog @ 2: 64b456429f67 'Collapsed revision | * move1 | * move2' o 1: 1352765a01d4 'change' | o 0: f447d5abf5ea 'add' $ hg rebase --collapse -r 1 -d 0 abort: cannot rebase changeset with children (use --keep to keep original changesets) [10] Test collapsing in place $ hg rebase --collapse -b . -d 0 rebasing 1:1352765a01d4 "change" rebasing 2:64b456429f67 tip "Collapsed revision" saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-rebase.hg $ hg st --change tip --copies M a M c A d a A g b R b $ hg up tip -q $ cat a a a $ cat c c c $ cat d a a $ cat g b b $ cd .. Test stripping a revision with another child $ hg init f $ cd f $ hg debugdrawdag << 'EOF' > C B > |/ > A > EOF $ hg heads --template="{rev}:{node} {branch}: {desc}\n" 2:dc0947a82db884575bb76ea10ac97b08536bfa03 default: C 1:112478962961147124edd43549aedd1a335e44bf default: B $ hg strip C saved backup bundle to $TESTTMP/f/.hg/strip-backup/dc0947a82db8-d21b92a4-backup.hg $ hg tglog o 1: 112478962961 'B' | o 0: 426bada5c675 'A' $ hg heads --template="{rev}:{node} {branch}: {desc}\n" 1:112478962961147124edd43549aedd1a335e44bf default: B $ cd .. Test collapsing changes that add then remove a file $ hg init collapseaddremove $ cd collapseaddremove $ touch base $ hg commit -Am base adding base $ touch a $ hg commit -Am a adding a $ hg rm a $ touch b $ hg commit -Am b adding b $ hg book foo $ hg rebase -d 0 -r "1::2" --collapse -m collapsed rebasing 1:6d8d9f24eec3 "a" rebasing 2:1cc73eca5ecc foo tip "b" saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-rebase.hg $ hg log -G --template "{rev}: '{desc}' {bookmarks}" @ 1: 'collapsed' foo | o 0: 'base' $ hg manifest --rev tip b base $ cd .. Test that rebase --collapse will remember message after running into merge conflict and invoking rebase --continue. $ hg init collapse_remember_message $ cd collapse_remember_message $ hg debugdrawdag << 'EOF' > C B # B/A = B\n > |/ # C/A = C\n > A > EOF $ hg rebase --collapse -m "new message" -b B -d C rebasing 1:81e5401e4d37 B "B" merging A warning: conflicts while merging A! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [240] $ rm A.orig $ hg resolve --mark A (no more unresolved files) continue: hg rebase --continue $ hg rebase --continue rebasing 1:81e5401e4d37 B "B" saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/81e5401e4d37-96c3dd30-rebase.hg $ hg log changeset: 2:17186933e123 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: new message changeset: 1:043039e9df84 tag: C user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: C changeset: 0:426bada5c675 tag: A user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: A $ cd .. Test aborted editor on final message $ HGMERGE=:merge3 $ export HGMERGE $ hg init aborted-editor $ cd aborted-editor $ hg debugdrawdag << 'EOF' > C # D/A = D\n > | # C/A = C\n > B D # B/A = B\n > |/ # A/A = A\n > A > EOF $ hg rebase --collapse -t internal:merge3 -s B -d D rebasing 1:f899f3910ce7 B "B" merging A warning: conflicts while merging A! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [240] $ hg tglog o 3: 63668d570d21 'C' | | @ 2: 82b8abf9c185 'D' | | % | 1: f899f3910ce7 'B' |/ o 0: 4a2df7238c3b 'A' $ cat A <<<<<<< dest: 82b8abf9c185 D - test: D D ||||||| base A ======= B >>>>>>> source: f899f3910ce7 B - test: B $ echo BC > A $ hg resolve -m (no more unresolved files) continue: hg rebase --continue $ hg rebase --continue rebasing 1:f899f3910ce7 B "B" rebasing 3:63668d570d21 C tip "C" merging A warning: conflicts while merging A! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [240] $ hg tglog % 3: 63668d570d21 'C' | | @ 2: 82b8abf9c185 'D' | | o | 1: f899f3910ce7 'B' |/ o 0: 4a2df7238c3b 'A' $ cat A <<<<<<< dest: 82b8abf9c185 D - test: D BC ||||||| base B ======= C >>>>>>> source: 63668d570d21 C tip - test: C $ echo BD > A $ hg resolve -m (no more unresolved files) continue: hg rebase --continue $ HGEDITOR=false hg rebase --continue --config ui.interactive=1 already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185 rebasing 3:63668d570d21 C tip "C" abort: edit failed: false exited with status 1 [250] $ hg tglog o 3: 63668d570d21 'C' | | @ 2: 82b8abf9c185 'D' | | o | 1: f899f3910ce7 'B' |/ o 0: 4a2df7238c3b 'A' $ hg rebase --continue already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185 already rebased 3:63668d570d21 C tip "C" as 82b8abf9c185 saved backup bundle to $TESTTMP/aborted-editor/.hg/strip-backup/f899f3910ce7-7cab5e15-rebase.hg