D6503: statecheck: added support for STATES

taapas1128 (Taapas Agrawal) phabricator at mercurial-scm.org
Thu Jun 13 17:51:24 EDT 2019


taapas1128 added a comment.


  @martinvonz @pulkit passing `merge` through `checkunfinished()` with the correct `allowcommit` flag  has led to change in the tests most of which are positive and the merge in progress which were detected by separate methods earlier can be detected  by `checkunfinished()` alone. The only test that has given negative results in `test-strip.t`. I will try to improve that too.

INLINE COMMENTS

> martinvonz wrote in state.py:147
> Yes, I agree with doing it here. It wasn't used before, so it wasn't clear then why it would be needed or how it would be used.
> 
> But actually, it still doesn't seem to be used. Should it be removed?

removed that

> state.py:148
> +
> +def addunfinished(**cmddata):
> +    """this accepts a dict having command data, makes a statecheck object and

@martinvonz have a look this is making sure bisect and merge stays the last.

> state.py:188
> +    'cmdname': 'merge',
> +    'fname': None,
> +    'clearable': True,

merge fname set to None .

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


More information about the Mercurial-devel mailing list