hgext/evolve.py
changeset 1497 cebe06c16837
parent 1496 62aa11956a40
child 1498 3d9a546dcbc5
equal deleted inserted replaced
1496:62aa11956a40 1497:cebe06c16837
  1985 
  1985 
  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 uncommited 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]
  2024         ui.warn(_('multiple parents, explicitly update to one\n'))
  2024         ui.warn(_('multiple parents, explicitly update to one\n'))
  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 uncommited 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