On Fri, Aug 23, 2019 at 12:01 AM Pratyush Yadav <[email protected]> wrote:
>
> Just like the user can select lines to stage or unstage, add the
> ability to revert selected lines.
>
> Signed-off-by: Pratyush Yadav <[email protected]>
> ---
> git-gui.sh | 25 ++++++++++++++++++++++++-
> lib/diff.tcl | 31 ++++++++++++++++++++++++++-----
> 2 files changed, 50 insertions(+), 6 deletions(-)
>
> diff --git a/git-gui.sh b/git-gui.sh
> index b7811d8..9d84ba9 100755
> --- a/git-gui.sh
> +++ b/git-gui.sh
> @@ -3588,9 +3588,15 @@ set ui_diff_applyhunk [$ctxm index last]
> lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
> $ctxm add command \
> -label [mc "Apply/Reverse Line"] \
> - -command {apply_range_or_line $cursorX $cursorY; do_rescan}
> + -command {apply_or_revert_range_or_line $cursorX $cursorY 0;
> do_rescan}
> set ui_diff_applyline [$ctxm index last]
> lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
> +$ctxm add command \
> + -label [mc "Revert Line"] \
> + -command {apply_or_revert_range_or_line $cursorX $cursorY 1;
> do_rescan}
> +set ui_diff_revertline [$ctxm index last]
> +lappend diff_actions [list $ctxm entryconf $ui_diff_revertline -state]
> +set ui_diff_revertline [$ctxm index last]
> $ctxm add separator
> $ctxm add command \
> -label [mc "Show Less Context"] \
> @@ -3688,15 +3694,19 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
> set l [mc "Unstage Hunk From Commit"]
> if {$has_range} {
> set t [mc "Unstage Lines From Commit"]
> + set r [mc "Revert Lines"]
> } else {
> set t [mc "Unstage Line From Commit"]
> + set r [mc "Revert Line"]
> }
> } else {
> set l [mc "Stage Hunk For Commit"]
> if {$has_range} {
> set t [mc "Stage Lines For Commit"]
> + set r [mc "Revert Lines"]
> } else {
> set t [mc "Stage Line For Commit"]
> + set r [mc "Revert Line"]
> }
> }
> if {$::is_3way_diff
> @@ -3707,11 +3717,24 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
> || [string match {T?} $state]
> || [has_textconv $current_diff_path]} {
> set s disabled
> + set revert_state disabled
> } else {
> set s normal
> +
> + # Only allow reverting changes in the working tree. If
> + # the user wants to revert changes in the index, they
> + # need to unstage those first.
> + if {$::ui_workdir eq $::current_diff_side} {
> + set revert_state normal
> + } else {
> + set revert_state disabled
> + }
> }
> +
> $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
> $ctxm entryconf $::ui_diff_applyline -state $s -label $t
> + $ctxm entryconf $::ui_diff_revertline -state $revert_state \
> + -label $r
so you have the 'Revert Line(s)' menu entry always in the context
menu, also when the context menu was opened for an staged file (than
the menu entry is only disabled)? I think this is a step backwards
from my original patch (which isn't mentioned/referenced at all in
this patch anyway).
My orignal patch also had this hunk in lib/diff.tcl:
@@ -614,6 +619,8 @@ proc apply_hunk {x y} {
if {$current_diff_side eq $ui_index} {
set mi ${o}M
+ } elseif {$revert} {
+ set mi "[string index $mi 0]$o"
} elseif {[string index $mi 0] eq {_}} {
set mi M$o
} else {
which is missing here. I cannot remember why I added this here. But
maybe you can?
Best,
Bert
> tk_popup $ctxm $X $Y
> }
> }
> diff --git a/lib/diff.tcl b/lib/diff.tcl
> index 4cae10a..00b15f5 100644
> --- a/lib/diff.tcl
> +++ b/lib/diff.tcl
> @@ -640,7 +640,7 @@ proc apply_hunk {x y} {
> }
> }
>
> -proc apply_range_or_line {x y} {
> +proc apply_or_revert_range_or_line {x y revert} {
> global current_diff_path current_diff_header current_diff_side
> global ui_diff ui_index file_states
>
> @@ -660,25 +660,46 @@ proc apply_range_or_line {x y} {
> if {$current_diff_path eq {} || $current_diff_header eq {}} return
> if {![lock_index apply_hunk]} return
>
> - set apply_cmd {apply --cached --whitespace=nowarn}
> + set apply_cmd {apply --whitespace=nowarn}
> set mi [lindex $file_states($current_diff_path) 0]
> if {$current_diff_side eq $ui_index} {
> set failed_msg [mc "Failed to unstage selected line."]
> set to_context {+}
> - lappend apply_cmd --reverse
> + lappend apply_cmd --reverse --cached
> if {[string index $mi 0] ne {M}} {
> unlock_index
> return
> }
> } else {
> - set failed_msg [mc "Failed to stage selected line."]
> - set to_context {-}
> + if {$revert} {
> + set failed_msg [mc "Failed to revert selected line."]
> + set to_context {+}
> + lappend apply_cmd --reverse
> + } else {
> + set failed_msg [mc "Failed to stage selected line."]
> + set to_context {-}
> + lappend apply_cmd --cached
> + }
> +
> if {[string index $mi 1] ne {M}} {
> unlock_index
> return
> }
> }
>
> + 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]
> + if {$reply ne 1} {
> + unlock_index
> + return
> + }
> + }
> +
> set wholepatch {}
>
> while {$first_l < $last_l} {
> --
> 2.21.0
>
