Mercurial > hg
comparison mercurial/phases.py @ 15480:7d4f364c980b
phases: remove underbar into target_phase argument
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Thu, 10 Nov 2011 01:08:08 +0100 |
| parents | abcaaf51d568 |
| children | 0b7ce2f739fb |
comparison
equal
deleted
inserted
replaced
| 15479:1bb0a5b02da9 | 15480:7d4f364c980b |
|---|---|
| 56 msg = _('Removing unknown node %(n)s from %(p)i-phase boundary') | 56 msg = _('Removing unknown node %(n)s from %(p)i-phase boundary') |
| 57 repo.ui.debug(msg, {'n': short(mnode), 'p': phase}) | 57 repo.ui.debug(msg, {'n': short(mnode), 'p': phase}) |
| 58 nodes.symmetric_difference_update(missing) | 58 nodes.symmetric_difference_update(missing) |
| 59 repo._dirtyphases = True | 59 repo._dirtyphases = True |
| 60 | 60 |
| 61 def moveboundary(repo, target_phase, nodes): | 61 def moveboundary(repo, targetphase, nodes): |
| 62 """Add nodes to a phase changing other nodes phases if necessary. | 62 """Add nodes to a phase changing other nodes phases if necessary. |
| 63 | 63 |
| 64 Simplify boundary to contains phase roots only.""" | 64 Simplify boundary to contains phase roots only.""" |
| 65 | 65 |
| 66 # move roots of lower states | 66 # move roots of lower states |
| 67 for phase in xrange(target_phase + 1, len(allphases)): | 67 for phase in xrange(targetphase + 1, len(allphases)): |
| 68 # filter nodes that are not in a compatible phase already | 68 # filter nodes that are not in a compatible phase already |
| 69 # XXX rev phase cache might have been invalidated by a previous loop | 69 # XXX rev phase cache might have been invalidated by a previous loop |
| 70 # XXX we need to be smarter here | 70 # XXX we need to be smarter here |
| 71 nodes = [n for n in nodes if repo[n].phase() >= phase] | 71 nodes = [n for n in nodes if repo[n].phase() >= phase] |
| 72 if not nodes: | 72 if not nodes: |