##// END OF EJS Templates
subrepo: check phase of state in each subrepositories before committing...
subrepo: check phase of state in each subrepositories before committing Before this patch, phase of newly created commit is determined by "phases.new-commit" configuration regardless of phase of state in each subrepositories. For example, this may cause the "public" revision in the parent repository referring the "secret" one in subrepository. This patch checks phase of state in each subrepositories before committing in the parent, and aborts or changes phase of newly created commit if subrepositories have more restricted phase than the parent. This patch uses "follow" as default value of "phases.checksubrepos" configuration, because it can keep consistency between phases of the parent and subrepositories without breaking existing tool chains.

File last commit:

r19872:681f7b92 default
r20176:4c96c50e default
Show More
fix_bytesmod.py
63 lines | 2.3 KiB | text/x-python | PythonLexer
"""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):
if self.filename in blacklist:
return
elif self.filename == 'mercurial/util.py':
touch_import('.', 'py3kcompat', node=node)
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]
call = Call(Name('bytesformatter', prefix=' '), args)
return call