| hg-reviewers |
If bookmarks are stored in .hg/store/, there is no need for the
wlock().
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/exchange.py (16 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| if not pushop.remote.capable('unbundle'): | if not pushop.remote.capable('unbundle'): | ||||
| raise error.Abort(_('cannot push: destination does not support the ' | raise error.Abort(_('cannot push: destination does not support the ' | ||||
| 'unbundle wire protocol command')) | 'unbundle wire protocol command')) | ||||
| # get lock as we might write phase data | # get lock as we might write phase data | ||||
| wlock = lock = None | wlock = lock = None | ||||
| try: | try: | ||||
| # bundle2 push may receive a reply bundle touching bookmarks or other | # bundle2 push may receive a reply bundle touching bookmarks | ||||
| # things requiring the wlock. Take it now to ensure proper ordering. | # requiring the wlock. Take it now to ensure proper ordering. | ||||
| maypushback = pushop.ui.configbool('experimental', 'bundle2.pushback') | maypushback = pushop.ui.configbool('experimental', 'bundle2.pushback') | ||||
| if (not _forcebundle1(pushop)) and maypushback: | if ((not _forcebundle1(pushop)) and | ||||
| maypushback and | |||||
| not bookmod.bookmarksinstore(repo)): | |||||
| wlock = pushop.repo.wlock() | wlock = pushop.repo.wlock() | ||||
| lock = pushop.repo.lock() | lock = pushop.repo.lock() | ||||
| pushop.trmanager = transactionmanager(pushop.repo, | pushop.trmanager = transactionmanager(pushop.repo, | ||||
| 'push-response', | 'push-response', | ||||
| pushop.remote.url()) | pushop.remote.url()) | ||||
| except error.LockUnavailable as err: | except error.LockUnavailable as err: | ||||
| # source repo cannot be locked. | # source repo cannot be locked. | ||||
| # We do not abort the push, but just disable the local phase | # We do not abort the push, but just disable the local phase | ||||
| missing = set(peerlocal.requirements) - pullop.repo.supported | missing = set(peerlocal.requirements) - pullop.repo.supported | ||||
| if missing: | if missing: | ||||
| msg = _("required features are not" | msg = _("required features are not" | ||||
| " supported in the destination:" | " supported in the destination:" | ||||
| " %s") % (', '.join(sorted(missing))) | " %s") % (', '.join(sorted(missing))) | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) | pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) | ||||
| with repo.wlock(), repo.lock(), pullop.trmanager: | wlock = util.nullcontextmanager() | ||||
| if not bookmod.bookmarksinstore(repo): | |||||
| wlock = repo.wlock() | |||||
| with wlock, repo.lock(), pullop.trmanager: | |||||
| # Use the modern wire protocol, if available. | # Use the modern wire protocol, if available. | ||||
| if remote.capable('command-changesetdata'): | if remote.capable('command-changesetdata'): | ||||
| exchangev2.pull(pullop) | exchangev2.pull(pullop) | ||||
| else: | else: | ||||
| # This should ideally be in _pullbundle2(). However, it needs to run | # This should ideally be in _pullbundle2(). However, it needs to run | ||||
| # before discovery to avoid extra work. | # before discovery to avoid extra work. | ||||
| _maybeapplyclonebundle(pullop) | _maybeapplyclonebundle(pullop) | ||||
| streamclone.maybeperformlegacystreamclone(pullop) | streamclone.maybeperformlegacystreamclone(pullop) | ||||
| with repo.lock(), repo.transaction(txnname) as tr: | with repo.lock(), repo.transaction(txnname) as tr: | ||||
| op = bundle2.applybundle(repo, cg, tr, source, url) | op = bundle2.applybundle(repo, cg, tr, source, url) | ||||
| r = bundle2.combinechangegroupresults(op) | r = bundle2.combinechangegroupresults(op) | ||||
| else: | else: | ||||
| r = None | r = None | ||||
| try: | try: | ||||
| def gettransaction(): | def gettransaction(): | ||||
| if not lockandtr[2]: | if not lockandtr[2]: | ||||
| if not bookmod.bookmarksinstore(repo): | |||||
| lockandtr[0] = repo.wlock() | lockandtr[0] = repo.wlock() | ||||
| lockandtr[1] = repo.lock() | lockandtr[1] = repo.lock() | ||||
| lockandtr[2] = repo.transaction(source) | lockandtr[2] = repo.transaction(source) | ||||
| lockandtr[2].hookargs['source'] = source | lockandtr[2].hookargs['source'] = source | ||||
| lockandtr[2].hookargs['url'] = url | lockandtr[2].hookargs['url'] = url | ||||
| lockandtr[2].hookargs['bundle2'] = '1' | lockandtr[2].hookargs['bundle2'] = '1' | ||||
| return lockandtr[2] | return lockandtr[2] | ||||
| # Do greedy locking by default until we're satisfied with lazy | # Do greedy locking by default until we're satisfied with lazy | ||||