471 if ui.config('alias', 'pdiff', None) is None: |
471 if ui.config('alias', 'pdiff', None) is None: |
472 ui.setconfig('alias', 'pdiff', 'diff --rev .^') |
472 ui.setconfig('alias', 'pdiff', 'diff --rev .^') |
473 if ui.config('alias', 'olog', None) is None: |
473 if ui.config('alias', 'olog', None) is None: |
474 ui.setconfig('alias', 'olog', "log -r 'precursors(.)' --hidden") |
474 ui.setconfig('alias', 'olog', "log -r 'precursors(.)' --hidden") |
475 if ui.config('alias', 'odiff', None) is None: |
475 if ui.config('alias', 'odiff', None) is None: |
476 ui.setconfig('alias', 'odiff', "diff --rev 'limit(precursors(.),1)' --rev .") |
476 ui.setconfig('alias', 'odiff', "diff --hidden --rev 'limit(precursors(.),1)' --rev .") |
477 |
477 |
478 # - "troubles" method on changectx |
478 # - "troubles" method on changectx |
479 |
479 |
480 @eh.addattr(context.changectx, 'troubles') |
480 @eh.addattr(context.changectx, 'troubles') |
481 def troubles(ctx): |
481 def troubles(ctx): |
1117 if 'unstable' in troubles: |
1117 if 'unstable' in troubles: |
1118 return _solveunstable(ui, repo, tr, opts['dry_run']) |
1118 return _solveunstable(ui, repo, tr, opts['dry_run']) |
1119 elif 'bumped' in troubles: |
1119 elif 'bumped' in troubles: |
1120 return _solvebumped(ui, repo, tr, opts['dry_run']) |
1120 return _solvebumped(ui, repo, tr, opts['dry_run']) |
1121 elif 'divergent' in troubles: |
1121 elif 'divergent' in troubles: |
|
1122 repo = repo.unfiltered() |
|
1123 tr = repo[tr.rev()] |
1122 return _solvedivergent(ui, repo, tr, opts['dry_run']) |
1124 return _solvedivergent(ui, repo, tr, opts['dry_run']) |
1123 else: |
1125 else: |
1124 assert False # WHAT? unknown troubles |
1126 assert False # WHAT? unknown troubles |
1125 |
1127 |
1126 def _picknexttroubled(ui, repo, pickany=False): |
1128 def _picknexttroubled(ui, repo, pickany=False): |