This is an archive of the discontinued Mercurial Phabricator instance.

Differential D405

commit: move dirstateguard creation out of try-block
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5d286eb7009f: commit: move dirstateguard creation out of try-block
Summary

This is just a simple refactoring to make the next patch simpler. If
the dirstateguard constructor raises an exception, the finally-block
won't do anything anyway, so this is functionally equivalent (and
there is no except-block).

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.Aug 15 2017, 3:13 AM
Closed by commit rHG5d286eb7009f: commit: move dirstateguard creation out of try-block (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 (5 lines)

Diff 951

mercurial/cmdutil.py

if date: if date:
opts['date'] = util.parsedate(date) opts['date'] = util.parsedate(date)
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
try:
if opts.get('addremove'): if opts.get('addremove'):
dsguard = dirstateguard.dirstateguard(repo, 'commit') dsguard = dirstateguard.dirstateguard(repo, 'commit')
try:
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) r = commitfunc(ui, repo, message, matcher, opts)
if dsguard: if dsguard:
dsguard.close() dsguard.close()
return r return r