##// END OF EJS Templates
revsetbenchmarks: use a more compact output format with a header...
revsetbenchmarks: use a more compact output format with a header We change the output from: revset #0: draft() 0) wall 0.011989 comb 0.010000 user 0.000000 sys 0.010000 (best of 177) 1) wall 0.012226 comb 0.010000 user 0.000000 sys 0.010000 (best of 193) 2) wall 0.011838 comb 0.020000 user 0.000000 sys 0.020000 (best of 208) to: revset #0: draft() wall comb user sys count 0) 0.012028 0.010000 0.000000 0.010000 170 1) 0.012218 0.010000 0.000000 0.010000 157 2) 0.012622 0.010000 0.000000 0.010000 189 This opens the road to more useful output.

File last commit:

r20701:d20817ac default
r25534:43e5a681 default
Show More
fix_bytesmod.py
63 lines | 2.3 KiB | text/x-python | PythonLexer
Renato Cunha
hgfixes: added a fixer that makes bytes to be formatted correctly...
r11749 """Fixer that changes bytes % whatever to a function that actually formats
it."""
from lib2to3 import fixer_base
from lib2to3.fixer_util import is_tuple, Call, Comma, Name, touch_import
# XXX: Implementing a blacklist in 2to3 turned out to be more troublesome than
# blacklisting some modules inside the fixers. So, this is what I came with.
blacklist = ['mercurial/demandimport.py',
'mercurial/py3kcompat.py',
'mercurial/i18n.py',
]
def isnumberremainder(formatstr, data):
try:
if data.value.isdigit():
return True
except AttributeError:
return False
class FixBytesmod(fixer_base.BaseFix):
# XXX: There's one case (I suppose) I can't handle: when a remainder
# operation like foo % bar is performed, I can't really know what the
# contents of foo and bar are. I believe the best approach is to "correct"
# the to-be-converted code and let bytesformatter handle that case in
# runtime.
PATTERN = '''
term< formatstr=STRING '%' data=STRING > |
term< formatstr=STRING '%' data=atom > |
term< formatstr=NAME '%' data=any > |
term< formatstr=any '%' data=any >
'''
def transform(self, node, results):
Augie Fackler
fix_bytesmod: fix defects in fix_bytesmod so it produces working code...
r20399 for bfn in blacklist:
if self.filename.endswith(bfn):
return
if not self.filename.endswith('mercurial/py3kcompat.py'):
Augie Fackler
fix_bytesmod: use the "from mercurial" form of the import to avoid breaking httpclient...
r20701 touch_import('mercurial', 'py3kcompat', node=node)
Renato Cunha
hgfixes: added a fixer that makes bytes to be formatted correctly...
r11749
formatstr = results['formatstr'].clone()
data = results['data'].clone()
formatstr.prefix = '' # remove spaces from start
if isnumberremainder(formatstr, data):
return
# We have two possibilities:
# 1- An identifier or name is passed, it is going to be a leaf, thus, we
# just need to copy its value as an argument to the formatter;
# 2- A tuple is explicitly passed. In this case, we're gonna explode it
# to pass to the formatter
# TODO: Check for normal strings. They don't need to be translated
if is_tuple(data):
args = [formatstr, Comma().clone()] + \
[c.clone() for c in data.children[:]]
else:
args = [formatstr, Comma().clone(), data]
Mads Kiilerich
check-code: check for spaces around = for named parameters
r19872 call = Call(Name('bytesformatter', prefix=' '), args)
Renato Cunha
hgfixes: added a fixer that makes bytes to be formatted correctly...
r11749 return call