Show More
@@ -485,6 +485,7 b' def add(ui, repo, *pats, **opts):' | |||
|
485 | 485 | names = [] |
|
486 | 486 | for src, abs, rel, exact in walk(repo, pats, opts): |
|
487 | 487 | if exact: |
|
488 | if ui.verbose: ui.status('adding %s\n' % rel) | |
|
488 | 489 | names.append(abs) |
|
489 | 490 | elif repo.dirstate.state(abs) == '?': |
|
490 | 491 | ui.status('adding %s\n' % rel) |
@@ -497,11 +498,11 b' def addremove(ui, repo, *pats, **opts):' | |||
|
497 | 498 | for src, abs, rel, exact in walk(repo, pats, opts): |
|
498 | 499 | if src == 'f' and repo.dirstate.state(abs) == '?': |
|
499 | 500 | add.append(abs) |
|
500 | if not exact: | |
|
501 | if ui.verbose or not exact: | |
|
501 | 502 | ui.status('adding ', rel, '\n') |
|
502 | 503 | if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel): |
|
503 | 504 | remove.append(abs) |
|
504 | if not exact: | |
|
505 | if ui.verbose or not exact: | |
|
505 | 506 | ui.status('removing ', rel, '\n') |
|
506 | 507 | repo.add(add) |
|
507 | 508 | repo.remove(remove) |
@@ -966,7 +967,7 b' def forget(ui, repo, *pats, **opts):' | |||
|
966 | 967 | for src, abs, rel, exact in walk(repo, pats, opts): |
|
967 | 968 | if repo.dirstate.state(abs) == 'a': |
|
968 | 969 | forget.append(abs) |
|
969 | if not exact: | |
|
970 | if ui.verbose or not exact: | |
|
970 | 971 | ui.status('forgetting ', rel, '\n') |
|
971 | 972 | repo.forget(forget) |
|
972 | 973 | |
@@ -1404,8 +1405,8 b' def remove(ui, repo, pat, *pats, **opts)' | |||
|
1404 | 1405 | if c: reason = 'is modified' |
|
1405 | 1406 | elif a: reason = 'has been marked for add' |
|
1406 | 1407 | elif u: reason = 'is not managed' |
|
1407 |
if reason |
|
|
1408 | ui.warn('not removing %s: file %s\n' % (rel, reason)) | |
|
1408 | if reason: | |
|
1409 | if exact: ui.warn('not removing %s: file %s\n' % (rel, reason)) | |
|
1409 | 1410 | else: |
|
1410 | 1411 | return True |
|
1411 | 1412 | for src, abs, rel, exact in walk(repo, (pat,) + pats, opts): |
General Comments 0
You need to be logged in to leave comments.
Login now