equal
deleted
inserted
replaced
3950 opts = pycompat.byteskwargs(opts) |
3950 opts = pycompat.byteskwargs(opts) |
3951 abort = opts.get('abort') |
3951 abort = opts.get('abort') |
3952 if abort and repo.dirstate.p2() == nullid: |
3952 if abort and repo.dirstate.p2() == nullid: |
3953 cmdutil.wrongtooltocontinue(repo, _('merge')) |
3953 cmdutil.wrongtooltocontinue(repo, _('merge')) |
3954 if abort: |
3954 if abort: |
|
3955 state = cmdutil.getunfinishedstate(repo) |
|
3956 if state and state._opname != 'merge': |
|
3957 raise error.Abort(_('cannot abort merge with %s in progress') % |
|
3958 (state._opname), hint=state.hint()) |
3955 if node: |
3959 if node: |
3956 raise error.Abort(_("cannot specify a node with --abort")) |
3960 raise error.Abort(_("cannot specify a node with --abort")) |
3957 if opts.get('rev'): |
3961 if opts.get('rev'): |
3958 raise error.Abort(_("cannot specify both --rev and --abort")) |
3962 raise error.Abort(_("cannot specify both --rev and --abort")) |
3959 if opts.get('preview'): |
3963 if opts.get('preview'): |