| author | Pierre-Yves David <pierre-yves.david@fb.com> |
| Tue, 21 Apr 2015 17:37:59 +0200 | |
| branch | stable |
| changeset 1276 | 18a18131e92f |
| parent 1185 | cc3e68120185 |
| child 1277 | 0ac2ad8e7235 |
| permissions | -rw-r--r-- |
|
943
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
1 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 |
$ cat >> $HGRCPATH <<EOF |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 |
> [defaults] |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
> amend=-d "0 0" |
|
1276
18a18131e92f
test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
5 |
> [experimental] |
|
18a18131e92f
test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
6 |
> obsmarkers-exchange-debug=true |
|
18a18131e92f
test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
7 |
> bundle2-exp=true |
|
943
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
> [ui] |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 |
> ssh=python "$TESTDIR/dummyssh" |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 |
> [phases] |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
11 |
> publish = False |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
12 |
> [extensions] |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
13 |
> EOF |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
15 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
16 |
$ mkcommit() { |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
17 |
> echo "$1" > "$1" |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
18 |
> hg add "$1" |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 |
> hg ci -m "add $1" |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 |
> } |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
22 |
setup repo |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 |
$ hg init server |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
$ hg clone ssh://user@dummy/server client |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 |
no changes found |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 |
updating to branch default |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 |
$ cp -r client other |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 |
Smoke testing |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 |
=============== |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 |
$ cd client |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 |
$ mkcommit 0 |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 |
$ mkcommit a |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 |
$ hg push |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 |
pushing to ssh://user@dummy/server |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 |
searching for changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
remote: adding changesets |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 |
remote: adding manifests |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 |
remote: adding file changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
remote: added 2 changesets with 2 changes to 2 files |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
45 |
$ hg pull |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 |
pulling from ssh://user@dummy/server |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
47 |
searching for changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
48 |
no changes found |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
49 |
$ hg pull -R ../other |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
50 |
pulling from ssh://user@dummy/server |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 |
requesting all changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
adding changesets |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 |
adding manifests |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 |
adding file changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 |
added 2 changesets with 2 changes to 2 files |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 |
(run 'hg update' to get a working copy) |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 |
$ hg push -R ../other |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
58 |
pushing to ssh://user@dummy/server |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
59 |
searching for changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
60 |
no changes found |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
61 |
[1] |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
62 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
63 |
Push |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
64 |
============= |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
65 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
66 |
$ echo 'A' > a |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
67 |
$ hg amend |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 |
$ hg push |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
69 |
pushing to ssh://user@dummy/server |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
70 |
searching for changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 |
remote: adding changesets |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
72 |
remote: adding manifests |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
73 |
remote: adding file changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 |
remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
1276
18a18131e92f
test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
75 |
remote: obsmarker-exchange: 139 bytes received |
|
18a18131e92f
test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
76 |
remote: 2 new obsolescence markers |
|
943
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 |
$ hg push |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 |
pushing to ssh://user@dummy/server |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
79 |
searching for changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
80 |
no changes found |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
81 |
[1] |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
83 |
Pull |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
84 |
============= |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
85 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
86 |
$ hg -R ../other pull |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
87 |
pulling from ssh://user@dummy/server |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
88 |
searching for changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
89 |
adding changesets |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
90 |
adding manifests |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
91 |
adding file changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
92 |
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
|
1276
18a18131e92f
test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
93 |
obsmarker-exchange: 139 bytes received |
|
18a18131e92f
test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
94 |
2 new obsolescence markers |
|
18a18131e92f
test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1185
diff
changeset
|
95 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
|
943
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
96 |
$ hg -R ../other pull |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
97 |
pulling from ssh://user@dummy/server |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
98 |
searching for changes |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
99 |
no changes found |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
100 |
|
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
101 |
$ cd .. |
|
5b8d9c2ab480
evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
102 |