Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-ssh.out @ 2439:e8c4f3d3df8c
extend network protocol to stop clients from locking servers
now all repositories have capabilities slot, tuple with list of names.
if 'unbundle' capability present, repo supports push where client does
not need to lock server. repository classes that have unbundle capability
also have unbundle method.
implemented for ssh now, will be base for push over http.
unbundle protocol acts this way. server tells client what heads it
has during normal negotiate step. client starts unbundle by repeat
server's heads back to it. if server has new heads, abort immediately.
otherwise, transfer changes to server. once data transferred, server
locks and checks heads again. if heads same, changes can be added.
else someone else added heads, and server aborts.
if client wants to force server to add heads, sends special heads list of
'force'.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 15 Jun 2006 16:37:23 -0700 |
parents | b2ae81a7df29 |
children | ffb895f16925 |
rev | line source |
---|---|
1110 | 1 # creating 'remote' |
2 # clone remote | |
3 requesting all changes | |
4 adding changesets | |
5 adding manifests | |
6 adding file changes | |
7 added 1 changesets with 1 changes to 1 files | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1110 | 9 # verify |
10 checking changesets | |
11 checking manifests | |
12 crosschecking files in changesets and manifests | |
13 checking files | |
14 1 files, 1 changesets, 1 total revisions | |
15 # empty default pull | |
16 default = ssh://user@dummy/remote | |
17 pulling from ssh://user@dummy/remote | |
18 searching for changes | |
19 no changes found | |
20 # local change | |
21 # updating rc | |
22 # find outgoing | |
23 searching for changes | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1168
diff
changeset
|
24 changeset: 1:c54836a570be |
1110 | 25 tag: tip |
26 user: test | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1168
diff
changeset
|
27 date: Mon Jan 12 13:46:40 1970 +0000 |
1110 | 28 summary: add |
29 | |
1982
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
30 # find incoming on the remote side |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
31 searching for changes |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
32 changeset: 1:c54836a570be |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
33 tag: tip |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
34 user: test |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
35 date: Mon Jan 12 13:46:40 1970 +0000 |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
36 summary: add |
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
37 |
1110 | 38 # push |
39 pushing to ssh://user@dummy/remote | |
40 searching for changes | |
41 remote: adding changesets | |
42 remote: adding manifests | |
43 remote: adding file changes | |
44 remote: added 1 changesets with 1 changes to 1 files | |
45 # check remote tip | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1168
diff
changeset
|
46 changeset: 1:c54836a570be |
1110 | 47 tag: tip |
48 user: test | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1168
diff
changeset
|
49 date: Mon Jan 12 13:46:40 1970 +0000 |
1110 | 50 summary: add |
51 | |
52 checking changesets | |
53 checking manifests | |
54 crosschecking files in changesets and manifests | |
55 checking files | |
56 1 files, 2 changesets, 2 total revisions | |
57 bleah | |
2439
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
58 # push should fail |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
59 pushing to ssh://user@dummy/remote |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
60 searching for changes |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
61 abort: unsynced remote changes! |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
62 (did you forget to sync? use push -f to force) |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
63 # push should succeed |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
64 pushing to ssh://user@dummy/remote |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
65 searching for changes |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
66 remote: adding changesets |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
67 remote: adding manifests |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
68 remote: adding file changes |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
69 remote: added 1 changesets with 1 changes to 1 files |
1110 | 70 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
71 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: | |
72 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: | |
1982
70ba0c86da8b
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1933
diff
changeset
|
73 Got arguments 1:user@dummy 2:hg -R local serve --stdio 3: 4: 5: |
1110 | 74 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
2439
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
75 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
e8c4f3d3df8c
extend network protocol to stop clients from locking servers
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
76 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |