1564 ui.pager('evolve') |
1564 ui.pager('evolve') |
1565 listtroubles(ui, repo, specifiedcategories, **opts) |
1565 listtroubles(ui, repo, specifiedcategories, **opts) |
1566 return |
1566 return |
1567 |
1567 |
1568 targetcat = 'orphan' |
1568 targetcat = 'orphan' |
|
1569 has_some_opts = bool(revopt or anyopt or allopt or contopt or stopopt or abortopt) |
1569 if 1 < len(specifiedcategories): |
1570 if 1 < len(specifiedcategories): |
1570 msg = _('cannot specify more than one trouble category to solve (yet)') |
1571 msg = _('cannot specify more than one trouble category to solve (yet)') |
1571 raise error.Abort(msg) |
1572 raise error.Abort(msg) |
1572 elif len(specifiedcategories) == 1: |
1573 elif len(specifiedcategories) == 1: |
1573 targetcat = specifiedcategories[0] |
1574 targetcat = specifiedcategories[0] |
1574 elif repo['.'].obsolete() and not(revopt or anyopt or allopt): |
1575 elif repo['.'].obsolete() and not has_some_opts: |
1575 # if no args and parent is obsolete, update to successors |
1576 # if no args and parent is obsolete, update to successors |
1576 return solveobswdp(ui, repo, opts) |
1577 return solveobswdp(ui, repo, opts) |
1577 |
1578 |
1578 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'evolve') |
1579 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'evolve') |
1579 troubled = set(repo.revs('troubled()')) |
1580 troubled = set(repo.revs('troubled()')) |