comparison mercurial/phases.py @ 16293:bc1d949261c4 stable

phases: fix a non-standard debug message - add missing newline - ditch gratuitous use of string formatting with dict - fix so it actually does string formatting ('%' rather than ',') - inline unnecessary local variable - downcase first word
author Greg Ward <greg@gerg.ca>
date Wed, 15 Feb 2012 17:30:21 -0500
parents 2aa5b51f310f
children 39d1f83eb05d
comparison
equal deleted inserted replaced
16292:101c8a1befb1 16293:bc1d949261c4
146 nodemap = repo.changelog.nodemap # to filter unknown nodes 146 nodemap = repo.changelog.nodemap # to filter unknown nodes
147 for phase, nodes in enumerate(phaseroots): 147 for phase, nodes in enumerate(phaseroots):
148 missing = [node for node in nodes if node not in nodemap] 148 missing = [node for node in nodes if node not in nodemap]
149 if missing: 149 if missing:
150 for mnode in missing: 150 for mnode in missing:
151 msg = 'Removing unknown node %(n)s from %(p)i-phase boundary' 151 repo.ui.debug(
152 repo.ui.debug(msg, {'n': short(mnode), 'p': phase}) 152 'removing unknown node %s from %i-phase boundary\n'
153 % (short(mnode), phase))
153 nodes.symmetric_difference_update(missing) 154 nodes.symmetric_difference_update(missing)
154 repo._dirtyphases = True 155 repo._dirtyphases = True
155 156
156 def advanceboundary(repo, targetphase, nodes): 157 def advanceboundary(repo, targetphase, nodes):
157 """Add nodes to a phase changing other nodes phases if necessary. 158 """Add nodes to a phase changing other nodes phases if necessary.