Show More
@@ -201,7 +201,6 b' except ImportError:' | |||||
201 | termios = None |
|
201 | termios = None | |
202 |
|
202 | |||
203 | import functools |
|
203 | import functools | |
204 | import locale |
|
|||
205 | import os |
|
204 | import os | |
206 | import struct |
|
205 | import struct | |
207 |
|
206 | |||
@@ -1711,10 +1710,6 b' def _chistedit(ui, repo, freeargs, opts)' | |||||
1711 | ctxs = [] |
|
1710 | ctxs = [] | |
1712 | for i, r in enumerate(revs): |
|
1711 | for i, r in enumerate(revs): | |
1713 | ctxs.append(histeditrule(ui, repo[r], i)) |
|
1712 | ctxs.append(histeditrule(ui, repo[r], i)) | |
1714 | # Curses requires setting the locale or it will default to the C |
|
|||
1715 | # locale. This sets the locale to the user's default system |
|
|||
1716 | # locale. |
|
|||
1717 | locale.setlocale(locale.LC_ALL, '') |
|
|||
1718 | rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs)) |
|
1713 | rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs)) | |
1719 | curses.echo() |
|
1714 | curses.echo() | |
1720 | curses.endwin() |
|
1715 | curses.endwin() |
@@ -10,7 +10,6 b'' | |||||
10 |
|
10 | |||
11 | from __future__ import absolute_import |
|
11 | from __future__ import absolute_import | |
12 |
|
12 | |||
13 | import locale |
|
|||
14 | import os |
|
13 | import os | |
15 | import re |
|
14 | import re | |
16 | import signal |
|
15 | import signal | |
@@ -574,9 +573,6 b' def chunkselector(ui, headerlist, operat' | |||||
574 | """ |
|
573 | """ | |
575 | ui.write(_(b'starting interactive selection\n')) |
|
574 | ui.write(_(b'starting interactive selection\n')) | |
576 | chunkselector = curseschunkselector(headerlist, ui, operation) |
|
575 | chunkselector = curseschunkselector(headerlist, ui, operation) | |
577 | # This is required for ncurses to display non-ASCII characters in |
|
|||
578 | # default user locale encoding correctly. --immerrr |
|
|||
579 | locale.setlocale(locale.LC_ALL, '') |
|
|||
580 | origsigtstp = sentinel = object() |
|
576 | origsigtstp = sentinel = object() | |
581 | if util.safehasattr(signal, b'SIGTSTP'): |
|
577 | if util.safehasattr(signal, b'SIGTSTP'): | |
582 | origsigtstp = signal.getsignal(signal.SIGTSTP) |
|
578 | origsigtstp = signal.getsignal(signal.SIGTSTP) |
General Comments 0
You need to be logged in to leave comments.
Login now