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

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

localrepo: use file API via vfs while ensuring repository directory...
localrepo: use file API via vfs while ensuring repository directory As a part of migration to vfs, this patch invokes some file API indirectly via vfs, while ensuring repository directory in the constructor of "localrepository" class. New file API are added to "scmutil.abstractopener" class, because they are also used via other derived classes than "scmutil.opener". But "join()" is not yet defined other than "scmutil.opener" class, because it should not be used via other opener classes yet.
Pierre-Yves.David@ens-lyon.org - - Load All Authors

File last commit:

r17075:28ed1c45 default
r17161:be016e96 default
Show More
test-bookmarks-pushpull.t
266 lines | 6.8 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
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 adding remote bookmark X
adding remote bookmark Z
Will Maier
tests: add test for bookmark push/pull
 r12303 (run 'hg update' to get a working copy)
$ hg bookmarks
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 X 0:4e3505fd9583
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 Y 0:4e3505fd9583
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 Z 0:4e3505fd9583
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 $ hg debugpushkey ../a namespaces
bookmarks
Pierre-Yves David
phases: add basic pushkey support
 r15648 phases
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 namespaces
Pierre-Yves.David@ens-lyon.org
obsolete: exchange obsolete marker over pushkey...
 r17075 obsolete
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 $ 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
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 Z 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
Matt Mackall
push: don't treat bookmark as a found change...
 r16038 [1]
Will Maier
tests: add test for bookmark push/pull
 r12303 $ 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
Matt Mackall
push: don't treat bookmark as a found change...
 r16038 [1]
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969
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
Kevin Bullock
update: note updated bookmark...
 r16010 updating bookmark foobar
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 $ 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
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 Z 0:4e3505fd9583
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 foo -1:000000000000
Matt Mackall
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
 r15935 foobar 1:9b140be10808
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969
Matt Mackall
bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
 r15614 $ hg pull --config paths.foo=../a foo
Adrian Buehlmann
test-bookmarks-pushpull: partially adapt for Windows...
 r17021 pulling from $TESTTMP/a (glob)
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
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 updating bookmark Z
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
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 Z 2:0d2164f0ce0d
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 foo -1:000000000000
Matt Mackall
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
 r15935 foobar 1:9b140be10808
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 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
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
Levi Bard
bookmarks: allow existing remote bookmarks to become heads when pushing
 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
Sune Foldager
fix push of moved bookmark when creating new branch heads...
 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/
Levi Bard
bookmarks: allow existing remote bookmarks to become heads when pushing
 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
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 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
$ hg debugpushkey http://localhost:$HGPORT/ namespaces
bookmarks
Pierre-Yves David
phases: add basic pushkey support
 r15648 phases
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 namespaces
Pierre-Yves.David@ens-lyon.org
obsolete: exchange obsolete marker over pushkey...
 r17075 obsolete
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks
Levi Bard
bookmarks: allow existing remote bookmarks to become heads when pushing
 r16835 Y 4efff6d98829d9c824c621afd6e3f01865f5439f
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 foobar 9b140be1080824d768c5a4691a564088eede71f9
Z 0d2164f0ce0d8f1d6f94351eba04b794909be66c
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 foo 0000000000000000000000000000000000000000
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 X 9b140be1080824d768c5a4691a564088eede71f9
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 $ hg out -B http://localhost:$HGPORT/
comparing with http://localhost:$HGPORT/
searching for changed bookmarks
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 no changed bookmarks found
[1]
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 $ hg push -B Z http://localhost:$HGPORT/
pushing to http://localhost:$HGPORT/
searching for changes
no changes found
exporting bookmark Z
Matt Mackall
push: don't treat bookmark as a found change...
 r16038 [1]
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 $ hg book -d Z
$ hg in -B http://localhost:$HGPORT/
comparing with http://localhost:$HGPORT/
searching for changed bookmarks
Z 0d2164f0ce0d
foo 000000000000
Matt Mackall
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
 r15935 foobar 9b140be10808
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969 $ hg pull -B Z http://localhost:$HGPORT/
pulling from http://localhost:$HGPORT/
no changes found
Levi Bard
bookmarks: pull new bookmarks from remote by default (BC)
 r16697 adding remote bookmark foobar
adding remote bookmark Z
adding remote bookmark foo
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
Levi Bard
bookmarks: allow existing remote bookmarks to become heads when pushing
 r16835 added 5 changesets with 5 changes to 3 files (+3 heads)
David Soria Parra
hg: add support for cloning bookmarks
 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
Levi Bard
bookmarks: allow existing remote bookmarks to become heads when pushing
 r16835 Y 4:4efff6d98829
David Soria Parra
hg: add support for cloning bookmarks
 r13604 Z 2:0d2164f0ce0d
foo -1:000000000000
Matt Mackall
bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
 r15935 foobar 1:9b140be10808
Matt Mackall
pushkey: force HTTP POST on push and add tests (issue2489)
 r12969
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913 $ cd ..