D6503: statecheck: added support for STATES

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> state.py:208
> +
> +def checkunfinished(repo, commit=False, mergeskip=False):
>      '''Look for an unfinished multistep operation, like graft, and abort

nit: s/mergeskip/skipmerge/ perhaps?

> test-shelve.t:1156
>    $ hg unshelve
> -  abort: cannot unshelve while merging
> +  abort: outstanding uncommitted merge
> +  (use 'hg commit' or 'hg merge --abort')

Don't forget to add patch that cleans up `shelve.py` to not handle the merge case explicitly (unless it's still needed there for some reason). The same applies to mq.

REPOSITORY
  rHG Mercurial

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

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

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