test-bookmarks-pushpull.t
298 lines
| 7.8 KiB
| text/troff
|
Tads3Lexer
/ tests / test-bookmarks-pushpull.t
|
r15446 | $ "$TESTDIR/hghave" serve || exit 80 | ||
|
r12303 | initialize | ||
$ hg init a | ||||
$ cd a | ||||
$ echo 'test' > test | ||||
$ hg commit -Am'test' | ||||
adding test | ||||
set bookmarks | ||||
$ hg bookmark X | ||||
$ hg bookmark Y | ||||
$ hg bookmark Z | ||||
import bookmark by name | ||||
$ hg init ../b | ||||
$ cd ../b | ||||
|
r12969 | $ hg book Y | ||
$ hg book | ||||
* Y -1:000000000000 | ||||
|
r12303 | $ hg pull ../a | ||
pulling from ../a | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r13662 | updating bookmark Y | ||
|
r16697 | adding remote bookmark X | ||
adding remote bookmark Z | ||||
|
r12303 | (run 'hg update' to get a working copy) | ||
$ hg bookmarks | ||||
|
r16697 | X 0:4e3505fd9583 | ||
|
r12969 | Y 0:4e3505fd9583 | ||
|
r16697 | Z 0:4e3505fd9583 | ||
|
r12969 | $ hg debugpushkey ../a namespaces | ||
bookmarks | ||||
|
r15648 | phases | ||
|
r12969 | namespaces | ||
$ hg debugpushkey ../a bookmarks | ||||
Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 | ||||
X 4e3505fd95835d721066b76e75dbb8cc554d7f77 | ||||
Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 | ||||
|
r12303 | $ hg pull -B X ../a | ||
pulling from ../a | ||||
no changes found | ||||
importing bookmark X | ||||
$ hg bookmark | ||||
|
r13388 | X 0:4e3505fd9583 | ||
|
r12969 | Y 0:4e3505fd9583 | ||
|
r16697 | Z 0:4e3505fd9583 | ||
|
r12303 | |||
export bookmark by name | ||||
$ hg bookmark W | ||||
$ hg bookmark foo | ||||
$ hg bookmark foobar | ||||
$ hg push -B W ../a | ||||
pushing to ../a | ||||
searching for changes | ||||
no changes found | ||||
exporting bookmark W | ||||
|
r16038 | [1] | ||
|
r12303 | $ hg -R ../a bookmarks | ||
|
r13388 | W -1:000000000000 | ||
|
r12303 | X 0:4e3505fd9583 | ||
|
r13388 | Y 0:4e3505fd9583 | ||
|
r12303 | * Z 0:4e3505fd9583 | ||
|
r12969 | delete a remote bookmark | ||
$ hg book -d W | ||||
$ hg push -B W ../a | ||||
|
r13368 | pushing to ../a | ||
searching for changes | ||||
no changes found | ||||
|
r12969 | deleting remote bookmark W | ||
|
r16038 | [1] | ||
|
r12969 | |||
|
r12303 | push/pull name that doesn't exist | ||
$ hg push -B badname ../a | ||||
|
r13368 | pushing to ../a | ||
searching for changes | ||||
no changes found | ||||
|
r12303 | bookmark badname does not exist on the local or remote repository! | ||
|
r12316 | [2] | ||
|
r12303 | $ hg pull -B anotherbadname ../a | ||
|
r13368 | pulling from ../a | ||
|
r12303 | abort: remote bookmark anotherbadname not found! | ||
|
r12316 | [255] | ||
|
r12969 | |||
divergent bookmarks | ||||
$ cd ../a | ||||
$ echo c1 > f1 | ||||
$ hg ci -Am1 | ||||
adding f1 | ||||
$ hg book -f X | ||||
$ hg book | ||||
|
r13388 | * X 1:0d2164f0ce0d | ||
|
r12969 | Y 0:4e3505fd9583 | ||
Z 1:0d2164f0ce0d | ||||
$ cd ../b | ||||
$ hg up | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r16010 | updating bookmark foobar | ||
|
r12969 | $ echo c2 > f2 | ||
$ hg ci -Am2 | ||||
adding f2 | ||||
$ hg book -f X | ||||
$ hg book | ||||
|
r13388 | * X 1:9b140be10808 | ||
|
r12969 | Y 0:4e3505fd9583 | ||
|
r16697 | Z 0:4e3505fd9583 | ||
|
r12969 | foo -1:000000000000 | ||
|
r15935 | foobar 1:9b140be10808 | ||
|
r12969 | |||
|
r15614 | $ hg pull --config paths.foo=../a foo | ||
|
r17021 | pulling from $TESTTMP/a (glob) | ||
|
r12969 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
r15614 | divergent bookmark X stored as X@foo | ||
|
r16697 | updating bookmark Z | ||
|
r12969 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ hg book | ||||
|
r13388 | * X 1:9b140be10808 | ||
|
r15614 | X@foo 2:0d2164f0ce0d | ||
|
r12969 | Y 0:4e3505fd9583 | ||
|
r16697 | Z 2:0d2164f0ce0d | ||
|
r12969 | foo -1:000000000000 | ||
|
r15935 | foobar 1:9b140be10808 | ||
|
r12969 | $ hg push -f ../a | ||
pushing to ../a | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
$ hg -R ../a book | ||||
|
r13388 | * X 1:0d2164f0ce0d | ||
|
r12969 | Y 0:4e3505fd9583 | ||
Z 1:0d2164f0ce0d | ||||
|
r16835 | update a remote bookmark from a non-head to a head | ||
$ hg up -q Y | ||||
$ echo c3 > f2 | ||||
$ hg ci -Am3 | ||||
adding f2 | ||||
created new head | ||||
$ hg push ../a | ||||
pushing to ../a | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
updating bookmark Y | ||||
$ hg -R ../a book | ||||
* X 1:0d2164f0ce0d | ||||
Y 3:f6fc62dde3c0 | ||||
Z 1:0d2164f0ce0d | ||||
diverging a remote bookmark fails | ||||
$ hg up -q 4e3505fd9583 | ||||
$ echo c4 > f2 | ||||
$ hg ci -Am4 | ||||
adding f2 | ||||
created new head | ||||
$ hg book -f Y | ||||
|
r17043 | |||
$ cat <<EOF > ../a/.hg/hgrc | ||||
> [web] | ||||
> push_ssl = false | ||||
> allow_push = * | ||||
> EOF | ||||
$ hg -R ../a serve -p $HGPORT2 -d --pid-file=../hg2.pid | ||||
$ cat ../hg2.pid >> $DAEMON_PIDS | ||||
$ hg push http://localhost:$HGPORT2/ | ||||
pushing to http://localhost:$HGPORT2/ | ||||
|
r16835 | searching for changes | ||
abort: push creates new remote head 4efff6d98829! | ||||
(did you forget to merge? use push -f to force) | ||||
[255] | ||||
$ hg -R ../a book | ||||
* X 1:0d2164f0ce0d | ||||
Y 3:f6fc62dde3c0 | ||||
Z 1:0d2164f0ce0d | ||||
|
r12969 | hgweb | ||
$ cat <<EOF > .hg/hgrc | ||||
> [web] | ||||
> push_ssl = false | ||||
> allow_push = * | ||||
> EOF | ||||
$ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log | ||||
$ cat ../hg.pid >> $DAEMON_PIDS | ||||
$ cd ../a | ||||
|
r17345 | $ hg debugpushkey http://localhost:$HGPORT/ namespaces | ||
|
r12969 | bookmarks | ||
|
r15648 | phases | ||
|
r12969 | namespaces | ||
$ hg debugpushkey http://localhost:$HGPORT/ bookmarks | ||||
|
r16835 | Y 4efff6d98829d9c824c621afd6e3f01865f5439f | ||
|
r16697 | foobar 9b140be1080824d768c5a4691a564088eede71f9 | ||
Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c | ||||
|
r12969 | foo 0000000000000000000000000000000000000000 | ||
|
r16697 | X 9b140be1080824d768c5a4691a564088eede71f9 | ||
|
r12969 | $ hg out -B http://localhost:$HGPORT/ | ||
comparing with http://localhost:$HGPORT/ | ||||
searching for changed bookmarks | ||||
|
r16697 | no changed bookmarks found | ||
[1] | ||||
|
r12969 | $ hg push -B Z http://localhost:$HGPORT/ | ||
pushing to http://localhost:$HGPORT/ | ||||
searching for changes | ||||
no changes found | ||||
exporting bookmark Z | ||||
|
r16038 | [1] | ||
|
r12969 | $ hg book -d Z | ||
$ hg in -B http://localhost:$HGPORT/ | ||||
comparing with http://localhost:$HGPORT/ | ||||
searching for changed bookmarks | ||||
Z 0d2164f0ce0d | ||||
foo 000000000000 | ||||
|
r15935 | foobar 9b140be10808 | ||
|
r12969 | $ hg pull -B Z http://localhost:$HGPORT/ | ||
pulling from http://localhost:$HGPORT/ | ||||
no changes found | ||||
|
r16697 | adding remote bookmark foobar | ||
adding remote bookmark Z | ||||
adding remote bookmark foo | ||||
|
r15613 | divergent bookmark X stored as X@1 | ||
|
r12969 | importing bookmark Z | ||
|
r13604 | $ hg clone http://localhost:$HGPORT/ cloned-bookmarks | ||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r16835 | added 5 changesets with 5 changes to 3 files (+3 heads) | ||
|
r13604 | updating to branch default | ||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg -R cloned-bookmarks bookmarks | ||||
X 1:9b140be10808 | ||||
|
r16835 | Y 4:4efff6d98829 | ||
|
r13604 | Z 2:0d2164f0ce0d | ||
foo -1:000000000000 | ||||
|
r15935 | foobar 1:9b140be10808 | ||
|
r17189 | |||
$ cd .. | ||||
Pushing a bookmark should only push the changes required by that | ||||
bookmark, not all outgoing changes: | ||||
$ hg clone http://localhost:$HGPORT/ addmarks | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 5 changesets with 5 changes to 3 files (+3 heads) | ||||
updating to branch default | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd addmarks | ||||
$ echo foo > foo | ||||
$ hg add foo | ||||
$ hg commit -m 'add foo' | ||||
$ echo bar > bar | ||||
$ hg add bar | ||||
$ hg commit -m 'add bar' | ||||
$ hg co "tip^" | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg book add-foo | ||||
$ hg book -r tip add-bar | ||||
Note: this push *must* push only a single changeset, as that's the point | ||||
of this test. | ||||
$ hg push -B add-foo | ||||
pushing to http://localhost:$HGPORT/ | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: added 1 changesets with 1 changes to 1 files | ||||
exporting bookmark add-foo | ||||
|
r12969 | |||
|
r16913 | $ cd .. | ||