| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (13 lines) | |||
| M | tests/test-graft-interrupted.t (6 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| statedata[b'newnodes'] = [] | statedata[b'newnodes'] = [] | ||||
| cmdutil.resolvecommitoptions(ui, opts) | cmdutil.resolvecommitoptions(ui, opts) | ||||
| editor = cmdutil.getcommiteditor( | editor = cmdutil.getcommiteditor( | ||||
| editform=b'graft', **pycompat.strkwargs(opts) | editform=b'graft', **pycompat.strkwargs(opts) | ||||
| ) | ) | ||||
| cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') | |||||
| cont = False | cont = False | ||||
| if opts.get(b'no_commit'): | if opts.get(b'no_commit'): | ||||
| if opts.get(b'edit'): | if opts.get(b'edit'): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b"cannot specify --no-commit and --edit together") | _(b"cannot specify --no-commit and --edit together") | ||||
| ) | ) | ||||
| if opts.get(b'currentuser'): | if opts.get(b'currentuser'): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b"cannot specify --no-commit and --currentuser together") | _(b"cannot specify --no-commit and --currentuser together") | ||||
| ) | ) | ||||
| if opts.get(b'currentdate'): | if opts.get(b'currentdate'): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b"cannot specify --no-commit and --currentdate together") | _(b"cannot specify --no-commit and --currentdate together") | ||||
| ) | ) | ||||
| if opts.get(b'log'): | if opts.get(b'log'): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b"cannot specify --no-commit and --log together") | _(b"cannot specify --no-commit and --log together") | ||||
| ) | ) | ||||
| graftstate = statemod.cmdstate(repo, b'graftstate') | graftstate = statemod.cmdstate(repo, b'graftstate') | ||||
| if opts.get(b'stop'): | if opts.get(b'stop'): | ||||
| if opts.get(b'continue'): | |||||
| raise error.Abort( | |||||
| _(b"cannot use '--continue' and '--stop' together") | |||||
| ) | |||||
| if opts.get(b'abort'): | |||||
| raise error.Abort(_(b"cannot use '--abort' and '--stop' together")) | |||||
| if any( | if any( | ||||
| ( | ( | ||||
| opts.get(b'edit'), | opts.get(b'edit'), | ||||
| opts.get(b'log'), | opts.get(b'log'), | ||||
| opts.get(b'user'), | opts.get(b'user'), | ||||
| opts.get(b'date'), | opts.get(b'date'), | ||||
| opts.get(b'currentdate'), | opts.get(b'currentdate'), | ||||
| opts.get(b'currentuser'), | opts.get(b'currentuser'), | ||||
| opts.get(b'rev'), | opts.get(b'rev'), | ||||
| ) | ) | ||||
| ): | ): | ||||
| raise error.Abort(_(b"cannot specify any other flag with '--stop'")) | raise error.Abort(_(b"cannot specify any other flag with '--stop'")) | ||||
| return _stopgraft(ui, repo, graftstate) | return _stopgraft(ui, repo, graftstate) | ||||
| elif opts.get(b'abort'): | elif opts.get(b'abort'): | ||||
| if opts.get(b'continue'): | |||||
| raise error.Abort( | |||||
| _(b"cannot use '--continue' and '--abort' together") | |||||
| ) | |||||
| if any( | if any( | ||||
| ( | ( | ||||
| opts.get(b'edit'), | opts.get(b'edit'), | ||||
| opts.get(b'log'), | opts.get(b'log'), | ||||
| opts.get(b'user'), | opts.get(b'user'), | ||||
| opts.get(b'date'), | opts.get(b'date'), | ||||
| opts.get(b'currentdate'), | opts.get(b'currentdate'), | ||||
| opts.get(b'currentuser'), | opts.get(b'currentuser'), | ||||
| grafting 3:9150fe93bec6 "added d" | grafting 3:9150fe93bec6 "added d" | ||||
| merging d | merging d | ||||
| warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | ||||
| abort: unresolved conflicts, can't continue | abort: unresolved conflicts, can't continue | ||||
| (use 'hg resolve' and 'hg graft --continue') | (use 'hg resolve' and 'hg graft --continue') | ||||
| [1] | [1] | ||||
| $ hg graft --stop --continue | $ hg graft --stop --continue | ||||
| abort: cannot use '--continue' and '--stop' together | abort: cannot specify both --stop and --continue | ||||
| [255] | [255] | ||||
| $ hg graft --stop -U | $ hg graft --stop -U | ||||
| abort: cannot specify any other flag with '--stop' | abort: cannot specify any other flag with '--stop' | ||||
| [255] | [255] | ||||
| $ hg graft --stop --rev 4 | $ hg graft --stop --rev 4 | ||||
| abort: cannot specify any other flag with '--stop' | abort: cannot specify any other flag with '--stop' | ||||
| [255] | [255] | ||||
| grafting 5:36b793615f78 "added foo to c" (tip) | grafting 5:36b793615f78 "added foo to c" (tip) | ||||
| merging c | merging c | ||||
| warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | ||||
| abort: unresolved conflicts, can't continue | abort: unresolved conflicts, can't continue | ||||
| (use 'hg resolve' and 'hg graft --continue') | (use 'hg resolve' and 'hg graft --continue') | ||||
| [1] | [1] | ||||
| $ hg graft --continue --abort | $ hg graft --continue --abort | ||||
| abort: cannot use '--continue' and '--abort' together | abort: cannot specify both --abort and --continue | ||||
| [255] | [255] | ||||
| $ hg graft --abort --stop | $ hg graft --abort --stop | ||||
| abort: cannot use '--abort' and '--stop' together | abort: cannot specify both --abort and --stop | ||||
| [255] | [255] | ||||
| $ hg graft --abort --currentuser | $ hg graft --abort --currentuser | ||||
| abort: cannot specify any other flag with '--abort' | abort: cannot specify any other flag with '--abort' | ||||
| [255] | [255] | ||||
| $ hg graft --abort --edit | $ hg graft --abort --edit | ||||
| abort: cannot specify any other flag with '--abort' | abort: cannot specify any other flag with '--abort' | ||||