D6503: statecheck: added support for STATES

Closed by commit rHG12243f15d53e: statecheck: added support for STATES (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15641=15684 CHANGES SINCE

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15641. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15614=15641 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

martinvonz added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:100-102 > We should probably put all the boolean options together and the message > overrides together (as they already are). Maybe move `stopflag` and > `reportonly` before `cmdmsg`? Could you move `stopflag`

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15614. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15610=15614 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 added inline comments. taapas1128 marked an inline comment as done. INLINE COMMENTS > martinvonz wrote in rebase.py:1954-1955 > It seems like this should also be unified with the new tracking of unfinished > operations. Will you have time to look into that after the current series?

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15610. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15597=15610 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

This revision is now accepted and ready to land. martinvonz added inline comments. martinvonz accepted this revision. INLINE COMMENTS > rebase.py:1954-1955 > +statemod.addunfinished('rebase', fname='rebasestate', stopflag=True) > cmdutil.afterresolvedstates.append( >

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15597. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15589=15597 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 added a comment. taapas1128 marked 2 inline comments as done. okay I will send seperate patches for them right away . The amends in this are done. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL

D6503: statecheck: added support for STATES

martinvonz added inline comments. INLINE COMMENTS > taapas1128 wrote in test-shelve.t:1156 > as a seperate patch after this right ? Yes, separate patch (or two, probably, since both mq and shelve seem possible to clean up) after this one. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in test-shelve.t:1156 > 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. as a seperate patch after

D6503: statecheck: added support for STATES

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:

D6503: statecheck: added support for STATES

martinvonz added inline comments. INLINE COMMENTS > taapas1128 wrote in test-graft.t:284 > the `stopflag`. Since graft supports `--stop`. It should be displayed in `hg > status --verbose` and similar should happen with any extension in future > which supports `--stop`. Oh, I had not noticed

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > state.py:167 > +""" > +if self._opname == 'merge': > +return len(repo[None].parents()) > 1 removed bisect from here . @martinvonz have a look. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15589. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15588=15589 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:154 > But what fails if we don't have it here? No tests fail. I see we got a `reportonly` flag. So it's not needed anymore. Sorry about that. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15588. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15587=15588 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in test-graft.t:284 > What caused this change? the `stopflag`. Since graft supports `--stop`. It should be displayed in `hg status --verbose` and similar should happen with any extension in future which supports `--stop`. >

D6503: statecheck: added support for STATES

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

D6503: statecheck: added support for STATES

taapas1128 added a comment. taapas1128 marked 3 inline comments as done. I forgot to add tests for hg status -v case of interrupted update. That is added now. INLINE COMMENTS > martinvonz wrote in state.py:215 > Note that I didn't suggest changing `getrepostate()` -- I said (or tried to >

D6503: statecheck: added support for STATES

taapas1128 edited the summary of this revision. taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 15587. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15584=15587 CHANGES SINCE LAST ACTION

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15584. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15581=15584 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 15581. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15565=15581 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL

D6503: statecheck: added support for STATES

martinvonz added inline comments. INLINE COMMENTS > taapas1128 wrote in state.py:215 > the special handling is given so that `checkunfinished()` and > `clearunfinished()` bypass `bisect` completely.(see line 93 D6501 > the comment above unfinishedstates)

D6503: statecheck: added support for STATES

taapas1128 added inline comments. taapas1128 marked 3 inline comments as done. INLINE COMMENTS > martinvonz wrote in state.py:215 > I can see that `getrepostate()` is unchanged, but I cannot see that > `checkunfinished()` is unchanged (line 187 includes `'bisect'` in the version > I'm looking

D6503: statecheck: added support for STATES

martinvonz added inline comments. INLINE COMMENTS > strip.py:49-61 > def checklocalchanges(repo, force=False, excsuffix=''): > -statemod.checkunfinished(repo) > s = repo.status() > if not force: > -if len(repo[None].parents()) > 1: > -_("outstanding uncommitted

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15565. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15556=15565 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in test-graft.t:281 > We generally (always?) use a short lowercase message for the hint. I'm not > sure we want to change that. OTOH, I also don't want to make the morestatus > (`hg status -v`) output inconsistent like this

D6503: statecheck: added support for STATES

taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 15556. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=1=15556 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL

D6503: statecheck: added support for STATES

taapas1128 added a comment. > we should keep this message, can you see how we can prevent this change? amended that. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 To: taapas1128,

D6503: statecheck: added support for STATES

pulkit added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:154 > @pulkit, can you explain why bisect needs to be last? Because we can have a unresolved bisect state and unresolved rebase/histedit/evolve/graft or even merge state at the same time. > test-rebase-pull.t:119 > -

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 1. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15553=1 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:215 > Why was the comment above marked as done? Did I just miss the answer? because the hard-coded values were removed. And regarding bisect as you can see nothing has been changed it is not handled by

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15553. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15541=15553 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

martinvonz added inline comments. INLINE COMMENTS > taapas1128 wrote in state.py:154 > This was suggested by @pulkit to keep bisect last too. @pulkit, can you explain why bisect needs to be last? > taapas1128 wrote in test-graft.t:281 > In D6504 is not

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15541. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15539=15541 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 added a comment. > 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

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15539. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15537=15539 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 marked an inline comment as not done. taapas1128 updated this revision to Diff 15537. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15529=15537 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in test-graft.t:281 > I think we probably we want separate messages for morestatus and > checkunfinished so this doesn't have to change. In D6504 is not the message method alright?

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:154 > Why does bisect have to be treated differently? This was suggested by @pulkit to keep bisect last too. > martinvonz wrote in test-strip.t:276 > This doesn't seem right. Did you forget to update this patch

D6503: statecheck: added support for STATES

martinvonz added a comment. In 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

D6503: statecheck: added support for STATES

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15529. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15516=15529 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15516. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15506=15516 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

pulkit added a comment. This patch does multiple things, 1. improve how states are registered 2. move STATES to cmdutil it will be nice if we take 1) out and amend that into the initial patch which introduced how states are registered. REPOSITORY rHG Mercurial CHANGES SINCE

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15506. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15503=15506 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

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

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15503. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15501=15503 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15501. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15499=15501 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15499. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15497=15499 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15497. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15480=15497 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > cmdutil.py:622 > > +def addunfinished(**cmddata): > +cmdname = cmddata['cmdname'] @martinvonz have a look this is making sure bisect and merge stays the last. > taapas1128 wrote in state.py:174 > I went through the code this is

D6503: statecheck: added support for STATES

Herald added a reviewer: martinvonz. Herald added a subscriber: mjpieters. taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15480. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15440=15480 CHANGES SINCE

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:174 > So what happens if we check merge state too here? I know we didn't do it > before, but would it make sense to do it? It would probably belong in a > separate patch if we did it. I went through the code this

D6503: statecheck: added support for STATES

taapas1128 added a comment. taapas1128 marked an inline comment as done. yes, they do . as they did earlier no extra case has been generated. INLINE COMMENTS > martinvonz wrote in state.py:161 > I know that's what you did regarding merge (as I said). I suggested a > different solution (or

D6503: statecheck: added support for STATES

martinvonz added a comment. In D6503#94684 , @taapas1128 wrote: > @martinvonz I haven't changed anything regarding rebase and update on interrupted states hence not added any tests. Do those commands call checkunfinished? INLINE COMMENTS

[Differential] D6503: statecheck: added support for STATES

taapas1128 added a comment. taapas1128 marked an inline comment as not done. @martinvonz I haven't changed anything regarding rebase and update on interrupted states hence not added any tests. INLINE COMMENTS > martinvonz wrote in state.py:161 > Did you mean None instead of 'None'? I will

[Differential] D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:161 > There was a comment somewhere saying that merge has to come last. It seems > merge is no longer last and you've solved it by checking specifically for > 'merge' in many places. I think it would be better to

[Differential] D6503: statecheck: added support for STATES

martinvonz added a comment. > Results of tests are shown. Are there other functional changes that are not shown? For example, was it previously allowed to do some operations (update?) during an interrupted rebase that are no longer allowed? INLINE COMMENTS > taapas1128 wrote in

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15440. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15428=15440 REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FILES mercurial/cmdutil.py mercurial/state.py tests/test-graft.t

D6503: statecheck: added support for STATES

taapas1128 added a subscriber: martinvonz. taapas1128 added inline comments. INLINE COMMENTS > pulkit wrote in state.py:186 > the previous patch moves all this code, and this patch just removes it > mostly. I think we can prevent the code-movement then. Yes but this is according to the

D6503: statecheck: added support for STATES

pulkit added inline comments. INLINE COMMENTS > state.py:186 > - > -def _helpmessage(continuecmd, abortcmd): > -msg = _('To continue:%s\n' the previous patch moves all this code, and this patch just removes it mostly. I think we can prevent the code-movement then. REPOSITORY rHG

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15428. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15426=15428 REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FILES mercurial/cmdutil.py mercurial/state.py tests/test-graft.t

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15426. taapas1128 marked an inline comment as done. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15414=15426 REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FILES mercurial/cmdutil.py

D6503: statecheck: added support for STATES

taapas1128 marked 3 inline comments as done. taapas1128 added inline comments. INLINE COMMENTS > pulkit wrote in state.py:147 > This change should be a part of patch where isunfinished was introduced. mergecheck is introduced in this patch now so now this change must be okay I suppose.

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15414. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15408=15414 REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FILES mercurial/cmdutil.py mercurial/state.py tests/test-graft.t

D6503: statecheck: added support for STATES

pulkit added inline comments. INLINE COMMENTS > state.py:147 > > def isunfinished(self, repo, mergecheck=False): > +"""determines whether a multi-step operation is in progress This change should be a part of patch where isunfinished was introduced. > state.py:158 >

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15408. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15405=15408 REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FILES mercurial/cmdutil.py mercurial/state.py tests/test-graft.t

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15405. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15395=15405 REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FILES mercurial/cmdutil.py mercurial/state.py tests/test-graft.t

D6503: statecheck: added support for STATES

taapas1128 created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This removes `STATES` from `state.py` and adds support to `statecheck` class to handle its features. `getrepostate()`