equal
deleted
inserted
replaced
2056 if cca: |
2056 if cca: |
2057 cca(f) |
2057 cca(f) |
2058 names.append(f) |
2058 names.append(f) |
2059 if ui.verbose or not exact: |
2059 if ui.verbose or not exact: |
2060 ui.status(_('adding %s\n') % match.rel(f), |
2060 ui.status(_('adding %s\n') % match.rel(f), |
2061 label='addremove.added') |
2061 label='ui.addremove.added') |
2062 |
2062 |
2063 for subpath in sorted(wctx.substate): |
2063 for subpath in sorted(wctx.substate): |
2064 sub = wctx.sub(subpath) |
2064 sub = wctx.sub(subpath) |
2065 try: |
2065 try: |
2066 submatch = matchmod.subdirmatcher(subpath, match) |
2066 submatch = matchmod.subdirmatcher(subpath, match) |
2155 break |
2155 break |
2156 |
2156 |
2157 for f in forget: |
2157 for f in forget: |
2158 if ui.verbose or not match.exact(f) or interactive: |
2158 if ui.verbose or not match.exact(f) or interactive: |
2159 ui.status(_('removing %s\n') % match.rel(f), |
2159 ui.status(_('removing %s\n') % match.rel(f), |
2160 label='addremove.removed') |
2160 label='ui.addremove.removed') |
2161 |
2161 |
2162 if not dryrun: |
2162 if not dryrun: |
2163 rejected = wctx.forget(forget, prefix) |
2163 rejected = wctx.forget(forget, prefix) |
2164 bad.extend(f for f in rejected if f in match.files()) |
2164 bad.extend(f for f in rejected if f in match.files()) |
2165 forgot.extend(f for f in forget if f not in rejected) |
2165 forgot.extend(f for f in forget if f not in rejected) |
2289 unit=_('files')) |
2289 unit=_('files')) |
2290 for f in list: |
2290 for f in list: |
2291 if ui.verbose or not m.exact(f): |
2291 if ui.verbose or not m.exact(f): |
2292 progress.increment() |
2292 progress.increment() |
2293 ui.status(_('removing %s\n') % m.rel(f), |
2293 ui.status(_('removing %s\n') % m.rel(f), |
2294 label='addremove.removed') |
2294 label='ui.addremove.removed') |
2295 progress.complete() |
2295 progress.complete() |
2296 |
2296 |
2297 if not dryrun: |
2297 if not dryrun: |
2298 with repo.wlock(): |
2298 with repo.wlock(): |
2299 if not after: |
2299 if not after: |