pulkit added inline comments.

INLINE COMMENTS

> commands.py:151
>          raise error.Abort(_('no operation in progress'))
> +    if abortstate._opname == 'merge':
> +        return hg.merge(repo, abort=True)

let's refactor some code and create a function for merge abort instead of 
special casing it.

> hg.py:963
>      else:
>          ms = mergemod.mergestate.read(repo)
>          if ms.active():

We can compute node required here again, and hence take this abort related code 
into a separate function.

REPOSITORY
  rHG Mercurial

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

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

To: taapas1128, #hg-reviewers
Cc: pulkit, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to