Mercurial > public > mercurial-scm > hg-stable

annotate tests/test-bookmarks-pushpull.t @ 13740:dcb51f156fa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Mar 2011 12:38:36 -0500
parents 80d6e1f63ed9
children cb98fed52495
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
1 initialize
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
2
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
3 $ hg init a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
4 $ cd a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
5 $ echo 'test' > test
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
6 $ hg commit -Am'test'
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
7 adding test
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
8
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
9 set bookmarks
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
10
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
11 $ hg bookmark X
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
12 $ hg bookmark Y
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
13 $ hg bookmark Z
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
14
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
15 import bookmark by name
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
16
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
17 $ hg init ../b
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
18 $ cd ../b
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
19 $ hg book Y
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
20 $ hg book
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
21 * Y -1:000000000000
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
22 $ hg pull ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
23 pulling from ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
24 requesting all changes
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
25 adding changesets
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
26 adding manifests
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
27 adding file changes
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
28 added 1 changesets with 1 changes to 1 files
13662
80d6e1f63ed9 localrepo: do not update bookmarks in addchangegroup
David Soria Parra <dsp@php.net>
parents: 13604
diff changeset
29 updating bookmark Y
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
30 (run 'hg update' to get a working copy)
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
31 $ hg bookmarks
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
32 Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
33 $ hg debugpushkey ../a namespaces
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
34 bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
35 namespaces
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
36 $ hg debugpushkey ../a bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
37 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
38 X 4e3505fd95835d721066b76e75dbb8cc554d7f77
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
39 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
40 $ hg pull -B X ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
41 pulling from ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
42 searching for changes
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
43 no changes found
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
44 importing bookmark X
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
45 $ hg bookmark
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
46 X 0:4e3505fd9583
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
47 Y 0:4e3505fd9583
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
48
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
49 export bookmark by name
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
50
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
51 $ hg bookmark W
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
52 $ hg bookmark foo
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
53 $ hg bookmark foobar
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
54 $ hg push -B W ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
55 pushing to ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
56 searching for changes
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
57 no changes found
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
58 exporting bookmark W
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
59 $ hg -R ../a bookmarks
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
60 W -1:000000000000
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
61 X 0:4e3505fd9583
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
62 Y 0:4e3505fd9583
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
63 * Z 0:4e3505fd9583
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
64
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
65 delete a remote bookmark
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
66
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
67 $ hg book -d W
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
68 $ hg push -B W ../a
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
69 pushing to ../a
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
70 searching for changes
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
71 no changes found
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
72 deleting remote bookmark W
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
73
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
74 push/pull name that doesn't exist
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
75
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
76 $ hg push -B badname ../a
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
77 pushing to ../a
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
78 searching for changes
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
79 no changes found
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
80 bookmark badname does not exist on the local or remote repository!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12303
diff changeset
81 [2]
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
82 $ hg pull -B anotherbadname ../a
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
83 pulling from ../a
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
84 abort: remote bookmark anotherbadname not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12303
diff changeset
85 [255]
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
86
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
87 divergent bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
88
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
89 $ cd ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
90 $ echo c1 > f1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
91 $ hg ci -Am1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
92 adding f1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
93 $ hg book -f X
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
94 $ hg book
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
95 * X 1:0d2164f0ce0d
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
96 Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
97 Z 1:0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
98
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
99 $ cd ../b
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
100 $ hg up
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
102 $ echo c2 > f2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
103 $ hg ci -Am2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
104 adding f2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
105 $ hg book -f X
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
106 $ hg book
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
107 * X 1:9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
108 Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
109 foo -1:000000000000
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
110 foobar -1:000000000000
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
111
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
112 $ hg pull ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
113 pulling from ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
114 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
115 adding changesets
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
116 adding manifests
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
117 adding file changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
118 added 1 changesets with 1 changes to 1 files (+1 heads)
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
119 not updating divergent bookmark X
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
120 (run 'hg heads' to see heads, 'hg merge' to merge)
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
121 $ hg book
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
122 * X 1:9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
123 Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
124 foo -1:000000000000
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
125 foobar -1:000000000000
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
126 $ hg push -f ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
127 pushing to ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
128 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
129 adding changesets
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
130 adding manifests
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
131 adding file changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
132 added 1 changesets with 1 changes to 1 files (+1 heads)
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
133 $ hg -R ../a book
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
134 * X 1:0d2164f0ce0d
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
135 Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
136 Z 1:0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
137
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
138 hgweb
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
139
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
140 $ cat <<EOF > .hg/hgrc
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
141 > [web]
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
142 > push_ssl = false
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
143 > allow_push = *
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
144 > EOF
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
145
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
146 $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
147 $ cat ../hg.pid >> $DAEMON_PIDS
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
148 $ cd ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
149
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
150 $ hg debugpushkey http://localhost:$HGPORT/ namespaces
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
151 bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
152 namespaces
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
153 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
154 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
155 X 9b140be1080824d768c5a4691a564088eede71f9
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
156 foo 0000000000000000000000000000000000000000
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
157 foobar 0000000000000000000000000000000000000000
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
158 $ hg out -B http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
159 comparing with http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
160 searching for changed bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
161 Z 0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
162 $ hg push -B Z http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
163 pushing to http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
164 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
165 no changes found
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
166 exporting bookmark Z
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
167 $ hg book -d Z
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
168 $ hg in -B http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
169 comparing with http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
170 searching for changed bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
171 Z 0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
172 foo 000000000000
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
173 foobar 000000000000
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
174 $ hg pull -B Z http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
175 pulling from http://localhost:$HGPORT/
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
176 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
177 no changes found
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
178 not updating divergent bookmark X
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
179 importing bookmark Z
13604
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
180 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
181 requesting all changes
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
182 adding changesets
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
183 adding manifests
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
184 adding file changes
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
185 added 3 changesets with 3 changes to 3 files (+1 heads)
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
186 updating to branch default
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
187 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
188 $ hg -R cloned-bookmarks bookmarks
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
189 X 1:9b140be10808
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
190 Y 0:4e3505fd9583
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
191 Z 2:0d2164f0ce0d
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
192 foo -1:000000000000
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
193 foobar -1:000000000000
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
194
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
195 $ kill `cat ../hg.pid`