Mercurial > evolve
comparison hgext/evolve.py @ 1572:44e9c0a264de stable
evolve: improve help for prev, next commands
author | Greg Ward <greg@gerg.ca> |
---|---|
date | Sat, 07 Nov 2015 13:38:22 -0500 |
parents | 0e8936e7cb89 |
children | 0b4cec85d4ab |
comparison
equal
deleted
inserted
replaced
1571:0e8936e7cb89 | 1572:44e9c0a264de |
---|---|
2053 _('move active bookmark after update')), | 2053 _('move active bookmark after update')), |
2054 ('', 'merge', False, _('bring uncommitted change along')), | 2054 ('', 'merge', False, _('bring uncommitted change along')), |
2055 ('n', 'dry-run', False, _('do not perform actions, just print what would be done'))], | 2055 ('n', 'dry-run', False, _('do not perform actions, just print what would be done'))], |
2056 '[OPTION]...') | 2056 '[OPTION]...') |
2057 def cmdprevious(ui, repo, **opts): | 2057 def cmdprevious(ui, repo, **opts): |
2058 """update to parent and display summary lines""" | 2058 """update to parent revision |
2059 | |
2060 Displays the summary line of the destination for clarity.""" | |
2059 wkctx = repo[None] | 2061 wkctx = repo[None] |
2060 wparents = wkctx.parents() | 2062 wparents = wkctx.parents() |
2061 dryrunopt = opts['dry_run'] | 2063 dryrunopt = opts['dry_run'] |
2062 if len(wparents) != 1: | 2064 if len(wparents) != 1: |
2063 raise util.Abort('merge in progress') | 2065 raise util.Abort('merge in progress') |
2104 ('', 'merge', False, _('bring uncommitted change along')), | 2106 ('', 'merge', False, _('bring uncommitted change along')), |
2105 ('', 'evolve', False, _('evolve the next changeset if necessary')), | 2107 ('', 'evolve', False, _('evolve the next changeset if necessary')), |
2106 ('n', 'dry-run', False, _('do not perform actions, just print what would be done'))], | 2108 ('n', 'dry-run', False, _('do not perform actions, just print what would be done'))], |
2107 '[OPTION]...') | 2109 '[OPTION]...') |
2108 def cmdnext(ui, repo, **opts): | 2110 def cmdnext(ui, repo, **opts): |
2109 """update to next child | 2111 """update to next child revision |
2110 | 2112 |
2111 You can use the --evolve flag to get unstable children evolved on demand. | 2113 Use the ``--evolve`` flag to evolve unstable children on demand. |
2112 | 2114 |
2113 The summary line of the destination is displayed for clarity""" | 2115 Displays the summary line of the destination for clarity. |
2116 """ | |
2114 wkctx = repo[None] | 2117 wkctx = repo[None] |
2115 wparents = wkctx.parents() | 2118 wparents = wkctx.parents() |
2116 dryrunopt = opts['dry_run'] | 2119 dryrunopt = opts['dry_run'] |
2117 if len(wparents) != 1: | 2120 if len(wparents) != 1: |
2118 raise util.Abort('merge in progress') | 2121 raise util.Abort('merge in progress') |