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