This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8840

rename: add support for --at-rev, which marks as copy and removes the source
ClosedPublic

Authored by martinvonz on Jul 28 2020, 1:23 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5178dd2233d0: rename: add support for --at-rev, which marks as copy and removes the source
Summary

I had previously only added support for --at-rev to hg cp, but not
to hg mv. This patch adds that support. Just like for hg cp, it
marks the destination as copied from the source, and doesn't care if
the source file still exists (because it only supports the -A mode,
aka "don't touch files" mode). It works whether or not the source file
still exists. This matches the behavior of hg mv -A in the working
copy.

Diff Detail

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

Event Timeline

martinvonz created this revision.Jul 28 2020, 1:23 PM
martinvonz added a comment.Jul 28 2020, 1:34 PM

I didn't include release notes in this patch because D8839 needs to get in first. If that lands quickly and gets merged to default, I'll update this patch. Otherwise I'll just send a follow-up later.

martinvonz updated this revision to Diff 22313.Aug 6 2020, 11:36 AM
martinvonz edited the summary of this revision. (Show Details)Aug 6 2020, 12:04 PM
martinvonz updated this revision to Diff 22314.
martinvonz added a comment.Aug 6 2020, 12:07 PM

This now includes release notes. I also fixed a bug: I realized only now that I had previously made it remove the source file, but that shouldn't happen since it only supports the -A/--after mode.

indygreg accepted this revision.Aug 8 2020, 4:51 PM
This revision is now accepted and ready to land.Aug 8 2020, 4:51 PM
indygreg added a comment.Aug 8 2020, 4:52 PM

I'm not sure what the README.rst rename was doing in the diff. So I dropped it in-flight.

Revision Contents
Changeset List

Diff 22314

README.rst

  • This file was moved to README.rst2.

README.rst2

  • This file was moved from README.rst.

mercurial/commands.py

) )
@command( @command(
b'rename|move|mv', b'rename|move|mv',
[ [
(b'A', b'after', None, _(b'record a rename that has already occurred')), (b'A', b'after', None, _(b'record a rename that has already occurred')),
( (
b'',
b'at-rev',
b'',
_(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
_(b'REV'),
),
(
b'f', b'f',
b'force', b'force',
None, None,
_(b'forcibly move over an existing managed file'), _(b'forcibly move over an existing managed file'),
), ),
] ]
+ walkopts + walkopts
+ dryrunopts, + dryrunopts,

relnotes/next

== New Features == == New Features ==
* `hg mv -A` can now be used with `--at-rev`. It behaves just like
`hg cp -A --at-rev`, i.e. it marks the destination as a copy of the
source whether or not the source still exists (but the source must
exist in the parent revision).
== New Experimental Features == == New Experimental Features ==
== Bug Fixes == == Bug Fixes ==
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
== Internal API Changes == == Internal API Changes ==

tests/test-completion.t

outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
parents: rev, style, template parents: rev, style, template
paths: template paths: template
phase: public, draft, secret, force, rev phase: public, draft, secret, force, rev
pull: update, force, confirm, rev, bookmark, branch, ssh, remotecmd, insecure pull: update, force, confirm, rev, bookmark, branch, ssh, remotecmd, insecure
push: force, rev, bookmark, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure push: force, rev, bookmark, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure
recover: verify recover: verify
remove: after, force, subrepos, include, exclude, dry-run remove: after, force, subrepos, include, exclude, dry-run
rename: after, force, include, exclude, dry-run rename: after, at-rev, force, include, exclude, dry-run
resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template
revert: all, date, rev, no-backup, interactive, include, exclude, dry-run revert: all, date, rev, no-backup, interactive, include, exclude, dry-run
rollback: dry-run, force rollback: dry-run, force
root: template root: template
serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos
shelve: addremove, unknown, cleanup, date, delete, edit, keep, list, message, name, patch, interactive, stat, include, exclude shelve: addremove, unknown, cleanup, date, delete, edit, keep, list, message, name, patch, interactive, stat, include, exclude
status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template
summary: remote summary: remote

tests/test-rename-rev.t

saved backup bundle to $TESTTMP/.hg/strip-backup/8a9d70fa20c9-973ae357-copy.hg saved backup bundle to $TESTTMP/.hg/strip-backup/8a9d70fa20c9-973ae357-copy.hg
# New copy is recorded, and previously recorded copy is also still there # New copy is recorded, and previously recorded copy is also still there
$ hg st -C --change . $ hg st -C --change .
A d1/c A d1/c
d1/b d1/b
A d1/d A d1/d
d1/b d1/b
Test moved file (not copied) Test moved file (not copied) using 'hg cp' command
$ 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
$ hg cp -A --at-rev . d1/b d1/d $ hg cp -A --at-rev . d1/b d1/d
saved backup bundle to $TESTTMP/.hg/strip-backup/519850c3ea27-153c8fbb-copy.hg saved backup bundle to $TESTTMP/.hg/strip-backup/519850c3ea27-153c8fbb-copy.hg
$ hg st -C --change . $ hg st -C --change .
A d1/d A d1/d
d1/b d1/b
R d1/b R d1/b
Test using directory as destination Test moved file (not copied) using 'hg mv' command
$ 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
$ mv d1/b d1/d
$ hg rm -A d1/b
$ hg add d1/d
$ hg ci -m 'move d1/b to d1/d'
created new head
$ hg mv -A --at-rev . d1/b d1/d
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 moved file (not copied) for which source still exists
$ hg co 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cp d1/b d1/d
$ hg add d1/d
$ hg ci -m 'copy d1/b to d1/d'
created new head
$ hg mv -A --at-rev . d1/b d1/d
saved backup bundle to $TESTTMP/.hg/strip-backup/c8d0f6bcf7ca-1c9bb53e-copy.hg
$ hg st -C --change .
A d1/d
d1/b
Test using directory as destination
$ hg co 0
0 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
adding d3/a adding d3/a
adding d3/b adding d3/b
adding d3/ba adding d3/ba
adding d3/d11/a1 adding d3/d11/a1
$ hg ci -m 'copy d1/ to d3/' $ hg ci -m 'copy d1/ to d3/'
created new head created new head
$ hg cp -A --at-rev . d1 d3 $ hg cp -A --at-rev . d1 d3
abort: d3: --at-rev does not support a directory as destination abort: d3: --at-rev does not support a directory as destination
[255] [255]