This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6667

amend: stop committing unrequested file reverts (issue6157)
ClosedPublic

Authored by valentin.gatienbaron on Jul 22 2019, 6:36 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGce52377102db: amend: stop committing unrequested file reverts (issue6157)
Summary

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

valentin.gatienbaron added a commit: rHGce52377102db: amend: stop committing unrequested file reverts (issue6157).Jul 22 2019, 7:27 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGce52377102db: amend: stop committing unrequested file reverts (issue6157) (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (4 lines)
Mtests/test-amend.t (5 lines)

Diff 16002

mercurial/cmdutil.py

# Prune files which were reverted by the updates: if old # Prune files which were reverted by the updates: if old
# introduced file X and the file was renamed in the working # introduced file X and the file was renamed in the working
# copy, then those two files are the same and # copy, then those two files are the same and
# we can discard X from our list of files. Likewise if X # we can discard X from our list of files. Likewise if X
# was removed, it's no longer relevant. If X is missing (aka # was removed, it's no longer relevant. If X is missing (aka
# deleted), old X must be preserved. # deleted), old X must be preserved.
files.update(filestoamend) files.update(filestoamend)
files = [f for f in files if (not samefile(f, wctx, base) files = [f for f in files if (f not in filestoamend
or f in wctx.deleted())] or not samefile(f, wctx, base))]
def filectxfn(repo, ctx_, path): def filectxfn(repo, ctx_, path):
try: try:
# If the file being considered is not amongst the files # If the file being considered is not amongst the files
# to be amended, we should return the file context from the # to be amended, we should return the file context from the
# old changeset. This avoids issues when only some files in # old changeset. This avoids issues when only some files in
# the working copy are being amended but there are also # the working copy are being amended but there are also
# changes to other files from the old changeset. # changes to other files from the old changeset.

tests/test-amend.t

[255] [255]
$ cd .. $ cd ..
Corner case of amend from issue6157: Corner case of amend from issue6157:
- working copy parent has a change to file `a` - working copy parent has a change to file `a`
- working copy has the inverse change - working copy has the inverse change
- we amend the working copy parent for files other than `a` - we amend the working copy parent for files other than `a`
hg includes the changes to `a` anyway. hg used to include the changes to `a` anyway.
$ hg init 6157; cd 6157 $ hg init 6157; cd 6157
$ echo a > a; echo b > b; hg commit -qAm_ $ echo a > a; echo b > b; hg commit -qAm_
$ echo a2 > a; hg commit -qm_ $ echo a2 > a; hg commit -qm_
$ hg diff --stat -c . $ hg diff --stat -c .
a | 2 +- a | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-) 1 files changed, 1 insertions(+), 1 deletions(-)
$ echo a > a; echo b2 > b; hg amend -q b $ echo a > a; echo b2 > b; hg amend -q b
$ hg diff --stat -c . $ hg diff --stat -c .
a | 2 +-
b | 2 +- b | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)