comparison mercurial/commands.py @ 44364:8be0c63535b5

copy: add option to unmark file as copied

To unmark a file as copied, the user currently has to do this:

  hg forget <dest>
  hg add <dest>

The new command simplifies that to:

  hg copy --forget <dest>

That's not a very big improvement, but I'm planning to also teach `hg
copy [--forget]` a `--at-rev` argument for marking/unmarking copies
after commit (usually with `--at-rev .`).

Differential Revision: https://phab.mercurial-scm.org/D8029

44363:f7459da77f23

@command(
    b'copy|cp',
    [
        (b'A', b'after', None, _(b'record a copy that has already occurred')),
        (
            b'f',
            b'force',
            None,

    By default, this command copies the contents of files as they
    exist in the working directory. If invoked with -A/--after, the
    operation is recorded, but no copying is performed.

    This command takes effect with the next commit. To undo a copy
    before that, see :hg:`revert`.

    Returns 0 on success, 1 if errors are encountered.
    """
    opts = pycompat.byteskwargs(opts)
    with repo.wlock(False):

44364:8be0c63535b5

@command(
    b'copy|cp',
    [
        (b'', b'forget', None, _(b'unmark a file as copied')),
        (b'A', b'after', None, _(b'record a copy that has already occurred')),
        (
            b'f',
            b'force',
            None,

    By default, this command copies the contents of files as they
    exist in the working directory. If invoked with -A/--after, the
    operation is recorded, but no copying is performed.

    To undo marking a file as copied, use --forget. With that option,
    all given (positional) arguments are unmarked as copies. The destination
    file(s) will be left in place (still tracked).

    This command takes effect with the next commit.

    Returns 0 on success, 1 if errors are encountered.
    """
    opts = pycompat.byteskwargs(opts)
    with repo.wlock(False):