comparison hgext/histedit.py @ 42659:701341f57ceb stable

curses: do not setlocale() at import time (issue5261)

setlocale() can break date formatting/parsing functions because they are
locale dependent. We should avoid doing setlocale() as possible.

This patch moves setlocale() just before curses.wrapper(), which function
is documented to "initialize curses." I don't know the details about the
curses initialization, but I *think* this would work as well.

Maybe we can extract a curses setup function later.

https://www.mercurial-scm.org/pipermail/mercurial-devel/2019-February/128788.html

42649:7fae3b0bd893

except ImportError:
    fcntl = None
    termios = None

import functools
import os
import struct

from mercurial.i18n import _
from mercurial import (

    return repo[roots[0]].node()

# Curses Support
try:
    import curses

    # Curses requires setting the locale or it will default to the C
    # locale. This sets the locale to the user's default system
    # locale.
    import locale
    locale.setlocale(locale.LC_ALL, r'')
except ImportError:
    curses = None

KEY_LIST = ['pick', 'edit', 'fold', 'drop', 'mess', 'roll']
ACTION_LABELS = {

                             node.short(root))

        ctxs = []
        for i, r in enumerate(revs):
            ctxs.append(histeditrule(repo[r], i))
        rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs))
        curses.echo()
        curses.endwin()
        if rc is False:
            ui.write(_("histedit aborted\n"))

def extsetup(ui):
    cmdutil.summaryhooks.add('histedit', summaryhook)
    statemod.addunfinished('histedit', fname='histedit-state', allowcommit=True,
                            continueflag=True, abortfunc=hgaborthistedit)

42659:701341f57ceb

except ImportError:
    fcntl = None
    termios = None

import functools
import locale
import os
import struct

from mercurial.i18n import _
from mercurial import (

    return repo[roots[0]].node()

# Curses Support
try:
    import curses
except ImportError:
    curses = None

KEY_LIST = ['pick', 'edit', 'fold', 'drop', 'mess', 'roll']
ACTION_LABELS = {

                             node.short(root))

        ctxs = []
        for i, r in enumerate(revs):
            ctxs.append(histeditrule(repo[r], i))
        # Curses requires setting the locale or it will default to the C
        # locale. This sets the locale to the user's default system
        # locale.
        locale.setlocale(locale.LC_ALL, r'')
        rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs))
        curses.echo()
        curses.endwin()
        if rc is False:
            ui.write(_("histedit aborted\n"))

def extsetup(ui):
    cmdutil.summaryhooks.add('histedit', summaryhook)
    statemod.addunfinished('histedit', fname='histedit-state', allowcommit=True,
                            continueflag=True, abortfunc=hgaborthistedit)