Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 2436:f910b91dd912 | 2439:e8c4f3d3df8c |
|---|---|
| 53 checking manifests | 53 checking manifests |
| 54 crosschecking files in changesets and manifests | 54 crosschecking files in changesets and manifests |
| 55 checking files | 55 checking files |
| 56 1 files, 2 changesets, 2 total revisions | 56 1 files, 2 changesets, 2 total revisions |
| 57 bleah | 57 bleah |
| 58 # push should fail | |
| 59 pushing to ssh://user@dummy/remote | |
| 60 searching for changes | |
| 61 abort: unsynced remote changes! | |
| 62 (did you forget to sync? use push -f to force) | |
| 63 # push should succeed | |
| 64 pushing to ssh://user@dummy/remote | |
| 65 searching for changes | |
| 66 remote: adding changesets | |
| 67 remote: adding manifests | |
| 68 remote: adding file changes | |
| 69 remote: added 1 changesets with 1 changes to 1 files | |
| 58 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: | 70 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
| 59 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: |
| 60 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: |
| 61 Got arguments 1:user@dummy 2:hg -R local serve --stdio 3: 4: 5: | 73 Got arguments 1:user@dummy 2:hg -R local serve --stdio 3: 4: 5: |
| 62 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: | 74 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |
| 75 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: | |
| 76 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5: |