1058 "phasedivergent": repo.revs("phasedivergent()"), |
1058 "phasedivergent": repo.revs("phasedivergent()"), |
1059 "all": repo.revs("troubled()"), |
1059 "all": repo.revs("troubled()"), |
1060 } |
1060 } |
1061 |
1061 |
1062 hintmap = { |
1062 hintmap = { |
1063 'phasedivergent': _("do you want to use --phasedivergent"), |
1063 'phasedivergent': _("do you want to use --phase-divergent"), |
1064 'phasedivergent+contentdivergent': _("do you want to use " |
1064 'phasedivergent+contentdivergent': _("do you want to use " |
1065 "--phasedivergent or" |
1065 "--phase-divergent or" |
1066 " --content-divergent"), |
1066 " --content-divergent"), |
1067 'phasedivergent+orphan': _("do you want to use --phasedivergent" |
1067 'phasedivergent+orphan': _("do you want to use --phase-divergent" |
1068 " or --orphan"), |
1068 " or --orphan"), |
1069 'contentdivergent': _("do you want to use --content-divergent"), |
1069 'contentdivergent': _("do you want to use --content-divergent"), |
1070 'contentdivergent+orphan': _("do you want to use --content-divergent" |
1070 'contentdivergent+orphan': _("do you want to use --content-divergent" |
1071 " or --orphan"), |
1071 " or --orphan"), |
1072 'orphan': _("do you want to use --orphan"), |
1072 'orphan': _("do you want to use --orphan"), |
1073 'any+phasedivergent': _("do you want to use --any (or --rev) and" |
1073 'any+phasedivergent': _("do you want to use --any (or --rev) and" |
1074 " --phasedivergent"), |
1074 " --phase-divergent"), |
1075 'any+phasedivergent+contentdivergent': _("do you want to use --any" |
1075 'any+phasedivergent+contentdivergent': _("do you want to use --any" |
1076 " (or --rev) and" |
1076 " (or --rev) and" |
1077 " --phasedivergent or" |
1077 " --phase-divergent or" |
1078 " --content-divergent"), |
1078 " --content-divergent"), |
1079 'any+phasedivergent+orphan': _("do you want to use --any (or --rev)" |
1079 'any+phasedivergent+orphan': _("do you want to use --any (or --rev)" |
1080 " and --phasedivergent or --orphan"), |
1080 " and --phase-divergent or --orphan"), |
1081 'any+contentdivergent': _("do you want to use --any (or --rev) and" |
1081 'any+contentdivergent': _("do you want to use --any (or --rev) and" |
1082 " --content-divergent"), |
1082 " --content-divergent"), |
1083 'any+contentdivergent+orphan': _("do you want to use --any (or --rev)" |
1083 'any+contentdivergent+orphan': _("do you want to use --any (or --rev)" |
1084 " and --content-divergent or " |
1084 " and --content-divergent or " |
1085 "--orphan"), |
1085 "--orphan"), |
1416 ('A', 'any', False, |
1416 ('A', 'any', False, |
1417 _('also consider troubled changesets unrelated to current working ' |
1417 _('also consider troubled changesets unrelated to current working ' |
1418 'directory')), |
1418 'directory')), |
1419 ('r', 'rev', [], _('solves troubles of these revisions')), |
1419 ('r', 'rev', [], _('solves troubles of these revisions')), |
1420 ('', 'bumped', False, _('solves only bumped changesets')), |
1420 ('', 'bumped', False, _('solves only bumped changesets')), |
1421 ('', 'phasedivergent', False, _('solves only phase-divergent changesets')), |
1421 ('', 'phase-divergent', False, _('solves only phase-divergent changesets')), |
1422 ('', 'divergent', False, _('solves only divergent changesets')), |
1422 ('', 'divergent', False, _('solves only divergent changesets')), |
1423 ('', 'content-divergent', False, _('solves only content-divergent changesets')), |
1423 ('', 'content-divergent', False, _('solves only content-divergent changesets')), |
1424 ('', 'unstable', False, _('solves only unstable changesets')), |
1424 ('', 'unstable', False, _('solves only unstable changesets')), |
1425 ('', 'orphan', False, _('solves only orphan changesets (default)')), |
1425 ('', 'orphan', False, _('solves only orphan changesets (default)')), |
1426 ('a', 'all', False, _('evolve all troubled changesets related to the ' |
1426 ('a', 'all', False, _('evolve all troubled changesets related to the ' |
1525 |
1525 |
1526 opts['content_divergent'] = opts['divergent'] |
1526 opts['content_divergent'] = opts['divergent'] |
1527 |
1527 |
1528 if opts['bumped']: |
1528 if opts['bumped']: |
1529 msg = ("'evolve --bumped' is deprecated, " |
1529 msg = ("'evolve --bumped' is deprecated, " |
1530 "use 'evolve --phasedivergent'") |
1530 "use 'evolve --phase-divergent'") |
1531 repo.ui.deprecwarn(msg, '4.4') |
1531 repo.ui.deprecwarn(msg, '4.4') |
1532 |
1532 |
1533 opts['phasedivergent'] = opts['bumped'] |
1533 opts['phase_divergent'] = opts['bumped'] |
1534 |
1534 |
1535 troublecategories = ['phasedivergent', 'content_divergent', 'orphan'] |
1535 troublecategories = ['phase_divergent', 'content_divergent', 'orphan'] |
1536 specifiedcategories = [t.replace('_', '') |
1536 specifiedcategories = [t.replace('_', '') |
1537 for t in troublecategories |
1537 for t in troublecategories |
1538 if opts[t]] |
1538 if opts[t]] |
1539 if listopt: |
1539 if listopt: |
1540 compat.startpager(ui, 'evolve') |
1540 compat.startpager(ui, 'evolve') |