| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (13 lines) | |||
| M | tests/test-completion.t (2 lines) | |||
| M | tests/test-copy.t (39 lines) |
| the source must be a single file. | the source must be a single file. | ||||
| By default, this command copies the contents of files as they | By default, this command copies the contents of files as they | ||||
| exist in the working directory. If invoked with -A/--after, the | exist in the working directory. If invoked with -A/--after, the | ||||
| operation is recorded, but no copying is performed. | operation is recorded, but no copying is performed. | ||||
| To undo marking a destination file as copied, use --forget. With that | To undo marking a destination file as copied, use --forget. With that | ||||
| option, all given (positional) arguments are unmarked as copies. The | option, all given (positional) arguments are unmarked as copies. The | ||||
| destination file(s) will be left in place (still tracked). | destination file(s) will be left in place (still tracked). Note that | ||||
| :hg:`copy --forget` behaves the same way as :hg:`rename --forget`. | |||||
| This command takes effect with the next commit by default. | This command takes effect with the next commit by default. | ||||
| Returns 0 on success, 1 if errors are encountered. | Returns 0 on success, 1 if errors are encountered. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| return cmdutil.copy(ui, repo, pats, opts) | return cmdutil.copy(ui, repo, pats, opts) | ||||
| return cmdutil.remove( | return cmdutil.remove( | ||||
| ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun | ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun | ||||
| ) | ) | ||||
| @command( | @command( | ||||
| b'rename|move|mv', | b'rename|move|mv', | ||||
| [ | [ | ||||
| (b'', b'forget', None, _(b'unmark a destination file as renamed')), | |||||
| (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'', | ||||
| b'at-rev', | b'at-rev', | ||||
| b'', | b'', | ||||
| _(b'(un)mark renames in the given revision (EXPERIMENTAL)'), | _(b'(un)mark renames in the given revision (EXPERIMENTAL)'), | ||||
| _(b'REV'), | _(b'REV'), | ||||
| ), | ), | ||||
| Mark dest as copies of sources; mark sources for deletion. If dest | Mark dest as copies of sources; mark sources for deletion. If dest | ||||
| is a directory, copies are put in that directory. If dest is a | is a directory, copies are put in that directory. If dest is a | ||||
| file, there can only be one source. | file, there can only be one source. | ||||
| By default, this command copies the contents of files as they | By default, this command copies the contents of files as they | ||||
| exist in the working directory. If invoked with -A/--after, the | exist in the working directory. If invoked with -A/--after, the | ||||
| operation is recorded, but no copying is performed. | operation is recorded, but no copying is performed. | ||||
| This command takes effect at the next commit. To undo a rename | To undo marking a destination file as renamed, use --forget. With that | ||||
| before that, see :hg:`revert`. | option, all given (positional) arguments are unmarked as renames. The | ||||
| destination file(s) will be left in place (still tracked). The source | |||||
| file(s) will not be restored. Note that :hg:`rename --forget` behaves | |||||
| the same way as :hg:`copy --forget`. | |||||
| This command takes effect with the next commit by default. | |||||
| Returns 0 on success, 1 if errors are encountered. | Returns 0 on success, 1 if errors are encountered. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| return cmdutil.copy(ui, repo, pats, opts, rename=True) | return cmdutil.copy(ui, repo, pats, opts, rename=True) | ||||
| 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 | ||||
| purge: abort-on-err, all, ignored, dirs, files, print, print0, confirm, include, exclude | purge: abort-on-err, all, ignored, dirs, files, print, print0, confirm, include, exclude | ||||
| push: force, rev, bookmark, all-bookmarks, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure | push: force, rev, bookmark, all-bookmarks, 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, at-rev, force, include, exclude, dry-run | rename: forget, 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 | ||||
| $ hg cp bar xyzzy | $ hg cp bar xyzzy | ||||
| xyzzy: not overwriting - file exists | xyzzy: not overwriting - file exists | ||||
| ('hg copy --after' to record the copy) | ('hg copy --after' to record the copy) | ||||
| [1] | [1] | ||||
| $ hg co -qC . | $ hg co -qC . | ||||
| $ rm baz xyzzy | $ rm baz xyzzy | ||||
| Test unmarking copy of a single file | Test unmarking copy/rename of a single file | ||||
| # Set up by creating a copy | # Set up by creating a copy | ||||
| $ hg cp bar baz | $ hg cp bar baz | ||||
| # Test uncopying a non-existent file | # Test unmarking as copy a non-existent file | ||||
| $ hg copy --forget non-existent | $ hg copy --forget non-existent | ||||
| non-existent: $ENOENT$ | non-existent: $ENOENT$ | ||||
| # Test uncopying an tracked but unrelated file | $ hg rename --forget non-existent | ||||
| non-existent: $ENOENT$ | |||||
| # Test unmarking as copy an tracked but unrelated file | |||||
| $ hg copy --forget foo | $ hg copy --forget foo | ||||
| foo: not unmarking as copy - file is not marked as copied | foo: not unmarking as copy - file is not marked as copied | ||||
| # Test uncopying a copy source | $ hg rename --forget foo | ||||
| foo: not unmarking as copy - file is not marked as copied | |||||
| # Test unmarking as copy a copy source | |||||
| $ hg copy --forget bar | $ hg copy --forget bar | ||||
| bar: not unmarking as copy - file is not marked as copied | bar: not unmarking as copy - file is not marked as copied | ||||
| $ hg rename --forget bar | |||||
| bar: not unmarking as copy - file is not marked as copied | |||||
| # baz should still be marked as a copy | # baz should still be marked as a copy | ||||
| $ hg st -C | $ hg st -C | ||||
| A baz | A baz | ||||
| bar | bar | ||||
| # Test the normal case | # Test the normal case | ||||
| $ hg copy --forget baz | $ hg copy --forget baz | ||||
| $ hg st -C | $ hg st -C | ||||
| A baz | A baz | ||||
| # Test uncopy with matching an non-matching patterns | $ rm bar | ||||
| $ hg rename --after bar baz | |||||
| $ hg st -C | |||||
| A baz | |||||
| bar | |||||
| R bar | |||||
| $ hg rename --forget baz | |||||
| $ hg st -C | |||||
| A baz | |||||
| R bar | |||||
| $ hg revert bar | |||||
| # Test unmarking as copy with matching an non-matching patterns | |||||
| $ hg cp bar baz --after | $ hg cp bar baz --after | ||||
| $ hg copy --forget bar baz | $ hg copy --forget bar baz | ||||
| bar: not unmarking as copy - file is not marked as copied | bar: not unmarking as copy - file is not marked as copied | ||||
| $ hg cp bar baz --after | |||||
| $ hg rename --forget bar baz | |||||
| bar: not unmarking as copy - file is not marked as copied | |||||
| $ hg st -C | $ hg st -C | ||||
| A baz | A baz | ||||
| # Test uncopy with no exact matches | # Test unmarking as copy with no exact matches | ||||
| $ hg cp bar baz --after | $ hg cp bar baz --after | ||||
| $ hg copy --forget . | $ hg copy --forget . | ||||
| $ hg st -C | $ hg st -C | ||||
| A baz | A baz | ||||
| $ hg cp bar baz --after | |||||
| $ hg st -C | |||||
| A baz | |||||
| bar | |||||
| $ hg rename --forget . | |||||
| $ hg st -C | |||||
| A baz | |||||
| $ hg forget baz | $ hg forget baz | ||||
| $ rm baz | $ rm baz | ||||
| Test unmarking copy of a directory | Test unmarking copy of a directory | ||||
| $ mkdir dir | $ mkdir dir | ||||
| $ echo foo > dir/foo | $ echo foo > dir/foo | ||||
| $ echo bar > dir/bar | $ echo bar > dir/bar | ||||