This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5180

logtoprocess: fix message formatting
ClosedPublic

Authored by lothiraldan on Oct 22 2018, 9:55 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6bd477ee7294: logtoprocess: fix message formatting
Summary

The logtoprocess used to try formatting the message using keyword options
instead of always using the rest of the arguments. Update it to match blackbox
behavior.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lothiraldan created this revision.Oct 22 2018, 9:55 AM
Closed by commit rHG6bd477ee7294: logtoprocess: fix message formatting (authored by lothiraldan). · Explain WhyOct 22 2018, 11:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/logtoprocess.py (6 lines)
Mtests/test-logtoprocess.t (4 lines)

Diff 12306

hgext/logtoprocess.py

""" """
script = self.config('logtoprocess', event) script = self.config('logtoprocess', event)
if script: if script:
if msg: if msg:
# try to format the log message given the remaining # try to format the log message given the remaining
# arguments # arguments
try: try:
# Python string formatting with % either uses a # Format the message as blackbox does
# dictionary *or* tuple, but not both. If we have formatted = msg[0] % msg[1:]
# keyword options, assume we need a mapping.
formatted = msg[0] % (opts or msg[1:])
except (TypeError, KeyError): except (TypeError, KeyError):
# Failed to apply the arguments, ignore # Failed to apply the arguments, ignore
formatted = msg[0] formatted = msg[0]
messages = (formatted,) + msg[1:] messages = (formatted,) + msg[1:]
else: else:
messages = msg messages = msg
# positional arguments are listed as MSG[N] keys in the # positional arguments are listed as MSG[N] keys in the
# environment # environment

tests/test-logtoprocess.t

> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> configtable = {} > configtable = {}
> configitem = registrar.configitem(configtable) > configitem = registrar.configitem(configtable)
> configitem('logtoprocess', 'foo', > configitem('logtoprocess', 'foo',
> default=None, > default=None,
> ) > )
> @command(b'foo', []) > @command(b'foo', [])
> def foo(ui, repo): > def foo(ui, repo):
> ui.log('foo', 'a message: %(bar)s\n', bar='spam') > ui.log('foo', 'a message: %s\n', 'spam')
> EOF > EOF
$ cp $HGRCPATH $HGRCPATH.bak $ cp $HGRCPATH $HGRCPATH.bak
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> logtoprocess= > logtoprocess=
> foocommand=$TESTTMP/foocommand.py > foocommand=$TESTTMP/foocommand.py
> [logtoprocess] > [logtoprocess]
> command=(echo 'logtoprocess command output:'; > command=(echo 'logtoprocess command output:';
> echo "\$EVENT"; > echo "\$EVENT";
> echo "\$MSG1"; > echo "\$MSG1";
> echo "\$MSG2") > $TESTTMP/command.log > echo "\$MSG2") > $TESTTMP/command.log
> commandfinish=(echo 'logtoprocess commandfinish output:'; > commandfinish=(echo 'logtoprocess commandfinish output:';
> echo "\$EVENT"; > echo "\$EVENT";
> echo "\$MSG1"; > echo "\$MSG1";
> echo "\$MSG2"; > echo "\$MSG2";
> echo "\$MSG3") > $TESTTMP/commandfinish.log > echo "\$MSG3") > $TESTTMP/commandfinish.log
> foo=(echo 'logtoprocess foo output:'; > foo=(echo 'logtoprocess foo output:';
> echo "\$EVENT"; > echo "\$EVENT";
> echo "\$MSG1"; > echo "\$MSG1";
> echo "\$OPT_BAR") > $TESTTMP/foo.log > echo "\$MSG2") > $TESTTMP/foo.log
> EOF > EOF
Running a command triggers both a ui.log('command') and a Running a command triggers both a ui.log('command') and a
ui.log('commandfinish') call. The foo command also uses ui.log. ui.log('commandfinish') call. The foo command also uses ui.log.
Use sort to avoid ordering issues between the various processes we spawn: Use sort to avoid ordering issues between the various processes we spawn:
$ hg foo $ hg foo
$ sleep 1 $ sleep 1