| hg-reviewers |
This will make upcoming patch where we introduce a new elif for the abort case
more readable. Also added a new line before the if-else starts.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (3 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Pulkit Goyal | Jun 14 2018, 5:16 PM |
| if not opts.get('date') and opts.get('currentdate'): | if not opts.get('date') and opts.get('currentdate'): | ||||
| opts['date'] = "%d %d" % dateutil.makedate() | opts['date'] = "%d %d" % dateutil.makedate() | ||||
| editor = cmdutil.getcommiteditor(editform='graft', | editor = cmdutil.getcommiteditor(editform='graft', | ||||
| **pycompat.strkwargs(opts)) | **pycompat.strkwargs(opts)) | ||||
| cont = False | cont = False | ||||
| graftstate = statemod.cmdstate(repo, 'graftstate') | graftstate = statemod.cmdstate(repo, 'graftstate') | ||||
| if opts.get('stop'): | if opts.get('stop'): | ||||
| if opts.get('continue'): | if opts.get('continue'): | ||||
| raise error.Abort(_("cannot use '--continue' and " | raise error.Abort(_("cannot use '--continue' and " | ||||
| "'--stop' together")) | "'--stop' together")) | ||||
| if any((opts.get('edit'), opts.get('log'), opts.get('user'), | if any((opts.get('edit'), opts.get('log'), opts.get('user'), | ||||
| opts.get('date'), opts.get('currentdate'), | opts.get('date'), opts.get('currentdate'), | ||||
| opts.get('currentuser'), opts.get('rev'))): | opts.get('currentuser'), opts.get('rev'))): | ||||
| raise error.Abort(_("cannot specify any other flag with '--stop'")) | raise error.Abort(_("cannot specify any other flag with '--stop'")) | ||||
| return _stopgraft(ui, repo, graftstate) | return _stopgraft(ui, repo, graftstate) | ||||
| if opts.get('continue'): | elif opts.get('continue'): | ||||
| cont = True | cont = True | ||||
| if revs: | if revs: | ||||
| raise error.Abort(_("can't specify --continue and revisions")) | raise error.Abort(_("can't specify --continue and revisions")) | ||||
| # read in unfinished revisions | # read in unfinished revisions | ||||
| if graftstate.exists(): | if graftstate.exists(): | ||||
| statedata = _readgraftstate(repo, graftstate) | statedata = _readgraftstate(repo, graftstate) | ||||
| if statedata.get('date'): | if statedata.get('date'): | ||||
| opts['date'] = statedata['date'] | opts['date'] = statedata['date'] | ||||