annotate tests/test-wireproto.t @ 3176:1b58e0121689 mercurial-4.3

test-compat: merge stable into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 07 Nov 2017 13:05:37 +0100
parents f5d472b7e800 3afe20410b55
children a7050ab9d8c1 68aeeb4d4b8f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
1
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
2 $ cat >> $HGRCPATH <<EOF
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
3 > [defaults]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
4 > amend=-d "0 0"
1276
18a18131e92f test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
5 > [experimental]
18a18131e92f test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
6 > obsmarkers-exchange-debug=true
18a18131e92f test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
7 > bundle2-exp=true
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
8 > [ui]
1523
34e0b17858e3 test: use 'dummyssh' from the run-tests directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1452
diff changeset
9 > ssh=python "$RUNTESTDIR/dummyssh"
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
10 > [phases]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
11 > publish = False
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
12 > [extensions]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
13 > EOF
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1562
diff changeset
14 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
15
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
16 $ mkcommit() {
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
17 > echo "$1" > "$1"
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
18 > hg add "$1"
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
19 > hg ci -m "add $1"
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
20 > }
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
21
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
22 setup repo
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
23
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
24 $ hg init server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
25
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
26 $ hg clone ssh://user@dummy/server client
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
27 no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
28 updating to branch default
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
29 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
30 $ cp -r client other
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
31
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
32 Smoke testing
2084
b1f029dcf573 discovery: implement some range based discovery
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1806
diff changeset
33 ===============.t
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
34
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
35 $ cd client
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
36 $ mkcommit 0
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
37 $ mkcommit a
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
38 $ hg push
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
39 pushing to ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
40 searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
41 remote: adding changesets
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
42 remote: adding manifests
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
43 remote: adding file changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
44 remote: added 2 changesets with 2 changes to 2 files
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
45 $ hg pull
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
46 pulling from ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
47 searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
48 no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
49 $ hg pull -R ../other
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
50 pulling from ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
51 requesting all changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
52 adding changesets
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
53 adding manifests
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
54 adding file changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
55 added 2 changesets with 2 changes to 2 files
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
56 (run 'hg update' to get a working copy)
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
57 $ hg push -R ../other
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
58 pushing to ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
59 searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
60 no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
61 [1]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
62
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
63 Push
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
64 =============
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
65
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
66 $ echo 'A' > a
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
67 $ hg amend
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
68 $ hg push
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
69 pushing to ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
70 searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
71 remote: adding changesets
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
72 remote: adding manifests
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
73 remote: adding file changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
74 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
75 remote: obsmarker-exchange: 151 bytes received
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
76 remote: 2 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
77 remote: obsoleted 1 changesets
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
78 $ hg push
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
79 pushing to ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
80 searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
81 no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
82 [1]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
83
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
84 Pull
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
85 =============
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
86
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
87 $ hg -R ../other pull
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
88 pulling from ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
89 searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
90 adding changesets
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
91 adding manifests
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
92 adding file changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
93 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
94 obsmarker-exchange: 151 bytes received
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
95 2 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
96 obsoleted 1 changesets
2398
612c17c8ab69 tests: apply output changes from core fix
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2084
diff changeset
97 (run 'hg heads' to see heads)
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
98 $ hg -R ../other pull
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
99 pulling from ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
100 searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
101 no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
102
1277
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
103 Test some markers discovery
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
104 ===========================
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
105
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
106 $ echo c > C
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
107 $ hg add C
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
108 $ hg commit -m C
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
109 $ echo c >> C
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
110 $ hg amend
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
111 $ hg push
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
112 pushing to ssh://user@dummy/server
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
113 searching for changes
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
114 remote: adding changesets
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
115 remote: adding manifests
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
116 remote: adding file changes
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
117 remote: added 1 changesets with 1 changes to 1 files
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
118 remote: obsmarker-exchange: 151 bytes received
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
119 remote: 2 new obsolescence markers
1277
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
120 $ hg -R ../other pull
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
121 pulling from ssh://user@dummy/server
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
122 searching for changes
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
123 adding changesets
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
124 adding manifests
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
125 adding file changes
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
126 added 1 changesets with 1 changes to 1 files
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
127 obsmarker-exchange: 151 bytes received
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
128 2 new obsolescence markers
1277
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
129 (run 'hg update' to get a working copy)
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
130
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
131 some common hidden
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
132
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
133 $ hg touch .
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
134 $ hg push
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
135 pushing to ssh://user@dummy/server
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
136 searching for changes
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
137 remote: adding changesets
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
138 remote: adding manifests
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
139 remote: adding file changes
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
140 remote: added 1 changesets with 0 changes to 1 files (+1 heads)
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
141 remote: obsmarker-exchange: 226 bytes received
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
142 remote: 1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
143 remote: obsoleted 1 changesets
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
144 $ hg -R ../other pull
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
145 pulling from ssh://user@dummy/server
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
146 searching for changes
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
147 adding changesets
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
148 adding manifests
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
149 adding file changes
1562
b1158ce4ec50 test: adapt to fix to "known" wireprotocol command
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1523
diff changeset
150 added 1 changesets with 0 changes to 1 files (+1 heads)
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
151 obsmarker-exchange: 226 bytes received
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
152 1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
153 obsoleted 1 changesets
2398
612c17c8ab69 tests: apply output changes from core fix
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2084
diff changeset
154 (run 'hg heads' to see heads)
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
155
2521
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
156 test discovery avoid exchanging known markers
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
157
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
158 $ hg push
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
159 pushing to ssh://user@dummy/server
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
160 searching for changes
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
161 no changes found
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
162 [1]
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
163 $ hg -R ../other pull
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
164 pulling from ssh://user@dummy/server
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
165 searching for changes
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
166 no changes found
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
167
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
168 test discovery can be disabled
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
169
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
170 $ hg push --config experimental.evolution.obsdiscovery=no
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
171 pushing to ssh://user@dummy/server
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
172 searching for changes
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
173 (skipping discovery of obsolescence markers, will exchange everything)
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
174 (controled by 'experimental.evolution.obsdiscovery' configuration)
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
175 no changes found
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
176 remote: obsmarker-exchange: 376 bytes received
2521
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
177 [1]
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
178 $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
179 pulling from ssh://user@dummy/server
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
180 searching for changes
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
181 no changes found
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
182 (skipping discovery of obsolescence markers, will exchange everything)
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
183 (controled by 'experimental.evolution.obsdiscovery' configuration)
3105
f5d472b7e800 test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3103
diff changeset
184 obsmarker-exchange: 376 bytes received
2521
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
185
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
186 $ cd ..
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
187
3171
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
188 And disable it server side too:
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
189
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
190 $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log --config experimental.evolution.obsdiscovery=no
3171
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
191 $ cat hg.pid >> $DAEMON_PIDS
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
192
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
193 $ curl -s http://localhost:$HGPORT/?cmd=capabilities
3176
1b58e0121689 test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3105 3173
diff changeset
194 _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=zstd,zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol)
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
195
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
196 Check we cannot use pushkey for marker exchange anymore
3171
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
197
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
198 $ hg debugpushkey http://localhost:$HGPORT/ obsolete
3173
3afe20410b55 wireproto: gracefully fail on http when trying to use older pushkey method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3172
diff changeset
199 abort: HTTP Error 410: won't exchange obsmarkers through pushkey
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
200 [255]
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
201 $ hg debugpushkey ssh://user@dummy/server obsolete
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
202 remote: abort: won't exchange obsmarkers through pushkey
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
203 remote: (upgrade your client or server to use the bundle2 protocol)
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
204 abort: unexpected response: empty string
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
205 [255]
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
206
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
207 But we do let it goes fine on repository with exchange disabled:
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
208
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
209 $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
210 $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log --config experimental.evolution='!'
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
211 $ hg debugpushkey http://localhost:$HGPORT/ obsolete