This is an archive of the discontinued Mercurial Phabricator instance.

Differential D959

patch: do not cache translated messages (API)
ClosedPublic

Authored by quark on Oct 5 2017, 4:47 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG60213a2eca81: patch: do not cache translated messages (API)
Summary

Previously the code caches i18n._ results in module variables. That causes
issues after an encoding change. Instead of invalidating them manually, we
now just recalculate the translated messages every time filterpatch gets
called.

This makes test-commit-interactive.t pass regardless of whether chg or
demandimport is used or not.

.. api: patch.messages now lives in patch.getmessages().

Extensions adding new messages should now wrap the `patch.getmessages`
method instead of changing `patch.messages` directly.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Oct 5 2017, 4:47 PM
quark edited the summary of this revision. (Show Details)Oct 5 2017, 6:41 PM
quark updated this revision to Diff 2491.
yuja requested changes to this revision.Oct 8 2017, 8:41 AM
yuja added a subscriber: yuja.

So the messages may be rolled back, which seems to be against the original
intent, "take messages out of the function so that extensions can add entries."

Since extensions have to wrap the _getmessages() function, the messages
table isn't necessary, so we don't need the callback mechanism, too.
Alternatively, the messages table could keep the raw (untranslated) messages,
to which gettext() will be applied later.

messages = {
    ...
        'discard': "discard change %d/%d to '%s'?",
}
i18nblahblah = messages.... # tell hggettext to extract strings

....
    i18n.gettext(messages[k][op])
This revision now requires changes to proceed.Oct 8 2017, 8:41 AM
quark edited the summary of this revision. (Show Details)Oct 9 2017, 4:40 PM
quark retitled this revision from patch: invalidate messages after encoding change to patch: do not cache translated messages (API).
quark updated this revision to Diff 2537.
yuja accepted this revision.Oct 10 2017, 9:50 AM
This revision is now accepted and ready to land.Oct 10 2017, 9:50 AM
Closed by commit rHG60213a2eca81: patch: do not cache translated messages (API) (authored by quark). · Explain WhyOct 10 2017, 2:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (95 lines)
Mtests/test-commit-interactive.t (2 lines)

Diff 2474

mercurial/patch.py

pretty = write pretty = write
def filename(self): def filename(self):
return self.header.filename() return self.header.filename()
def __repr__(self): def __repr__(self):
return '<hunk %r@%d>' % (self.filename(), self.fromline) return '<hunk %r@%d>' % (self.filename(), self.fromline)
messages = { def _getmessages():
return {
'multiple': { 'multiple': {
'discard': _("discard change %d/%d to '%s'?"), 'discard': _("discard change %d/%d to '%s'?"),
'record': _("record change %d/%d to '%s'?"), 'record': _("record change %d/%d to '%s'?"),
'revert': _("revert change %d/%d to '%s'?"), 'revert': _("revert change %d/%d to '%s'?"),
}, },
'single': { 'single': {
'discard': _("discard this change to '%s'?"), 'discard': _("discard this change to '%s'?"),
'record': _("record this change to '%s'?"), 'record': _("record this change to '%s'?"),
'revert': _("revert this change to '%s'?"), 'revert': _("revert this change to '%s'?"),
}, },
'help': { 'help': {
'discard': _('[Ynesfdaq?]' 'discard': _('[Ynesfdaq?]'
'$$ &Yes, discard this change' '$$ &Yes, discard this change'
'$$ &No, skip this change' '$$ &No, skip this change'
'$$ &Edit this change manually' '$$ &Edit this change manually'
'$$ &Skip remaining changes to this file' '$$ &Skip remaining changes to this file'
'$$ Discard remaining changes to this &file' '$$ Discard remaining changes to this &file'
'$$ &Done, skip remaining changes and files' '$$ &Done, skip remaining changes and files'
'$$ Discard &all changes to all remaining files' '$$ Discard &all changes to all remaining files'
'$$ &Quit, discarding no changes' '$$ &Quit, discarding no changes'
'$$ &? (display help)'), '$$ &? (display help)'),
'record': _('[Ynesfdaq?]' 'record': _('[Ynesfdaq?]'
'$$ &Yes, record this change' '$$ &Yes, record this change'
'$$ &No, skip this change' '$$ &No, skip this change'
'$$ &Edit this change manually' '$$ &Edit this change manually'
'$$ &Skip remaining changes to this file' '$$ &Skip remaining changes to this file'
'$$ Record remaining changes to this &file' '$$ Record remaining changes to this &file'
'$$ &Done, skip remaining changes and files' '$$ &Done, skip remaining changes and files'
'$$ Record &all changes to all remaining files' '$$ Record &all changes to all remaining files'
'$$ &Quit, recording no changes' '$$ &Quit, recording no changes'
'$$ &? (display help)'), '$$ &? (display help)'),
'revert': _('[Ynesfdaq?]' 'revert': _('[Ynesfdaq?]'
'$$ &Yes, revert this change' '$$ &Yes, revert this change'
'$$ &No, skip this change' '$$ &No, skip this change'
'$$ &Edit this change manually' '$$ &Edit this change manually'
'$$ &Skip remaining changes to this file' '$$ &Skip remaining changes to this file'
'$$ Revert remaining changes to this &file' '$$ Revert remaining changes to this &file'
'$$ &Done, skip remaining changes and files' '$$ &Done, skip remaining changes and files'
'$$ Revert &all changes to all remaining files' '$$ Revert &all changes to all remaining files'
'$$ &Quit, reverting no changes' '$$ &Quit, reverting no changes'
'$$ &? (display help)') '$$ &? (display help)')
} }
} }
messages = _getmessages()
def _resetmessages():
global messages
messages = _getmessages()
encoding.setencodingcallbacks.append(_resetmessages)
def filterpatch(ui, headers, operation=None): def filterpatch(ui, headers, operation=None):
"""Interactively filter patch chunks into applied-only chunks""" """Interactively filter patch chunks into applied-only chunks"""
if operation is None: if operation is None:
operation = 'record' operation = 'record'
def prompt(skipfile, skipall, query, chunk): def prompt(skipfile, skipall, query, chunk):
"""prompt query, and process base inputs """prompt query, and process base inputs

tests/test-commit-interactive.t

> for l in sys.stdin: > for l in sys.stdin:
> sys.stdout.write(''.join(escape(c) for c in l)) > sys.stdout.write(''.join(escape(c) for c in l))
> EOF > EOF
$ hg commit -i --encoding cp932 2>&1 <<EOF | $PYTHON $TESTTMP/escape.py | grep '^y - ' $ hg commit -i --encoding cp932 2>&1 <<EOF | $PYTHON $TESTTMP/escape.py | grep '^y - '
> ? > ?
> q > q
> EOF > EOF
y - ???????(yes) y - \x82\xb1\x82\xcc\x95\xcf\x8dX\x82\xf0\x8bL\x98^(yes)
$ LANGUAGE= $ LANGUAGE=
#endif #endif
Skip Skip
$ hg commit -i <<EOF $ hg commit -i <<EOF
> s > s