This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11667

copy: recommend `--at-rev .` if target was added in parent commit
ClosedPublic

Authored by martinvonz on Oct 14 2021, 4:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc62e4397eb28: copy: recommend `--at-rev .` if target was added in parent commit
Summary

If the target file was added in the working copy parent, it's much
more likely that the user meant to use --at-rev . (to record the
copy/rename in the that commit) than --force (to replace the
just-added file by another file).

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.Oct 14 2021, 4:12 PM
Alphare added a subscriber: Alphare.Oct 18 2021, 6:22 AM

This looks good aside from the small comment I have.

mercurial/cmdutil.py
1681–1696

Could you add an intermediate variable to make this easier to read?

martinvonz marked an inline comment as done.Oct 18 2021, 12:10 PM
martinvonz updated this revision to Diff 30879.
martinvonz added inline comments.Oct 18 2021, 12:10 PM
mercurial/cmdutil.py
1681–1696

Makes sense, that expression was pretty long.

martinvonz added a commit: rHGc62e4397eb28: copy: recommend `--at-rev .` if target was added in parent commit.Oct 18 2021, 3:34 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc62e4397eb28: copy: recommend `--at-rev .` if target was added in parent commit (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (52 lines)
Mtests/test-rename-rev.t (11 lines)

Diff 30882

mercurial/cmdutil.py

return True # report a failure return True # report a failure
exists = False exists = False
samefile = True samefile = True
if not after and exists or after and already_commited: if not after and exists or after and already_commited:
if not opts[b'force']: if not opts[b'force']:
if already_commited: if already_commited:
msg = _(b'%s: not overwriting - file already committed\n') msg = _(b'%s: not overwriting - file already committed\n')
# Check if if the target was added in the parent and the
# source already existed in the grandparent.
looks_like_copy_in_pctx = abstarget in pctx and any(
abssrc in gpctx and abstarget not in gpctx
for gpctx in pctx.parents()
)
if looks_like_copy_in_pctx:
if rename:
hint = _(
b"('hg rename --at-rev .' to record the rename "
b"in the parent of the working copy)\n"
)
else:
hint = _(
b"('hg copy --at-rev .' to record the copy in "
b"the parent of the working copy)\n"
AlphareUnsubmitted
Done

Could you add an intermediate variable to make this easier to read?

Alphare: Could you add an intermediate variable to make this easier to read?
martinvonzAuthorUnsubmitted
Done

Makes sense, that expression was pretty long.

martinvonz: Makes sense, that expression was pretty long.
)
else:
if after: if after:
flags = b'--after --force' flags = b'--after --force'
else: else:
flags = b'--force' flags = b'--force'
if rename: if rename:
hint = ( hint = (
_( _(
b"('hg rename %s' to replace the file by " b"('hg rename %s' to replace the file by "
b'recording a rename)\n' b'recording a rename)\n'
) )
% flags % flags
) )
else: else:
hint = ( hint = (
_( _(
b"('hg copy %s' to replace the file by " b"('hg copy %s' to replace the file by "
b'recording a copy)\n' b'recording a copy)\n'
) )
% flags % flags
) )
else: else:
msg = _(b'%s: not overwriting - file exists\n') msg = _(b'%s: not overwriting - file exists\n')
if rename: if rename:
hint = _( hint = _(
b"('hg rename --after' to record the rename)\n" b"('hg rename --after' to record the rename)\n"
) )
else: else:
hint = _(b"('hg copy --after' to record the copy)\n") hint = _(b"('hg copy --after' to record the copy)\n")

tests/test-rename-rev.t

$ 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/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
# Should get helpful message if we try to copy or rename after commit
$ hg cp --forget --at-rev . d1/d
saved backup bundle to $TESTTMP/.hg/strip-backup/3f7c325d3f9e-46f377bb-uncopy.hg
$ hg cp d1/b d1/d
d1/d: not overwriting - file already committed
('hg copy --at-rev .' to record the copy in the parent of the working copy)
[1]
$ hg mv d1/b d1/d
d1/d: not overwriting - file already committed
('hg rename --at-rev .' to record the rename in the parent of the working copy)
[1]
Test moved file (not copied) using 'hg cp' command 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