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

Get all commands that operate on files to honour --verbose and --quiet.

Browse Source 
Fix minor bug in remove command; the when-to-unlink logic was wonky.
This commit is contained in:
Bryan O'Sullivan 2005-09-14 22:32:12 -07:00
parent b6e3f2ae8c
commit 6edfd3a956
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mercurial/commands.py
View File

@ -485,6 +485,7 @@ def add(ui, repo, *pats, **opts):
names = []
for src, abs, rel, exact in walk(repo, pats, opts):
if exact:
if ui.verbose: ui.status('adding %s\n' % rel)
names.append(abs)
elif repo.dirstate.state(abs) == '?':
ui.status('adding %s\n' % rel)
@ -497,11 +498,11 @@ def addremove(ui, repo, *pats, **opts):
for src, abs, rel, exact in walk(repo, pats, opts):
if src == 'f' and repo.dirstate.state(abs) == '?':
add.append(abs)
if not exact:
if ui.verbose or not exact:
ui.status('adding ', rel, '\n')
if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
remove.append(abs)
if not exact:
if ui.verbose or not exact:
ui.status('removing ', rel, '\n')
repo.add(add)
repo.remove(remove)
@ -966,7 +967,7 @@ def forget(ui, repo, *pats, **opts):
for src, abs, rel, exact in walk(repo, pats, opts):
if repo.dirstate.state(abs) == 'a':
forget.append(abs)
if not exact:
if ui.verbose or not exact:
ui.status('forgetting ', rel, '\n')
repo.forget(forget)
@ -1404,8 +1405,8 @@ def remove(ui, repo, pat, *pats, **opts):
if c: reason = 'is modified'
elif a: reason = 'has been marked for add'
elif u: reason = 'is not managed'
if reason and exact:
ui.warn('not removing %s: file %s\n' % (rel, reason))
if reason:
if exact: ui.warn('not removing %s: file %s\n' % (rel, reason))
else:
return True
for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):