equal
deleted
inserted
replaced
276 assert False # WHAT? unknown troubles |
276 assert False # WHAT? unknown troubles |
277 |
277 |
278 def _picknexttroubled(ui, repo, any=False): |
278 def _picknexttroubled(ui, repo, any=False): |
279 """Pick a the next trouble changeset to solve""" |
279 """Pick a the next trouble changeset to solve""" |
280 tr = _stabilizableunstable(repo, repo['.']) |
280 tr = _stabilizableunstable(repo, repo['.']) |
|
281 if tr is None: |
|
282 wdp = repo['.'] |
|
283 if 'conflicting' in wdp.troubles(): |
|
284 tr = wdp |
281 if tr is None and any: |
285 if tr is None and any: |
282 troubled = list(repo.set('unstable()')) |
286 troubled = list(repo.set('unstable()')) |
283 if not troubled: |
287 if not troubled: |
284 troubled = list(repo.set('latecomer()')) |
288 troubled = list(repo.set('latecomer()')) |
285 if not troubled: |
289 if not troubled: |
286 troubled = list(repo.set('conflicting()')) |
290 troubled = list(repo.set('conflicting()')) |
287 if troubled: |
291 if troubled: |
288 tr = troubled[0] |
292 tr = troubled[0] |
|
293 |
289 return tr |
294 return tr |
290 |
295 |
291 |
296 |
292 def _solveunstable(ui, repo, orig, dryrun=False): |
297 def _solveunstable(ui, repo, orig, dryrun=False): |
293 """Stabilize a unstable changeset""" |
298 """Stabilize a unstable changeset""" |