[PATCH] git-gui: add configurable tab size to the diff view git-gui - why not added to git-gui ?

From

Ppb158 <pb158@tlen.pl>

Date

Sep 19, 2014, 14:33 UTC

Message-ID

<lvhesi$qqs$1@ger.gmane.org>

Home of the original description and the author of the patch:

http://www.spinics.net/lists/git/msg174415.html

Why not added this useful little patch for git-gui ?

original content of the message from the link above:

----------------------

The code is heavily based on how gitk handles tabs.

Signed-off-by: Michael Lutz <michi@xxxxxxxxxxxxxx>
---
  git-gui.sh     |    1 +
  lib/diff.tcl   |   20 +++++++++++++++++++-
  lib/option.tcl |    1 +
  3 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/git-gui.sh b/git-gui.sh
index ba4e5c1..22d7665 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -892,6 +892,7 @@ set default_config(gui.fontdiff) [font configure 
font_diff]
  set default_config(gui.maxfilesdisplayed) 5000
  set default_config(gui.usettk) 1
  set default_config(gui.warndetachedcommit) 1
+set default_config(gui.tabsize) 8
  set font_descs {
  	{fontui   font_ui   {mc "Main Font"}}
  	{fontdiff font_diff {mc "Diff/Console Font"}}
diff --git a/lib/diff.tcl b/lib/diff.tcl
index ec44055..f314197 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -1,6 +1,19 @@
  # git-gui diff viewer
  # Copyright (C) 2006, 2007 Shawn Pearce

+proc apply_tab_size {{firsttab {}}} {
+	global have_tk85 repo_config ui_diff
+
+	set w [font measure font_diff "0"]
+	if {$have_tk85 && $firsttab != 0} {
+		$ui_diff configure -tabs [list [expr {$firsttab * $w}] [expr 
{($firsttab + $repo_config(gui.tabsize)) * $w}]]
+	} elseif {$have_tk85 || $repo_config(gui.tabsize) != 8} {
+		$ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}]
+	} else {
+		$ui_diff configure -tabs {}
+	}
+}
+
  proc clear_diff {} {
  	global ui_diff current_diff_path current_diff_header
  	global ui_index ui_workdir
@@ -105,6 +118,8 @@ proc show_diff {path w {lno {}} {scroll_pos {}} 
{callback {}}} {

  	set cont_info [list $scroll_pos $callback]

+	apply_tab_size 0
+
  	if {[string first {U} $m] >= 0} {
  		merge_load_stages $path [list show_unmerged_diff $cont_info]
  	} elseif {$m eq {_O}} {
@@ -398,7 +413,10 @@ proc read_diff {fd conflict_size cont_info} {

  		# -- Automatically detect if this is a 3 way diff.
  		#
-		if {[string match {@@@ *} $line]} {set is_3way_diff 1}
+		if {[string match {@@@ *} $line]} {
+			set is_3way_diff 1
+			apply_tab_size 1
+		}

  		if {$::current_diff_inheader} {

diff --git a/lib/option.tcl b/lib/option.tcl
index 0cf1da1..b940c44 100644
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -159,6 +159,7 @@ proc do_options {} {
  		{c gui.encoding {mc "Default File Contents Encoding"}}
  		{b gui.warndetachedcommit {mc "Warn before committing to a detached 
head"}}
  		{s gui.stageuntracked {mc "Staging of untracked files"} {list "yes" 
"no" "ask"}}
+		{i-1..99 gui.tabsize {mc "Tab spacing"}}
  		} {
  		set type [lindex $option 0]
  		set name [lindex $option 1]

---------------

Regards,

Krzysztof