mercurial/commands.py
changeset 9183 d0225fa2f6c4
parent 9128 98d90ad54749
child 9188 4c287332e03b
child 9196 07d127e771a1
equal deleted inserted replaced
9182:3a319bc8906d 9183:d0225fa2f6c4
   244     revert_opts['no_backup'] = None
   244     revert_opts['no_backup'] = None
   245     revert(ui, repo, **revert_opts)
   245     revert(ui, repo, **revert_opts)
   246     commit_opts = opts.copy()
   246     commit_opts = opts.copy()
   247     commit_opts['addremove'] = False
   247     commit_opts['addremove'] = False
   248     if not commit_opts['message'] and not commit_opts['logfile']:
   248     if not commit_opts['message'] and not commit_opts['logfile']:
   249         commit_opts['message'] = _("Backed out changeset %s") % (short(node))
   249         # we don't translate commit messages
       
   250         commit_opts['message'] = "Backed out changeset %s" % (short(node))
   250         commit_opts['force_editor'] = True
   251         commit_opts['force_editor'] = True
   251     commit(ui, repo, **commit_opts)
   252     commit(ui, repo, **commit_opts)
   252     def nice(node):
   253     def nice(node):
   253         return '%d:%s' % (repo.changelog.rev(node), short(node))
   254         return '%d:%s' % (repo.changelog.rev(node), short(node))
   254     ui.status(_('changeset %s backs out changeset %s\n') %
   255     ui.status(_('changeset %s backs out changeset %s\n') %
  2912                     raise util.Abort(_('tag \'%s\' is not a global tag') % n)
  2913                     raise util.Abort(_('tag \'%s\' is not a global tag') % n)
  2913                 else:
  2914                 else:
  2914                     raise util.Abort(_('tag \'%s\' is not a local tag') % n)
  2915                     raise util.Abort(_('tag \'%s\' is not a local tag') % n)
  2915         rev_ = nullid
  2916         rev_ = nullid
  2916         if not message:
  2917         if not message:
  2917             message = _('Removed tag %s') % ', '.join(names)
  2918             # we don't translate commit messages
       
  2919             message = 'Removed tag %s' % ', '.join(names)
  2918     elif not opts.get('force'):
  2920     elif not opts.get('force'):
  2919         for n in names:
  2921         for n in names:
  2920             if n in repo.tags():
  2922             if n in repo.tags():
  2921                 raise util.Abort(_('tag \'%s\' already exists '
  2923                 raise util.Abort(_('tag \'%s\' already exists '
  2922                                    '(use -f to force)') % n)
  2924                                    '(use -f to force)') % n)
  2924         raise util.Abort(_('uncommitted merge - please provide a '
  2926         raise util.Abort(_('uncommitted merge - please provide a '
  2925                            'specific revision'))
  2927                            'specific revision'))
  2926     r = repo[rev_].node()
  2928     r = repo[rev_].node()
  2927 
  2929 
  2928     if not message:
  2930     if not message:
  2929         message = (_('Added tag %s for changeset %s') %
  2931         # we don't translate commit messages
       
  2932         message = ('Added tag %s for changeset %s' %
  2930                    (', '.join(names), short(r)))
  2933                    (', '.join(names), short(r)))
  2931 
  2934 
  2932     date = opts.get('date')
  2935     date = opts.get('date')
  2933     if date:
  2936     if date:
  2934         date = util.parsedate(date)
  2937         date = util.parsedate(date)