Mercurial > hg-stable
changeset 35724:853bf7d90804
blackbox: if --debug is used, also trace ui.debug() calls
Differential Revision: https://phab.mercurial-scm.org/D1880
| author | Joerg Sonnenberger <joerg@bec.de> |
|---|---|
| date | Thu, 18 Jan 2018 12:55:19 +0100 |
| parents | 50868145a8de |
| children | 2a7e777c9eed |
| files | hgext/blackbox.py tests/blackbox-readonly-dispatch.py tests/test-blackbox.t |
| diffstat | 3 files changed, 56 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/blackbox.py Thu Jan 18 14:43:04 2018 +0000 +++ b/hgext/blackbox.py Thu Jan 18 12:55:19 2018 +0100 @@ -130,6 +130,11 @@ def track(self): 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)) + def log(self, event, *msg, **opts): global lastui super(blackboxui, self).log(event, *msg, **opts)
--- a/tests/blackbox-readonly-dispatch.py Thu Jan 18 14:43:04 2018 +0000 +++ b/tests/blackbox-readonly-dispatch.py Thu Jan 18 12:55:19 2018 +0100 @@ -18,8 +18,8 @@ f = open('foo', 'wb') f.write('foo\n') f.close() -testdispatch("add foo") -testdispatch("commit -m commit1 -d 2000-01-01 foo") +testdispatch("--debug add foo") +testdispatch("--debug commit -m commit1 -d 2000-01-01 foo") # append to file 'foo' and commit f = open('foo', 'ab') @@ -29,8 +29,8 @@ os.rmdir(".hg/blackbox.log") # replace it with the real blackbox.log file 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) -testdispatch("log -r 0") -testdispatch("log -r tip") +testdispatch("--debug log -r 0") +testdispatch("--debug log -r tip")
--- a/tests/test-blackbox.t Thu Jan 18 14:43:04 2018 +0000 +++ b/tests/test-blackbox.t Thu Jan 18 12:55:19 2018 +0100 @@ -193,37 +193,68 @@ > os.rename(".hg/blackbox.log-", ".hg/blackbox.log")\ > \1#' $TESTDIR/test-dispatch.py > ../test-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 - 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 - 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 - running: log -r 0 - changeset: 0:0e4634943879 + running: --debug log -r 0 + changeset: 0:0e46349438790c460c5c9f7546bfcd39b267bbd2 + phase: draft + parent: -1:0000000000000000000000000000000000000000 + parent: -1:0000000000000000000000000000000000000000 + manifest: 0:9091aa5df980aea60860a2e39c95182e68d1ddec user: test date: Sat Jan 01 00:00:00 2000 +0000 - summary: commit1 + files+: foo + extra: branch=default + description: + commit1 + result: None - running: log -r tip - changeset: 1:45589e459b2e + running: --debug log -r tip + changeset: 1:45589e459b2edfbf3dbde7e01f611d2c1e7453d7 tag: tip + phase: draft + parent: 0:0e46349438790c460c5c9f7546bfcd39b267bbd2 + parent: -1:0000000000000000000000000000000000000000 + manifest: 1:895aa9b7886f89dd017a6d62524e1f9180b04df9 user: test date: Sun Jan 02 00:00:00 2000 +0000 - summary: commit2 + files: foo + extra: branch=default + description: + commit2 + result: None $ 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)> 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)> log -r 0 + 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)> --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)> 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)> log -r tip 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)> --debug log -r tip + 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 Test log recursion from dirty status check