From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Feb 2008 01:42:49 +0000 (-0800)
Subject: Merge git://repo.or.cz/git-gui
X-Git-Tag: v1.5.5-rc0~212
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=67cdec1e58f1f9bc17d500b04e856042e0b2bf59;p=git.git

Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: Correct size of dictionary name widget in options dialog
  git-gui: Paper bag fix bad string length call in spellchecker
---

67cdec1e58f1f9bc17d500b04e856042e0b2bf59
diff --cc git-gui/lib/option.tcl
index 3bfa2edf1,000000000..ea80df009
mode 100644,000000..100644
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@@ -1,280 -1,0 +1,278 @@@
 +# git-gui options editor
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc save_config {} {
 +	global default_config font_descs
 +	global repo_config global_config
 +	global repo_config_new global_config_new
 +	global ui_comm_spell
 +
 +	foreach option $font_descs {
 +		set name [lindex $option 0]
 +		set font [lindex $option 1]
 +		font configure $font \
 +			-family $global_config_new(gui.$font^^family) \
 +			-size $global_config_new(gui.$font^^size)
 +		font configure ${font}bold \
 +			-family $global_config_new(gui.$font^^family) \
 +			-size $global_config_new(gui.$font^^size)
 +		font configure ${font}italic \
 +			-family $global_config_new(gui.$font^^family) \
 +			-size $global_config_new(gui.$font^^size)
 +		set global_config_new(gui.$name) [font configure $font]
 +		unset global_config_new(gui.$font^^family)
 +		unset global_config_new(gui.$font^^size)
 +	}
 +
 +	foreach name [array names default_config] {
 +		set value $global_config_new($name)
 +		if {$value ne $global_config($name)} {
 +			if {$value eq $default_config($name)} {
 +				catch {git config --global --unset $name}
 +			} else {
 +				regsub -all "\[{}\]" $value {"} value
 +				git config --global $name $value
 +			}
 +			set global_config($name) $value
 +			if {$value eq $repo_config($name)} {
 +				catch {git config --unset $name}
 +				set repo_config($name) $value
 +			}
 +		}
 +	}
 +
 +	foreach name [array names default_config] {
 +		set value $repo_config_new($name)
 +		if {$value ne $repo_config($name)} {
 +			if {$value eq $global_config($name)} {
 +				catch {git config --unset $name}
 +			} else {
 +				regsub -all "\[{}\]" $value {"} value
 +				git config $name $value
 +			}
 +			set repo_config($name) $value
 +		}
 +	}
 +
 +	if {[info exists repo_config(gui.spellingdictionary)]} {
 +		set value $repo_config(gui.spellingdictionary)
 +		if {$value eq {none}} {
 +			if {[info exists ui_comm_spell]} {
 +				$ui_comm_spell stop
 +			}
 +		} elseif {[info exists ui_comm_spell]} {
 +			$ui_comm_spell lang $value
 +		}
 +	}
 +}
 +
 +proc do_options {} {
 +	global repo_config global_config font_descs
 +	global repo_config_new global_config_new
 +	global ui_comm_spell
 +
 +	array unset repo_config_new
 +	array unset global_config_new
 +	foreach name [array names repo_config] {
 +		set repo_config_new($name) $repo_config($name)
 +	}
 +	load_config 1
 +	foreach name [array names repo_config] {
 +		switch -- $name {
 +		gui.diffcontext {continue}
 +		}
 +		set repo_config_new($name) $repo_config($name)
 +	}
 +	foreach name [array names global_config] {
 +		set global_config_new($name) $global_config($name)
 +	}
 +
 +	set w .options_editor
 +	toplevel $w
 +	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 +
 +	frame $w.buttons
 +	button $w.buttons.restore -text [mc "Restore Defaults"] \
 +		-default normal \
 +		-command do_restore_defaults
 +	pack $w.buttons.restore -side left
 +	button $w.buttons.save -text [mc Save] \
 +		-default active \
 +		-command [list do_save_config $w]
 +	pack $w.buttons.save -side right
 +	button $w.buttons.cancel -text [mc "Cancel"] \
 +		-default normal \
 +		-command [list destroy $w]
 +	pack $w.buttons.cancel -side right -padx 5
 +	pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 +
 +	labelframe $w.repo -text [mc "%s Repository" [reponame]]
 +	labelframe $w.global -text [mc "Global (All Repositories)"]
 +	pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
 +	pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
 +
 +	set optid 0
 +	foreach option {
 +		{t user.name {mc "User Name"}}
 +		{t user.email {mc "Email Address"}}
 +
 +		{b merge.summary {mc "Summarize Merge Commits"}}
 +		{i-1..5 merge.verbosity {mc "Merge Verbosity"}}
 +		{b merge.diffstat {mc "Show Diffstat After Merge"}}
 +
 +		{b gui.trustmtime  {mc "Trust File Modification Timestamps"}}
 +		{b gui.pruneduringfetch {mc "Prune Tracking Branches During Fetch"}}
 +		{b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
 +		{i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
 +		{t gui.newbranchtemplate {mc "New Branch Name Template"}}
 +		} {
 +		set type [lindex $option 0]
 +		set name [lindex $option 1]
 +		set text [eval [lindex $option 2]]
 +		incr optid
 +		foreach f {repo global} {
 +			switch -glob -- $type {
 +			b {
 +				checkbutton $w.$f.$optid -text $text \
 +					-variable ${f}_config_new($name) \
 +					-onvalue true \
 +					-offvalue false
 +				pack $w.$f.$optid -side top -anchor w
 +			}
 +			i-* {
 +				regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
 +				frame $w.$f.$optid
 +				label $w.$f.$optid.l -text "$text:"
 +				pack $w.$f.$optid.l -side left -anchor w -fill x
 +				spinbox $w.$f.$optid.v \
 +					-textvariable ${f}_config_new($name) \
 +					-from $min \
 +					-to $max \
 +					-increment 1 \
 +					-width [expr {1 + [string length $max]}]
 +				bind $w.$f.$optid.v <FocusIn> {%W selection range 0 end}
 +				pack $w.$f.$optid.v -side right -anchor e -padx 5
 +				pack $w.$f.$optid -side top -anchor w -fill x
 +			}
 +			t {
 +				frame $w.$f.$optid
 +				label $w.$f.$optid.l -text "$text:"
 +				entry $w.$f.$optid.v \
 +					-borderwidth 1 \
 +					-relief sunken \
 +					-width 20 \
 +					-textvariable ${f}_config_new($name)
 +				pack $w.$f.$optid.l -side left -anchor w
 +				pack $w.$f.$optid.v -side left -anchor w \
 +					-fill x -expand 1 \
 +					-padx 5
 +				pack $w.$f.$optid -side top -anchor w -fill x
 +			}
 +			}
 +		}
 +	}
 +
 +	set all_dicts [linsert \
 +		[spellcheck::available_langs] \
 +		0 \
 +		none]
 +	incr optid
 +	foreach f {repo global} {
 +		if {![info exists ${f}_config_new(gui.spellingdictionary)]} {
 +			if {[info exists ui_comm_spell]} {
 +				set value [$ui_comm_spell lang]
 +			} else {
 +				set value none
 +			}
 +			set ${f}_config_new(gui.spellingdictionary) $value
 +		}
 +
 +		frame $w.$f.$optid
 +		label $w.$f.$optid.l -text [mc "Spelling Dictionary:"]
 +		eval tk_optionMenu $w.$f.$optid.v \
 +			${f}_config_new(gui.spellingdictionary) \
 +			$all_dicts
 +		pack $w.$f.$optid.l -side left -anchor w -fill x
- 		pack $w.$f.$optid.v -side left -anchor w \
- 			-fill x -expand 1 \
- 			-padx 5
++		pack $w.$f.$optid.v -side right -anchor e -padx 5
 +		pack $w.$f.$optid -side top -anchor w -fill x
 +	}
 +	unset all_dicts
 +
 +	set all_fonts [lsort [font families]]
 +	foreach option $font_descs {
 +		set name [lindex $option 0]
 +		set font [lindex $option 1]
 +		set text [eval [lindex $option 2]]
 +
 +		set global_config_new(gui.$font^^family) \
 +			[font configure $font -family]
 +		set global_config_new(gui.$font^^size) \
 +			[font configure $font -size]
 +
 +		frame $w.global.$name
 +		label $w.global.$name.l -text "$text:"
 +		button $w.global.$name.b \
 +			-text [mc "Change Font"] \
 +			-command [list \
 +				choose_font::pick \
 +				$w \
 +				[mc "Choose %s" $text] \
 +				global_config_new(gui.$font^^family) \
 +				global_config_new(gui.$font^^size) \
 +				]
 +		label $w.global.$name.f -textvariable global_config_new(gui.$font^^family)
 +		label $w.global.$name.s -textvariable global_config_new(gui.$font^^size)
 +		label $w.global.$name.pt -text [mc "pt."]
 +		pack $w.global.$name.l -side left -anchor w
 +		pack $w.global.$name.b -side right -anchor e
 +		pack $w.global.$name.pt -side right -anchor w
 +		pack $w.global.$name.s -side right -anchor w
 +		pack $w.global.$name.f -side right -anchor w
 +		pack $w.global.$name -side top -anchor w -fill x
 +	}
 +
 +	bind $w <Visibility> "grab $w; focus $w.buttons.save"
 +	bind $w <Key-Escape> "destroy $w"
 +	bind $w <Key-Return> [list do_save_config $w]
 +
 +	if {[is_MacOSX]} {
 +		set t [mc "Preferences"]
 +	} else {
 +		set t [mc "Options"]
 +	}
 +	wm title $w "[appname] ([reponame]): $t"
 +	tkwait window $w
 +}
 +
 +proc do_restore_defaults {} {
 +	global font_descs default_config repo_config
 +	global repo_config_new global_config_new
 +
 +	foreach name [array names default_config] {
 +		set repo_config_new($name) $default_config($name)
 +		set global_config_new($name) $default_config($name)
 +	}
 +
 +	foreach option $font_descs {
 +		set name [lindex $option 0]
 +		set repo_config(gui.$name) $default_config(gui.$name)
 +	}
 +	apply_config
 +
 +	foreach option $font_descs {
 +		set name [lindex $option 0]
 +		set font [lindex $option 1]
 +		set global_config_new(gui.$font^^family) \
 +			[font configure $font -family]
 +		set global_config_new(gui.$font^^size) \
 +			[font configure $font -size]
 +	}
 +}
 +
 +proc do_save_config {w} {
 +	if {[catch {save_config} err]} {
 +		error_popup [strcat [mc "Failed to completely save options:"] "\n\n$err"]
 +	}
 +	reshow_diff
 +	destroy $w
 +}
diff --cc git-gui/lib/spellcheck.tcl
index 01c2c4f0d,000000000..7f018e400
mode 100644,000000..100644
--- a/git-gui/lib/spellcheck.tcl
+++ b/git-gui/lib/spellcheck.tcl
@@@ -1,363 -1,0 +1,363 @@@
 +# git-gui spellchecking support through aspell
 +# Copyright (C) 2008 Shawn Pearce
 +
 +class spellcheck {
 +
 +field s_fd     {} ; # pipe to aspell
 +field s_version   ; # aspell version string
 +field s_lang      ; # current language code
 +
 +field w_text      ; # text widget we are spelling
 +field w_menu      ; # context menu for the widget
 +field s_menuidx 0 ; # last index of insertion into $w_menu
 +
 +field s_i              ; # timer registration for _run callbacks
 +field s_clear        0 ; # did we erase mispelled tags yet?
 +field s_seen    [list] ; # lines last seen from $w_text in _run
 +field s_checked [list] ; # lines already checked
 +field s_pending [list] ; # [$line $data] sent to aspell
 +field s_suggest        ; # array, list of suggestions, keyed by misspelling
 +
 +constructor init {pipe_fd ui_text ui_menu} {
 +	set w_text $ui_text
 +	set w_menu $ui_menu
 +
 +	_connect $this $pipe_fd
 +	return $this
 +}
 +
 +method _connect {pipe_fd} {
 +	fconfigure $pipe_fd \
 +		-encoding utf-8 \
 +		-eofchar {} \
 +		-translation lf
 +
 +	if {[gets $pipe_fd s_version] <= 0} {
 +		close $pipe_fd
 +		error [mc "Not connected to aspell"]
 +	}
 +	if {{@(#) } ne [string range $s_version 0 4]} {
 +		close $pipe_fd
 +		error [strcat [mc "Unrecognized aspell version"] ": $s_version"]
 +	}
 +	set s_version [string range $s_version 5 end]
 +
 +	puts $pipe_fd !             ; # enable terse mode
 +	puts $pipe_fd {$$cr master} ; # fetch the language
 +	flush $pipe_fd
 +
 +	gets $pipe_fd s_lang
 +	regexp {[/\\]([^/\\]+)\.[^\.]+$} $s_lang _ s_lang
 +
 +	if {$::default_config(gui.spellingdictionary) eq {}
 +	 && [get_config gui.spellingdictionary] eq {}} {
 +		set ::default_config(gui.spellingdictionary) $s_lang
 +	}
 +
 +	if {$s_fd ne {}} {
 +		catch {close $s_fd}
 +	}
 +	set s_fd $pipe_fd
 +
 +	fconfigure $s_fd -blocking 0
 +	fileevent $s_fd readable [cb _read]
 +
 +	$w_text tag conf misspelled \
 +		-foreground red \
 +		-underline 1
 +	bind_button3 $w_text [cb _popup_suggest %X %Y @%x,%y]
 +
 +	array unset s_suggest
 +	set s_seen    [list]
 +	set s_checked [list]
 +	set s_pending [list]
 +	_run $this
 +}
 +
 +method lang {{n {}}} {
 +	if {$n ne {} && $s_lang ne $n} {
 +		set spell_cmd [list |]
 +		lappend spell_cmd aspell
 +		lappend spell_cmd --master=$n
 +		lappend spell_cmd --mode=none
 +		lappend spell_cmd --encoding=UTF-8
 +		lappend spell_cmd pipe
 +		_connect $this [open $spell_cmd r+]
 +	}
 +	return $s_lang
 +}
 +
 +method version {} {
 +	return "$s_version, $s_lang"
 +}
 +
 +method stop {} {
 +	while {$s_menuidx > 0} {
 +		$w_menu delete 0
 +		incr s_menuidx -1
 +	}
 +	$w_text tag delete misspelled
 +
 +	catch {close $s_fd}
 +	catch {after cancel $s_i}
 +	set s_fd {}
 +	set s_i {}
 +	set s_lang {}
 +}
 +
 +method _popup_suggest {X Y pos} {
 +	while {$s_menuidx > 0} {
 +		$w_menu delete 0
 +		incr s_menuidx -1
 +	}
 +
 +	set b_loc [$w_text index "$pos wordstart"]
 +	set e_loc [_wordend $this $b_loc]
 +	set orig  [$w_text get $b_loc $e_loc]
 +	set tags  [$w_text tag names $b_loc]
 +
 +	if {[lsearch -exact $tags misspelled] >= 0} {
 +		if {[info exists s_suggest($orig)]} {
 +			set cnt 0
 +			foreach s $s_suggest($orig) {
 +				if {$cnt < 5} {
 +					$w_menu insert $s_menuidx command \
 +						-label $s \
 +						-command [cb _replace $b_loc $e_loc $s]
 +					incr s_menuidx
 +					incr cnt
 +				} else {
 +					break
 +				}
 +			}
 +		} else {
 +			$w_menu insert $s_menuidx command \
 +				-label [mc "No Suggestions"] \
 +				-state disabled
 +			incr s_menuidx
 +		}
 +		$w_menu insert $s_menuidx separator
 +		incr s_menuidx
 +	}
 +
 +	$w_text mark set saved-insert insert
 +	tk_popup $w_menu $X $Y
 +}
 +
 +method _replace {b_loc e_loc word} {
 +	$w_text configure -autoseparators 0
 +	$w_text edit separator
 +
 +	$w_text delete $b_loc $e_loc
 +	$w_text insert $b_loc $word
 +
 +	$w_text edit separator
 +	$w_text configure -autoseparators 1
 +	$w_text mark set insert saved-insert
 +}
 +
 +method _restart_timer {} {
 +	set s_i [after 300 [cb _run]]
 +}
 +
 +proc _match_length {max_line arr_name} {
 +	upvar $arr_name a
 +
 +	if {[llength $a] > $max_line} {
 +		set a [lrange $a 0 $max_line]
 +	}
 +	while {[llength $a] <= $max_line} {
 +		lappend a {}
 +	}
 +}
 +
 +method _wordend {pos} {
 +	set pos  [$w_text index "$pos wordend"]
 +	set tags [$w_text tag names $pos]
 +	while {[lsearch -exact $tags misspelled] >= 0} {
 +		set pos  [$w_text index "$pos +1c"]
 +		set tags [$w_text tag names $pos]
 +	}
 +	return $pos
 +}
 +
 +method _run {} {
 +	set cur_pos  [$w_text index {insert -1c}]
 +	set cur_line [lindex [split $cur_pos .] 0]
 +	set max_line [lindex [split [$w_text index end] .] 0]
 +	_match_length $max_line s_seen
 +	_match_length $max_line s_checked
 +
 +	# Nothing in the message buffer?  Nothing to spellcheck.
 +	#
 +	if {$cur_line == 1
 +	 && $max_line == 2
 +	 && [$w_text get 1.0 end] eq "\n"} {
 +		array unset s_suggest
 +		_restart_timer $this
 +		return
 +	}
 +
 +	set active 0
 +	for {set n 1} {$n <= $max_line} {incr n} {
 +		set s [$w_text get "$n.0" "$n.end"]
 +
 +		# Don't spellcheck the current line unless we are at
 +		# a word boundary.  The user might be typing on it.
 +		#
 +		if {$n == $cur_line
 +		 && ![regexp {^\W$} [$w_text get $cur_pos insert]]} {
 +
 +			# If the current word is mispelled remove the tag
 +			# but force a spellcheck later.
 +			#
 +			set tags [$w_text tag names $cur_pos]
 +			if {[lsearch -exact $tags misspelled] >= 0} {
 +				$w_text tag remove misspelled \
 +					"$cur_pos wordstart" \
 +					[_wordend $this $cur_pos]
 +				lset s_seen    $n $s
 +				lset s_checked $n {}
 +			}
 +
 +			continue
 +		}
 +
 +		if {[lindex $s_seen    $n] eq $s
 +		 && [lindex $s_checked $n] ne $s} {
 +			# Don't send empty lines to Aspell it doesn't check them.
 +			#
 +			if {$s eq {}} {
 +				lset s_checked $n $s
 +				continue
 +			}
 +
 +			# Don't send typical s-b-o lines as the emails are
 +			# almost always misspelled according to Aspell.
 +			#
 +			if {[regexp -nocase {^[a-z-]+-by:.*<.*@.*>$} $s]} {
 +				$w_text tag remove misspelled "$n.0" "$n.end"
 +				lset s_checked $n $s
 +				continue
 +			}
 +
 +			puts $s_fd ^$s
 +			lappend s_pending [list $n $s]
 +			set active 1
 +		} else {
 +			# Delay until another idle loop to make sure we don't
 +			# spellcheck lines the user is actively changing.
 +			#
 +			lset s_seen $n $s
 +		}
 +	}
 +
 +	if {$active} {
 +		set s_clear 1
 +		flush $s_fd
 +	} else {
 +		_restart_timer $this
 +	}
 +}
 +
 +method _read {} {
 +	while {[gets $s_fd line] >= 0} {
 +		set lineno [lindex $s_pending 0 0]
 +
 +		if {$s_clear} {
 +			$w_text tag remove misspelled "$lineno.0" "$lineno.end"
 +			set s_clear 0
 +		}
 +
 +		if {$line eq {}} {
 +			lset s_checked $lineno [lindex $s_pending 0 1]
 +			set s_pending [lrange $s_pending 1 end]
 +			set s_clear 1
 +			continue
 +		}
 +
 +		set sugg [list]
 +		switch -- [string range $line 0 1] {
 +		{& } {
 +			set line [split [string range $line 2 end] :]
 +			set info [split [lindex $line 0] { }]
 +			set orig [lindex $info 0]
 +			set offs [lindex $info 2]
 +			foreach s [split [lindex $line 1] ,] {
 +				lappend sugg [string range $s 1 end]
 +			}
 +		}
 +		{# } {
 +			set info [split [string range $line 2 end] { }]
 +			set orig [lindex $info 0]
 +			set offs [lindex $info 1]
 +		}
 +		default {
 +			puts stderr "<spell> $line"
 +			continue
 +		}
 +		}
 +
 +		incr offs -1
 +		set b_loc "$lineno.$offs"
 +		set e_loc [$w_text index "$lineno.$offs wordend"]
 +		set curr [$w_text get $b_loc $e_loc]
 +
 +		# At least for English curr = "bob", orig = "bob's"
 +		# so Tk didn't include the 's but Aspell did.  We
 +		# try to round out the word.
 +		#
 +		while {$curr ne $orig
- 		 && [string equal -length [llength $curr] $curr $orig]} {
++		 && [string equal -length [string length $curr] $curr $orig]} {
 +			set n_loc  [$w_text index "$e_loc +1c"]
 +			set n_curr [$w_text get $b_loc $n_loc]
 +			if {$n_curr eq $curr} {
 +				break
 +			}
 +			set curr  $n_curr
 +			set e_loc $n_loc
 +		}
 +
 +		if {$curr eq $orig} {
 +			$w_text tag add misspelled $b_loc $e_loc
 +			if {[llength $sugg] > 0} {
 +				set s_suggest($orig) $sugg
 +			} else {
 +				unset -nocomplain s_suggest($orig)
 +			}
 +		} else {
 +			unset -nocomplain s_suggest($orig)
 +		}
 +	}
 +
 +	fconfigure $s_fd -block 1
 +	if {[eof $s_fd]} {
 +		if {![catch {close $s_fd} err]} {
 +			set err [mc "unexpected eof from aspell"]
 +		}
 +		catch {after cancel $s_i}
 +		$w_text tag remove misspelled 1.0 end
 +		error_popup [strcat "Spell Checker Failed" "\n\n" $err]
 +		return
 +	}
 +	fconfigure $s_fd -block 0
 +
 +	if {[llength $s_pending] == 0} {
 +		_restart_timer $this
 +	}
 +}
 +
 +proc available_langs {} {
 +	set langs [list]
 +	catch {
 +		set fd [open [list | aspell dump dicts] r]
 +		while {[gets $fd line] >= 0} {
 +			if {$line eq {}} continue
 +			lappend langs $line
 +		}
 +		close $fd
 +	}
 +	return $langs
 +}
 +
 +}