Mercurial > hg
comparison mercurial/commands.py @ 8008:36924a4711e9
commands, i18n: avoid untranslated strings as message parameters
| author | Wagner Bruna <wbruna@yahoo.com> |
|---|---|
| date | Sun, 05 Apr 2009 05:11:46 -0300 |
| parents | a4defdc4f5dc |
| children | 76e4c08a48ad |
comparison
equal
deleted
inserted
replaced
| 8007:a4defdc4f5dc | 8008:36924a4711e9 |
|---|---|
| 2827 expectedtype = opts.get('local') and 'local' or 'global' | 2827 expectedtype = opts.get('local') and 'local' or 'global' |
| 2828 for n in names: | 2828 for n in names: |
| 2829 if not repo.tagtype(n): | 2829 if not repo.tagtype(n): |
| 2830 raise util.Abort(_('tag \'%s\' does not exist') % n) | 2830 raise util.Abort(_('tag \'%s\' does not exist') % n) |
| 2831 if repo.tagtype(n) != expectedtype: | 2831 if repo.tagtype(n) != expectedtype: |
| 2832 raise util.Abort(_('tag \'%s\' is not a %s tag') % | 2832 if expectedtype == 'global': |
| 2833 (n, expectedtype)) | 2833 raise util.Abort(_('tag \'%s\' is not a global tag') % n) |
| 2834 else: | |
| 2835 raise util.Abort(_('tag \'%s\' is not a local tag') % n) | |
| 2834 rev_ = nullid | 2836 rev_ = nullid |
| 2835 if not message: | 2837 if not message: |
| 2836 message = _('Removed tag %s') % ', '.join(names) | 2838 message = _('Removed tag %s') % ', '.join(names) |
| 2837 elif not opts.get('force'): | 2839 elif not opts.get('force'): |
| 2838 for n in names: | 2840 for n in names: |