author | Matt Harbison <matt_harbison@yahoo.com> |
Mon, 07 Dec 2020 20:32:05 -0500 | |
changeset 46072 | 69429972ff1f |
parent 45906 | 95c4cca641f6 |
child 46226 | 0826d684a1b5 |
permissions | -rw-r--r-- |
37379
24c7428983c5
tests: disable infinitepush tests for simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37240
diff
changeset
|
1 |
#require no-reposimplestore |
24c7428983c5
tests: disable infinitepush tests for simple store
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37240
diff
changeset
|
2 |
|
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
Testing the case when there is no infinitepush extension present on the client |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 |
side and the server routes each push to bundlestore. This case is very much |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
similar to CI use case. |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
Setup |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
----- |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 |
$ . "$TESTDIR/library-infinitepush.sh" |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 |
$ cat >> $HGRCPATH <<EOF |
37561
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
12 |
> [ui] |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
13 |
> ssh = python "$TESTDIR/dummyssh" |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
> [alias] |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
> glog = log -GT "{rev}:{node|short} {desc}\n{phase}" |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
> EOF |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
$ cp $HGRCPATH $TESTTMP/defaulthgrc |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
$ hg init repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 |
$ cd repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
20 |
$ setupserver |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 |
$ echo "pushtobundlestore = True" >> .hg/hgrc |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 |
$ echo "[extensions]" >> .hg/hgrc |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
$ echo "infinitepush=" >> .hg/hgrc |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
$ echo initialcommit > initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
$ hg ci -Aqm "initialcommit" |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
$ hg phase --public . |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 |
$ cd .. |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 |
$ hg clone repo client -q |
37240
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
30 |
$ hg clone repo client2 -q |
37561
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
31 |
$ hg clone ssh://user@dummy/repo client3 -q |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
$ cd client |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
Pushing a new commit from the client to the server |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
----------------------------------------------------- |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
36 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
37 |
$ echo foobar > a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
38 |
$ hg ci -Aqm "added a" |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
$ hg glog |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
40 |
@ 1:6cb0989601f1 added a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 |
| draft |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
o 0:67145f466344 initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 |
$ hg push |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
pushing to $TESTTMP/repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
47 |
searching for changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 |
storing changesets on the bundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
pushing 1 commit: |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
50 |
6cb0989601f1 added a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 |
$ scratchnodes |
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
53 |
6cb0989601f1fb5805238edfb16f3606713d9a0b 3b414252ff8acab801318445d88ff48faf4a28c3 |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 |
Understanding how data is stored on the bundlestore in server |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |
------------------------------------------------------------- |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 |
There are two things, filebundlestore and index |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 |
$ ls ../repo/.hg/scratchbranches |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
filebundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 |
index |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 |
filebundlestore stores the bundles |
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
64 |
$ ls ../repo/.hg/scratchbranches/filebundlestore/3b/41/ |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
65 |
3b414252ff8acab801318445d88ff48faf4a28c3 |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
index/nodemap stores a map of node id and file in which bundle is stored in filebundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
$ ls ../repo/.hg/scratchbranches/index/ |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 |
nodemap |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
$ ls ../repo/.hg/scratchbranches/index/nodemap/ |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
6cb0989601f1fb5805238edfb16f3606713d9a0b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 |
$ cd ../repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
Checking that the commit was not applied to revlog on the server |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
76 |
------------------------------------------------------------------ |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 |
$ hg glog |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 |
@ 0:67145f466344 initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 |
Applying the changeset from the bundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
-------------------------------------------- |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
|
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
85 |
$ hg unbundle .hg/scratchbranches/filebundlestore/3b/41/3b414252ff8acab801318445d88ff48faf4a28c3 |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
adding changesets |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
adding manifests |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
88 |
adding file changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 |
added 1 changesets with 1 changes to 1 files |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
new changesets 6cb0989601f1 |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
91 |
(run 'hg update' to get a working copy) |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
93 |
$ hg glog |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
o 1:6cb0989601f1 added a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
95 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 |
@ 0:67145f466344 initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 |
public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 |
Pushing more changesets from the local repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
100 |
-------------------------------------------- |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
101 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
102 |
$ cd ../client |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
103 |
$ echo b > b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 |
$ hg ci -Aqm "added b" |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 |
$ echo c > c |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 |
$ hg ci -Aqm "added c" |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 |
$ hg glog |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 |
@ 3:bf8a6e3011b3 added c |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 |
| draft |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
110 |
o 2:eaba929e866c added b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
| draft |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
o 1:6cb0989601f1 added a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 |
o 0:67145f466344 initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 |
public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 |
$ hg push |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 |
pushing to $TESTTMP/repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 |
searching for changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
120 |
storing changesets on the bundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 |
pushing 2 commits: |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 |
eaba929e866c added b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
123 |
bf8a6e3011b3 added c |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
124 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
125 |
Checking that changesets are not applied on the server |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 |
------------------------------------------------------ |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
$ hg glog -R ../repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 |
o 1:6cb0989601f1 added a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
130 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 |
@ 0:67145f466344 initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 |
public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
134 |
Both of the new changesets are stored in a single bundle-file |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
135 |
$ scratchnodes |
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
136 |
6cb0989601f1fb5805238edfb16f3606713d9a0b 3b414252ff8acab801318445d88ff48faf4a28c3 |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
137 |
bf8a6e3011b345146bbbedbcb1ebd4837571492a 239585f5e61f0c09ce7106bdc1097bff731738f4 |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
138 |
eaba929e866c59bc9a6aada5a9dd2f6990db83c0 239585f5e61f0c09ce7106bdc1097bff731738f4 |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 |
Pushing more changesets to the server |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
141 |
------------------------------------- |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
142 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 |
$ echo d > d |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
144 |
$ hg ci -Aqm "added d" |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
145 |
$ echo e > e |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
146 |
$ hg ci -Aqm "added e" |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
147 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
148 |
XXX: we should have pushed only the parts which are not in bundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
149 |
$ hg push |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
150 |
pushing to $TESTTMP/repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
151 |
searching for changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
152 |
storing changesets on the bundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
153 |
pushing 4 commits: |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 |
eaba929e866c added b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
155 |
bf8a6e3011b3 added c |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
156 |
1bb96358eda2 added d |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
157 |
b4e4bce66051 added e |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
159 |
Sneak peek into the bundlestore at the server |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
160 |
$ scratchnodes |
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
161 |
1bb96358eda285b536c6d1c66846a7cdb2336cea 98fbae0016662521b0007da1b7bc349cd3caacd1 |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
162 |
6cb0989601f1fb5805238edfb16f3606713d9a0b 3b414252ff8acab801318445d88ff48faf4a28c3 |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
163 |
b4e4bce660512ad3e71189e14588a70ac8e31fef 98fbae0016662521b0007da1b7bc349cd3caacd1 |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
164 |
bf8a6e3011b345146bbbedbcb1ebd4837571492a 98fbae0016662521b0007da1b7bc349cd3caacd1 |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
165 |
eaba929e866c59bc9a6aada5a9dd2f6990db83c0 98fbae0016662521b0007da1b7bc349cd3caacd1 |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
166 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
167 |
Checking if `hg pull` pulls something or `hg incoming` shows something |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
168 |
----------------------------------------------------------------------- |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
169 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
170 |
$ hg incoming |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
171 |
comparing with $TESTTMP/repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
172 |
searching for changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
173 |
no changes found |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
174 |
[1] |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
175 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
176 |
$ hg pull |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
177 |
pulling from $TESTTMP/repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
178 |
searching for changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
179 |
no changes found |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
180 |
|
37561
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
181 |
Pulling from second client which is a localpeer to test `hg pull -r <rev>` |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
182 |
-------------------------------------------------------------------------- |
37240
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
183 |
|
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
184 |
Pulling the revision which is applied |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
185 |
|
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
186 |
$ cd ../client2 |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
187 |
$ hg pull -r 6cb0989601f1 |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
188 |
pulling from $TESTTMP/repo |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
189 |
searching for changes |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
190 |
adding changesets |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
191 |
adding manifests |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
192 |
adding file changes |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
193 |
added 1 changesets with 1 changes to 1 files |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
194 |
new changesets 6cb0989601f1 |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
195 |
(run 'hg update' to get a working copy) |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
196 |
$ hg glog |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
197 |
o 1:6cb0989601f1 added a |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
198 |
| public |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
199 |
@ 0:67145f466344 initialcommit |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
200 |
public |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
201 |
|
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
202 |
Pulling the revision which is in bundlestore |
37561
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
203 |
XXX: we should support pulling revisions from a local peers bundlestore without |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
204 |
client side wrapping |
37240
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
205 |
|
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
206 |
$ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
207 |
pulling from $TESTTMP/repo |
45906
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
208 |
abort: unknown revision 'b4e4bce660512ad3e71189e14588a70ac8e31fef' |
37240
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
209 |
[255] |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
210 |
$ hg glog |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
211 |
o 1:6cb0989601f1 added a |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
212 |
| public |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
213 |
@ 0:67145f466344 initialcommit |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
214 |
public |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
215 |
|
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
216 |
$ cd ../client |
b5caa13d1a73
infinitepush: add tests for `hg pull -r <rev>`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37206
diff
changeset
|
217 |
|
37561
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
218 |
Pulling from third client which is not a localpeer |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
219 |
--------------------------------------------------- |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
220 |
|
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
221 |
Pulling the revision which is applied |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
222 |
|
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
223 |
$ cd ../client3 |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
224 |
$ hg pull -r 6cb0989601f1 |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
225 |
pulling from ssh://user@dummy/repo |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
226 |
searching for changes |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
227 |
adding changesets |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
228 |
adding manifests |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
229 |
adding file changes |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
230 |
added 1 changesets with 1 changes to 1 files |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
231 |
new changesets 6cb0989601f1 |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
232 |
(run 'hg update' to get a working copy) |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
233 |
$ hg glog |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
234 |
o 1:6cb0989601f1 added a |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
235 |
| public |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
236 |
@ 0:67145f466344 initialcommit |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
237 |
public |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
238 |
|
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
239 |
Pulling the revision which is in bundlestore |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
240 |
|
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
241 |
Trying to specify short hash |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
242 |
XXX: we should support this |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
243 |
$ hg pull -r b4e4bce660512 |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
244 |
pulling from ssh://user@dummy/repo |
45906
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
245 |
abort: unknown revision 'b4e4bce660512' |
37561
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
246 |
[255] |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
247 |
|
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
248 |
XXX: we should show better message when the pull is happening from bundlestore |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
249 |
$ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
250 |
pulling from ssh://user@dummy/repo |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
251 |
searching for changes |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
252 |
adding changesets |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
253 |
adding manifests |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
254 |
adding file changes |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
255 |
added 4 changesets with 4 changes to 4 files |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
256 |
new changesets eaba929e866c:b4e4bce66051 |
44667
b561f3a68e41
discovery: avoid wrongly saying there are nothing to pull
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
39480
diff
changeset
|
257 |
(run 'hg update' to get a working copy) |
37561
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
258 |
$ hg glog |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
259 |
o 5:b4e4bce66051 added e |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
260 |
| public |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
261 |
o 4:1bb96358eda2 added d |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
262 |
| public |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
263 |
o 3:bf8a6e3011b3 added c |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
264 |
| public |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
265 |
o 2:eaba929e866c added b |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
266 |
| public |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
267 |
o 1:6cb0989601f1 added a |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
268 |
| public |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
269 |
@ 0:67145f466344 initialcommit |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
270 |
public |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
271 |
|
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
272 |
$ cd ../client |
8478b198af9c
tests: add tests showing pulling from infinitepush works over wire
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37379
diff
changeset
|
273 |
|
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
274 |
Checking storage of phase information with the bundle on bundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
275 |
--------------------------------------------------------------------- |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
276 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
277 |
creating a draft commit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
278 |
$ cat >> $HGRCPATH <<EOF |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
279 |
> [phases] |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
280 |
> publish = False |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
281 |
> EOF |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
282 |
$ echo f > f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
283 |
$ hg ci -Aqm "added f" |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
284 |
$ hg glog -r '.^::' |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
285 |
@ 6:9b42578d4447 added f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
286 |
| draft |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
287 |
o 5:b4e4bce66051 added e |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
288 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
289 |
~ |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
290 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
291 |
$ hg push |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
292 |
pushing to $TESTTMP/repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
293 |
searching for changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
294 |
storing changesets on the bundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
295 |
pushing 5 commits: |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
296 |
eaba929e866c added b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
297 |
bf8a6e3011b3 added c |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
298 |
1bb96358eda2 added d |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
299 |
b4e4bce66051 added e |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
300 |
9b42578d4447 added f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
301 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
302 |
XXX: the phase of 9b42578d4447 should not be changed here |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
303 |
$ hg glog -r . |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
304 |
@ 6:9b42578d4447 added f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
305 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
306 |
~ |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
307 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
308 |
applying the bundle on the server to check preservation of phase-information |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
309 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
310 |
$ cd ../repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
311 |
$ scratchnodes |
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
312 |
1bb96358eda285b536c6d1c66846a7cdb2336cea 280a46a259a268f0e740c81c5a7751bdbfaec85f |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
313 |
6cb0989601f1fb5805238edfb16f3606713d9a0b 3b414252ff8acab801318445d88ff48faf4a28c3 |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
314 |
9b42578d44473575994109161430d65dd147d16d 280a46a259a268f0e740c81c5a7751bdbfaec85f |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
315 |
b4e4bce660512ad3e71189e14588a70ac8e31fef 280a46a259a268f0e740c81c5a7751bdbfaec85f |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
316 |
bf8a6e3011b345146bbbedbcb1ebd4837571492a 280a46a259a268f0e740c81c5a7751bdbfaec85f |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
317 |
eaba929e866c59bc9a6aada5a9dd2f6990db83c0 280a46a259a268f0e740c81c5a7751bdbfaec85f |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
318 |
|
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
319 |
$ hg unbundle .hg/scratchbranches/filebundlestore/28/0a/280a46a259a268f0e740c81c5a7751bdbfaec85f |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
320 |
adding changesets |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
321 |
adding manifests |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
322 |
adding file changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
323 |
added 5 changesets with 5 changes to 5 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
37561
diff
changeset
|
324 |
new changesets eaba929e866c:9b42578d4447 (1 drafts) |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
325 |
(run 'hg update' to get a working copy) |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
326 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
327 |
$ hg glog |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
328 |
o 6:9b42578d4447 added f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
329 |
| draft |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
330 |
o 5:b4e4bce66051 added e |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
331 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
332 |
o 4:1bb96358eda2 added d |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
333 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
334 |
o 3:bf8a6e3011b3 added c |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
335 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
336 |
o 2:eaba929e866c added b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
337 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
338 |
o 1:6cb0989601f1 added a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
339 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
340 |
@ 0:67145f466344 initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
341 |
public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
342 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
343 |
Checking storage of obsmarkers in the bundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
344 |
-------------------------------------------------- |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
345 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
346 |
enabling obsmarkers and rebase extension |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
347 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
348 |
$ cat >> $HGRCPATH << EOF |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
349 |
> [experimental] |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
350 |
> evolution = all |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
351 |
> [extensions] |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
352 |
> rebase = |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
353 |
> EOF |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
354 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
355 |
$ cd ../client |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
356 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
357 |
$ hg phase -r . --draft --force |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
358 |
$ hg rebase -r 6 -d 3 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
44729
diff
changeset
|
359 |
rebasing 6:9b42578d4447 tip "added f" |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
360 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
361 |
$ hg glog |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
362 |
@ 7:99949238d9ac added f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
363 |
| draft |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
364 |
| o 5:b4e4bce66051 added e |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
365 |
| | public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
366 |
| o 4:1bb96358eda2 added d |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
367 |
|/ public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
368 |
o 3:bf8a6e3011b3 added c |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
369 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
370 |
o 2:eaba929e866c added b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
371 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
372 |
o 1:6cb0989601f1 added a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
373 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
374 |
o 0:67145f466344 initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
375 |
public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
376 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
377 |
$ hg push -f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
378 |
pushing to $TESTTMP/repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
379 |
searching for changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
380 |
storing changesets on the bundlestore |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
381 |
pushing 1 commit: |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
382 |
99949238d9ac added f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
383 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
384 |
XXX: the phase should not have changed here |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
385 |
$ hg glog -r . |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
386 |
@ 7:99949238d9ac added f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
387 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
388 |
~ |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
389 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
390 |
Unbundling on server to see obsmarkers being applied |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
391 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
392 |
$ cd ../repo |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
393 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
394 |
$ scratchnodes |
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
395 |
1bb96358eda285b536c6d1c66846a7cdb2336cea 280a46a259a268f0e740c81c5a7751bdbfaec85f |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
396 |
6cb0989601f1fb5805238edfb16f3606713d9a0b 3b414252ff8acab801318445d88ff48faf4a28c3 |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
397 |
99949238d9ac7f2424a33a46dface6f866afd059 090a24fe63f31d3b4bee714447f835c8c362ff57 |
44412
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
398 |
9b42578d44473575994109161430d65dd147d16d 280a46a259a268f0e740c81c5a7751bdbfaec85f |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
399 |
b4e4bce660512ad3e71189e14588a70ac8e31fef 280a46a259a268f0e740c81c5a7751bdbfaec85f |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
400 |
bf8a6e3011b345146bbbedbcb1ebd4837571492a 280a46a259a268f0e740c81c5a7751bdbfaec85f |
edc8504bc26b
exchange: turn on option that makes concurrent pushes work better
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents:
39480
diff
changeset
|
401 |
eaba929e866c59bc9a6aada5a9dd2f6990db83c0 280a46a259a268f0e740c81c5a7751bdbfaec85f |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
402 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
403 |
$ hg glog |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
404 |
o 6:9b42578d4447 added f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
405 |
| draft |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
406 |
o 5:b4e4bce66051 added e |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
407 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
408 |
o 4:1bb96358eda2 added d |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
409 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
410 |
o 3:bf8a6e3011b3 added c |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
411 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
412 |
o 2:eaba929e866c added b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
413 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
414 |
o 1:6cb0989601f1 added a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
415 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
416 |
@ 0:67145f466344 initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
417 |
public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
418 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
419 |
$ hg unbundle .hg/scratchbranches/filebundlestore/09/0a/090a24fe63f31d3b4bee714447f835c8c362ff57 |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
420 |
adding changesets |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
421 |
adding manifests |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
422 |
adding file changes |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
423 |
added 1 changesets with 0 changes to 1 files (+1 heads) |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
424 |
1 new obsolescence markers |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
425 |
obsoleted 1 changesets |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
37561
diff
changeset
|
426 |
new changesets 99949238d9ac (1 drafts) |
37206
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
427 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
428 |
|
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
429 |
$ hg glog |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
430 |
o 7:99949238d9ac added f |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
431 |
| draft |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
432 |
| o 5:b4e4bce66051 added e |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
433 |
| | public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
434 |
| o 4:1bb96358eda2 added d |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
435 |
|/ public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
436 |
o 3:bf8a6e3011b3 added c |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
437 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
438 |
o 2:eaba929e866c added b |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
439 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
440 |
o 1:6cb0989601f1 added a |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
441 |
| public |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
442 |
@ 0:67145f466344 initialcommit |
571f25dae740
infinitepush: introduce server option to route every push to bundlestore
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
443 |
public |