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

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

bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall - - Load All Authors

File last commit:

r15614:260a6449 default
r15614:260a6449 default
Show More
test-bookmarks-pushpull.t
196 lines | 5.1 KiB | text/troff | Tads3Lexer
/ tests / test-bookmarks-pushpull.t
History | Source | Raw |Copy content |Copy permalink
Mads Kiilerich
tests: use 'hghave serve' to guard tests that requires serve daemon management
 r15446 $ "$TESTDIR/hghave" serve || exit 80
Will Maier
tests: add test for bookmark push/pull
 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
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 $ hg book Y
$ hg book
* Y -1:000000000000
Will Maier
tests: add test for bookmark push/pull
 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
David Soria Parra
localrepo: do not update bookmarks in addchangegroup...
 r13662 updating bookmark Y
Will Maier
tests: add test for bookmark push/pull
 r12303 (run 'hg update' to get a working copy)
$ hg bookmarks
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 Y 0:4e3505fd9583
$ hg debugpushkey ../a namespaces
bookmarks
namespaces
$ hg debugpushkey ../a bookmarks
Y 4e3505fd95835d721066b76e75dbb8cc554d7f77
X 4e3505fd95835d721066b76e75dbb8cc554d7f77
Z 4e3505fd95835d721066b76e75dbb8cc554d7f77
Will Maier
tests: add test for bookmark push/pull
 r12303 $ hg pull -B X ../a
pulling from ../a
no changes found
importing bookmark X
$ hg bookmark
David Soria Parra
localrepo: sort hg bookmark output...
 r13388 X 0:4e3505fd9583
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 Y 0:4e3505fd9583
Will Maier
tests: add test for bookmark push/pull
 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
$ hg -R ../a bookmarks
David Soria Parra
localrepo: sort hg bookmark output...
 r13388 W -1:000000000000
Will Maier
tests: add test for bookmark push/pull
 r12303 X 0:4e3505fd9583
David Soria Parra
localrepo: sort hg bookmark output...
 r13388 Y 0:4e3505fd9583
Will Maier
tests: add test for bookmark push/pull
 r12303 * Z 0:4e3505fd9583
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 delete a remote bookmark
$ hg book -d W
$ hg push -B W ../a
Matt Mackall
bookmarks: move push/pull command features to core
 r13368 pushing to ../a
searching for changes
no changes found
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 deleting remote bookmark W
Will Maier
tests: add test for bookmark push/pull
 r12303 push/pull name that doesn't exist
$ hg push -B badname ../a
Matt Mackall
bookmarks: move push/pull command features to core
 r13368 pushing to ../a
searching for changes
no changes found
Will Maier
tests: add test for bookmark push/pull
 r12303 bookmark badname does not exist on the local or remote repository!
Matt Mackall
tests: add exit codes to unified tests
 r12316 [2]
Will Maier
tests: add test for bookmark push/pull
 r12303 $ hg pull -B anotherbadname ../a
Matt Mackall
bookmarks: move push/pull command features to core
 r13368 pulling from ../a
Will Maier
tests: add test for bookmark push/pull
 r12303 abort: remote bookmark anotherbadname not found!
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969
divergent bookmarks
$ cd ../a
$ echo c1 > f1
$ hg ci -Am1
adding f1
$ hg book -f X
$ hg book
David Soria Parra
localrepo: sort hg bookmark output...
 r13388 * X 1:0d2164f0ce0d
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 Y 0:4e3505fd9583
Z 1:0d2164f0ce0d
$ cd ../b
$ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c2 > f2
$ hg ci -Am2
adding f2
$ hg book -f X
$ hg book
David Soria Parra
localrepo: sort hg bookmark output...
 r13388 * X 1:9b140be10808
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 Y 0:4e3505fd9583
foo -1:000000000000
foobar -1:000000000000
Matt Mackall
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
 r15614 $ hg pull --config paths.foo=../a foo
pulling from $TESTTMP/a
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Matt Mackall
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
 r15614 divergent bookmark X stored as X@foo
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg book
David Soria Parra
localrepo: sort hg bookmark output...
 r13388 * X 1:9b140be10808
Matt Mackall
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
 r15614 X@foo 2:0d2164f0ce0d
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 Y 0:4e3505fd9583
foo -1:000000000000
foobar -1:000000000000
$ 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
David Soria Parra
localrepo: sort hg bookmark output...
 r13388 * X 1:0d2164f0ce0d
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 Y 0:4e3505fd9583
Z 1:0d2164f0ce0d
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
$ hg debugpushkey http://localhost:$HGPORT/ namespaces
bookmarks
namespaces
$ hg debugpushkey http://localhost:$HGPORT/ bookmarks
Y 4e3505fd95835d721066b76e75dbb8cc554d7f77
X 9b140be1080824d768c5a4691a564088eede71f9
foo 0000000000000000000000000000000000000000
foobar 0000000000000000000000000000000000000000
$ hg out -B http://localhost:$HGPORT/
comparing with http://localhost:$HGPORT/
searching for changed bookmarks
Z 0d2164f0ce0d
$ hg push -B Z http://localhost:$HGPORT/
pushing to http://localhost:$HGPORT/
searching for changes
no changes found
exporting bookmark Z
$ hg book -d Z
$ hg in -B http://localhost:$HGPORT/
comparing with http://localhost:$HGPORT/
searching for changed bookmarks
Z 0d2164f0ce0d
foo 000000000000
foobar 000000000000
$ hg pull -B Z http://localhost:$HGPORT/
pulling from http://localhost:$HGPORT/
no changes found
Matt Mackall
bookmarks: shadow divergent bookmarks of foo with foo@n
 r15613 divergent bookmark X stored as X@1
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 importing bookmark Z
David Soria Parra
hg: add support for cloning bookmarks
 r13604 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R cloned-bookmarks bookmarks
X 1:9b140be10808
Y 0:4e3505fd9583
Z 2:0d2164f0ce0d
foo -1:000000000000
foobar -1:000000000000
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969
$ kill `cat ../hg.pid`