set _appname [lindex [file split $argv0] end]
set _gitdir {}
+set _gitexec {}
set _reponame {}
+set _iscygwin {}
proc appname {} {
global _appname
return [eval [concat [list file join $_gitdir] $args]]
}
+proc gitexec {args} {
+ global _gitexec
+ if {$_gitexec eq {}} {
+ if {[catch {set _gitexec [exec git --exec-path]} err]} {
+ error "Git not installed?\n\n$err"
+ }
+ }
+ if {$args eq {}} {
+ return $_gitexec
+ }
+ return [eval [concat [list file join $_gitexec] $args]]
+}
+
proc reponame {} {
global _reponame
return $_reponame
}
+proc is_MacOSX {} {
+ global tcl_platform tk_library
+ if {[tk windowingsystem] eq {aqua}} {
+ return 1
+ }
+ return 0
+}
+
+proc is_Windows {} {
+ global tcl_platform
+ if {$tcl_platform(platform) eq {windows}} {
+ return 1
+ }
+ return 0
+}
+
+proc is_Cygwin {} {
+ global tcl_platform _iscygwin
+ if {$_iscygwin eq {}} {
+ if {$tcl_platform(platform) eq {windows}} {
+ if {[catch {set p [exec cygpath --windir]} err]} {
+ set _iscygwin 0
+ } else {
+ set _iscygwin 1
+ }
+ } else {
+ set _iscygwin 0
+ }
+ }
+ return $_iscygwin
+}
+
######################################################################
##
## config
}
}
+proc is_config_true {name} {
+ global repo_config
+ if {[catch {set v $repo_config($name)}]} {
+ return 0
+ } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
+ return 1
+ } else {
+ return 0
+ }
+}
+
proc load_config {include_global} {
global repo_config global_config default_config
error_popup "Cannot find the git directory:\n\n$err"
exit 1
}
+if {![file isdirectory $_gitdir] && [is_Cygwin]} {
+ catch {set _gitdir [exec cygpath --unix $_gitdir]}
+}
if {![file isdirectory $_gitdir]} {
catch {wm withdraw .}
error_popup "Git directory not found:\n\n$_gitdir"
}
if {[lindex [file split $_gitdir] end] ne {.git}} {
catch {wm withdraw .}
- error_popup "Cannot use funny .git directory:\n\n$gitdir"
+ error_popup "Cannot use funny .git directory:\n\n$_gitdir"
exit 1
}
if {[catch {cd [file dirname $_gitdir]} err]} {
# On Cygwin [file executable] might lie so we need to ask
# the shell if the hook is executable. Yes that's annoying.
#
- if {[is_Windows] && [file isfile $pchook]} {
+ if {[is_Cygwin] && [file isfile $pchook]} {
set pchook [list sh -c [concat \
"if test -x \"$pchook\";" \
"then exec \"$pchook\" 2>&1;" \
# -- Run the post-commit hook.
#
set pchook [gitdir hooks post-commit]
- if {[is_Windows] && [file isfile $pchook]} {
+ if {[is_Cygwin] && [file isfile $pchook]} {
set pchook [list sh -c [concat \
"if test -x \"$pchook\";" \
"then exec \"$pchook\";" \
-font font_ui
listbox $w.list.l \
-height 10 \
- -width 50 \
+ -width 70 \
-selectmode extended \
+ -yscrollcommand [list $w.list.sby set] \
-font font_ui
foreach h $all_heads {
if {$h ne $current_branch} {
$w.list.l insert end $h
}
}
- pack $w.list.l -fill both -pady 5 -padx 5
- pack $w.list -fill both -pady 5 -padx 5
+ scrollbar $w.list.sby -command [list $w.list.l yview]
+ pack $w.list.sby -side right -fill y
+ pack $w.list.l -side left -fill both -expand 1
+ pack $w.list -fill both -expand 1 -pady 5 -padx 5
labelframe $w.validate \
-text {Delete Only If} \
-font font_ui
listbox $w.source.l \
-height 10 \
- -width 50 \
+ -width 70 \
-selectmode extended \
+ -yscrollcommand [list $w.source.sby set] \
-font font_ui
foreach h $all_heads {
$w.source.l insert end $h
$w.source.l select set end
}
}
- pack $w.source.l -fill both -pady 5 -padx 5
- pack $w.source -fill both -pady 5 -padx 5
+ scrollbar $w.source.sby -command [list $w.source.l yview]
+ pack $w.source.sby -side right -fill y
+ pack $w.source.l -side left -fill both -expand 1
+ pack $w.source -fill both -expand 1 -pady 5 -padx 5
labelframe $w.dest \
-text {Destination Repository} \
-font font_ui
listbox $w.source.l \
-height 10 \
- -width 25 \
+ -width 70 \
-selectmode extended \
-yscrollcommand [list $w.source.sby set] \
-font font_ui
}
}
+######################################################################
+##
+## browser
+
+set next_browser_id 0
+
+proc new_browser {} {
+ global next_browser_id cursor_ptr
+ global browser_commit browser_status browser_stack browser_path browser_busy
+
+ set w .browser[incr next_browser_id]
+ set w_list $w.list.l
+ set browser_commit($w_list) HEAD
+ set browser_status($w_list) {Starting...}
+ set browser_stack($w_list) {}
+ set browser_path($w_list) $browser_commit($w_list):
+ set browser_busy($w_list) 1
+
+ toplevel $w
+ label $w.path -textvariable browser_path($w_list) \
+ -anchor w \
+ -justify left \
+ -borderwidth 1 \
+ -relief sunken \
+ -font font_uibold
+ pack $w.path -anchor w -side top -fill x
+
+ frame $w.list
+ text $w_list -background white -borderwidth 0 \
+ -cursor $cursor_ptr \
+ -state disabled \
+ -wrap none \
+ -height 20 \
+ -width 70 \
+ -xscrollcommand [list $w.list.sbx set] \
+ -yscrollcommand [list $w.list.sby set] \
+ -font font_ui
+ $w_list tag conf in_sel \
+ -background [$w_list cget -foreground] \
+ -foreground [$w_list cget -background]
+ scrollbar $w.list.sbx -orient h -command [list $w_list xview]
+ scrollbar $w.list.sby -orient v -command [list $w_list yview]
+ pack $w.list.sbx -side bottom -fill x
+ pack $w.list.sby -side right -fill y
+ pack $w_list -side left -fill both -expand 1
+ pack $w.list -side top -fill both -expand 1
+
+ label $w.status -textvariable browser_status($w_list) \
+ -anchor w \
+ -justify left \
+ -borderwidth 1 \
+ -relief sunken \
+ -font font_ui
+ pack $w.status -anchor w -side bottom -fill x
+
+ bind $w_list <Button-1> "browser_click 0 $w_list @%x,%y;break"
+ bind $w_list <Double-Button-1> "browser_click 1 $w_list @%x,%y;break"
+
+ bind $w <Visibility> "focus $w"
+ bind $w <Destroy> "
+ array unset browser_buffer $w_list
+ array unset browser_files $w_list
+ array unset browser_status $w_list
+ array unset browser_stack $w_list
+ array unset browser_path $w_list
+ array unset browser_commit $w_list
+ array unset browser_busy $w_list
+ "
+ wm title $w "[appname] ([reponame]): File Browser"
+ ls_tree $w_list $browser_commit($w_list) {}
+}
+
+proc browser_click {was_double_click w pos} {
+ global browser_files browser_status browser_path
+ global browser_commit browser_stack browser_busy
+
+ if {$browser_busy($w)} return
+ set lno [lindex [split [$w index $pos] .] 0]
+ set info [lindex $browser_files($w) [expr {$lno - 1}]]
+
+ $w conf -state normal
+ $w tag remove sel 0.0 end
+ $w tag remove in_sel 0.0 end
+ if {$info ne {}} {
+ $w tag add in_sel $lno.0 [expr {$lno + 1}].0
+ if {$was_double_click} {
+ switch -- [lindex $info 0] {
+ parent {
+ set parent [lindex $browser_stack($w) end-1]
+ set browser_stack($w) [lrange $browser_stack($w) 0 end-2]
+ if {$browser_stack($w) eq {}} {
+ regsub {:.*$} $browser_path($w) {:} browser_path($w)
+ } else {
+ regsub {/[^/]+$} $browser_path($w) {} browser_path($w)
+ }
+ set browser_status($w) "Loading $browser_path($w)..."
+ ls_tree $w [lindex $parent 0] [lindex $parent 1]
+ }
+ tree {
+ set name [lindex $info 2]
+ set escn [escape_path $name]
+ set browser_status($w) "Loading $escn..."
+ append browser_path($w) $escn
+ ls_tree $w [lindex $info 1] $name
+ }
+ blob {
+ set name [lindex $info 2]
+ set p {}
+ foreach n $browser_stack($w) {
+ append p [lindex $n 1]
+ }
+ append p $name
+ show_blame $browser_commit($w) $p
+ }
+ }
+ }
+ }
+ $w conf -state disabled
+}
+
+proc ls_tree {w tree_id name} {
+ global browser_buffer browser_files browser_stack browser_busy
+
+ set browser_buffer($w) {}
+ set browser_files($w) {}
+ set browser_busy($w) 1
+
+ $w conf -state normal
+ $w tag remove in_sel 0.0 end
+ $w tag remove sel 0.0 end
+ $w delete 0.0 end
+ if {$browser_stack($w) ne {}} {
+ $w image create end \
+ -align center -padx 5 -pady 1 \
+ -name icon0 \
+ -image file_uplevel
+ $w insert end {[Up To Parent]}
+ lappend browser_files($w) parent
+ }
+ lappend browser_stack($w) [list $tree_id $name]
+ $w conf -state disabled
+
+ set fd [open "| git ls-tree -z $tree_id" r]
+ fconfigure $fd -blocking 0 -translation binary -encoding binary
+ fileevent $fd readable [list read_ls_tree $fd $w]
+}
+
+proc read_ls_tree {fd w} {
+ global browser_buffer browser_files browser_status browser_busy
+
+ if {![winfo exists $w]} {
+ catch {close $fd}
+ return
+ }
+
+ append browser_buffer($w) [read $fd]
+ set pck [split $browser_buffer($w) "\0"]
+ set browser_buffer($w) [lindex $pck end]
+
+ set n [llength $browser_files($w)]
+ $w conf -state normal
+ foreach p [lrange $pck 0 end-1] {
+ set info [split $p "\t"]
+ set path [lindex $info 1]
+ set info [split [lindex $info 0] { }]
+ set type [lindex $info 1]
+ set object [lindex $info 2]
+
+ switch -- $type {
+ blob {
+ set image file_plain
+ }
+ tree {
+ set image file_dir
+ append path /
+ }
+ default {
+ set image file_question
+ }
+ }
+
+ if {$n > 0} {$w insert end "\n"}
+ $w image create end \
+ -align center -padx 5 -pady 1 \
+ -name icon[incr n] \
+ -image $image
+ $w insert end [escape_path $path]
+ lappend browser_files($w) [list $type $object $path]
+ }
+ $w conf -state disabled
+
+ if {[eof $fd]} {
+ close $fd
+ set browser_status($w) Ready.
+ set browser_busy($w) 0
+ array unset browser_buffer $w
+ }
+}
+
+proc show_blame {commit path} {
+ global next_browser_id blame_status blame_data
+
+ set w .browser[incr next_browser_id]
+ set blame_status($w) {Loading current file content...}
+ set texts [list]
+
+ toplevel $w
+ panedwindow $w.out -orient horizontal
+
+ label $w.path -text "$commit:$path" \
+ -anchor w \
+ -justify left \
+ -borderwidth 1 \
+ -relief sunken \
+ -font font_uibold
+ pack $w.path -anchor w -side top -fill x
+
+ text $w.out.commit -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 8 \
+ -font font_diff
+ $w.out add $w.out.commit
+ lappend texts $w.out.commit
+
+ text $w.out.author -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 20 \
+ -font font_diff
+ $w.out add $w.out.author
+ lappend texts $w.out.author
+
+ text $w.out.date -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width [string length "yyyy-mm-dd hh:mm:ss"] \
+ -font font_diff
+ $w.out add $w.out.date
+ lappend texts $w.out.date
+
+ text $w.out.linenumber -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 5 \
+ -font font_diff
+ $w.out.linenumber tag conf linenumber -justify right
+ $w.out add $w.out.linenumber
+ lappend texts $w.out.linenumber
+
+ text $w.out.file -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 80 \
+ -font font_diff
+ $w.out add $w.out.file
+ lappend texts $w.out.file
+
+ label $w.status -textvariable blame_status($w) \
+ -anchor w \
+ -justify left \
+ -borderwidth 1 \
+ -relief sunken \
+ -font font_ui
+ pack $w.status -anchor w -side bottom -fill x
+
+ scrollbar $w.sby -orient v -command [list scrollbar2many $texts yview]
+ pack $w.sby -side right -fill y
+ pack $w.out -side left -fill both -expand 1
+
+ menu $w.ctxm -tearoff 0
+ $w.ctxm add command -label "Copy Commit" \
+ -font font_ui \
+ -command "blame_copycommit $w \$cursorW @\$cursorX,\$cursorY"
+
+ foreach i $texts {
+ $i tag conf in_sel \
+ -background [$i cget -foreground] \
+ -foreground [$i cget -background]
+ $i conf -yscrollcommand [list many2scrollbar $texts yview $w.sby]
+ bind $i <Button-1> "blame_highlight $i @%x,%y $texts;break"
+ bind_button3 $i "
+ set cursorX %x
+ set cursorY %y
+ set cursorW %W
+ tk_popup $w.ctxm %X %Y
+ "
+ }
+
+ bind $w <Visibility> "focus $w"
+ bind $w <Destroy> "
+ array unset blame_status $w
+ array unset blame_data $w,*
+ "
+ wm title $w "[appname] ([reponame]): File Viewer"
+
+ set blame_data($w,total_lines) 0
+ set fd [open "| git cat-file blob $commit:$path" r]
+ fconfigure $fd -blocking 0 -translation lf -encoding binary
+ fileevent $fd readable [list read_blame_catfile $fd $w $commit $path \
+ $texts $w.out.linenumber $w.out.file]
+}
+
+proc read_blame_catfile {fd w commit path texts w_lno w_file} {
+ global blame_status blame_data
+
+ if {![winfo exists $w_file]} {
+ catch {close $fd}
+ return
+ }
+
+ set n $blame_data($w,total_lines)
+ foreach i $texts {$i conf -state normal}
+ while {[gets $fd line] >= 0} {
+ regsub "\r\$" $line {} line
+ incr n
+ $w_lno insert end $n linenumber
+ $w_file insert end $line
+ foreach i $texts {$i insert end "\n"}
+ }
+ foreach i $texts {$i conf -state disabled}
+ set blame_data($w,total_lines) $n
+
+ if {[eof $fd]} {
+ close $fd
+ set blame_status($w) {Loading annotations...}
+ set fd [open "| git blame --incremental $commit -- $path" r]
+ fconfigure $fd -blocking 0 -translation lf -encoding binary
+ fileevent $fd readable "read_blame_incremental $fd $w $texts"
+ }
+}
+
+proc read_blame_incremental {fd w w_commit w_author w_date w_lno w_file} {
+ global blame_status blame_data
+
+ if {![winfo exists $w_commit]} {
+ catch {close $fd}
+ return
+ }
+
+ $w_commit conf -state normal
+ $w_author conf -state normal
+ $w_date conf -state normal
+
+ while {[gets $fd line] >= 0} {
+ if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
+ commit original_line final_line line_count]} {
+ set blame_data($w,commit) $commit
+ set blame_data($w,original_line) $original_line
+ set blame_data($w,final_line) $final_line
+ set blame_data($w,line_count) $line_count
+ } elseif {[string match {filename *} $line]} {
+ set n $blame_data($w,line_count)
+ set lno $blame_data($w,final_line)
+ set file [string range $line 9 end]
+ set commit $blame_data($w,commit)
+ set abbrev [string range $commit 0 8]
+
+ if {[catch {set author $blame_data($w,$commit,author)} err]} {
+ puts $err
+ set author {}
+ }
+
+ if {[catch {set atime $blame_data($w,$commit,author-time)}]} {
+ set atime {}
+ } else {
+ set atime [clock format $atime -format {%Y-%m-%d %T}]
+ }
+
+ while {$n > 0} {
+ $w_commit delete $lno.0 "$lno.0 lineend"
+ $w_author delete $lno.0 "$lno.0 lineend"
+ $w_date delete $lno.0 "$lno.0 lineend"
+
+ $w_commit insert $lno.0 $abbrev
+ $w_author insert $lno.0 $author
+ $w_date insert $lno.0 $atime
+ set blame_data($w,line$lno,commit) $commit
+
+ incr n -1
+ incr lno
+ }
+ } elseif {[regexp {^([a-z-]+) (.*)$} $line line header data]} {
+ set blame_data($w,$blame_data($w,commit),$header) $data
+ }
+ }
+
+ $w_commit conf -state disabled
+ $w_author conf -state disabled
+ $w_date conf -state disabled
+
+ if {[eof $fd]} {
+ close $fd
+ set blame_status($w) {Annotation complete.}
+ }
+}
+
+proc blame_highlight {w pos args} {
+ set lno [lindex [split [$w index $pos] .] 0]
+ foreach i $args {
+ $i tag remove in_sel 0.0 end
+ }
+ if {$lno eq {}} return
+ foreach i $args {
+ $i tag add in_sel $lno.0 "$lno.0 + 1 line"
+ }
+}
+
+proc blame_copycommit {w i pos} {
+ global blame_data
+ set lno [lindex [split [$i index $pos] .] 0]
+ if {![catch {set commit $blame_data($w,line$lno,commit)}]} {
+ clipboard clear
+ clipboard append \
+ -format STRING \
+ -type STRING \
+ -- $commit
+ }
+}
+
######################################################################
##
## icons
0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask
+image create bitmap file_dir -background white -foreground blue -data {
+#define mod_width 14
+#define mod_height 15
+static unsigned char mod_bits[] = {
+ 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
+ 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
+ 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
+} -maskdata $filemask
+
+image create bitmap file_uplevel -background white -foreground blue -data {
+#define mod_width 14
+#define mod_height 15
+static unsigned char mod_bits[] = {
+ 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
+ 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
+ 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
+} -maskdata $filemask
+
set ui_index .vpane.files.index.list
set ui_workdir .vpane.files.workdir.list
##
## util
-proc is_MacOSX {} {
- global tcl_platform tk_library
- if {[tk windowingsystem] eq {aqua}} {
- return 1
- }
- return 0
-}
-
-proc is_Windows {} {
- global tcl_platform
- if {$tcl_platform(platform) eq {windows}} {
- return 1
- }
- return 0
-}
-
proc bind_button3 {w cmd} {
bind $w <Any-Button-3> $cmd
if {[is_MacOSX]} {
}
}
+proc scrollbar2many {list mode args} {
+ foreach w $list {eval $w $mode $args}
+}
+
+proc many2scrollbar {list mode sb top bottom} {
+ $sb set $top $bottom
+ foreach w $list {$w $mode moveto $top}
+}
+
proc incr_font_size {font {amt 1}} {
set sz [font configure $font -size]
incr sz $amt
}
proc console_exec {w cmd after} {
- # -- Windows tosses the enviroment when we exec our child.
+ # -- Cygwin's Tcl tosses the enviroment when we exec our child.
# But most users need that so we have to relogin. :-(
#
- if {[is_Windows]} {
+ if {[is_Cygwin]} {
set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
}
set starting_gitk_msg {Starting gitk... please wait...}
proc do_gitk {revs} {
- global ui_status_value starting_gitk_msg
+ global env ui_status_value starting_gitk_msg
- set cmd gitk
+ # -- On Windows gitk is severly broken, and right now it seems like
+ # nobody cares about fixing it. The only known workaround is to
+ # always delete ~/.gitk before starting the program.
+ #
+ if {[is_Windows]} {
+ catch {file delete [file join $env(HOME) .gitk]}
+ }
+
+ # -- Always start gitk through whatever we were loaded with. This
+ # lets us bypass using shell process on Windows systems.
+ #
+ set cmd [info nameofexecutable]
+ lappend cmd [gitexec gitk]
if {$revs ne {}} {
append cmd { }
append cmd $revs
}
- if {[is_Windows]} {
- set cmd "sh -c \"exec $cmd\""
- }
- append cmd { &}
- if {[catch {eval exec $cmd} err]} {
+ if {[catch {eval exec $cmd &} err]} {
error_popup "Failed to start gitk:\n\n$err"
} else {
set ui_status_value $starting_gitk_msg
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 {
- {b pullsummary {Show Pull Summary}}
- {b trustmtime {Trust File Modification Timestamps}}
- {i diffcontext {Number of Diff Context Lines}}
- {t newbranchtemplate {New Branch Name Template}}
+ {b merge.summary {Summarize Merge Commits}}
+ {i-1..5 merge.verbosity {Merge Verbosity}}
+
+ {b gui.trustmtime {Trust File Modification Timestamps}}
+ {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
+ {t gui.newbranchtemplate {New Branch Name Template}}
} {
set type [lindex $option 0]
set name [lindex $option 1]
set text [lindex $option 2]
+ incr optid
foreach f {repo global} {
- switch $type {
+ switch -glob -- $type {
b {
- checkbutton $w.$f.$name -text $text \
- -variable ${f}_config_new(gui.$name) \
+ checkbutton $w.$f.$optid -text $text \
+ -variable ${f}_config_new($name) \
-onvalue true \
-offvalue false \
-font font_ui
- pack $w.$f.$name -side top -anchor w
+ pack $w.$f.$optid -side top -anchor w
}
- i {
- frame $w.$f.$name
- label $w.$f.$name.l -text "$text:" -font font_ui
- pack $w.$f.$name.l -side left -anchor w -fill x
- spinbox $w.$f.$name.v \
- -textvariable ${f}_config_new(gui.$name) \
- -from 1 -to 99 -increment 1 \
- -width 3 \
+ i-* {
+ regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
+ frame $w.$f.$optid
+ label $w.$f.$optid.l -text "$text:" -font font_ui
+ 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]}] \
-font font_ui
- bind $w.$f.$name.v <FocusIn> {%W selection range 0 end}
- pack $w.$f.$name.v -side right -anchor e -padx 5
- pack $w.$f.$name -side top -anchor w -fill x
+ 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.$name
- label $w.$f.$name.l -text "$text:" -font font_ui
- entry $w.$f.$name.v \
+ frame $w.$f.$optid
+ label $w.$f.$optid.l -text "$text:" -font font_ui
+ entry $w.$f.$optid.v \
-borderwidth 1 \
-relief sunken \
-width 20 \
- -textvariable ${f}_config_new(gui.$name) \
+ -textvariable ${f}_config_new($name) \
-font font_ui
- pack $w.$f.$name.l -side left -anchor w
- pack $w.$f.$name.v -side left -anchor w \
+ 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.$name -side top -anchor w -fill x
+ pack $w.$f.$optid -side top -anchor w -fill x
}
}
}
proc do_windows_shortcut {} {
global argv0
+ set fn [tk_getSaveFile \
+ -parent . \
+ -title "[appname] ([reponame]): Create Desktop Icon" \
+ -initialfile "Git [reponame].bat"]
+ if {$fn != {}} {
+ if {[catch {
+ set fd [open $fn w]
+ puts $fd "@ECHO Entering [reponame]"
+ puts $fd "@ECHO Starting git-gui... please wait..."
+ puts $fd "@SET PATH=[file normalize [gitexec]];%PATH%"
+ puts $fd "@SET GIT_DIR=[file normalize [gitdir]]"
+ puts -nonewline $fd "@\"[info nameofexecutable]\""
+ puts $fd " \"[file normalize $argv0]\""
+ close $fd
+ } err]} {
+ error_popup "Cannot write script:\n\n$err"
+ }
+ }
+}
+
+proc do_cygwin_shortcut {} {
+ global argv0
+
if {[catch {
set desktop [exec cygpath \
--windows \
set fd [open $exe w]
set gd [file normalize [gitdir]]
- set ep [file normalize [exec git --exec-path]]
+ set ep [file normalize [gitexec]]
regsub -all ' $gd "'\\''" gd
regsub -all ' $ep "'\\''" ep
puts $fd "#!/bin/sh"
}
}
+set default_config(merge.summary) false
+set default_config(merge.verbosity) 2
set default_config(gui.trustmtime) false
-set default_config(gui.pullsummary) true
set default_config(gui.diffcontext) 5
set default_config(gui.newbranchtemplate) {}
set default_config(gui.fontui) [font configure font_ui]
# -- Repository Menu
#
menu .mbar.repository
+
+.mbar.repository add command \
+ -label {Browse Current Branch} \
+ -command new_browser \
+ -font font_ui
+.mbar.repository add separator
+
.mbar.repository add command \
-label {Visualize Current Branch} \
-command {do_gitk {}} \
.mbar.repository add separator
- if {[is_Windows]} {
+ if {[is_Cygwin]} {
+ .mbar.repository add command \
+ -label {Create Desktop Icon} \
+ -command do_cygwin_shortcut \
+ -font font_ui
+ } elseif {[is_Windows]} {
.mbar.repository add command \
-label {Create Desktop Icon} \
-command do_windows_shortcut \
lappend disable_on_lock \
[list .mbar.tools entryconf [.mbar.tools index last] -state]
}
+}
- # -- Help Menu
- #
- .mbar add cascade -label Help -menu .mbar.help
- menu .mbar.help
+# -- Help Menu
+#
+.mbar add cascade -label Help -menu .mbar.help
+menu .mbar.help
+if {![is_MacOSX]} {
.mbar.help add command -label "About [appname]" \
-command do_about \
-font font_ui
}
+set browser {}
+catch {set browser $repo_config(instaweb.browser)}
+set doc_path [file dirname [gitexec]]
+set doc_path [file join $doc_path Documentation index.html]
+
+if {[is_Cygwin]} {
+ set doc_path [exec cygpath --windows $doc_path]
+}
+
+if {$browser eq {}} {
+ if {[is_MacOSX]} {
+ set browser open
+ } elseif {[is_Cygwin]} {
+ set program_files [file dirname [exec cygpath --windir]]
+ set program_files [file join $program_files {Program Files}]
+ set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
+ set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
+ if {[file exists $firefox]} {
+ set browser $firefox
+ } elseif {[file exists $ie]} {
+ set browser $ie
+ }
+ unset program_files firefox ie
+ }
+}
+
+if {[file isfile $doc_path]} {
+ set doc_url "file:$doc_path"
+} else {
+ set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
+}
+
+if {$browser ne {}} {
+ .mbar.help add command -label {Online Documentation} \
+ -command [list exec $browser $doc_url &] \
+ -font font_ui
+}
+unset browser doc_path doc_url
# -- Branch Control
#
# does *not* pass its env array onto any processes it spawns.
# This means that git processes get none of our environment.
#
-if {[is_Windows]} {
+if {[is_Cygwin]} {
set ignored_env 0
set suggest_user {}
set msg "Possible environment issues exist.
projects / git.git / blobdiff