# HG changeset patch
# User mason@suse.com
# Date 1123859528 28800
# Node ID 409a9a7b0da25a3faf15da75a8c19c77c5df1256
# Parent  953ccddd57bd8073143f3df33e0f8d3b874aa9f5
addremove was not correctly finding removed files when given
a list of files to look at.  These end up with a src of 'f' from
walk() but no longer exist on the filesystem.

Index: mine/mercurial/commands.py
===================================================================


diff -r 953ccddd57bd -r 409a9a7b0da2 mercurial/commands.py
--- a/mercurial/commands.py	Fri Aug 12 07:10:21 2005 -0800
+++ b/mercurial/commands.py	Fri Aug 12 07:12:08 2005 -0800
@@ -393,11 +393,10 @@
     q = dict(zip(pats, pats))
     add, remove = [], []
     for src, abs, rel in walk(repo, pats, opts):
-        if src == 'f':
-            if repo.dirstate.state(abs) == '?':
-                add.append(abs)
-                if rel not in q: ui.status('adding ', rel, '\n')
-        elif repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
+        if src == 'f' and repo.dirstate.state(abs) == '?':
+            add.append(abs)
+            if rel not in q: ui.status('adding ', rel, '\n')
+        if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
             remove.append(abs)
             if rel not in q: ui.status('removing ', rel, '\n')
     repo.add(add)