equal
deleted
inserted
replaced
1 import collections |
1 import collections |
2 |
2 |
3 from . import compat |
3 from mercurial import ( |
|
4 obsutil, |
|
5 ) |
4 |
6 |
5 # Copied from evolve 081605c2e9b6 |
7 # Copied from evolve 081605c2e9b6 |
6 |
8 |
7 def _orderrevs(repo, revs): |
9 def _orderrevs(repo, revs): |
8 """Compute an ordering to solve instability for the given revs |
10 """Compute an ordering to solve instability for the given revs |
71 |
73 |
72 if not p.obsolete(): |
74 if not p.obsolete(): |
73 return p.rev() |
75 return p.rev() |
74 obs = repo[p] |
76 obs = repo[p] |
75 ui = repo.ui |
77 ui = repo.ui |
76 newer = compat.successorssets(repo, obs.node()) |
78 newer = obsutil.successorssets(repo, obs.node()) |
77 # search of a parent which is not killed |
79 # search of a parent which is not killed |
78 while not newer: |
80 while not newer: |
79 ui.debug("stabilize target %s is plain dead," |
81 ui.debug("stabilize target %s is plain dead," |
80 " trying to stabilize on its parent\n" % |
82 " trying to stabilize on its parent\n" % |
81 obs) |
83 obs) |
82 obs = obs.parents()[0] |
84 obs = obs.parents()[0] |
83 newer = compat.successorssets(repo, obs.node()) |
85 newer = obsutil.successorssets(repo, obs.node()) |
84 if 1 < len(newer): |
86 if 1 < len(newer): |
85 # divergence case |
87 # divergence case |
86 # we should pick as arbitrary one |
88 # we should pick as arbitrary one |
87 raise MultipleSuccessorsError(newer) |
89 raise MultipleSuccessorsError(newer) |
88 elif 1 < len(newer[0]): |
90 elif 1 < len(newer[0]): |