Details
Details
Diff Detail
Diff Detail
- Repository
- rFBHGX Facebook Mercurial Extensions
- Lint
Lint Skipped - Unit
Unit Tests Skipped
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D41
tests: adjust for new messages coming from the strip transactionClosedPublic
tests: adjust for new messages coming from the strip transaction
ClosedPublic
Authored by mitrandir on Jul 11 2017, 12:12 PM.
Revision Contents
Revision Contents
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-dirsync.t (2 lines) | |||
| M | tests/test-fbamend.t (8 lines) |
Diff 57
Diff 57
tests/test-dirsync.t
| committing manifest | committing manifest | ||||
| committing changelog | committing changelog | ||||
| copying changeset 32cbac0ffaa1 to 4cc69952853e | copying changeset 32cbac0ffaa1 to 4cc69952853e | ||||
| committing files: | committing files: | ||||
| dir1/b | dir1/b | ||||
| dir2/subdir/b | dir2/subdir/b | ||||
| committing manifest | committing manifest | ||||
| committing changelog | committing changelog | ||||
| stripping intermediate changeset 32cbac0ffaa1 | |||||
| stripping amended changeset a6e4f018e982 | |||||
| 2 changesets found | 2 changesets found | ||||
| uncompressed size of bundle content: | uncompressed size of bundle content: | ||||
| 468 (changelog) | 468 (changelog) | ||||
| 442 (manifests) | 442 (manifests) | ||||
| 317 dir1/b | 317 dir1/b | ||||
| 331 dir2/subdir/b | 331 dir2/subdir/b | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a6e4f018e982-f4dc39cf-amend.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a6e4f018e982-f4dc39cf-amend.hg (glob) | ||||
| 1 changesets found | 1 changesets found | ||||
tests/test-fbamend.t
| $ hg commit -m 'aa' | $ hg commit -m 'aa' | ||||
| $ echo b >> b | $ echo b >> b | ||||
| $ hg add b | $ hg add b | ||||
| $ hg commit -m 'b' | $ hg commit -m 'b' | ||||
| $ hg up ".^" | $ hg up ".^" | ||||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ echo a >> a | $ echo a >> a | ||||
| $ hg amend | $ hg amend | ||||
| warning: orphaned descendants detected, not stripping 86cf3bb05fcf | |||||
| warning: the changeset's children were left behind | warning: the changeset's children were left behind | ||||
| (use 'hg restack' to rebase them) | (use 'hg restack' to rebase them) | ||||
| $ hg up 0 | $ hg up 0 | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ echo x >> x | $ echo x >> x | ||||
| $ hg commit -Am 'extra commit to test multiple heads' | $ hg commit -Am 'extra commit to test multiple heads' | ||||
| adding x | adding x | ||||
| created new head | created new head | ||||
| $ hg up 3 | $ hg up 3 | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ hg amend --fixup | $ hg amend --fixup | ||||
| rebasing the children of 34414ab6546d.preamend | rebasing the children of 34414ab6546d.preamend | ||||
| rebasing 2:a764265b74cf "b" | rebasing 2:a764265b74cf "b" | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a764265b74cf-c5eef4f8-rebase.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a764265b74cf-c5eef4f8-rebase.hg (glob) | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/86cf3bb05fcf-36a6cbd7-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/86cf3bb05fcf-36a6cbd7-preamend-backup.hg (glob) | ||||
| $ echo a >> a | $ echo a >> a | ||||
| $ hg amend --rebase | $ hg amend --rebase | ||||
| warning: orphaned descendants detected, not stripping 34414ab6546d | |||||
| rebasing the children of 7817096bf624.preamend | rebasing the children of 7817096bf624.preamend | ||||
| rebasing 3:e1c831172263 "b" | rebasing 3:e1c831172263 "b" | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/e1c831172263-eee3b8f6-rebase.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/e1c831172263-eee3b8f6-rebase.hg (glob) | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/34414ab6546d-72d06a8e-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/34414ab6546d-72d06a8e-preamend-backup.hg (glob) | ||||
| Test that current bookmark is maintained | Test that current bookmark is maintained | ||||
| $ hg bookmark bm | $ hg bookmark bm | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| * bm 2:7817096bf624 | * bm 2:7817096bf624 | ||||
| $ echo a >> a | $ echo a >> a | ||||
| $ hg amend --rebase | $ hg amend --rebase | ||||
| warning: orphaned descendants detected, not stripping 7817096bf624 | |||||
| rebasing the children of bm.preamend | rebasing the children of bm.preamend | ||||
| rebasing 3:1e390e3ec656 "b" | rebasing 3:1e390e3ec656 "b" | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/1e390e3ec656-8362bab7-rebase.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/1e390e3ec656-8362bab7-rebase.hg (glob) | ||||
| saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7817096bf624-d72fddeb-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7817096bf624-d72fddeb-preamend-backup.hg (glob) | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| * bm 2:7635008c16e1 | * bm 2:7635008c16e1 | ||||
| Set up education | Set up education | ||||
| $ echo "[fbamend]" >> $HGRCPATH | $ echo "[fbamend]" >> $HGRCPATH | ||||
| $ echo "education = user education" >> $HGRCPATH | $ echo "education = user education" >> $HGRCPATH | ||||
| $ echo " second line" >> $HGRCPATH | $ echo " second line" >> $HGRCPATH | ||||
| $ echo "" >> $HGRCPATH | $ echo "" >> $HGRCPATH | ||||
| Test that bookmarked re-amends work well | Test that bookmarked re-amends work well | ||||
| $ echo a >> a | $ echo a >> a | ||||
| $ hg amend | $ hg amend | ||||
| warning: orphaned descendants detected, not stripping 7635008c16e1 | |||||
| user education | user education | ||||
| second line | second line | ||||
| warning: the changeset's children were left behind | warning: the changeset's children were left behind | ||||
| (use 'hg restack' to rebase them) | (use 'hg restack' to rebase them) | ||||
| $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | ||||
| @ edf5fd2f5332 aa bm | @ edf5fd2f5332 aa bm | ||||
| | | | | ||||
| | o 2d6884e15790 b | | o 2d6884e15790 b | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| * bm 2:0889a0030a17 | * bm 2:0889a0030a17 | ||||
| Test that unbookmarked re-amends work well | Test that unbookmarked re-amends work well | ||||
| $ hg boo -d bm | $ hg boo -d bm | ||||
| $ echo a >> a | $ echo a >> a | ||||
| $ hg amend | $ hg amend | ||||
| warning: orphaned descendants detected, not stripping 0889a0030a17 | |||||
| user education | user education | ||||
| second line | second line | ||||
| warning: the changeset's children were left behind | warning: the changeset's children were left behind | ||||
| (use 'hg restack' to rebase them) | (use 'hg restack' to rebase them) | ||||
| $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | ||||
| @ 94eb429c9465 aa | @ 94eb429c9465 aa | ||||
| | | | | ||||
| | o 6ba7926ba204 b | | o 6ba7926ba204 b | ||||
| > x echo amending from exec | > x echo amending from exec | ||||
| > x hg commit --amend -m 'message from exec' | > x hg commit --amend -m 'message from exec' | ||||
| > stop 455e4104f605 | > stop 455e4104f605 | ||||
| > pick 765b28efbe8b | > pick 765b28efbe8b | ||||
| > EOF | > EOF | ||||
| 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
| amending from exec | amending from exec | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| warning: orphaned descendants detected, not stripping 83455f1f6049 | |||||
| warning: the changeset's children were left behind | warning: the changeset's children were left behind | ||||
| (this is okay since a histedit is in progress) | (this is okay since a histedit is in progress) | ||||
| Changes commited as a2329fab3fab. You may amend the changeset now. | Changes commited as a2329fab3fab. You may amend the changeset now. | ||||
| When you are done, run hg histedit --continue to resume | When you are done, run hg histedit --continue to resume | ||||
| [1] | [1] | ||||
| $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | $ hg log -G -T '{node|short} {desc} {bookmarks}\n' | ||||
| @ a2329fab3fab b | @ a2329fab3fab b | ||||
| | | | | ||||
| | | | | ||||
| o 7c3bad9141dc add b | o 7c3bad9141dc add b | ||||
| | | | | ||||
| o 1f0dee641bb7 add a | o 1f0dee641bb7 add a | ||||
| $ hg up ".^" -q | $ hg up ".^" -q | ||||
| $ echo "hello" > b | $ echo "hello" > b | ||||
| $ hg amend | $ hg amend | ||||
| warning: orphaned descendants detected, not stripping 7c3bad9141dc | |||||
| user education | user education | ||||
| second line | second line | ||||
| warning: the changeset's children were left behind | warning: the changeset's children were left behind | ||||
| (use 'hg restack' to rebase them) | (use 'hg restack' to rebase them) | ||||
| $ hg amend --fixup | $ hg amend --fixup | ||||
| rebasing the children of f2d4abddbbcd.preamend | rebasing the children of f2d4abddbbcd.preamend | ||||
| rebasing 2:4538525df7e2 "add c" | rebasing 2:4538525df7e2 "add c" | ||||
| saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/4538525df7e2-0bcb0716-rebase.hg (glob) | saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/4538525df7e2-0bcb0716-rebase.hg (glob) | ||||
| saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/7c3bad9141dc-81844e36-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/7c3bad9141dc-81844e36-preamend-backup.hg (glob) | ||||
| $ hg log --template '{node|short} {desc}' --graph | $ hg log --template '{node|short} {desc}' --graph | ||||
| o 084836c39cc1 add c | o 084836c39cc1 add c | ||||
| | | | | ||||
| @ f2d4abddbbcd add b | @ f2d4abddbbcd add b | ||||
| | | | | ||||
| o 1f0dee641bb7 add a | o 1f0dee641bb7 add a | ||||
| $ hg up tip | $ hg up tip | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ mkcommit d | $ mkcommit d | ||||
| $ hg up ".^" -q | $ hg up ".^" -q | ||||
| $ echo "hello" > c | $ echo "hello" > c | ||||
| $ hg amend --rebase | $ hg amend --rebase | ||||
| warning: orphaned descendants detected, not stripping 084836c39cc1 | |||||
| rebasing the children of 6d41fcaa1aa4.preamend | rebasing the children of 6d41fcaa1aa4.preamend | ||||
| rebasing 3:3a033d20b13a "add d" | rebasing 3:3a033d20b13a "add d" | ||||
| saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/3a033d20b13a-c275a49d-rebase.hg (glob) | saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/3a033d20b13a-c275a49d-rebase.hg (glob) | ||||
| saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/084836c39cc1-e86e0471-preamend-backup.hg (glob) | saved backup bundle to $TESTTMP/inhibitrepo/.hg/strip-backup/084836c39cc1-e86e0471-preamend-backup.hg (glob) | ||||
| $ hg log --template '{node|short} {desc}' --graph | $ hg log --template '{node|short} {desc}' --graph | ||||
| o cc9fcfa87676 add d | o cc9fcfa87676 add d | ||||
| | | | | ||||
| @ 6d41fcaa1aa4 add c | @ 6d41fcaa1aa4 add c | ||||