StatesPlan - a draft of the sprint discussion about liquid hg

[Pierre-Yves David]

On Sat, May 07, 2011 at 03:06:53PM -0500, Matt Mackall wrote:
> I've written this up in a form I hope gives a pretty clear plan for the
> groundwork here:
> 
> http://mercurial.selenic.com/wiki/StatesPlan
> 
> This also proposes some UI for this feature (the hg state command and
> the state: field in the log), which we'd been mostly handwaving to this
> point.
> 
> I think some people at the sprint missed the discussion of the local
> feature, so please take a look at that.
> 
> I've mostly left out Pierre-Yves very interesting model for changeset
> management (briefly discussed at the end) as it would double the length
> of the document to go into a similar level of detail and states need to
> be implemented first at any rate.
> 
> Similarly, Henrik and Martin's work on dead heads shows up here as
> 'abandoned heads' mostly to illustrate that it's an orthogonal feature.

I advocate some rename for the two last states:

"Local" should be renamed in "Private".

    I find private a less ambiguous term.  "Not being pulled and pushed" looks
    more a _definition_ of "Private" changeset while it looks more a _property_
    "Local" one. As the only concept of those change is to be "not pulled and
    pushed" I find "Private" more appropriate.  Moreover,  "Local" may be
    confuse with "changeset you did not pushed yet" which is more the "Liquid
    one".

"Dead" should be renamed as "discard" or "Trashed"

    The idea is that "Dead" is a kind definitive state. If you "kill" changeset
    and say yhey are "dead", you assume you won't use them again except if you
    "resurrect" them. As resurrection is pretty uncommon in day to day live. I
    would use a more reversible metaphor. Here is two proposals.

    * You "discard" a changeset it become "discarded".
      You "retain" a changeset when it go back to another state.

    * You "Trash" a changeset is become Thrashed
      You "untrash" a changeset when it go back to another state.

    The trash proposal fit well with garbage collectable idea. Discard is a nicer word IMO.


-- 
Pierre-Yves David

http://www.logilab.fr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20110512/d3a1f4ca/attachment.pgp>