##// END OF EJS Templates
phabricator: warn if unable to amend, instead of aborting after posting...
phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

File last commit:

r39525:f1186c29 default
r41198:0101a35d default
Show More
test-bundle-r.t
351 lines | 9.5 KiB | text/troff | Tads3Lexer
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg init test
$ cd test
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ hg unbundle "$TESTDIR/bundles/remote.hg"
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01:916f1afdef90 (9 drafts)
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
Martin Geisler
tests: unify test-bundle-r
r11871 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117
Martin Geisler
tests: unify test-bundle-r
r11871 $ for i in 0 1 2 3 4 5 6 7 8; do
> mkdir test-"$i"
> hg --cwd test-"$i" init
> hg -R test bundle -r "$i" test-"$i".hg test-"$i"
> cd test-"$i"
> hg unbundle ../test-"$i".hg
> hg verify
> hg tip -q
> cd ..
> done
searching for changes
1 changesets found
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01 (1 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 1 changesets with 1 changes to 1 files
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 0:bfaf4b5cbf01
Martin Geisler
tests: unify test-bundle-r
r11871 searching for changes
2 changesets found
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01:21f32785131f (2 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 2 changesets with 2 changes to 1 files
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 1:21f32785131f
Martin Geisler
tests: unify test-bundle-r
r11871 searching for changes
3 changesets found
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01:4ce51a113780 (3 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 3 changesets with 3 changes to 1 files
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 2:4ce51a113780
Martin Geisler
tests: unify test-bundle-r
r11871 searching for changes
4 changesets found
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01:93ee6ab32777 (4 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 4 changesets with 4 changes to 1 files
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 3:93ee6ab32777
Martin Geisler
tests: unify test-bundle-r
r11871 searching for changes
2 changesets found
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01:c70afb1ee985 (2 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 2 changesets with 2 changes to 1 files
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 1:c70afb1ee985
Martin Geisler
tests: unify test-bundle-r
r11871 searching for changes
3 changesets found
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01:f03ae5a9b979 (3 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 3 changesets with 3 changes to 1 files
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 2:f03ae5a9b979
Martin Geisler
tests: unify test-bundle-r
r11871 searching for changes
4 changesets found
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01:095cb14b1b4d (4 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 4 changesets with 5 changes to 2 files
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 3:095cb14b1b4d
Martin Geisler
tests: unify test-bundle-r
r11871 searching for changes
5 changesets found
adding changesets
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01:faa2e4234c7a (5 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 6 changes to 3 files
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 4:faa2e4234c7a
Martin Geisler
tests: unify test-bundle-r
r11871 searching for changes
5 changesets found
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets bfaf4b5cbf01:916f1afdef90 (5 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 5 changes to 2 files
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 4:916f1afdef90
Martin Geisler
tests: unify test-bundle-r
r11871 $ cd test-8
$ hg pull ../test-7
pulling from ../test-7
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets c70afb1ee985:faa2e4234c7a
Boris Feld
phases: use "published" in the phase movement message...
r38268 1 local changesets published
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 9 changesets with 7 changes to 4 files
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg rollback
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
r13446 repository tip rolled back to revision 4 (undo pull)
Martin Geisler
tests: unify test-bundle-r
r11871 $ cd ..
should fail
$ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
abort: --base is incompatible with specifying a destination
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
timeless
bundle: fix error for --all with destination...
r27422 $ hg -R test bundle -a -r tip test-bundle-branch1.hg test-3
abort: --all is incompatible with specifying a destination
[255]
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg -R test bundle -r tip test-bundle-branch1.hg
abort: repository default-push not found!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin Geisler
tests: unify test-bundle-r
r11871
$ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
2 changesets found
$ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
4 changesets found
$ hg -R test bundle --base 2 test-bundle-all.hg
6 changesets found
timeless
bundle: warn for --base with --all
r27423 $ hg -R test bundle --base 2 --all test-bundle-all-2.hg
ignoring --base because --all was specified
9 changesets found
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg
1 changesets found
empty bundle
$ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg
no changes found
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Martin Geisler
tests: unify test-bundle-r
r11871
issue76 msg2163
$ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg
Peter Arrenbrecht
discovery: drop findoutgoing and simplify findcommonincoming's api...
r14073 no changes found
[1]
Martin Geisler
tests: unify test-bundle-r
r11871
Martin Geisler
tests: added a short description to issue numbers...
r12399 Issue1910: 'hg bundle --base $head' does not exclude $head from
result
Martin Geisler
tests: unify test-bundle-r
r11871
$ hg -R test bundle --base 7 test-bundle-cset-7.hg
4 changesets found
$ hg clone test-2 test-9
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd test-9
revision 2
$ hg tip -q
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 2:4ce51a113780
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg unbundle ../test-bundle-should-fail.hg
adding changesets
transaction abort!
rollback completed
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 abort: 00changelog.i@93ee6ab32777: unknown parent!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin Geisler
tests: unify test-bundle-r
r11871
revision 2
$ hg tip -q
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 2:4ce51a113780
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg unbundle ../test-bundle-all.hg
adding changesets
adding manifests
adding file changes
added 6 changesets with 4 changes to 4 files (+1 heads)
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets 93ee6ab32777:916f1afdef90 (6 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg heads' to see heads, 'hg merge' to merge)
revision 8
$ hg tip -q
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 8:916f1afdef90
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 9 changesets with 7 changes to 4 files
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg rollback
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
r13446 repository tip rolled back to revision 2 (undo unbundle)
Martin Geisler
tests: unify test-bundle-r
r11871
revision 2
$ hg tip -q
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 2:4ce51a113780
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg unbundle ../test-bundle-branch1.hg
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
revision 4
$ hg tip -q
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 4:916f1afdef90
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 5 changes to 2 files
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg rollback
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
r13446 repository tip rolled back to revision 2 (undo unbundle)
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg unbundle ../test-bundle-branch2.hg
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files (+1 heads)
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets c70afb1ee985:faa2e4234c7a (4 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg heads' to see heads, 'hg merge' to merge)
revision 6
$ hg tip -q
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 6:faa2e4234c7a
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 7 changesets with 6 changes to 3 files
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg rollback
Gilles Moris
rollback: clarifies the message about the reverted state (issue2628)...
r13446 repository tip rolled back to revision 2 (undo unbundle)
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg unbundle ../test-bundle-cset-7.hg
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets 93ee6ab32777:916f1afdef90 (2 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
revision 4
$ hg tip -q
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 4:916f1afdef90
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 5 changes to 2 files
Martin Geisler
tests: unify test-bundle-r
r11871
$ cd ../test
$ hg merge 7
Dan Villiom Podlaski Christiansen
merge: make 'diverging renames' diagnostic a more helpful note....
r12757 note: possible conflict - afile was renamed multiple times to:
Martin Geisler
tests: unify test-bundle-r
r11871 anotherfile
adifferentfile
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m merge
Martin Geisler
tests: unify test-bundle-r
r11871 $ cd ..
$ hg -R test bundle --base 2 test-bundle-head.hg
7 changesets found
$ hg clone test-2 test-10
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd test-10
$ hg unbundle ../test-bundle-head.hg
adding changesets
adding manifests
adding file changes
added 7 changesets with 4 changes to 4 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets 93ee6ab32777:03fc0b0e347c (7 drafts)
Martin Geisler
tests: unify test-bundle-r
r11871 (run 'hg update' to get a working copy)
revision 9
$ hg tip -q
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
r14117 9:03fc0b0e347c
Martin Geisler
tests: unify test-bundle-r
r11871 $ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 10 changesets with 7 changes to 4 files
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..