annotate tests/test-bookmarks-pushpull.t @ 37296:78103e4138b1

wireproto: port protocol handler to zope.interface zope.interface is superior to the abc module. Let's port to it. As part of this, we add tests for interface conformance for classes implementing the interface. Differential Revision: https://phab.mercurial-scm.org/D2983
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 23 Mar 2018 16:24:53 -0700
parents 2090044a288d
children 15622e72307d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1 #testcases b2-pushkey b2-binary
35264
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
2
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
3 #if b2-pushkey
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
4 $ cat << EOF >> $HGRCPATH
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
5 > [devel]
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
6 > legacy.exchange=bookmarks
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
7 > EOF
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
8 #endif
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
9
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 21580
diff changeset
10 #require serve
15446
c5c9ca3719f9 tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents: 14164
diff changeset
11
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
12 $ cat << EOF >> $HGRCPATH
17864
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
13 > [ui]
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
14 > logtemplate={rev}:{node|short} {desc|firstline}
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
15 > [phases]
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
16 > publish=False
22955
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22659
diff changeset
17 > [experimental]
34866
1644623ab096 config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents: 34708
diff changeset
18 > evolution.createmarkers=True
34868
44797aedfb35 config: use 'experimental.evolution.exchange'
Boris Feld <boris.feld@octobus.net>
parents: 34866
diff changeset
19 > evolution.exchange=True
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
20 > EOF
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
21
34938
aa05b95949fe tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 34868
diff changeset
22 $ cat > $TESTTMP/hook.sh <<'EOF'
aa05b95949fe tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 34868
diff changeset
23 > echo "test-hook-bookmark: $HG_BOOKMARK: $HG_OLDNODE -> $HG_NODE"
aa05b95949fe tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 34868
diff changeset
24 > EOF
aa05b95949fe tests: adjust hooks for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 34868
diff changeset
25 $ TESTHOOK="hooks.txnclose-bookmark.test=sh $TESTTMP/hook.sh"
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
26
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
27 initialize
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
28
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
29 $ hg init a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
30 $ cd a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
31 $ echo 'test' > test
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
32 $ hg commit -Am'test'
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
33 adding test
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
34
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
35 set bookmarks
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
36
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
37 $ hg bookmark X
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
38 $ hg bookmark Y
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
39 $ hg bookmark Z
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
40
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
41 import bookmark by name
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
42
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
43 $ hg init ../b
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
44 $ cd ../b
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
45 $ hg book Y
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
46 $ hg book
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
47 * Y -1:000000000000
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
48 $ hg pull ../a --config "$TESTHOOK"
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
49 pulling from ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
50 requesting all changes
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
51 adding changesets
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
52 adding manifests
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
53 adding file changes
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
54 added 1 changesets with 1 changes to 1 files
18363
c6e033a7dd38 bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents: 18255
diff changeset
55 adding remote bookmark X
13662
80d6e1f63ed9 localrepo: do not update bookmarks in addchangegroup
David Soria Parra <dsp@php.net>
parents: 13604
diff changeset
56 updating bookmark Y
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
57 adding remote bookmark Z
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33773
diff changeset
58 new changesets 4e3505fd9583
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
59 test-hook-bookmark: X: -> 4e3505fd95835d721066b76e75dbb8cc554d7f77
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
60 test-hook-bookmark: Y: 0000000000000000000000000000000000000000 -> 4e3505fd95835d721066b76e75dbb8cc554d7f77
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
61 test-hook-bookmark: Z: -> 4e3505fd95835d721066b76e75dbb8cc554d7f77
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
62 (run 'hg update' to get a working copy)
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
63 $ hg bookmarks
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
64 X 0:4e3505fd9583
18479
0efd5686f80c bookmarks: show active bookmark even if not at working dir
Kevin Bullock <kbullock@ringworld.org>
parents: 18470
diff changeset
65 * Y 0:4e3505fd9583
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
66 Z 0:4e3505fd9583
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
67 $ hg debugpushkey ../a namespaces
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
68 bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
69 namespaces
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
70 obsolete
18255
7ca534f31a83 debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents: 17882
diff changeset
71 phases
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
72 $ hg debugpushkey ../a bookmarks
18255
7ca534f31a83 debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents: 17882
diff changeset
73 X 4e3505fd95835d721066b76e75dbb8cc554d7f77
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
74 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
75 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77
23199
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
76
23543
4dd8a6a1240d spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 23416
diff changeset
77 delete the bookmark to re-pull it
23199
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
78
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
79 $ hg book -d X
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
80 $ hg pull -B X ../a
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
81 pulling from ../a
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
82 no changes found
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
83 adding remote bookmark X
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
84
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
85 finally no-op pull
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
86
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
87 $ hg pull -B X ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
88 pulling from ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
89 no changes found
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
90 $ hg bookmark
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
91 X 0:4e3505fd9583
18479
0efd5686f80c bookmarks: show active bookmark even if not at working dir
Kevin Bullock <kbullock@ringworld.org>
parents: 18470
diff changeset
92 * Y 0:4e3505fd9583
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
93 Z 0:4e3505fd9583
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
94
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
95 export bookmark by name
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
96
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
97 $ hg bookmark W
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
98 $ hg bookmark foo
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
99 $ hg bookmark foobar
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
100 $ hg push -B W ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
101 pushing to ../a
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
102 searching for changes
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
103 no changes found
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
104 exporting bookmark W
16038
dad96e752079 push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents: 16010
diff changeset
105 [1]
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
106 $ hg -R ../a bookmarks
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
107 W -1:000000000000
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
108 X 0:4e3505fd9583
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
109 Y 0:4e3505fd9583
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
110 * Z 0:4e3505fd9583
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
111
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
112 delete a remote bookmark
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
113
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
114 $ hg book -d W
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
115
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
116 #if b2-pushkey
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
117
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
118 $ hg push -B W ../a --config "$TESTHOOK" --debug --config devel.bundle2.debug=yes
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
119 pushing to ../a
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
120 query 1; heads
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
121 searching for changes
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
122 all remote heads known locally
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
123 listing keys for "phases"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
124 checking for updated bookmarks
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
125 listing keys for "bookmarks"
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
126 no changes found
35259
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
127 bundle2-output-bundle: "HG20", 4 parts total
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
128 bundle2-output: start emission of HG20 stream
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
129 bundle2-output: bundle parameter:
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
130 bundle2-output: start of parts
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
131 bundle2-output: bundle part: "replycaps"
36968
2090044a288d revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents: 36789
diff changeset
132 bundle2-output-part: "replycaps" 222 bytes payload
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
133 bundle2-output: part 0: "REPLYCAPS"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
134 bundle2-output: header chunk size: 16
36968
2090044a288d revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents: 36789
diff changeset
135 bundle2-output: payload chunk size: 222
35259
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
136 bundle2-output: closing payload chunk
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
137 bundle2-output: bundle part: "check:bookmarks"
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
138 bundle2-output-part: "check:bookmarks" 23 bytes payload
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
139 bundle2-output: part 1: "CHECK:BOOKMARKS"
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
140 bundle2-output: header chunk size: 22
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
141 bundle2-output: payload chunk size: 23
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
142 bundle2-output: closing payload chunk
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
143 bundle2-output: bundle part: "check:phases"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
144 bundle2-output-part: "check:phases" 48 bytes payload
35259
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
145 bundle2-output: part 2: "CHECK:PHASES"
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
146 bundle2-output: header chunk size: 19
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
147 bundle2-output: payload chunk size: 48
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
148 bundle2-output: closing payload chunk
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
149 bundle2-output: bundle part: "pushkey"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
150 bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
35259
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
151 bundle2-output: part 3: "PUSHKEY"
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
152 bundle2-output: header chunk size: 90
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
153 bundle2-output: closing payload chunk
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
154 bundle2-output: end of bundle
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
155 bundle2-input: start processing of HG20 stream
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
156 bundle2-input: reading bundle2 stream parameters
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
157 bundle2-input-bundle: with-transaction
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
158 bundle2-input: start extraction of bundle2 parts
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
159 bundle2-input: part header size: 16
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
160 bundle2-input: part type: "REPLYCAPS"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
161 bundle2-input: part id: "0"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
162 bundle2-input: part parameters: 0
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
163 bundle2-input: found a handler for part replycaps
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
164 bundle2-input-part: "replycaps" supported
36968
2090044a288d revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents: 36789
diff changeset
165 bundle2-input: payload chunk size: 222
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
166 bundle2-input: payload chunk size: 0
36968
2090044a288d revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents: 36789
diff changeset
167 bundle2-input-part: total payload size 222
35259
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
168 bundle2-input: part header size: 22
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
169 bundle2-input: part type: "CHECK:BOOKMARKS"
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
170 bundle2-input: part id: "1"
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
171 bundle2-input: part parameters: 0
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
172 bundle2-input: found a handler for part check:bookmarks
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
173 bundle2-input-part: "check:bookmarks" supported
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
174 bundle2-input: payload chunk size: 23
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
175 bundle2-input: payload chunk size: 0
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
176 bundle2-input-part: total payload size 23
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
177 bundle2-input: part header size: 19
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
178 bundle2-input: part type: "CHECK:PHASES"
35259
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
179 bundle2-input: part id: "2"
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
180 bundle2-input: part parameters: 0
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
181 bundle2-input: found a handler for part check:phases
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
182 bundle2-input-part: "check:phases" supported
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
183 bundle2-input: payload chunk size: 48
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
184 bundle2-input: payload chunk size: 0
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
185 bundle2-input-part: total payload size 48
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
186 bundle2-input: part header size: 90
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
187 bundle2-input: part type: "PUSHKEY"
35259
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
188 bundle2-input: part id: "3"
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
189 bundle2-input: part parameters: 4
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
190 bundle2-input: found a handler for part pushkey
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
191 bundle2-input-part: "pushkey" (params: 4 mandatory) supported
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
192 pushing key for "bookmarks:W"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
193 bundle2-input: payload chunk size: 0
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
194 bundle2-input: part header size: 0
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
195 bundle2-input: end of bundle2 stream
35259
ad5f2b923b0d push: include a 'check:bookmarks' part when possible
Boris Feld <boris.feld@octobus.net>
parents: 35163
diff changeset
196 bundle2-input-bundle: 3 parts total
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
197 running hook txnclose-bookmark.test: sh $TESTTMP/hook.sh
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
198 test-hook-bookmark: W: 0000000000000000000000000000000000000000 ->
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
199 bundle2-output-bundle: "HG20", 1 parts total
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
200 bundle2-output: start emission of HG20 stream
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
201 bundle2-output: bundle parameter:
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
202 bundle2-output: start of parts
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
203 bundle2-output: bundle part: "reply:pushkey"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
204 bundle2-output-part: "reply:pushkey" (params: 0 advisory) empty payload
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
205 bundle2-output: part 0: "REPLY:PUSHKEY"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
206 bundle2-output: header chunk size: 43
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
207 bundle2-output: closing payload chunk
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
208 bundle2-output: end of bundle
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
209 bundle2-input: start processing of HG20 stream
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
210 bundle2-input: reading bundle2 stream parameters
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
211 bundle2-input-bundle: no-transaction
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
212 bundle2-input: start extraction of bundle2 parts
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
213 bundle2-input: part header size: 43
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
214 bundle2-input: part type: "REPLY:PUSHKEY"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
215 bundle2-input: part id: "0"
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
216 bundle2-input: part parameters: 2
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
217 bundle2-input: found a handler for part reply:pushkey
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
218 bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
219 bundle2-input: payload chunk size: 0
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
220 bundle2-input: part header size: 0
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
221 bundle2-input: end of bundle2 stream
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
222 bundle2-input-bundle: 0 parts total
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
223 deleting remote bookmark W
35040
ef8518f14e4e bookmark: use bundle2 debug output in one push tests
Boris Feld <boris.feld@octobus.net>
parents: 34938
diff changeset
224 listing keys for "phases"
16038
dad96e752079 push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents: 16010
diff changeset
225 [1]
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
226
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
227 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
228 #if b2-binary
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
229
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
230 $ hg push -B W ../a --config "$TESTHOOK" --debug --config devel.bundle2.debug=yes
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
231 pushing to ../a
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
232 query 1; heads
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
233 searching for changes
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
234 all remote heads known locally
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
235 listing keys for "phases"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
236 checking for updated bookmarks
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
237 listing keys for "bookmarks"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
238 no changes found
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
239 bundle2-output-bundle: "HG20", 4 parts total
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
240 bundle2-output: start emission of HG20 stream
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
241 bundle2-output: bundle parameter:
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
242 bundle2-output: start of parts
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
243 bundle2-output: bundle part: "replycaps"
36968
2090044a288d revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents: 36789
diff changeset
244 bundle2-output-part: "replycaps" 222 bytes payload
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
245 bundle2-output: part 0: "REPLYCAPS"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
246 bundle2-output: header chunk size: 16
36968
2090044a288d revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents: 36789
diff changeset
247 bundle2-output: payload chunk size: 222
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
248 bundle2-output: closing payload chunk
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
249 bundle2-output: bundle part: "check:bookmarks"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
250 bundle2-output-part: "check:bookmarks" 23 bytes payload
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
251 bundle2-output: part 1: "CHECK:BOOKMARKS"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
252 bundle2-output: header chunk size: 22
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
253 bundle2-output: payload chunk size: 23
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
254 bundle2-output: closing payload chunk
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
255 bundle2-output: bundle part: "check:phases"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
256 bundle2-output-part: "check:phases" 48 bytes payload
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
257 bundle2-output: part 2: "CHECK:PHASES"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
258 bundle2-output: header chunk size: 19
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
259 bundle2-output: payload chunk size: 48
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
260 bundle2-output: closing payload chunk
35264
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
261 bundle2-output: bundle part: "bookmarks"
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
262 bundle2-output-part: "bookmarks" 23 bytes payload
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
263 bundle2-output: part 3: "BOOKMARKS"
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
264 bundle2-output: header chunk size: 16
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
265 bundle2-output: payload chunk size: 23
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
266 bundle2-output: closing payload chunk
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
267 bundle2-output: end of bundle
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
268 bundle2-input: start processing of HG20 stream
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
269 bundle2-input: reading bundle2 stream parameters
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
270 bundle2-input-bundle: with-transaction
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
271 bundle2-input: start extraction of bundle2 parts
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
272 bundle2-input: part header size: 16
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
273 bundle2-input: part type: "REPLYCAPS"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
274 bundle2-input: part id: "0"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
275 bundle2-input: part parameters: 0
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
276 bundle2-input: found a handler for part replycaps
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
277 bundle2-input-part: "replycaps" supported
36968
2090044a288d revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents: 36789
diff changeset
278 bundle2-input: payload chunk size: 222
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
279 bundle2-input: payload chunk size: 0
36968
2090044a288d revbranchcache: advertise and use 'rbc' exchange capability
Boris Feld <boris.feld@octobus.net>
parents: 36789
diff changeset
280 bundle2-input-part: total payload size 222
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
281 bundle2-input: part header size: 22
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
282 bundle2-input: part type: "CHECK:BOOKMARKS"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
283 bundle2-input: part id: "1"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
284 bundle2-input: part parameters: 0
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
285 bundle2-input: found a handler for part check:bookmarks
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
286 bundle2-input-part: "check:bookmarks" supported
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
287 bundle2-input: payload chunk size: 23
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
288 bundle2-input: payload chunk size: 0
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
289 bundle2-input-part: total payload size 23
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
290 bundle2-input: part header size: 19
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
291 bundle2-input: part type: "CHECK:PHASES"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
292 bundle2-input: part id: "2"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
293 bundle2-input: part parameters: 0
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
294 bundle2-input: found a handler for part check:phases
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
295 bundle2-input-part: "check:phases" supported
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
296 bundle2-input: payload chunk size: 48
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
297 bundle2-input: payload chunk size: 0
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
298 bundle2-input-part: total payload size 48
35264
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
299 bundle2-input: part header size: 16
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
300 bundle2-input: part type: "BOOKMARKS"
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
301 bundle2-input: part id: "3"
35264
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
302 bundle2-input: part parameters: 0
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
303 bundle2-input: found a handler for part bookmarks
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
304 bundle2-input-part: "bookmarks" supported
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
305 bundle2-input: payload chunk size: 23
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
306 bundle2-input: payload chunk size: 0
35264
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
307 bundle2-input-part: total payload size 23
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
308 bundle2-input: part header size: 0
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
309 bundle2-input: end of bundle2 stream
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
310 bundle2-input-bundle: 3 parts total
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
311 running hook txnclose-bookmark.test: sh $TESTTMP/hook.sh
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
312 test-hook-bookmark: W: 0000000000000000000000000000000000000000 ->
35264
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
313 bundle2-output-bundle: "HG20", 0 parts total
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
314 bundle2-output: start emission of HG20 stream
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
315 bundle2-output: bundle parameter:
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
316 bundle2-output: start of parts
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
317 bundle2-output: end of bundle
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
318 bundle2-input: start processing of HG20 stream
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
319 bundle2-input: reading bundle2 stream parameters
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
320 bundle2-input-bundle: no-transaction
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
321 bundle2-input: start extraction of bundle2 parts
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
322 bundle2-input: part header size: 0
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
323 bundle2-input: end of bundle2 stream
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
324 bundle2-input-bundle: 0 parts total
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
325 deleting remote bookmark W
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
326 listing keys for "phases"
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
327 [1]
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
328
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
329 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
330
28182
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
331 export the active bookmark
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
332
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
333 $ hg bookmark V
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
334 $ hg push -B . ../a
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
335 pushing to ../a
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
336 searching for changes
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
337 no changes found
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
338 exporting bookmark V
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
339 [1]
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
340
29354
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
341 exporting the active bookmark with 'push -B .'
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
342 demand that one of the bookmarks is activated
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
343
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
344 $ hg update -r default
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
345 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
346 (leaving bookmark V)
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
347 $ hg push -B . ../a
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
348 abort: no active bookmark
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
349 [255]
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
350 $ hg update -r V
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
351 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
352 (activating bookmark V)
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
353
28182
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
354 delete the bookmark
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
355
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
356 $ hg book -d V
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
357 $ hg push -B V ../a
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
358 pushing to ../a
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
359 searching for changes
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
360 no changes found
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
361 deleting remote bookmark V
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
362 [1]
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
363 $ hg up foobar
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
364 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
365 (activating bookmark foobar)
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
366
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
367 push/pull name that doesn't exist
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
368
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
369 $ hg push -B badname ../a
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
370 pushing to ../a
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
371 searching for changes
22651
b901645a8784 push: gather all bookmark decisions together
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22046
diff changeset
372 bookmark badname does not exist on the local or remote repository!
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
373 no changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12303
diff changeset
374 [2]
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
375 $ hg pull -B anotherbadname ../a
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
376 pulling from ../a
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
377 abort: remote bookmark anotherbadname not found!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12303
diff changeset
378 [255]
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
379
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
380 divergent bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
381
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
382 $ cd ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
383 $ echo c1 > f1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
384 $ hg ci -Am1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
385 adding f1
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
386 $ hg book -f @
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
387 $ hg book -f X
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
388 $ hg book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
389 @ 1:0d2164f0ce0d
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
390 * X 1:0d2164f0ce0d
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
391 Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
392 Z 1:0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
393
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
394 $ cd ../b
35027
7384250eabd9 dispatch: do not drop unpaired argument at _earlygetopt()
Yuya Nishihara <yuya@tcha.org>
parents: 34938
diff changeset
395 $ hg up
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
396 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16010
c7811ca6fb94 update: note updated bookmark
Kevin Bullock <kbullock@ringworld.org>
parents: 15935
diff changeset
397 updating bookmark foobar
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
398 $ echo c2 > f2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
399 $ hg ci -Am2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
400 adding f2
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
401 $ hg book -if @
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
402 $ hg book -if X
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
403 $ hg book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
404 @ 1:9b140be10808
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
405 X 1:9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
406 Y 0:4e3505fd9583
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
407 Z 0:4e3505fd9583
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
408 foo -1:000000000000
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
409 * foobar 1:9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
410
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
411 $ hg pull --config paths.foo=../a foo --config "$TESTHOOK"
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35264
diff changeset
412 pulling from $TESTTMP/a
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
413 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
414 adding changesets
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
415 adding manifests
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
416 adding file changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
417 added 1 changesets with 1 changes to 1 files (+1 heads)
18363
c6e033a7dd38 bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents: 18255
diff changeset
418 divergent bookmark @ stored as @foo
15614
260a6449d83a bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com>
parents: 15613
diff changeset
419 divergent bookmark X stored as X@foo
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
420 updating bookmark Z
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33773
diff changeset
421 new changesets 0d2164f0ce0d
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
422 test-hook-bookmark: @foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
423 test-hook-bookmark: X@foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
424 test-hook-bookmark: Z: 4e3505fd95835d721066b76e75dbb8cc554d7f77 -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
425 (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
426 $ hg book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
427 @ 1:9b140be10808
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
428 @foo 2:0d2164f0ce0d
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
429 X 1:9b140be10808
15614
260a6449d83a bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]
Matt Mackall <mpm@selenic.com>
parents: 15613
diff changeset
430 X@foo 2:0d2164f0ce0d
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
431 Y 0:4e3505fd9583
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
432 Z 2:0d2164f0ce0d
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
433 foo -1:000000000000
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
434 * foobar 1:9b140be10808
24353
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
435
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
436 (test that too many divergence of bookmark)
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
437
32940
75be14993fda cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents: 32077
diff changeset
438 $ $PYTHON $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -r 000000000000 "X@${i}"; done
24353
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
439 $ hg pull ../a
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
440 pulling from ../a
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
441 searching for changes
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
442 no changes found
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
443 warning: failed to assign numbered name to divergent bookmark X
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
444 divergent bookmark @ stored as @1
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
445 $ hg bookmarks | grep '^ X' | grep -v ':000000000000'
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
446 X 1:9b140be10808
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
447 X@foo 2:0d2164f0ce0d
24355
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
448
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
449 (test that remotely diverged bookmarks are reused if they aren't changed)
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
450
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
451 $ hg bookmarks | grep '^ @'
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
452 @ 1:9b140be10808
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
453 @1 2:0d2164f0ce0d
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
454 @foo 2:0d2164f0ce0d
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
455 $ hg pull ../a
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
456 pulling from ../a
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
457 searching for changes
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
458 no changes found
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
459 warning: failed to assign numbered name to divergent bookmark X
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
460 divergent bookmark @ stored as @1
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
461 $ hg bookmarks | grep '^ @'
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
462 @ 1:9b140be10808
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
463 @1 2:0d2164f0ce0d
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
464 @foo 2:0d2164f0ce0d
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
465
32940
75be14993fda cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents: 32077
diff changeset
466 $ $PYTHON $TESTDIR/seq.py 1 100 | while read i; do hg bookmarks -d "X@${i}"; done
24353
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
467 $ hg bookmarks -d "@1"
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
468
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
469 $ hg push -f ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
470 pushing to ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
471 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
472 adding changesets
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
473 adding manifests
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
474 adding file changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
475 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
476 $ hg -R ../a book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
477 @ 1:0d2164f0ce0d
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
478 * X 1:0d2164f0ce0d
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
479 Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
480 Z 1:0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
481
23543
4dd8a6a1240d spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 23416
diff changeset
482 explicit pull should overwrite the local version (issue4439)
23199
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
483
29376
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
484 $ hg update -r X
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
485 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
486 (activating bookmark X)
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
487 $ hg pull --config paths.foo=../a foo -B . --config "$TESTHOOK"
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35264
diff changeset
488 pulling from $TESTTMP/a
23199
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
489 no changes found
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
490 divergent bookmark @ stored as @foo
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
491 importing bookmark X
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
492 test-hook-bookmark: @foo: 0d2164f0ce0d8f1d6f94351eba04b794909be66c -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
493 test-hook-bookmark: X: 9b140be1080824d768c5a4691a564088eede71f9 -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
23199
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
494
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
495 reinstall state for further testing:
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
496
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
497 $ hg book -fr 9b140be10808 X
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
498
18495
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
499 revsets should not ignore divergent bookmarks
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
500
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
501 $ hg bookmark -fr 1 Z
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
502 $ hg log -r 'bookmark()' --template '{rev}:{node|short} {bookmarks}\n'
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
503 0:4e3505fd9583 Y
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
504 1:9b140be10808 @ X Z foobar
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
505 2:0d2164f0ce0d @foo X@foo
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
506 $ hg log -r 'bookmark("X@foo")' --template '{rev}:{node|short} {bookmarks}\n'
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
507 2:0d2164f0ce0d @foo X@foo
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
508 $ hg log -r 'bookmark("re:X@foo")' --template '{rev}:{node|short} {bookmarks}\n'
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
509 2:0d2164f0ce0d @foo X@foo
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
510
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
511 update a remote bookmark from a non-head to a head
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
512
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
513 $ hg up -q Y
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
514 $ echo c3 > f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
515 $ hg ci -Am3
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
516 adding f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
517 created new head
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
518 $ hg push ../a --config "$TESTHOOK"
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
519 pushing to ../a
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
520 searching for changes
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
521 adding changesets
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
522 adding manifests
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
523 adding file changes
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
524 added 1 changesets with 1 changes to 1 files (+1 heads)
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
525 test-hook-bookmark: Y: 4e3505fd95835d721066b76e75dbb8cc554d7f77 -> f6fc62dde3c0771e29704af56ba4d8af77abcc2f
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
526 updating bookmark Y
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
527 $ hg -R ../a book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
528 @ 1:0d2164f0ce0d
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
529 * X 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
530 Y 3:f6fc62dde3c0
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
531 Z 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
532
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
533 update a bookmark in the middle of a client pulling changes
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
534
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
535 $ cd ..
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
536 $ hg clone -q a pull-race
25442
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
537
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
538 We want to use http because it is stateless and therefore more susceptible to
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
539 race conditions
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
540
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28182
diff changeset
541 $ hg serve -R pull-race -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log
25442
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
542 $ cat pull-race.pid >> $DAEMON_PIDS
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
543
32077
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
544 $ cat <<EOF > $TESTTMP/out_makecommit.sh
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
545 > #!/bin/sh
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
546 > hg ci -Am5
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
547 > echo committed in pull-race
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
548 > EOF
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
549
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
550 $ hg clone -q http://localhost:$HGPORT/ pull-race2 --config "$TESTHOOK"
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
551 test-hook-bookmark: @: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
552 test-hook-bookmark: X: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
553 test-hook-bookmark: Y: -> f6fc62dde3c0771e29704af56ba4d8af77abcc2f
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
554 test-hook-bookmark: Z: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
555 $ cd pull-race
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
556 $ hg up -q Y
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
557 $ echo c4 > f2
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
558 $ hg ci -Am4
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
559 $ echo c5 > f3
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
560 $ cat <<EOF > .hg/hgrc
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
561 > [hooks]
32077
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
562 > outgoing.makecommit = sh $TESTTMP/out_makecommit.sh
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
563 > EOF
25442
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
564
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
565 (new config needs a server restart)
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
566
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
567 $ cd ..
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
568 $ killdaemons.py
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28182
diff changeset
569 $ hg serve -R pull-race -p $HGPORT -d --pid-file=pull-race.pid -E main-error.log
25442
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
570 $ cat pull-race.pid >> $DAEMON_PIDS
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
571 $ cd pull-race2
25441
58b766a21189 test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25357
diff changeset
572 $ hg -R $TESTTMP/pull-race book
58b766a21189 test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25357
diff changeset
573 @ 1:0d2164f0ce0d
58b766a21189 test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25357
diff changeset
574 X 1:0d2164f0ce0d
58b766a21189 test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25357
diff changeset
575 * Y 4:b0a5eff05604
58b766a21189 test: display pre-pull remote bookmark state when testing race condition
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25357
diff changeset
576 Z 1:0d2164f0ce0d
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
577 $ hg pull
25442
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
578 pulling from http://localhost:$HGPORT/
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
579 searching for changes
25352
ddf99471e023 test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24661
diff changeset
580 adding changesets
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
581 adding manifests
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
582 adding file changes
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
583 added 1 changesets with 1 changes to 1 files
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
584 updating bookmark Y
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33773
diff changeset
585 new changesets b0a5eff05604
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
586 (run 'hg update' to get a working copy)
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
587 $ hg book
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
588 * @ 1:0d2164f0ce0d
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
589 X 1:0d2164f0ce0d
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
590 Y 4:b0a5eff05604
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
591 Z 1:0d2164f0ce0d
25442
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
592
25446
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
593 Update a bookmark right after the initial lookup -B (issue4689)
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
594
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
595 $ echo c6 > ../pull-race/f3 # to be committed during the race
32077
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
596 $ cat <<EOF > $TESTTMP/listkeys_makecommit.sh
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
597 > #!/bin/sh
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
598 > if hg st | grep -q M; then
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
599 > hg commit -m race
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
600 > echo committed in pull-race
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
601 > else
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
602 > exit 0
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
603 > fi
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
604 > EOF
25446
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
605 $ cat <<EOF > ../pull-race/.hg/hgrc
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
606 > [hooks]
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
607 > # If anything to commit, commit it right after the first key listing used
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
608 > # during lookup. This makes the commit appear before the actual getbundle
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
609 > # call.
32077
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
610 > listkeys.makecommit= sh $TESTTMP/listkeys_makecommit.sh
25446
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
611 > EOF
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
612
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
613 (new config need server restart)
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
614
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
615 $ killdaemons.py
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28182
diff changeset
616 $ hg serve -R ../pull-race -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log
25446
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
617 $ cat ../pull-race.pid >> $DAEMON_PIDS
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
618
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
619 $ hg -R $TESTTMP/pull-race book
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
620 @ 1:0d2164f0ce0d
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
621 X 1:0d2164f0ce0d
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
622 * Y 5:35d1ef0a8d1b
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
623 Z 1:0d2164f0ce0d
29376
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
624 $ hg update -r Y
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
625 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
626 (activating bookmark Y)
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
627 $ hg pull -B .
25446
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
628 pulling from http://localhost:$HGPORT/
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
629 searching for changes
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
630 adding changesets
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
631 adding manifests
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
632 adding file changes
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
633 added 1 changesets with 1 changes to 1 files
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
634 updating bookmark Y
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33773
diff changeset
635 new changesets 35d1ef0a8d1b
25446
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
636 (run 'hg update' to get a working copy)
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
637 $ hg book
29376
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
638 @ 1:0d2164f0ce0d
25446
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
639 X 1:0d2164f0ce0d
29376
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
640 * Y 5:35d1ef0a8d1b
25446
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
641 Z 1:0d2164f0ce0d
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
642
25442
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
643 (done with this section of the test)
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
644
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
645 $ killdaemons.py
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
646 $ cd ../b
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
647
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
648 diverging a remote bookmark fails
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
649
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
650 $ hg up -q 4e3505fd9583
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
651 $ echo c4 > f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
652 $ hg ci -Am4
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
653 adding f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
654 created new head
17864
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
655 $ echo c5 > f2
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
656 $ hg ci -Am5
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
657 $ hg log -G
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
658 @ 5:c922c0139ca0 5
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
659 |
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
660 o 4:4efff6d98829 4
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
661 |
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
662 | o 3:f6fc62dde3c0 3
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
663 |/
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
664 | o 2:0d2164f0ce0d 1
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
665 |/
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
666 | o 1:9b140be10808 2
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
667 |/
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
668 o 0:4e3505fd9583 test
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
669
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
670
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
671 $ hg book -f Y
17043
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
672
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
673 $ cat <<EOF > ../a/.hg/hgrc
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
674 > [web]
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
675 > push_ssl = false
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
676 > allow_push = *
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
677 > EOF
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
678
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28182
diff changeset
679 $ hg serve -R ../a -p $HGPORT2 -d --pid-file=../hg2.pid
17043
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
680 $ cat ../hg2.pid >> $DAEMON_PIDS
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
681
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
682 $ hg push http://localhost:$HGPORT2/
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
683 pushing to http://localhost:$HGPORT2/
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
684 searching for changes
21580
32601b0b74c0 discovery: if a push would create a new head, mention the bookmark name if any
Stephen Lee <sphen.lee@gmail.com>
parents: 21404
diff changeset
685 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
29973
4ddb05751b12 discovery: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 29688
diff changeset
686 (merge or see 'hg help push' for details about pushing new heads)
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
687 [255]
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
688 $ hg -R ../a book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
689 @ 1:0d2164f0ce0d
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
690 * X 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
691 Y 3:f6fc62dde3c0
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
692 Z 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
693
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
694
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
695 Unrelated marker does not alter the decision
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
696
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
697 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
698 $ hg push http://localhost:$HGPORT2/
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
699 pushing to http://localhost:$HGPORT2/
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
700 searching for changes
21580
32601b0b74c0 discovery: if a push would create a new head, mention the bookmark name if any
Stephen Lee <sphen.lee@gmail.com>
parents: 21404
diff changeset
701 abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
29973
4ddb05751b12 discovery: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 29688
diff changeset
702 (merge or see 'hg help push' for details about pushing new heads)
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
703 [255]
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
704 $ hg -R ../a book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
705 @ 1:0d2164f0ce0d
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
706 * X 1:0d2164f0ce0d
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
707 Y 3:f6fc62dde3c0
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
708 Z 1:0d2164f0ce0d
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
709
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
710 Update to a successor works
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
711
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
712 $ hg id --debug -r 3
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
713 f6fc62dde3c0771e29704af56ba4d8af77abcc2f
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
714 $ hg id --debug -r 4
17864
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
715 4efff6d98829d9c824c621afd6e3f01865f5439f
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
716 $ hg id --debug -r 5
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
717 c922c0139ca03858f655e4a2af4dd02796a63969 tip Y
17865
daf32ebfde6b bookmark: prevent crashing when a successor is unknown locally (issue3680)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17864
diff changeset
718 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33286
diff changeset
719 obsoleted 1 changesets
17865
daf32ebfde6b bookmark: prevent crashing when a successor is unknown locally (issue3680)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17864
diff changeset
720 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
721 $ hg push http://localhost:$HGPORT2/
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
722 pushing to http://localhost:$HGPORT2/
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
723 searching for changes
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
724 remote: adding changesets
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
725 remote: adding manifests
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
726 remote: adding file changes
17864
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
727 remote: added 2 changesets with 2 changes to 1 files (+1 heads)
25352
ddf99471e023 test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24661
diff changeset
728 remote: 2 new obsolescence markers
33252
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32940
diff changeset
729 remote: obsoleted 1 changesets
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
730 updating bookmark Y
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
731 $ hg -R ../a book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
732 @ 1:0d2164f0ce0d
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
733 * X 1:0d2164f0ce0d
17864
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
734 Y 5:c922c0139ca0
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
735 Z 1:0d2164f0ce0d
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
736
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
737 hgweb
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
738
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
739 $ cat <<EOF > .hg/hgrc
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
740 > [web]
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
741 > push_ssl = false
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
742 > allow_push = *
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
743 > EOF
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
744
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
745 $ 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
746 $ 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
747 $ cd ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
748
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17298
diff changeset
749 $ hg debugpushkey http://localhost:$HGPORT/ namespaces
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
750 bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
751 namespaces
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
752 obsolete
18255
7ca534f31a83 debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents: 17882
diff changeset
753 phases
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
754 $ hg debugpushkey http://localhost:$HGPORT/ bookmarks
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
755 @ 9b140be1080824d768c5a4691a564088eede71f9
18255
7ca534f31a83 debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents: 17882
diff changeset
756 X 9b140be1080824d768c5a4691a564088eede71f9
7ca534f31a83 debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents: 17882
diff changeset
757 Y c922c0139ca03858f655e4a2af4dd02796a63969
18495
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
758 Z 9b140be1080824d768c5a4691a564088eede71f9
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
759 foo 0000000000000000000000000000000000000000
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
760 foobar 9b140be1080824d768c5a4691a564088eede71f9
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
761 $ 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
762 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
763 searching for changed bookmarks
24658
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
764 @ 0d2164f0ce0d
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
765 X 0d2164f0ce0d
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
766 Z 0d2164f0ce0d
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
767 foo
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
768 foobar
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
769 $ 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
770 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
771 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
772 no changes found
22651
b901645a8784 push: gather all bookmark decisions together
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22046
diff changeset
773 updating bookmark Z
16038
dad96e752079 push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents: 16010
diff changeset
774 [1]
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
775 $ hg book -d Z
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
776 $ 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
777 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
778 searching for changed bookmarks
24657
3d7c512b258d bookmarks: show incoming bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24400
diff changeset
779 @ 9b140be10808
3d7c512b258d bookmarks: show incoming bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24400
diff changeset
780 X 9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
781 Z 0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
782 foo 000000000000
15935
6c97eb445341 bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
Matt Mackall <mpm@selenic.com>
parents: 15648
diff changeset
783 foobar 9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
784 $ 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
785 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
786 no changes found
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
787 divergent bookmark @ stored as @1
18363
c6e033a7dd38 bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents: 18255
diff changeset
788 divergent bookmark X stored as X@1
c6e033a7dd38 bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents: 18255
diff changeset
789 adding remote bookmark Z
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
790 adding remote bookmark foo
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
791 adding remote bookmark foobar
13604
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
792 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
793 requesting all changes
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
794 adding changesets
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
795 adding manifests
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
796 adding file changes
17864
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
797 added 5 changesets with 5 changes to 3 files (+2 heads)
25352
ddf99471e023 test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24661
diff changeset
798 2 new obsolescence markers
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33773
diff changeset
799 new changesets 4e3505fd9583:c922c0139ca0
17882
36ed69d4593d clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents: 17872
diff changeset
800 updating to bookmark @
13604
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
801 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
802 $ hg -R cloned-bookmarks bookmarks
17870
7d2dd10ce9ea clone: activate @ bookmark if updating to it
Thomas Arendsen Hein <thomas@intevation.de>
parents: 17865
diff changeset
803 * @ 1:9b140be10808
13604
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
804 X 1:9b140be10808
17864
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
805 Y 4:c922c0139ca0
13604
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
806 Z 2:0d2164f0ce0d
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
807 foo -1:000000000000
15935
6c97eb445341 bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
Matt Mackall <mpm@selenic.com>
parents: 15648
diff changeset
808 foobar 1:9b140be10808
17346
2944a6d35158 check-code: fix check for trailing whitespace on empty lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
809
17189
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
810 $ cd ..
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
811
30332
318a24b52eeb spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
812 Test to show result of bookmarks comparison
24659
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
813
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
814 $ mkdir bmcomparison
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
815 $ cd bmcomparison
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
816
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
817 $ hg init source
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
818 $ hg -R source debugbuilddag '+2*2*3*4'
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
819 $ hg -R source log -G --template '{rev}:{node|short}'
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
820 o 4:e7bd5218ca15
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
821 |
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
822 | o 3:6100d3090acf
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
823 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
824 | o 2:fa942426a6fd
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
825 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
826 | o 1:66f7d451a68b
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
827 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
828 o 0:1ea73414a91b
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
829
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
830 $ hg -R source bookmarks -r 0 SAME
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
831 $ hg -R source bookmarks -r 0 ADV_ON_REPO1
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
832 $ hg -R source bookmarks -r 0 ADV_ON_REPO2
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
833 $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO1
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
834 $ hg -R source bookmarks -r 0 DIFF_ADV_ON_REPO2
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
835 $ hg -R source bookmarks -r 1 DIVERGED
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
836
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
837 $ hg clone -U source repo1
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
838
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
839 (test that incoming/outgoing exit with 1, if there is no bookmark to
26781
1aee2ab0f902 spelling: trivial spell checking
Mads Kiilerich <madski@unity3d.com>
parents: 25501
diff changeset
840 be exchanged)
24659
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
841
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
842 $ hg -R repo1 incoming -B
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35264
diff changeset
843 comparing with $TESTTMP/bmcomparison/source
24659
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
844 searching for changed bookmarks
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
845 no changed bookmarks found
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
846 [1]
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
847 $ hg -R repo1 outgoing -B
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35264
diff changeset
848 comparing with $TESTTMP/bmcomparison/source
24659
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
849 searching for changed bookmarks
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
850 no changed bookmarks found
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
851 [1]
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
852
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
853 $ hg -R repo1 bookmarks -f -r 1 ADD_ON_REPO1
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
854 $ hg -R repo1 bookmarks -f -r 2 ADV_ON_REPO1
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
855 $ hg -R repo1 bookmarks -f -r 3 DIFF_ADV_ON_REPO1
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
856 $ hg -R repo1 bookmarks -f -r 3 DIFF_DIVERGED
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
857 $ hg -R repo1 -q --config extensions.mq= strip 4
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
858 $ hg -R repo1 log -G --template '{node|short} ({bookmarks})'
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
859 o 6100d3090acf (DIFF_ADV_ON_REPO1 DIFF_DIVERGED)
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
860 |
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
861 | o fa942426a6fd (ADV_ON_REPO1)
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
862 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
863 | o 66f7d451a68b (ADD_ON_REPO1 DIVERGED)
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
864 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
865 o 1ea73414a91b (ADV_ON_REPO2 DIFF_ADV_ON_REPO2 SAME)
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
866
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
867
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
868 $ hg clone -U source repo2
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
869 $ hg -R repo2 bookmarks -f -r 1 ADD_ON_REPO2
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
870 $ hg -R repo2 bookmarks -f -r 1 ADV_ON_REPO2
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
871 $ hg -R repo2 bookmarks -f -r 2 DIVERGED
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
872 $ hg -R repo2 bookmarks -f -r 4 DIFF_ADV_ON_REPO2
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
873 $ hg -R repo2 bookmarks -f -r 4 DIFF_DIVERGED
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
874 $ hg -R repo2 -q --config extensions.mq= strip 3
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
875 $ hg -R repo2 log -G --template '{node|short} ({bookmarks})'
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
876 o e7bd5218ca15 (DIFF_ADV_ON_REPO2 DIFF_DIVERGED)
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
877 |
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
878 | o fa942426a6fd (DIVERGED)
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
879 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
880 | o 66f7d451a68b (ADD_ON_REPO2 ADV_ON_REPO2)
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
881 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
882 o 1ea73414a91b (ADV_ON_REPO1 DIFF_ADV_ON_REPO1 SAME)
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
883
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
884
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
885 (test that difference of bookmarks between repositories are fully shown)
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
886
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
887 $ hg -R repo1 incoming -B repo2 -v
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
888 comparing with repo2
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
889 searching for changed bookmarks
24660
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
890 ADD_ON_REPO2 66f7d451a68b added
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
891 ADV_ON_REPO2 66f7d451a68b advanced
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
892 DIFF_ADV_ON_REPO2 e7bd5218ca15 changed
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
893 DIFF_DIVERGED e7bd5218ca15 changed
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
894 DIVERGED fa942426a6fd diverged
24659
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
895 $ hg -R repo1 outgoing -B repo2 -v
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
896 comparing with repo2
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
897 searching for changed bookmarks
24661
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
898 ADD_ON_REPO1 66f7d451a68b added
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
899 ADD_ON_REPO2 deleted
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
900 ADV_ON_REPO1 fa942426a6fd advanced
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
901 DIFF_ADV_ON_REPO1 6100d3090acf advanced
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
902 DIFF_ADV_ON_REPO2 1ea73414a91b changed
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
903 DIFF_DIVERGED 6100d3090acf changed
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
904 DIVERGED 66f7d451a68b diverged
24659
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
905
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
906 $ hg -R repo2 incoming -B repo1 -v
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
907 comparing with repo1
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
908 searching for changed bookmarks
24660
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
909 ADD_ON_REPO1 66f7d451a68b added
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
910 ADV_ON_REPO1 fa942426a6fd advanced
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
911 DIFF_ADV_ON_REPO1 6100d3090acf changed
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
912 DIFF_DIVERGED 6100d3090acf changed
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
913 DIVERGED 66f7d451a68b diverged
24659
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
914 $ hg -R repo2 outgoing -B repo1 -v
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
915 comparing with repo1
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
916 searching for changed bookmarks
24661
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
917 ADD_ON_REPO1 deleted
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
918 ADD_ON_REPO2 66f7d451a68b added
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
919 ADV_ON_REPO2 66f7d451a68b advanced
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
920 DIFF_ADV_ON_REPO1 1ea73414a91b changed
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
921 DIFF_ADV_ON_REPO2 e7bd5218ca15 advanced
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
922 DIFF_DIVERGED e7bd5218ca15 changed
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
923 DIVERGED fa942426a6fd diverged
24659
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
924
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
925 $ cd ..
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
926
17189
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
927 Pushing a bookmark should only push the changes required by that
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
928 bookmark, not all outgoing changes:
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
929 $ hg clone http://localhost:$HGPORT/ addmarks
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
930 requesting all changes
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
931 adding changesets
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
932 adding manifests
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
933 adding file changes
17864
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
934 added 5 changesets with 5 changes to 3 files (+2 heads)
25352
ddf99471e023 test: use bundle2 for exchange in test-bookmark-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24661
diff changeset
935 2 new obsolescence markers
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 33773
diff changeset
936 new changesets 4e3505fd9583:c922c0139ca0
17882
36ed69d4593d clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents: 17872
diff changeset
937 updating to bookmark @
17189
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
938 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
939 $ cd addmarks
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
940 $ echo foo > foo
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
941 $ hg add foo
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
942 $ hg commit -m 'add foo'
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
943 $ echo bar > bar
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
944 $ hg add bar
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
945 $ hg commit -m 'add bar'
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
946 $ hg co "tip^"
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
947 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21404
ca275f7ec576 update: when deactivating a bookmark, print a message
Siddharth Agarwal <sid0@fb.com>
parents: 20184
diff changeset
948 (leaving bookmark @)
17189
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
949 $ hg book add-foo
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
950 $ hg book -r tip add-bar
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
951 Note: this push *must* push only a single changeset, as that's the point
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
952 of this test.
17548
eaa5fcc5bd20 checkheads: check successors for new heads in both missing and common
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17346
diff changeset
953 $ hg push -B add-foo --traceback
17189
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
954 pushing to http://localhost:$HGPORT/
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
955 searching for changes
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
956 remote: adding changesets
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
957 remote: adding manifests
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
958 remote: adding file changes
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
959 remote: added 1 changesets with 1 changes to 1 files
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
960 exporting bookmark add-foo
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
961
20184
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
962 pushing a new bookmark on a new head does not require -f if -B is specified
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
963
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
964 $ hg up -q X
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
965 $ hg book W
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
966 $ echo c5 > f2
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
967 $ hg ci -Am5
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
968 created new head
29229
89bba2beb03e bookmarks: allow pushing active bookmark on new remote head (issue5236)
liscju <piotr.listkiewicz@gmail.com>
parents: 28549
diff changeset
969 $ hg push -B .
20184
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
970 pushing to http://localhost:$HGPORT/
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
971 searching for changes
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
972 remote: adding changesets
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
973 remote: adding manifests
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
974 remote: adding file changes
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
975 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
976 exporting bookmark W
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
977 $ hg -R ../b id -r W
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
978 cc978a373a53 tip W
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
979
26819
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
980 pushing an existing but divergent bookmark with -B still requires -f
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
981
28082
db90cb1e89c8 bookmarks: avoid creating a nested repository during testing
Martijn Pieters <mjpieters@fb.com>
parents: 26819
diff changeset
982 $ hg clone -q . ../r
26819
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
983 $ hg up -q X
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
984 $ echo 1 > f2
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
985 $ hg ci -qAml
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
986
28082
db90cb1e89c8 bookmarks: avoid creating a nested repository during testing
Martijn Pieters <mjpieters@fb.com>
parents: 26819
diff changeset
987 $ cd ../r
26819
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
988 $ hg up -q X
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
989 $ echo 2 > f2
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
990 $ hg ci -qAmr
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
991 $ hg push -B X
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35264
diff changeset
992 pushing to $TESTTMP/addmarks
26819
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
993 searching for changes
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
994 remote has heads on branch 'default' that are not known locally: a2a606d9ff1b
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
995 abort: push creates new remote head 54694f811df9 with bookmark 'X'!
29973
4ddb05751b12 discovery: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 29688
diff changeset
996 (pull and merge or see 'hg help push' for details about pushing new heads)
26819
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
997 [255]
28082
db90cb1e89c8 bookmarks: avoid creating a nested repository during testing
Martijn Pieters <mjpieters@fb.com>
parents: 26819
diff changeset
998 $ cd ../addmarks
26819
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
999
24400
03c84c966ef5 bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24361
diff changeset
1000 Check summary output for incoming/outgoing bookmarks
03c84c966ef5 bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24361
diff changeset
1001
03c84c966ef5 bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24361
diff changeset
1002 $ hg bookmarks -d X
03c84c966ef5 bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24361
diff changeset
1003 $ hg bookmarks -d Y
03c84c966ef5 bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24361
diff changeset
1004 $ hg summary --remote | grep '^remote:'
03c84c966ef5 bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24361
diff changeset
1005 remote: *, 2 incoming bookmarks, 1 outgoing bookmarks (glob)
03c84c966ef5 bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24361
diff changeset
1006
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16835
diff changeset
1007 $ cd ..
23082
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1008
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1009 pushing an unchanged bookmark should result in no changes
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1010
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1011 $ hg init unchanged-a
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1012 $ hg init unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1013 $ cd unchanged-a
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1014 $ echo initial > foo
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1015 $ hg commit -A -m initial
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1016 adding foo
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1017 $ hg bookmark @
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1018 $ hg push -B @ ../unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1019 pushing to ../unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1020 searching for changes
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1021 adding changesets
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1022 adding manifests
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1023 adding file changes
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1024 added 1 changesets with 1 changes to 1 files
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1025 exporting bookmark @
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1026
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1027 $ hg push -B @ ../unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1028 pushing to ../unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1029 searching for changes
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1030 no changes found
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1031 [1]
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1032
36789
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1033 Pushing a really long bookmark should work fine (issue5165)
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1034 ===============================================
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1035
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1036 #if b2-binary
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1037 >>> open('longname', 'w').write('wat' * 100)
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1038 $ hg book `cat longname`
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1039 $ hg push -B `cat longname` ../unchanged-b
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1040 pushing to ../unchanged-b
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1041 searching for changes
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1042 no changes found
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1043 exporting bookmark (wat){100} (re)
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1044 [1]
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1045 $ hg -R ../unchanged-b book --delete `cat longname`
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1046
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1047 Test again but forcing bundle2 exchange to make sure that doesn't regress.
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1048
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1049 $ hg push -B `cat longname` ../unchanged-b --config devel.legacy.exchange=bundle1
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1050 pushing to ../unchanged-b
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1051 searching for changes
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1052 no changes found
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1053 exporting bookmark (wat){100} (re)
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1054 [1]
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1055 $ hg -R ../unchanged-b book --delete `cat longname`
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1056 $ hg book --delete `cat longname`
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1057 $ hg co @
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1058 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1059 (activating bookmark @)
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1060 #endif
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1061
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1062 Check hook preventing push (issue4455)
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1063 ======================================
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1064
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1065 $ hg bookmarks
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1066 * @ 0:55482a6fb4b1
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1067 $ hg log -G
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1068 @ 0:55482a6fb4b1 initial
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1069
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1070 $ hg init ../issue4455-dest
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1071 $ hg push ../issue4455-dest # changesets only
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1072 pushing to ../issue4455-dest
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1073 searching for changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1074 adding changesets
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1075 adding manifests
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1076 adding file changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1077 added 1 changesets with 1 changes to 1 files
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1078 $ cat >> .hg/hgrc << EOF
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1079 > [paths]
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1080 > local=../issue4455-dest/
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1081 > ssh=ssh://user@dummy/issue4455-dest
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1082 > http=http://localhost:$HGPORT/
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1083 > [ui]
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 33252
diff changeset
1084 > ssh=$PYTHON "$TESTDIR/dummyssh"
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1085 > EOF
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1086 $ cat >> ../issue4455-dest/.hg/hgrc << EOF
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1087 > [hooks]
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1088 > prepushkey=false
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1089 > [web]
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1090 > push_ssl = false
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1091 > allow_push = *
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1092 > EOF
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
1093 $ killdaemons.py
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28182
diff changeset
1094 $ hg serve -R ../issue4455-dest -p $HGPORT -d --pid-file=../issue4455.pid -E ../issue4455-error.log
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1095 $ cat ../issue4455.pid >> $DAEMON_PIDS
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1096
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1097 Local push
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1098 ----------
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1099
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1100 #if b2-pushkey
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1101
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1102 $ hg push -B @ local
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35264
diff changeset
1103 pushing to $TESTTMP/issue4455-dest
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1104 searching for changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1105 no changes found
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1106 pushkey-abort: prepushkey hook exited with status 1
25501
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25495
diff changeset
1107 abort: exporting bookmark @ failed!
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25495
diff changeset
1108 [255]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1109
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1110 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1111 #if b2-binary
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1112
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1113 $ hg push -B @ local
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35264
diff changeset
1114 pushing to $TESTTMP/issue4455-dest
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1115 searching for changes
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1116 no changes found
35264
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
1117 abort: prepushkey hook exited with status 1
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1118 [255]
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1119
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1120 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1121
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1122 $ hg -R ../issue4455-dest/ bookmarks
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1123 no bookmarks set
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1124
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1125 Using ssh
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1126 ---------
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1127
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1128 #if b2-pushkey
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1129
29688
30c59bdd4f41 tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29687
diff changeset
1130 $ hg push -B @ ssh # bundle2+
25357
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1131 pushing to ssh://user@dummy/issue4455-dest
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1132 searching for changes
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1133 no changes found
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1134 remote: pushkey-abort: prepushkey hook exited with status 1
25501
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25495
diff changeset
1135 abort: exporting bookmark @ failed!
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25495
diff changeset
1136 [255]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1137
25357
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1138 $ hg -R ../issue4455-dest/ bookmarks
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1139 no bookmarks set
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1140
29687
ac9b85079122 tests: use 'legacy.exchange' option in various mixed tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29681
diff changeset
1141 $ hg push -B @ ssh --config devel.legacy.exchange=bundle1
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1142 pushing to ssh://user@dummy/issue4455-dest
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1143 searching for changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1144 no changes found
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1145 remote: pushkey-abort: prepushkey hook exited with status 1
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1146 exporting bookmark @ failed!
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1147 [1]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1148
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1149 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1150 #if b2-binary
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1151
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1152 $ hg push -B @ ssh # bundle2+
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1153 pushing to ssh://user@dummy/issue4455-dest
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1154 searching for changes
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1155 no changes found
35264
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
1156 remote: prepushkey hook exited with status 1
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
1157 abort: push failed on remote
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1158 [255]
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1159
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1160 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1161
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1162 $ hg -R ../issue4455-dest/ bookmarks
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1163 no bookmarks set
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1164
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1165 Using http
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1166 ----------
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1167
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1168 #if b2-pushkey
29688
30c59bdd4f41 tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29687
diff changeset
1169 $ hg push -B @ http # bundle2+
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1170 pushing to http://localhost:$HGPORT/
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1171 searching for changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1172 no changes found
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1173 remote: pushkey-abort: prepushkey hook exited with status 1
25501
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25495
diff changeset
1174 abort: exporting bookmark @ failed!
a99fee62611d bookmarks: abort the whole push if bookmarks fails to update (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25495
diff changeset
1175 [255]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1176
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1177 $ hg -R ../issue4455-dest/ bookmarks
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1178 no bookmarks set
25357
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1179
29687
ac9b85079122 tests: use 'legacy.exchange' option in various mixed tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29681
diff changeset
1180 $ hg push -B @ http --config devel.legacy.exchange=bundle1
25357
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1181 pushing to http://localhost:$HGPORT/
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1182 searching for changes
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1183 no changes found
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1184 remote: pushkey-abort: prepushkey hook exited with status 1
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1185 exporting bookmark @ failed!
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1186 [1]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1187
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1188 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1189
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1190 #if b2-binary
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1191
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1192 $ hg push -B @ ssh # bundle2+
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1193 pushing to ssh://user@dummy/issue4455-dest
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1194 searching for changes
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1195 no changes found
35264
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
1196 remote: prepushkey hook exited with status 1
a1e70c1dbec0 bookmark: use the 'bookmarks' bundle2 part to push bookmark update (issue5165)
Boris Feld <boris.feld@octobus.net>
parents: 35263
diff changeset
1197 abort: push failed on remote
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1198 [255]
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1199
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1200 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1201
25357
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1202 $ hg -R ../issue4455-dest/ bookmarks
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1203 no bookmarks set
35811
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1204
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1205 $ cd ..
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1206
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1207 Test that pre-pushkey compat for bookmark works as expected (issue5777)
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1208
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1209 $ cat << EOF >> $HGRCPATH
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1210 > [ui]
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1211 > ssh="$PYTHON" "$TESTDIR/dummyssh"
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1212 > [server]
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1213 > bookmarks-pushkey-compat = yes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1214 > EOF
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1215
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1216 $ hg init server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1217 $ echo foo > server/a
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1218 $ hg -R server book foo
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1219 $ hg -R server commit -Am a
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1220 adding a
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1221 $ hg clone ssh://user@dummy/server client
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1222 requesting all changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1223 adding changesets
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1224 adding manifests
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1225 adding file changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1226 added 1 changesets with 1 changes to 1 files
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1227 new changesets 79513d0d7716
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1228 updating to branch default
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1230
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1231 Forbid bookmark move on the server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1232
35815
b5df7fcf5d80 test-bookmarks-pushpull: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 35811
diff changeset
1233 $ cat << EOF >> $TESTDIR/no-bm-move.sh
b5df7fcf5d80 test-bookmarks-pushpull: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 35811
diff changeset
1234 > #!/bin/sh
b5df7fcf5d80 test-bookmarks-pushpull: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 35811
diff changeset
1235 > echo \$HG_NAMESPACE | grep -v bookmarks
b5df7fcf5d80 test-bookmarks-pushpull: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 35811
diff changeset
1236 > EOF
35811
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1237 $ cat << EOF >> server/.hg/hgrc
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1238 > [hooks]
35815
b5df7fcf5d80 test-bookmarks-pushpull: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 35811
diff changeset
1239 > prepushkey.no-bm-move= sh $TESTDIR/no-bm-move.sh
35811
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1240 > EOF
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1241
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1242 pushing changeset is okay
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1243
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1244 $ echo bar >> client/a
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1245 $ hg -R client commit -m b
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1246 $ hg -R client push
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1247 pushing to ssh://user@dummy/server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1248 searching for changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1249 remote: adding changesets
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1250 remote: adding manifests
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1251 remote: adding file changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1252 remote: added 1 changesets with 1 changes to 1 files
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1253
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1254 attempt to move the bookmark is rejected
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1255
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1256 $ hg -R client book foo -r .
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1257 moving bookmark 'foo' forward from 79513d0d7716
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1258
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1259 #if b2-pushkey
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1260 $ hg -R client push
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1261 pushing to ssh://user@dummy/server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1262 searching for changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1263 no changes found
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1264 remote: pushkey-abort: prepushkey.no-bm-move hook exited with status 1
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1265 abort: updating bookmark foo failed!
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1266 [255]
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1267 #endif
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1268 #if b2-binary
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1269 $ hg -R client push
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1270 pushing to ssh://user@dummy/server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1271 searching for changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1272 no changes found
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1273 remote: prepushkey.no-bm-move hook exited with status 1
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1274 abort: push failed on remote
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1275 [255]
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1276 #endif