Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
forget, remove: don't note on nonexistent file twice
authorIdan Kamara <idankk86@gmail.com>
Mon, 13 Jun 2011 14:56:00 +0300
changeset 14604 b1a534335548
parent 14603 68a43fdd7d80
child 14605 9f1139cf5c76
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
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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:
mercurial