D6503: statecheck: added support for STATES

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> state.py:134
> +
> +    def hint(self, status=False):
>          """returns the hint message corresponding to the command"""

This function shares no functionality between the `status=False` and `status=True` cases and the callers all seem to know which version they want to call (no dynamic switching between the two), so it would be better to have two separate functions.

> state.py:199
> +                 'To abort:       hg merge --abort'),
> +    cmdhint=_("use 'hg commit' or 'hg merge --abort'")
> +)

I think we should pass `cmdmsg='outstanding uncommitted merge'` here so we affect existing tests as little as possible.

> test-graft.t:284
>    # To abort:       hg graft --abort
> +  # To stop:        hg graft --stop
>    

What caused this change?

> test-merge1.t:52
> +  
> +  # use 'hg update' to get a consistent checkout
> +  

This should use the multi-line style

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