D7705: phases: make the working directory consistently a draft

rdamazio added a comment. x REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7705/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7705 To: rdamazio, #hg-reviewers, marmoute Cc: yuja, marmoute, mercurial-devel

D7705: phases: make the working directory consistently a draft

rdamazio added a comment. In D7705#114943 , @yuja wrote: >> @@ -252,25 +254,44 @@ >> >> revs = set.union(*[self._phasesets[p] for p in phases]) >> if repo.changelog.filteredrevs: >> revs = revs -

D7705: phases: make the working directory consistently a draft

yuja added a comment. > @@ -252,25 +254,44 @@ > > revs = set.union(*[self._phasesets[p] for p in phases]) > if repo.changelog.filteredrevs: > revs = revs - repo.changelog.filteredrevs > > + > > if subset is None: > return smartset.baseset(revs) >

Re: D7705: phases: make the working directory consistently a draft

> @@ -252,25 +254,44 @@ > revs = set.union(*[self._phasesets[p] for p in phases]) > if repo.changelog.filteredrevs: > revs = revs - repo.changelog.filteredrevs > + > if subset is None: > return smartset.baseset(revs) >

D7705: phases: make the working directory consistently a draft

Closed by commit rHG2ab225377c27: phases: make the working directory consistently a draft (authored by rdamazio). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG

D7705: phases: make the working directory consistently a draft

marmoute added a comment. marmoute accepted this revision. Looks good to me REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7705/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7705 To: rdamazio, #hg-reviewers, marmoute Cc: marmoute,

D7705: phases: make the working directory consistently a draft

rdamazio added a comment. In D7705#114157 , @marmoute wrote: > In D7705#114045 , @rdamazio wrote: > >> I don't understand what you're asking me to do here, can you clarify? > > In short we

D7705: phases: make the working directory consistently a draft

rdamazio updated this revision to Diff 19050. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7705?vs=18921=19050 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7705/new/ REVISION DETAIL

D7705: phases: make the working directory consistently a draft

marmoute added a comment. In D7705#114045 , @rdamazio wrote: > In D7705#113845 , @marmoute wrote: > >> I simply sent this. If am I following your changeset right, we should have `wdir()` match

D7705: phases: make the working directory consistently a draft

rdamazio added a comment. In D7705#113845 , @marmoute wrote: > I simply sent this. If am I following your changeset right, we should have `wdir()` match `draft()` or `secret()` according to the projected phase (config + parent) I don't

D7705: phases: make the working directory consistently a draft

marmoute added a comment. I simply sent this. If am I following your changeset right, we should have `wdir()` match `draft()` or `secret()` according to the projected phase (config + parent) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7705/new/

D7705: phases: make the working directory consistently a draft

rdamazio added a comment. > commitablectx code seems wrong here. I am sending a patch. Sure. Let me know if your patch is going to somehow cover the use case I'm trying to address here, or what else you'd like me to do with this patch (is it just a matter of adding more tests here to

D7705: phases: make the working directory consistently a draft

marmoute added a comment. In D7705#113667 , @rdamazio wrote: > In D7705#113383 , @marmoute wrote: > >> The working copy is not necessarly draft phase. For example, it will be secret is the

D7705: phases: make the working directory consistently a draft

rdamazio added a comment. In D7705#113383 , @marmoute wrote: > The working copy is not necessarly draft phase. For example, it will be secret is the working copy parent is secret. One can also control it using the `phases.new-commit` config.

D7705: phases: make the working directory consistently a draft

rdamazio updated this revision to Diff 18921. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7705?vs=18878=18921 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7705/new/ REVISION DETAIL

D7705: phases: make the working directory consistently a draft

marmoute added a comment. The working copy is not necessarly draft phase. For example, it will be secret is the working copy parent is secret. One can also control it using the `phases.new-commit` config. The `mercurial.phases.newcommitphase(ui)` function can help you there. REPOSITORY

D7705: phases: make the working directory consistently a draft

rdamazio created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Before this change, `hg log -r 'wdir() and public()'` would return it. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL