Mercurial > hg-stable
comparison tests/test-ssh.t @ 35268:ad5f2b923b0d
push: include a 'check:bookmarks' part when possible
Before updating the actual bookmark update, we can start with updating the way
we check for push race. Checking bookmarks state earlier is useful even if we
still use pushkey. Aborting before the changegroup is added can save a lot of
time.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Mon, 13 Nov 2017 04:22:45 +0100 |
| parents | 3180ff7f6025 |
| children | 44b8b5ad30eb |
comparison
equal
deleted
inserted
replaced
| 35267:dbf868623daf | 35268:ad5f2b923b0d |
|---|---|
| 481 $ hg pull --debug ssh://user@dummy/remote | 481 $ hg pull --debug ssh://user@dummy/remote |
| 482 pulling from ssh://user@dummy/remote | 482 pulling from ssh://user@dummy/remote |
| 483 running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) | 483 running .* ".*/dummyssh" ['"]user@dummy['"] ('|")hg -R remote serve --stdio('|") (re) |
| 484 sending hello command | 484 sending hello command |
| 485 sending between command | 485 sending between command |
| 486 remote: 372 | 486 remote: 384 |
| 487 remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS$ unbundle=HG10GZ,HG10BZ,HG10UN | 487 remote: capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch streamreqs=generaldelta,revlogv1 $USUAL_BUNDLE2_CAPS$ unbundle=HG10GZ,HG10BZ,HG10UN |
| 488 remote: 1 | 488 remote: 1 |
| 489 query 1; heads | 489 query 1; heads |
| 490 sending batch command | 490 sending batch command |
| 491 searching for changes | 491 searching for changes |