mercurial/cmd_impls/graft.py
changeset 52335 0b52283d50bb
parent 52334 77cb5d8643b3
child 52336 8faabe8abf66
equal deleted inserted replaced
52334:77cb5d8643b3 52335:0b52283d50bb
    43     statedata = {}
    43     statedata = {}
    44     # list of new nodes created by ongoing graft
    44     # list of new nodes created by ongoing graft
    45     statedata[b'newnodes'] = []
    45     statedata[b'newnodes'] = []
    46 
    46 
    47     cmdutil.resolve_commit_options(ui, opts)
    47     cmdutil.resolve_commit_options(ui, opts)
    48 
       
    49     editor = cmdutil.getcommiteditor(editform=b'graft', **opts)
       
    50 
    48 
    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
    54     if opts.get('no_commit'):
    52     if opts.get('no_commit'):
   218                     )
   216                     )
   219                     revs.remove(r)
   217                     revs.remove(r)
   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)
   226 
   225 
   227 
   226