1336 elif 'conflicting' in troubles: |
1336 elif 'conflicting' in troubles: |
1337 return _solveconflicting(ui, repo, tr, opts['dry_run']) |
1337 return _solveconflicting(ui, repo, tr, opts['dry_run']) |
1338 else: |
1338 else: |
1339 assert False # WHAT? unknown troubles |
1339 assert False # WHAT? unknown troubles |
1340 |
1340 |
1341 def _picknexttroubled(ui, repo, any=False): |
1341 def _picknexttroubled(ui, repo, pickany=False): |
1342 """Pick a the next trouble changeset to solve""" |
1342 """Pick a the next trouble changeset to solve""" |
1343 tr = _stabilizableunstable(repo, repo['.']) |
1343 tr = _stabilizableunstable(repo, repo['.']) |
1344 if tr is None: |
1344 if tr is None: |
1345 wdp = repo['.'] |
1345 wdp = repo['.'] |
1346 if 'conflicting' in wdp.troubles(): |
1346 if 'conflicting' in wdp.troubles(): |
1347 tr = wdp |
1347 tr = wdp |
1348 if tr is None and any: |
1348 if tr is None and pickany: |
1349 troubled = list(repo.set('unstable()')) |
1349 troubled = list(repo.set('unstable()')) |
1350 if not troubled: |
1350 if not troubled: |
1351 troubled = list(repo.set('latecomer()')) |
1351 troubled = list(repo.set('latecomer()')) |
1352 if not troubled: |
1352 if not troubled: |
1353 troubled = list(repo.set('conflicting()')) |
1353 troubled = list(repo.set('conflicting()')) |