Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 38373:ef692614e601
progress: hide update(None) in a new complete() method
update(None) seemed a bit cryptic.
Differential Revision: https://phab.mercurial-scm.org/D3774
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 17 Jun 2018 22:13:41 -0700 |
| parents | 89db59e5cf3e |
| children | 32fba6fe893d |
comparison
equal
deleted
inserted
replaced
| 38372:f4f1fb1cbfb4 | 38373:ef692614e601 |
|---|---|
| 2193 dryrun, warnings): | 2193 dryrun, warnings): |
| 2194 ret = 1 | 2194 ret = 1 |
| 2195 except error.LookupError: | 2195 except error.LookupError: |
| 2196 warnings.append(_("skipping missing subrepository: %s\n") | 2196 warnings.append(_("skipping missing subrepository: %s\n") |
| 2197 % join(subpath)) | 2197 % join(subpath)) |
| 2198 progress.update(None) | 2198 progress.complete() |
| 2199 | 2199 |
| 2200 # warn about failure to delete explicit files/dirs | 2200 # warn about failure to delete explicit files/dirs |
| 2201 deleteddirs = util.dirs(deleted) | 2201 deleteddirs = util.dirs(deleted) |
| 2202 files = m.files() | 2202 files = m.files() |
| 2203 progress = ui.makeprogress(_('deleting'), total=len(files), | 2203 progress = ui.makeprogress(_('deleting'), total=len(files), |
| 2222 else: | 2222 else: |
| 2223 warnings.append(_('not removing %s: file is untracked\n') | 2223 warnings.append(_('not removing %s: file is untracked\n') |
| 2224 % m.rel(f)) | 2224 % m.rel(f)) |
| 2225 # missing files will generate a warning elsewhere | 2225 # missing files will generate a warning elsewhere |
| 2226 ret = 1 | 2226 ret = 1 |
| 2227 progress.update(None) | 2227 progress.complete() |
| 2228 | 2228 |
| 2229 if force: | 2229 if force: |
| 2230 list = modified + deleted + clean + added | 2230 list = modified + deleted + clean + added |
| 2231 elif after: | 2231 elif after: |
| 2232 list = deleted | 2232 list = deleted |
| 2237 progress.increment() | 2237 progress.increment() |
| 2238 if ui.verbose or (f in files): | 2238 if ui.verbose or (f in files): |
| 2239 warnings.append(_('not removing %s: file still exists\n') | 2239 warnings.append(_('not removing %s: file still exists\n') |
| 2240 % m.rel(f)) | 2240 % m.rel(f)) |
| 2241 ret = 1 | 2241 ret = 1 |
| 2242 progress.update(None) | 2242 progress.complete() |
| 2243 else: | 2243 else: |
| 2244 list = deleted + clean | 2244 list = deleted + clean |
| 2245 progress = ui.makeprogress(_('skipping'), | 2245 progress = ui.makeprogress(_('skipping'), |
| 2246 total=(len(modified) + len(added)), | 2246 total=(len(modified) + len(added)), |
| 2247 unit=_('files')) | 2247 unit=_('files')) |
| 2253 for f in added: | 2253 for f in added: |
| 2254 progress.increment() | 2254 progress.increment() |
| 2255 warnings.append(_("not removing %s: file has been marked for add" | 2255 warnings.append(_("not removing %s: file has been marked for add" |
| 2256 " (use 'hg forget' to undo add)\n") % m.rel(f)) | 2256 " (use 'hg forget' to undo add)\n") % m.rel(f)) |
| 2257 ret = 1 | 2257 ret = 1 |
| 2258 progress.update(None) | 2258 progress.complete() |
| 2259 | 2259 |
| 2260 list = sorted(list) | 2260 list = sorted(list) |
| 2261 progress = ui.makeprogress(_('deleting'), total=len(list), | 2261 progress = ui.makeprogress(_('deleting'), total=len(list), |
| 2262 unit=_('files')) | 2262 unit=_('files')) |
| 2263 for f in list: | 2263 for f in list: |
| 2264 if ui.verbose or not m.exact(f): | 2264 if ui.verbose or not m.exact(f): |
| 2265 progress.increment() | 2265 progress.increment() |
| 2266 ui.status(_('removing %s\n') % m.rel(f)) | 2266 ui.status(_('removing %s\n') % m.rel(f)) |
| 2267 progress.update(None) | 2267 progress.complete() |
| 2268 | 2268 |
| 2269 if not dryrun: | 2269 if not dryrun: |
| 2270 with repo.wlock(): | 2270 with repo.wlock(): |
| 2271 if not after: | 2271 if not after: |
| 2272 for f in list: | 2272 for f in list: |