D6503: statecheck: added support for STATES

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Mon Jun 17 00:44:37 EDT 2019


martinvonz added a comment.


  In D6503#94684 <https://phab.mercurial-scm.org/D6503#94684>, @taapas1128 wrote:
  
  > @martinvonz I haven't changed anything regarding rebase and update on interrupted states hence not added any tests.
  
  Ah, because those were already in both `unfinishedstates` and in `STATES`. I assume there are still some small functional changes. For example, `hg status -v` should now mentioning an unfinished transplant operation (the transplant extension added an entry to `unfinishedstates`, but it wasn't in `STATES`).

INLINE COMMENTS

> martinvonz wrote in state.py:215
> I know. That's what I tried to explain. I suggested different solutions. Can you explain why they won't work or why they're worse?

Why was the comment above marked as done? Did I just miss the answer?

> state.py:154
>      statecheckobj = statecheck(**cmddata)
> -    unfinishedstates.append(statecheckobj)
> +    if cmdname=='merge' or cmdname=='bisect':
> +        unfinishedstates.append(statecheckobj)

Why does bisect have to be treated differently?

> test-graft.t:281
>    
> -  # To continue:    hg graft --continue
> -  # To abort:       hg graft --abort
> +  # use 'hg graft --continue' or 'hg graft --stop' to stop
>    

I think we probably we want separate messages for morestatus and checkunfinished so this doesn't have to change.

> test-strip.t:276
>    $ hg strip 4
> -  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> -  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
> +  abort: merge in progress
> +  (To continue:    hg commit

This doesn't seem right. Did you forget to update this patch after your other patch got landed?

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