annotate tests/test-bookmarks-pushpull.t @ 51395:a0d88b021a98

unbundle: faster computation of changed heads To compute the set of changed heads it's sufficient to look at the recent commits, instead of looking at all heads currently in existence.
author Arseniy Alekseyev <aalekseyev@janestreet.com>
date Thu, 21 Dec 2023 17:38:04 +0000
parents 2cf264e9aa75
children 7c1d7edff91b
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
45765
ed84a4d48910 config: add a new [command-templates] section for templates defined by hg
Martin von Zweigbergk <martinvonz@google.com>
parents: 44412
diff changeset
13 > [command-templates]
ed84a4d48910 config: add a new [command-templates] section for templates defined by hg
Martin von Zweigbergk <martinvonz@google.com>
parents: 44412
diff changeset
14 > log={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
18363
c6e033a7dd38 bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents: 18255
diff changeset
54 adding remote bookmark X
13662
80d6e1f63ed9 localrepo: do not update bookmarks in addchangegroup
David Soria Parra <dsp@php.net>
parents: 13604
diff changeset
55 updating bookmark Y
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
56 adding remote bookmark Z
42897
d7304434390f changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 42893
diff changeset
57 added 1 changesets with 1 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39304
diff changeset
58 new changesets 4e3505fd9583 (1 drafts)
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"
50381
2cf264e9aa75 configitems: enable changegroup3 by default (unless using infinitepush)
Matt Harbison <matt_harbison@yahoo.com>
parents: 48526
diff changeset
132 bundle2-output-part: "replycaps" 227 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
50381
2cf264e9aa75 configitems: enable changegroup3 by default (unless using infinitepush)
Matt Harbison <matt_harbison@yahoo.com>
parents: 48526
diff changeset
135 bundle2-output: payload chunk size: 227
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"
39146
f736fdbe546a remotephase: avoid full changelog iteration (issue5964)
Boris Feld <boris.feld@octobus.net>
parents: 38722
diff changeset
144 bundle2-output-part: "check:phases" 24 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
39146
f736fdbe546a remotephase: avoid full changelog iteration (issue5964)
Boris Feld <boris.feld@octobus.net>
parents: 38722
diff changeset
147 bundle2-output: payload chunk size: 24
35040
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
50381
2cf264e9aa75 configitems: enable changegroup3 by default (unless using infinitepush)
Matt Harbison <matt_harbison@yahoo.com>
parents: 48526
diff changeset
165 bundle2-input: payload chunk size: 227
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
50381
2cf264e9aa75 configitems: enable changegroup3 by default (unless using infinitepush)
Matt Harbison <matt_harbison@yahoo.com>
parents: 48526
diff changeset
167 bundle2-input-part: total payload size 227
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
39146
f736fdbe546a remotephase: avoid full changelog iteration (issue5964)
Boris Feld <boris.feld@octobus.net>
parents: 38722
diff changeset
183 bundle2-input: payload chunk size: 24
35040
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
39146
f736fdbe546a remotephase: avoid full changelog iteration (issue5964)
Boris Feld <boris.feld@octobus.net>
parents: 38722
diff changeset
185 bundle2-input-part: total payload size 24
35040
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
42931
181ee2118a96 bundle2: fix an off-by-one in debug message of number of parts
Martin von Zweigbergk <martinvonz@google.com>
parents: 42897
diff changeset
196 bundle2-input-bundle: 4 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
42931
181ee2118a96 bundle2: fix an off-by-one in debug message of number of parts
Martin von Zweigbergk <martinvonz@google.com>
parents: 42897
diff changeset
222 bundle2-input-bundle: 1 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"
50381
2cf264e9aa75 configitems: enable changegroup3 by default (unless using infinitepush)
Matt Harbison <matt_harbison@yahoo.com>
parents: 48526
diff changeset
244 bundle2-output-part: "replycaps" 227 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
50381
2cf264e9aa75 configitems: enable changegroup3 by default (unless using infinitepush)
Matt Harbison <matt_harbison@yahoo.com>
parents: 48526
diff changeset
247 bundle2-output: payload chunk size: 227
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"
39146
f736fdbe546a remotephase: avoid full changelog iteration (issue5964)
Boris Feld <boris.feld@octobus.net>
parents: 38722
diff changeset
256 bundle2-output-part: "check:phases" 24 bytes payload
35263
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
39146
f736fdbe546a remotephase: avoid full changelog iteration (issue5964)
Boris Feld <boris.feld@octobus.net>
parents: 38722
diff changeset
259 bundle2-output: payload chunk size: 24
35263
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
50381
2cf264e9aa75 configitems: enable changegroup3 by default (unless using infinitepush)
Matt Harbison <matt_harbison@yahoo.com>
parents: 48526
diff changeset
278 bundle2-input: payload chunk size: 227
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
50381
2cf264e9aa75 configitems: enable changegroup3 by default (unless using infinitepush)
Matt Harbison <matt_harbison@yahoo.com>
parents: 48526
diff changeset
280 bundle2-input-part: total payload size 227
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
39146
f736fdbe546a remotephase: avoid full changelog iteration (issue5964)
Boris Feld <boris.feld@octobus.net>
parents: 38722
diff changeset
296 bundle2-input: payload chunk size: 24
35263
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
39146
f736fdbe546a remotephase: avoid full changelog iteration (issue5964)
Boris Feld <boris.feld@octobus.net>
parents: 38722
diff changeset
298 bundle2-input-part: total payload size 24
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
42931
181ee2118a96 bundle2: fix an off-by-one in debug message of number of parts
Martin von Zweigbergk <martinvonz@google.com>
parents: 42897
diff changeset
310 bundle2-input-bundle: 4 parts total
35263
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
44372
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
331 Divergent bookmark cannot be exported
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
332
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
333 $ hg book W@default
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
334 $ hg push -B W@default ../a
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
335 pushing to ../a
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
336 searching for changes
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
337 cannot push divergent bookmark W@default!
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
338 no changes found
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
339 [2]
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
340 $ hg book -d W@default
8407031f195f bookmarks: prevent pushes of divergent bookmarks (foo@remote)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 42931
diff changeset
341
28182
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
342 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
343
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
344 $ hg bookmark V
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
345 $ 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
346 pushing to ../a
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
347 searching for changes
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
348 no changes found
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
349 exporting bookmark V
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
350 [1]
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
351
29354
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
352 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
353 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
354
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
355 $ hg update -r default
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
356 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
357 (leaving bookmark V)
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
358 $ hg push -B . ../a
45906
95c4cca641f6 errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents: 45827
diff changeset
359 abort: no active bookmark
48368
8c4881c07f57 errors: use detailed exit code for RepoLookupError
Martin von Zweigbergk <martinvonz@google.com>
parents: 48244
diff changeset
360 [10]
29354
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
361 $ hg update -r V
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
362 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
363 (activating bookmark V)
af849596752c bookmarks: abort 'push -B .' when no active bookmark
liscju <piotr.listkiewicz@gmail.com>
parents: 29229
diff changeset
364
28182
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
365 delete the bookmark
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
366
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
367 $ 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
368 $ 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
369 pushing to ../a
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
370 searching for changes
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
371 no changes found
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
372 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
373 [1]
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
374 $ hg up foobar
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
375 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
376 (activating bookmark foobar)
e4fe4e903e97 bookmarks: add 'hg push -B .' for pushing the active bookmark (issue4917)
liscju <piotr.listkiewicz@gmail.com>
parents: 28082
diff changeset
377
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
378 push/pull name that doesn't exist
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
379
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
380 $ hg push -B badname ../a
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
381 pushing to ../a
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
382 searching for changes
22651
b901645a8784 push: gather all bookmark decisions together
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22046
diff changeset
383 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
384 no changes found
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12303
diff changeset
385 [2]
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
386 $ hg pull -B anotherbadname ../a
13368
d4ab9486e514 bookmarks: move push/pull command features to core
Matt Mackall <mpm@selenic.com>
parents: 12969
diff changeset
387 pulling from ../a
12303
4ab87473029d tests: add test for bookmark push/pull
Will Maier <willmaier@ml1.net>
parents:
diff changeset
388 abort: remote bookmark anotherbadname not found!
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45805
diff changeset
389 [10]
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
390
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
391 divergent bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
392
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
393 $ cd ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
394 $ echo c1 > f1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
395 $ hg ci -Am1
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
396 adding f1
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
397 $ hg book -f @
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
398 $ hg book -f X
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
399 $ hg book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
400 @ 1:0d2164f0ce0d
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
401 * X 1:0d2164f0ce0d
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
402 Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
403 Z 1:0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
404
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
405 $ cd ../b
35027
7384250eabd9 dispatch: do not drop unpaired argument at _earlygetopt()
Yuya Nishihara <yuya@tcha.org>
parents: 34938
diff changeset
406 $ hg up
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
407 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
408 updating bookmark foobar
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
409 $ echo c2 > f2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
410 $ hg ci -Am2
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
411 adding f2
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
412 $ hg book -if @
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
413 $ 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
414 $ hg book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
415 @ 1:9b140be10808
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
416 X 1:9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
417 Y 0:4e3505fd9583
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
418 Z 0:4e3505fd9583
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
419 foo -1:000000000000
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
420 * foobar 1:9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
421
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
422 $ 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
423 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
424 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
425 adding changesets
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
426 adding manifests
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
427 adding file changes
18363
c6e033a7dd38 bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents: 18255
diff changeset
428 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
429 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
430 updating bookmark Z
42897
d7304434390f changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 42893
diff changeset
431 added 1 changesets with 1 changes to 1 files (+1 heads)
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39304
diff changeset
432 new changesets 0d2164f0ce0d (1 drafts)
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
433 test-hook-bookmark: @foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
434 test-hook-bookmark: X@foo: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
435 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
436 (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
437 $ hg book
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
438 @ 1:9b140be10808
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
439 @foo 2:0d2164f0ce0d
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
440 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
441 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
442 Y 0:4e3505fd9583
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
443 Z 2:0d2164f0ce0d
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
444 foo -1:000000000000
18470
28b3d669295e test-bookmarks-pushpull.t: don't set bookmark active unnecessarily
Kevin Bullock <kbullock@ringworld.org>
parents: 18363
diff changeset
445 * foobar 1:9b140be10808
24353
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
446
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
447 (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
448
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39480
diff changeset
449 $ "$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
450 $ hg pull ../a
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
451 pulling from ../a
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
452 searching for changes
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
453 no changes found
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
454 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
455 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
456 $ 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
457 X 1:9b140be10808
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
458 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
459
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
460 (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
461
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
462 $ 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
463 @ 1:9b140be10808
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
464 @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
465 @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
466 $ 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
467 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
468 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
469 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
470 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
471 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
472 $ 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
473 @ 1:9b140be10808
ca4b89683078 bookmarks: reuse @number bookmark, if it refers changeset referred remotely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24353
diff changeset
474 @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
475 @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
476
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39480
diff changeset
477 $ "$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
478 $ hg bookmarks -d "@1"
3f6bf9f29e7b bookmarks: prevent divergent bookmark from being updated unexpectedly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23543
diff changeset
479
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
480 $ hg push -f ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
481 pushing to ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
482 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
483 adding changesets
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
484 adding manifests
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
485 adding file changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
486 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
487 $ 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
488 @ 1:0d2164f0ce0d
13388
a184dbd9b2c5 localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents: 13368
diff changeset
489 * X 1:0d2164f0ce0d
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
490 Y 0:4e3505fd9583
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
491 Z 1:0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
492
48033
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
493 mirroring bookmarks
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
494
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
495 $ hg book
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
496 @ 1:9b140be10808
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
497 @foo 2:0d2164f0ce0d
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
498 X 1:9b140be10808
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
499 X@foo 2:0d2164f0ce0d
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
500 Y 0:4e3505fd9583
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
501 Z 2:0d2164f0ce0d
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
502 foo -1:000000000000
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
503 * foobar 1:9b140be10808
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
504 $ cp .hg/bookmarks .hg/bookmarks.bak
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
505 $ hg book -d X
48243
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
506 $ hg incoming --bookmark -v ../a
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
507 comparing with ../a
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
508 searching for changed bookmarks
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
509 @ 0d2164f0ce0d diverged
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
510 X 0d2164f0ce0d added
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
511 $ hg incoming --bookmark -v ../a --config 'paths.*:bookmarks.mode=babar'
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
512 (paths.*:bookmarks.mode has unknown value: "babar")
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
513 comparing with ../a
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
514 searching for changed bookmarks
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
515 @ 0d2164f0ce0d diverged
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
516 X 0d2164f0ce0d added
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
517 $ hg incoming --bookmark -v ../a --config 'paths.*:bookmarks.mode=mirror'
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
518 comparing with ../a
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
519 searching for changed bookmarks
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
520 @ 0d2164f0ce0d changed
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
521 @foo 000000000000 removed
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
522 X 0d2164f0ce0d added
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
523 X@foo 000000000000 removed
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
524 foo 000000000000 removed
76c071bba40d bookmarks: add support for `mirror` mode to `incoming`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48242
diff changeset
525 foobar 000000000000 removed
48244
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
526 $ hg incoming --bookmark -v ../a --config 'paths.*:bookmarks.mode=ignore'
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
527 comparing with ../a
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
528 bookmarks exchange disabled with this path
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
529 $ hg pull ../a --config 'paths.*:bookmarks.mode=ignore'
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
530 pulling from ../a
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
531 searching for changes
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
532 no changes found
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
533 $ hg book
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
534 @ 1:9b140be10808
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
535 @foo 2:0d2164f0ce0d
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
536 X@foo 2:0d2164f0ce0d
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
537 Y 0:4e3505fd9583
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
538 Z 2:0d2164f0ce0d
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
539 foo -1:000000000000
b56858d85a7b bookmarks: add a `ignore` variant of the bookmark mode
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48243
diff changeset
540 * foobar 1:9b140be10808
48242
4d2ab365699e bookmarks: move the `mirror` option to the `paths` section
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 48033
diff changeset
541 $ hg pull ../a --config 'paths.*:bookmarks.mode=mirror'
48033
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
542 pulling from ../a
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
543 searching for changes
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
544 no changes found
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
545 $ hg book
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
546 @ 2:0d2164f0ce0d
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
547 X 2:0d2164f0ce0d
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
548 Y 0:4e3505fd9583
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
549 Z 2:0d2164f0ce0d
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
550 $ mv .hg/bookmarks.bak .hg/bookmarks
62f325f9b347 bookmarks: add an option to make pull mirror remote bookmarks
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 47921
diff changeset
551
23543
4dd8a6a1240d spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 23416
diff changeset
552 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
553
29376
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
554 $ 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
555 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
556 (activating bookmark X)
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
557 $ 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
558 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
559 no changes found
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
560 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
561 importing bookmark X
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
562 test-hook-bookmark: @foo: 0d2164f0ce0d8f1d6f94351eba04b794909be66c -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
563 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
564
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
565 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
566
c35ffa4249ca bookmarks: fix formatting of exchange message (issue4439)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23082
diff changeset
567 $ 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
568
18495
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
569 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
570
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
571 $ hg bookmark -fr 1 Z
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
572 $ 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
573 0:4e3505fd9583 Y
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
574 1:9b140be10808 @ X Z foobar
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
575 2:0d2164f0ce0d @foo X@foo
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
576 $ 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
577 2:0d2164f0ce0d @foo X@foo
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
578 $ 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
579 2:0d2164f0ce0d @foo X@foo
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
580
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
581 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
582
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
583 $ hg up -q Y
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
584 $ echo c3 > f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
585 $ hg ci -Am3
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
586 adding f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
587 created new head
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
588 $ 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
589 pushing to ../a
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
590 searching for changes
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
591 adding changesets
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
592 adding manifests
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
593 adding file changes
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
594 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
595 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
596 updating bookmark Y
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
597 $ 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
598 @ 1:0d2164f0ce0d
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
599 * X 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
600 Y 3:f6fc62dde3c0
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
601 Z 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
602
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
603 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
604
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
605 $ cd ..
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
606 $ 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
607
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
608 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
609 race conditions
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
610
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28182
diff changeset
611 $ 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
612 $ 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
613
32077
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
614 $ 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
615 > #!/bin/sh
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
616 > 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
617 > 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
618 > EOF
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
619
34708
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
620 $ 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
621 test-hook-bookmark: @: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
622 test-hook-bookmark: X: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
623 test-hook-bookmark: Y: -> f6fc62dde3c0771e29704af56ba4d8af77abcc2f
ee5f0d047b41 bookmark: add a dedicated txnclose-bookmark hook
Boris Feld <boris.feld@octobus.net>
parents: 34661
diff changeset
624 test-hook-bookmark: Z: -> 0d2164f0ce0d8f1d6f94351eba04b794909be66c
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
625 $ cd pull-race
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
626 $ hg up -q Y
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
627 $ echo c4 > f2
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
628 $ hg ci -Am4
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
629 $ echo c5 > f3
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
630 $ cat <<EOF > .hg/hgrc
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
631 > [hooks]
32077
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
632 > 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
633 > EOF
25442
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
634
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
635 (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
636
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
637 $ cd ..
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
638 $ killdaemons.py
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28182
diff changeset
639 $ 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
640 $ 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
641 $ 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
642 $ 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
643 @ 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
644 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
645 * 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
646 Z 1:0d2164f0ce0d
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
647 $ 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
648 pulling from http://localhost:$HGPORT/
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
649 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
650 adding changesets
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
651 adding manifests
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
652 adding file changes
42897
d7304434390f changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 42893
diff changeset
653 updating bookmark Y
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
654 added 1 changesets with 1 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39304
diff changeset
655 new changesets b0a5eff05604 (1 drafts)
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
656 (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
657 $ hg book
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
658 * @ 1:0d2164f0ce0d
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
659 X 1:0d2164f0ce0d
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
660 Y 4:b0a5eff05604
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
661 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
662
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
663 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
664
b5311068077e pull: prevent race condition in bookmark update when using -B (issue4689)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25442
diff changeset
665 $ 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
666 $ 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
667 > #!/bin/sh
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
668 > 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
669 > 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
670 > 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
671 > else
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
672 > exit 0
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
673 > fi
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
674 > 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
675 $ 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
676 > [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
677 > # 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
678 > # 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
679 > # call.
32077
de115db3688e test-bookmarks: factor hooks out to a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 31766
diff changeset
680 > 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
681 > EOF
41026
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
682 $ restart_server() {
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
683 > "$TESTDIR/killdaemons.py" $DAEMON_PIDS
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
684 > hg serve -R ../pull-race -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
685 > cat ../pull-race.pid >> $DAEMON_PIDS
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
686 > }
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
687 $ restart_server # new config need server restart
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
688 $ 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
689 @ 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
690 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
691 * 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
692 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
693 $ 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
694 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
695 (activating bookmark Y)
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
696 $ 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
697 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
698 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
699 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
700 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
701 adding file changes
42897
d7304434390f changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 42893
diff changeset
702 updating bookmark Y
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
703 added 1 changesets with 1 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39304
diff changeset
704 new changesets 35d1ef0a8d1b (1 drafts)
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
705 (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
706 $ hg book
29376
113d0b23321a bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
liscju <piotr.listkiewicz@gmail.com>
parents: 29354
diff changeset
707 @ 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
708 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
709 * 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
710 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
711
41026
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
712 Update a bookmark right after the initial lookup -r (issue4700)
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
713
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
714 $ echo c7 > ../pull-race/f3 # to be committed during the race
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
715 $ cat <<EOF > ../lookuphook.py
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
716 > """small extensions adding a hook after wireprotocol lookup to test race"""
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
717 > import functools
48526
04688c51f81f exchangev2: remove it
Raphaël Gomès <rgomes@octobus.net>
parents: 48368
diff changeset
718 > from mercurial import wireprotov1server
41026
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
719 >
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
720 > def wrappedlookup(orig, repo, *args, **kwargs):
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
721 > ret = orig(repo, *args, **kwargs)
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
722 > repo.hook(b'lookup')
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
723 > return ret
48526
04688c51f81f exchangev2: remove it
Raphaël Gomès <rgomes@octobus.net>
parents: 48368
diff changeset
724 >
04688c51f81f exchangev2: remove it
Raphaël Gomès <rgomes@octobus.net>
parents: 48368
diff changeset
725 > table = wireprotov1server.commands
04688c51f81f exchangev2: remove it
Raphaël Gomès <rgomes@octobus.net>
parents: 48368
diff changeset
726 > table[b'lookup'].func = functools.partial(wrappedlookup, table[b'lookup'].func)
41026
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
727 > EOF
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
728 $ cat <<EOF > ../pull-race/.hg/hgrc
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
729 > [extensions]
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
730 > lookuphook=$TESTTMP/lookuphook.py
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
731 > [hooks]
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
732 > lookup.makecommit= sh $TESTTMP/listkeys_makecommit.sh
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
733 > EOF
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
734 $ restart_server # new config need server restart
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
735 $ hg -R $TESTTMP/pull-race book
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
736 @ 1:0d2164f0ce0d
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
737 X 1:0d2164f0ce0d
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
738 * Y 6:0d60821d2197
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
739 Z 1:0d2164f0ce0d
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
740 $ hg pull -r Y
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
741 pulling from http://localhost:$HGPORT/
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
742 searching for changes
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
743 adding changesets
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
744 adding manifests
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
745 adding file changes
42897
d7304434390f changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 42893
diff changeset
746 updating bookmark Y
41026
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
747 added 1 changesets with 1 changes to 1 files
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
748 new changesets 0d60821d2197 (1 drafts)
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
749 (run 'hg update' to get a working copy)
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
750 $ hg book
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
751 @ 1:0d2164f0ce0d
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
752 X 1:0d2164f0ce0d
41051
bad05a6afdc8 pull: fix inconsistent view of bookmarks during pull (issue4700)
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 41026
diff changeset
753 * Y 6:0d60821d2197
41026
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
754 Z 1:0d2164f0ce0d
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
755 $ hg -R $TESTTMP/pull-race book
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
756 @ 1:0d2164f0ce0d
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
757 X 1:0d2164f0ce0d
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
758 * Y 7:714424d9e8b8
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
759 Z 1:0d2164f0ce0d
c236a491ab7b test-bookmarks-pushpull: add failing test of issue4700
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 40231
diff changeset
760
25442
9ee395dffac9 test: pull through http when testing for race conditions
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25441
diff changeset
761 (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
762
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
763 $ killdaemons.py
18851
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
764 $ cd ../b
a60963c02f92 pull: list bookmarks before pulling changesets (issue3873)
Siddharth Agarwal <sid0@fb.com>
parents: 18495
diff changeset
765
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
766 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
767
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
768 $ hg up -q 4e3505fd9583
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
769 $ echo c4 > f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
770 $ hg ci -Am4
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
771 adding f2
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
772 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
773 $ 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
774 $ 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
775 $ 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
776 @ 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
777 |
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
778 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
779 |
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
780 | 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
781 |/
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
782 | 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
783 |/
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
784 | 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
785 |/
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
786 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
787
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
788
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
789 $ 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
790
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
791 $ 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
792 > [web]
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
793 > push_ssl = false
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
794 > allow_push = *
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
795 > EOF
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
796
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28182
diff changeset
797 $ 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
798 $ 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
799
6f89c3f0192d fix push of moved bookmark when creating new branch heads
Sune Foldager <cryo@cyanite.org>
parents: 17021
diff changeset
800 $ 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
801 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
802 searching for changes
45908
122f0b59f5f0 errors: remove trailing "!" in messages about creating new heads on push
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
diff changeset
803 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
804 (merge or see 'hg help push' for details about pushing new heads)
46119
9261f6c1d39b errors: raise StateError when push fails because it creates new heads
Martin von Zweigbergk <martinvonz@google.com>
parents: 45910
diff changeset
805 [20]
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
806 $ 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
807 @ 1:0d2164f0ce0d
16835
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
808 * X 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
809 Y 3:f6fc62dde3c0
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
810 Z 1:0d2164f0ce0d
4267c840c481 bookmarks: allow existing remote bookmarks to become heads when pushing
Levi Bard <levi@unity3d.com>
parents: 16697
diff changeset
811
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
812
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
813 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
814
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
815 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
42893
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 42811
diff changeset
816 1 new obsolescence markers
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
817 $ 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
818 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
819 searching for changes
45908
122f0b59f5f0 errors: remove trailing "!" in messages about creating new heads on push
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
diff changeset
820 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
821 (merge or see 'hg help push' for details about pushing new heads)
46119
9261f6c1d39b errors: raise StateError when push fails because it creates new heads
Martin von Zweigbergk <martinvonz@google.com>
parents: 45910
diff changeset
822 [20]
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
823 $ 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
824 @ 1:0d2164f0ce0d
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
825 * X 1:0d2164f0ce0d
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
826 Y 3:f6fc62dde3c0
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
827 Z 1:0d2164f0ce0d
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
828
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
829 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
830
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
831 $ 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
832 f6fc62dde3c0771e29704af56ba4d8af77abcc2f
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
833 $ 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
834 4efff6d98829d9c824c621afd6e3f01865f5439f
d044a762f47f bookmark: complexity pull-push test to have deeper tree
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17770
diff changeset
835 $ 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
836 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
837 $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc
42893
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 42811
diff changeset
838 1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33286
diff changeset
839 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
840 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f
42893
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 42811
diff changeset
841 1 new obsolescence markers
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
842 $ 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
843 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
844 searching for changes
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
845 remote: adding changesets
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
846 remote: adding manifests
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
847 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
848 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
849 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
850 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
851 updating bookmark Y
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
852 $ 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
853 @ 1:0d2164f0ce0d
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
854 * 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
855 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
856 Z 1:0d2164f0ce0d
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
857
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
858 hgweb
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
859
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
860 $ cat <<EOF > .hg/hgrc
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
861 > [web]
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
862 > push_ssl = false
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
863 > allow_push = *
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
864 > EOF
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
865
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
866 $ 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
867 $ 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
868 $ cd ../a
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
869
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17298
diff changeset
870 $ 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
871 bookmarks
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
872 namespaces
17551
a7b3fdaf768d bookmark: take successors into account when updating (issue3561)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17548
diff changeset
873 obsolete
18255
7ca534f31a83 debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents: 17882
diff changeset
874 phases
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
875 $ 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
876 @ 9b140be1080824d768c5a4691a564088eede71f9
18255
7ca534f31a83 debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents: 17882
diff changeset
877 X 9b140be1080824d768c5a4691a564088eede71f9
7ca534f31a83 debugpushkey: list keys sorted
Mads Kiilerich <mads at kiilerich.com>
parents: 17882
diff changeset
878 Y c922c0139ca03858f655e4a2af4dd02796a63969
18495
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations
Kevin Bullock <kbullock@ringworld.org>
parents: 18479
diff changeset
879 Z 9b140be1080824d768c5a4691a564088eede71f9
17770
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
880 foo 0000000000000000000000000000000000000000
6c81b8ebf66e bookmarks: when @ bookmark diverges, don't double the @ sign (BC)
David M. Carr <david@carrclan.us>
parents: 17551
diff changeset
881 foobar 9b140be1080824d768c5a4691a564088eede71f9
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
882 $ 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
883 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
884 searching for changed bookmarks
24658
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
885 @ 0d2164f0ce0d
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
886 X 0d2164f0ce0d
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
887 Z 0d2164f0ce0d
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
888 foo
8ea893ab0572 bookmarks: show outgoing bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24657
diff changeset
889 foobar
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
890 $ 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
891 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
892 searching for changes
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
893 no changes found
22651
b901645a8784 push: gather all bookmark decisions together
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22046
diff changeset
894 updating bookmark Z
16038
dad96e752079 push: don't treat bookmark as a found change
Matt Mackall <mpm@selenic.com>
parents: 16010
diff changeset
895 [1]
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
896 $ hg book -d Z
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
897 $ 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
898 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
899 searching for changed bookmarks
24657
3d7c512b258d bookmarks: show incoming bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24400
diff changeset
900 @ 9b140be10808
3d7c512b258d bookmarks: show incoming bookmarks more exactly
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24400
diff changeset
901 X 9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
902 Z 0d2164f0ce0d
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
903 foo 000000000000
15935
6c97eb445341 bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
Matt Mackall <mpm@selenic.com>
parents: 15648
diff changeset
904 foobar 9b140be10808
12969
6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489)
Matt Mackall <mpm@selenic.com>
parents: 12346
diff changeset
905 $ 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
906 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
907 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
908 divergent bookmark @ stored as @1
18363
c6e033a7dd38 bookmarks: process pulled remote bookmarks in sorted order
Mads Kiilerich <mads@kiilerich.com>
parents: 18255
diff changeset
909 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
910 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
911 adding remote bookmark foo
16697
c285aae10f6c bookmarks: pull new bookmarks from remote by default (BC)
Levi Bard <levi@unity3d.com>
parents: 16107
diff changeset
912 adding remote bookmark foobar
13604
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
913 $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
914 requesting all changes
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
915 adding changesets
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
916 adding manifests
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
917 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
918 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
919 2 new obsolescence markers
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39304
diff changeset
920 new changesets 4e3505fd9583:c922c0139ca0 (5 drafts)
17882
36ed69d4593d clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents: 17872
diff changeset
921 updating to bookmark @
13604
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
922 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
923 $ hg -R cloned-bookmarks bookmarks
17870
7d2dd10ce9ea clone: activate @ bookmark if updating to it
Thomas Arendsen Hein <thomas@intevation.de>
parents: 17865
diff changeset
924 * @ 1:9b140be10808
13604
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
925 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
926 Y 4:c922c0139ca0
13604
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
927 Z 2:0d2164f0ce0d
3f6a4579f803 hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents: 13469
diff changeset
928 foo -1:000000000000
15935
6c97eb445341 bookmarks: automatically advance bookmark on naked update (BC) (issue2894)
Matt Mackall <mpm@selenic.com>
parents: 15648
diff changeset
929 foobar 1:9b140be10808
17346
2944a6d35158 check-code: fix check for trailing whitespace on empty lines
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
930
17189
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
931 $ cd ..
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
932
30332
318a24b52eeb spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents: 29973
diff changeset
933 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
934
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
935 $ mkdir bmcomparison
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
936 $ cd bmcomparison
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
937
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
938 $ 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
939 $ 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
940 $ 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
941 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
942 |
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
943 | 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
944 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
945 | 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
946 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
947 | 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
948 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
949 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
950
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
951 $ 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
952 $ 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
953 $ 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
954 $ 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
955 $ 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
956 $ 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
957
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
958 $ 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
959
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
960 (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
961 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
962
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
963 $ 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
964 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
965 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
966 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
967 [1]
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
968 $ 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
969 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
970 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
971 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
972 [1]
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
973
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
974 $ 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
975 $ 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
976 $ 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
977 $ 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
978 $ 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
979 $ 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
980 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
981 |
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
982 | 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
983 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
984 | 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
985 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
986 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
987
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
988
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
989 $ 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
990 $ 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
991 $ 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
992 $ 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
993 $ 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
994 $ 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
995 $ 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
996 $ 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
997 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
998 |
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
999 | 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
1000 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
1001 | 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
1002 |/
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
1003 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
1004
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
1005
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
1006 (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
1007
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
1008 $ 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
1009 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
1010 searching for changed bookmarks
24660
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
1011 ADD_ON_REPO2 66f7d451a68b added
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
1012 ADV_ON_REPO2 66f7d451a68b advanced
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
1013 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
1014 DIFF_DIVERGED e7bd5218ca15 changed
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
1015 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
1016 $ 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
1017 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
1018 searching for changed bookmarks
24661
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1019 ADD_ON_REPO1 66f7d451a68b added
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1020 ADD_ON_REPO2 deleted
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1021 ADV_ON_REPO1 fa942426a6fd advanced
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1022 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
1023 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
1024 DIFF_DIVERGED 6100d3090acf changed
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1025 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
1026
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
1027 $ 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
1028 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
1029 searching for changed bookmarks
24660
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
1030 ADD_ON_REPO1 66f7d451a68b added
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
1031 ADV_ON_REPO1 fa942426a6fd advanced
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
1032 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
1033 DIFF_DIVERGED 6100d3090acf changed
bf13b44bbb0a bookmarks: show detailed status about incoming bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24659
diff changeset
1034 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
1035 $ 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
1036 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
1037 searching for changed bookmarks
24661
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1038 ADD_ON_REPO1 deleted
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1039 ADD_ON_REPO2 66f7d451a68b added
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1040 ADV_ON_REPO2 66f7d451a68b advanced
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1041 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
1042 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
1043 DIFF_DIVERGED e7bd5218ca15 changed
8cf70c97a6e1 bookmarks: show detailed status about outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24660
diff changeset
1044 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
1045
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
1046 $ cd ..
4ee00d6b0e29 bookmarks: enhance test of showing detail about incoming/outgoing bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24658
diff changeset
1047
17189
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1048 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
1049 bookmark, not all outgoing changes:
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1050 $ 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
1051 requesting all changes
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1052 adding changesets
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1053 adding manifests
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1054 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
1055 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
1056 2 new obsolescence markers
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39304
diff changeset
1057 new changesets 4e3505fd9583:c922c0139ca0 (5 drafts)
17882
36ed69d4593d clone: show status "updating to bookmark @"
Adrian Buehlmann <adrian@cadifra.com>
parents: 17872
diff changeset
1058 updating to bookmark @
17189
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1059 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
1060 $ cd addmarks
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1061 $ echo foo > foo
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1062 $ hg add foo
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1063 $ hg commit -m 'add foo'
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1064 $ echo bar > bar
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1065 $ hg add bar
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1066 $ hg commit -m 'add bar'
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1067 $ hg co "tip^"
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1068 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
1069 (leaving bookmark @)
17189
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1070 $ hg book add-foo
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1071 $ 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
1072 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
1073 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
1074 $ 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
1075 pushing to http://localhost:$HGPORT/
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1076 searching for changes
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1077 remote: adding changesets
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1078 remote: adding manifests
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1079 remote: adding file changes
7199e82d6d8b test-bookmarks-pushpull.t: verify correct push -B behavior
Augie Fackler <raf@durin42.com>
parents: 17075
diff changeset
1080 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
1081 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
1082
20184
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
1083 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
1084
a14d93b2fb1b bookmarks: allow push -B to create a new remote head (issue2372)
Stephen Lee <sphen.lee@gmail.com>
parents: 19934
diff changeset
1085 $ 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
1086 $ 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
1087 $ 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
1088 $ 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
1089 created new head
29229
89bba2beb03e bookmarks: allow pushing active bookmark on new remote head (issue5236)
liscju <piotr.listkiewicz@gmail.com>
parents: 28549
diff changeset
1090 $ 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
1091 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
1092 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
1093 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
1094 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
1095 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
1096 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
1097 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
1098 $ 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
1099 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
1100
26819
ba7eeeac9603 bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
Matt Mackall <mpm@selenic.com>
parents: 26781
diff changeset
1101 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
1102
28082
db90cb1e89c8 bookmarks: avoid creating a nested repository during testing
Martijn Pieters <mjpieters@fb.com>
parents: 26819
diff changeset
1103 $ 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
1104 $ 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
1105 $ 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
1106 $ 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
1107
28082
db90cb1e89c8 bookmarks: avoid creating a nested repository during testing
Martijn Pieters <mjpieters@fb.com>
parents: 26819
diff changeset
1108 $ 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
1109 $ 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
1110 $ 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
1111 $ 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
1112 $ 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
1113 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
1114 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
1115 remote has heads on branch 'default' that are not known locally: a2a606d9ff1b
45908
122f0b59f5f0 errors: remove trailing "!" in messages about creating new heads on push
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
diff changeset
1116 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
1117 (pull and merge or see 'hg help push' for details about pushing new heads)
46119
9261f6c1d39b errors: raise StateError when push fails because it creates new heads
Martin von Zweigbergk <martinvonz@google.com>
parents: 45910
diff changeset
1118 [20]
28082
db90cb1e89c8 bookmarks: avoid creating a nested repository during testing
Martijn Pieters <mjpieters@fb.com>
parents: 26819
diff changeset
1119 $ 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
1120
24400
03c84c966ef5 bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24361
diff changeset
1121 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
1122
03c84c966ef5 bookmarks: rewrite comparing bookmarks in commands.summary() by compare()
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 24361
diff changeset
1123 $ 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
1124 $ 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
1125 $ 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
1126 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
1127
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16835
diff changeset
1128 $ cd ..
23082
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1129
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1130 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
1131
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1132 $ hg init unchanged-a
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1133 $ hg init unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1134 $ cd unchanged-a
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1135 $ echo initial > foo
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1136 $ hg commit -A -m initial
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1137 adding foo
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1138 $ hg bookmark @
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1139 $ hg push -B @ ../unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1140 pushing to ../unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1141 searching for changes
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1142 adding changesets
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1143 adding manifests
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1144 adding file changes
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1145 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
1146 exporting bookmark @
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1147
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1148 $ hg push -B @ ../unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1149 pushing to ../unchanged-b
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1150 searching for changes
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1151 no changes found
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1152 [1]
0fc4686de1d7 exchange: don't report failure from identical bookmarks
Gregory Szorc <gregory.szorc@gmail.com>
parents: 22955
diff changeset
1153
36789
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1154 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
1155 ===============================================
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1156
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1157 #if b2-binary
38606
15622e72307d py3: suppress write() result and close file in test-bookmarks-pushpull.t
Yuya Nishihara <yuya@tcha.org>
parents: 36968
diff changeset
1158 >>> with open('longname', 'w') as f:
15622e72307d py3: suppress write() result and close file in test-bookmarks-pushpull.t
Yuya Nishihara <yuya@tcha.org>
parents: 36968
diff changeset
1159 ... f.write('wat' * 100) and None
36789
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1160 $ hg book `cat longname`
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1161 $ 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
1162 pushing to ../unchanged-b
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1163 searching for changes
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1164 no changes found
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1165 exporting bookmark (wat){100} (re)
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1166 [1]
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1167 $ 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
1168
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1169 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
1170
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1171 $ 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
1172 pushing to ../unchanged-b
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1173 searching for changes
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1174 no changes found
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1175 exporting bookmark (wat){100} (re)
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1176 [1]
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1177 $ 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
1178 $ hg book --delete `cat longname`
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1179 $ hg co @
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1180 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
1181 (activating bookmark @)
09b58af83d44 bookmarks: test for exchanging long bookmark names (issue5165)
Augie Fackler <augie@google.com>
parents: 35815
diff changeset
1182 #endif
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1183
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1184 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
1185 ======================================
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1186
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1187 $ hg bookmarks
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1188 * @ 0:55482a6fb4b1
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1189 $ hg log -G
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1190 @ 0:55482a6fb4b1 initial
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1191
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1192 $ hg init ../issue4455-dest
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1193 $ 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
1194 pushing to ../issue4455-dest
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1195 searching for changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1196 adding changesets
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1197 adding manifests
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1198 adding file changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1199 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
1200 $ cat >> .hg/hgrc << EOF
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1201 > [paths]
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1202 > local=../issue4455-dest/
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1203 > 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
1204 > http=http://localhost:$HGPORT/
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1205 > EOF
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1206 $ 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
1207 > [hooks]
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1208 > prepushkey=false
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1209 > [web]
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1210 > push_ssl = false
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1211 > allow_push = *
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1212 > EOF
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
1213 $ killdaemons.py
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28182
diff changeset
1214 $ 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
1215 $ 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
1216
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1217 Local push
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1218 ----------
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1219
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1220 #if b2-pushkey
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1221
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1222 $ 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
1223 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
1224 searching for changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1225 no changes found
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1226 pushkey-abort: prepushkey hook exited with status 1
45910
f0626acf007d errors: drop trailing "!" for some errors about bookmarks
Martin von Zweigbergk <martinvonz@google.com>
parents: 45908
diff changeset
1227 abort: exporting bookmark @ failed
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
1228 [255]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1229
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1230 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1231 #if b2-binary
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1232
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1233 $ 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
1234 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
1235 searching for changes
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1236 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
1237 abort: prepushkey hook exited with status 1
46417
768056549737 errors: use exit code 40 for when a hook fails
Martin von Zweigbergk <martinvonz@google.com>
parents: 46119
diff changeset
1238 [40]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1239
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1240 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1241
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1242 $ 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
1243 no bookmarks set
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1244
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1245 Using ssh
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1246 ---------
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1247
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1248 #if b2-pushkey
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1249
29688
30c59bdd4f41 tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29687
diff changeset
1250 $ 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
1251 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
1252 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
1253 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
1254 remote: pushkey-abort: prepushkey hook exited with status 1
45910
f0626acf007d errors: drop trailing "!" for some errors about bookmarks
Martin von Zweigbergk <martinvonz@google.com>
parents: 45908
diff changeset
1255 abort: exporting bookmark @ failed
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
1256 [255]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1257
25357
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1258 $ 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
1259 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
1260
29687
ac9b85079122 tests: use 'legacy.exchange' option in various mixed tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29681
diff changeset
1261 $ 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
1262 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
1263 searching for changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1264 no changes found
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1265 remote: pushkey-abort: prepushkey hook exited with status 1
45910
f0626acf007d errors: drop trailing "!" for some errors about bookmarks
Martin von Zweigbergk <martinvonz@google.com>
parents: 45908
diff changeset
1266 exporting bookmark @ failed
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1267 [1]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1268
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1269 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1270 #if b2-binary
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1271
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1272 $ 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
1273 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
1274 searching for changes
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1275 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
1276 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
1277 abort: push failed on remote
46977
3f87d2af0bd6 errors: raise RemoteError in some places in exchange.py
Martin von Zweigbergk <martinvonz@google.com>
parents: 46633
diff changeset
1278 [100]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1279
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1280 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1281
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1282 $ 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
1283 no bookmarks set
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1284
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1285 Using http
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1286 ----------
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1287
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1288 #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
1289 $ 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
1290 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
1291 searching for changes
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1292 no changes found
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1293 remote: pushkey-abort: prepushkey hook exited with status 1
45910
f0626acf007d errors: drop trailing "!" for some errors about bookmarks
Martin von Zweigbergk <martinvonz@google.com>
parents: 45908
diff changeset
1294 abort: exporting bookmark @ failed
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
1295 [255]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1296
23416
53a65929ef1f pushkey: gracefully handle prepushkey hook failure (issue4455)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23199
diff changeset
1297 $ 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
1298 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
1299
29687
ac9b85079122 tests: use 'legacy.exchange' option in various mixed tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29681
diff changeset
1300 $ 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
1301 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
1302 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
1303 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
1304 remote: pushkey-abort: prepushkey hook exited with status 1
45910
f0626acf007d errors: drop trailing "!" for some errors about bookmarks
Martin von Zweigbergk <martinvonz@google.com>
parents: 45908
diff changeset
1305 exporting bookmark @ failed
25357
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1306 [1]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1307
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1308 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1309
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1310 #if b2-binary
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1311
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1312 $ 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
1313 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
1314 searching for changes
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1315 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
1316 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
1317 abort: push failed on remote
46977
3f87d2af0bd6 errors: raise RemoteError in some places in exchange.py
Martin von Zweigbergk <martinvonz@google.com>
parents: 46633
diff changeset
1318 [100]
35263
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1319
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1320 #endif
ae79d878702b bookmark: introduce in advance a variant of the exchange test
Boris Feld <boris.feld@octobus.net>
parents: 35259
diff changeset
1321
25357
efa2621c2859 test: use both bundle formats in test-bookmarks-pushpull
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25352
diff changeset
1322 $ 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
1323 no bookmarks set
35811
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1324
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1325 $ cd ..
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1326
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1327 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
1328
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1329 $ cat << EOF >> $HGRCPATH
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1330 > [ui]
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1331 > [server]
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1332 > bookmarks-pushkey-compat = yes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1333 > EOF
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1334
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1335 $ hg init server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1336 $ echo foo > server/a
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1337 $ hg -R server book foo
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1338 $ hg -R server commit -Am a
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1339 adding a
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1340 $ hg clone ssh://user@dummy/server client
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1341 requesting all changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1342 adding changesets
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1343 adding manifests
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1344 adding file changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1345 added 1 changesets with 1 changes to 1 files
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39304
diff changeset
1346 new changesets 79513d0d7716 (1 drafts)
35811
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1347 updating to branch default
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1348 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
1349
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1350 Forbid bookmark move on the server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1351
40231
58d785679e15 test-bookmarks-pushpull: use correct tmp dir for no-bm-move.sh
Mark Thomas <mbthomas@fb.com>
parents: 39707
diff changeset
1352 $ cat << EOF >> $TESTTMP/no-bm-move.sh
35815
b5df7fcf5d80 test-bookmarks-pushpull: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 35811
diff changeset
1353 > #!/bin/sh
b5df7fcf5d80 test-bookmarks-pushpull: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 35811
diff changeset
1354 > echo \$HG_NAMESPACE | grep -v bookmarks
b5df7fcf5d80 test-bookmarks-pushpull: stabilize for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 35811
diff changeset
1355 > EOF
35811
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1356 $ cat << EOF >> server/.hg/hgrc
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1357 > [hooks]
40231
58d785679e15 test-bookmarks-pushpull: use correct tmp dir for no-bm-move.sh
Mark Thomas <mbthomas@fb.com>
parents: 39707
diff changeset
1358 > prepushkey.no-bm-move= sh $TESTTMP/no-bm-move.sh
35811
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1359 > EOF
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1360
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1361 pushing changeset is okay
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1362
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1363 $ echo bar >> client/a
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1364 $ hg -R client commit -m b
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1365 $ hg -R client push
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1366 pushing to ssh://user@dummy/server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1367 searching for changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1368 remote: adding changesets
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1369 remote: adding manifests
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1370 remote: adding file changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1371 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
1372
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1373 attempt to move the bookmark is rejected
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1374
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1375 $ hg -R client book foo -r .
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1376 moving bookmark 'foo' forward from 79513d0d7716
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1377
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1378 #if b2-pushkey
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1379 $ hg -R client push
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1380 pushing to ssh://user@dummy/server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1381 searching for changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1382 no changes found
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1383 remote: pushkey-abort: prepushkey.no-bm-move hook exited with status 1
45910
f0626acf007d errors: drop trailing "!" for some errors about bookmarks
Martin von Zweigbergk <martinvonz@google.com>
parents: 45908
diff changeset
1384 abort: updating bookmark foo failed
35811
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1385 [255]
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1386 #endif
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1387 #if b2-binary
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1388 $ hg -R client push
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1389 pushing to ssh://user@dummy/server
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1390 searching for changes
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1391 no changes found
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1392 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
1393 abort: push failed on remote
46977
3f87d2af0bd6 errors: raise RemoteError in some places in exchange.py
Martin von Zweigbergk <martinvonz@google.com>
parents: 46633
diff changeset
1394 [100]
35811
e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777)
Boris Feld <boris.feld@octobus.net>
parents: 35792
diff changeset
1395 #endif
42810
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1396
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1397 -- test for pushing bookmarks pointing to secret changesets
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1398
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1399 Set up a "remote" repo
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1400 $ hg init issue6159remote
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1401 $ cd issue6159remote
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1402 $ echo a > a
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1403 $ hg add a
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1404 $ hg commit -m_
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1405 $ hg bookmark foo
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1406 $ cd ..
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1407
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1408 Clone a local repo
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1409 $ hg clone -q issue6159remote issue6159local
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1410 $ cd issue6159local
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1411 $ hg up -qr foo
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1412 $ echo b > b
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1413
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1414 Move the bookmark "foo" to point at a secret changeset
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1415 $ hg commit -qAm_ --config phases.new-commit=secret
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1416
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1417 Pushing the bookmark "foo" now fails as it contains a secret changeset
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1418 $ hg push -r foo
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1419 pushing to $TESTTMP/issue6159remote
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1420 searching for changes
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1421 no changes found (ignored 1 secret changesets)
42811
3332bde53714 exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 42810
diff changeset
1422 abort: cannot push bookmark foo as it points to a secret changeset
42810
cf9dbc7377de tests: add test to demonstrate issue6159
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 41051
diff changeset
1423 [255]
45805
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1424
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1425 Test pushing all bookmarks
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1426
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1427 $ hg init $TESTTMP/ab1
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1428 $ cd $TESTTMP/ab1
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1429 $ "$PYTHON" $TESTDIR/seq.py 1 5 | while read i; do
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1430 > echo $i > test && hg ci -Am test
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1431 > done
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1432 adding test
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1433 $ hg clone -U . ../ab2
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1434 $ hg book -r 1 A; hg book -r 2 B; hg book -r 3 C
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1435 $ hg push ../ab2
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1436 pushing to ../ab2
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1437 searching for changes
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1438 no changes found
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1439 [1]
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1440 $ hg push --all-bookmarks -r 1 ../ab2
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1441 abort: cannot specify both --all-bookmarks and --rev
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45805
diff changeset
1442 [10]
45805
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1443 $ hg push --all-bookmarks -B A ../ab2
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1444 abort: cannot specify both --all-bookmarks and --bookmark
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45805
diff changeset
1445 [10]
45805
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1446 $ hg push --all-bookmarks ../ab2
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1447 pushing to ../ab2
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1448 searching for changes
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1449 no changes found
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1450 exporting bookmark A
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1451 exporting bookmark B
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1452 exporting bookmark C
49535e56fab8 push: add --all-bookmarks option
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 45765
diff changeset
1453 [1]