Mercurial > evolve
comparison tests/test-wireproto.t @ 3287:4303a46b4167 mercurial-4.3
test-compat: merge stable into mercurial-4.3
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 11 Dec 2017 16:32:03 +0100 |
parents | 68aeeb4d4b8f 76c447d88d9a |
children | b714709afe6a 85cdce113c2c |
comparison
equal
deleted
inserted
replaced
3286:76c447d88d9a | 3287:4303a46b4167 |
---|---|
51 requesting all changes | 51 requesting all changes |
52 adding changesets | 52 adding changesets |
53 adding manifests | 53 adding manifests |
54 adding file changes | 54 adding file changes |
55 added 2 changesets with 2 changes to 2 files | 55 added 2 changesets with 2 changes to 2 files |
56 new changesets 8685c6d34325:4957bfdac07e | |
57 (run 'hg update' to get a working copy) | 56 (run 'hg update' to get a working copy) |
58 $ hg push -R ../other | 57 $ hg push -R ../other |
59 pushing to ssh://user@dummy/server | 58 pushing to ssh://user@dummy/server |
60 searching for changes | 59 searching for changes |
61 no changes found | 60 no changes found |
71 searching for changes | 70 searching for changes |
72 remote: adding changesets | 71 remote: adding changesets |
73 remote: adding manifests | 72 remote: adding manifests |
74 remote: adding file changes | 73 remote: adding file changes |
75 remote: added 1 changesets with 1 changes to 1 files (+1 heads) | 74 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
76 remote: obsmarker-exchange: 92 bytes received | 75 remote: obsmarker-exchange: 151 bytes received |
77 remote: 1 new obsolescence markers | 76 remote: 2 new obsolescence markers |
78 remote: obsoleted 1 changesets | 77 remote: obsoleted 1 changesets |
79 $ hg push | 78 $ hg push |
80 pushing to ssh://user@dummy/server | 79 pushing to ssh://user@dummy/server |
81 searching for changes | 80 searching for changes |
82 no changes found | 81 no changes found |
90 searching for changes | 89 searching for changes |
91 adding changesets | 90 adding changesets |
92 adding manifests | 91 adding manifests |
93 adding file changes | 92 adding file changes |
94 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) | 93 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
95 obsmarker-exchange: 92 bytes received | 94 obsmarker-exchange: 151 bytes received |
96 1 new obsolescence markers | 95 2 new obsolescence markers |
97 obsoleted 1 changesets | 96 obsoleted 1 changesets |
98 new changesets 9d1c114e7797 | |
99 (run 'hg heads' to see heads) | 97 (run 'hg heads' to see heads) |
100 $ hg -R ../other pull | 98 $ hg -R ../other pull |
101 pulling from ssh://user@dummy/server | 99 pulling from ssh://user@dummy/server |
102 searching for changes | 100 searching for changes |
103 no changes found | 101 no changes found |
115 searching for changes | 113 searching for changes |
116 remote: adding changesets | 114 remote: adding changesets |
117 remote: adding manifests | 115 remote: adding manifests |
118 remote: adding file changes | 116 remote: adding file changes |
119 remote: added 1 changesets with 1 changes to 1 files | 117 remote: added 1 changesets with 1 changes to 1 files |
120 remote: obsmarker-exchange: 92 bytes received | 118 remote: obsmarker-exchange: 151 bytes received |
121 remote: 1 new obsolescence markers | 119 remote: 2 new obsolescence markers |
122 $ hg -R ../other pull | 120 $ hg -R ../other pull |
123 pulling from ssh://user@dummy/server | 121 pulling from ssh://user@dummy/server |
124 searching for changes | 122 searching for changes |
125 adding changesets | 123 adding changesets |
126 adding manifests | 124 adding manifests |
127 adding file changes | 125 adding file changes |
128 added 1 changesets with 1 changes to 1 files | 126 added 1 changesets with 1 changes to 1 files |
129 obsmarker-exchange: 92 bytes received | 127 obsmarker-exchange: 151 bytes received |
130 1 new obsolescence markers | 128 2 new obsolescence markers |
131 new changesets a5687ec59dd4 | |
132 (run 'hg update' to get a working copy) | 129 (run 'hg update' to get a working copy) |
133 | 130 |
134 some common hidden | 131 some common hidden |
135 | 132 |
136 $ hg touch . | 133 $ hg touch . |
139 searching for changes | 136 searching for changes |
140 remote: adding changesets | 137 remote: adding changesets |
141 remote: adding manifests | 138 remote: adding manifests |
142 remote: adding file changes | 139 remote: adding file changes |
143 remote: added 1 changesets with 0 changes to 1 files (+1 heads) | 140 remote: added 1 changesets with 0 changes to 1 files (+1 heads) |
144 remote: obsmarker-exchange: 167 bytes received | 141 remote: obsmarker-exchange: 226 bytes received |
145 remote: 1 new obsolescence markers | 142 remote: 1 new obsolescence markers |
146 remote: obsoleted 1 changesets | 143 remote: obsoleted 1 changesets |
147 $ hg -R ../other pull | 144 $ hg -R ../other pull |
148 pulling from ssh://user@dummy/server | 145 pulling from ssh://user@dummy/server |
149 searching for changes | 146 searching for changes |
150 adding changesets | 147 adding changesets |
151 adding manifests | 148 adding manifests |
152 adding file changes | 149 adding file changes |
153 added 1 changesets with 0 changes to 1 files (+1 heads) | 150 added 1 changesets with 0 changes to 1 files (+1 heads) |
154 obsmarker-exchange: 167 bytes received | 151 obsmarker-exchange: 226 bytes received |
155 1 new obsolescence markers | 152 1 new obsolescence markers |
156 obsoleted 1 changesets | 153 obsoleted 1 changesets |
157 new changesets * (glob) | |
158 (run 'hg heads' to see heads) | 154 (run 'hg heads' to see heads) |
159 | 155 |
160 test discovery avoid exchanging known markers | 156 test discovery avoid exchanging known markers |
161 | 157 |
162 $ hg push | 158 $ hg push |
175 pushing to ssh://user@dummy/server | 171 pushing to ssh://user@dummy/server |
176 searching for changes | 172 searching for changes |
177 (skipping discovery of obsolescence markers, will exchange everything) | 173 (skipping discovery of obsolescence markers, will exchange everything) |
178 (controled by 'experimental.evolution.obsdiscovery' configuration) | 174 (controled by 'experimental.evolution.obsdiscovery' configuration) |
179 no changes found | 175 no changes found |
180 remote: obsmarker-exchange: 258 bytes received | 176 remote: obsmarker-exchange: 376 bytes received |
181 [1] | 177 [1] |
182 $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no | 178 $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no |
183 pulling from ssh://user@dummy/server | 179 pulling from ssh://user@dummy/server |
184 searching for changes | 180 searching for changes |
185 no changes found | 181 no changes found |
186 (skipping discovery of obsolescence markers, will exchange everything) | 182 (skipping discovery of obsolescence markers, will exchange everything) |
187 (controled by 'experimental.evolution.obsdiscovery' configuration) | 183 (controled by 'experimental.evolution.obsdiscovery' configuration) |
188 obsmarker-exchange: 258 bytes received | 184 obsmarker-exchange: 376 bytes received |
189 | 185 |
190 $ cd .. | 186 $ cd .. |
191 | 187 |
192 And disable it server side too: | 188 And disable it server side too: |
193 | 189 |
194 $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log --config experimental.evolution.obsdiscovery=no | 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 |
195 $ cat hg.pid >> $DAEMON_PIDS | 191 $ cat hg.pid >> $DAEMON_PIDS |
196 | 192 |
197 $ curl -s http://localhost:$HGPORT/?cmd=capabilities | 193 $ curl -s http://localhost:$HGPORT/?cmd=capabilities |
198 _evoext_getbundle_obscommon batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%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) | 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) |
199 | 195 |
200 Check we cannot use pushkey for marker exchange anymore | 196 Check we cannot use pushkey for marker exchange anymore |
201 | 197 |
202 $ hg debugpushkey http://localhost:$HGPORT/ obsolete | 198 $ hg debugpushkey http://localhost:$HGPORT/ obsolete |
203 abort: HTTP Error 410: won't exchange obsmarkers through pushkey | 199 abort: HTTP Error 410: won't exchange obsmarkers through pushkey |
212 | 208 |
213 $ hg -R client pull http://localhost:$HGPORT/ | 209 $ hg -R client pull http://localhost:$HGPORT/ |
214 pulling from http://localhost:$HGPORT/ | 210 pulling from http://localhost:$HGPORT/ |
215 searching for changes | 211 searching for changes |
216 no changes found | 212 no changes found |
217 obsmarker-exchange: 258 bytes received | 213 obsmarker-exchange: 376 bytes received |
218 | 214 |
219 $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers | 215 $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers |
220 pulling from http://localhost:$HGPORT/ | 216 pulling from http://localhost:$HGPORT/ |
221 searching for changes | 217 searching for changes |
222 no changes found | 218 no changes found |