Mercurial > hg-stable
changeset 873:4480e035d838
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
===================================================================
| author | mason@suse.com |
|---|---|
| date | Fri, 12 Aug 2005 09:57:59 -0800 |
| parents | 9a0af739cf55 |
| children | d4cb383e7de7 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Aug 12 09:57:56 2005 -0800 +++ b/mercurial/commands.py Fri Aug 12 09:57:59 2005 -0800 @@ -396,11 +396,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)