Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 48423:fff5942d445f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
typo: s/unkown/unknown across the codebase Differential Revision: https://phab.mercurial-scm.org/D11807
author Rapha?l Gom?s <rgomes@octobus.net>
date Fri, 26 Nov 2021 11:53:54 +0100
parents 6dc3dc5e9636
children 38941a28406a
comparison
equal deleted inserted replaced
48422:000130cfafb6 48423:fff5942d445f
2477 2477
2478 status = repo.status(match=matcher, ignored=ignored, unknown=unknown) 2478 status = repo.status(match=matcher, ignored=ignored, unknown=unknown)
2479 2479
2480 if confirm: 2480 if confirm:
2481 nb_ignored = len(status.ignored) 2481 nb_ignored = len(status.ignored)
2482 nb_unkown = len(status.unknown) 2482 nb_unknown = len(status.unknown)
2483 if nb_unkown and nb_ignored: 2483 if nb_unknown and nb_ignored:
2484 msg = _(b"permanently delete %d unkown and %d ignored files?") 2484 msg = _(b"permanently delete %d unknown and %d ignored files?")
2485 msg %= (nb_unkown, nb_ignored) 2485 msg %= (nb_unknown, nb_ignored)
2486 elif nb_unkown: 2486 elif nb_unknown:
2487 msg = _(b"permanently delete %d unkown files?") 2487 msg = _(b"permanently delete %d unknown files?")
2488 msg %= nb_unkown 2488 msg %= nb_unknown
2489 elif nb_ignored: 2489 elif nb_ignored:
2490 msg = _(b"permanently delete %d ignored files?") 2490 msg = _(b"permanently delete %d ignored files?")
2491 msg %= nb_ignored 2491 msg %= nb_ignored
2492 elif removeemptydirs: 2492 elif removeemptydirs:
2493 dir_count = 0 2493 dir_count = 0