This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8494

copy: to find copy source, walk parent of revision we're marking copies in
ClosedPublic

Authored by martinvonz on May 6 2020, 3:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1cdc80280286: copy: to find copy source, walk parent of revision we're marking copies in
rHG81c6d1b7ceee: copy: to find copy source, walk parent of revision we're marking copies in
rHG02bf61bb4a70: copy: to find copy source, walk parent of revision we're marking copies in
Summary

As shown in the previous patch, hg cp --after --at-rev . src dst
fails if src is not in .. It seems obvious that you should always
walk the *parent* of the revision you're marking copies in, but that's
not how it was done for the working copy, and I didn't think to change
it when marking copies in a non-working-copy commit.

This patch fixes that by walking the parent commit instead, but only
if we're marking copies for a non-working-copy commit. We need to
leave the working-copy code unchanged because it depends on the weird
behavior of workingctx.walk(). With these changes, there's very
little overlap between the working-copy version and the
non-working-copy version of walkpats(), but I've refrained from
cleaning that up on the stable branch.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (7 lines)
Mtests/test-rename-rev.t (6 lines)

Diff 21271

mercurial/cmdutil.py

if not pats: if not pats:
raise error.Abort(_(b'no source or destination specified')) raise error.Abort(_(b'no source or destination specified'))
if len(pats) == 1: if len(pats) == 1:
raise error.Abort(_(b'no destination specified')) raise error.Abort(_(b'no destination specified'))
dest = pats.pop() dest = pats.pop()
def walkpat(pat): def walkpat(pat):
srcs = [] srcs = []
m = scmutil.match(ctx, [pat], opts, globbed=True) # TODO: Inline and simplify the non-working-copy version of this code
for abs in ctx.walk(m): # since it shares very little with the working-copy version of it.
ctx_to_walk = ctx if ctx.rev() is None else pctx
m = scmutil.match(ctx_to_walk, [pat], opts, globbed=True)
for abs in ctx_to_walk.walk(m):
rel = uipathfn(abs) rel = uipathfn(abs)
exact = m.exact(abs) exact = m.exact(abs)
if abs not in ctx: if abs not in ctx:
if abs in pctx: if abs in pctx:
if not after: if not after:
if exact: if exact:
ui.warn( ui.warn(
_( _(

tests/test-rename-rev.t

$ hg co 0 $ hg co 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mv d1/b d1/d $ mv d1/b d1/d
$ hg rm -A d1/b $ hg rm -A d1/b
$ hg add d1/d $ hg add d1/d
$ hg ci -m 'move d1/b to d1/d' $ hg ci -m 'move d1/b to d1/d'
created new head created new head
BROKEN: this should work
$ hg cp -A --at-rev . d1/b d1/d $ hg cp -A --at-rev . d1/b d1/d
d1/b: no such file in rev 519850c3ea27 saved backup bundle to $TESTTMP/.hg/strip-backup/519850c3ea27-153c8fbb-copy.hg
abort: --at-rev requires a single source
[255]
$ hg st -C --change . $ hg st -C --change .
A d1/d A d1/d
d1/b
R d1/b R d1/b
Test using directory as destination Test using directory as destination
$ hg co 0 $ hg co 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cp -R d1 d3 $ cp -R d1 d3
$ hg add d3 $ hg add d3