forget, remove: don't note on nonexistent file twice
before:
$ hg forget foo
foo: No such file or directory
not removing foo: file is already untracked
after:
$ hg forget foo
foo: No such file or directory
--- a/mercurial/commands.py Mon Jun 13 12:51:38 2011 -0500
+++ b/mercurial/commands.py Mon Jun 13 14:56:00 2011 +0300
@@ -2272,8 +2272,9 @@
for f in m.files():
if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
- ui.warn(_('not removing %s: file is already untracked\n')
- % m.rel(f))
+ if os.path.exists(m.rel(f)):
+ ui.warn(_('not removing %s: file is already untracked\n')
+ % m.rel(f))
errs = 1
for f in forget:
@@ -3917,7 +3918,8 @@
for f in m.files():
if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
- ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
+ if os.path.exists(m.rel(f)):
+ ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
ret = 1
if force: