This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8665

merge: don't grab wlock when merging in memory
ClosedPublic

Authored by martinvonz on Jun 25 2020, 10:20 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd1471dbbdd63: merge: don't grab wlock when merging in memory
Summary

I noticed this because we have an internal extension that does an
in-memory rebase while holding only a repo lock, which resulted in a
developer warning about the working copy lock being taken after the
repo lock.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 25 2020, 10:20 AM
pulkit accepted this revision.Jun 25 2020, 10:49 AM
This revision is now accepted and ready to land.Jun 25 2020, 10:49 AM
martinvonz added a commit: rHGd1471dbbdd63: merge: don't grab wlock when merging in memory.Jun 25 2020, 12:29 PM
Closed by commit rHGd1471dbbdd63: merge: don't grab wlock when merging in memory (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (6 lines)

Diff 21715

mercurial/merge.py

updatecheck, updatecheck,
( (
UPDATECHECK_NONE, UPDATECHECK_NONE,
UPDATECHECK_LINEAR, UPDATECHECK_LINEAR,
UPDATECHECK_NO_CONFLICT, UPDATECHECK_NO_CONFLICT,
), ),
) )
) )
with repo.wlock(): if wc is not None and wc.isinmemory():
maybe_wlock = util.nullcontextmanager()
else:
maybe_wlock = repo.wlock()
with maybe_wlock:
if wc is None: if wc is None:
wc = repo[None] wc = repo[None]
pl = wc.parents() pl = wc.parents()
p1 = pl[0] p1 = pl[0]
p2 = repo[node] p2 = repo[node]
if ancestor is not None: if ancestor is not None:
pas = [repo[ancestor]] pas = [repo[ancestor]]
else: else: