equal
deleted
inserted
replaced
2507 ' to force removal)\n') % m.rel(f)) |
2507 ' to force removal)\n') % m.rel(f)) |
2508 ret = 1 |
2508 ret = 1 |
2509 for f in added: |
2509 for f in added: |
2510 count += 1 |
2510 count += 1 |
2511 ui.progress(_('skipping'), count, total=total, unit=_('files')) |
2511 ui.progress(_('skipping'), count, total=total, unit=_('files')) |
2512 warnings.append(_('not removing %s: file has been marked for add' |
2512 warnings.append(_("not removing %s: file has been marked for add" |
2513 ' (use forget to undo)\n') % m.rel(f)) |
2513 " (use 'hg forget' to undo add)\n") % m.rel(f)) |
2514 ret = 1 |
2514 ret = 1 |
2515 ui.progress(_('skipping'), None) |
2515 ui.progress(_('skipping'), None) |
2516 |
2516 |
2517 list = sorted(list) |
2517 list = sorted(list) |
2518 total = len(list) |
2518 total = len(list) |