Mercurial > public > mercurial-scm > hg
comparison tests/common-pattern.py @ 35259: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 | f0445eea9b93 |
| children | 991e4404e910 |
comparison
equal
deleted
inserted
replaced
| 35258:dbf868623daf | 35259:ad5f2b923b0d |
|---|---|
| 6 (br'(zstd,)?zlib,none,bzip2', | 6 (br'(zstd,)?zlib,none,bzip2', |
| 7 br'$USUAL_COMPRESSIONS$' | 7 br'$USUAL_COMPRESSIONS$' |
| 8 ), | 8 ), |
| 9 # capabilities sent through http | 9 # capabilities sent through http |
| 10 (br'bundlecaps=HG20%2Cbundle2%3DHG20%250A' | 10 (br'bundlecaps=HG20%2Cbundle2%3DHG20%250A' |
| 11 br'bookmarks%250A' | |
| 11 br'changegroup%253D01%252C02%250A' | 12 br'changegroup%253D01%252C02%250A' |
| 12 br'digests%253Dmd5%252Csha1%252Csha512%250A' | 13 br'digests%253Dmd5%252Csha1%252Csha512%250A' |
| 13 br'error%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250A' | 14 br'error%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250A' |
| 14 br'hgtagsfnodes%250A' | 15 br'hgtagsfnodes%250A' |
| 15 br'listkeys%250A' | 16 br'listkeys%250A' |
| 19 # (the replacement patterns) | 20 # (the replacement patterns) |
| 20 br'$USUAL_BUNDLE_CAPS$' | 21 br'$USUAL_BUNDLE_CAPS$' |
| 21 ), | 22 ), |
| 22 # bundle2 capabilities sent through ssh | 23 # bundle2 capabilities sent through ssh |
| 23 (br'bundle2=HG20%0A' | 24 (br'bundle2=HG20%0A' |
| 25 br'bookmarks%0A' | |
| 24 br'changegroup%3D01%2C02%0A' | 26 br'changegroup%3D01%2C02%0A' |
| 25 br'digests%3Dmd5%2Csha1%2Csha512%0A' | 27 br'digests%3Dmd5%2Csha1%2Csha512%0A' |
| 26 br'error%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0A' | 28 br'error%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0A' |
| 27 br'hgtagsfnodes%0A' | 29 br'hgtagsfnodes%0A' |
| 28 br'listkeys%0A' | 30 br'listkeys%0A' |