D6607: merge: disallow merge abort in case of an unfinished operation(issue6160)

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> commands.py:4017
> +    unfinishedstate = None
> +    for state in statemod._unfinishedstates:
> +        if state.isunfinished(repo):

We should first check `if abort` before performing this loop instead of checking later.

> commands.py:4019
> +        if state.isunfinished(repo):
> +            unfinishedstate = state
> +            if abort and unfinishedstate._opname != 'merge':

we don't need to create a new variable. We can operate on `state` below.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6607/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6607

To: taapas1128, #hg-reviewers
Cc: pulkit, mercurial-devel