This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8029

copy: add option to unmark file as copied
ClosedPublic

Authored by martinvonz on Jan 28 2020, 6:51 PM.

Details

Reviewers
durin42
marmoute
Group Reviewers
hg-reviewers
Commits
rHG8be0c63535b5: copy: add option to unmark file as copied
Summary

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 .).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 28 2020, 6:51 PM
martinvonz updated this revision to Diff 19669.Jan 28 2020, 6:55 PM
marmoute added a subscriber: marmoute.Jan 29 2020, 12:00 PM

Coudl we use a flag for to hg copy for that ? something like hg copy --forget

martinvonz added a comment.Jan 29 2020, 12:06 PM
In D8029#118463, @marmoute wrote:

Coudl we use a flag for to hg copy for that ? something like hg copy --forget

Why would you prefer that? Discoverability?

An argument against it is that the commands take different flags and arguments (for example, hg uncopy takes only the destination, no source).

durin42 added a subscriber: durin42.Jan 29 2020, 5:42 PM
In D8029#118464, @martinvonz wrote:
In D8029#118463, @marmoute wrote:

Coudl we use a flag for to hg copy for that ? something like hg copy --forget

Why would you prefer that? Discoverability?
An argument against it is that the commands take different flags and arguments (for example, hg uncopy takes only the destination, no source).

I'm convinced enough that hg uncopy is enough clearer to justify being its own thing.

durin42 accepted this revision.Jan 29 2020, 5:44 PM
This revision is now accepted and ready to land.Jan 29 2020, 5:44 PM
martinvonz updated this revision to Diff 19692.Jan 29 2020, 6:37 PM
pulkit added a subscriber: pulkit.Jan 30 2020, 9:19 AM
pulkit added inline comments.
mercurial/cmdutil.py
1722

generally we refer to repo[None] as wctx right?

mercurial/commands.py
7511

We should add descriptive function documentation which will be visible to user when they do hg uncopy -h.

martinvonz added inline comments.Jan 30 2020, 9:40 AM
mercurial/cmdutil.py
1722

I didn't do that because I had planned the next patch, where the same code is used for working copy and not, so ctx isn't necessarily the working copy.

mercurial/commands.py
7511

Oops, I just forgot about that, I think. I'll send a follow-up (I assume you know that many of the patches you're reviewing now are already queued).

martinvonz added inline comments.Jan 30 2020, 12:08 PM
mercurial/commands.py
7511

Sorry, I forgot that this series was just accepted but not queued :) I've added documentation now.

marmoute requested changes to this revision.Feb 7 2020, 3:29 PM

I am still not convinced by the command name.

In D8029#118464, @martinvonz wrote:
In D8029#118463, @marmoute wrote:

Coudl we use a flag for to hg copy for that ? something like hg copy --forget

Why would you prefer that? Discoverability?

Discoverability, avoiding command creep, interface clarify, avoiding interface of similar command drifting appart from each other. The two command really deal with the same data in the same way. Having them one would

An argument against it is that the commands take different flags and arguments (for example, hg uncopy takes only the destination, no source).

I don't think it is a big deal hg copy source dest, hg copy --forget dest seems clear enough to me.

One of the thing that bother me is that hg uncopy is not reverse of hg copy, it is the reverse hg copy --after I expect it can be a source of confusion. using --after better map the behavior of the function, that is closer to hg forget as you point out in your changeset description.

This revision now requires changes to proceed.Feb 7 2020, 3:29 PM
martinvonz added a comment.Feb 7 2020, 3:35 PM
In D8029#119813, @marmoute wrote:

I am still not convinced by the command name.

In D8029#118464, @martinvonz wrote:
In D8029#118463, @marmoute wrote:

Coudl we use a flag for to hg copy for that ? something like hg copy --forget

Why would you prefer that? Discoverability?

Discoverability, avoiding command creep, interface clarify, avoiding interface of similar command drifting appart from each other. The two command really deal with the same data in the same way. Having them one would

An argument against it is that the commands take different flags and arguments (for example, hg uncopy takes only the destination, no source).

I don't think it is a big deal hg copy source dest, hg copy --forget dest seems clear enough to me.
One of the thing that bother me is that hg uncopy is not reverse of hg copy, it is the reverse hg copy --after I expect it can be a source of confusion. using --after better map the behavior of the function, that is closer to hg forget as you point out in your changeset description.

You're saying you want the user to say hg copy --forget --after dest to unmark it as copied?

martinvonz retitled this revision from uncopy: add new `hg uncopy` command to copy: add option to unmark file as copied.Feb 10 2020, 5:42 PM
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 20068.
martinvonz added a comment.Feb 10 2020, 5:49 PM
In D8029#119818, @martinvonz wrote:
In D8029#119813, @marmoute wrote:

I am still not convinced by the command name.

In D8029#118464, @martinvonz wrote:
In D8029#118463, @marmoute wrote:

Coudl we use a flag for to hg copy for that ? something like hg copy --forget

Why would you prefer that? Discoverability?

Discoverability, avoiding command creep, interface clarify, avoiding interface of similar command drifting appart from each other. The two command really deal with the same data in the same way. Having them one would

An argument against it is that the commands take different flags and arguments (for example, hg uncopy takes only the destination, no source).

I don't think it is a big deal hg copy source dest, hg copy --forget dest seems clear enough to me.
One of the thing that bother me is that hg uncopy is not reverse of hg copy, it is the reverse hg copy --after I expect it can be a source of confusion. using --after better map the behavior of the function, that is closer to hg forget as you point out in your changeset description.

You're saying you want the user to say hg copy --forget --after dest to unmark it as copied?

Since both you and @durin42 wanted hg copy --forget, I've updated the series to do it that way. I decided not to require hg --after since --forget could be interpreted to mean both "forget the copy" and "forget the file" (i.e. untrack but don't remove) at the same time. That's convenient :)

Note that the synopsis of the command is now not quite correct because hg copy --forget doesn't have SOURCE... DEST but DEST.... timeless suggested adding multiple synopsis lines à la man cp, but our help system decided not to respect my newline. So I just gave up on it. I described it in the help text instead.

martinvonz updated this revision to Diff 20081.Feb 10 2020, 6:30 PM
durin42 accepted this revision.Feb 12 2020, 2:41 PM

LGTM, would like @marmoute to chime in.

martinvonz updated this revision to Diff 20174.Feb 12 2020, 5:23 PM
pulkit added a comment.Feb 13 2020, 1:58 PM

The commit message has a mention of uncopy which needs to be removed.

martinvonz edited the summary of this revision. (Show Details)Feb 13 2020, 2:09 PM
martinvonz added a comment.Feb 13 2020, 2:09 PM
In D8029#120701, @pulkit wrote:

The commit message has a mention of uncopy which needs to be removed.

Good catch. Done.

martinvonz updated this revision to Diff 20199.Feb 13 2020, 4:37 PM
marmoute requested changes to this revision.Feb 13 2020, 5:57 PM

The UI seems good, but it seems like we should have --dry-run supports and I find the help text confusing (I made improvement suggestion).

mercurial/cmdutil.py
1413

Why are these two incompatible ? I can imagine running --forget with --dryrun

1421

Thanks for updating the UI to forget ☺

mercurial/commands.py
2339

I find this text a bit confusing. Do you mean the the synopsys is hg copy --forget FILE ?

If so, what about something like:

To undo marking a file as copied, use --forget. In that case, any copy informations attached to the command argument will be forgotten: `hg copy --forget FILE+`. The target file(s) will be left in place (still tracked).
tests/test-copy.t
304

This block will be a great place to add a --dry-run test ;-).

This revision now requires changes to proceed.Feb 13 2020, 5:57 PM
martinvonz added inline comments.Feb 13 2020, 6:07 PM
mercurial/cmdutil.py
1413

Just not implemented yet. Are you asking just out of curiosity or do you think it needs to be clarified to the user?

mercurial/commands.py
2339

If you first do hg cp a b, you can't then do hg cp --forget a, it needs to be the destination. The "SOURCE" and "DEST" names refer to the names in the synopsis. I was trying to clarify that that they're treated the same, but maybe there will be no confusion and I should not mention it?

tests/test-copy.t
304

I'll leave that for a follow-up. I don't think it should be a requirement.

marmoute added inline comments.Feb 13 2020, 6:14 PM
mercurial/commands.py
2339

doing hg cp a b does not add copies information to a, so I don't think there would be confusion from the users.

What I find the most confusing part is the piece refering to SOURCE and DEST for an operation that as no such pair. I would refer to an explicite TARGET argument and include some kind of synopsys (at that location in the documentation)

tests/test-copy.t
304

Okay that seems fair. Do you think you could impletement that before 5.4 ?

martinvonz added inline comments.Feb 13 2020, 6:20 PM
mercurial/commands.py
2339

What I find the most confusing part is the piece refering to SOURCE and DEST for an
operation that as no such pair. I would refer to an explicite TARGET argument and
include some kind of synopsys (at that location in the documentation)

I tried to add a separate synopsis line for --forget, as I said in https://phab.mercurial-scm.org/D8029#120191.

I'll still update the comment here to not refer to SOURCE and DEST since it's clearly confusing you, but I don't want to refer to TARGET or FILE either since that's not defined anywhere.

martinvonz updated this revision to Diff 20204.Feb 13 2020, 6:22 PM
marmoute added inline comments.Feb 13 2020, 6:49 PM
mercurial/commands.py
2339

What i mean is to put the equivalent of a synopsys line inside the documentation text at tle location where --forget is defined.

martinvonz added inline comments.Feb 13 2020, 6:51 PM
mercurial/commands.py
2339

Hmm, do we do that elsewhere? It would seem out of place to me, but if there's precedent for doing it, I can do it here too.

marmoute added inline comments.Feb 13 2020, 6:59 PM
mercurial/commands.py
2339

The other command with variable number of arguments I can think of usually mark them as optional in their synopsis (eg: hg bookmarks), but I feel like the situation in a bit different.

The new doc is clearer, but still not very clear. Can you try adding the synopsis to see how it looks like?

An alternative is to augment the help test to support multiple synopsys, "it can't be that hard".

martinvonz added inline comments.Feb 13 2020, 7:03 PM
mercurial/commands.py
2339

I'll let other reviewers decide if it's worth blocking the patch or series for that. I think it's quite clear already.

martinvonz edited the summary of this revision. (Show Details)Feb 14 2020, 6:19 PM
martinvonz added a commit: rHG8be0c63535b5: copy: add option to unmark file as copied.Feb 15 2020, 2:12 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8be0c63535b5: copy: add option to unmark file as copied (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (21 lines)
Mmercurial/commands.py (8 lines)
Mrelnotes/next (2 lines)
Mtests/test-completion.t (2 lines)
Mtests/test-copy.t (57 lines)

Diff 20241

mercurial/cmdutil.py

revlog backing it. Therefore, this function should only be used by code revlog backing it. Therefore, this function should only be used by code
that needs to examine low-level revlog implementation details. e.g. debug that needs to examine low-level revlog implementation details. e.g. debug
commands. commands.
""" """
return openstorage(repo, cmd, file_, opts, returnrevlog=True) return openstorage(repo, cmd, file_, opts, returnrevlog=True)
def copy(ui, repo, pats, opts, rename=False): def copy(ui, repo, pats, opts, rename=False):
check_incompatible_arguments(opts, b'forget', [b'dry_run'])
marmouteUnsubmitted
Not Done

Why are these two incompatible ? I can imagine running --forget with --dryrun

marmoute: Why are these two incompatible ? I can imagine running `--forget` with `--dryrun`
martinvonzAuthorUnsubmitted
Done

Just not implemented yet. Are you asking just out of curiosity or do you think it needs to be clarified to the user?

martinvonz: Just not implemented yet. Are you asking just out of curiosity or do you think it needs to be…
# called with the repo lock held # called with the repo lock held
# #
# hgsep => pathname that uses "/" to separate directories # hgsep => pathname that uses "/" to separate directories
# ossep => pathname that uses os.sep to separate directories # ossep => pathname that uses os.sep to separate directories
cwd = repo.getcwd() cwd = repo.getcwd()
targets = {} targets = {}
forget = opts.get(b"forget")
marmouteUnsubmitted
Not Done

Thanks for updating the UI to forget ☺

marmoute: Thanks for updating the UI to forget ☺
after = opts.get(b"after") after = opts.get(b"after")
dryrun = opts.get(b"dry_run") dryrun = opts.get(b"dry_run")
ctx = repo[None] ctx = repo[None]
pctx = ctx.p1() pctx = ctx.p1()
uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
if forget:
match = scmutil.match(wctx, pats, opts)
current_copies = wctx.p1copies()
current_copies.update(wctx.p2copies())
for f in wctx.walk(match):
if f in current_copies:
wctx[f].markcopied(None)
elif match.exact(f):
ui.warn(
_(
b'%s: not unmarking as copy - file is not marked as copied\n'
)
% uipathfn(f)
)
return
def walkpat(pat): def walkpat(pat):
srcs = [] srcs = []
m = scmutil.match(ctx, [pat], opts, globbed=True) m = scmutil.match(ctx, [pat], opts, globbed=True)
for abs in ctx.walk(m): for abs in ctx.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:
for abssrc, relsrc, exact in srcs: for abssrc, relsrc, exact in srcs:
if copyfile(abssrc, relsrc, targetpath(abssrc), exact): if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
errors += 1 errors += 1
return errors != 0 return errors != 0
## facility to let extension process additional data into an import patch ## facility to let extension process additional data into an import patch
# list of identifier to be executed in order # list of identifier to be executed in order
pulkitUnsubmitted
Not Done

generally we refer to repo[None] as wctx right?

pulkit: generally we refer to `repo[None]` as `wctx` right?
martinvonzAuthorUnsubmitted
Done

I didn't do that because I had planned the next patch, where the same code is used for working copy and not, so ctx isn't necessarily the working copy.

martinvonz: I didn't do that because I had planned the next patch, where the same code is used for working…
extrapreimport = [] # run before commit extrapreimport = [] # run before commit
extrapostimport = [] # run after commit extrapostimport = [] # run after commit
# mapping from identifier to actual import function # mapping from identifier to actual import function
# #
# 'preimport' are run before the commit is made and are provided the following # 'preimport' are run before the commit is made and are provided the following
# arguments: # arguments:
# - repo: the localrepository instance, # - repo: the localrepository instance,
# - patchdata: data extracted from patch header (cf m.patch.patchheadermap), # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),

mercurial/commands.py

ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname)) ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
return return
return contstate.continuefunc(ui, repo) return contstate.continuefunc(ui, repo)
@command( @command(
b'copy|cp', 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'A', b'after', None, _(b'record a copy that has already occurred')),
( (
b'f', b'f',
b'force', b'force',
None, None,
_(b'forcibly copy over an existing managed file'), _(b'forcibly copy over an existing managed file'),
), ),
] ]
+ walkopts + walkopts
+ dryrunopts, + dryrunopts,
_(b'[OPTION]... SOURCE... DEST'), _(b'[OPTION]... SOURCE... DEST'),
helpcategory=command.CATEGORY_FILE_CONTENTS, helpcategory=command.CATEGORY_FILE_CONTENTS,
) )
def copy(ui, repo, *pats, **opts): def copy(ui, repo, *pats, **opts):
"""mark files as copied for the next commit """mark files as copied for the next commit
Mark dest as having copies of source files. If dest is a Mark dest as having copies of source files. If dest is a
directory, copies are put in that directory. If dest is a file, directory, copies are put in that directory. If dest is a file,
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.
This command takes effect with the next commit. To undo a copy To undo marking a file as copied, use --forget. With that option,
before that, see :hg:`revert`. all given (positional) arguments are unmarked as copies. The destination
file(s) will be left in place (still tracked).
marmouteUnsubmitted
Not Done

I find this text a bit confusing. Do you mean the the synopsys is hg copy --forget FILE ?

If so, what about something like:

To undo marking a file as copied, use --forget. In that case, any copy informations attached to the command argument will be forgotten: `hg copy --forget FILE+`. The target file(s) will be left in place (still tracked).
marmoute: I find this text a bit confusing. Do you mean the the synopsys is `hg copy --forget FILE` ? If…
martinvonzAuthorUnsubmitted
Done

If you first do hg cp a b, you can't then do hg cp --forget a, it needs to be the destination. The "SOURCE" and "DEST" names refer to the names in the synopsis. I was trying to clarify that that they're treated the same, but maybe there will be no confusion and I should not mention it?

martinvonz: If you first do `hg cp a b`, you can't then do `hg cp --forget a`, it needs to be the…
marmouteUnsubmitted
Not Done

doing hg cp a b does not add copies information to a, so I don't think there would be confusion from the users.

What I find the most confusing part is the piece refering to SOURCE and DEST for an operation that as no such pair. I would refer to an explicite TARGET argument and include some kind of synopsys (at that location in the documentation)

marmoute: doing `hg cp a b` does not add copies information to `a`, so I don't think there would be…
martinvonzAuthorUnsubmitted
Done

What I find the most confusing part is the piece refering to SOURCE and DEST for an
operation that as no such pair. I would refer to an explicite TARGET argument and
include some kind of synopsys (at that location in the documentation)

I tried to add a separate synopsis line for --forget, as I said in https://phab.mercurial-scm.org/D8029#120191.

I'll still update the comment here to not refer to SOURCE and DEST since it's clearly confusing you, but I don't want to refer to TARGET or FILE either since that's not defined anywhere.

martinvonz: > What I find the most confusing part is the piece refering to SOURCE and DEST for an >…
marmouteUnsubmitted
Not Done

What i mean is to put the equivalent of a synopsys line inside the documentation text at tle location where --forget is defined.

marmoute: What i mean is to put the equivalent of a synopsys line inside the documentation text at tle…
martinvonzAuthorUnsubmitted
Done

Hmm, do we do that elsewhere? It would seem out of place to me, but if there's precedent for doing it, I can do it here too.

martinvonz: Hmm, do we do that elsewhere? It would seem out of place to me, but if there's precedent for…
marmouteUnsubmitted
Not Done

The other command with variable number of arguments I can think of usually mark them as optional in their synopsis (eg: hg bookmarks), but I feel like the situation in a bit different.

The new doc is clearer, but still not very clear. Can you try adding the synopsis to see how it looks like?

An alternative is to augment the help test to support multiple synopsys, "it can't be that hard".

marmoute: The other command with variable number of arguments I can think of usually mark them as…
martinvonzAuthorUnsubmitted
Done

I'll let other reviewers decide if it's worth blocking the patch or series for that. I think it's quite clear already.

martinvonz: I'll let other reviewers decide if it's worth blocking the patch or series for that. I think…
This command takes effect with the next commit.
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(False): with repo.wlock(False):
return cmdutil.copy(ui, repo, pats, opts) return cmdutil.copy(ui, repo, pats, opts)
@command( @command(
b'unshelve', b'unshelve',
[ [
(b'a', b'abort', None, _(b'abort an incomplete unshelve operation')), (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
( (
b'c', b'c',
b'continue', b'continue',
pulkitUnsubmitted
Not Done

We should add descriptive function documentation which will be visible to user when they do hg uncopy -h.

pulkit: We should add descriptive function documentation which will be visible to user when they do `hg…
martinvonzAuthorUnsubmitted
Done

Oops, I just forgot about that, I think. I'll send a follow-up (I assume you know that many of the patches you're reviewing now are already queued).

martinvonz: Oops, I just forgot about that, I think. I'll send a follow-up (I assume you know that many of…
martinvonzAuthorUnsubmitted
Done

Sorry, I forgot that this series was just accepted but not queued :) I've added documentation now.

martinvonz: Sorry, I forgot that this series was just accepted but not queued :) I've added documentation…
None, None,
_(b'continue an incomplete unshelve operation'), _(b'continue an incomplete unshelve operation'),
), ),
(b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')), (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
(b'k', b'keep', None, _(b'keep shelve after unshelving')), (b'k', b'keep', None, _(b'keep shelve after unshelving')),
( (
b'n', b'n',
b'name', b'name',

relnotes/next

== New Features == == New Features ==
* `hg purge`/`hg clean` can now delete ignored files instead of * `hg purge`/`hg clean` can now delete ignored files instead of
untracked files, with the new -i flag. untracked files, with the new -i flag.
* `hg log` now defaults to using an '%' symbol for commits involved * `hg log` now defaults to using an '%' symbol for commits involved
in unresolved merge conflicts. That includes unresolved conflicts in unresolved merge conflicts. That includes unresolved conflicts
caused by e.g. `hg update --merge` and `hg graft`. '@' still takes caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
precedence, so what used to be marked '@' still is. precedence, so what used to be marked '@' still is.
* New `conflictlocal()` and `conflictother()` revsets return the * New `conflictlocal()` and `conflictother()` revsets return the
commits that are being merged, when there are conflicts. Also works commits that are being merged, when there are conflicts. Also works
for conflicts caused by e.g. `hg graft`. for conflicts caused by e.g. `hg graft`.
* `hg copy --forget` can be used to unmark a file as copied.
== New Experimental Features == == New Experimental Features ==
== Bug Fixes == == Bug Fixes ==
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==

tests/test-completion.t

branch: force, clean, rev branch: force, clean, rev
branches: active, closed, rev, template branches: active, closed, rev, template
bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
cat: output, rev, decode, include, exclude, template cat: output, rev, decode, include, exclude, template
clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure
commit: addremove, close-branch, amend, secret, edit, force-close-branch, interactive, include, exclude, message, logfile, date, user, subrepos commit: addremove, close-branch, amend, secret, edit, force-close-branch, interactive, include, exclude, message, logfile, date, user, subrepos
config: untrusted, edit, local, global, template config: untrusted, edit, local, global, template
continue: dry-run continue: dry-run
copy: after, force, include, exclude, dry-run copy: forget, after, force, include, exclude, dry-run
debugancestor: debugancestor:
debugapplystreamclonebundle: debugapplystreamclonebundle:
debugbuilddag: mergeable-file, overwritten-file, new-file debugbuilddag: mergeable-file, overwritten-file, new-file
debugbundle: all, part-type, spec debugbundle: all, part-type, spec
debugcapabilities: debugcapabilities:
debugcheckstate: debugcheckstate:
debugcolor: style debugcolor: style
debugcommands: debugcommands:

tests/test-copy.t

bar bar
The hint for a file that exists but is not in file history doesn't The hint for a file that exists but is not in file history doesn't
mention --force: mention --force:
$ touch xyzzy $ touch xyzzy
$ 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 .
$ rm baz xyzzy
Test unmarking copy of a single file
# Set up by creating a copy
$ hg cp bar baz
# Test uncopying a non-existent file
$ hg copy --forget non-existent
non-existent: $ENOENT$
# Test uncopying an tracked but unrelated file
$ hg copy --forget foo
foo: not unmarking as copy - file is not marked as copied
# Test uncopying a copy source
$ hg copy --forget bar
bar: not unmarking as copy - file is not marked as copied
# baz should still be marked as a copy
$ hg st -C
A baz
bar
# Test the normal case
$ hg copy --forget baz
$ hg st -C
A baz
# Test uncopy with matching an non-matching patterns
$ hg cp bar baz --after
$ hg copy --forget bar baz
bar: not unmarking as copy - file is not marked as copied
$ hg st -C
A baz
# Test uncopy with no exact matches
$ hg cp bar baz --after
$ hg copy --forget .
$ hg st -C
A baz
$ hg forget baz
$ rm baz
Test unmarking copy of a directory
marmouteUnsubmitted
Not Done

This block will be a great place to add a --dry-run test ;-).

marmoute: This block will be a great place to add a `--dry-run` test ;-).
martinvonzAuthorUnsubmitted
Done

I'll leave that for a follow-up. I don't think it should be a requirement.

martinvonz: I'll leave that for a follow-up. I don't think it should be a requirement.
marmouteUnsubmitted
Not Done

Okay that seems fair. Do you think you could impletement that before 5.4 ?

marmoute: Okay that seems fair. Do you think you could impletement that before 5.4 ?
$ mkdir dir
$ echo foo > dir/foo
$ echo bar > dir/bar
$ hg add dir
adding dir/bar
adding dir/foo
$ hg ci -m 'add dir/'
$ hg cp dir dir2
copying dir/bar to dir2/bar
copying dir/foo to dir2/foo
$ touch dir2/untracked
$ hg copy --forget dir2
$ hg st -C
A dir2/bar
A dir2/foo
? dir2/untracked
$ cd .. $ cd ..