Mercurial > hg
comparison mercurial/commands.py @ 9196:07d127e771a1
merge with crew-stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Wed, 22 Jul 2009 22:56:45 +0200 |
parents | 9261667e9b82 d0225fa2f6c4 |
children | a05aa192a00a |
comparison
equal
deleted
inserted
replaced
9195:8c719222ddd7 | 9196:07d127e771a1 |
---|---|
236 revert_opts['no_backup'] = None | 236 revert_opts['no_backup'] = None |
237 revert(ui, repo, **revert_opts) | 237 revert(ui, repo, **revert_opts) |
238 commit_opts = opts.copy() | 238 commit_opts = opts.copy() |
239 commit_opts['addremove'] = False | 239 commit_opts['addremove'] = False |
240 if not commit_opts['message'] and not commit_opts['logfile']: | 240 if not commit_opts['message'] and not commit_opts['logfile']: |
241 commit_opts['message'] = _("Backed out changeset %s") % (short(node)) | 241 # we don't translate commit messages |
242 commit_opts['message'] = "Backed out changeset %s" % (short(node)) | |
242 commit_opts['force_editor'] = True | 243 commit_opts['force_editor'] = True |
243 commit(ui, repo, **commit_opts) | 244 commit(ui, repo, **commit_opts) |
244 def nice(node): | 245 def nice(node): |
245 return '%d:%s' % (repo.changelog.rev(node), short(node)) | 246 return '%d:%s' % (repo.changelog.rev(node), short(node)) |
246 ui.status(_('changeset %s backs out changeset %s\n') % | 247 ui.status(_('changeset %s backs out changeset %s\n') % |
2881 raise util.Abort(_('tag \'%s\' is not a global tag') % n) | 2882 raise util.Abort(_('tag \'%s\' is not a global tag') % n) |
2882 else: | 2883 else: |
2883 raise util.Abort(_('tag \'%s\' is not a local tag') % n) | 2884 raise util.Abort(_('tag \'%s\' is not a local tag') % n) |
2884 rev_ = nullid | 2885 rev_ = nullid |
2885 if not message: | 2886 if not message: |
2886 message = _('Removed tag %s') % ', '.join(names) | 2887 # we don't translate commit messages |
2888 message = 'Removed tag %s' % ', '.join(names) | |
2887 elif not opts.get('force'): | 2889 elif not opts.get('force'): |
2888 for n in names: | 2890 for n in names: |
2889 if n in repo.tags(): | 2891 if n in repo.tags(): |
2890 raise util.Abort(_('tag \'%s\' already exists ' | 2892 raise util.Abort(_('tag \'%s\' already exists ' |
2891 '(use -f to force)') % n) | 2893 '(use -f to force)') % n) |
2893 raise util.Abort(_('uncommitted merge - please provide a ' | 2895 raise util.Abort(_('uncommitted merge - please provide a ' |
2894 'specific revision')) | 2896 'specific revision')) |
2895 r = repo[rev_].node() | 2897 r = repo[rev_].node() |
2896 | 2898 |
2897 if not message: | 2899 if not message: |
2898 message = (_('Added tag %s for changeset %s') % | 2900 # we don't translate commit messages |
2901 message = ('Added tag %s for changeset %s' % | |
2899 (', '.join(names), short(r))) | 2902 (', '.join(names), short(r))) |
2900 | 2903 |
2901 date = opts.get('date') | 2904 date = opts.get('date') |
2902 if date: | 2905 if date: |
2903 date = util.parsedate(date) | 2906 date = util.parsedate(date) |