This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5806

py3: add Python 3 output for test-flagprocessor.t
ClosedPublic

Authored by indygreg on Feb 2 2019, 4:13 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3e9c6cef949b: py3: add Python 3 output for test-flagprocessor.t
rHG000f8b89bdd2: py3: add Python 3 output for test-flagprocessor.t
rHGa4392b5c69ce: py3: add Python 3 output for test-flagprocessor.t
Summary

The exception is being generated from ui.traceback(), which
simply calls traceback.format_*() to format exceptions. Since
the output from the standard library has changed, there is
seemingly not much we can do about it. So this commit adds
conditional output depending on the Python version.

I'm not thrilled about b'' appearing in user-facing output.
Can we do something better here?

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.

Revision Contents
Changeset List

PathPackages
Mtests/test-flagprocessor.t (6 lines)

Diff 13709

tests/test-flagprocessor.t

File "*/mercurial/extensions.py", line *, in _runextsetup (glob) File "*/mercurial/extensions.py", line *, in _runextsetup (glob)
extsetup(ui) extsetup(ui)
File "*/tests/flagprocessorext.py", line *, in extsetup (glob) File "*/tests/flagprocessorext.py", line *, in extsetup (glob)
validatehash, validatehash,
File "*/mercurial/revlog.py", line *, in addflagprocessor (glob) File "*/mercurial/revlog.py", line *, in addflagprocessor (glob)
_insertflagprocessor(flag, processor, _flagprocessors) _insertflagprocessor(flag, processor, _flagprocessors)
File "*/mercurial/revlog.py", line *, in _insertflagprocessor (glob) File "*/mercurial/revlog.py", line *, in _insertflagprocessor (glob)
raise error.Abort(msg) raise error.Abort(msg)
Abort: cannot register multiple processors on flag '0x8'. mercurial.error.Abort: b"cannot register multiple processors on flag '0x8'." (py3 !)
Abort: cannot register multiple processors on flag '0x8'. (no-py3 !)
*** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'. *** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'.
$ hg st 2>&1 | egrep 'cannot register multiple processors|flagprocessorext' $ hg st 2>&1 | egrep 'cannot register multiple processors|flagprocessorext'
File "*/tests/flagprocessorext.py", line *, in extsetup (glob) File "*/tests/flagprocessorext.py", line *, in extsetup (glob)
Abort: cannot register multiple processors on flag '0x8'. mercurial.error.Abort: b"cannot register multiple processors on flag '0x8'." (py3 !)
Abort: cannot register multiple processors on flag '0x8'. (no-py3 !)
*** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'. *** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'.
File "*/tests/flagprocessorext.py", line *, in b64decode (glob) File "*/tests/flagprocessorext.py", line *, in b64decode (glob)
$ cd .. $ cd ..
# TEST: bundle repo # TEST: bundle repo
$ hg init bundletest $ hg init bundletest
$ cd bundletest $ cd bundletest