Show More
@@ -9,6 +9,8 b' Setup' | |||||
9 |
|
9 | |||
10 | $ . "$TESTDIR/library-infinitepush.sh" |
|
10 | $ . "$TESTDIR/library-infinitepush.sh" | |
11 | $ cat >> $HGRCPATH <<EOF |
|
11 | $ cat >> $HGRCPATH <<EOF | |
|
12 | > [ui] | |||
|
13 | > ssh = python "$TESTDIR/dummyssh" | |||
12 | > [alias] |
|
14 | > [alias] | |
13 | > glog = log -GT "{rev}:{node|short} {desc}\n{phase}" |
|
15 | > glog = log -GT "{rev}:{node|short} {desc}\n{phase}" | |
14 | > EOF |
|
16 | > EOF | |
@@ -26,6 +28,7 b' Setup' | |||||
26 | $ cd .. |
|
28 | $ cd .. | |
27 | $ hg clone repo client -q |
|
29 | $ hg clone repo client -q | |
28 | $ hg clone repo client2 -q |
|
30 | $ hg clone repo client2 -q | |
|
31 | $ hg clone ssh://user@dummy/repo client3 -q | |||
29 | $ cd client |
|
32 | $ cd client | |
30 |
|
33 | |||
31 | Pushing a new commit from the client to the server |
|
34 | Pushing a new commit from the client to the server | |
@@ -175,8 +178,8 b' Checking if `hg pull` pulls something or' | |||||
175 | searching for changes |
|
178 | searching for changes | |
176 | no changes found |
|
179 | no changes found | |
177 |
|
180 | |||
178 | Pulling from second client to test `hg pull -r <rev>` |
|
181 | Pulling from second client which is a localpeer to test `hg pull -r <rev>` | |
179 | ------------------------------------------------------ |
|
182 | -------------------------------------------------------------------------- | |
180 |
|
183 | |||
181 | Pulling the revision which is applied |
|
184 | Pulling the revision which is applied | |
182 |
|
185 | |||
@@ -197,8 +200,8 b' Pulling the revision which is applied' | |||||
197 | public |
|
200 | public | |
198 |
|
201 | |||
199 | Pulling the revision which is in bundlestore |
|
202 | Pulling the revision which is in bundlestore | |
200 |
XXX: we should support pulling revisions from bundlestore without |
|
203 | XXX: we should support pulling revisions from a local peers bundlestore without | |
201 | wrapping |
|
204 | client side wrapping | |
202 |
|
205 | |||
203 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef |
|
206 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef | |
204 | pulling from $TESTTMP/repo |
|
207 | pulling from $TESTTMP/repo | |
@@ -212,6 +215,62 b' wrapping' | |||||
212 |
|
215 | |||
213 | $ cd ../client |
|
216 | $ cd ../client | |
214 |
|
217 | |||
|
218 | Pulling from third client which is not a localpeer | |||
|
219 | --------------------------------------------------- | |||
|
220 | ||||
|
221 | Pulling the revision which is applied | |||
|
222 | ||||
|
223 | $ cd ../client3 | |||
|
224 | $ hg pull -r 6cb0989601f1 | |||
|
225 | pulling from ssh://user@dummy/repo | |||
|
226 | searching for changes | |||
|
227 | adding changesets | |||
|
228 | adding manifests | |||
|
229 | adding file changes | |||
|
230 | added 1 changesets with 1 changes to 1 files | |||
|
231 | new changesets 6cb0989601f1 | |||
|
232 | (run 'hg update' to get a working copy) | |||
|
233 | $ hg glog | |||
|
234 | o 1:6cb0989601f1 added a | |||
|
235 | | public | |||
|
236 | @ 0:67145f466344 initialcommit | |||
|
237 | public | |||
|
238 | ||||
|
239 | Pulling the revision which is in bundlestore | |||
|
240 | ||||
|
241 | Trying to specify short hash | |||
|
242 | XXX: we should support this | |||
|
243 | $ hg pull -r b4e4bce660512 | |||
|
244 | pulling from ssh://user@dummy/repo | |||
|
245 | abort: unknown revision 'b4e4bce660512'! | |||
|
246 | [255] | |||
|
247 | ||||
|
248 | XXX: we should show better message when the pull is happening from bundlestore | |||
|
249 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef | |||
|
250 | pulling from ssh://user@dummy/repo | |||
|
251 | searching for changes | |||
|
252 | no changes found | |||
|
253 | adding changesets | |||
|
254 | adding manifests | |||
|
255 | adding file changes | |||
|
256 | added 4 changesets with 4 changes to 4 files | |||
|
257 | new changesets eaba929e866c:b4e4bce66051 | |||
|
258 | $ hg glog | |||
|
259 | o 5:b4e4bce66051 added e | |||
|
260 | | public | |||
|
261 | o 4:1bb96358eda2 added d | |||
|
262 | | public | |||
|
263 | o 3:bf8a6e3011b3 added c | |||
|
264 | | public | |||
|
265 | o 2:eaba929e866c added b | |||
|
266 | | public | |||
|
267 | o 1:6cb0989601f1 added a | |||
|
268 | | public | |||
|
269 | @ 0:67145f466344 initialcommit | |||
|
270 | public | |||
|
271 | ||||
|
272 | $ cd ../client | |||
|
273 | ||||
215 | Checking storage of phase information with the bundle on bundlestore |
|
274 | Checking storage of phase information with the bundle on bundlestore | |
216 | --------------------------------------------------------------------- |
|
275 | --------------------------------------------------------------------- | |
217 |
|
276 |
General Comments 0
You need to be logged in to leave comments.
Login now