This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12387

amend: fix amend with copies in extras
ClosedPublic

Authored by martinvonz on Sat, Mar 19, 1:05 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG877d7e1a4223: amend: fix amend with copies in extras
Summary

If copy information is stored only in the commit extras and not in
filelogs, then they get lost on amend if the file wasn't also modified
in the working copy. That's because we create filectx object from
the old commit in those cases, and the .copysource() of such objects
read only from the filelog. This patch fixes it by always creating a
new memfilectx in these cases, passing the calculated copy
information to it.

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.Sat, Mar 19, 1:05 AM
Alphare accepted this revision.Mon, Mar 21, 5:46 AM
This revision is now accepted and ready to land.Mon, Mar 21, 5:46 AM
martinvonz added a commit: rHG877d7e1a4223: amend: fix amend with copies in extras.Mon, Mar 21, 6:01 AM
Closed by commit rHG877d7e1a4223: amend: fix amend with copies in extras (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (27 lines)
Mtests/test-copies-in-changeset.t (2 lines)

Diff 32675

mercurial/cmdutil.py

subrepoutil.writestate(repo, newsubstate) subrepoutil.writestate(repo, newsubstate)
ms = mergestatemod.mergestate.read(repo) ms = mergestatemod.mergestate.read(repo)
mergeutil.checkunresolved(ms) mergeutil.checkunresolved(ms)
filestoamend = {f for f in wctx.files() if matcher(f)} filestoamend = {f for f in wctx.files() if matcher(f)}
changes = len(filestoamend) > 0 changes = len(filestoamend) > 0
if changes: changeset_copies = (
repo.ui.config(b'experimental', b'copies.read-from')
!= b'filelog-only'
)
# 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
# filectxs from the old commit.
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, matcher)
if old.p2: if old.p2:
copied.update(copies.pathcopies(old.p2(), wctx, matcher)) copied.update(copies.pathcopies(old.p2(), wctx, matcher))
# 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 = [ files = [
f f
for f in files for f in files
if (f not in filestoamend or not samefile(f, wctx, base)) if (f not in filestoamend 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
# to be amended, we should return the file context from the
# old changeset. This avoids issues when only some files in
# the working copy are being amended but there are also
# changes to other files from the old changeset.
if path not in filestoamend:
return old.filectx(path)
# Return None for removed files. # Return None for removed files.
if path in wctx.removed(): if path in wctx.removed():
return None return None
# If the file being considered is not amongst the files
# to be amended, we should use the file context from the
# old changeset. This avoids issues when only some files in
# the working copy are being amended but there are also
# changes to other files from the old changeset.
if path in filestoamend:
fctx = wctx[path] fctx = wctx[path]
else:
fctx = old.filectx(path)
flags = fctx.flags() flags = fctx.flags()
mctx = context.memfilectx( mctx = context.memfilectx(
repo, repo,
ctx_, ctx_,
fctx.path(), fctx.path(),
fctx.data(), fctx.data(),
islink=b'l' in flags, islink=b'l' in flags,
isexec=b'x' in flags, isexec=b'x' in flags,

tests/test-copies-in-changeset.t

Existing copy information is preserved by amend Existing copy information is preserved by amend
$ hg cp a l $ hg cp a l
$ hg ci -m 'copy a to l' $ hg ci -m 'copy a to l'
$ hg showcopies $ hg showcopies
a -> l a -> l
$ hg ci --amend -m 'new description' $ hg ci --amend -m 'new description'
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-*-amend.hg (glob) saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-*-amend.hg (glob)
$ hg showcopies $ hg showcopies
a -> l (no-extra !) a -> l
$ cd .. $ cd ..
Test rebasing a commit with copy information Test rebasing a commit with copy information
$ hg init rebase-rename $ hg init rebase-rename
$ cd rebase-rename $ cd rebase-rename
$ echo a > a $ echo a > a
$ hg ci -Aqm 'add a' $ hg ci -Aqm 'add a'