This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2212

util: convert traceback-related sysstrs to sysbytes in getstackframes
ClosedPublic

Authored by durin42 on Feb 12 2018, 10:30 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG7ec26f27ca83: util: convert traceback-related sysstrs to sysbytes in getstackframes
Summary

With this change, test-devel-warnings.t passes except for differences
in how ProgrammingError is formatted and one mysterious traceback
inside of transaction.del.

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

durin42 created this revision.Feb 12 2018, 10:30 PM
indygreg accepted this revision.Feb 12 2018, 10:46 PM
This revision is now accepted and ready to land.Feb 12 2018, 10:46 PM
Closed by commit rHG7ec26f27ca83: util: convert traceback-related sysstrs to sysbytes in getstackframes (authored by durin42). · Explain WhyFeb 12 2018, 10:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5611

mercurial/util.py

Each line is formatted according to line. Each line is formatted according to line.
If line is None, it yields: If line is None, it yields:
length of longest filepath+line number, length of longest filepath+line number,
filepath+linenumber, filepath+linenumber,
function function
Not be used in production code but very convenient while developing. Not be used in production code but very convenient while developing.
''' '''
entries = [(fileline % (fn, ln), func) entries = [(fileline % (pycompat.sysbytes(fn), ln), pycompat.sysbytes(func))
for fn, ln, func, _text in traceback.extract_stack()[:-skip - 1] for fn, ln, func, _text in traceback.extract_stack()[:-skip - 1]
][-depth:] ][-depth:]
if entries: if entries:
fnmax = max(len(entry[0]) for entry in entries) fnmax = max(len(entry[0]) for entry in entries)
for fnln, func in entries: for fnln, func in entries:
if line is None: if line is None:
yield (fnmax, fnln, func) yield (fnmax, fnln, func)
else: else: