Re: [PATCH] git-gui: Fast staging/unstaging of hunks/lines

From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Apr 12, 2010, 06:49 UTC
Message-ID: <q2m36ca99e91004112349l9e336fffl7e69bb75bce07a40@mail.gmail.com>
In-Reply-To: <201004112101.54908.j6t@kdbg.org>

Hi,

On Sun, Apr 11, 2010 at 21:01, Johannes Sixt <j6t@kdbg.org> wrote:

Show 11 quoted lines

> On Sonntag, 11. April 2010, Bert Wesarg wrote:
>> On Mon, Apr 5, 2010 at 11:01, Bert Wesarg <bert.wesarg@googlemail.com>
> wrote:
>> > This adds a shortcut to stage/unstage hunks or a range of lines. Which is
>> > done on a mouse button 1 release event and holding the control key in the
>> > diff view. If there is currently a selection only the selected lines will
>> > be staged/unstaged. Otherwise the hunk will be staged/unstaged.
>>
>> Ping.
>
> I gave the patch a quick try.

Thanks,

Show 8 quoted lines

>
> I don't think that I would use it a lot because it is very easy to mess up a
> staged change: The problem is that a click without anything selected will
> stage an entire hunk. I frequently use "Stage Line(s)" to separate
> neighboring changes that must go to separate commits, but with you feature it
> is very easy to forget to select something and, hence, to stage the entire
> hunk accidentally - which means that I would have to start over with the hunk
> and all the "quick" aspects of the feature would be lost.

I don't feel comfortable with this ambiguity myself. I see two ways to solve this:

    a) Use Shift-Button-1 for lines

or

    b) Use Shift-Control-Button-1 for lines

and make Control-Button-1 only stage hunks.

May this interface be more usable?

Regards, Bert

> -- Hannes
>