help: search section of help topic by translated section name correctly Before this patch, "hg help topic.section" might show unexpected section of help topic in some encoding. It applies str.lower() instead of encoding.lower(str) on translated message to search section case-insensitively, but some encoding uses 0x41(A) - 0x5a(Z) as the second or later byte of multi-byte character (for example, ja_JP.cp932), and str.lower() causes unexpected result. To search section of help topic by translated section name correctly, this patch replaces str.lower() by encoding.lower(str) for both query string (in commands.help()) and translated help text (in minirst.getsections()).

     1

# extension to emulate interupting filemerge._filemerge

     2

     3

from __future__ import absolute_import

     4

     5

from mercurial import (

     6

    error,

     7

    extensions,

     8

    filemerge,

     9

)

    10

    11

def failfilemerge(filemergefn,

    12

        premerge, repo, mynode, orig, fcd, fco, fca, labels=None):

    13

    raise error.Abort("^C")

    14

    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)

    15

    16

def extsetup(ui):

    17

    extensions.wrapfunction(filemerge, '_filemerge',

    18

                            failfilemerge)