This is an archive of the discontinued Mercurial Phabricator instance.

Differential D655

blackbox: set lastui even if ui.log is not called (issue5518)
ClosedPublic

Authored by quark on Sep 7 2017, 1:33 AM.

Details

Reviewers
durham
Group Reviewers
hg-reviewers
Commits
rHGb90bd9a98c8b: blackbox: set lastui even if ui.log is not called (issue5518)
Summary

lastui decides where (where is the .hg) to use if the current ui
object does not have a _bbrepo associated. Previously it only gets set in
ui.log, which means unless a ui with repo associated calls log with
tracked event, blackbox does not know where to write its log. This patch
makes reposetup set lastui so it so we could log some more events (see
test changes).

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

quark created this revision.Sep 7 2017, 1:33 AM
durham accepted this revision.Sep 7 2017, 8:26 PM
durham added a subscriber: durham.

It might be worth mentioning what lastui is use for in the commit message. I had to look at the code a little to remember what lastui did and why this was safe.

quark edited the summary of this revision. (Show Details)Sep 18 2017, 7:03 PM
quark updated this revision to Diff 1880.
quark updated this revision to Diff 1898.Sep 19 2017, 1:50 PM
Closed by commit rHGb90bd9a98c8b: blackbox: set lastui even if ui.log is not called (issue5518) (authored by quark). · Explain WhySep 20 2017, 9:02 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/blackbox.py (7 lines)
Mtests/test-blackbox.t (41 lines)

Diff 1922

hgext/blackbox.py

# During 'hg pull' a httppeer repo is created to represent the remote repo. # During 'hg pull' a httppeer repo is created to represent the remote repo.
# It doesn't have a .hg directory to put a blackbox in, so we don't do # It doesn't have a .hg directory to put a blackbox in, so we don't do
# the blackbox setup for it. # the blackbox setup for it.
if not repo.local(): if not repo.local():
return return
if util.safehasattr(ui, 'setrepo'): if util.safehasattr(ui, 'setrepo'):
ui.setrepo(repo) ui.setrepo(repo)
# Set lastui even if ui.log is not called. This gives blackbox a
# fallback place to log.
global lastui
if lastui is None:
lastui = ui
repo._wlockfreeprefix.add('blackbox.log') repo._wlockfreeprefix.add('blackbox.log')
@command('^blackbox', @command('^blackbox',
[('l', 'limit', 10, _('the number of events to show')), [('l', 'limit', 10, _('the number of events to show')),
], ],
_('hg blackbox [OPTION]...')) _('hg blackbox [OPTION]...'))
def blackbox(ui, repo, *revs, **opts): def blackbox(ui, repo, *revs, **opts):
'''view the recent repository events '''view the recent repository events

tests/test-blackbox.t

$ hg init blackboxtest $ hg init blackboxtest
$ cd blackboxtest $ cd blackboxtest
command, exit codes, and duration command, exit codes, and duration
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg blackbox --config blackbox.dirty=True $ hg blackbox --config blackbox.dirty=True
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> init blackboxtest exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a exited 0 after * seconds (glob) 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000+ (5000)> blackbox 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000+ (5000)> blackbox
alias expansion is logged alias expansion is logged
$ hg confuse $ hg confuse
$ hg blackbox $ hg blackbox
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> init blackboxtest exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a exited 0 after * seconds (glob) 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> add a exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000+ (5000)> blackbox 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000+ (5000)> blackbox
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000+ (5000)> blackbox --config *blackbox.dirty=True* exited 0 after * seconds (glob) 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000+ (5000)> blackbox --config *blackbox.dirty=True* exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> confuse 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> confuse
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> alias 'confuse' expands to 'log --limit 3' 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> alias 'confuse' expands to 'log --limit 3'
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> confuse exited 0 after * seconds (glob) 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> confuse exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> blackbox 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> blackbox
.hg/blackbox.log .hg/blackbox.log
.hg/blackbox.log.1 .hg/blackbox.log.1
.hg/blackbox.log.2 .hg/blackbox.log.2
$ cd .. $ cd ..
$ hg init blackboxtest3 $ hg init blackboxtest3
$ cd blackboxtest3 $ cd blackboxtest3
$ hg blackbox $ hg blackbox
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> init blackboxtest3 exited 0 after * seconds (glob)
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> blackbox 1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> blackbox
$ mv .hg/blackbox.log .hg/blackbox.log- $ mv .hg/blackbox.log .hg/blackbox.log-
$ mkdir .hg/blackbox.log $ mkdir .hg/blackbox.log
$ sed -e 's/\(.*test1.*\)/#\1/; s#\(.*commit2.*\)#os.rmdir(".hg/blackbox.log")\ $ sed -e 's/\(.*test1.*\)/#\1/; s#\(.*commit2.*\)#os.rmdir(".hg/blackbox.log")\
> os.rename(".hg/blackbox.log-", ".hg/blackbox.log")\ > os.rename(".hg/blackbox.log-", ".hg/blackbox.log")\
> \1#' $TESTDIR/test-dispatch.py > ../test-dispatch.py > \1#' $TESTDIR/test-dispatch.py > ../test-dispatch.py
$ $PYTHON $TESTDIR/blackbox-readonly-dispatch.py $ $PYTHON $TESTDIR/blackbox-readonly-dispatch.py
running: add foo running: add foo
$ $PYTHON showsize.py .hg/blackbox* $ $PYTHON showsize.py .hg/blackbox*
.hg/blackbox.log: < 500 .hg/blackbox.log: < 500
.hg/blackbox.log.1: >= 500 .hg/blackbox.log.1: >= 500
.hg/blackbox.log.2: >= 500 .hg/blackbox.log.2: >= 500
$ cd .. $ cd ..
#endif #endif
blackbox should work if repo.ui.log is not called (issue5518)
$ cat > $TESTTMP/raise.py << EOF
> from __future__ import absolute_import
> from mercurial import registrar, scmutil
> cmdtable = {}
> command = registrar.command(cmdtable)
> @command('raise')
> def raisecmd(*args):
> raise RuntimeError('raise')
> EOF
$ cat >> $HGRCPATH << EOF
> [blackbox]
> track = commandexception
> [extensions]
> raise=$TESTTMP/raise.py
> EOF
$ hg init $TESTTMP/blackbox-exception-only
$ cd $TESTTMP/blackbox-exception-only
#if chg
(chg exits 255 because it fails to receive an exit code)
$ hg raise 2>/dev/null
[255]
#else
(hg exits 1 because Python default exit code for uncaught exception is 1)
$ hg raise 2>/dev/null
[1]
#endif
$ head -1 .hg/blackbox.log
1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000)> ** Unknown exception encountered with possibly-broken third-party extension mock
$ tail -2 .hg/blackbox.log
RuntimeError: raise