This is an archive of the discontinued Mercurial Phabricator instance.

Differential D593

cmdutil: removing redundant if condition in amend
AbandonedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

There is needless checking for the new commit hash not being equal to
the old commit hash. This condition will always be true at this point in the
code path and thus, can be removed safely. This commit removes the redundant
condition.

Test Plan

ran the test suite.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

singhsrb created this revision.Aug 31 2017, 10:01 PM
durham added a subscriber: durham.Sep 1 2017, 3:26 PM

I'd probably fold this together with the next commit. Splitting commits is good when it increases readability or increases bisect ability. This change is so small I think readability is fine in one commit, and the feature change is only in one commit anyway so bisectability isn't hurt.

singhsrb updated this revision to Diff 1561.Sep 1 2017, 6:15 PM
singhsrb removed a child revision: D594: cmdutil: removing redundant if condition in amend.Sep 1 2017, 6:23 PM
singhsrb abandoned this revision.

Please see D594 instead. This commit has been merged into that commit.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (15 lines)

Diff 1561

mercurial/cmdutil.py

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:
repo.ui.setconfig('phases', 'new-commit', ph, 'amend') repo.ui.setconfig('phases', 'new-commit', ph, 'amend')
if newid != old.node():
# Reroute the working copy parent to the new changeset # Reroute the working copy parent to the new changeset
repo.setparents(newid, nullid) repo.setparents(newid, nullid)
mapping = {old.node(): (newid,)} mapping = {old.node(): (newid,)}
if node: if node:
mapping[node] = () mapping[node] = ()
scmutil.cleanupnodes(repo, mapping, 'amend') scmutil.cleanupnodes(repo, mapping, 'amend')
return newid return newid
def commiteditor(repo, ctx, subs, editform=''): def commiteditor(repo, ctx, subs, editform=''):
if ctx.description(): if ctx.description():
return ctx.description() return ctx.description()
return commitforceeditor(repo, ctx, subs, editform=editform, return commitforceeditor(repo, ctx, subs, editform=editform,
unchangedmessagedetection=True) unchangedmessagedetection=True)