This is an archive of the discontinued Mercurial Phabricator instance.

Differential D406

commit: use context manager with dirstateguard
ClosedPublic

Authored by martinvonz on Aug 15 2017, 3:13 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG158dddc635ff: commit: use context manager with dirstateguard
Summary

When I wrote 5ac845ca059a (commit: don't let failed commit with
--addremove update dirstate (issue5645), 2017-07-31), Durham's
609606d21765 (rebase: use one dirstateguard for when using
rebase.singletransaction, 2017-07-20) had not yet landed, so I had to
write it in the old-fashioned way. Now that Durham's patch is in, we
can simplify by using a context manager.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 15 2017, 3:13 AM
Closed by commit rHG158dddc635ff: commit: use context manager with dirstateguard (authored by martinvonz). · Explain WhyAug 15 2017, 5:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (10 lines)

Diff 922

mercurial/cmdutil.py

message = logmessage(ui, opts) message = logmessage(ui, opts)
matcher = scmutil.match(repo[None], pats, opts) matcher = scmutil.match(repo[None], pats, opts)
dsguard = None dsguard = None
# extract addremove carefully -- this function can be called from a command # extract addremove carefully -- this function can be called from a command
# that doesn't support addremove # that doesn't support addremove
if opts.get('addremove'): if opts.get('addremove'):
dsguard = dirstateguard.dirstateguard(repo, 'commit') dsguard = dirstateguard.dirstateguard(repo, 'commit')
try: with dsguard or util.nullcontextmanager():
if dsguard: if dsguard:
if scmutil.addremove(repo, matcher, "", opts) != 0: if scmutil.addremove(repo, matcher, "", opts) != 0:
raise error.Abort( raise error.Abort(
_("failed to mark all new/missing files as added/removed")) _("failed to mark all new/missing files as added/removed"))
r = commitfunc(ui, repo, message, matcher, opts) return commitfunc(ui, repo, message, matcher, opts)
if dsguard:
dsguard.close()
return r
finally:
if dsguard:
dsguard.release()
def samefile(f, ctx1, ctx2): def samefile(f, ctx1, ctx2):
if f in ctx1.manifest(): if f in ctx1.manifest():
a = ctx1.filectx(f) a = ctx1.filectx(f)
if f in ctx2.manifest(): if f in ctx2.manifest():
b = ctx2.filectx(f) b = ctx2.filectx(f)
return (not a.cmp(b) return (not a.cmp(b)
and a.flags() == b.flags()) and a.flags() == b.flags())