[Updated] D8494: copy: to find copy source, walk parent of revision we're marking copies in

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHG02bf61bb4a70: copy: to find copy source, walk parent of revision we're marking copies in (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8494?vs=21271&id=21312

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8494/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8494

AFFECTED FILES
  mercurial/cmdutil.py
  tests/test-rename-rev.t

CHANGE DETAILS

diff --git a/tests/test-rename-rev.t b/tests/test-rename-rev.t
--- a/tests/test-rename-rev.t
+++ b/tests/test-rename-rev.t
@@ -47,13 +47,11 @@
   $ hg add d1/d
   $ hg ci -m 'move d1/b to d1/d'
   created new head
-BROKEN: this should work
   $ hg cp -A --at-rev . d1/b d1/d
-  d1/b: no such file in rev 519850c3ea27
-  abort: --at-rev requires a single source
-  [255]
+  saved backup bundle to $TESTTMP/.hg/strip-backup/519850c3ea27-153c8fbb-copy.hg
   $ hg st -C --change .
   A d1/d
+    d1/b
   R d1/b
 
 Test using directory as destination
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1496,8 +1496,11 @@
 
     def walkpat(pat):
         srcs = []
-        m = scmutil.match(ctx, [pat], opts, globbed=True)
-        for abs in ctx.walk(m):
+        # TODO: Inline and simplify the non-working-copy version of this code
+        # 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)
             exact = m.exact(abs)
             if abs not in ctx:



To: martinvonz, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200507/b3742b68/attachment-0002.html>