facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

remove: specify hg in added warning

Browse Source
This commit is contained in:
timeless 2016-09-02 21:46:00 +00:00
parent 847e1dc1fe
commit 9b9d2357c6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/cmdutil.py
View File

@ -2509,8 +2509,8 @@ def remove(ui, repo, m, prefix, after, force, subrepos, warnings=None):
for f in added:
count += 1
ui.progress(_('skipping'), count, total=total, unit=_('files'))
warnings.append(_('not removing %s: file has been marked for add'
' (use forget to undo)\n') % m.rel(f))
warnings.append(_("not removing %s: file has been marked for add"
" (use 'hg forget' to undo add)\n") % m.rel(f))
ret = 1
ui.progress(_('skipping'), None)

2
tests/test-largefiles.t
View File

@ -112,7 +112,7 @@ Test messages and exit codes for remove warning cases
normalnew already tracked!
$ hg remove normalnew largenew
not removing largenew: file is untracked
not removing normalnew: file has been marked for add (use forget to undo)
not removing normalnew: file has been marked for add (use 'hg forget' to undo add)
[1]
$ rm normalnew largenew
$ hg up -Cq

2
tests/test-remove.t
View File

@ -50,7 +50,7 @@ the table cases
\r (no-eol) (esc)
skipping [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
not removing bar: file has been marked for add (use forget to undo)
not removing bar: file has been marked for add (use 'hg forget' to undo add)
exit code: 1
A bar
./bar