This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6994

ui: define (write|status|warn|note)noi18n aliases
ClosedPublic

Authored by indygreg on Oct 6 2019, 10:11 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5209fc94b982: ui: define (write|status|warn|note)noi18n aliases
Summary

We currently use write(('...')) to suppress check-code warnings
about not using translated strings. However, when we run black, it
will strip the ((...)). In order to placate black, we'll need to use
a different mechanism to pass untranslatable strings. This commit
introduces a writenoi18n alias (and friends) to write for that
purpose.

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Oct 6 2019, 10:11 AM
indygreg set the repository for this revision to rHG Mercurial.Oct 6 2019, 10:39 AM
durin42 added a parent revision: D6973: mangler: stop rewriting string constants to be bytes literals.Oct 6 2019, 11:01 AM
durin42 retitled this revision from ui: define a writenoi18n alias to ui: define (write|status|warn|note)noi18n aliases.
durin42 edited the summary of this revision. (Show Details)
durin42 added a child revision: D6996: cleanup: mark some ui.(status|note|warn|write) calls as not needing i18n.
durin42 updated this revision to Diff 16886.
durin42 accepted this revision.Oct 6 2019, 11:50 AM
This revision is now accepted and ready to land.Oct 6 2019, 11:50 AM
indygreg added a commit: rHG5209fc94b982: ui: define (write|status|warn|note)noi18n aliases.Oct 6 2019, 12:06 PM
Closed by commit rHG5209fc94b982: ui: define (write|status|warn|note)noi18n aliases (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (3 lines)

Diff 16877

mercurial/ui.py

msg = self.label(msg, label) msg = self.label(msg, label)
dest.write(msg) dest.write(msg)
except IOError as err: except IOError as err:
raise error.StdioError(err) raise error.StdioError(err)
finally: finally:
self._blockedtimes['stdio_blocked'] += ( self._blockedtimes['stdio_blocked'] += (
(util.timer() - starttime) * 1000) (util.timer() - starttime) * 1000)
# Alias to defeat check-code.
writenoi18n = write
def write_err(self, *args, **opts): def write_err(self, *args, **opts):
self._write(self._ferr, *args, **opts) self._write(self._ferr, *args, **opts)
def _write(self, dest, *args, **opts): def _write(self, dest, *args, **opts):
# update write() as well if you touch this code # update write() as well if you touch this code
if self._isbuffered(dest): if self._isbuffered(dest):
label = opts.get(r'label', '') label = opts.get(r'label', '')
if label and self._bufferapplylabels: if label and self._bufferapplylabels: