Re: [RFD] Rewriting safety - warn before/when rewriting published history

From: Johan Herland <johan@herland.net>
Date: Feb 6, 2012, 06:53 UTC
Message-ID: <CALKQrgfOE7Ekmuvut9Lff37v7BPJu5ohYjwq_Nk2sCkrUOF15w@mail.gmail.com>
In-Reply-To: <EAF9D593-4E0C-4C95-A048-3F6AC8ADD866@gmail.com>

On Mon, Feb 6, 2012 at 01:57, Steven Michalske <smichalske@gmail.com> wrote:

Show 33 quoted lines

> On Feb 4, 2012, at 11:45 AM, Jakub Narebski wrote:
>> In Mercurial 2.1 there are three available phases: 'public' for
>> published commits, 'draft' for local un-published commits and
>> 'secret' for local un-published commits which are not meant to
>> be published.
>>
>> The phase of a changeset is always equal to or higher than the phase
>> of it's descendants, according to the following order:
>>
>>      public < draft < secret
>
> Let's not limit ourselves to just three levels.  They are a great start but I propose the following.
>
> published - The commits that are on a public repository that if are rewritten will invoke uprisings.
>        general rule here would be to revert or patch, no rewrites.
> based - The commits that the core developers have work based upon. (not just the commits in their repo.)
>        general rule is notify your fellow developers before a rewrite.
> shared - The commits that are known to your fellow core developers.
>        These commits are known, but have not had work based off of them.  Minimal risk to rewrite.
> local - The commits that are local only, no one else has a copy.
>        Commits your willing to share, but have not been yet shared, either from actions of you, or a fetch from others.
> restricted or private - The commits that you do not want shared.
>        Manually added, think of a branch tip marked as restricted automatically promotes commits to the branch as restricted.
>
> Maybe make these like nice levels, but as two components, publicity 0-100 and rewritability 0-100
>        Published is publicity 100 and rewritability 0
>        Restricted is publicity 0 and rewritability 100
>        Based publicity 75 and rewritability 25
>        Shared publicity 50 and rewritability 50
>        Local publicity 25 and rewritability 75
>        Restricted publicity 0 and rewritability 100
>
> [...]

With all due respect, I believe this is crazy. You're adding an entire layer of complexity on top of commits that every user has to know about, and has little or no value to most of them. IMHO, most users only want Git to help them avoid doing something stupid (rewriting 'public' commits or publishing 'secret' commits), and to do so with the minimal amount of manual user interaction. The above idea is more suitable for armchair dictators that want to micromanage their commits along two arbitrary axes of evil^H^H^H^Hpointlessness. On both axes, you'll need threshold values where Git starts refusing to publish/rewrite your commit. Hence, the only thing that matters is whether the 'publicity'/'rewritability' value is above/below that threshold, at which point you could save yourself a lot of trouble by making them simple boolean flags instead.

Having said that, you can use 'git notes' along with existing and proposed hooks (as described elsewhere in this thread) to implement whatever crazy commit publishing/rewriting scheme you desire. To misquote someone famous: I disapprove of what you want to do with Git, but I will defend to the death your right to make Git do what you want (in the privacy of your own repos). ;)

Have fun! :)

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net