Re: [PATCH 2/3] git-gui: Add the ability to revert selected lines

From: Pratyush Yadav <me@yadavpratyush.com>
Date: Aug 20, 2019, 19:29 UTC
Message-ID: <20190820192944.gzfwnm52fvb5refq@localhost.localdomain>
In-Reply-To: <73e63382-4f79-cfd0-47f4-812f9cd4f88b@kdbg.org>

On 20/08/19 09:21PM, Johannes Sixt wrote:

Show 19 quoted lines

> Am 19.08.19 um 23:41 schrieb Pratyush Yadav:
> > Just like the user can select lines to stage or unstage, add the
> > ability to revert selected lines.
> > 
> > Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
> 
> > +	if {$revert} {
> > +		set query "[mc "Revert changes in file %s?" \
> > +			[short_path $current_diff_path]]
> > +
> > +[mc "The selected lines will be permanently lost by the revert."]"
> > +
> > +		set reply [revert_dialog $query]
> 
> Please don't do this. This confirmation dialog is unacceptable in my
> workflow. I use reversals of hunks and lines frequently, almost like a
> secondary code editor. My safety net is the undo function of the IDE,
> which works across reloads that are triggered by these external edits.
> These confirmations get in the way.

 
But not everyone uses an IDE. I use vim and it does not have any such 
undo feature that works across reloads. Not one I'm aware of anyway. It 
is absolutely necessary IMO to ask the user for confirmation before 
deleting their work, unless we have a built in safety net.

So how about adding a config option that allows you to disable the confirmation dialog? Sounds like a reasonable compromise to me.

Show 12 quoted lines

> > +		if {$reply ne 1} {
> > +			unlock_index
> > +			return
> > +		}
> > +	}
> > +
> >  	set wholepatch {}
> >  
> >  	while {$first_l < $last_l} {
> > 
> 
> -- Hannes

-- 
Regards,
Pratyush Yadav