equal
deleted
inserted
replaced
2608 """ |
2608 """ |
2609 opts = pycompat.byteskwargs(opts) |
2609 opts = pycompat.byteskwargs(opts) |
2610 bookmark = opts.get(b'bookmark') |
2610 bookmark = opts.get(b'bookmark') |
2611 changesets += tuple(opts.get(b'rev', [])) |
2611 changesets += tuple(opts.get(b'rev', [])) |
2612 |
2612 |
2613 if bookmark and changesets: |
2613 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark') |
2614 raise error.Abort(_(b"-r and -B are mutually exclusive")) |
|
2615 |
2614 |
2616 if bookmark: |
2615 if bookmark: |
2617 if bookmark not in repo._bookmarks: |
2616 if bookmark not in repo._bookmarks: |
2618 raise error.Abort(_(b"bookmark '%s' not found") % bookmark) |
2617 raise error.Abort(_(b"bookmark '%s' not found") % bookmark) |
2619 |
2618 |