>From 53d911208cb867eab4a2a6d71bfa3d95bc9f2671 Mon Sep 17 00:00:00 2001 From: Barry Roberts Date: Thu, 8 May 2008 11:37:53 -0600 Subject: [PATCH] Added cheap call to git-diff for ext diff --- git-gui/git-gui.sh | 3 +++ git-gui/lib/index.tcl | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 0b201ec..3b77e68 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -2061,6 +2061,9 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} { lappend disable_on_lock \ [list .mbar.commit entryconf [.mbar.commit index last] -state] + .mbar.commit add command -label [mc "External Diff"] \ + -command do_ext_diff_selection + .mbar.commit add separator .mbar.commit add command -label [mc "Show Less Context"] \ diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl index 3c1fce7..1e08664 100644 --- a/git-gui/lib/index.tcl +++ b/git-gui/lib/index.tcl @@ -435,3 +435,17 @@ proc do_select_commit_type {} { } } } + +proc do_ext_diff_selection { } { + global current_diff_path selected_paths + + if {[array size selected_paths] > 0} { + error_popup [mc "Please select one file at a time for diffs"] + } elseif {$current_diff_path ne {}} { + set w [console::new \ + [mc "diff"] \ + [mc "Differencing"]] + set cmd [list git diff $current_diff_path] + console::exec $w $cmd + } +} \ No newline at end of file -- 1.5.5.1.116.ge4b9c