Mercurial > hg
comparison tests/test-bundle2-exchange.t @ 24752:5640efd1b160
unbundle: acquire 'wlock' when processing bundle2 (BC) (issue4596)
A bundle2 may contain bookmark updates (or other extension content) that
requires the 'wlock' to be written. As 'wlock' must be acquired before 'lock',
we must stay on the side of caution and use both in all case to ensure their
ordering.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 15 Apr 2015 01:16:40 -0400 |
| parents | dc4daf028f9c |
| children | 0c4d5e01b31f |
comparison
equal
deleted
inserted
replaced
| 24751:dc4daf028f9c | 24752:5640efd1b160 |
|---|---|
| 224 remote: adding changesets | 224 remote: adding changesets |
| 225 remote: adding manifests | 225 remote: adding manifests |
| 226 remote: adding file changes | 226 remote: adding file changes |
| 227 remote: added 1 changesets with 0 changes to 0 files (-1 heads) | 227 remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
| 228 remote: 1 new obsolescence markers | 228 remote: 1 new obsolescence markers |
| 229 remote: "wlock" acquired after "lock" at: */mercurial/bookmarks.py:259 (pushbookmark) (glob) | |
| 230 updating bookmark book_eea1 | 229 updating bookmark book_eea1 |
| 231 pre-close-tip:02de42196ebe draft book_02de | 230 pre-close-tip:02de42196ebe draft book_02de |
| 232 postclose-tip:02de42196ebe draft book_02de | 231 postclose-tip:02de42196ebe draft book_02de |
| 233 txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) | 232 txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) |
| 234 file:/*/$TESTTMP/other HG_URL=file:$TESTTMP/other (glob) | 233 file:/*/$TESTTMP/other HG_URL=file:$TESTTMP/other (glob) |
| 303 remote: adding changesets | 302 remote: adding changesets |
| 304 remote: adding manifests | 303 remote: adding manifests |
| 305 remote: adding file changes | 304 remote: adding file changes |
| 306 remote: added 1 changesets with 1 changes to 1 files | 305 remote: added 1 changesets with 1 changes to 1 files |
| 307 remote: 1 new obsolescence markers | 306 remote: 1 new obsolescence markers |
| 308 remote: "wlock" acquired after "lock" at: */mercurial/bookmarks.py:259 (pushbookmark) (glob) | |
| 309 updating bookmark book_5fdd | 307 updating bookmark book_5fdd |
| 310 remote: pre-close-tip:5fddd98957c8 draft book_5fdd | 308 remote: pre-close-tip:5fddd98957c8 draft book_5fdd |
| 311 remote: pushkey: lock state after "bookmarks" | 309 remote: pushkey: lock state after "bookmarks" |
| 312 remote: lock: free | 310 remote: lock: free |
| 313 remote: wlock: free | 311 remote: wlock: free |
| 355 remote: adding changesets | 353 remote: adding changesets |
| 356 remote: adding manifests | 354 remote: adding manifests |
| 357 remote: adding file changes | 355 remote: adding file changes |
| 358 remote: added 1 changesets with 1 changes to 1 files | 356 remote: added 1 changesets with 1 changes to 1 files |
| 359 remote: 1 new obsolescence markers | 357 remote: 1 new obsolescence markers |
| 360 remote: "wlock" acquired after "lock" at: */mercurial/bookmarks.py:259 (pushbookmark) (glob) | |
| 361 updating bookmark book_32af | 358 updating bookmark book_32af |
| 362 pre-close-tip:02de42196ebe draft book_02de | 359 pre-close-tip:02de42196ebe draft book_02de |
| 363 postclose-tip:02de42196ebe draft book_02de | 360 postclose-tip:02de42196ebe draft book_02de |
| 364 txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) | 361 txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) |
| 365 http://localhost:$HGPORT2/ HG_URL=http://localhost:$HGPORT2/ | 362 http://localhost:$HGPORT2/ HG_URL=http://localhost:$HGPORT2/ |