equal
deleted
inserted
replaced
2513 raise util.Abort(_("--rev and --remove are incompatible")) |
2513 raise util.Abort(_("--rev and --remove are incompatible")) |
2514 if opts['rev']: |
2514 if opts['rev']: |
2515 rev_ = opts['rev'] |
2515 rev_ = opts['rev'] |
2516 message = opts['message'] |
2516 message = opts['message'] |
2517 if opts['remove']: |
2517 if opts['remove']: |
2518 if not name in repo.tags(): |
2518 if not name in repo.tags(): |
2519 raise util.Abort(_('tag %s does not exist') % name) |
2519 raise util.Abort(_('tag %s does not exist') % name) |
2520 rev_ = nullid |
2520 rev_ = nullid |
2521 if not message: |
2521 if not message: |
2522 message = _('Removed tag %s') % name |
2522 message = _('Removed tag %s') % name |
2523 elif name in repo.tags() and not opts['force']: |
2523 elif name in repo.tags() and not opts['force']: |