This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3744

backout: use context manager for locks
ClosedPublic

Authored by martinvonz on Jun 14 2018, 7:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9b1536b02221: backout: use context manager for locks
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jun 14 2018, 7:32 PM
Closed by commit rHG9b1536b02221: backout: use context manager for locks (authored by martinvonz). · Explain WhyJun 15 2018, 8:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (7 lines)

Diff 9073

mercurial/commands.py

See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help dates` for a list of formats valid for -d/--date.
See :hg:`help revert` for a way to restore files to the state See :hg:`help revert` for a way to restore files to the state
of another revision. of another revision.
Returns 0 on success, 1 if nothing to backout or there are unresolved Returns 0 on success, 1 if nothing to backout or there are unresolved
files. files.
''' '''
wlock = lock = None with repo.wlock(), repo.lock():
try:
wlock = repo.wlock()
lock = repo.lock()
return _dobackout(ui, repo, node, rev, **opts) return _dobackout(ui, repo, node, rev, **opts)
finally:
release(lock, wlock)
def _dobackout(ui, repo, node=None, rev=None, **opts): def _dobackout(ui, repo, node=None, rev=None, **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get('commit') and opts.get('no_commit'): if opts.get('commit') and opts.get('no_commit'):
raise error.Abort(_("cannot use --commit with --no-commit")) raise error.Abort(_("cannot use --commit with --no-commit"))
if opts.get('merge') and opts.get('no_commit'): if opts.get('merge') and opts.get('no_commit'):
raise error.Abort(_("cannot use --merge with --no-commit")) raise error.Abort(_("cannot use --merge with --no-commit"))