This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5695

unshare: use context manager for locks
ClosedPublic

Authored by martinvonz on Jan 25 2019, 3:31 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbc843e251134: unshare: use context manager for locks

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jan 25 2019, 3:31 PM
Closed by commit rHGbc843e251134: unshare: use context manager for locks (authored by martinvonz). · Explain WhyJan 26 2019, 2:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (21 lines)

Diff 13464

mercurial/hg.py

Copy the store data to the repo and remove the sharedpath data. Copy the store data to the repo and remove the sharedpath data.
Returns a new repository object representing the unshared repository. Returns a new repository object representing the unshared repository.
The passed repository object is not usable after this function is The passed repository object is not usable after this function is
called. called.
""" """
destlock = None with repo.lock():
lock = repo.lock()
try:
# we use locks here because if we race with commit, we # we use locks here because if we race with commit, we
# can end up with extra data in the cloned revlogs that's # can end up with extra data in the cloned revlogs that's
# not pointed to by changesets, thus causing verify to # not pointed to by changesets, thus causing verify to
# fail # fail
destlock = copystore(ui, repo, repo.path) destlock = copystore(ui, repo, repo.path)
with destlock or util.nullcontextmanager():
sharefile = repo.vfs.join('sharedpath') sharefile = repo.vfs.join('sharedpath')
util.rename(sharefile, sharefile + '.old') util.rename(sharefile, sharefile + '.old')
repo.requirements.discard('shared') repo.requirements.discard('shared')
repo.requirements.discard('relshared') repo.requirements.discard('relshared')
repo._writerequirements() repo._writerequirements()
finally:
destlock and destlock.release()
lock and lock.release()
# Removing share changes some fundamental properties of the repo instance. # Removing share changes some fundamental properties of the repo instance.
# So we instantiate a new repo object and operate on it rather than # So we instantiate a new repo object and operate on it rather than
# try to keep the existing repo usable. # try to keep the existing repo usable.
newrepo = repository(repo.baseui, repo.root, create=False) newrepo = repository(repo.baseui, repo.root, create=False)
# TODO: figure out how to access subrepos that exist, but were previously # TODO: figure out how to access subrepos that exist, but were previously
# removed from .hgsub # removed from .hgsub