Show More
@@ -683,19 +683,26 b' def addremove(repo, pats=[], opts={}, dr' | |||||
683 | dstate = dirstate[abs] |
|
683 | dstate = dirstate[abs] | |
684 | if dstate == '?' and audit_path.check(abs): |
|
684 | if dstate == '?' and audit_path.check(abs): | |
685 | unknown.append(abs) |
|
685 | unknown.append(abs) | |
686 | if repo.ui.verbose or not m.exact(abs): |
|
|||
687 | rel = m.rel(abs) |
|
|||
688 | repo.ui.status(_('adding %s\n') % ((pats and rel) or abs)) |
|
|||
689 | elif dstate != 'r' and not st: |
|
686 | elif dstate != 'r' and not st: | |
690 | deleted.append(abs) |
|
687 | deleted.append(abs) | |
691 | if repo.ui.verbose or not m.exact(abs): |
|
|||
692 | rel = m.rel(abs) |
|
|||
693 | repo.ui.status(_('removing %s\n') % ((pats and rel) or abs)) |
|
|||
694 | # for finding renames |
|
688 | # for finding renames | |
695 | elif dstate == 'r': |
|
689 | elif dstate == 'r': | |
696 | removed.append(abs) |
|
690 | removed.append(abs) | |
697 | elif dstate == 'a': |
|
691 | elif dstate == 'a': | |
698 | added.append(abs) |
|
692 | added.append(abs) | |
|
693 | ||||
|
694 | unknownset = set(unknown) | |||
|
695 | toprint = unknownset.copy() | |||
|
696 | toprint.update(deleted) | |||
|
697 | for abs in sorted(toprint): | |||
|
698 | if repo.ui.verbose or not m.exact(abs): | |||
|
699 | rel = m.rel(abs) | |||
|
700 | if abs in unknownset: | |||
|
701 | status = _('adding %s\n') % ((pats and rel) or abs) | |||
|
702 | else: | |||
|
703 | status = _('removing %s\n') % ((pats and rel) or abs) | |||
|
704 | repo.ui.status(status) | |||
|
705 | ||||
699 | copies = {} |
|
706 | copies = {} | |
700 | if similarity > 0: |
|
707 | if similarity > 0: | |
701 | for old, new, score in similar.findrenames(repo, |
|
708 | for old, new, score in similar.findrenames(repo, |
General Comments 0
You need to be logged in to leave comments.
Login now