Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-pull @ 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 | 85daa4e03b4c |
children | 83cfd95eafb5 |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
522
diff
changeset
|
1 #!/bin/sh |
336 | 2 |
3 mkdir test | |
4 cd test | |
5 echo foo>foo | |
6 hg init | |
7 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
642
diff
changeset
|
8 hg commit -m 1 |
336 | 9 hg verify |
1786
ffb584a182d1
Don't use mktemp in tests, we're already in a secure temp dir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1744
diff
changeset
|
10 hg serve -p 20059 -d --pid-file=hg.pid |
336 | 11 cd .. |
12 | |
1927
397b62d5dd13
add http_proxy= lines to test-bad-pull and test-pull
Peter van Dijk <peter@dataloss.nl>
parents:
814
diff
changeset
|
13 http_proxy= hg clone http://localhost:20059/ copy |
336 | 14 cd copy |
15 hg verify | |
16 hg co | |
17 cat foo | |
18 hg manifest | |
522
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
495
diff
changeset
|
19 hg pull |
336 | 20 |
1786
ffb584a182d1
Don't use mktemp in tests, we're already in a secure temp dir.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1744
diff
changeset
|
21 kill `cat ../test/hg.pid` |