equal
deleted
inserted
replaced
134 for p in parents: |
134 for p in parents: |
135 d[p][0] += 1 |
135 d[p][0] += 1 |
136 return d |
136 return d |
137 |
137 |
138 if head in stop: |
138 if head in stop: |
139 raise util.Abort(_("Unconsistent state, %s:%s is good and bad") |
139 raise util.Abort(_("Inconsistent state, %s:%s is good and bad") |
140 % (cl.rev(head), hg.short(head))) |
140 % (cl.rev(head), hg.short(head))) |
141 n_child = num_children(head) |
141 n_child = num_children(head) |
142 for i in xrange(cl.rev(head)+1): |
142 for i in xrange(cl.rev(head)+1): |
143 n = cl.node(i) |
143 n = cl.node(i) |
144 parents = [p for p in cl.parents(n) if p != hg.nullid] |
144 parents = [p for p in cl.parents(n) if p != hg.nullid] |