( )⚙ D1880 blackbox: if --debug is used, also trace ui.debug() calls

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1880

blackbox: if --debug is used, also trace ui.debug() calls
ClosedPublic

Authored by joerg.sonnenberger on Jan 18 2018, 6:56 AM.

Details

Reviewers
yuja
durin42
Group Reviewers
hg-reviewers
Commits
rHG853bf7d90804: blackbox: if --debug is used, also trace ui.debug() calls

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

yuja requested changes to this revision.Jan 18 2018, 7:56 AM
yuja added a subscriber: yuja.

I'm 0 on this, but I have no reason against it.

hgext/blackbox.py
136

These arguments can't be passed directly to .log().
.log() takes a format string and its parameters, whereas .debug()
takes a list of arbitrary strings to print.

Perhaps **opts should be dropped.

This revision now requires changes to proceed.Jan 18 2018, 7:56 AM
joerg.sonnenberger updated this revision to Diff 4902.Jan 18 2018, 9:21 AM
joerg.sonnenberger updated this revision to Diff 4903.
joerg.sonnenberger marked an inline comment as done.Jan 18 2018, 1:35 PM
joerg.sonnenberger added inline comments.
hgext/blackbox.py
136

Fixed, thanks.

durin42 accepted this revision.Jan 18 2018, 3:10 PM
joerg.sonnenberger marked an inline comment as done.Jan 18 2018, 3:31 PM
Closed by commit rHG853bf7d90804: blackbox: if --debug is used, also trace ui.debug() calls (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 4928

hgext/blackbox.py

if not vfs.isdir('.'): if not vfs.isdir('.'):
vfs = None vfs = None
return vfs return vfs
@util.propertycache @util.propertycache
def track(self): def track(self):
return self.configlist('blackbox', 'track') return self.configlist('blackbox', 'track')
def debug(self, *msg, **opts):
super(blackboxui, self).debug(*msg, **opts)
if self.debugflag:
self.log('debug', '%s', ''.join(*msg))
yujaUnsubmitted
Done

These arguments can't be passed directly to .log().
.log() takes a format string and its parameters, whereas .debug()
takes a list of arbitrary strings to print.

Perhaps **opts should be dropped.

yuja: These arguments can't be passed directly to `.log()`. `.log()` takes a format string and its…
joerg.sonnenbergerAuthorUnsubmitted
Not Done

Fixed, thanks.

joerg.sonnenberger: Fixed, thanks.
def log(self, event, *msg, **opts): def log(self, event, *msg, **opts):
global lastui global lastui
super(blackboxui, self).log(event, *msg, **opts) super(blackboxui, self).log(event, *msg, **opts)
if not '*' in self.track and not event in self.track: if not '*' in self.track and not event in self.track:
return return
if self._bbvfs: if self._bbvfs:

tests/blackbox-readonly-dispatch.py

req = dispatch.request(cmd.split()) req = dispatch.request(cmd.split())
result = dispatch.dispatch(req) result = dispatch.dispatch(req)
print("result: %r" % (result,)) print("result: %r" % (result,))
# create file 'foo', add and commit # create file 'foo', add and commit
f = open('foo', 'wb') f = open('foo', 'wb')
f.write('foo\n') f.write('foo\n')
f.close() f.close()
testdispatch("add foo") testdispatch("--debug add foo")
testdispatch("commit -m commit1 -d 2000-01-01 foo") testdispatch("--debug commit -m commit1 -d 2000-01-01 foo")
# append to file 'foo' and commit # append to file 'foo' and commit
f = open('foo', 'ab') f = open('foo', 'ab')
f.write('bar\n') f.write('bar\n')
f.close() f.close()
# remove blackbox.log directory (proxy for readonly log file) # remove blackbox.log directory (proxy for readonly log file)
os.rmdir(".hg/blackbox.log") os.rmdir(".hg/blackbox.log")
# replace it with the real blackbox.log file # replace it with the real blackbox.log file
os.rename(".hg/blackbox.log-", ".hg/blackbox.log") os.rename(".hg/blackbox.log-", ".hg/blackbox.log")
testdispatch("commit -m commit2 -d 2000-01-02 foo") testdispatch("--debug commit -m commit2 -d 2000-01-02 foo")
# check 88803a69b24 (fancyopts modified command table) # check 88803a69b24 (fancyopts modified command table)
testdispatch("log -r 0") testdispatch("--debug log -r 0")
testdispatch("log -r tip") testdispatch("--debug log -r tip")

tests/test-blackbox.t

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)> 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: --debug add foo
warning: cannot write to blackbox.log: Is a directory
adding foo
result: 0 result: 0
running: commit -m commit1 -d 2000-01-01 foo running: --debug commit -m commit1 -d 2000-01-01 foo
warning: cannot write to blackbox.log: Is a directory
committing files:
foo
committing manifest
committing changelog
updating the branch cache
committed changeset 0:0e46349438790c460c5c9f7546bfcd39b267bbd2
result: None result: None
running: commit -m commit2 -d 2000-01-02 foo running: --debug commit -m commit2 -d 2000-01-02 foo
committing files:
foo
committing manifest
committing changelog
updating the branch cache
committed changeset 1:45589e459b2edfbf3dbde7e01f611d2c1e7453d7
result: None result: None
running: log -r 0 running: --debug log -r 0
changeset: 0:0e4634943879 changeset: 0:0e46349438790c460c5c9f7546bfcd39b267bbd2
phase: draft
parent: -1:0000000000000000000000000000000000000000
parent: -1:0000000000000000000000000000000000000000
manifest: 0:9091aa5df980aea60860a2e39c95182e68d1ddec
user: test user: test
date: Sat Jan 01 00:00:00 2000 +0000 date: Sat Jan 01 00:00:00 2000 +0000
summary: commit1 files+: foo
extra: branch=default
description:
commit1
result: None result: None
running: log -r tip running: --debug log -r tip
changeset: 1:45589e459b2e changeset: 1:45589e459b2edfbf3dbde7e01f611d2c1e7453d7
tag: tip tag: tip
phase: draft
parent: 0:0e46349438790c460c5c9f7546bfcd39b267bbd2
parent: -1:0000000000000000000000000000000000000000
manifest: 1:895aa9b7886f89dd017a6d62524e1f9180b04df9
user: test user: test
date: Sun Jan 02 00:00:00 2000 +0000 date: Sun Jan 02 00:00:00 2000 +0000
summary: commit2 files: foo
extra: branch=default
description:
commit2
result: None result: None
$ hg blackbox $ hg blackbox
1970/01/01 00:00:00 bob @0e46349438790c460c5c9f7546bfcd39b267bbd2 (5000)> commit -m commit2 -d 2000-01-02 foo 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updating the branch cache
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updated served branch cache in * seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updated served branch cache in * seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> wrote served branch cache with 1 labels and 1 nodes 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> wrote served branch cache with 1 labels and 1 nodes
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> commit -m commit2 -d 2000-01-02 foo exited 0 after * seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug commit -m commit2 -d 2000-01-02 foo exited 0 after *.?? seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> log -r 0 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> writing .hg/cache/tags2-visible with 0 tags 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> writing .hg/cache/tags2-visible with 0 tags
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> log -r 0 exited 0 after * seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 exited 0 after *.?? seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> log -r tip 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> log -r tip exited 0 after * seconds (glob) 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip exited 0 after *.?? seconds (glob)
1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> blackbox 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> blackbox
Test log recursion from dirty status check Test log recursion from dirty status check
$ cat > ../r.py <<EOF $ cat > ../r.py <<EOF
> from mercurial import context, error, extensions > from mercurial import context, error, extensions
> x=[False] > x=[False]
> def status(orig, *args, **opts): > def status(orig, *args, **opts):