Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 46367:57370e7deb7b
purge: also deal with directory with --confirm
Getting the exact number is simple (you have to project the result of previous
deletion to detect super-directory with only about-to-be-deleted content). So we
use a vaguer message.
Differential Revision: https://phab.mercurial-scm.org/D9819
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 18 Jan 2021 10:24:11 +0100 |
| parents | 135056e8b5a8 |
| children | dc00324e80f4 |
comparison
equal
deleted
inserted
replaced
| 46366:135056e8b5a8 | 46367:57370e7deb7b |
|---|---|
| 2384 msg = _(b"permanently delete %d unkown files?") | 2384 msg = _(b"permanently delete %d unkown files?") |
| 2385 msg %= nb_unkown | 2385 msg %= nb_unkown |
| 2386 elif nb_ignored: | 2386 elif nb_ignored: |
| 2387 msg = _(b"permanently delete %d ignored files?") | 2387 msg = _(b"permanently delete %d ignored files?") |
| 2388 msg %= nb_ignored | 2388 msg %= nb_ignored |
| 2389 else: | 2389 elif removeemptydirs: |
| 2390 # XXX we might be missing directory there | 2390 dir_count = 0 |
| 2391 return res | 2391 for f in directories: |
| 2392 if matcher(f) and not repo.wvfs.listdir(f): | |
| 2393 dir_count += 1 | |
| 2394 if dir_count: | |
| 2395 msg = _( | |
| 2396 b"permanently delete at least %d empty directories?" | |
| 2397 ) | |
| 2398 msg %= dir_count | |
| 2399 else: | |
| 2400 # XXX we might be missing directory there | |
| 2401 return res | |
| 2392 msg += b" (yN)$$ &Yes $$ &No" | 2402 msg += b" (yN)$$ &Yes $$ &No" |
| 2393 if repo.ui.promptchoice(msg, default=1) == 1: | 2403 if repo.ui.promptchoice(msg, default=1) == 1: |
| 2394 raise error.CanceledError(_(b'removal cancelled')) | 2404 raise error.CanceledError(_(b'removal cancelled')) |
| 2395 | 2405 |
| 2396 if removefiles: | 2406 if removefiles: |