Mercurial > evolve
comparison hgext/evolve.py @ 1499:c936a243346a
evolve: spelling uncommitted
| author | timeless@mozdev.org |
|---|---|
| date | Wed, 09 Sep 2015 22:25:37 -0400 |
| parents | 3d9a546dcbc5 |
| children | b4dfafda72c2 |
comparison
equal
deleted
inserted
replaced
| 1498:3d9a546dcbc5 | 1499:c936a243346a |
|---|---|
| 1986 shorttemplate = '[{rev}] {desc|firstline}\n' | 1986 shorttemplate = '[{rev}] {desc|firstline}\n' |
| 1987 | 1987 |
| 1988 @command('^previous', | 1988 @command('^previous', |
| 1989 [('B', 'move-bookmark', False, | 1989 [('B', 'move-bookmark', False, |
| 1990 _('move active bookmark after update')), | 1990 _('move active bookmark after update')), |
| 1991 ('', 'merge', False, _('bring uncommited change along'))], | 1991 ('', 'merge', False, _('bring uncommitted change along'))], |
| 1992 '[-B]') | 1992 '[-B]') |
| 1993 def cmdprevious(ui, repo, **opts): | 1993 def cmdprevious(ui, repo, **opts): |
| 1994 """update to parent and display summary lines""" | 1994 """update to parent and display summary lines""" |
| 1995 wkctx = repo[None] | 1995 wkctx = repo[None] |
| 1996 wparents = wkctx.parents() | 1996 wparents = wkctx.parents() |
| 2025 return 1 | 2025 return 1 |
| 2026 | 2026 |
| 2027 @command('^next', | 2027 @command('^next', |
| 2028 [('B', 'move-bookmark', False, | 2028 [('B', 'move-bookmark', False, |
| 2029 _('move active bookmark after update')), | 2029 _('move active bookmark after update')), |
| 2030 ('', 'merge', False, _('bring uncommited change along')), | 2030 ('', 'merge', False, _('bring uncommitted change along')), |
| 2031 ('', 'evolve', False, _('evolve the next changeset if necessary'))], | 2031 ('', 'evolve', False, _('evolve the next changeset if necessary'))], |
| 2032 '[-B]') | 2032 '[-B]') |
| 2033 def cmdnext(ui, repo, **opts): | 2033 def cmdnext(ui, repo, **opts): |
| 2034 """update to next child | 2034 """update to next child |
| 2035 | 2035 |