git-gui: allow reverting selected lines

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>

diff --git a/git-gui.sh b/git-gui.sh
index 5bc21b878d413e27de8e3d54e66a138ff41c7daa..6d4d002559b85953a6593066f1e4b2e93c8fe119 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3587,10 +3587,16 @@ 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"] \
 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 separator
 set ui_diff_applyline [$ctxm index last]
 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
 $ctxm add separator

+$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]
+$ctxm add separator

 $ctxm add command \
        -label [mc "Show Less Context"] \
        -command show_less_context
 $ctxm add command \
        -label [mc "Show Less Context"] \
        -command show_less_context


@@ -3687,15 +3693,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 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"]
                        } 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"]
                        }
                } 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"]
                        } else {
                                set t [mc "Stage Line For Commit"]

+                               set r [mc "Revert Line"]

                        }
                }
                if {$::is_3way_diff
                        }
                }
                if {$::is_3way_diff


@@ -3706,11 +3716,24 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
                        || [string match {T?} $state]
                        || [has_textconv $current_diff_path]} {
                        set s disabled
                        || [string match {T?} $state]
                        || [has_textconv $current_diff_path]} {
                        set s disabled

+                       set revert_state disabled

                } else {
                        set s normal
                } 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_applyhunk -state $s -label $l
                $ctxm entryconf $::ui_diff_applyline -state $s -label $t

+               $ctxm entryconf $::ui_diff_revertline -state $revert_state \
+                       -label $r

                tk_popup $ctxm $X $Y
        }
 }
                tk_popup $ctxm $X $Y
        }
 }

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 4cae10a4c7f197aab9ae0bc145254a8d4a1bae50..d6bee29a130a163ccf217ec2858b54a593fdafbb 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -55,7 +55,7 @@ proc reshow_diff {{after {}}} {
 
 proc force_diff_encoding {enc} {
        global current_diff_path
 
 proc force_diff_encoding {enc} {
        global current_diff_path

-       
+

        if {$current_diff_path ne {}} {
                force_path_encoding $current_diff_path $enc
                reshow_diff
        if {$current_diff_path ne {}} {
                force_path_encoding $current_diff_path $enc
                reshow_diff


@@ -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
 
        global current_diff_path current_diff_header current_diff_side
        global ui_diff ui_index file_states
 


@@ -660,19 +660,27 @@ proc apply_range_or_line {x y} {
        if {$current_diff_path eq {} || $current_diff_header eq {}} return
        if {![lock_index apply_hunk]} return
 
        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 {+}
        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 {
                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 {[string index $mi 1] ne {M}} {
                        unlock_index
                        return