Show More
@@ -2419,7 +2419,7 b' def handlebookmark(op, inpart):' | |||||
2419 | op.records.add(b'bookmarks', record) |
|
2419 | op.records.add(b'bookmarks', record) | |
2420 | else: |
|
2420 | else: | |
2421 | raise error.ProgrammingError( |
|
2421 | raise error.ProgrammingError( | |
2422 | b'unkown bookmark mode: %s' % bookmarksmode |
|
2422 | b'unknown bookmark mode: %s' % bookmarksmode | |
2423 | ) |
|
2423 | ) | |
2424 |
|
2424 | |||
2425 |
|
2425 |
@@ -2479,13 +2479,13 b' def purge(' | |||||
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 |
@@ -218,7 +218,7 b' def exclusivemarkers(repo, nodes):' | |||||
218 |
|
218 | |||
219 | or |
|
219 | or | |
220 |
|
220 | |||
221 | # (A0 rewritten as AX; AX rewritten as A1; AX is unkown locally) |
|
221 | # (A0 rewritten as AX; AX rewritten as A1; AX is unknown locally) | |
222 | # |
|
222 | # | |
223 | # <-1- A0 <-2- AX <-3- A1 # Marker "2,3" are exclusive to A1 |
|
223 | # <-1- A0 <-2- AX <-3- A1 # Marker "2,3" are exclusive to A1 | |
224 |
|
224 |
@@ -535,7 +535,7 b' class hgdist(Distribution):' | |||||
535 | # (see mercurial/__modulepolicy__.py) |
|
535 | # (see mercurial/__modulepolicy__.py) | |
536 | if hgrustext != 'cpython' and hgrustext is not None: |
|
536 | if hgrustext != 'cpython' and hgrustext is not None: | |
537 | if hgrustext: |
|
537 | if hgrustext: | |
538 | msg = 'unkown HGWITHRUSTEXT value: %s' % hgrustext |
|
538 | msg = 'unknown HGWITHRUSTEXT value: %s' % hgrustext | |
539 | printf(msg, file=sys.stderr) |
|
539 | printf(msg, file=sys.stderr) | |
540 | hgrustext = None |
|
540 | hgrustext = None | |
541 | self.rust = hgrustext is not None |
|
541 | self.rust = hgrustext is not None |
@@ -29,7 +29,7 b' purge without the extension' | |||||
29 | $ hg st |
|
29 | $ hg st | |
30 | $ touch foo |
|
30 | $ touch foo | |
31 | $ hg purge |
|
31 | $ hg purge | |
32 | permanently delete 1 unkown files? (yN) n |
|
32 | permanently delete 1 unknown files? (yN) n | |
33 | abort: removal cancelled |
|
33 | abort: removal cancelled | |
34 | [250] |
|
34 | [250] | |
35 | $ hg st |
|
35 | $ hg st | |
@@ -93,7 +93,7 b' delete an untracked file' | |||||
93 | untracked_file |
|
93 | untracked_file | |
94 | untracked_file_readonly |
|
94 | untracked_file_readonly | |
95 | $ hg purge --confirm |
|
95 | $ hg purge --confirm | |
96 | permanently delete 2 unkown files? (yN) n |
|
96 | permanently delete 2 unknown files? (yN) n | |
97 | abort: removal cancelled |
|
97 | abort: removal cancelled | |
98 | [250] |
|
98 | [250] | |
99 | $ hg purge -v |
|
99 | $ hg purge -v | |
@@ -156,7 +156,7 b' delete only part of the tree' | |||||
156 | $ hg purge -p ../untracked_directory |
|
156 | $ hg purge -p ../untracked_directory | |
157 | untracked_directory/nested_directory |
|
157 | untracked_directory/nested_directory | |
158 | $ hg purge --confirm |
|
158 | $ hg purge --confirm | |
159 | permanently delete 1 unkown files? (yN) n |
|
159 | permanently delete 1 unknown files? (yN) n | |
160 | abort: removal cancelled |
|
160 | abort: removal cancelled | |
161 | [250] |
|
161 | [250] | |
162 | $ hg purge -v ../untracked_directory |
|
162 | $ hg purge -v ../untracked_directory | |
@@ -203,7 +203,7 b' skip ignored files if -i or --all not sp' | |||||
203 | ignored |
|
203 | ignored | |
204 | untracked_file |
|
204 | untracked_file | |
205 | $ hg purge --confirm --all |
|
205 | $ hg purge --confirm --all | |
206 | permanently delete 1 unkown and 1 ignored files? (yN) n |
|
206 | permanently delete 1 unknown and 1 ignored files? (yN) n | |
207 | abort: removal cancelled |
|
207 | abort: removal cancelled | |
208 | [250] |
|
208 | [250] | |
209 | $ hg purge -v --all |
|
209 | $ hg purge -v --all |
General Comments 0
You need to be logged in to leave comments.
Login now