##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.
Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default
r23524:a1a7c94d default
Show More
test-bundle-r.t
328 lines | 8.3 KiB | text/troff | Tads3Lexer
/ tests / test-bundle-r.t
History | Source | Raw |Copy content |Copy permalink
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)
(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
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
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
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
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
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
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
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 4 changesets, 4 total revisions
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
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
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
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
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
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 4 changesets, 5 total revisions
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
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
3 files, 5 changesets, 6 total revisions
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
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 5 total revisions
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)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
$ 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]
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
$ 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)
(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
4 files, 9 changesets, 7 total revisions
$ 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
(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
2 files, 5 changesets, 5 total revisions
$ 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)
(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
3 files, 7 changesets, 6 total revisions
$ 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
(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
2 files, 5 changesets, 5 total revisions
$ 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
(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
4 files, 10 changesets, 7 total revisions
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913
$ cd ..