Show More
@@ -4089,12 +4089,12 b' def graft(ui, repo, *revs, **opts):' | |||
|
4089 | 4089 | return _dograft(ui, repo, *revs, **opts) |
|
4090 | 4090 | |
|
4091 | 4091 | def _dograft(ui, repo, *revs, **opts): |
|
4092 |
if revs and opts |
|
|
4092 | if revs and opts.get('rev'): | |
|
4093 | 4093 | ui.warn(_('warning: inconsistent use of --rev might give unexpected ' |
|
4094 | 4094 | 'revision ordering!\n')) |
|
4095 | 4095 | |
|
4096 | 4096 | revs = list(revs) |
|
4097 |
revs.extend(opts |
|
|
4097 | revs.extend(opts.get('rev')) | |
|
4098 | 4098 | |
|
4099 | 4099 | if not opts.get('user') and opts.get('currentuser'): |
|
4100 | 4100 | opts['user'] = ui.username() |
@@ -4104,7 +4104,7 b' def _dograft(ui, repo, *revs, **opts):' | |||
|
4104 | 4104 | editor = cmdutil.getcommiteditor(editform='graft', **opts) |
|
4105 | 4105 | |
|
4106 | 4106 | cont = False |
|
4107 |
if opts |
|
|
4107 | if opts.get('continue'): | |
|
4108 | 4108 | cont = True |
|
4109 | 4109 | if revs: |
|
4110 | 4110 | raise error.Abort(_("can't specify --continue and revisions")) |
General Comments 0
You need to be logged in to leave comments.
Login now