This is an archive of the discontinued Mercurial Phabricator instance.

Differential D597

cmdutil: moving first use of newid closer to its use in amend
ClosedPublic

Authored by singhsrb on Aug 31 2017, 10:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGda13616d1a92: amend: moving first assignment of newid closer to its use
rHGa352ca63dc79: amend: moving first assignment of newid closer to its use
Summary

newid was needlessly further away from where its intended to be used
leading to bad readability. This commit moves it to address the same. The end
goal is to remove the redundant commit in the amend code path and this commit
takes care of cleaning up some unrelated code before that change.

Test Plan

ran the test suite

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

singhsrb created this revision.Aug 31 2017, 10:01 PM
martinvonz added a subscriber: martinvonz.Sep 2 2017, 2:38 AM

moving first use of newid closer to its use in amend

Changing this to "moving first *assignment* of..." in flight so it sounds less confusing.

Also, "cmdutil" is so large it doesn't add much, so I'm also replacing "cmdutil" by "amend" and dropping "in amend" in the summary lines.

Closed by commit rHGa352ca63dc79: amend: moving first assignment of newid closer to its use (authored by singhsrb). · Explain WhySep 2 2017, 2:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 1574

mercurial/cmdutil.py

# amend will reuse the existing user if not specified, but the obsolete # amend will reuse the existing user if not specified, but the obsolete
# marker creation requires that the current user's name is specified. # marker creation requires that the current user's name is specified.
if obsolete.isenabled(repo, obsolete.createmarkersopt): if obsolete.isenabled(repo, obsolete.createmarkersopt):
ui.username() # raise exception if username not set ui.username() # raise exception if username not set
ui.note(_('amending changeset %s\n') % old) ui.note(_('amending changeset %s\n') % old)
base = old.p1() base = old.p1()
newid = None
with repo.wlock(), repo.lock(), repo.transaction('amend'): with repo.wlock(), repo.lock(), repo.transaction('amend'):
# See if we got a message from -m or -l, if not, open the editor # See if we got a message from -m or -l, if not, open the editor
# with the message of the changeset to amend # with the message of the changeset to amend
message = logmessage(ui, opts) message = logmessage(ui, opts)
# ensure logfile does not conflict with later enforcement of the # ensure logfile does not conflict with later enforcement of the
# message. potential logfile content has been processed by # message. potential logfile content has been processed by
# `logmessage` anyway. # `logmessage` anyway.
opts.pop('logfile') opts.pop('logfile')
and pureextra == old.extra()): and pureextra == old.extra()):
# nothing changed. continuing here would create a new node # nothing changed. continuing here would create a new node
# anyway because of the amend_source noise. # anyway because of the amend_source noise.
# #
# This not what we expect from amend. # This not what we expect from amend.
return old.node() return old.node()
ph = repo.ui.config('phases', 'new-commit', phases.draft) ph = repo.ui.config('phases', 'new-commit', phases.draft)
newid = None
try: try:
if opts.get('secret'): if opts.get('secret'):
commitphase = 'secret' commitphase = 'secret'
else: else:
commitphase = old.phase() commitphase = old.phase()
repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend')
newid = repo.commitctx(new) newid = repo.commitctx(new)
finally: finally: