This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4417

rename: quote hg commands in warnings
ClosedPublic

Authored by martinvonz on Aug 29 2018, 1:47 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGcde75233c415: rename: quote hg commands in warnings
Summary

I think we usally use single quotes around hg commands in messages.

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.Aug 29 2018, 1:47 PM
pulkit accepted this revision.Aug 29 2018, 3:22 PM
Closed by commit rHGcde75233c415: rename: quote hg commands in warnings (authored by martinvonz). · Explain WhyAug 29 2018, 3:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (8 lines)
Mtests/test-copy.t (6 lines)
Mtests/test-rename.t (6 lines)

Diff 10651

mercurial/cmdutil.py

if not opts['force']: if not opts['force']:
if state in 'mn': if state in 'mn':
msg = _('%s: not overwriting - file already committed\n') msg = _('%s: not overwriting - file already committed\n')
if after: if after:
flags = '--after --force' flags = '--after --force'
else: else:
flags = '--force' flags = '--force'
if rename: if rename:
hint = _('(hg rename %s to replace the file by ' hint = _("('hg rename %s' to replace the file by "
'recording a rename)\n') % flags 'recording a rename)\n') % flags
else: else:
hint = _('(hg copy %s to replace the file by ' hint = _("('hg copy %s' to replace the file by "
'recording a copy)\n') % flags 'recording a copy)\n') % flags
else: else:
msg = _('%s: not overwriting - file exists\n') msg = _('%s: not overwriting - file exists\n')
if rename: if rename:
hint = _('(hg rename --after to record the rename)\n') hint = _("('hg rename --after' to record the rename)\n")
else: else:
hint = _('(hg copy --after to record the copy)\n') hint = _("('hg copy --after' to record the copy)\n")
ui.warn(msg % reltarget) ui.warn(msg % reltarget)
ui.warn(hint) ui.warn(hint)
return return
if after: if after:
if not exists: if not exists:
if rename: if rename:
ui.warn(_('%s: not recording move - %s does not exist\n') % ui.warn(_('%s: not recording move - %s does not exist\n') %

tests/test-copy.t

bar bar
foo was clean: foo was clean:
$ hg st -AC foo $ hg st -AC foo
C foo C foo
Trying to copy on top of an existing file fails, Trying to copy on top of an existing file fails,
$ hg copy -A bar foo $ hg copy -A bar foo
foo: not overwriting - file already committed foo: not overwriting - file already committed
(hg copy --after --force to replace the file by recording a copy) ('hg copy --after --force' to replace the file by recording a copy)
same error without the --after, so the user doesn't have to go through same error without the --after, so the user doesn't have to go through
two hints: two hints:
$ hg copy bar foo $ hg copy bar foo
foo: not overwriting - file already committed foo: not overwriting - file already committed
(hg copy --force to replace the file by recording a copy) ('hg copy --force' to replace the file by recording a copy)
but it's considered modified after a copy --after --force but it's considered modified after a copy --after --force
$ hg copy -Af bar foo $ hg copy -Af bar foo
$ hg st -AC foo $ hg st -AC foo
M foo M foo
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)
$ cd .. $ cd ..

tests/test-rename.t

5 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf d3 $ rm -rf d3
move everything under directory d1 to existing directory d2, do not move everything under directory d1 to existing directory d2, do not
overwrite existing files (d2/b) overwrite existing files (d2/b)
$ hg rename d1/* d2 $ hg rename d1/* d2
d2/b: not overwriting - file already committed d2/b: not overwriting - file already committed
(hg rename --force to replace the file by recording a rename) ('hg rename --force' to replace the file by recording a rename)
moving d1/d11/a1 to d2/d11/a1 moving d1/d11/a1 to d2/d11/a1
$ hg status -C $ hg status -C
A d2/a A d2/a
d1/a d1/a
A d2/ba A d2/ba
d1/ba d1/ba
A d2/d11/a1 A d2/d11/a1
d1/d11/a1 d1/d11/a1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf d2/d21 $ rm -rf d2/d21
attempt to overwrite an existing file attempt to overwrite an existing file
$ echo "ca" > d1/ca $ echo "ca" > d1/ca
$ hg rename d1/ba d1/ca $ hg rename d1/ba d1/ca
d1/ca: not overwriting - file exists d1/ca: not overwriting - file exists
(hg rename --after to record the rename) ('hg rename --after' to record the rename)
$ hg status -C $ hg status -C
? d1/ca ? d1/ca
$ hg update -C $ hg update -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
forced overwrite of an existing file forced overwrite of an existing file
$ echo "ca" > d1/ca $ echo "ca" > d1/ca
$ hg rename --force d1/ba d1/ca $ hg rename --force d1/ba d1/ca
$ hg status -C $ hg status -C
A d1/ca A d1/ca
d1/ba d1/ba
R d1/ba R d1/ba
$ hg update -C $ hg update -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm d1/ca $ rm d1/ca
attempt to overwrite an existing broken symlink attempt to overwrite an existing broken symlink
#if symlink #if symlink
$ ln -s ba d1/ca $ ln -s ba d1/ca
$ hg rename --traceback d1/ba d1/ca $ hg rename --traceback d1/ba d1/ca
d1/ca: not overwriting - file exists d1/ca: not overwriting - file exists
(hg rename --after to record the rename) ('hg rename --after' to record the rename)
$ hg status -C $ hg status -C
? d1/ca ? d1/ca
$ hg update -C $ hg update -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm d1/ca $ rm d1/ca
replace a symlink with a file replace a symlink with a file