Show More
@@ -46,8 +46,6 def _process_args(ui, repo, *revs, **opt | |||||
46 |
|
46 | |||
47 | cmdutil.resolve_commit_options(ui, opts) |
|
47 | cmdutil.resolve_commit_options(ui, opts) | |
48 |
|
48 | |||
49 | editor = cmdutil.getcommiteditor(editform=b'graft', **opts) |
|
|||
50 |
|
||||
51 | cmdutil.check_at_most_one_arg(opts, 'abort', 'stop', 'continue') |
|
49 | cmdutil.check_at_most_one_arg(opts, 'abort', 'stop', 'continue') | |
52 |
|
50 | |||
53 | cont = False |
|
51 | cont = False | |
@@ -220,6 +218,7 def _process_args(ui, repo, *revs, **opt | |||||
220 | if not revs: |
|
218 | if not revs: | |
221 | return "ERROR", None, None |
|
219 | return "ERROR", None, None | |
222 |
|
220 | |||
|
221 | editor = cmdutil.getcommiteditor(editform=b'graft', **opts) | |||
223 | dry_run = bool(opts.get("dry_run")) |
|
222 | dry_run = bool(opts.get("dry_run")) | |
224 | tool = opts.get('tool', b'') |
|
223 | tool = opts.get('tool', b'') | |
225 | return "GRAFT", graftstate, (statedata, revs, editor, cont, dry_run, tool) |
|
224 | return "GRAFT", graftstate, (statedata, revs, editor, cont, dry_run, tool) |
General Comments 0
You need to be logged in to leave comments.
Login now