3086 with repo.wlock(): |
3086 with repo.wlock(): |
3087 return _dograft(ui, repo, *revs, **opts) |
3087 return _dograft(ui, repo, *revs, **opts) |
3088 |
3088 |
3089 |
3089 |
3090 def _dograft(ui, repo, *revs, **opts): |
3090 def _dograft(ui, repo, *revs, **opts): |
3091 opts = pycompat.byteskwargs(opts) |
3091 if revs and opts.get('rev'): |
3092 if revs and opts.get(b'rev'): |
|
3093 ui.warn( |
3092 ui.warn( |
3094 _( |
3093 _( |
3095 b'warning: inconsistent use of --rev might give unexpected ' |
3094 b'warning: inconsistent use of --rev might give unexpected ' |
3096 b'revision ordering!\n' |
3095 b'revision ordering!\n' |
3097 ) |
3096 ) |
3098 ) |
3097 ) |
3099 |
3098 |
3100 revs = list(revs) |
3099 revs = list(revs) |
3101 revs.extend(opts.get(b'rev')) |
3100 revs.extend(opts.get('rev')) |
3102 # a dict of data to be stored in state file |
3101 # a dict of data to be stored in state file |
3103 statedata = {} |
3102 statedata = {} |
3104 # list of new nodes created by ongoing graft |
3103 # list of new nodes created by ongoing graft |
3105 statedata[b'newnodes'] = [] |
3104 statedata[b'newnodes'] = [] |
3106 |
3105 |
|
3106 opts = pycompat.byteskwargs(opts) |
3107 cmdutil.resolvecommitoptions(ui, opts) |
3107 cmdutil.resolvecommitoptions(ui, opts) |
3108 |
3108 |
3109 editor = cmdutil.getcommiteditor( |
3109 editor = cmdutil.getcommiteditor( |
3110 editform=b'graft', **pycompat.strkwargs(opts) |
3110 editform=b'graft', **pycompat.strkwargs(opts) |
3111 ) |
3111 ) |