This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10197

amend: mark commit obsolete after moving working copy
ClosedPublic

Authored by martinvonz on Mar 12 2021, 6:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG62c2857a174b: amend: mark commit obsolete after moving working copy
Summary

We were doing it this way:

  1. move working copy (repo.setparents)
  2. add obsmarkers (scmutil.cleanupnodes)
  3. fix dirstate (dirstate.normal/drop)

Step 1 and 3 are closely related, so let's move them together. It
seems safest to create the obsmarkers last. This patch thus makes the
order 1, 3, 2.

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.Mar 12 2021, 6:42 PM
martinvonz added a commit: rHG62c2857a174b: amend: mark commit obsolete after moving working copy.Mar 16 2021, 5:55 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG62c2857a174b: amend: mark commit obsolete after moving working copy (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (29 lines)

Diff 26446

mercurial/cmdutil.py

commitphase = None commitphase = None
if opts.get(b'secret'): if opts.get(b'secret'):
commitphase = phases.secret commitphase = phases.secret
newid = repo.commitctx(new) newid = repo.commitctx(new)
ms.reset() ms.reset()
# 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,)}
obsmetadata = None
if opts.get(b'note'):
obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])}
backup = ui.configbool(b'rewrite', b'backup-bundle')
scmutil.cleanupnodes(
repo,
mapping,
b'amend',
metadata=obsmetadata,
fixphase=True,
targetphase=commitphase,
backup=backup,
)
# Fixing the dirstate because localrepo.commitctx does not update # Fixing the dirstate because localrepo.commitctx does not update
# it. This is rather convenient because we did not need to update # it. This is rather convenient because we did not need to update
# the dirstate for all the files in the new commit which commitctx # the dirstate for all the files in the new commit which commitctx
# could have done if it updated the dirstate. Now, we can # could have done if it updated the dirstate. Now, we can
# selectively update the dirstate only for the amended files. # selectively update the dirstate only for the amended files.
dirstate = repo.dirstate dirstate = repo.dirstate
# Update the state of the files which were added and modified in the # Update the state of the files which were added and modified in the
# amend to "normal" in the dirstate. We need to use "normallookup" since # amend to "normal" in the dirstate. We need to use "normallookup" since
# the files may have changed since the command started; using "normal" # the files may have changed since the command started; using "normal"
# would mark them as clean but with uncommitted contents. # would mark them as clean but with uncommitted contents.
normalfiles = set(wctx.modified() + wctx.added()) & filestoamend normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
for f in normalfiles: for f in normalfiles:
dirstate.normallookup(f) dirstate.normallookup(f)
# Update the state of files which were removed in the amend # Update the state of files which were removed in the amend
# to "removed" in the dirstate. # to "removed" in the dirstate.
removedfiles = set(wctx.removed()) & filestoamend removedfiles = set(wctx.removed()) & filestoamend
for f in removedfiles: for f in removedfiles:
dirstate.drop(f) dirstate.drop(f)
mapping = {old.node(): (newid,)}
obsmetadata = None
if opts.get(b'note'):
obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])}
backup = ui.configbool(b'rewrite', b'backup-bundle')
scmutil.cleanupnodes(
repo,
mapping,
b'amend',
metadata=obsmetadata,
fixphase=True,
targetphase=commitphase,
backup=backup,
)
return newid return newid
def commiteditor(repo, ctx, subs, editform=b''): def commiteditor(repo, ctx, subs, editform=b''):
if ctx.description(): if ctx.description():
return ctx.description() return ctx.description()
return commitforceeditor( return commitforceeditor(
repo, ctx, subs, editform=editform, unchangedmessagedetection=True repo, ctx, subs, editform=editform, unchangedmessagedetection=True