| Alphare |
| hg-reviewers |
This is just another little py3 cleanup.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| experimental.inmemory = True | experimental.inmemory = True | ||||
| Return Values: | Return Values: | ||||
| Returns 0 on success, 1 if nothing to rebase or there are | Returns 0 on success, 1 if nothing to rebase or there are | ||||
| unresolved conflicts. | unresolved conflicts. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| inmemory = ui.configbool(b'rebase', b'experimental.inmemory') | inmemory = ui.configbool(b'rebase', b'experimental.inmemory') | ||||
| action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') | action = cmdutil.check_at_most_one_arg(opts, 'abort', 'stop', 'continue') | ||||
| if action: | if action: | ||||
| cmdutil.check_incompatible_arguments( | cmdutil.check_incompatible_arguments( | ||||
| opts, action, [b'confirm', b'dry_run'] | opts, action, ['confirm', 'dry_run'] | ||||
| ) | ) | ||||
| cmdutil.check_incompatible_arguments( | cmdutil.check_incompatible_arguments( | ||||
| opts, action, [b'rev', b'source', b'base', b'dest'] | opts, action, ['rev', 'source', 'base', 'dest'] | ||||
| ) | ) | ||||
| cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') | cmdutil.check_at_most_one_arg(opts, 'confirm', 'dry_run') | ||||
| cmdutil.check_at_most_one_arg(opts, b'rev', b'source', b'base') | cmdutil.check_at_most_one_arg(opts, 'rev', 'source', 'base') | ||||
| if action or repo.currenttransaction() is not None: | if action or repo.currenttransaction() is not None: | ||||
| # in-memory rebase is not compatible with resuming rebases. | # in-memory rebase is not compatible with resuming rebases. | ||||
| # (Or if it is run within a transaction, since the restart logic can | # (Or if it is run within a transaction, since the restart logic can | ||||
| # fail the entire transaction.) | # fail the entire transaction.) | ||||
| inmemory = False | inmemory = False | ||||
| if opts.get(b'auto_orphans'): | if opts.get('auto_orphans'): | ||||
| disallowed_opts = set(opts) - {b'auto_orphans'} | disallowed_opts = set(opts) - {'auto_orphans'} | ||||
| cmdutil.check_incompatible_arguments( | cmdutil.check_incompatible_arguments( | ||||
| opts, b'auto_orphans', disallowed_opts | opts, 'auto_orphans', disallowed_opts | ||||
| ) | ) | ||||
| userrevs = list(repo.revs(opts.get(b'auto_orphans'))) | userrevs = list(repo.revs(opts.get('auto_orphans'))) | ||||
| opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)] | opts['rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)] | ||||
| opts[b'dest'] = b'_destautoorphanrebase(SRC)' | opts['dest'] = b'_destautoorphanrebase(SRC)' | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| if opts.get(b'dry_run') or opts.get(b'confirm'): | if opts.get(b'dry_run') or opts.get(b'confirm'): | ||||
| return _dryrunrebase(ui, repo, action, opts) | return _dryrunrebase(ui, repo, action, opts) | ||||
| elif action == b'stop': | elif action == 'stop': | ||||
| rbsrt = rebaseruntime(repo, ui) | rbsrt = rebaseruntime(repo, ui) | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| rbsrt.restorestatus() | rbsrt.restorestatus() | ||||
| if rbsrt.collapsef: | if rbsrt.collapsef: | ||||
| raise error.StateError(_(b"cannot stop in --collapse session")) | raise error.StateError(_(b"cannot stop in --collapse session")) | ||||
| allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | ||||
| if not (rbsrt.keepf or allowunstable): | if not (rbsrt.keepf or allowunstable): | ||||
| raise error.StateError( | raise error.StateError( | ||||
| def _dorebase(ui, repo, action, opts, inmemory=False): | def _dorebase(ui, repo, action, opts, inmemory=False): | ||||
| rbsrt = rebaseruntime(repo, ui, inmemory, opts=opts) | rbsrt = rebaseruntime(repo, ui, inmemory, opts=opts) | ||||
| return _origrebase(ui, repo, action, opts, rbsrt) | return _origrebase(ui, repo, action, opts, rbsrt) | ||||
| def _origrebase(ui, repo, action, opts, rbsrt): | def _origrebase(ui, repo, action, opts, rbsrt): | ||||
| assert action != b'stop' | assert action != 'stop' | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| if opts.get(b'interactive'): | if opts.get(b'interactive'): | ||||
| try: | try: | ||||
| if extensions.find(b'histedit'): | if extensions.find(b'histedit'): | ||||
| enablehistedit = b'' | enablehistedit = b'' | ||||
| except KeyError: | except KeyError: | ||||
| enablehistedit = b" --config extensions.histedit=" | enablehistedit = b" --config extensions.histedit=" | ||||
| help = b"hg%s help -e histedit" % enablehistedit | help = b"hg%s help -e histedit" % enablehistedit | ||||
| _(b'message can only be specified with collapse') | _(b'message can only be specified with collapse') | ||||
| ) | ) | ||||
| if action: | if action: | ||||
| if rbsrt.collapsef: | if rbsrt.collapsef: | ||||
| raise error.InputError( | raise error.InputError( | ||||
| _(b'cannot use collapse with continue or abort') | _(b'cannot use collapse with continue or abort') | ||||
| ) | ) | ||||
| if action == b'abort' and opts.get(b'tool', False): | if action == 'abort' and opts.get(b'tool', False): | ||||
| ui.warn(_(b'tool option will be ignored\n')) | ui.warn(_(b'tool option will be ignored\n')) | ||||
| if action == b'continue': | if action == 'continue': | ||||
| ms = mergestatemod.mergestate.read(repo) | ms = mergestatemod.mergestate.read(repo) | ||||
| mergeutil.checkunresolved(ms) | mergeutil.checkunresolved(ms) | ||||
| retcode = rbsrt._prepareabortorcontinue( | retcode = rbsrt._prepareabortorcontinue(isabort=(action == 'abort')) | ||||
| isabort=(action == b'abort') | |||||
| ) | |||||
| if retcode is not None: | if retcode is not None: | ||||
| return retcode | return retcode | ||||
| else: | else: | ||||
| # search default destination in this space | # search default destination in this space | ||||
| # used in the 'hg pull --rebase' case, see issue 5214. | # used in the 'hg pull --rebase' case, see issue 5214. | ||||
| destspace = opts.get(b'_destspace') | destspace = opts.get(b'_destspace') | ||||
| destmap = _definedestmap( | destmap = _definedestmap( | ||||
| ui, | ui, | ||||