Show More
@@ -7088,6 +7088,7 b' def tag(ui, repo, name1, *names, **opts)' | |||||
7088 |
|
7088 | |||
7089 | Returns 0 on success. |
|
7089 | Returns 0 on success. | |
7090 | """ |
|
7090 | """ | |
|
7091 | cmdutil.check_incompatible_arguments(opts, 'remove', ['rev']) | |||
7091 | opts = pycompat.byteskwargs(opts) |
|
7092 | opts = pycompat.byteskwargs(opts) | |
7092 | with repo.wlock(), repo.lock(): |
|
7093 | with repo.wlock(), repo.lock(): | |
7093 | rev_ = b"." |
|
7094 | rev_ = b"." | |
@@ -7100,8 +7101,6 b' def tag(ui, repo, name1, *names, **opts)' | |||||
7100 | raise error.Abort( |
|
7101 | raise error.Abort( | |
7101 | _(b'tag names cannot consist entirely of whitespace') |
|
7102 | _(b'tag names cannot consist entirely of whitespace') | |
7102 | ) |
|
7103 | ) | |
7103 | if opts.get(b'rev') and opts.get(b'remove'): |
|
|||
7104 | raise error.Abort(_(b"--rev and --remove are incompatible")) |
|
|||
7105 | if opts.get(b'rev'): |
|
7104 | if opts.get(b'rev'): | |
7106 | rev_ = opts[b'rev'] |
|
7105 | rev_ = opts[b'rev'] | |
7107 | message = opts.get(b'message') |
|
7106 | message = opts.get(b'message') |
General Comments 0
You need to be logged in to leave comments.
Login now