Mercurial > hg
comparison tests/test-phabricator.t @ 45772:294aab57a5f3
phabsend: use default one-line summary
This means that the `phabricator.node` and `phabricator.desc` color
configs will no longer be respected, but `log.changeset` and
`log.desc` will be respected instead.
Differential Revision: https://phab.mercurial-scm.org/D9254
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 27 Oct 2020 10:22:36 -0700 |
parents | 1a5d3e555c70 |
children | 9624bf057c2a |
comparison
equal
deleted
inserted
replaced
45771:f90a5c211251 | 45772:294aab57a5f3 |
---|---|
99 $ HGENCODING=utf-8; export HGENCODING | 99 $ HGENCODING=utf-8; export HGENCODING |
100 $ echo alpha > alpha | 100 $ echo alpha > alpha |
101 $ hg ci --addremove -m 'create alpha for phabricator test €' | 101 $ hg ci --addremove -m 'create alpha for phabricator test €' |
102 adding alpha | 102 adding alpha |
103 $ hg phabsend -r . --test-vcr "$VCR/phabsend-create-alpha.json" | 103 $ hg phabsend -r . --test-vcr "$VCR/phabsend-create-alpha.json" |
104 D7915 - created - d386117f30e6: create alpha for phabricator test \xe2\x82\xac (esc) | 104 D7915 - created - 0:d386117f30e6 tip "create alpha for phabricator test \xe2\x82\xac" (esc) |
105 new commits: ['347bf67801e5'] | 105 new commits: ['347bf67801e5'] |
106 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d386117f30e6-24ffe649-phabsend.hg | 106 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d386117f30e6-24ffe649-phabsend.hg |
107 $ echo more >> alpha | 107 $ echo more >> alpha |
108 $ HGEDITOR=true hg ci --amend | 108 $ HGEDITOR=true hg ci --amend |
109 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/347bf67801e5-3bf313e4-amend.hg | 109 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/347bf67801e5-3bf313e4-amend.hg |
110 $ echo beta > beta | 110 $ echo beta > beta |
111 $ hg ci --addremove -m 'create beta for phabricator test' | 111 $ hg ci --addremove -m 'create beta for phabricator test' |
112 adding beta | 112 adding beta |
113 $ hg phabsend -r ".^::" --test-vcr "$VCR/phabsend-update-alpha-create-beta.json" | 113 $ hg phabsend -r ".^::" --test-vcr "$VCR/phabsend-update-alpha-create-beta.json" |
114 c44b38f24a45 mapped to old nodes [] | 114 c44b38f24a45 mapped to old nodes [] |
115 D7915 - updated - c44b38f24a45: create alpha for phabricator test \xe2\x82\xac (esc) | 115 D7915 - updated - 0:c44b38f24a45 "create alpha for phabricator test \xe2\x82\xac" (esc) |
116 D7916 - created - 9e6901f21d5b: create beta for phabricator test | 116 D7916 - created - 1:9e6901f21d5b tip "create beta for phabricator test" |
117 new commits: ['a692622e6937'] | 117 new commits: ['a692622e6937'] |
118 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9e6901f21d5b-1fcd4f0e-phabsend.hg | 118 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9e6901f21d5b-1fcd4f0e-phabsend.hg |
119 $ unset HGENCODING | 119 $ unset HGENCODING |
120 | 120 |
121 The amend won't explode after posting a public commit. The local tag is left | 121 The amend won't explode after posting a public commit. The local tag is left |
125 $ hg ci -m 'create public change for phabricator testing' | 125 $ hg ci -m 'create public change for phabricator testing' |
126 $ hg phase --public . | 126 $ hg phase --public . |
127 $ echo 'draft change' > alpha | 127 $ echo 'draft change' > alpha |
128 $ hg ci -m 'create draft change for phabricator testing' | 128 $ hg ci -m 'create draft change for phabricator testing' |
129 $ hg phabsend --amend -r '.^::' --test-vcr "$VCR/phabsend-create-public.json" | 129 $ hg phabsend --amend -r '.^::' --test-vcr "$VCR/phabsend-create-public.json" |
130 D7917 - created - 7b4185ab5d16: create public change for phabricator testing | 130 D7917 - created - 2:7b4185ab5d16 "create public change for phabricator testing" |
131 D7918 - created - 251c1c333fc6: create draft change for phabricator testing | 131 D7918 - created - 3:251c1c333fc6 tip "create draft change for phabricator testing" |
132 warning: not updating public commit 2:7b4185ab5d16 | 132 warning: not updating public commit 2:7b4185ab5d16 |
133 new commits: ['3244dc4a3334'] | 133 new commits: ['3244dc4a3334'] |
134 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/251c1c333fc6-41cb7c3b-phabsend.hg | 134 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/251c1c333fc6-41cb7c3b-phabsend.hg |
135 $ hg tags -v | 135 $ hg tags -v |
136 tip 3:3244dc4a3334 | 136 tip 3:3244dc4a3334 |
173 Commenting when phabsending: | 173 Commenting when phabsending: |
174 $ echo comment > comment | 174 $ echo comment > comment |
175 $ hg ci --addremove -m "create comment for phabricator test" | 175 $ hg ci --addremove -m "create comment for phabricator test" |
176 adding comment | 176 adding comment |
177 $ hg phabsend -r . -m "For default branch" --test-vcr "$VCR/phabsend-comment-created.json" | 177 $ hg phabsend -r . -m "For default branch" --test-vcr "$VCR/phabsend-comment-created.json" |
178 D7919 - created - d5dddca9023d: create comment for phabricator test | 178 D7919 - created - 4:d5dddca9023d tip "create comment for phabricator test" |
179 new commits: ['f7db812bbe1d'] | 179 new commits: ['f7db812bbe1d'] |
180 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5dddca9023d-adf673ba-phabsend.hg | 180 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5dddca9023d-adf673ba-phabsend.hg |
181 $ echo comment2 >> comment | 181 $ echo comment2 >> comment |
182 $ hg ci --amend | 182 $ hg ci --amend |
183 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f7db812bbe1d-8fcded77-amend.hg | 183 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f7db812bbe1d-8fcded77-amend.hg |
184 $ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json" | 184 $ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json" |
185 1849d7828727 mapped to old nodes [] | 185 1849d7828727 mapped to old nodes [] |
186 D7919 - updated - 1849d7828727: create comment for phabricator test | 186 D7919 - updated - 4:1849d7828727 tip "create comment for phabricator test" |
187 | 187 |
188 Phabsending a skipped commit: | 188 Phabsending a skipped commit: |
189 $ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json" | 189 $ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json" |
190 1849d7828727 mapped to old nodes ['1849d7828727'] | 190 1849d7828727 mapped to old nodes ['1849d7828727'] |
191 D7919 - skipped - 1849d7828727: create comment for phabricator test | 191 D7919 - skipped - 4:1849d7828727 tip "create comment for phabricator test" |
192 | 192 |
193 Phabsend doesn't create an instability when restacking existing revisions on top | 193 Phabsend doesn't create an instability when restacking existing revisions on top |
194 of new revisions. | 194 of new revisions. |
195 | 195 |
196 $ hg init reorder | 196 $ hg init reorder |
208 $ echo "mod1" > file1.txt | 208 $ echo "mod1" > file1.txt |
209 $ hg ci -m 'modified 1' | 209 $ hg ci -m 'modified 1' |
210 $ echo "mod2" > file1.txt | 210 $ echo "mod2" > file1.txt |
211 $ hg ci -m 'modified 2' | 211 $ hg ci -m 'modified 2' |
212 $ hg phabsend -r . --test-vcr "$VCR/phabsend-add-parent-setup.json" | 212 $ hg phabsend -r . --test-vcr "$VCR/phabsend-add-parent-setup.json" |
213 D8433 - created - 5d3959e20d1d: modified 2 | 213 D8433 - created - 2:5d3959e20d1d tip "modified 2" |
214 new commits: ['2b4aa8a88d61'] | 214 new commits: ['2b4aa8a88d61'] |
215 $ hg log -G -T compact | 215 $ hg log -G -T compact |
216 @ 3[tip]:1 2b4aa8a88d61 1970-01-01 00:00 +0000 test | 216 @ 3[tip]:1 2b4aa8a88d61 1970-01-01 00:00 +0000 test |
217 | modified 2 | 217 | modified 2 |
218 | | 218 | |
229 $ hg ci -m 'modified 3' | 229 $ hg ci -m 'modified 3' |
230 created new head | 230 created new head |
231 $ hg up -q 3 | 231 $ hg up -q 3 |
232 $ hg phabsend -r ".^ + ." --test-vcr "$VCR/phabsend-add-parent.json" | 232 $ hg phabsend -r ".^ + ." --test-vcr "$VCR/phabsend-add-parent.json" |
233 2b4aa8a88d61 mapped to old nodes ['2b4aa8a88d61'] | 233 2b4aa8a88d61 mapped to old nodes ['2b4aa8a88d61'] |
234 D8434 - created - d549263bcb2d: modified 1 | 234 D8434 - created - 1:d549263bcb2d "modified 1" |
235 D8433 - updated - 2b4aa8a88d61: modified 2 | 235 D8433 - updated - 3:2b4aa8a88d61 "modified 2" |
236 new commits: ['876a60d024de'] | 236 new commits: ['876a60d024de'] |
237 new commits: ['0c6523cb1d0f'] | 237 new commits: ['0c6523cb1d0f'] |
238 restabilizing 1eda4bf55021 as d2c78c3a3e01 | 238 restabilizing 1eda4bf55021 as d2c78c3a3e01 |
239 $ hg log -G -T compact | 239 $ hg log -G -T compact |
240 o 7[tip]:5 d2c78c3a3e01 1970-01-01 00:00 +0000 test | 240 o 7[tip]:5 d2c78c3a3e01 1970-01-01 00:00 +0000 test |
311 Don't restack existing orphans | 311 Don't restack existing orphans |
312 | 312 |
313 $ hg phabsend -r 5::tip --test-vcr "$VCR/phabsend-no-restack-orphan.json" | 313 $ hg phabsend -r 5::tip --test-vcr "$VCR/phabsend-no-restack-orphan.json" |
314 876a60d024de mapped to old nodes ['876a60d024de'] | 314 876a60d024de mapped to old nodes ['876a60d024de'] |
315 0c6523cb1d0f mapped to old nodes ['0c6523cb1d0f'] | 315 0c6523cb1d0f mapped to old nodes ['0c6523cb1d0f'] |
316 D8434 - updated - 876a60d024de: modified 1 | 316 D8434 - updated - 5:876a60d024de "modified 1" |
317 D8433 - updated - 0c6523cb1d0f: modified 2 | 317 D8433 - updated - 6:0c6523cb1d0f "modified 2" |
318 D8435 - created - 082be6c94150: modified A | 318 D8435 - created - 10:082be6c94150 tip "modified A" |
319 new commits: ['b5913193c805'] | 319 new commits: ['b5913193c805'] |
320 not restabilizing unchanged d2c78c3a3e01 | 320 not restabilizing unchanged d2c78c3a3e01 |
321 $ hg log -G | 321 $ hg log -G |
322 @ changeset: 11:b5913193c805 | 322 @ changeset: 11:b5913193c805 |
323 | tag: tip | 323 | tag: tip |
372 $ hg ci -m 'modify binary' | 372 $ hg ci -m 'modify binary' |
373 $ hg rm bin | 373 $ hg rm bin |
374 $ hg ci -m 'remove binary' | 374 $ hg ci -m 'remove binary' |
375 $ hg phabsend -r .~2:: --test-vcr "$VCR/phabsend-binary.json" | 375 $ hg phabsend -r .~2:: --test-vcr "$VCR/phabsend-binary.json" |
376 uploading bin@aa24a81f55de | 376 uploading bin@aa24a81f55de |
377 D8007 - created - aa24a81f55de: add binary | 377 D8007 - created - 5:aa24a81f55de "add binary" |
378 uploading bin@d8d62a881b54 | 378 uploading bin@d8d62a881b54 |
379 D8008 - created - d8d62a881b54: modify binary | 379 D8008 - created - 6:d8d62a881b54 "modify binary" |
380 D8009 - created - af55645b2e29: remove binary | 380 D8009 - created - 7:af55645b2e29 tip "remove binary" |
381 new commits: ['b8139fbb4a57'] | 381 new commits: ['b8139fbb4a57'] |
382 new commits: ['c88ce4c2d2ad'] | 382 new commits: ['c88ce4c2d2ad'] |
383 new commits: ['75dbbc901145'] | 383 new commits: ['75dbbc901145'] |
384 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/aa24a81f55de-a3a0cf24-phabsend.hg | 384 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/aa24a81f55de-a3a0cf24-phabsend.hg |
385 | 385 |
419 >>> open('bin2_moved', 'wb').write(b'\0copy src+mod') and None | 419 >>> open('bin2_moved', 'wb').write(b'\0copy src+mod') and None |
420 $ hg ci -m "copy+mod moved binary" | 420 $ hg ci -m "copy+mod moved binary" |
421 | 421 |
422 $ hg phabsend -r .~4:: --test-vcr "$VCR/phabsend-binary-renames.json" | 422 $ hg phabsend -r .~4:: --test-vcr "$VCR/phabsend-binary-renames.json" |
423 uploading bin2@f42f9195e00c | 423 uploading bin2@f42f9195e00c |
424 D8128 - created - f42f9195e00c: add another binary | 424 D8128 - created - 8:f42f9195e00c "add another binary" |
425 D8129 - created - 834ab31d80ae: moved binary | 425 D8129 - created - 9:834ab31d80ae "moved binary" |
426 D8130 - created - 494b750e5194: copied binary | 426 D8130 - created - 10:494b750e5194 "copied binary" |
427 uploading bin2_moved_again@25f766b50cc2 | 427 uploading bin2_moved_again@25f766b50cc2 |
428 D8131 - created - 25f766b50cc2: move+mod copied binary | 428 D8131 - created - 11:25f766b50cc2 "move+mod copied binary" |
429 uploading bin2_moved_copied@1b87b363a5e4 | 429 uploading bin2_moved_copied@1b87b363a5e4 |
430 uploading bin2_moved@1b87b363a5e4 | 430 uploading bin2_moved@1b87b363a5e4 |
431 D8132 - created - 1b87b363a5e4: copy+mod moved binary | 431 D8132 - created - 12:1b87b363a5e4 tip "copy+mod moved binary" |
432 new commits: ['90437c20312a'] | 432 new commits: ['90437c20312a'] |
433 new commits: ['f391f4da4c61'] | 433 new commits: ['f391f4da4c61'] |
434 new commits: ['da86a9f3268c'] | 434 new commits: ['da86a9f3268c'] |
435 new commits: ['003ffc16ba66'] | 435 new commits: ['003ffc16ba66'] |
436 new commits: ['13bd750c36fa'] | 436 new commits: ['13bd750c36fa'] |
660 | 660 |
661 The folding of immutable commits works... | 661 The folding of immutable commits works... |
662 | 662 |
663 $ hg phase -r tip --public | 663 $ hg phase -r tip --public |
664 $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-immutable.json" | 664 $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-immutable.json" |
665 D8386 - created - a959a3f69d8d: one: first commit to review | 665 D8386 - created - 1:a959a3f69d8d "one: first commit to review" |
666 D8386 - created - 24a4438154ba: two: second commit to review | 666 D8386 - created - 2:24a4438154ba "two: second commit to review" |
667 D8386 - created - d235829e802c: 3: a commit with no detailed message | 667 D8386 - created - 3:d235829e802c tip "3: a commit with no detailed message" |
668 warning: not updating public commit 1:a959a3f69d8d | 668 warning: not updating public commit 1:a959a3f69d8d |
669 warning: not updating public commit 2:24a4438154ba | 669 warning: not updating public commit 2:24a4438154ba |
670 warning: not updating public commit 3:d235829e802c | 670 warning: not updating public commit 3:d235829e802c |
671 no newnodes to update | 671 no newnodes to update |
672 | 672 |
674 | 674 |
675 ... as does the initial mutable fold... | 675 ... as does the initial mutable fold... |
676 | 676 |
677 $ echo y | hg phabsend --fold --confirm -r 1:: \ | 677 $ echo y | hg phabsend --fold --confirm -r 1:: \ |
678 > --test-vcr "$VCR/phabsend-fold-initial.json" | 678 > --test-vcr "$VCR/phabsend-fold-initial.json" |
679 NEW - a959a3f69d8d: one: first commit to review | 679 NEW - 1:a959a3f69d8d "one: first commit to review" |
680 NEW - 24a4438154ba: two: second commit to review | 680 NEW - 2:24a4438154ba "two: second commit to review" |
681 NEW - d235829e802c: 3: a commit with no detailed message | 681 NEW - 3:d235829e802c tip "3: a commit with no detailed message" |
682 Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y | 682 Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y |
683 D8387 - created - a959a3f69d8d: one: first commit to review | 683 D8387 - created - 1:a959a3f69d8d "one: first commit to review" |
684 D8387 - created - 24a4438154ba: two: second commit to review | 684 D8387 - created - 2:24a4438154ba "two: second commit to review" |
685 D8387 - created - d235829e802c: 3: a commit with no detailed message | 685 D8387 - created - 3:d235829e802c tip "3: a commit with no detailed message" |
686 updating local commit list for D8387 | 686 updating local commit list for D8387 |
687 new commits: ['602c4e738243', '832553266fe8', '921f8265efbd'] | 687 new commits: ['602c4e738243', '832553266fe8', '921f8265efbd'] |
688 saved backup bundle to $TESTTMP/folded/.hg/strip-backup/a959a3f69d8d-a4a24136-phabsend.hg | 688 saved backup bundle to $TESTTMP/folded/.hg/strip-backup/a959a3f69d8d-a4a24136-phabsend.hg |
689 | 689 |
690 ... and doesn't mangle the local commits. | 690 ... and doesn't mangle the local commits. |
726 1 new orphan changesets | 726 1 new orphan changesets |
727 $ hg up 3 | 727 $ hg up 3 |
728 obsolete feature not enabled but 1 markers found! | 728 obsolete feature not enabled but 1 markers found! |
729 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 729 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
730 $ hg rebase --config experimental.evolution=all --config extensions.rebase= | 730 $ hg rebase --config experimental.evolution=all --config extensions.rebase= |
731 note: not rebasing 2:832553266fe8 "two: second commit to review", already in destination as 4:0124e5474c88 "two: second commit to review" (tip) | 731 note: not rebasing 2:832553266fe8 "two: second commit to review", already in destination as 4:0124e5474c88 tip "two: second commit to review" |
732 rebasing 3:921f8265efbd "3: a commit with no detailed message" | 732 rebasing 3:921f8265efbd "3: a commit with no detailed message" |
733 | 733 |
734 When commits have changed locally, the local commit list on Phabricator is | 734 When commits have changed locally, the local commit list on Phabricator is |
735 updated. | 735 updated. |
736 | 736 |
738 > --test-vcr "$VCR/phabsend-fold-updated.json" | 738 > --test-vcr "$VCR/phabsend-fold-updated.json" |
739 obsolete feature not enabled but 2 markers found! | 739 obsolete feature not enabled but 2 markers found! |
740 602c4e738243 mapped to old nodes ['602c4e738243'] | 740 602c4e738243 mapped to old nodes ['602c4e738243'] |
741 0124e5474c88 mapped to old nodes ['832553266fe8'] | 741 0124e5474c88 mapped to old nodes ['832553266fe8'] |
742 e4edb1fe3565 mapped to old nodes ['921f8265efbd'] | 742 e4edb1fe3565 mapped to old nodes ['921f8265efbd'] |
743 D8387 - 602c4e738243: one: first commit to review | 743 D8387 - 1:602c4e738243 "one: first commit to review" |
744 D8387 - 0124e5474c88: two: second commit to review | 744 D8387 - 4:0124e5474c88 "two: second commit to review" |
745 D8387 - e4edb1fe3565: 3: a commit with no detailed message | 745 D8387 - 5:e4edb1fe3565 tip "3: a commit with no detailed message" |
746 Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y | 746 Send the above changes to https://phab.mercurial-scm.org/ (Y/n)? y |
747 D8387 - updated - 602c4e738243: one: first commit to review | 747 D8387 - updated - 1:602c4e738243 "one: first commit to review" |
748 D8387 - updated - 0124e5474c88: two: second commit to review | 748 D8387 - updated - 4:0124e5474c88 "two: second commit to review" |
749 D8387 - updated - e4edb1fe3565: 3: a commit with no detailed message | 749 D8387 - updated - 5:e4edb1fe3565 tip "3: a commit with no detailed message" |
750 obsolete feature not enabled but 2 markers found! (?) | 750 obsolete feature not enabled but 2 markers found! (?) |
751 updating local commit list for D8387 | 751 updating local commit list for D8387 |
752 new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565'] | 752 new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565'] |
753 $ hg log -Tcompact | 753 $ hg log -Tcompact |
754 obsolete feature not enabled but 2 markers found! | 754 obsolete feature not enabled but 2 markers found! |
770 $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-no-changes.json" | 770 $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-no-changes.json" |
771 obsolete feature not enabled but 2 markers found! | 771 obsolete feature not enabled but 2 markers found! |
772 602c4e738243 mapped to old nodes ['602c4e738243'] | 772 602c4e738243 mapped to old nodes ['602c4e738243'] |
773 0124e5474c88 mapped to old nodes ['0124e5474c88'] | 773 0124e5474c88 mapped to old nodes ['0124e5474c88'] |
774 e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] | 774 e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] |
775 D8387 - updated - 602c4e738243: one: first commit to review | 775 D8387 - updated - 1:602c4e738243 "one: first commit to review" |
776 D8387 - updated - 0124e5474c88: two: second commit to review | 776 D8387 - updated - 4:0124e5474c88 "two: second commit to review" |
777 D8387 - updated - e4edb1fe3565: 3: a commit with no detailed message | 777 D8387 - updated - 5:e4edb1fe3565 tip "3: a commit with no detailed message" |
778 obsolete feature not enabled but 2 markers found! (?) | 778 obsolete feature not enabled but 2 markers found! (?) |
779 local commit list for D8387 is already up-to-date | 779 local commit list for D8387 is already up-to-date |
780 $ hg log -Tcompact | 780 $ hg log -Tcompact |
781 obsolete feature not enabled but 2 markers found! | 781 obsolete feature not enabled but 2 markers found! |
782 5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test | 782 5[tip] e4edb1fe3565 1970-01-01 00:00 +0000 test |
799 $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-extend-end.json" \ | 799 $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-extend-end.json" \ |
800 > --config experimental.evolution=all | 800 > --config experimental.evolution=all |
801 602c4e738243 mapped to old nodes ['602c4e738243'] | 801 602c4e738243 mapped to old nodes ['602c4e738243'] |
802 0124e5474c88 mapped to old nodes ['0124e5474c88'] | 802 0124e5474c88 mapped to old nodes ['0124e5474c88'] |
803 e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] | 803 e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] |
804 D8387 - updated - 602c4e738243: one: first commit to review | 804 D8387 - updated - 1:602c4e738243 "one: first commit to review" |
805 D8387 - updated - 0124e5474c88: two: second commit to review | 805 D8387 - updated - 4:0124e5474c88 "two: second commit to review" |
806 D8387 - updated - e4edb1fe3565: 3: a commit with no detailed message | 806 D8387 - updated - 5:e4edb1fe3565 "3: a commit with no detailed message" |
807 D8387 - created - 94aaae213b23: four: extend the fold range | 807 D8387 - created - 6:94aaae213b23 tip "four: extend the fold range" |
808 updating local commit list for D8387 | 808 updating local commit list for D8387 |
809 new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565', '51a04fea8707'] | 809 new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565', '51a04fea8707'] |
810 $ hg log -r . -T '{desc}\n' | 810 $ hg log -r . -T '{desc}\n' |
811 four: extend the fold range | 811 four: extend the fold range |
812 | 812 |
830 > --config experimental.evolution=all | 830 > --config experimental.evolution=all |
831 602c4e738243 mapped to old nodes ['602c4e738243'] | 831 602c4e738243 mapped to old nodes ['602c4e738243'] |
832 0124e5474c88 mapped to old nodes ['0124e5474c88'] | 832 0124e5474c88 mapped to old nodes ['0124e5474c88'] |
833 e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] | 833 e4edb1fe3565 mapped to old nodes ['e4edb1fe3565'] |
834 51a04fea8707 mapped to old nodes ['51a04fea8707'] | 834 51a04fea8707 mapped to old nodes ['51a04fea8707'] |
835 D8388 - created - 98d480e0d494: added file | 835 D8388 - created - 0:98d480e0d494 "added file" |
836 D8388 - updated - 602c4e738243: one: first commit to review | 836 D8388 - updated - 1:602c4e738243 "one: first commit to review" |
837 D8388 - updated - 0124e5474c88: two: second commit to review | 837 D8388 - updated - 4:0124e5474c88 "two: second commit to review" |
838 D8388 - updated - e4edb1fe3565: 3: a commit with no detailed message | 838 D8388 - updated - 5:e4edb1fe3565 "3: a commit with no detailed message" |
839 D8388 - updated - 51a04fea8707: four: extend the fold range | 839 D8388 - updated - 7:51a04fea8707 tip "four: extend the fold range" |
840 updating local commit list for D8388 | 840 updating local commit list for D8388 |
841 new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'ac7db67f0991'] | 841 new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'ac7db67f0991'] |
842 | 842 |
843 $ hg log -T '{rev}:{node|short}\n{indent(desc, " ")}\n' | 843 $ hg log -T '{rev}:{node|short}\n{indent(desc, " ")}\n' |
844 obsolete feature not enabled but 8 markers found! | 844 obsolete feature not enabled but 8 markers found! |
923 6320b7d714cf mapped to old nodes ['6320b7d714cf'] | 923 6320b7d714cf mapped to old nodes ['6320b7d714cf'] |
924 3ee132d41dbc mapped to old nodes ['3ee132d41dbc'] | 924 3ee132d41dbc mapped to old nodes ['3ee132d41dbc'] |
925 30682b960804 mapped to old nodes ['30682b960804'] | 925 30682b960804 mapped to old nodes ['30682b960804'] |
926 6bc15dc99efd mapped to old nodes ['ac7db67f0991'] | 926 6bc15dc99efd mapped to old nodes ['ac7db67f0991'] |
927 b50946d5e490 mapped to old nodes ['ac7db67f0991'] | 927 b50946d5e490 mapped to old nodes ['ac7db67f0991'] |
928 D8388 - updated - 15e9b14b4b4c: added file | 928 D8388 - updated - 8:15e9b14b4b4c "added file" |
929 D8388 - updated - 6320b7d714cf: one: first commit to review | 929 D8388 - updated - 9:6320b7d714cf "one: first commit to review" |
930 D8388 - updated - 3ee132d41dbc: two: second commit to review | 930 D8388 - updated - 10:3ee132d41dbc "two: second commit to review" |
931 D8388 - updated - 30682b960804: 3: a commit with no detailed message | 931 D8388 - updated - 11:30682b960804 "3: a commit with no detailed message" |
932 D8388 - updated - 6bc15dc99efd: four: extend the fold range | 932 D8388 - updated - 14:6bc15dc99efd "four: extend the fold range" |
933 D8388 - updated - b50946d5e490: four: extend the fold range | 933 D8388 - updated - 15:b50946d5e490 tip "four: extend the fold range" |
934 updating local commit list for D8388 | 934 updating local commit list for D8388 |
935 new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', '6bc15dc99efd', 'b50946d5e490'] | 935 new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', '6bc15dc99efd', 'b50946d5e490'] |
936 | 936 |
937 Test phabsend --fold with an `hg fold` at the end of the range | 937 Test phabsend --fold with an `hg fold` at the end of the range |
938 | 938 |
939 $ hg --config experimental.evolution=all --config extensions.rebase= \ | 939 $ hg --config experimental.evolution=all --config extensions.rebase= \ |
940 > rebase -r '.^' -r . -d '.^^' --collapse -l log.txt | 940 > rebase -r '.^' -r . -d '.^^' --collapse -l log.txt |
941 rebasing 14:6bc15dc99efd "four: extend the fold range" | 941 rebasing 14:6bc15dc99efd "four: extend the fold range" |
942 rebasing 15:b50946d5e490 "four: extend the fold range" (tip) | 942 rebasing 15:b50946d5e490 tip "four: extend the fold range" |
943 | 943 |
944 $ hg phabsend --fold -r 8:: --test-vcr "$VCR/phabsend-fold-fold-end.json" \ | 944 $ hg phabsend --fold -r 8:: --test-vcr "$VCR/phabsend-fold-fold-end.json" \ |
945 > --config experimental.evolution=all | 945 > --config experimental.evolution=all |
946 15e9b14b4b4c mapped to old nodes ['15e9b14b4b4c'] | 946 15e9b14b4b4c mapped to old nodes ['15e9b14b4b4c'] |
947 6320b7d714cf mapped to old nodes ['6320b7d714cf'] | 947 6320b7d714cf mapped to old nodes ['6320b7d714cf'] |
948 3ee132d41dbc mapped to old nodes ['3ee132d41dbc'] | 948 3ee132d41dbc mapped to old nodes ['3ee132d41dbc'] |
949 30682b960804 mapped to old nodes ['30682b960804'] | 949 30682b960804 mapped to old nodes ['30682b960804'] |
950 e919cdf3d4fe mapped to old nodes ['6bc15dc99efd', 'b50946d5e490'] | 950 e919cdf3d4fe mapped to old nodes ['6bc15dc99efd', 'b50946d5e490'] |
951 D8388 - updated - 15e9b14b4b4c: added file | 951 D8388 - updated - 8:15e9b14b4b4c "added file" |
952 D8388 - updated - 6320b7d714cf: one: first commit to review | 952 D8388 - updated - 9:6320b7d714cf "one: first commit to review" |
953 D8388 - updated - 3ee132d41dbc: two: second commit to review | 953 D8388 - updated - 10:3ee132d41dbc "two: second commit to review" |
954 D8388 - updated - 30682b960804: 3: a commit with no detailed message | 954 D8388 - updated - 11:30682b960804 "3: a commit with no detailed message" |
955 D8388 - updated - e919cdf3d4fe: four: extend the fold range | 955 D8388 - updated - 16:e919cdf3d4fe tip "four: extend the fold range" |
956 updating local commit list for D8388 | 956 updating local commit list for D8388 |
957 new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'e919cdf3d4fe'] | 957 new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'e919cdf3d4fe'] |
958 | 958 |
959 $ hg log -r tip -v | 959 $ hg log -r tip -v |
960 obsolete feature not enabled but 12 markers found! | 960 obsolete feature not enabled but 12 markers found! |
985 $ hg ci -m '133c1c6c6449 is my parent (generate test for phabsend)' | 985 $ hg ci -m '133c1c6c6449 is my parent (generate test for phabsend)' |
986 $ echo 'even more content' > file.txt | 986 $ echo 'even more content' > file.txt |
987 $ hg ci -m 'c2874a398f7e is my parent (generate test for phabsend)' | 987 $ hg ci -m 'c2874a398f7e is my parent (generate test for phabsend)' |
988 | 988 |
989 $ hg phabsend -r 17::18 --test-vcr "$VCR/phabsend-hash-fixes.json" | 989 $ hg phabsend -r 17::18 --test-vcr "$VCR/phabsend-hash-fixes.json" |
990 D8945 - created - 133c1c6c6449: base review (generate test for phabsend) | 990 D8945 - created - 17:133c1c6c6449 "base review (generate test for phabsend)" |
991 D8946 - created - c2874a398f7e: 133c1c6c6449 is my parent (generate test for phabsend) | 991 D8946 - created - 18:c2874a398f7e "133c1c6c6449 is my parent (generate test for phabsend)" |
992 new commits: ['f444f060f4d6'] | 992 new commits: ['f444f060f4d6'] |
993 new commits: ['9c9290f945b1'] | 993 new commits: ['9c9290f945b1'] |
994 restabilizing 1528c12fa2e4 as b28b20212bd4 | 994 restabilizing 1528c12fa2e4 as b28b20212bd4 |
995 | 995 |
996 $ hg log -l 3 -Tcompact | 996 $ hg log -l 3 -Tcompact |