2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 ||
test "z$*" = z--version
; \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
11 set appvers
{@@GITGUI_VERSION@@
}
13 Copyright ©
2006, 2007 Shawn Pearce
, et. al.
15 This program is free software
; you can redistribute it and
/or modify
16 it under the terms of the GNU General Public License as published by
17 the Free Software Foundation
; either version
2 of the License
, or
18 (at your option
) any later version.
20 This program is distributed
in the hope that it will be useful
,
21 but WITHOUT ANY WARRANTY
; without even the implied warranty of
22 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23 GNU General Public License
for more details.
25 You should have received a copy of the GNU General Public License
26 along with this program
; if not
, write to the Free Software
27 Foundation
, Inc.
, 59 Temple Place
, Suite
330, Boston
, MA
02111-1307 USA
}
29 ######################################################################
31 ## Tcl/Tk sanity check
33 if {[catch
{package require Tcl
8.4} err
]
34 ||
[catch
{package require Tk
8.4} err
]
40 -title "git-gui: fatal error" \
45 ######################################################################
47 ## enable verbose loading?
49 if {![catch
{set _verbose
$env(GITGUI_VERBOSE
)}]} {
51 rename auto_load real__auto_load
52 proc auto_load
{name args
} {
53 puts stderr
"auto_load $name"
54 return [uplevel
1 real__auto_load
$name $args]
56 rename
source real__source
58 puts stderr
"source $name"
59 uplevel
1 real__source
$name
63 ######################################################################
65 ## configure our library
67 set oguilib
{@@GITGUI_LIBDIR@@
}
68 set oguirel
{@@GITGUI_RELATIVE@@
}
69 if {$oguirel eq
{1}} {
70 set oguilib
[file dirname [file dirname [file normalize
$argv0]]]
71 set oguilib
[file join $oguilib share git-gui lib
]
72 } elseif
{[string match @@
* $oguirel]} {
73 set oguilib
[file join [file dirname [file normalize
$argv0]] lib
]
76 set idx
[file join $oguilib tclIndex
]
77 if {[catch
{set fd
[open
$idx r
]} err
]} {
82 -title "git-gui: fatal error" \
86 if {[gets
$fd] eq
{# Autogenerated by git-gui Makefile}} {
88 while {[gets
$fd n
] >= 0} {
89 if {$n ne
{} && ![string match
#* $n]} {
101 if {[lsearch
-exact $loaded $p] >= 0} continue
102 source [file join $oguilib $p]
107 set auto_path
[concat
[list
$oguilib] $auto_path]
109 unset -nocomplain oguirel idx fd
111 ######################################################################
115 set _appname
[lindex
[file split $argv0] end
]
131 return [eval [concat
[list
file join $_gitdir] $args]]
134 proc gitexec
{args
} {
136 if {$_gitexec eq
{}} {
137 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
138 error
"Git not installed?\n\n$err"
144 return [eval [concat
[list
file join $_gitexec] $args]]
153 global tcl_platform tk_library
154 if {[tk windowingsystem
] eq
{aqua
}} {
162 if {$tcl_platform(platform
) eq
{windows
}} {
169 global tcl_platform _iscygwin
170 if {$_iscygwin eq
{}} {
171 if {$tcl_platform(platform
) eq
{windows
}} {
172 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
184 proc is_enabled
{option
} {
185 global enabled_options
186 if {[catch
{set on
$enabled_options($option)}]} {return 0}
190 proc enable_option
{option
} {
191 global enabled_options
192 set enabled_options
($option) 1
195 proc disable_option
{option
} {
196 global enabled_options
197 set enabled_options
($option) 0
200 ######################################################################
204 proc is_many_config
{name
} {
205 switch
-glob -- $name {
214 proc is_config_true
{name
} {
216 if {[catch
{set v
$repo_config($name)}]} {
218 } elseif
{$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes}} {
225 proc get_config
{name
} {
227 if {[catch
{set v
$repo_config($name)}]} {
234 proc load_config
{include_global
} {
235 global repo_config global_config default_config
237 array
unset global_config
238 if {$include_global} {
240 set fd_rc
[open
"| git config --global --list" r
]
241 while {[gets
$fd_rc line
] >= 0} {
242 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
243 if {[is_many_config
$name]} {
244 lappend global_config
($name) $value
246 set global_config
($name) $value
254 array
unset repo_config
256 set fd_rc
[open
"| git config --list" r
]
257 while {[gets
$fd_rc line
] >= 0} {
258 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
259 if {[is_many_config
$name]} {
260 lappend repo_config
($name) $value
262 set repo_config
($name) $value
269 foreach name
[array names default_config
] {
270 if {[catch
{set v
$global_config($name)}]} {
271 set global_config
($name) $default_config($name)
273 if {[catch
{set v
$repo_config($name)}]} {
274 set repo_config
($name) $default_config($name)
279 ######################################################################
284 return [eval exec git
$args]
287 proc current-branch
{} {
289 set fd
[open
[gitdir HEAD
] r
]
290 if {[gets
$fd ref
] <16
291 ||
![regsub
{^ref
: refs
/heads
/} $ref {} ref
]} {
298 auto_load tk_optionMenu
299 rename tk_optionMenu real__tkOptionMenu
300 proc tk_optionMenu
{w varName args
} {
301 set m
[eval real__tkOptionMenu
$w $varName $args]
302 $m configure
-font font_ui
303 $w configure
-font font_ui
307 ######################################################################
311 if {[catch
{set _git_version
[git
--version]} err
]} {
312 catch
{wm withdraw .
}
313 error_popup
"Cannot determine Git version:
317 [appname] requires Git 1.5.0 or later."
320 if {![regsub
{^git version
} $_git_version {} _git_version
]} {
321 catch
{wm withdraw .
}
322 error_popup
"Cannot parse Git version string:\n\n$_git_version"
325 regsub
{\.
[0-9]+\.g
[0-9a-f]+$
} $_git_version {} _git_version
326 regsub
{\.rc
[0-9]+$
} $_git_version {} _git_version
328 proc git-version
{args
} {
331 switch
[llength
$args] {
337 set op
[lindex
$args 0]
338 set vr
[lindex
$args 1]
339 set cm
[package vcompare
$_git_version $vr]
340 return [expr $cm $op 0]
344 set type [lindex
$args 0]
345 set name
[lindex
$args 1]
346 set parm
[lindex
$args 2]
347 set body
[lindex
$args 3]
349 if {($type ne
{proc
} && $type ne
{method
})} {
350 error
"Invalid arguments to git-version"
352 if {[llength
$body] < 2 ||
[lindex
$body end-1
] ne
{default
}} {
353 error
"Last arm of $type $name must be default"
356 foreach
{op vr cb
} [lrange
$body 0 end-2
] {
357 if {[git-version
$op $vr]} {
358 return [uplevel
[list
$type $name $parm $cb]]
362 return [uplevel
[list
$type $name $parm [lindex
$body end
]]]
366 error
"git-version >= x"
372 if {[git-version
< 1.5]} {
373 catch
{wm withdraw .
}
374 error_popup
"[appname] requires Git 1.5.0 or later.
376 You are using [git-version]:
382 ######################################################################
387 set _gitdir
$env(GIT_DIR
)
391 set _gitdir
[git rev-parse
--git-dir]
392 set _prefix
[git rev-parse
--show-prefix]
394 catch
{wm withdraw .
}
395 error_popup
"Cannot find the git directory:\n\n$err"
398 if {![file isdirectory
$_gitdir] && [is_Cygwin
]} {
399 catch
{set _gitdir
[exec cygpath
--unix $_gitdir]}
401 if {![file isdirectory
$_gitdir]} {
402 catch
{wm withdraw .
}
403 error_popup
"Git directory not found:\n\n$_gitdir"
406 if {[lindex
[file split $_gitdir] end
] ne
{.git
}} {
407 catch
{wm withdraw .
}
408 error_popup
"Cannot use funny .git directory:\n\n$_gitdir"
411 if {[catch
{cd [file dirname $_gitdir]} err
]} {
412 catch
{wm withdraw .
}
413 error_popup
"No working directory [file dirname $_gitdir]:\n\n$err"
416 set _reponame
[lindex
[file split \
417 [file normalize
[file dirname $_gitdir]]] \
420 ######################################################################
424 set current_diff_path
{}
425 set current_diff_side
{}
426 set diff_actions
[list
]
427 set ui_status_value
{Initializing...
}
431 set MERGE_HEAD
[list
]
434 set current_branch
{}
435 set current_diff_path
{}
436 set selected_commit_type new
438 ######################################################################
446 set disable_on_lock
[list
]
447 set index_lock_type none
449 proc lock_index
{type} {
450 global index_lock_type disable_on_lock
452 if {$index_lock_type eq
{none
}} {
453 set index_lock_type
$type
454 foreach w
$disable_on_lock {
455 uplevel
#0 $w disabled
458 } elseif
{$index_lock_type eq
"begin-$type"} {
459 set index_lock_type
$type
465 proc unlock_index
{} {
466 global index_lock_type disable_on_lock
468 set index_lock_type none
469 foreach w
$disable_on_lock {
474 ######################################################################
478 proc repository_state
{ctvar hdvar mhvar
} {
479 global current_branch
480 upvar
$ctvar ct
$hdvar hd
$mhvar mh
484 set current_branch
[current-branch
]
485 if {[catch
{set hd
[git rev-parse
--verify HEAD
]}]} {
491 set merge_head
[gitdir MERGE_HEAD
]
492 if {[file exists
$merge_head]} {
494 set fd_mh
[open
$merge_head r
]
495 while {[gets
$fd_mh line
] >= 0} {
506 global PARENT empty_tree
508 set p
[lindex
$PARENT 0]
512 if {$empty_tree eq
{}} {
513 set empty_tree
[git mktree
<< {}]
518 proc rescan
{after
{honor_trustmtime
1}} {
519 global HEAD PARENT MERGE_HEAD commit_type
520 global ui_index ui_workdir ui_status_value ui_comm
521 global rescan_active file_states
524 if {$rescan_active > 0 ||
![lock_index
read]} return
526 repository_state newType newHEAD newMERGE_HEAD
527 if {[string match amend
* $commit_type]
528 && $newType eq
{normal
}
529 && $newHEAD eq
$HEAD} {
533 set MERGE_HEAD
$newMERGE_HEAD
534 set commit_type
$newType
537 array
unset file_states
539 if {![$ui_comm edit modified
]
540 ||
[string trim
[$ui_comm get
0.0 end
]] eq
{}} {
541 if {[string match amend
* $commit_type]} {
542 } elseif
{[load_message GITGUI_MSG
]} {
543 } elseif
{[load_message MERGE_MSG
]} {
544 } elseif
{[load_message SQUASH_MSG
]} {
547 $ui_comm edit modified false
550 if {[is_enabled branch
]} {
555 if {$honor_trustmtime && $repo_config(gui.trustmtime
) eq
{true
}} {
556 rescan_stage2
{} $after
559 set ui_status_value
{Refreshing
file status...
}
560 set cmd
[list git update-index
]
562 lappend cmd
--unmerged
563 lappend cmd
--ignore-missing
564 lappend cmd
--refresh
565 set fd_rf
[open
"| $cmd" r
]
566 fconfigure
$fd_rf -blocking 0 -translation binary
567 fileevent
$fd_rf readable \
568 [list rescan_stage2
$fd_rf $after]
572 proc rescan_stage2
{fd after
} {
573 global ui_status_value
574 global rescan_active buf_rdi buf_rdf buf_rlo
578 if {![eof
$fd]} return
582 set ls_others
[list | git ls-files
--others -z \
583 --exclude-per-directory=.gitignore
]
584 set info_exclude
[gitdir info exclude
]
585 if {[file readable
$info_exclude]} {
586 lappend ls_others
"--exclude-from=$info_exclude"
594 set ui_status_value
{Scanning
for modified files ...
}
595 set fd_di
[open
"| git diff-index --cached -z [PARENT]" r
]
596 set fd_df
[open
"| git diff-files -z" r
]
597 set fd_lo
[open
$ls_others r
]
599 fconfigure
$fd_di -blocking 0 -translation binary
-encoding binary
600 fconfigure
$fd_df -blocking 0 -translation binary
-encoding binary
601 fconfigure
$fd_lo -blocking 0 -translation binary
-encoding binary
602 fileevent
$fd_di readable
[list read_diff_index
$fd_di $after]
603 fileevent
$fd_df readable
[list read_diff_files
$fd_df $after]
604 fileevent
$fd_lo readable
[list read_ls_others
$fd_lo $after]
607 proc load_message
{file} {
611 if {[file isfile
$f]} {
612 if {[catch
{set fd
[open
$f r
]}]} {
615 set content
[string trim
[read $fd]]
617 regsub
-all -line {[ \r\t]+$
} $content {} content
618 $ui_comm delete
0.0 end
619 $ui_comm insert end
$content
625 proc read_diff_index
{fd after
} {
628 append buf_rdi
[read $fd]
630 set n
[string length
$buf_rdi]
632 set z1
[string first
"\0" $buf_rdi $c]
635 set z2
[string first
"\0" $buf_rdi $z1]
639 set i
[split [string range
$buf_rdi $c [expr {$z1 - 2}]] { }]
640 set p
[string range
$buf_rdi $z1 [expr {$z2 - 1}]]
642 [encoding convertfrom
$p] \
644 [list
[lindex
$i 0] [lindex
$i 2]] \
650 set buf_rdi
[string range
$buf_rdi $c end
]
655 rescan_done
$fd buf_rdi
$after
658 proc read_diff_files
{fd after
} {
661 append buf_rdf
[read $fd]
663 set n
[string length
$buf_rdf]
665 set z1
[string first
"\0" $buf_rdf $c]
668 set z2
[string first
"\0" $buf_rdf $z1]
672 set i
[split [string range
$buf_rdf $c [expr {$z1 - 2}]] { }]
673 set p
[string range
$buf_rdf $z1 [expr {$z2 - 1}]]
675 [encoding convertfrom
$p] \
678 [list
[lindex
$i 0] [lindex
$i 2]]
683 set buf_rdf
[string range
$buf_rdf $c end
]
688 rescan_done
$fd buf_rdf
$after
691 proc read_ls_others
{fd after
} {
694 append buf_rlo
[read $fd]
695 set pck
[split $buf_rlo "\0"]
696 set buf_rlo
[lindex
$pck end
]
697 foreach p
[lrange
$pck 0 end-1
] {
698 merge_state
[encoding convertfrom
$p] ?O
700 rescan_done
$fd buf_rlo
$after
703 proc rescan_done
{fd buf after
} {
704 global rescan_active current_diff_path
705 global file_states repo_config
708 if {![eof
$fd]} return
711 if {[incr rescan_active
-1] > 0} return
716 if {$current_diff_path ne
{}} reshow_diff
720 proc prune_selection
{} {
721 global file_states selected_paths
723 foreach path
[array names selected_paths
] {
724 if {[catch
{set still_here
$file_states($path)}]} {
725 unset selected_paths
($path)
730 ######################################################################
734 proc mapicon
{w state path
} {
737 if {[catch
{set r
$all_icons($state$w)}]} {
738 puts
"error: no icon for $w state={$state} $path"
744 proc mapdesc
{state path
} {
747 if {[catch
{set r
$all_descs($state)}]} {
748 puts
"error: no desc for state={$state} $path"
754 proc escape_path
{path
} {
755 regsub
-all {\\} $path "\\\\" path
756 regsub
-all "\n" $path "\\n" path
760 proc short_path
{path
} {
761 return [escape_path
[lindex
[file split $path] end
]]
765 set null_sha1
[string repeat
0 40]
767 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
768 global file_states next_icon_id null_sha1
770 set s0
[string index
$new_state 0]
771 set s1
[string index
$new_state 1]
773 if {[catch
{set info
$file_states($path)}]} {
775 set icon n
[incr next_icon_id
]
777 set state
[lindex
$info 0]
778 set icon
[lindex
$info 1]
779 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
780 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
783 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
784 elseif
{$s0 eq
{_
}} {set s0 _
}
786 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
787 elseif
{$s1 eq
{_
}} {set s1 _
}
789 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
790 set head_info
[list
0 $null_sha1]
791 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
792 && $head_info eq
{}} {
793 set head_info
$index_info
796 set file_states
($path) [list
$s0$s1 $icon \
797 $head_info $index_info \
802 proc display_file_helper
{w path icon_name old_m new_m
} {
806 set lno
[lsearch
-sorted -exact $file_lists($w) $path]
808 set file_lists
($w) [lreplace
$file_lists($w) $lno $lno]
810 $w conf
-state normal
811 $w delete
$lno.0 [expr {$lno + 1}].0
812 $w conf
-state disabled
814 } elseif
{$old_m eq
{_
} && $new_m ne
{_
}} {
815 lappend file_lists
($w) $path
816 set file_lists
($w) [lsort
-unique $file_lists($w)]
817 set lno
[lsearch
-sorted -exact $file_lists($w) $path]
819 $w conf
-state normal
820 $w image create
$lno.0 \
821 -align center
-padx 5 -pady 1 \
823 -image [mapicon
$w $new_m $path]
824 $w insert
$lno.1 "[escape_path $path]\n"
825 $w conf
-state disabled
826 } elseif
{$old_m ne
$new_m} {
827 $w conf
-state normal
828 $w image conf
$icon_name -image [mapicon
$w $new_m $path]
829 $w conf
-state disabled
833 proc display_file
{path state
} {
834 global file_states selected_paths
835 global ui_index ui_workdir
837 set old_m
[merge_state
$path $state]
838 set s
$file_states($path)
839 set new_m
[lindex
$s 0]
840 set icon_name
[lindex
$s 1]
842 set o
[string index
$old_m 0]
843 set n
[string index
$new_m 0]
850 display_file_helper
$ui_index $path $icon_name $o $n
852 if {[string index
$old_m 0] eq
{U
}} {
855 set o
[string index
$old_m 1]
857 if {[string index
$new_m 0] eq
{U
}} {
860 set n
[string index
$new_m 1]
862 display_file_helper
$ui_workdir $path $icon_name $o $n
864 if {$new_m eq
{__
}} {
865 unset file_states
($path)
866 catch
{unset selected_paths
($path)}
870 proc display_all_files_helper
{w path icon_name m
} {
873 lappend file_lists
($w) $path
874 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
875 $w image create end \
876 -align center
-padx 5 -pady 1 \
878 -image [mapicon
$w $m $path]
879 $w insert end
"[escape_path $path]\n"
882 proc display_all_files
{} {
883 global ui_index ui_workdir
884 global file_states file_lists
887 $ui_index conf
-state normal
888 $ui_workdir conf
-state normal
890 $ui_index delete
0.0 end
891 $ui_workdir delete
0.0 end
894 set file_lists
($ui_index) [list
]
895 set file_lists
($ui_workdir) [list
]
897 foreach path
[lsort
[array names file_states
]] {
898 set s
$file_states($path)
900 set icon_name
[lindex
$s 1]
902 set s
[string index
$m 0]
903 if {$s ne
{U
} && $s ne
{_
}} {
904 display_all_files_helper
$ui_index $path \
908 if {[string index
$m 0] eq
{U
}} {
911 set s
[string index
$m 1]
914 display_all_files_helper
$ui_workdir $path \
919 $ui_index conf
-state disabled
920 $ui_workdir conf
-state disabled
923 ######################################################################
928 #define mask_width 14
929 #define mask_height 15
930 static unsigned char mask_bits
[] = {
931 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
932 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
933 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
936 image create bitmap file_plain
-background white
-foreground black
-data {
937 #define plain_width 14
938 #define plain_height 15
939 static unsigned char plain_bits
[] = {
940 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
941 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
942 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
943 } -maskdata $filemask
945 image create bitmap file_mod
-background white
-foreground blue
-data {
947 #define mod_height 15
948 static unsigned char mod_bits
[] = {
949 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
950 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
951 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
952 } -maskdata $filemask
954 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
955 #define file_fulltick_width 14
956 #define file_fulltick_height 15
957 static unsigned char file_fulltick_bits
[] = {
958 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
959 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
960 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
961 } -maskdata $filemask
963 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
964 #define parttick_width 14
965 #define parttick_height 15
966 static unsigned char parttick_bits
[] = {
967 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
968 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
969 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
970 } -maskdata $filemask
972 image create bitmap file_question
-background white
-foreground black
-data {
973 #define file_question_width 14
974 #define file_question_height 15
975 static unsigned char file_question_bits
[] = {
976 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
977 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
978 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
979 } -maskdata $filemask
981 image create bitmap file_removed
-background white
-foreground red
-data {
982 #define file_removed_width 14
983 #define file_removed_height 15
984 static unsigned char file_removed_bits
[] = {
985 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
986 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
987 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
988 } -maskdata $filemask
990 image create bitmap file_merge
-background white
-foreground blue
-data {
991 #define file_merge_width 14
992 #define file_merge_height 15
993 static unsigned char file_merge_bits
[] = {
994 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
995 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
996 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
997 } -maskdata $filemask
1000 #define file_width 18
1001 #define file_height 18
1002 static unsigned char file_bits
[] = {
1003 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
1004 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
1005 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
1006 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
1007 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
1009 image create bitmap file_dir
-background white
-foreground blue \
1010 -data $file_dir_data -maskdata $file_dir_data
1013 set file_uplevel_data
{
1015 #define up_height 15
1016 static unsigned char up_bits
[] = {
1017 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
1018 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
1019 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
1021 image create bitmap file_uplevel
-background white
-foreground red \
1022 -data $file_uplevel_data -maskdata $file_uplevel_data
1023 unset file_uplevel_data
1025 set ui_index .vpane.files.index.list
1026 set ui_workdir .vpane.files.workdir.list
1028 set all_icons
(_
$ui_index) file_plain
1029 set all_icons
(A
$ui_index) file_fulltick
1030 set all_icons
(M
$ui_index) file_fulltick
1031 set all_icons
(D
$ui_index) file_removed
1032 set all_icons
(U
$ui_index) file_merge
1034 set all_icons
(_
$ui_workdir) file_plain
1035 set all_icons
(M
$ui_workdir) file_mod
1036 set all_icons
(D
$ui_workdir) file_question
1037 set all_icons
(U
$ui_workdir) file_merge
1038 set all_icons
(O
$ui_workdir) file_plain
1040 set max_status_desc
0
1044 {_M
"Modified, not staged"}
1045 {M_
"Staged for commit"}
1046 {MM
"Portions staged for commit"}
1047 {MD
"Staged for commit, missing"}
1049 {_O
"Untracked, not staged"}
1050 {A_
"Staged for commit"}
1051 {AM
"Portions staged for commit"}
1052 {AD
"Staged for commit, missing"}
1055 {D_
"Staged for removal"}
1056 {DO
"Staged for removal, still present"}
1058 {U_
"Requires merge resolution"}
1059 {UU
"Requires merge resolution"}
1060 {UM
"Requires merge resolution"}
1061 {UD
"Requires merge resolution"}
1063 if {$max_status_desc < [string length
[lindex
$i 1]]} {
1064 set max_status_desc
[string length
[lindex
$i 1]]
1066 set all_descs
([lindex
$i 0]) [lindex
$i 1]
1070 ######################################################################
1074 proc bind_button3
{w cmd
} {
1075 bind $w <Any-Button-3
> $cmd
1077 bind $w <Control-Button-1
> $cmd
1081 proc scrollbar2many
{list mode args
} {
1082 foreach w
$list {eval $w $mode $args}
1085 proc many2scrollbar
{list mode sb top bottom
} {
1086 $sb set $top $bottom
1087 foreach w
$list {$w $mode moveto
$top}
1090 proc incr_font_size
{font
{amt
1}} {
1091 set sz
[font configure
$font -size]
1093 font configure
$font -size $sz
1094 font configure
${font}bold
-size $sz
1095 font configure
${font}italic
-size $sz
1098 ######################################################################
1102 set starting_gitk_msg
{Starting gitk... please
wait...
}
1104 proc do_gitk
{revs
} {
1105 global env ui_status_value starting_gitk_msg
1107 # -- Always start gitk through whatever we were loaded with. This
1108 # lets us bypass using shell process on Windows systems.
1110 set cmd
[list
[info nameofexecutable
]]
1111 set exe
[gitexec gitk
]
1118 if {! [file exists
$exe]} {
1119 error_popup
"Unable to start gitk:\n\n$exe does not exist"
1122 set ui_status_value
$starting_gitk_msg
1124 if {$ui_status_value eq
$starting_gitk_msg} {
1125 set ui_status_value
{Ready.
}
1134 global ui_comm is_quitting repo_config commit_type
1136 if {$is_quitting} return
1139 if {[winfo exists
$ui_comm]} {
1140 # -- Stash our current commit buffer.
1142 set save
[gitdir GITGUI_MSG
]
1143 set msg
[string trim
[$ui_comm get
0.0 end
]]
1144 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1145 if {(![string match amend
* $commit_type]
1146 ||
[$ui_comm edit modified
])
1149 set fd
[open
$save w
]
1150 puts
-nonewline $fd $msg
1154 catch
{file delete
$save}
1157 # -- Stash our current window geometry into this repository.
1159 set cfg_geometry
[list
]
1160 lappend cfg_geometry
[wm geometry .
]
1161 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
1162 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
1163 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1166 if {$cfg_geometry ne
$rc_geometry} {
1167 catch
{git config gui.geometry
$cfg_geometry}
1175 rescan
{set ui_status_value
{Ready.
}}
1182 proc toggle_or_diff
{w x y
} {
1183 global file_states file_lists current_diff_path ui_index ui_workdir
1184 global last_clicked selected_paths
1186 set pos
[split [$w index @
$x,$y] .
]
1187 set lno
[lindex
$pos 0]
1188 set col [lindex
$pos 1]
1189 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1195 set last_clicked
[list
$w $lno]
1196 array
unset selected_paths
1197 $ui_index tag remove in_sel
0.0 end
1198 $ui_workdir tag remove in_sel
0.0 end
1201 if {$current_diff_path eq
$path} {
1202 set after
{reshow_diff
;}
1206 if {$w eq
$ui_index} {
1208 "Unstaging [short_path $path] from commit" \
1210 [concat
$after {set ui_status_value
{Ready.
}}]
1211 } elseif
{$w eq
$ui_workdir} {
1213 "Adding [short_path $path]" \
1215 [concat
$after {set ui_status_value
{Ready.
}}]
1218 show_diff
$path $w $lno
1222 proc add_one_to_selection
{w x y
} {
1223 global file_lists last_clicked selected_paths
1225 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1226 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1232 if {$last_clicked ne
{}
1233 && [lindex
$last_clicked 0] ne
$w} {
1234 array
unset selected_paths
1235 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
1238 set last_clicked
[list
$w $lno]
1239 if {[catch
{set in_sel
$selected_paths($path)}]} {
1243 unset selected_paths
($path)
1244 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
1246 set selected_paths
($path) 1
1247 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1251 proc add_range_to_selection
{w x y
} {
1252 global file_lists last_clicked selected_paths
1254 if {[lindex
$last_clicked 0] ne
$w} {
1255 toggle_or_diff
$w $x $y
1259 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1260 set lc
[lindex
$last_clicked 1]
1269 foreach path
[lrange
$file_lists($w) \
1270 [expr {$begin - 1}] \
1271 [expr {$end - 1}]] {
1272 set selected_paths
($path) 1
1274 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
1277 ######################################################################
1281 set cursor_ptr arrow
1282 font create font_diff
-family Courier
-size 10
1286 eval font configure font_ui
[font actual
[.dummy cget
-font]]
1290 font create font_uiitalic
1291 font create font_uibold
1292 font create font_diffbold
1293 font create font_diffitalic
1295 foreach class
{Button Checkbutton Entry Label
1296 Labelframe Listbox Menu Message
1297 Radiobutton Spinbox Text
} {
1298 option add
*$class.font font_ui
1302 if {[is_Windows
] ||
[is_MacOSX
]} {
1303 option add
*Menu.tearOff
0
1314 proc apply_config
{} {
1315 global repo_config font_descs
1317 foreach option
$font_descs {
1318 set name
[lindex
$option 0]
1319 set font
[lindex
$option 1]
1321 foreach
{cn cv
} $repo_config(gui.
$name) {
1322 font configure
$font $cn $cv
1325 error_popup
"Invalid font specified in gui.$name:\n\n$err"
1327 foreach
{cn cv
} [font configure
$font] {
1328 font configure
${font}bold
$cn $cv
1329 font configure
${font}italic
$cn $cv
1331 font configure
${font}bold
-weight bold
1332 font configure
${font}italic
-slant italic
1336 set default_config
(merge.diffstat
) true
1337 set default_config
(merge.summary
) false
1338 set default_config
(merge.verbosity
) 2
1339 set default_config
(user.name
) {}
1340 set default_config
(user.email
) {}
1342 set default_config
(gui.pruneduringfetch
) false
1343 set default_config
(gui.trustmtime
) false
1344 set default_config
(gui.diffcontext
) 5
1345 set default_config
(gui.newbranchtemplate
) {}
1346 set default_config
(gui.fontui
) [font configure font_ui
]
1347 set default_config
(gui.fontdiff
) [font configure font_diff
]
1349 {fontui font_ui
{Main Font
}}
1350 {fontdiff font_diff
{Diff
/Console Font
}}
1355 ######################################################################
1357 ## feature option selection
1359 if {[regexp
{^git-
(.
+)$
} [appname
] _junk subcommand
]} {
1364 if {$subcommand eq
{gui.sh
}} {
1367 if {$subcommand eq
{gui
} && [llength
$argv] > 0} {
1368 set subcommand
[lindex
$argv 0]
1369 set argv
[lrange
$argv 1 end
]
1372 enable_option multicommit
1373 enable_option branch
1374 enable_option transport
1376 switch
-- $subcommand {
1379 disable_option multicommit
1380 disable_option branch
1381 disable_option transport
1384 enable_option singlecommit
1386 disable_option multicommit
1387 disable_option branch
1388 disable_option transport
1392 ######################################################################
1400 menu .mbar
-tearoff 0
1401 .mbar add cascade
-label Repository
-menu .mbar.repository
1402 .mbar add cascade
-label Edit
-menu .mbar.edit
1403 if {[is_enabled branch
]} {
1404 .mbar add cascade
-label Branch
-menu .mbar.branch
1406 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
1407 .mbar add cascade
-label Commit
-menu .mbar.commit
1409 if {[is_enabled transport
]} {
1410 .mbar add cascade
-label Merge
-menu .mbar.merge
1411 .mbar add cascade
-label Fetch
-menu .mbar.fetch
1412 .mbar add cascade
-label Push
-menu .mbar.push
1414 . configure
-menu .mbar
1416 # -- Repository Menu
1418 menu .mbar.repository
1420 .mbar.repository add
command \
1421 -label {Browse Current Branch
} \
1422 -command {browser
::new
$current_branch}
1423 trace add variable current_branch
write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
1424 .mbar.repository add separator
1426 .mbar.repository add
command \
1427 -label {Visualize Current Branch
} \
1428 -command {do_gitk
$current_branch}
1429 trace add variable current_branch
write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
1430 .mbar.repository add
command \
1431 -label {Visualize All Branches
} \
1432 -command {do_gitk
--all}
1433 .mbar.repository add separator
1435 if {[is_enabled multicommit
]} {
1436 .mbar.repository add
command -label {Database Statistics
} \
1439 .mbar.repository add
command -label {Compress Database
} \
1442 .mbar.repository add
command -label {Verify Database
} \
1443 -command do_fsck_objects
1445 .mbar.repository add separator
1448 .mbar.repository add
command \
1449 -label {Create Desktop Icon
} \
1450 -command do_cygwin_shortcut
1451 } elseif
{[is_Windows
]} {
1452 .mbar.repository add
command \
1453 -label {Create Desktop Icon
} \
1454 -command do_windows_shortcut
1455 } elseif
{[is_MacOSX
]} {
1456 .mbar.repository add
command \
1457 -label {Create Desktop Icon
} \
1458 -command do_macosx_app
1462 .mbar.repository add
command -label Quit \
1469 .mbar.edit add
command -label Undo \
1470 -command {catch
{[focus
] edit undo
}} \
1472 .mbar.edit add
command -label Redo \
1473 -command {catch
{[focus
] edit redo
}} \
1475 .mbar.edit add separator
1476 .mbar.edit add
command -label Cut \
1477 -command {catch
{tk_textCut
[focus
]}} \
1479 .mbar.edit add
command -label Copy \
1480 -command {catch
{tk_textCopy
[focus
]}} \
1482 .mbar.edit add
command -label Paste \
1483 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
1485 .mbar.edit add
command -label Delete \
1486 -command {catch
{[focus
] delete sel.first sel.last
}} \
1488 .mbar.edit add separator
1489 .mbar.edit add
command -label {Select All
} \
1490 -command {catch
{[focus
] tag add sel
0.0 end
}} \
1495 if {[is_enabled branch
]} {
1498 .mbar.branch add
command -label {Create...
} \
1499 -command branch_create
::dialog \
1501 lappend disable_on_lock
[list .mbar.branch entryconf \
1502 [.mbar.branch index last
] -state]
1504 .mbar.branch add
command -label {Rename...
} \
1505 -command branch_rename
::dialog
1506 lappend disable_on_lock
[list .mbar.branch entryconf \
1507 [.mbar.branch index last
] -state]
1509 .mbar.branch add
command -label {Delete...
} \
1510 -command branch_delete
::dialog
1511 lappend disable_on_lock
[list .mbar.branch entryconf \
1512 [.mbar.branch index last
] -state]
1514 .mbar.branch add
command -label {Reset...
} \
1515 -command merge
::reset_hard
1516 lappend disable_on_lock
[list .mbar.branch entryconf \
1517 [.mbar.branch index last
] -state]
1522 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
1525 .mbar.commit add radiobutton \
1526 -label {New Commit
} \
1527 -command do_select_commit_type \
1528 -variable selected_commit_type \
1530 lappend disable_on_lock \
1531 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1533 .mbar.commit add radiobutton \
1534 -label {Amend Last Commit
} \
1535 -command do_select_commit_type \
1536 -variable selected_commit_type \
1538 lappend disable_on_lock \
1539 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1541 .mbar.commit add separator
1543 .mbar.commit add
command -label Rescan \
1544 -command do_rescan \
1546 lappend disable_on_lock \
1547 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1549 .mbar.commit add
command -label {Add To Commit
} \
1550 -command do_add_selection
1551 lappend disable_on_lock \
1552 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1554 .mbar.commit add
command -label {Add Existing To Commit
} \
1555 -command do_add_all \
1557 lappend disable_on_lock \
1558 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1560 .mbar.commit add
command -label {Unstage From Commit
} \
1561 -command do_unstage_selection
1562 lappend disable_on_lock \
1563 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1565 .mbar.commit add
command -label {Revert Changes
} \
1566 -command do_revert_selection
1567 lappend disable_on_lock \
1568 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1570 .mbar.commit add separator
1572 .mbar.commit add
command -label {Sign Off
} \
1573 -command do_signoff \
1576 .mbar.commit add
command -label Commit \
1577 -command do_commit \
1578 -accelerator $M1T-Return
1579 lappend disable_on_lock \
1580 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
1585 if {[is_enabled branch
]} {
1587 .mbar.merge add
command -label {Local Merge...
} \
1588 -command merge
::dialog
1589 lappend disable_on_lock \
1590 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
1591 .mbar.merge add
command -label {Abort Merge...
} \
1592 -command merge
::reset_hard
1593 lappend disable_on_lock \
1594 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
1600 if {[is_enabled transport
]} {
1604 .mbar.push add
command -label {Push...
} \
1605 -command do_push_anywhere \
1607 .mbar.push add
command -label {Delete...
} \
1608 -command remote_branch_delete
::dialog
1612 # -- Apple Menu (Mac OS X only)
1614 .mbar add cascade
-label Apple
-menu .mbar.apple
1617 .mbar.apple add
command -label "About [appname]" \
1619 .mbar.apple add
command -label "Options..." \
1624 .mbar.edit add separator
1625 .mbar.edit add
command -label {Options...
} \
1630 if {[is_Cygwin
] && [file exists
/usr
/local
/miga
/lib
/gui-miga
]} {
1632 global ui_status_value
1633 if {![lock_index update
]} return
1634 set cmd
[list sh
--login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
1635 set miga_fd
[open
"|$cmd" r
]
1636 fconfigure
$miga_fd -blocking 0
1637 fileevent
$miga_fd readable
[list miga_done
$miga_fd]
1638 set ui_status_value
{Running miga...
}
1640 proc miga_done
{fd
} {
1645 rescan
[list
set ui_status_value
{Ready.
}]
1648 .mbar add cascade
-label Tools
-menu .mbar.tools
1650 .mbar.tools add
command -label "Migrate" \
1652 lappend disable_on_lock \
1653 [list .mbar.tools entryconf
[.mbar.tools index last
] -state]
1659 .mbar add cascade
-label Help
-menu .mbar.
help
1663 .mbar.
help add
command -label "About [appname]" \
1668 catch
{set browser
$repo_config(instaweb.browser
)}
1669 set doc_path
[file dirname [gitexec
]]
1670 set doc_path
[file join $doc_path Documentation index.html
]
1673 set doc_path
[exec cygpath
--mixed $doc_path]
1676 if {$browser eq
{}} {
1679 } elseif
{[is_Cygwin
]} {
1680 set program_files
[file dirname [exec cygpath
--windir]]
1681 set program_files
[file join $program_files {Program Files
}]
1682 set firefox
[file join $program_files {Mozilla Firefox
} firefox.exe
]
1683 set ie
[file join $program_files {Internet Explorer
} IEXPLORE.EXE
]
1684 if {[file exists
$firefox]} {
1685 set browser
$firefox
1686 } elseif
{[file exists
$ie]} {
1689 unset program_files firefox ie
1693 if {[file isfile
$doc_path]} {
1694 set doc_url
"file:$doc_path"
1696 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
1699 if {$browser ne
{}} {
1700 .mbar.
help add
command -label {Online Documentation
} \
1701 -command [list
exec $browser $doc_url &]
1703 unset browser doc_path doc_url
1705 # -- Standard bindings
1707 wm protocol . WM_DELETE_WINDOW do_quit
1708 bind all
<$M1B-Key-q> do_quit
1709 bind all
<$M1B-Key-Q> do_quit
1710 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
1711 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
1713 set subcommand_args
{}
1715 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
1719 # -- Not a normal commit type invocation? Do that instead!
1721 switch
-- $subcommand {
1723 set subcommand_args
{rev?
}
1724 switch
[llength
$argv] {
1725 0 { set current_branch
[current-branch
] }
1726 1 { set current_branch
[lindex
$argv 0] }
1729 browser
::new
$current_branch
1733 set subcommand_args
{rev? path?
}
1738 if {$is_path ||
[file exists
$_prefix$a]} {
1739 if {$path ne
{}} usage
1742 } elseif
{$a eq
{--}} {
1744 if {$head ne
{}} usage
1749 } elseif
{$head eq
{}} {
1750 if {$head ne
{}} usage
1759 set current_branch
[current-branch
]
1761 set current_branch
$head
1764 if {$path eq
{}} usage
1765 blame
::new
$head $path
1770 if {[llength
$argv] != 0} {
1771 puts
-nonewline stderr
"usage: $argv0"
1772 if {$subcommand ne
{gui
} && [appname
] ne
"git-$subcommand"} {
1773 puts
-nonewline stderr
" $subcommand"
1778 # fall through to setup UI for commits
1781 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
1792 -text {Current Branch
:} \
1796 -textvariable current_branch \
1799 pack .branch.l1
-side left
1800 pack .branch.cb
-side left
-fill x
1801 pack .branch
-side top
-fill x
1803 # -- Main Window Layout
1805 panedwindow .vpane
-orient vertical
1806 panedwindow .vpane.files
-orient horizontal
1807 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
1808 pack .vpane
-anchor n
-side top
-fill both
-expand 1
1810 # -- Index File List
1812 frame .vpane.files.index
-height 100 -width 200
1813 label .vpane.files.index.title
-text {Staged Changes
(Will Be Committed
)} \
1814 -background lightgreen
1815 text
$ui_index -background white
-borderwidth 0 \
1816 -width 20 -height 10 \
1818 -cursor $cursor_ptr \
1819 -xscrollcommand {.vpane.files.index.sx
set} \
1820 -yscrollcommand {.vpane.files.index.sy
set} \
1822 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
1823 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
1824 pack .vpane.files.index.title
-side top
-fill x
1825 pack .vpane.files.index.sx
-side bottom
-fill x
1826 pack .vpane.files.index.sy
-side right
-fill y
1827 pack
$ui_index -side left
-fill both
-expand 1
1828 .vpane.files add .vpane.files.index
-sticky nsew
1830 # -- Working Directory File List
1832 frame .vpane.files.workdir
-height 100 -width 200
1833 label .vpane.files.workdir.title
-text {Unstaged Changes
(Will Not Be Committed
)} \
1834 -background lightsalmon
1835 text
$ui_workdir -background white
-borderwidth 0 \
1836 -width 20 -height 10 \
1838 -cursor $cursor_ptr \
1839 -xscrollcommand {.vpane.files.workdir.sx
set} \
1840 -yscrollcommand {.vpane.files.workdir.sy
set} \
1842 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
1843 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
1844 pack .vpane.files.workdir.title
-side top
-fill x
1845 pack .vpane.files.workdir.sx
-side bottom
-fill x
1846 pack .vpane.files.workdir.sy
-side right
-fill y
1847 pack
$ui_workdir -side left
-fill both
-expand 1
1848 .vpane.files add .vpane.files.workdir
-sticky nsew
1850 foreach i
[list
$ui_index $ui_workdir] {
1851 $i tag conf in_diff
-background lightgray
1852 $i tag conf in_sel
-background lightgray
1856 # -- Diff and Commit Area
1858 frame .vpane.lower
-height 300 -width 400
1859 frame .vpane.lower.commarea
1860 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
1861 pack .vpane.lower.commarea
-side top
-fill x
1862 pack .vpane.lower.
diff -side bottom
-fill both
-expand 1
1863 .vpane add .vpane.lower
-sticky nsew
1865 # -- Commit Area Buttons
1867 frame .vpane.lower.commarea.buttons
1868 label .vpane.lower.commarea.buttons.l
-text {} \
1871 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
1872 pack .vpane.lower.commarea.buttons
-side left
-fill y
1874 button .vpane.lower.commarea.buttons.rescan
-text {Rescan
} \
1876 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
1877 lappend disable_on_lock \
1878 {.vpane.lower.commarea.buttons.rescan conf
-state}
1880 button .vpane.lower.commarea.buttons.incall
-text {Add Existing
} \
1882 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
1883 lappend disable_on_lock \
1884 {.vpane.lower.commarea.buttons.incall conf
-state}
1886 button .vpane.lower.commarea.buttons.signoff
-text {Sign Off
} \
1888 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
1890 button .vpane.lower.commarea.buttons.commit
-text {Commit
} \
1892 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
1893 lappend disable_on_lock \
1894 {.vpane.lower.commarea.buttons.commit conf
-state}
1896 button .vpane.lower.commarea.buttons.push
-text {Push
} \
1897 -command do_push_anywhere
1898 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
1900 # -- Commit Message Buffer
1902 frame .vpane.lower.commarea.buffer
1903 frame .vpane.lower.commarea.buffer.header
1904 set ui_comm .vpane.lower.commarea.buffer.t
1905 set ui_coml .vpane.lower.commarea.buffer.header.l
1906 radiobutton .vpane.lower.commarea.buffer.header.new \
1907 -text {New Commit
} \
1908 -command do_select_commit_type \
1909 -variable selected_commit_type \
1911 lappend disable_on_lock \
1912 [list .vpane.lower.commarea.buffer.header.new conf
-state]
1913 radiobutton .vpane.lower.commarea.buffer.header.amend \
1914 -text {Amend Last Commit
} \
1915 -command do_select_commit_type \
1916 -variable selected_commit_type \
1918 lappend disable_on_lock \
1919 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
1923 proc trace_commit_type
{varname args
} {
1924 global ui_coml commit_type
1925 switch
-glob -- $commit_type {
1926 initial
{set txt
{Initial Commit Message
:}}
1927 amend
{set txt
{Amended Commit Message
:}}
1928 amend-initial
{set txt
{Amended Initial Commit Message
:}}
1929 amend-merge
{set txt
{Amended Merge Commit Message
:}}
1930 merge
{set txt
{Merge Commit Message
:}}
1931 * {set txt
{Commit Message
:}}
1933 $ui_coml conf
-text $txt
1935 trace add variable commit_type
write trace_commit_type
1936 pack
$ui_coml -side left
-fill x
1937 pack .vpane.lower.commarea.buffer.header.amend
-side right
1938 pack .vpane.lower.commarea.buffer.header.new
-side right
1940 text
$ui_comm -background white
-borderwidth 1 \
1943 -autoseparators true \
1945 -width 75 -height 9 -wrap none \
1947 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
1948 scrollbar .vpane.lower.commarea.buffer.sby \
1949 -command [list
$ui_comm yview
]
1950 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
1951 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
1952 pack
$ui_comm -side left
-fill y
1953 pack .vpane.lower.commarea.buffer
-side left
-fill y
1955 # -- Commit Message Buffer Context Menu
1957 set ctxm .vpane.lower.commarea.buffer.ctxm
1958 menu
$ctxm -tearoff 0
1961 -command {tk_textCut
$ui_comm}
1964 -command {tk_textCopy
$ui_comm}
1967 -command {tk_textPaste
$ui_comm}
1970 -command {$ui_comm delete sel.first sel.last
}
1973 -label {Select All
} \
1974 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
1978 $ui_comm tag add sel
0.0 end
1979 tk_textCopy
$ui_comm
1980 $ui_comm tag remove sel
0.0 end
1986 bind_button3
$ui_comm "tk_popup $ctxm %X %Y"
1990 proc trace_current_diff_path
{varname args
} {
1991 global current_diff_path diff_actions file_states
1992 if {$current_diff_path eq
{}} {
1998 set p
$current_diff_path
1999 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2001 set p
[escape_path
$p]
2005 .vpane.lower.
diff.header.status configure
-text $s
2006 .vpane.lower.
diff.header.
file configure
-text $f
2007 .vpane.lower.
diff.header.path configure
-text $p
2008 foreach w
$diff_actions {
2012 trace add variable current_diff_path
write trace_current_diff_path
2014 frame .vpane.lower.
diff.header
-background gold
2015 label .vpane.lower.
diff.header.status \
2017 -width $max_status_desc \
2020 label .vpane.lower.
diff.header.
file \
2024 label .vpane.lower.
diff.header.path \
2028 pack .vpane.lower.
diff.header.status
-side left
2029 pack .vpane.lower.
diff.header.
file -side left
2030 pack .vpane.lower.
diff.header.path
-fill x
2031 set ctxm .vpane.lower.
diff.header.ctxm
2032 menu
$ctxm -tearoff 0
2040 -- $current_diff_path
2042 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2043 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2047 frame .vpane.lower.
diff.body
2048 set ui_diff .vpane.lower.
diff.body.t
2049 text
$ui_diff -background white
-borderwidth 0 \
2050 -width 80 -height 15 -wrap none \
2052 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2053 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2055 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2056 -command [list
$ui_diff xview
]
2057 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2058 -command [list
$ui_diff yview
]
2059 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2060 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2061 pack
$ui_diff -side left
-fill both
-expand 1
2062 pack .vpane.lower.
diff.header
-side top
-fill x
2063 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2065 $ui_diff tag conf d_cr
-elide true
2066 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2067 $ui_diff tag conf d_
+ -foreground {#00a000}
2068 $ui_diff tag conf d_-
-foreground red
2070 $ui_diff tag conf d_
++ -foreground {#00a000}
2071 $ui_diff tag conf d_--
-foreground red
2072 $ui_diff tag conf d_
+s \
2073 -foreground {#00a000} \
2074 -background {#e2effa}
2075 $ui_diff tag conf d_-s \
2077 -background {#e2effa}
2078 $ui_diff tag conf d_s
+ \
2079 -foreground {#00a000} \
2081 $ui_diff tag conf d_s- \
2085 $ui_diff tag conf d
<<<<<<< \
2086 -foreground orange \
2088 $ui_diff tag conf d
======= \
2089 -foreground orange \
2091 $ui_diff tag conf d
>>>>>>> \
2092 -foreground orange \
2095 $ui_diff tag raise sel
2097 # -- Diff Body Context Menu
2099 set ctxm .vpane.lower.
diff.body.ctxm
2100 menu
$ctxm -tearoff 0
2103 -command reshow_diff
2104 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2107 -command {tk_textCopy
$ui_diff}
2108 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2110 -label {Select All
} \
2111 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
2112 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2116 $ui_diff tag add sel
0.0 end
2117 tk_textCopy
$ui_diff
2118 $ui_diff tag remove sel
0.0 end
2120 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2123 -label {Apply
/Reverse Hunk
} \
2124 -command {apply_hunk
$cursorX $cursorY}
2125 set ui_diff_applyhunk
[$ctxm index last
]
2126 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
2129 -label {Decrease Font Size
} \
2130 -command {incr_font_size font_diff
-1}
2131 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2133 -label {Increase Font Size
} \
2134 -command {incr_font_size font_diff
1}
2135 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2138 -label {Show Less Context
} \
2139 -command {if {$repo_config(gui.diffcontext
) >= 1} {
2140 incr repo_config
(gui.diffcontext
) -1
2143 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2145 -label {Show More Context
} \
2146 -command {if {$repo_config(gui.diffcontext
) < 99} {
2147 incr repo_config
(gui.diffcontext
)
2150 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2152 $ctxm add
command -label {Options...
} \
2154 bind_button3
$ui_diff "
2157 if {\$ui_index eq \$current_diff_side} {
2158 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
2160 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
2162 tk_popup $ctxm %X %Y
2164 unset ui_diff_applyhunk
2168 label .status
-textvariable ui_status_value \
2173 pack .status
-anchor w
-side bottom
-fill x
2178 set gm
$repo_config(gui.geometry
)
2179 wm geometry .
[lindex
$gm 0]
2180 .vpane sash place
0 \
2181 [lindex
[.vpane sash coord
0] 0] \
2183 .vpane.files sash place
0 \
2185 [lindex
[.vpane.files sash coord
0] 1]
2191 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
2192 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
2193 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
2194 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
2195 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
2196 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
2197 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
2198 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
2199 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
2200 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2201 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2203 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
2204 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
2205 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
2206 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
2207 bind $ui_diff <$M1B-Key-v> {break}
2208 bind $ui_diff <$M1B-Key-V> {break}
2209 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2210 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2211 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
2212 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
2213 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
2214 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
2215 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
2216 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
2217 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
2218 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
2219 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
2220 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
2221 bind $ui_diff <Button-1
> {focus
%W
}
2223 if {[is_enabled branch
]} {
2224 bind .
<$M1B-Key-n> branch_create
::dialog
2225 bind .
<$M1B-Key-N> branch_create
::dialog
2227 if {[is_enabled transport
]} {
2228 bind .
<$M1B-Key-p> do_push_anywhere
2229 bind .
<$M1B-Key-P> do_push_anywhere
2232 bind .
<Key-F5
> do_rescan
2233 bind .
<$M1B-Key-r> do_rescan
2234 bind .
<$M1B-Key-R> do_rescan
2235 bind .
<$M1B-Key-s> do_signoff
2236 bind .
<$M1B-Key-S> do_signoff
2237 bind .
<$M1B-Key-i> do_add_all
2238 bind .
<$M1B-Key-I> do_add_all
2239 bind .
<$M1B-Key-Return> do_commit
2240 foreach i
[list
$ui_index $ui_workdir] {
2241 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
2242 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2243 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
2247 set file_lists
($ui_index) [list
]
2248 set file_lists
($ui_workdir) [list
]
2250 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2251 focus
-force $ui_comm
2253 # -- Warn the user about environmental problems. Cygwin's Tcl
2254 # does *not* pass its env array onto any processes it spawns.
2255 # This means that git processes get none of our environment.
2260 set msg
"Possible environment issues exist.
2262 The following environment variables are probably
2263 going to be ignored by any Git subprocess run
2267 foreach name
[array names env
] {
2268 switch
-regexp -- $name {
2269 {^GIT_INDEX_FILE$
} -
2270 {^GIT_OBJECT_DIRECTORY$
} -
2271 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
2273 {^GIT_EXTERNAL_DIFF$
} -
2277 {^GIT_CONFIG_LOCAL$
} -
2278 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
2279 append msg
" - $name\n"
2282 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
2283 append msg
" - $name\n"
2285 set suggest_user
$name
2289 if {$ignored_env > 0} {
2291 This is due to a known issue with the
2292 Tcl binary distributed by Cygwin."
2294 if {$suggest_user ne
{}} {
2297 A good replacement for $suggest_user
2298 is placing values for the user.name and
2299 user.email settings into your personal
2305 unset ignored_env msg suggest_user name
2308 # -- Only initialize complex UI if we are going to stay running.
2310 if {[is_enabled transport
]} {
2314 populate_branch_menu
2319 # -- Only suggest a gc run if we are going to stay running.
2321 if {[is_enabled multicommit
]} {
2322 set object_limit
2000
2323 if {[is_Windows
]} {set object_limit
200}
2324 regexp
{^
([0-9]+) objects
,} [git count-objects
] _junk objects_current
2325 if {$objects_current >= $object_limit} {
2327 "This repository currently has $objects_current loose objects.
2329 To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
2331 Compress the database now?"] eq
yes} {
2335 unset object_limit _junk objects_current
2338 lock_index begin-read