Mercurial > hg
view tests/test-i18n.t @ 46811:5a0b930cfb3e
commit: get info from mergestate whether a file was merged or not
While commiting a merge, the commit code does not know whether a file was merged
during `hg merge` or not. This leads the commit code to look for filelog
ancestor to choose parents of new filelog created on merge commit.
This leads to wrong results in some cases as demonstrated by previous patch.
From this patch, we start storing information about merged files in mergestate
in stateextras and then use that on commit to detect whether we need to set two
parents or not.
Differential Revision: https://phab.mercurial-scm.org/D10149
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 10 Mar 2021 13:14:32 +0530 |
parents | 8939062597f0 |
children |
line wrap: on
line source
(Translations are optional) #if gettext no-outer-repo Test that translations are compiled and installed correctly. Default encoding in tests is "ascii" and the translation is encoded using the "replace" error handler: $ LANGUAGE=pt_BR hg tip abortado: n?o foi encontrado um reposit?rio em '$TESTTMP' (.hg n?o encontrado) [10] Using a more accommodating encoding: $ HGENCODING=UTF-8 LANGUAGE=pt_BR hg tip abortado: n\xc3\xa3o foi encontrado um reposit\xc3\xb3rio em '$TESTTMP' (.hg n\xc3\xa3o encontrado) (esc) [10] Different encoding: $ HGENCODING=Latin-1 LANGUAGE=pt_BR hg tip abortado: n\xe3o foi encontrado um reposit\xf3rio em '$TESTTMP' (.hg n\xe3o encontrado) (esc) [10] #endif #if gettext Test keyword search in translated help text: $ HGENCODING=UTF-8 LANGUAGE=de hg help -k Aktualisiert Themen: subrepos Unterarchive Befehle: pull Ruft \xc3\x84nderungen von der angegebenen Quelle ab (esc) update Aktualisiert das Arbeitsverzeichnis (oder wechselt die Version) #endif Check Mercurial specific translation problems in each *.po files, and tool itself by doctest $ cd "$TESTDIR"/../i18n $ "$PYTHON" check-translation.py *.po $ "$PYTHON" check-translation.py --doctest $ cd $TESTTMP #if gettext Check i18n cache isn't reused after encoding change: $ cat > $TESTTMP/encodingchange.py << EOF > from mercurial.i18n import _ > from mercurial import encoding, registrar > cmdtable = {} > command = registrar.command(cmdtable) > @command(b'encodingchange', norepo=True) > def encodingchange(ui): > for encode in (b'ascii', b'UTF-8', b'ascii', b'UTF-8'): > encoding.encoding = encode > ui.write(b'%s\n' % _(b'(EXPERIMENTAL)')) > EOF $ LANGUAGE=ja hg --config extensions.encodingchange=$TESTTMP/encodingchange.py encodingchange (?????) (\xe5\xae\x9f\xe9\xa8\x93\xe7\x9a\x84\xe5\xae\x9f\xe8\xa3\x85) (esc) (?????) (\xe5\xae\x9f\xe9\xa8\x93\xe7\x9a\x84\xe5\xae\x9f\xe8\xa3\x85) (esc) #endif