| Alphare |
| hg-reviewers |
The adjustment in the direct consequence of the amend and the associated parents
change.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (47 lines) |
| return old.node() | return old.node() | ||||
| 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() | ||||
| with repo.dirstate.parentchange(): | |||||
| # Reroute the working copy parent to the new changeset | # Reroute the working copy parent to the new changeset | ||||
| repo.setparents(newid, repo.nullid) | repo.setparents(newid, repo.nullid) | ||||
| # 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,)} | mapping = {old.node(): (newid,)} | ||||
| obsmetadata = None | obsmetadata = None | ||||
| if opts.get(b'note'): | if opts.get(b'note'): | ||||
| obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])} | obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])} | ||||
| backup = ui.configbool(b'rewrite', b'backup-bundle') | backup = ui.configbool(b'rewrite', b'backup-bundle') | ||||
| scmutil.cleanupnodes( | scmutil.cleanupnodes( | ||||
| repo, | repo, | ||||