This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12625

amend: stop specifying matcher, get all copies in wctx
ClosedPublic

Authored by spectral on Wed, May 11, 9:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdf68d64b0d50: amend: stop specifying matcher, get all copies in wctx
Summary

When we're recreating the commit that we'll be committing, we don't want to
filter our copy information based on just the *new* [versions of the] files
we're amending. The test has an example of this case, but for clarity, the
situation is:

$ hg cp src dst && hg commit
<do some work>
$ hg amend some_unrelated_file.txt
$ hg status --copies
A dst
A some_unrelated_file.txt

What *should* happen is that dst should remain marked as a copy of src, but
this did not previously happen. matcher here only includes the files that were
specified on the commandline, so it only gets the copy information (if any, in
this example there's not) for some_unrelated_file.txt. When it goes to apply
the memctx to actually create the commit, the file copy information is
incomplete and loses the information for the files that shouldn't have been
affected at all by the amend.

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

spectral created this revision.Wed, May 11, 9:16 PM
martinvonz added a subscriber: martinvonz.Thu, May 12, 12:33 AM

Thanks for fixing! I'll apply this on stable.

spectral added a commit: rHGdf68d64b0d50: amend: stop specifying matcher, get all copies in wctx.Thu, May 12, 1:08 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGdf68d64b0d50: amend: stop specifying matcher, get all copies in wctx (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (6 lines)
Mtests/test-amend.t (2 lines)

Diff 33403

mercurial/cmdutil.py

repo.ui.config(b'experimental', b'copies.read-from') repo.ui.config(b'experimental', b'copies.read-from')
!= b'filelog-only' != b'filelog-only'
) )
# If there are changes to amend or if copy information needs to be read # If there are changes to amend or if copy information needs to be read
# from the changeset extras, we cannot take the fast path of using # from the changeset extras, we cannot take the fast path of using
# filectxs from the old commit. # filectxs from the old commit.
if changes or changeset_copies: if changes or changeset_copies:
# Recompute copies (avoid recording a -> b -> a) # Recompute copies (avoid recording a -> b -> a)
copied = copies.pathcopies(base, wctx, matcher) copied = copies.pathcopies(base, wctx)
if old.p2: if old.p2():
copied.update(copies.pathcopies(old.p2(), wctx, matcher)) copied.update(copies.pathcopies(old.p2(), wctx))
# 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)

tests/test-amend.t

$ echo hi > new_file_amend_me $ echo hi > new_file_amend_me
$ hg status --change . --copies $ hg status --change . --copies
A r0_copied A r0_copied
r0 r0
$ hg amend -qA new_file_amend_me $ hg amend -qA new_file_amend_me
$ hg status --change . --copies $ hg status --change . --copies
A new_file_amend_me A new_file_amend_me
A r0_copied A r0_copied
r0 (missing-correct-output !) r0