2 # Tcl ignores the next line -*- tcl -*- \
5 set appvers
{@@GITGUI_VERSION@@
}
7 Copyright ©
2006, 2007 Shawn Pearce
, et. al.
9 This program is free software
; you can redistribute it and
/or modify
10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation
; either version
2 of the License
, or
12 (at your option
) any later version.
14 This program is distributed
in the hope that it will be useful
,
15 but WITHOUT ANY WARRANTY
; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License
for more details.
19 You should have received a copy of the GNU General Public License
20 along with this program
; if not
, write to the Free Software
21 Foundation
, Inc.
, 59 Temple Place
, Suite
330, Boston
, MA
02111-1307 USA
}
23 ######################################################################
27 set _appname
[lindex
[file split $argv0] end
]
43 return [eval [concat
[list
file join $_gitdir] $args]]
48 if {$_gitexec eq
{}} {
49 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
50 error
"Git not installed?\n\n$err"
56 return [eval [concat
[list
file join $_gitexec] $args]]
65 global tcl_platform tk_library
66 if {[tk windowingsystem
] eq
{aqua
}} {
74 if {$tcl_platform(platform
) eq
{windows
}} {
81 global tcl_platform _iscygwin
82 if {$_iscygwin eq
{}} {
83 if {$tcl_platform(platform
) eq
{windows
}} {
84 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
96 proc is_enabled
{option
} {
97 global enabled_options
98 if {[catch
{set on
$enabled_options($option)}]} {return 0}
102 proc enable_option
{option
} {
103 global enabled_options
104 set enabled_options
($option) 1
107 proc disable_option
{option
} {
108 global enabled_options
109 set enabled_options
($option) 0
112 ######################################################################
116 proc is_many_config
{name
} {
117 switch
-glob -- $name {
126 proc is_config_true
{name
} {
128 if {[catch
{set v
$repo_config($name)}]} {
130 } elseif
{$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes}} {
137 proc load_config
{include_global
} {
138 global repo_config global_config default_config
140 array
unset global_config
141 if {$include_global} {
143 set fd_rc
[open
"| git config --global --list" r
]
144 while {[gets
$fd_rc line
] >= 0} {
145 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
146 if {[is_many_config
$name]} {
147 lappend global_config
($name) $value
149 set global_config
($name) $value
157 array
unset repo_config
159 set fd_rc
[open
"| git config --list" r
]
160 while {[gets
$fd_rc line
] >= 0} {
161 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
162 if {[is_many_config
$name]} {
163 lappend repo_config
($name) $value
165 set repo_config
($name) $value
172 foreach name
[array names default_config
] {
173 if {[catch
{set v
$global_config($name)}]} {
174 set global_config
($name) $default_config($name)
176 if {[catch
{set v
$repo_config($name)}]} {
177 set repo_config
($name) $default_config($name)
182 proc save_config
{} {
183 global default_config font_descs
184 global repo_config global_config
185 global repo_config_new global_config_new
187 foreach option
$font_descs {
188 set name
[lindex
$option 0]
189 set font
[lindex
$option 1]
190 font configure
$font \
191 -family $global_config_new(gui.
$font^^family
) \
192 -size $global_config_new(gui.
$font^^size
)
193 font configure
${font}bold \
194 -family $global_config_new(gui.
$font^^family
) \
195 -size $global_config_new(gui.
$font^^size
)
196 set global_config_new
(gui.
$name) [font configure
$font]
197 unset global_config_new
(gui.
$font^^family
)
198 unset global_config_new
(gui.
$font^^size
)
201 foreach name
[array names default_config
] {
202 set value
$global_config_new($name)
203 if {$value ne
$global_config($name)} {
204 if {$value eq
$default_config($name)} {
205 catch
{git config
--global --unset $name}
207 regsub
-all "\[{}\]" $value {"} value
208 git config --global $name $value
210 set global_config($name) $value
211 if {$value eq $repo_config($name)} {
212 catch {git config --unset $name}
213 set repo_config($name) $value
218 foreach name [array names default_config] {
219 set value $repo_config_new($name)
220 if {$value ne $repo_config($name)} {
221 if {$value eq $global_config($name)} {
222 catch {git config --unset $name}
224 regsub -all "\
[{}\
]" $value {"} value
225 git config
$name $value
227 set repo_config
($name) $value
232 ######################################################################
237 return [eval exec git
$args]
240 proc error_popup
{msg
} {
242 if {[reponame
] ne
{}} {
243 append title
" ([reponame])"
245 option add
*Dialog.msg.font font_ui
246 option add
*Button.font font_ui
247 set cmd
[list tk_messageBox \
250 -title "$title: error" \
252 if {[winfo ismapped .
]} {
253 lappend cmd
-parent .
258 proc warn_popup
{msg
} {
260 if {[reponame
] ne
{}} {
261 append title
" ([reponame])"
263 option add
*Dialog.msg.font font_ui
264 option add
*Button.font font_ui
265 set cmd
[list tk_messageBox \
268 -title "$title: warning" \
270 if {[winfo ismapped .
]} {
271 lappend cmd
-parent .
276 proc info_popup
{msg
{parent .
}} {
278 if {[reponame
] ne
{}} {
279 append title
" ([reponame])"
281 option add
*Dialog.msg.font font_ui
282 option add
*Button.font font_ui
291 proc ask_popup
{msg
} {
293 if {[reponame
] ne
{}} {
294 append title
" ([reponame])"
296 option add
*Dialog.msg.font font_ui
297 option add
*Button.font font_ui
298 return [tk_messageBox \
306 ######################################################################
310 if {{--version} eq
$argv ||
{version
} eq
$argv} {
311 puts
"git-gui version $appvers"
318 if {[catch
{set v
[git
--version]} err
]} {
319 catch
{wm withdraw .
}
320 error_popup
"Cannot determine Git version:
324 [appname] requires Git $req_maj.$req_min or later."
327 if {[regexp
{^git version
(\d
+)\.
(\d
+)} $v _junk act_maj act_min
]} {
328 if {$act_maj < $req_maj
329 ||
($act_maj == $req_maj && $act_min < $req_min)} {
330 catch
{wm withdraw .
}
331 error_popup
"[appname] requires Git $req_maj.$req_min or later.
337 catch
{wm withdraw .
}
338 error_popup
"Cannot parse Git version string:\n\n$v"
341 unset -nocomplain v _junk act_maj act_min req_maj req_min
343 ######################################################################
347 if { [catch
{set _gitdir
$env(GIT_DIR
)}]
348 && [catch
{set _gitdir
[git rev-parse
--git-dir]} err
]} {
349 catch
{wm withdraw .
}
350 error_popup
"Cannot find the git directory:\n\n$err"
353 if {![file isdirectory
$_gitdir] && [is_Cygwin
]} {
354 catch
{set _gitdir
[exec cygpath
--unix $_gitdir]}
356 if {![file isdirectory
$_gitdir]} {
357 catch
{wm withdraw .
}
358 error_popup
"Git directory not found:\n\n$_gitdir"
361 if {[lindex
[file split $_gitdir] end
] ne
{.git
}} {
362 catch
{wm withdraw .
}
363 error_popup
"Cannot use funny .git directory:\n\n$_gitdir"
366 if {[catch
{cd [file dirname $_gitdir]} err
]} {
367 catch
{wm withdraw .
}
368 error_popup
"No working directory [file dirname $_gitdir]:\n\n$err"
371 set _reponame
[lindex
[file split \
372 [file normalize
[file dirname $_gitdir]]] \
375 ######################################################################
379 set current_diff_path
{}
380 set current_diff_side
{}
381 set diff_actions
[list
]
382 set ui_status_value
{Initializing...
}
386 set MERGE_HEAD
[list
]
389 set current_branch
{}
390 set current_diff_path
{}
391 set selected_commit_type new
393 ######################################################################
401 set disable_on_lock
[list
]
402 set index_lock_type none
404 proc lock_index
{type} {
405 global index_lock_type disable_on_lock
407 if {$index_lock_type eq
{none
}} {
408 set index_lock_type
$type
409 foreach w
$disable_on_lock {
410 uplevel
#0 $w disabled
413 } elseif
{$index_lock_type eq
"begin-$type"} {
414 set index_lock_type
$type
420 proc unlock_index
{} {
421 global index_lock_type disable_on_lock
423 set index_lock_type none
424 foreach w
$disable_on_lock {
429 ######################################################################
433 proc repository_state
{ctvar hdvar mhvar
} {
434 global current_branch
435 upvar
$ctvar ct
$hdvar hd
$mhvar mh
439 if {[catch
{set current_branch
[git symbolic-ref HEAD
]}]} {
440 set current_branch
{}
442 regsub ^refs
/((heads|tags|remotes
)/)? \
448 if {[catch
{set hd
[git rev-parse
--verify HEAD
]}]} {
454 set merge_head
[gitdir MERGE_HEAD
]
455 if {[file exists
$merge_head]} {
457 set fd_mh
[open
$merge_head r
]
458 while {[gets
$fd_mh line
] >= 0} {
469 global PARENT empty_tree
471 set p
[lindex
$PARENT 0]
475 if {$empty_tree eq
{}} {
476 set empty_tree
[git mktree
<< {}]
481 proc rescan
{after
{honor_trustmtime
1}} {
482 global HEAD PARENT MERGE_HEAD commit_type
483 global ui_index ui_workdir ui_status_value ui_comm
484 global rescan_active file_states
487 if {$rescan_active > 0 ||
![lock_index
read]} return
489 repository_state newType newHEAD newMERGE_HEAD
490 if {[string match amend
* $commit_type]
491 && $newType eq
{normal
}
492 && $newHEAD eq
$HEAD} {
496 set MERGE_HEAD
$newMERGE_HEAD
497 set commit_type
$newType
500 array
unset file_states
502 if {![$ui_comm edit modified
]
503 ||
[string trim
[$ui_comm get
0.0 end
]] eq
{}} {
504 if {[load_message GITGUI_MSG
]} {
505 } elseif
{[load_message MERGE_MSG
]} {
506 } elseif
{[load_message SQUASH_MSG
]} {
509 $ui_comm edit modified false
512 if {[is_enabled branch
]} {
517 if {$honor_trustmtime && $repo_config(gui.trustmtime
) eq
{true
}} {
518 rescan_stage2
{} $after
521 set ui_status_value
{Refreshing
file status...
}
522 set cmd
[list git update-index
]
524 lappend cmd
--unmerged
525 lappend cmd
--ignore-missing
526 lappend cmd
--refresh
527 set fd_rf
[open
"| $cmd" r
]
528 fconfigure
$fd_rf -blocking 0 -translation binary
529 fileevent
$fd_rf readable \
530 [list rescan_stage2
$fd_rf $after]
534 proc rescan_stage2
{fd after
} {
535 global ui_status_value
536 global rescan_active buf_rdi buf_rdf buf_rlo
540 if {![eof
$fd]} return
544 set ls_others
[list | git ls-files
--others -z \
545 --exclude-per-directory=.gitignore
]
546 set info_exclude
[gitdir info exclude
]
547 if {[file readable
$info_exclude]} {
548 lappend ls_others
"--exclude-from=$info_exclude"
556 set ui_status_value
{Scanning
for modified files ...
}
557 set fd_di
[open
"| git diff-index --cached -z [PARENT]" r
]
558 set fd_df
[open
"| git diff-files -z" r
]
559 set fd_lo
[open
$ls_others r
]
561 fconfigure
$fd_di -blocking 0 -translation binary
-encoding binary
562 fconfigure
$fd_df -blocking 0 -translation binary
-encoding binary
563 fconfigure
$fd_lo -blocking 0 -translation binary
-encoding binary
564 fileevent
$fd_di readable
[list read_diff_index
$fd_di $after]
565 fileevent
$fd_df readable
[list read_diff_files
$fd_df $after]
566 fileevent
$fd_lo readable
[list read_ls_others
$fd_lo $after]
569 proc load_message
{file} {
573 if {[file isfile
$f]} {
574 if {[catch
{set fd
[open
$f r
]}]} {
577 set content
[string trim
[read $fd]]
579 regsub
-all -line {[ \r\t]+$
} $content {} content
580 $ui_comm delete
0.0 end
581 $ui_comm insert end
$content
587 proc read_diff_index
{fd after
} {
590 append buf_rdi
[read $fd]
592 set n
[string length
$buf_rdi]
594 set z1
[string first
"\0" $buf_rdi $c]
597 set z2
[string first
"\0" $buf_rdi $z1]
601 set i
[split [string range
$buf_rdi $c [expr {$z1 - 2}]] { }]
602 set p
[string range
$buf_rdi $z1 [expr {$z2 - 1}]]
604 [encoding convertfrom
$p] \
606 [list
[lindex
$i 0] [lindex
$i 2]] \
612 set buf_rdi
[string range
$buf_rdi $c end
]
617 rescan_done
$fd buf_rdi
$after
620 proc read_diff_files
{fd after
} {
623 append buf_rdf
[read $fd]
625 set n
[string length
$buf_rdf]
627 set z1
[string first
"\0" $buf_rdf $c]
630 set z2
[string first
"\0" $buf_rdf $z1]
634 set i
[split [string range
$buf_rdf $c [expr {$z1 - 2}]] { }]
635 set p
[string range
$buf_rdf $z1 [expr {$z2 - 1}]]
637 [encoding convertfrom
$p] \
640 [list
[lindex
$i 0] [lindex
$i 2]]
645 set buf_rdf
[string range
$buf_rdf $c end
]
650 rescan_done
$fd buf_rdf
$after
653 proc read_ls_others
{fd after
} {
656 append buf_rlo
[read $fd]
657 set pck
[split $buf_rlo "\0"]
658 set buf_rlo
[lindex
$pck end
]
659 foreach p
[lrange
$pck 0 end-1
] {
660 merge_state
[encoding convertfrom
$p] ?O
662 rescan_done
$fd buf_rlo
$after
665 proc rescan_done
{fd buf after
} {
667 global file_states repo_config
670 if {![eof
$fd]} return
673 if {[incr rescan_active
-1] > 0} return
682 proc prune_selection
{} {
683 global file_states selected_paths
685 foreach path
[array names selected_paths
] {
686 if {[catch
{set still_here
$file_states($path)}]} {
687 unset selected_paths
($path)
692 ######################################################################
697 global ui_diff current_diff_path current_diff_header
698 global ui_index ui_workdir
700 $ui_diff conf
-state normal
701 $ui_diff delete
0.0 end
702 $ui_diff conf
-state disabled
704 set current_diff_path
{}
705 set current_diff_header
{}
707 $ui_index tag remove in_diff
0.0 end
708 $ui_workdir tag remove in_diff
0.0 end
711 proc reshow_diff
{} {
712 global ui_status_value file_states file_lists
713 global current_diff_path current_diff_side
715 set p
$current_diff_path
717 # No diff is being shown.
718 } elseif
{$current_diff_side eq
{}
719 ||
[catch
{set s
$file_states($p)}]
720 ||
[lsearch
-sorted -exact $file_lists($current_diff_side) $p] == -1} {
723 show_diff
$p $current_diff_side
727 proc handle_empty_diff
{} {
728 global current_diff_path file_states file_lists
730 set path
$current_diff_path
731 set s
$file_states($path)
732 if {[lindex
$s 0] ne
{_M
}} return
734 info_popup
"No differences detected.
736 [short_path $path] has no changes.
738 The modification date of this file was updated by another application, but the content within the file was not changed.
740 A rescan will be automatically started to find other files which may have the same state."
743 display_file
$path __
744 rescan
{set ui_status_value
{Ready.
}} 0
747 proc show_diff
{path w
{lno
{}}} {
748 global file_states file_lists
749 global is_3way_diff diff_active repo_config
750 global ui_diff ui_status_value ui_index ui_workdir
751 global current_diff_path current_diff_side current_diff_header
753 if {$diff_active ||
![lock_index
read]} return
757 set lno
[lsearch
-sorted -exact $file_lists($w) $path]
763 $w tag add in_diff
$lno.0 [expr {$lno + 1}].0
766 set s
$file_states($path)
770 set current_diff_path
$path
771 set current_diff_side
$w
772 set current_diff_header
{}
773 set ui_status_value
"Loading diff of [escape_path $path]..."
775 # - Git won't give us the diff, there's nothing to compare to!
778 set max_sz
[expr {128 * 1024}]
780 set fd
[open
$path r
]
781 set content
[read $fd $max_sz]
783 set sz
[file size
$path]
787 set ui_status_value
"Unable to display [escape_path $path]"
788 error_popup
"Error loading file:\n\n$err"
791 $ui_diff conf
-state normal
792 if {![catch
{set type [exec file $path]}]} {
793 set n
[string length
$path]
794 if {[string equal
-length $n $path $type]} {
795 set type [string range
$type $n end
]
796 regsub
{^
:?\s
*} $type {} type
798 $ui_diff insert end
"* $type\n" d_@
800 if {[string first
"\0" $content] != -1} {
801 $ui_diff insert end \
802 "* Binary file (not showing content)." \
806 $ui_diff insert end \
807 "* Untracked file is $sz bytes.
808 * Showing only first $max_sz bytes.
811 $ui_diff insert end
$content
813 $ui_diff insert end
"
814 * Untracked file clipped here by [appname].
815 * To see the entire file, use an external editor.
819 $ui_diff conf
-state disabled
822 set ui_status_value
{Ready.
}
827 if {$w eq
$ui_index} {
828 lappend cmd diff-index
830 } elseif
{$w eq
$ui_workdir} {
831 if {[string index
$m 0] eq
{U
}} {
834 lappend cmd diff-files
839 lappend cmd
--no-color
840 if {$repo_config(gui.diffcontext
) > 0} {
841 lappend cmd
"-U$repo_config(gui.diffcontext)"
843 if {$w eq
$ui_index} {
849 if {[catch
{set fd
[open
$cmd r
]} err
]} {
852 set ui_status_value
"Unable to display [escape_path $path]"
853 error_popup
"Error loading diff:\n\n$err"
861 fileevent
$fd readable
[list read_diff
$fd]
864 proc read_diff
{fd
} {
865 global ui_diff ui_status_value diff_active
866 global is_3way_diff current_diff_header
868 $ui_diff conf
-state normal
869 while {[gets
$fd line
] >= 0} {
870 # -- Cleanup uninteresting diff header lines.
872 if { [string match
{diff --git *} $line]
873 ||
[string match
{diff --cc *} $line]
874 ||
[string match
{diff --combined *} $line]
875 ||
[string match
{--- *} $line]
876 ||
[string match
{+++ *} $line]} {
877 append current_diff_header
$line "\n"
880 if {[string match
{index
*} $line]} continue
881 if {$line eq
{deleted
file mode
120000}} {
882 set line
"deleted symlink"
885 # -- Automatically detect if this is a 3 way diff.
887 if {[string match
{@@@
*} $line]} {set is_3way_diff
1}
889 if {[string match
{mode
*} $line]
890 ||
[string match
{new
file *} $line]
891 ||
[string match
{deleted
file *} $line]
892 ||
[string match
{Binary files
* and
* differ
} $line]
893 ||
$line eq
{\ No newline
at end of
file}
894 ||
[regexp
{^\
* Unmerged path
} $line]} {
896 } elseif
{$is_3way_diff} {
897 set op
[string range
$line 0 1]
907 if {[regexp
{^\
+\
+([<>]{7} |
={7})} $line _g op
]} {
908 set line
[string replace
$line 0 1 { }]
915 puts
"error: Unhandled 3 way diff marker: {$op}"
920 set op
[string index
$line 0]
926 if {[regexp
{^\
+([<>]{7} |
={7})} $line _g op
]} {
927 set line
[string replace
$line 0 0 { }]
934 puts
"error: Unhandled 2 way diff marker: {$op}"
939 $ui_diff insert end
$line $tags
940 if {[string index
$line end
] eq
"\r"} {
941 $ui_diff tag add d_cr
{end
- 2c
}
943 $ui_diff insert end
"\n" $tags
945 $ui_diff conf
-state disabled
951 set ui_status_value
{Ready.
}
953 if {[$ui_diff index end
] eq
{2.0}} {
959 proc apply_hunk
{x y
} {
960 global current_diff_path current_diff_header current_diff_side
961 global ui_diff ui_index file_states
963 if {$current_diff_path eq
{} ||
$current_diff_header eq
{}} return
964 if {![lock_index apply_hunk
]} return
966 set apply_cmd
{git apply
--cached --whitespace=nowarn
}
967 set mi
[lindex
$file_states($current_diff_path) 0]
968 if {$current_diff_side eq
$ui_index} {
970 lappend apply_cmd
--reverse
971 if {[string index
$mi 0] ne
{M
}} {
977 if {[string index
$mi 1] ne
{M
}} {
983 set s_lno
[lindex
[split [$ui_diff index @
$x,$y] .
] 0]
984 set s_lno
[$ui_diff search
-backwards -regexp ^@@
$s_lno.0 0.0]
990 set e_lno
[$ui_diff search
-forwards -regexp ^@@
"$s_lno + 1 lines" end
]
996 set p
[open
"| $apply_cmd" w
]
997 fconfigure
$p -translation binary
-encoding binary
998 puts
-nonewline $p $current_diff_header
999 puts
-nonewline $p [$ui_diff get
$s_lno $e_lno]
1001 error_popup
"Failed to $mode selected hunk.\n\n$err"
1006 $ui_diff conf
-state normal
1007 $ui_diff delete
$s_lno $e_lno
1008 $ui_diff conf
-state disabled
1010 if {[$ui_diff get
1.0 end
] eq
"\n"} {
1016 if {$current_diff_side eq
$ui_index} {
1018 } elseif
{[string index
$mi 0] eq
{_
}} {
1024 display_file
$current_diff_path $mi
1030 ######################################################################
1034 proc load_last_commit
{} {
1035 global HEAD PARENT MERGE_HEAD commit_type ui_comm
1038 if {[llength
$PARENT] == 0} {
1039 error_popup
{There is nothing to amend.
1041 You are about to create the initial commit. There is no commit before this to amend.
1046 repository_state curType curHEAD curMERGE_HEAD
1047 if {$curType eq
{merge
}} {
1048 error_popup
{Cannot amend
while merging.
1050 You are currently
in the middle of a merge that has not been fully completed. You cannot amend the prior commit unless you first abort the current merge activity.
1058 set fd
[open
"| git cat-file commit $curHEAD" r
]
1059 fconfigure
$fd -encoding binary
-translation lf
1060 if {[catch
{set enc
$repo_config(i18n.commitencoding
)}]} {
1063 while {[gets
$fd line
] > 0} {
1064 if {[string match
{parent
*} $line]} {
1065 lappend parents
[string range
$line 7 end
]
1066 } elseif
{[string match
{encoding
*} $line]} {
1067 set enc
[string tolower
[string range
$line 9 end
]]
1070 fconfigure
$fd -encoding $enc
1071 set msg
[string trim
[read $fd]]
1074 error_popup
"Error loading commit data for amend:\n\n$err"
1080 set MERGE_HEAD
[list
]
1081 switch
-- [llength
$parents] {
1082 0 {set commit_type amend-initial
}
1083 1 {set commit_type amend
}
1084 default
{set commit_type amend-merge
}
1087 $ui_comm delete
0.0 end
1088 $ui_comm insert end
$msg
1090 $ui_comm edit modified false
1091 rescan
{set ui_status_value
{Ready.
}}
1094 proc create_new_commit
{} {
1095 global commit_type ui_comm
1097 set commit_type normal
1098 $ui_comm delete
0.0 end
1100 $ui_comm edit modified false
1101 rescan
{set ui_status_value
{Ready.
}}
1104 set GIT_COMMITTER_IDENT
{}
1106 proc committer_ident
{} {
1107 global GIT_COMMITTER_IDENT
1109 if {$GIT_COMMITTER_IDENT eq
{}} {
1110 if {[catch
{set me
[git var GIT_COMMITTER_IDENT
]} err
]} {
1111 error_popup
"Unable to obtain your identity:\n\n$err"
1114 if {![regexp
{^
(.
*) [0-9]+ [-+0-9]+$
} \
1115 $me me GIT_COMMITTER_IDENT
]} {
1116 error_popup
"Invalid GIT_COMMITTER_IDENT:\n\n$me"
1121 return $GIT_COMMITTER_IDENT
1124 proc commit_tree
{} {
1125 global HEAD commit_type file_states ui_comm repo_config
1126 global ui_status_value pch_error
1128 if {[committer_ident
] eq
{}} return
1129 if {![lock_index update
]} return
1131 # -- Our in memory state should match the repository.
1133 repository_state curType curHEAD curMERGE_HEAD
1134 if {[string match amend
* $commit_type]
1135 && $curType eq
{normal
}
1136 && $curHEAD eq
$HEAD} {
1137 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1138 info_popup
{Last scanned state does not match repository state.
1140 Another Git program has modified this repository since the last scan. A rescan must be performed before another commit can be created.
1142 The rescan will be automatically started now.
1145 rescan
{set ui_status_value
{Ready.
}}
1149 # -- At least one file should differ in the index.
1152 foreach path
[array names file_states
] {
1153 switch
-glob -- [lindex
$file_states($path) 0] {
1157 M?
{set files_ready
1}
1159 error_popup
"Unmerged files cannot be committed.
1161 File [short_path $path] has merge conflicts. You must resolve them and add the file before committing.
1167 error_popup
"Unknown file state [lindex $s 0] detected.
1169 File [short_path $path] cannot be committed by this program.
1174 if {!$files_ready && ![string match
*merge
$curType]} {
1175 info_popup
{No changes to commit.
1177 You must add
at least
1 file before you can commit.
1183 # -- A message is required.
1185 set msg
[string trim
[$ui_comm get
1.0 end
]]
1186 regsub
-all -line {[ \t\r]+$
} $msg {} msg
1188 error_popup
{Please supply a commit message.
1190 A good commit message has the following format
:
1192 - First line
: Describe
in one sentance what you did.
1193 - Second line
: Blank
1194 - Remaining lines
: Describe why this change is good.
1200 # -- Run the pre-commit hook.
1202 set pchook
[gitdir hooks pre-commit
]
1204 # On Cygwin [file executable] might lie so we need to ask
1205 # the shell if the hook is executable. Yes that's annoying.
1207 if {[is_Cygwin
] && [file isfile
$pchook]} {
1208 set pchook
[list sh
-c [concat \
1209 "if test -x \"$pchook\";" \
1210 "then exec \"$pchook\" 2>&1;" \
1212 } elseif
{[file executable
$pchook]} {
1213 set pchook
[list
$pchook |
& cat]
1215 commit_writetree
$curHEAD $msg
1219 set ui_status_value
{Calling pre-commit hook...
}
1221 set fd_ph
[open
"| $pchook" r
]
1222 fconfigure
$fd_ph -blocking 0 -translation binary
1223 fileevent
$fd_ph readable \
1224 [list commit_prehook_wait
$fd_ph $curHEAD $msg]
1227 proc commit_prehook_wait
{fd_ph curHEAD msg
} {
1228 global pch_error ui_status_value
1230 append pch_error
[read $fd_ph]
1231 fconfigure
$fd_ph -blocking 1
1233 if {[catch
{close
$fd_ph}]} {
1234 set ui_status_value
{Commit declined by pre-commit hook.
}
1235 hook_failed_popup pre-commit
$pch_error
1238 commit_writetree
$curHEAD $msg
1243 fconfigure
$fd_ph -blocking 0
1246 proc commit_writetree
{curHEAD msg
} {
1247 global ui_status_value
1249 set ui_status_value
{Committing changes...
}
1250 set fd_wt
[open
"| git write-tree" r
]
1251 fileevent
$fd_wt readable \
1252 [list commit_committree
$fd_wt $curHEAD $msg]
1255 proc commit_committree
{fd_wt curHEAD msg
} {
1256 global HEAD PARENT MERGE_HEAD commit_type
1257 global all_heads current_branch
1258 global ui_status_value ui_comm selected_commit_type
1259 global file_states selected_paths rescan_active
1263 if {$tree_id eq
{} ||
[catch
{close
$fd_wt} err
]} {
1264 error_popup
"write-tree failed:\n\n$err"
1265 set ui_status_value
{Commit failed.
}
1270 # -- Verify this wasn't an empty change.
1272 if {$commit_type eq
{normal
}} {
1273 set old_tree
[git rev-parse
"$PARENT^{tree}"]
1274 if {$tree_id eq
$old_tree} {
1275 info_popup
{No changes to commit.
1277 No files were modified by this commit and it was not a merge commit.
1279 A rescan will be automatically started now.
1282 rescan
{set ui_status_value
{No changes to commit.
}}
1287 # -- Build the message.
1289 set msg_p
[gitdir COMMIT_EDITMSG
]
1290 set msg_wt
[open
$msg_p w
]
1291 if {[catch
{set enc
$repo_config(i18n.commitencoding
)}]} {
1294 fconfigure
$msg_wt -encoding $enc -translation binary
1295 puts
-nonewline $msg_wt $msg
1298 # -- Create the commit.
1300 set cmd
[list git commit-tree
$tree_id]
1301 foreach p
[concat
$PARENT $MERGE_HEAD] {
1305 if {[catch
{set cmt_id
[eval exec $cmd]} err
]} {
1306 error_popup
"commit-tree failed:\n\n$err"
1307 set ui_status_value
{Commit failed.
}
1312 # -- Update the HEAD ref.
1315 if {$commit_type ne
{normal
}} {
1316 append reflogm
" ($commit_type)"
1318 set i
[string first
"\n" $msg]
1320 append reflogm
{: } [string range
$msg 0 [expr {$i - 1}]]
1322 append reflogm
{: } $msg
1324 set cmd
[list git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD]
1325 if {[catch
{eval exec $cmd} err
]} {
1326 error_popup
"update-ref failed:\n\n$err"
1327 set ui_status_value
{Commit failed.
}
1332 # -- Cleanup after ourselves.
1334 catch
{file delete
$msg_p}
1335 catch
{file delete
[gitdir MERGE_HEAD
]}
1336 catch
{file delete
[gitdir MERGE_MSG
]}
1337 catch
{file delete
[gitdir SQUASH_MSG
]}
1338 catch
{file delete
[gitdir GITGUI_MSG
]}
1340 # -- Let rerere do its thing.
1342 if {[file isdirectory
[gitdir rr-cache
]]} {
1346 # -- Run the post-commit hook.
1348 set pchook
[gitdir hooks post-commit
]
1349 if {[is_Cygwin
] && [file isfile
$pchook]} {
1350 set pchook
[list sh
-c [concat \
1351 "if test -x \"$pchook\";" \
1352 "then exec \"$pchook\";" \
1354 } elseif
{![file executable
$pchook]} {
1357 if {$pchook ne
{}} {
1358 catch
{exec $pchook &}
1361 $ui_comm delete
0.0 end
1363 $ui_comm edit modified false
1365 if {[is_enabled singlecommit
]} do_quit
1367 # -- Make sure our current branch exists.
1369 if {$commit_type eq
{initial
}} {
1370 lappend all_heads
$current_branch
1371 set all_heads
[lsort
-unique $all_heads]
1372 populate_branch_menu
1375 # -- Update in memory status
1377 set selected_commit_type new
1378 set commit_type normal
1381 set MERGE_HEAD
[list
]
1383 foreach path
[array names file_states
] {
1384 set s
$file_states($path)
1386 switch
-glob -- $m {
1394 unset file_states
($path)
1395 catch
{unset selected_paths
($path)}
1398 set file_states
($path) [list _O
[lindex
$s 1] {} {}]
1404 set file_states
($path) [list \
1405 _
[string index
$m 1] \
1416 set ui_status_value \
1417 "Changes committed as [string range $cmt_id 0 7]."
1420 ######################################################################
1424 proc fetch_from
{remote
} {
1425 set w
[new_console \
1427 "Fetching new changes from $remote"]
1428 set cmd
[list git fetch
]
1430 console_exec
$w $cmd console_done
1433 proc push_to
{remote
} {
1434 set w
[new_console \
1436 "Pushing changes to $remote"]
1437 set cmd
[list git push
]
1440 console_exec
$w $cmd console_done
1443 ######################################################################
1447 proc mapicon
{w state path
} {
1450 if {[catch
{set r
$all_icons($state$w)}]} {
1451 puts
"error: no icon for $w state={$state} $path"
1457 proc mapdesc
{state path
} {
1460 if {[catch
{set r
$all_descs($state)}]} {
1461 puts
"error: no desc for state={$state} $path"
1467 proc escape_path
{path
} {
1468 regsub
-all {\\} $path "\\\\" path
1469 regsub
-all "\n" $path "\\n" path
1473 proc short_path
{path
} {
1474 return [escape_path
[lindex
[file split $path] end
]]
1478 set null_sha1
[string repeat
0 40]
1480 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1481 global file_states next_icon_id null_sha1
1483 set s0
[string index
$new_state 0]
1484 set s1
[string index
$new_state 1]
1486 if {[catch
{set info
$file_states($path)}]} {
1488 set icon n
[incr next_icon_id
]
1490 set state
[lindex
$info 0]
1491 set icon
[lindex
$info 1]
1492 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1493 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1496 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1497 elseif
{$s0 eq
{_
}} {set s0 _
}
1499 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1500 elseif
{$s1 eq
{_
}} {set s1 _
}
1502 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1503 set head_info
[list
0 $null_sha1]
1504 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1505 && $head_info eq
{}} {
1506 set head_info
$index_info
1509 set file_states
($path) [list
$s0$s1 $icon \
1510 $head_info $index_info \
1515 proc display_file_helper
{w path icon_name old_m new_m
} {
1518 if {$new_m eq
{_
}} {
1519 set lno
[lsearch
-sorted -exact $file_lists($w) $path]
1521 set file_lists
($w) [lreplace
$file_lists($w) $lno $lno]
1523 $w conf
-state normal
1524 $w delete
$lno.0 [expr {$lno + 1}].0
1525 $w conf
-state disabled
1527 } elseif
{$old_m eq
{_
} && $new_m ne
{_
}} {
1528 lappend file_lists
($w) $path
1529 set file_lists
($w) [lsort
-unique $file_lists($w)]
1530 set lno
[lsearch
-sorted -exact $file_lists($w) $path]
1532 $w conf
-state normal
1533 $w image create
$lno.0 \
1534 -align center
-padx 5 -pady 1 \
1536 -image [mapicon
$w $new_m $path]
1537 $w insert
$lno.1 "[escape_path $path]\n"
1538 $w conf
-state disabled
1539 } elseif
{$old_m ne
$new_m} {
1540 $w conf
-state normal
1541 $w image conf
$icon_name -image [mapicon
$w $new_m $path]
1542 $w conf
-state disabled
1546 proc display_file
{path state
} {
1547 global file_states selected_paths
1548 global ui_index ui_workdir
1550 set old_m
[merge_state
$path $state]
1551 set s
$file_states($path)
1552 set new_m
[lindex
$s 0]
1553 set icon_name
[lindex
$s 1]
1555 set o
[string index
$old_m 0]
1556 set n
[string index
$new_m 0]
1563 display_file_helper
$ui_index $path $icon_name $o $n
1565 if {[string index
$old_m 0] eq
{U
}} {
1568 set o
[string index
$old_m 1]
1570 if {[string index
$new_m 0] eq
{U
}} {
1573 set n
[string index
$new_m 1]
1575 display_file_helper
$ui_workdir $path $icon_name $o $n
1577 if {$new_m eq
{__
}} {
1578 unset file_states
($path)
1579 catch
{unset selected_paths
($path)}
1583 proc display_all_files_helper
{w path icon_name m
} {
1586 lappend file_lists
($w) $path
1587 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1588 $w image create end \
1589 -align center
-padx 5 -pady 1 \
1591 -image [mapicon
$w $m $path]
1592 $w insert end
"[escape_path $path]\n"
1595 proc display_all_files
{} {
1596 global ui_index ui_workdir
1597 global file_states file_lists
1600 $ui_index conf
-state normal
1601 $ui_workdir conf
-state normal
1603 $ui_index delete
0.0 end
1604 $ui_workdir delete
0.0 end
1607 set file_lists
($ui_index) [list
]
1608 set file_lists
($ui_workdir) [list
]
1610 foreach path
[lsort
[array names file_states
]] {
1611 set s
$file_states($path)
1613 set icon_name
[lindex
$s 1]
1615 set s
[string index
$m 0]
1616 if {$s ne
{U
} && $s ne
{_
}} {
1617 display_all_files_helper
$ui_index $path \
1621 if {[string index
$m 0] eq
{U
}} {
1624 set s
[string index
$m 1]
1627 display_all_files_helper
$ui_workdir $path \
1632 $ui_index conf
-state disabled
1633 $ui_workdir conf
-state disabled
1636 proc update_indexinfo
{msg pathList after
} {
1637 global update_index_cp ui_status_value
1639 if {![lock_index update
]} return
1641 set update_index_cp
0
1642 set pathList
[lsort
$pathList]
1643 set totalCnt
[llength
$pathList]
1644 set batch [expr {int
($totalCnt * .01) + 1}]
1645 if {$batch > 25} {set batch 25}
1647 set ui_status_value
[format \
1648 "$msg... %i/%i files (%.2f%%)" \
1652 set fd
[open
"| git update-index -z --index-info" w
]
1659 fileevent
$fd writable
[list \
1660 write_update_indexinfo \
1670 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1671 global update_index_cp ui_status_value
1672 global file_states current_diff_path
1674 if {$update_index_cp >= $totalCnt} {
1681 for {set i
$batch} \
1682 {$update_index_cp < $totalCnt && $i > 0} \
1684 set path
[lindex
$pathList $update_index_cp]
1685 incr update_index_cp
1687 set s
$file_states($path)
1688 switch
-glob -- [lindex
$s 0] {
1695 set info
[lindex
$s 2]
1696 if {$info eq
{}} continue
1698 puts
-nonewline $fd "$info\t[encoding convertto $path]\0"
1699 display_file
$path $new
1702 set ui_status_value
[format \
1703 "$msg... %i/%i files (%.2f%%)" \
1706 [expr {100.0 * $update_index_cp / $totalCnt}]]
1709 proc update_index
{msg pathList after
} {
1710 global update_index_cp ui_status_value
1712 if {![lock_index update
]} return
1714 set update_index_cp
0
1715 set pathList
[lsort
$pathList]
1716 set totalCnt
[llength
$pathList]
1717 set batch [expr {int
($totalCnt * .01) + 1}]
1718 if {$batch > 25} {set batch 25}
1720 set ui_status_value
[format \
1721 "$msg... %i/%i files (%.2f%%)" \
1725 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1732 fileevent
$fd writable
[list \
1733 write_update_index \
1743 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1744 global update_index_cp ui_status_value
1745 global file_states current_diff_path
1747 if {$update_index_cp >= $totalCnt} {
1754 for {set i
$batch} \
1755 {$update_index_cp < $totalCnt && $i > 0} \
1757 set path
[lindex
$pathList $update_index_cp]
1758 incr update_index_cp
1760 switch
-glob -- [lindex
$file_states($path) 0] {
1766 if {[file exists
$path]} {
1775 puts
-nonewline $fd "[encoding convertto $path]\0"
1776 display_file
$path $new
1779 set ui_status_value
[format \
1780 "$msg... %i/%i files (%.2f%%)" \
1783 [expr {100.0 * $update_index_cp / $totalCnt}]]
1786 proc checkout_index
{msg pathList after
} {
1787 global update_index_cp ui_status_value
1789 if {![lock_index update
]} return
1791 set update_index_cp
0
1792 set pathList
[lsort
$pathList]
1793 set totalCnt
[llength
$pathList]
1794 set batch [expr {int
($totalCnt * .01) + 1}]
1795 if {$batch > 25} {set batch 25}
1797 set ui_status_value
[format \
1798 "$msg... %i/%i files (%.2f%%)" \
1802 set cmd
[list git checkout-index
]
1808 set fd
[open
"| $cmd " w
]
1815 fileevent
$fd writable
[list \
1816 write_checkout_index \
1826 proc write_checkout_index
{fd pathList totalCnt
batch msg after
} {
1827 global update_index_cp ui_status_value
1828 global file_states current_diff_path
1830 if {$update_index_cp >= $totalCnt} {
1837 for {set i
$batch} \
1838 {$update_index_cp < $totalCnt && $i > 0} \
1840 set path
[lindex
$pathList $update_index_cp]
1841 incr update_index_cp
1842 switch
-glob -- [lindex
$file_states($path) 0] {
1846 puts
-nonewline $fd "[encoding convertto $path]\0"
1847 display_file
$path ?_
1852 set ui_status_value
[format \
1853 "$msg... %i/%i files (%.2f%%)" \
1856 [expr {100.0 * $update_index_cp / $totalCnt}]]
1859 ######################################################################
1861 ## branch management
1863 proc is_tracking_branch
{name
} {
1864 global tracking_branches
1866 if {![catch
{set info
$tracking_branches($name)}]} {
1869 foreach t
[array names tracking_branches
] {
1870 if {[string match
{*/\
*} $t] && [string match
$t $name]} {
1877 proc load_all_heads
{} {
1880 set all_heads
[list
]
1881 set fd
[open
"| git for-each-ref --format=%(refname) refs/heads" r
]
1882 while {[gets
$fd line
] > 0} {
1883 if {[is_tracking_branch
$line]} continue
1884 if {![regsub ^refs
/heads
/ $line {} name
]} continue
1885 lappend all_heads
$name
1889 set all_heads
[lsort
$all_heads]
1892 proc populate_branch_menu
{} {
1893 global all_heads disable_on_lock
1896 set last
[$m index last
]
1897 for {set i
0} {$i <= $last} {incr i
} {
1898 if {[$m type $i] eq
{separator
}} {
1901 foreach a
$disable_on_lock {
1902 if {[lindex
$a 0] ne
$m ||
[lindex
$a 2] < $i} {
1906 set disable_on_lock
$new_dol
1911 if {$all_heads ne
{}} {
1914 foreach b
$all_heads {
1915 $m add radiobutton \
1917 -command [list switch_branch
$b] \
1918 -variable current_branch \
1921 lappend disable_on_lock \
1922 [list
$m entryconf
[$m index last
] -state]
1926 proc all_tracking_branches
{} {
1927 global tracking_branches
1929 set all_trackings
{}
1931 foreach name
[array names tracking_branches
] {
1932 if {[regsub
{/\
*$
} $name {} name
]} {
1935 regsub ^refs
/(heads|remotes
)/ $name {} name
1936 lappend all_trackings
$name
1941 set fd
[open
"| git for-each-ref --format=%(refname) $cmd" r
]
1942 while {[gets
$fd name
] > 0} {
1943 regsub ^refs
/(heads|remotes
)/ $name {} name
1944 lappend all_trackings
$name
1949 return [lsort
-unique $all_trackings]
1952 proc load_all_tags
{} {
1954 set fd
[open
"| git for-each-ref --format=%(refname) refs/tags" r
]
1955 while {[gets
$fd line
] > 0} {
1956 if {![regsub ^refs
/tags
/ $line {} name
]} continue
1957 lappend all_tags
$name
1961 return [lsort
$all_tags]
1964 proc do_create_branch_action
{w
} {
1965 global all_heads null_sha1 repo_config
1966 global create_branch_checkout create_branch_revtype
1967 global create_branch_head create_branch_trackinghead
1968 global create_branch_name create_branch_revexp
1969 global create_branch_tag
1971 set newbranch
$create_branch_name
1972 if {$newbranch eq
{}
1973 ||
$newbranch eq
$repo_config(gui.newbranchtemplate
)} {
1977 -title [wm title
$w] \
1979 -message "Please supply a branch name."
1980 focus
$w.desc.name_t
1983 if {![catch
{git show-ref
--verify -- "refs/heads/$newbranch"}]} {
1987 -title [wm title
$w] \
1989 -message "Branch '$newbranch' already exists."
1990 focus
$w.desc.name_t
1993 if {[catch
{git check-ref-format
"heads/$newbranch"}]} {
1997 -title [wm title
$w] \
1999 -message "We do not like '$newbranch' as a branch name."
2000 focus
$w.desc.name_t
2005 switch
-- $create_branch_revtype {
2006 head {set rev $create_branch_head}
2007 tracking
{set rev $create_branch_trackinghead}
2008 tag
{set rev $create_branch_tag}
2009 expression
{set rev $create_branch_revexp}
2011 if {[catch
{set cmt
[git rev-parse
--verify "${rev}^0"]}]} {
2015 -title [wm title
$w] \
2017 -message "Invalid starting revision: $rev"
2020 set cmd
[list git update-ref
]
2022 lappend cmd
"branch: Created from $rev"
2023 lappend cmd
"refs/heads/$newbranch"
2025 lappend cmd
$null_sha1
2026 if {[catch
{eval exec $cmd} err
]} {
2030 -title [wm title
$w] \
2032 -message "Failed to create '$newbranch'.\n\n$err"
2036 lappend all_heads
$newbranch
2037 set all_heads
[lsort
$all_heads]
2038 populate_branch_menu
2040 if {$create_branch_checkout} {
2041 switch_branch
$newbranch
2045 proc radio_selector
{varname value args
} {
2046 upvar
#0 $varname var
2050 trace add variable create_branch_head
write \
2051 [list radio_selector create_branch_revtype
head]
2052 trace add variable create_branch_trackinghead
write \
2053 [list radio_selector create_branch_revtype tracking
]
2054 trace add variable create_branch_tag
write \
2055 [list radio_selector create_branch_revtype tag
]
2057 trace add variable delete_branch_head
write \
2058 [list radio_selector delete_branch_checktype
head]
2059 trace add variable delete_branch_trackinghead
write \
2060 [list radio_selector delete_branch_checktype tracking
]
2062 proc do_create_branch
{} {
2063 global all_heads current_branch repo_config
2064 global create_branch_checkout create_branch_revtype
2065 global create_branch_head create_branch_trackinghead
2066 global create_branch_name create_branch_revexp
2067 global create_branch_tag
2069 set w .branch_editor
2071 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2073 label
$w.header
-text {Create New Branch
} \
2075 pack
$w.header
-side top
-fill x
2078 button
$w.buttons.create
-text Create \
2081 -command [list do_create_branch_action
$w]
2082 pack
$w.buttons.create
-side right
2083 button
$w.buttons.cancel
-text {Cancel
} \
2085 -command [list destroy
$w]
2086 pack
$w.buttons.cancel
-side right
-padx 5
2087 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2089 labelframe
$w.desc \
2090 -text {Branch Description
} \
2092 label
$w.desc.name_l
-text {Name
:} -font font_ui
2093 entry
$w.desc.name_t \
2097 -textvariable create_branch_name \
2101 if {%d
== 1 && [regexp
{[~^
:?
*\
[\
0- ]} %S
]} {return 0}
2104 grid
$w.desc.name_l
$w.desc.name_t
-sticky we
-padx {0 5}
2105 grid columnconfigure
$w.desc
1 -weight 1
2106 pack
$w.desc
-anchor nw
-fill x
-pady 5 -padx 5
2108 labelframe
$w.from \
2109 -text {Starting Revision
} \
2111 radiobutton
$w.from.head_r \
2112 -text {Local Branch
:} \
2114 -variable create_branch_revtype \
2116 set lbranchm
[eval tk_optionMenu
$w.from.head_m create_branch_head \
2118 $lbranchm configure
-font font_ui
2119 $w.from.head_m configure
-font font_ui
2120 grid
$w.from.head_r
$w.from.head_m
-sticky w
2121 set all_trackings
[all_tracking_branches
]
2122 if {$all_trackings ne
{}} {
2123 set create_branch_trackinghead
[lindex
$all_trackings 0]
2124 radiobutton
$w.from.tracking_r \
2125 -text {Tracking Branch
:} \
2127 -variable create_branch_revtype \
2129 set tbranchm
[eval tk_optionMenu
$w.from.tracking_m \
2130 create_branch_trackinghead \
2132 $tbranchm configure
-font font_ui
2133 $w.from.tracking_m configure
-font font_ui
2134 grid
$w.from.tracking_r
$w.from.tracking_m
-sticky w
2136 set all_tags
[load_all_tags
]
2137 if {$all_tags ne
{}} {
2138 set create_branch_tag
[lindex
$all_tags 0]
2139 radiobutton
$w.from.tag_r \
2142 -variable create_branch_revtype \
2144 set tagsm
[eval tk_optionMenu
$w.from.tag_m \
2147 $tagsm configure
-font font_ui
2148 $w.from.tag_m configure
-font font_ui
2149 grid
$w.from.tag_r
$w.from.tag_m
-sticky w
2151 radiobutton
$w.from.exp_r \
2152 -text {Revision Expression
:} \
2154 -variable create_branch_revtype \
2156 entry
$w.from.exp_t \
2160 -textvariable create_branch_revexp \
2164 if {%d
== 1 && [regexp
{\s
} %S
]} {return 0}
2165 if {%d
== 1 && [string length
%S
] > 0} {
2166 set create_branch_revtype expression
2170 grid
$w.from.exp_r
$w.from.exp_t
-sticky we
-padx {0 5}
2171 grid columnconfigure
$w.from
1 -weight 1
2172 pack
$w.from
-anchor nw
-fill x
-pady 5 -padx 5
2174 labelframe
$w.postActions \
2175 -text {Post Creation Actions
} \
2177 checkbutton
$w.postActions.checkout \
2178 -text {Checkout after creation
} \
2179 -variable create_branch_checkout \
2181 pack
$w.postActions.checkout
-anchor nw
2182 pack
$w.postActions
-anchor nw
-fill x
-pady 5 -padx 5
2184 set create_branch_checkout
1
2185 set create_branch_head
$current_branch
2186 set create_branch_revtype
head
2187 set create_branch_name
$repo_config(gui.newbranchtemplate
)
2188 set create_branch_revexp
{}
2190 bind $w <Visibility
> "
2192 $w.desc.name_t icursor end
2193 focus $w.desc.name_t
2195 bind $w <Key-Escape
> "destroy $w"
2196 bind $w <Key-Return
> "do_create_branch_action $w;break"
2197 wm title
$w "[appname] ([reponame]): Create Branch"
2201 proc do_delete_branch_action
{w
} {
2203 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2206 switch
-- $delete_branch_checktype {
2207 head {set check_rev
$delete_branch_head}
2208 tracking
{set check_rev
$delete_branch_trackinghead}
2209 always
{set check_rev
{:none
}}
2211 if {$check_rev eq
{:none
}} {
2213 } elseif
{[catch
{set check_cmt
[git rev-parse
--verify "${check_rev}^0"]}]} {
2217 -title [wm title
$w] \
2219 -message "Invalid check revision: $check_rev"
2223 set to_delete
[list
]
2224 set not_merged
[list
]
2225 foreach i
[$w.list.l curselection
] {
2226 set b
[$w.list.l get
$i]
2227 if {[catch
{set o
[git rev-parse
--verify $b]}]} continue
2228 if {$check_cmt ne
{}} {
2229 if {$b eq
$check_rev} continue
2230 if {[catch
{set m
[git merge-base
$o $check_cmt]}]} continue
2232 lappend not_merged
$b
2236 lappend to_delete
[list
$b $o]
2238 if {$not_merged ne
{}} {
2239 set msg
"The following branches are not completely merged into $check_rev:
2241 - [join $not_merged "\n - "]"
2245 -title [wm title
$w] \
2249 if {$to_delete eq
{}} return
2250 if {$delete_branch_checktype eq
{always
}} {
2251 set msg
{Recovering deleted branches is difficult.
2253 Delete the selected branches?
}
2254 if {[tk_messageBox \
2257 -title [wm title
$w] \
2259 -message $msg] ne
yes} {
2265 foreach i
$to_delete {
2268 if {[catch
{git update-ref
-d "refs/heads/$b" $o} err
]} {
2269 append failed
" - $b: $err\n"
2271 set x
[lsearch
-sorted -exact $all_heads $b]
2273 set all_heads
[lreplace
$all_heads $x $x]
2278 if {$failed ne
{}} {
2282 -title [wm title
$w] \
2284 -message "Failed to delete branches:\n$failed"
2287 set all_heads
[lsort
$all_heads]
2288 populate_branch_menu
2292 proc do_delete_branch
{} {
2293 global all_heads tracking_branches current_branch
2294 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2296 set w .branch_editor
2298 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2300 label
$w.header
-text {Delete Local Branch
} \
2302 pack
$w.header
-side top
-fill x
2305 button
$w.buttons.create
-text Delete \
2307 -command [list do_delete_branch_action
$w]
2308 pack
$w.buttons.create
-side right
2309 button
$w.buttons.cancel
-text {Cancel
} \
2311 -command [list destroy
$w]
2312 pack
$w.buttons.cancel
-side right
-padx 5
2313 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2315 labelframe
$w.list \
2316 -text {Local Branches
} \
2321 -selectmode extended \
2322 -yscrollcommand [list
$w.list.sby
set] \
2324 foreach h
$all_heads {
2325 if {$h ne
$current_branch} {
2326 $w.list.l insert end
$h
2329 scrollbar
$w.list.sby
-command [list
$w.list.l yview
]
2330 pack
$w.list.sby
-side right
-fill y
2331 pack
$w.list.l
-side left
-fill both
-expand 1
2332 pack
$w.list
-fill both
-expand 1 -pady 5 -padx 5
2334 labelframe
$w.validate \
2335 -text {Delete Only If
} \
2337 radiobutton
$w.validate.head_r \
2338 -text {Merged Into Local Branch
:} \
2340 -variable delete_branch_checktype \
2342 set mergedlocalm
[eval tk_optionMenu
$w.validate.head_m \
2343 delete_branch_head \
2345 $mergedlocalm configure
-font font_ui
2346 $w.validate.head_m configure
-font font_ui
2347 grid
$w.validate.head_r
$w.validate.head_m
-sticky w
2348 set all_trackings
[all_tracking_branches
]
2349 if {$all_trackings ne
{}} {
2350 set delete_branch_trackinghead
[lindex
$all_trackings 0]
2351 radiobutton
$w.validate.tracking_r \
2352 -text {Merged Into Tracking Branch
:} \
2354 -variable delete_branch_checktype \
2356 set mergedtrackm
[eval tk_optionMenu
$w.validate.tracking_m \
2357 delete_branch_trackinghead \
2359 $mergedtrackm configure
-font font_ui
2360 $w.validate.tracking_m configure
-font font_ui
2361 grid
$w.validate.tracking_r
$w.validate.tracking_m
-sticky w
2363 radiobutton
$w.validate.always_r \
2364 -text {Always
(Do not perform merge checks
)} \
2366 -variable delete_branch_checktype \
2368 grid
$w.validate.always_r
-columnspan 2 -sticky w
2369 grid columnconfigure
$w.validate
1 -weight 1
2370 pack
$w.validate
-anchor nw
-fill x
-pady 5 -padx 5
2372 set delete_branch_head
$current_branch
2373 set delete_branch_checktype
head
2375 bind $w <Visibility
> "grab $w; focus $w"
2376 bind $w <Key-Escape
> "destroy $w"
2377 wm title
$w "[appname] ([reponame]): Delete Branch"
2381 proc switch_branch
{new_branch
} {
2382 global HEAD commit_type current_branch repo_config
2384 if {![lock_index switch
]} return
2386 # -- Our in memory state should match the repository.
2388 repository_state curType curHEAD curMERGE_HEAD
2389 if {[string match amend
* $commit_type]
2390 && $curType eq
{normal
}
2391 && $curHEAD eq
$HEAD} {
2392 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
2393 info_popup
{Last scanned state does not match repository state.
2395 Another Git program has modified this repository since the last scan. A rescan must be performed before the current branch can be changed.
2397 The rescan will be automatically started now.
2400 rescan
{set ui_status_value
{Ready.
}}
2404 # -- Don't do a pointless switch.
2406 if {$current_branch eq
$new_branch} {
2411 if {$repo_config(gui.trustmtime
) eq
{true
}} {
2412 switch_branch_stage2
{} $new_branch
2414 set ui_status_value
{Refreshing
file status...
}
2415 set cmd
[list git update-index
]
2417 lappend cmd
--unmerged
2418 lappend cmd
--ignore-missing
2419 lappend cmd
--refresh
2420 set fd_rf
[open
"| $cmd" r
]
2421 fconfigure
$fd_rf -blocking 0 -translation binary
2422 fileevent
$fd_rf readable \
2423 [list switch_branch_stage2
$fd_rf $new_branch]
2427 proc switch_branch_stage2
{fd_rf new_branch
} {
2428 global ui_status_value HEAD
2432 if {![eof
$fd_rf]} return
2436 set ui_status_value
"Updating working directory to '$new_branch'..."
2437 set cmd
[list git read-tree
]
2440 lappend cmd
--exclude-per-directory=.gitignore
2442 lappend cmd
$new_branch
2443 set fd_rt
[open
"| $cmd" r
]
2444 fconfigure
$fd_rt -blocking 0 -translation binary
2445 fileevent
$fd_rt readable \
2446 [list switch_branch_readtree_wait
$fd_rt $new_branch]
2449 proc switch_branch_readtree_wait
{fd_rt new_branch
} {
2450 global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
2451 global current_branch
2452 global ui_comm ui_status_value
2454 # -- We never get interesting output on stdout; only stderr.
2457 fconfigure
$fd_rt -blocking 1
2458 if {![eof
$fd_rt]} {
2459 fconfigure
$fd_rt -blocking 0
2463 # -- The working directory wasn't in sync with the index and
2464 # we'd have to overwrite something to make the switch. A
2465 # merge is required.
2467 if {[catch
{close
$fd_rt} err
]} {
2468 regsub
{^fatal
: } $err {} err
2469 warn_popup
"File level merge required.
2473 Staying on branch '$current_branch'."
2474 set ui_status_value
"Aborted checkout of '$new_branch' (file level merging is required)."
2479 # -- Update the symbolic ref. Core git doesn't even check for failure
2480 # here, it Just Works(tm). If it doesn't we are in some really ugly
2481 # state that is difficult to recover from within git-gui.
2483 if {[catch
{git symbolic-ref HEAD
"refs/heads/$new_branch"} err
]} {
2484 error_popup
"Failed to set current branch.
2486 This working directory is only partially switched. We successfully updated your files, but failed to update an internal Git file.
2488 This should not have occurred. [appname] will now close and give up.
2495 # -- Update our repository state. If we were previously in amend mode
2496 # we need to toss the current buffer and do a full rescan to update
2497 # our file lists. If we weren't in amend mode our file lists are
2498 # accurate and we can avoid the rescan.
2501 set selected_commit_type new
2502 if {[string match amend
* $commit_type]} {
2503 $ui_comm delete
0.0 end
2505 $ui_comm edit modified false
2506 rescan
{set ui_status_value
"Checked out branch '$current_branch'."}
2508 repository_state commit_type HEAD MERGE_HEAD
2510 set ui_status_value
"Checked out branch '$current_branch'."
2514 ######################################################################
2516 ## remote management
2518 proc load_all_remotes
{} {
2520 global all_remotes tracking_branches
2522 set all_remotes
[list
]
2523 array
unset tracking_branches
2525 set rm_dir
[gitdir remotes
]
2526 if {[file isdirectory
$rm_dir]} {
2527 set all_remotes
[glob \
2531 -directory $rm_dir *]
2533 foreach name
$all_remotes {
2535 set fd
[open
[file join $rm_dir $name] r
]
2536 while {[gets
$fd line
] >= 0} {
2537 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
2538 $line line src dst
]} continue
2539 if {![regexp ^refs
/ $dst]} {
2540 set dst
"refs/heads/$dst"
2542 set tracking_branches
($dst) [list
$name $src]
2549 foreach line
[array names repo_config remote.
*.url
] {
2550 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
2551 lappend all_remotes
$name
2553 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
2557 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
2558 if {![regexp ^refs
/ $dst]} {
2559 set dst
"refs/heads/$dst"
2561 set tracking_branches
($dst) [list
$name $src]
2565 set all_remotes
[lsort
-unique $all_remotes]
2568 proc populate_fetch_menu
{} {
2569 global all_remotes repo_config
2572 foreach r
$all_remotes {
2574 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2575 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
2580 set fd
[open
[gitdir remotes
$r] r
]
2581 while {[gets
$fd n
] >= 0} {
2582 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
2593 -label "Fetch from $r..." \
2594 -command [list fetch_from
$r] \
2600 proc populate_push_menu
{} {
2601 global all_remotes repo_config
2605 foreach r
$all_remotes {
2607 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2608 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
2613 set fd
[open
[gitdir remotes
$r] r
]
2614 while {[gets
$fd n
] >= 0} {
2615 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
2629 -label "Push to $r..." \
2630 -command [list push_to
$r] \
2637 proc start_push_anywhere_action
{w
} {
2638 global push_urltype push_remote push_url push_thin push_tags
2641 switch
-- $push_urltype {
2642 remote
{set r_url
$push_remote}
2643 url
{set r_url
$push_url}
2645 if {$r_url eq
{}} return
2647 set cmd
[list git push
]
2657 foreach i
[$w.
source.l curselection
] {
2658 set b
[$w.
source.l get
$i]
2659 lappend cmd
"refs/heads/$b:refs/heads/$b"
2664 } elseif
{$cnt == 1} {
2670 set cons
[new_console
"push $r_url" "Pushing $cnt $unit to $r_url"]
2671 console_exec
$cons $cmd console_done
2675 trace add variable push_remote
write \
2676 [list radio_selector push_urltype remote
]
2678 proc do_push_anywhere
{} {
2679 global all_heads all_remotes current_branch
2680 global push_urltype push_remote push_url push_thin push_tags
2684 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2686 label
$w.header
-text {Push Branches
} -font font_uibold
2687 pack
$w.header
-side top
-fill x
2690 button
$w.buttons.create
-text Push \
2693 -command [list start_push_anywhere_action
$w]
2694 pack
$w.buttons.create
-side right
2695 button
$w.buttons.cancel
-text {Cancel
} \
2698 -command [list destroy
$w]
2699 pack
$w.buttons.cancel
-side right
-padx 5
2700 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2702 labelframe
$w.
source \
2703 -text {Source Branches
} \
2705 listbox
$w.
source.l \
2708 -selectmode extended \
2709 -yscrollcommand [list
$w.
source.sby
set] \
2711 foreach h
$all_heads {
2712 $w.
source.l insert end
$h
2713 if {$h eq
$current_branch} {
2714 $w.
source.l
select set end
2717 scrollbar
$w.
source.sby
-command [list
$w.
source.l yview
]
2718 pack
$w.
source.sby
-side right
-fill y
2719 pack
$w.
source.l
-side left
-fill both
-expand 1
2720 pack
$w.
source -fill both
-expand 1 -pady 5 -padx 5
2722 labelframe
$w.dest \
2723 -text {Destination Repository
} \
2725 if {$all_remotes ne
{}} {
2726 radiobutton
$w.dest.remote_r \
2729 -variable push_urltype \
2731 set remmenu
[eval tk_optionMenu
$w.dest.remote_m push_remote \
2733 $remmenu configure
-font font_ui
2734 $w.dest.remote_m configure
-font font_ui
2735 grid
$w.dest.remote_r
$w.dest.remote_m
-sticky w
2736 if {[lsearch
-sorted -exact $all_remotes origin
] != -1} {
2737 set push_remote origin
2739 set push_remote
[lindex
$all_remotes 0]
2741 set push_urltype remote
2743 set push_urltype url
2745 radiobutton
$w.dest.url_r \
2746 -text {Arbitrary URL
:} \
2748 -variable push_urltype \
2750 entry
$w.dest.url_t \
2754 -textvariable push_url \
2758 if {%d
== 1 && [regexp
{\s
} %S
]} {return 0}
2759 if {%d
== 1 && [string length
%S
] > 0} {
2760 set push_urltype url
2764 grid
$w.dest.url_r
$w.dest.url_t
-sticky we
-padx {0 5}
2765 grid columnconfigure
$w.dest
1 -weight 1
2766 pack
$w.dest
-anchor nw
-fill x
-pady 5 -padx 5
2768 labelframe
$w.options \
2769 -text {Transfer Options
} \
2771 checkbutton
$w.options.thin \
2772 -text {Use thin pack
(for slow network connections
)} \
2773 -variable push_thin \
2775 grid
$w.options.thin
-columnspan 2 -sticky w
2776 checkbutton
$w.options.tags \
2777 -text {Include tags
} \
2778 -variable push_tags \
2780 grid
$w.options.tags
-columnspan 2 -sticky w
2781 grid columnconfigure
$w.options
1 -weight 1
2782 pack
$w.options
-anchor nw
-fill x
-pady 5 -padx 5
2788 bind $w <Visibility
> "grab $w; focus $w.buttons.create"
2789 bind $w <Key-Escape
> "destroy $w"
2790 bind $w <Key-Return
> [list start_push_anywhere_action
$w]
2791 wm title
$w "[appname] ([reponame]): Push"
2795 ######################################################################
2800 global HEAD commit_type file_states
2802 if {[string match amend
* $commit_type]} {
2803 info_popup
{Cannot merge
while amending.
2805 You must finish amending this commit before starting any
type of merge.
2810 if {[committer_ident
] eq
{}} {return 0}
2811 if {![lock_index merge
]} {return 0}
2813 # -- Our in memory state should match the repository.
2815 repository_state curType curHEAD curMERGE_HEAD
2816 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
2817 info_popup
{Last scanned state does not match repository state.
2819 Another Git program has modified this repository since the last scan. A rescan must be performed before a merge can be performed.
2821 The rescan will be automatically started now.
2824 rescan
{set ui_status_value
{Ready.
}}
2828 foreach path
[array names file_states
] {
2829 switch
-glob -- [lindex
$file_states($path) 0] {
2831 continue; # and pray it works!
2834 error_popup
"You are in the middle of a conflicted merge.
2836 File [short_path $path] has merge conflicts.
2838 You must resolve them, add the file, and commit to complete the current merge. Only then can you begin another merge.
2844 error_popup
"You are in the middle of a change.
2846 File [short_path $path] is modified.
2848 You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.
2859 proc visualize_local_merge
{w
} {
2861 foreach i
[$w.
source.l curselection
] {
2862 lappend revs
[$w.
source.l get
$i]
2864 if {$revs eq
{}} return
2865 lappend revs
--not HEAD
2869 proc start_local_merge_action
{w
} {
2870 global HEAD ui_status_value current_branch
2872 set cmd
[list git merge
]
2875 foreach i
[$w.
source.l curselection
] {
2876 set b
[$w.
source.l get
$i]
2884 } elseif
{$revcnt == 1} {
2886 } elseif
{$revcnt <= 15} {
2892 -title [wm title
$w] \
2894 -message "Too many branches selected.
2896 You have requested to merge $revcnt branches
2897 in an octopus merge. This exceeds Git's
2898 internal limit of 15 branches per merge.
2900 Please select fewer branches. To merge more
2901 than 15 branches, merge the branches in batches.
2906 set msg
"Merging $current_branch, [join $names {, }]"
2907 set ui_status_value
"$msg..."
2908 set cons
[new_console
"Merge" $msg]
2909 console_exec
$cons $cmd [list finish_merge
$revcnt]
2910 bind $w <Destroy
> {}
2914 proc finish_merge
{revcnt w ok
} {
2917 set msg
{Merge completed successfully.
}
2920 info_popup
"Octopus merge failed.
2922 Your merge of $revcnt branches has failed.
2924 There are file-level conflicts between the branches which must be resolved manually.
2926 The working directory will now be reset.
2928 You can attempt this merge again by merging only one branch at a time." $w
2930 set fd
[open
"| git read-tree --reset -u HEAD" r
]
2931 fconfigure
$fd -blocking 0 -translation binary
2932 fileevent
$fd readable
[list reset_hard_wait
$fd]
2933 set ui_status_value
{Aborting... please
wait...
}
2937 set msg
{Merge failed. Conflict resolution is required.
}
2940 rescan
[list
set ui_status_value
$msg]
2943 proc do_local_merge
{} {
2944 global current_branch
2946 if {![can_merge
]} return
2950 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2953 -text "Merge Into $current_branch" \
2955 pack
$w.header
-side top
-fill x
2958 button
$w.buttons.visualize
-text Visualize \
2960 -command [list visualize_local_merge
$w]
2961 pack
$w.buttons.visualize
-side left
2962 button
$w.buttons.create
-text Merge \
2964 -command [list start_local_merge_action
$w]
2965 pack
$w.buttons.create
-side right
2966 button
$w.buttons.cancel
-text {Cancel
} \
2968 -command [list destroy
$w]
2969 pack
$w.buttons.cancel
-side right
-padx 5
2970 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2972 labelframe
$w.
source \
2973 -text {Source Branches
} \
2975 listbox
$w.
source.l \
2978 -selectmode extended \
2979 -yscrollcommand [list
$w.
source.sby
set] \
2981 scrollbar
$w.
source.sby
-command [list
$w.
source.l yview
]
2982 pack
$w.
source.sby
-side right
-fill y
2983 pack
$w.
source.l
-side left
-fill both
-expand 1
2984 pack
$w.
source -fill both
-expand 1 -pady 5 -padx 5
2986 set cmd
[list git for-each-ref
]
2987 lappend cmd
{--format=%(objectname
) %(*objectname
) %(refname
)}
2988 lappend cmd refs
/heads
2989 lappend cmd refs
/remotes
2990 lappend cmd refs
/tags
2991 set fr_fd
[open
"| $cmd" r
]
2992 fconfigure
$fr_fd -translation binary
2993 while {[gets
$fr_fd line
] > 0} {
2994 set line
[split $line { }]
2995 set sha1
([lindex
$line 0]) [lindex
$line 2]
2996 set sha1
([lindex
$line 1]) [lindex
$line 2]
3001 set fr_fd
[open
"| git rev-list --all --not HEAD"]
3002 while {[gets
$fr_fd line
] > 0} {
3003 if {[catch
{set ref
$sha1($line)}]} continue
3004 regsub ^refs
/(heads|remotes|tags
)/ $ref {} ref
3005 lappend to_show
$ref
3009 foreach ref
[lsort
-unique $to_show] {
3010 $w.
source.l insert end
$ref
3013 bind $w <Visibility
> "grab $w"
3014 bind $w <Key-Escape
> "unlock_index;destroy $w"
3015 bind $w <Destroy
> unlock_index
3016 wm title
$w "[appname] ([reponame]): Merge"
3020 proc do_reset_hard
{} {
3021 global HEAD commit_type file_states
3023 if {[string match amend
* $commit_type]} {
3024 info_popup
{Cannot abort
while amending.
3026 You must finish amending this commit.
3031 if {![lock_index abort
]} return
3033 if {[string match
*merge
* $commit_type]} {
3039 if {[ask_popup
"Abort $op?
3041 Aborting the current $op will cause *ALL* uncommitted changes to be lost.
3043 Continue with aborting the current $op?"] eq
{yes}} {
3044 set fd
[open
"| git read-tree --reset -u HEAD" r
]
3045 fconfigure
$fd -blocking 0 -translation binary
3046 fileevent
$fd readable
[list reset_hard_wait
$fd]
3047 set ui_status_value
{Aborting... please
wait...
}
3053 proc reset_hard_wait
{fd
} {
3061 $ui_comm delete
0.0 end
3062 $ui_comm edit modified false
3064 catch
{file delete
[gitdir MERGE_HEAD
]}
3065 catch
{file delete
[gitdir rr-cache MERGE_RR
]}
3066 catch
{file delete
[gitdir SQUASH_MSG
]}
3067 catch
{file delete
[gitdir MERGE_MSG
]}
3068 catch
{file delete
[gitdir GITGUI_MSG
]}
3070 rescan
{set ui_status_value
{Abort completed. Ready.
}}
3074 ######################################################################
3078 set next_browser_id
0
3080 proc new_browser
{commit
} {
3081 global next_browser_id cursor_ptr M1B
3082 global browser_commit browser_status browser_stack browser_path browser_busy
3084 if {[winfo ismapped .
]} {
3085 set w .browser
[incr next_browser_id
]
3092 set w_list
$w.list.l
3093 set browser_commit
($w_list) $commit
3094 set browser_status
($w_list) {Starting...
}
3095 set browser_stack
($w_list) {}
3096 set browser_path
($w_list) $browser_commit($w_list):
3097 set browser_busy
($w_list) 1
3099 label
$w.path
-textvariable browser_path
($w_list) \
3105 pack
$w.path
-anchor w
-side top
-fill x
3108 text
$w_list -background white
-borderwidth 0 \
3109 -cursor $cursor_ptr \
3114 -xscrollcommand [list
$w.list.sbx
set] \
3115 -yscrollcommand [list
$w.list.sby
set] \
3117 $w_list tag conf in_sel \
3118 -background [$w_list cget
-foreground] \
3119 -foreground [$w_list cget
-background]
3120 scrollbar
$w.list.sbx
-orient h
-command [list
$w_list xview
]
3121 scrollbar
$w.list.sby
-orient v
-command [list
$w_list yview
]
3122 pack
$w.list.sbx
-side bottom
-fill x
3123 pack
$w.list.sby
-side right
-fill y
3124 pack
$w_list -side left
-fill both
-expand 1
3125 pack
$w.list
-side top
-fill both
-expand 1
3127 label
$w.status
-textvariable browser_status
($w_list) \
3133 pack
$w.status
-anchor w
-side bottom
-fill x
3135 bind $w_list <Button-1
> "browser_click 0 $w_list @%x,%y;break"
3136 bind $w_list <Double-Button-1
> "browser_click 1 $w_list @%x,%y;break"
3137 bind $w_list <$M1B-Up> "browser_parent $w_list;break"
3138 bind $w_list <$M1B-Left> "browser_parent $w_list;break"
3139 bind $w_list <Up
> "browser_move -1 $w_list;break"
3140 bind $w_list <Down
> "browser_move 1 $w_list;break"
3141 bind $w_list <$M1B-Right> "browser_enter $w_list;break"
3142 bind $w_list <Return
> "browser_enter $w_list;break"
3143 bind $w_list <Prior
> "browser_page -1 $w_list;break"
3144 bind $w_list <Next
> "browser_page 1 $w_list;break"
3145 bind $w_list <Left
> break
3146 bind $w_list <Right
> break
3148 bind $tl <Visibility
> "focus $w"
3149 bind $tl <Destroy
> "
3150 array unset browser_buffer $w_list
3151 array unset browser_files $w_list
3152 array unset browser_status $w_list
3153 array unset browser_stack $w_list
3154 array unset browser_path $w_list
3155 array unset browser_commit $w_list
3156 array unset browser_busy $w_list
3158 wm title
$tl "[appname] ([reponame]): File Browser"
3159 ls_tree
$w_list $browser_commit($w_list) {}
3162 proc browser_move
{dir w
} {
3163 global browser_files browser_busy
3165 if {$browser_busy($w)} return
3166 set lno
[lindex
[split [$w index in_sel.first
] .
] 0]
3168 if {[lindex
$browser_files($w) [expr {$lno - 1}]] ne
{}} {
3169 $w tag remove in_sel
0.0 end
3170 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
3175 proc browser_page
{dir w
} {
3176 global browser_files browser_busy
3178 if {$browser_busy($w)} return
3179 $w yview scroll
$dir pages
3181 [lindex
[$w yview
] 0]
3182 * [llength
$browser_files($w)]
3184 if {[lindex
$browser_files($w) [expr {$lno - 1}]] ne
{}} {
3185 $w tag remove in_sel
0.0 end
3186 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
3191 proc browser_parent
{w
} {
3192 global browser_files browser_status browser_path
3193 global browser_stack browser_busy
3195 if {$browser_busy($w)} return
3196 set info
[lindex
$browser_files($w) 0]
3197 if {[lindex
$info 0] eq
{parent
}} {
3198 set parent
[lindex
$browser_stack($w) end-1
]
3199 set browser_stack
($w) [lrange
$browser_stack($w) 0 end-2
]
3200 if {$browser_stack($w) eq
{}} {
3201 regsub
{:.
*$
} $browser_path($w) {:} browser_path
($w)
3203 regsub
{/[^
/]+$
} $browser_path($w) {} browser_path
($w)
3205 set browser_status
($w) "Loading $browser_path($w)..."
3206 ls_tree
$w [lindex
$parent 0] [lindex
$parent 1]
3210 proc browser_enter
{w
} {
3211 global browser_files browser_status browser_path
3212 global browser_commit browser_stack browser_busy
3214 if {$browser_busy($w)} return
3215 set lno
[lindex
[split [$w index in_sel.first
] .
] 0]
3216 set info
[lindex
$browser_files($w) [expr {$lno - 1}]]
3218 switch
-- [lindex
$info 0] {
3223 set name
[lindex
$info 2]
3224 set escn
[escape_path
$name]
3225 set browser_status
($w) "Loading $escn..."
3226 append browser_path
($w) $escn
3227 ls_tree
$w [lindex
$info 1] $name
3230 set name
[lindex
$info 2]
3232 foreach n
$browser_stack($w) {
3233 append p
[lindex
$n 1]
3236 show_blame
$browser_commit($w) $p
3242 proc browser_click
{was_double_click w pos
} {
3243 global browser_files browser_busy
3245 if {$browser_busy($w)} return
3246 set lno
[lindex
[split [$w index
$pos] .
] 0]
3249 if {[lindex
$browser_files($w) [expr {$lno - 1}]] ne
{}} {
3250 $w tag remove in_sel
0.0 end
3251 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
3252 if {$was_double_click} {
3258 proc ls_tree
{w tree_id name
} {
3259 global browser_buffer browser_files browser_stack browser_busy
3261 set browser_buffer
($w) {}
3262 set browser_files
($w) {}
3263 set browser_busy
($w) 1
3265 $w conf
-state normal
3266 $w tag remove in_sel
0.0 end
3268 if {$browser_stack($w) ne
{}} {
3269 $w image create end \
3270 -align center
-padx 5 -pady 1 \
3273 $w insert end
{[Up To Parent
]}
3274 lappend browser_files
($w) parent
3276 lappend browser_stack
($w) [list
$tree_id $name]
3277 $w conf
-state disabled
3279 set cmd
[list git ls-tree
-z $tree_id]
3280 set fd
[open
"| $cmd" r
]
3281 fconfigure
$fd -blocking 0 -translation binary
-encoding binary
3282 fileevent
$fd readable
[list read_ls_tree
$fd $w]
3285 proc read_ls_tree
{fd w
} {
3286 global browser_buffer browser_files browser_status browser_busy
3288 if {![winfo exists
$w]} {
3293 append browser_buffer
($w) [read $fd]
3294 set pck
[split $browser_buffer($w) "\0"]
3295 set browser_buffer
($w) [lindex
$pck end
]
3297 set n
[llength
$browser_files($w)]
3298 $w conf
-state normal
3299 foreach p
[lrange
$pck 0 end-1
] {
3300 set info
[split $p "\t"]
3301 set path
[lindex
$info 1]
3302 set info
[split [lindex
$info 0] { }]
3303 set type [lindex
$info 1]
3304 set object
[lindex
$info 2]
3315 set image file_question
3319 if {$n > 0} {$w insert end
"\n"}
3320 $w image create end \
3321 -align center
-padx 5 -pady 1 \
3322 -name icon
[incr n
] \
3324 $w insert end
[escape_path
$path]
3325 lappend browser_files
($w) [list
$type $object $path]
3327 $w conf
-state disabled
3331 set browser_status
($w) Ready.
3332 set browser_busy
($w) 0
3333 array
unset browser_buffer
$w
3335 $w tag add in_sel
1.0 2.0
3341 proc show_blame
{commit path
} {
3342 global next_browser_id blame_status blame_data
3344 if {[winfo ismapped .
]} {
3345 set w .browser
[incr next_browser_id
]
3352 set blame_status
($w) {Loading current
file content...
}
3354 label
$w.path
-text "$commit:$path" \
3360 pack
$w.path
-side top
-fill x
3363 text
$w.out.loaded_t \
3364 -background white
-borderwidth 0 \
3370 $w.out.loaded_t tag conf annotated
-background grey
3372 text
$w.out.linenumber_t \
3373 -background white
-borderwidth 0 \
3379 $w.out.linenumber_t tag conf linenumber
-justify right
3381 text
$w.out.file_t \
3382 -background white
-borderwidth 0 \
3387 -xscrollcommand [list
$w.out.sbx
set] \
3390 scrollbar
$w.out.sbx
-orient h
-command [list
$w.out.file_t xview
]
3391 scrollbar
$w.out.sby
-orient v \
3392 -command [list scrollbar2many
[list \
3394 $w.out.linenumber_t \
3398 $w.out.linenumber_t \
3403 grid conf
$w.out.sbx
-column 2 -sticky we
3404 grid columnconfigure
$w.out
2 -weight 1
3405 grid rowconfigure
$w.out
0 -weight 1
3406 pack
$w.out
-fill both
-expand 1
3408 label
$w.status
-textvariable blame_status
($w) \
3414 pack
$w.status
-side bottom
-fill x
3418 -background white
-borderwidth 0 \
3423 -xscrollcommand [list
$w.cm.sbx
set] \
3424 -yscrollcommand [list
$w.cm.sby
set] \
3426 scrollbar
$w.cm.sbx
-orient h
-command [list
$w.cm.t xview
]
3427 scrollbar
$w.cm.sby
-orient v
-command [list
$w.cm.t yview
]
3428 pack
$w.cm.sby
-side right
-fill y
3429 pack
$w.cm.sbx
-side bottom
-fill x
3430 pack
$w.cm.t
-expand 1 -fill both
3431 pack
$w.cm
-side bottom
-fill x
3433 menu
$w.ctxm
-tearoff 0
3434 $w.ctxm add
command -label "Copy Commit" \
3436 -command "blame_copycommit $w \$cursorW @\$cursorX,\$cursorY"
3440 $w.out.linenumber_t \
3442 $i tag conf in_sel \
3443 -background [$i cget
-foreground] \
3444 -foreground [$i cget
-background]
3445 $i conf
-yscrollcommand \
3446 [list many2scrollbar
[list \
3448 $w.out.linenumber_t \
3451 bind $i <Button-1
> "
3454 $w.out.linenumber_t \\
3463 tk_popup $w.ctxm %X %Y
3467 bind $w.cm.t
<Button-1
> "focus $w.cm.t"
3468 bind $tl <Visibility
> "focus $tl"
3469 bind $tl <Destroy
> "
3470 array unset blame_status {$w}
3471 array unset blame_data $w,*
3473 wm title
$tl "[appname] ([reponame]): File Viewer"
3475 set blame_data
($w,commit_count
) 0
3476 set blame_data
($w,commit_list
) {}
3477 set blame_data
($w,total_lines
) 0
3478 set blame_data
($w,blame_lines
) 0
3479 set blame_data
($w,highlight_commit
) {}
3480 set blame_data
($w,highlight_line
) -1
3482 set cmd
[list git cat-file blob
"$commit:$path"]
3483 set fd
[open
"| $cmd" r
]
3484 fconfigure
$fd -blocking 0 -translation lf
-encoding binary
3485 fileevent
$fd readable
[list read_blame_catfile \
3486 $fd $w $commit $path \
3487 $w.cm.t
$w.out.loaded_t
$w.out.linenumber_t
$w.out.file_t
]
3490 proc read_blame_catfile
{fd w commit path w_cmit w_load w_line w_file
} {
3491 global blame_status blame_data
3493 if {![winfo exists
$w_file]} {
3498 set n
$blame_data($w,total_lines
)
3499 $w_load conf
-state normal
3500 $w_line conf
-state normal
3501 $w_file conf
-state normal
3502 while {[gets
$fd line
] >= 0} {
3503 regsub
"\r\$" $line {} line
3505 $w_load insert end
"\n"
3506 $w_line insert end
"$n\n" linenumber
3507 $w_file insert end
"$line\n"
3509 $w_load conf
-state disabled
3510 $w_line conf
-state disabled
3511 $w_file conf
-state disabled
3512 set blame_data
($w,total_lines
) $n
3516 blame_incremental_status
$w
3517 set cmd
[list git blame
-M -C --incremental]
3518 lappend cmd
$commit -- $path
3519 set fd
[open
"| $cmd" r
]
3520 fconfigure
$fd -blocking 0 -translation lf
-encoding binary
3521 fileevent
$fd readable
[list read_blame_incremental
$fd $w \
3522 $w_load $w_cmit $w_line $w_file]
3526 proc read_blame_incremental
{fd w w_load w_cmit w_line w_file
} {
3527 global blame_status blame_data
3529 if {![winfo exists
$w_file]} {
3534 while {[gets
$fd line
] >= 0} {
3535 if {[regexp
{^
([a-z0-9
]{40}) (\d
+) (\d
+) (\d
+)$
} $line line \
3536 cmit original_line final_line line_count
]} {
3537 set blame_data
($w,commit
) $cmit
3538 set blame_data
($w,original_line
) $original_line
3539 set blame_data
($w,final_line
) $final_line
3540 set blame_data
($w,line_count
) $line_count
3542 if {[catch
{set g
$blame_data($w,$cmit,order
)}]} {
3543 $w_line tag conf g
$cmit
3544 $w_file tag conf g
$cmit
3545 $w_line tag raise in_sel
3546 $w_file tag raise in_sel
3547 $w_file tag raise sel
3548 set blame_data
($w,$cmit,order
) $blame_data($w,commit_count
)
3549 incr blame_data
($w,commit_count
)
3550 lappend blame_data
($w,commit_list
) $cmit
3552 } elseif
{[string match
{filename
*} $line]} {
3553 set file [string range
$line 9 end
]
3554 set n
$blame_data($w,line_count
)
3555 set lno
$blame_data($w,final_line
)
3556 set cmit
$blame_data($w,commit
)
3559 if {[catch
{set g g
$blame_data($w,line
$lno,commit
)}]} {
3560 $w_load tag add annotated
$lno.0 "$lno.0 lineend + 1c"
3562 $w_line tag remove g
$g $lno.0 "$lno.0 lineend + 1c"
3563 $w_file tag remove g
$g $lno.0 "$lno.0 lineend + 1c"
3566 set blame_data
($w,line
$lno,commit
) $cmit
3567 set blame_data
($w,line
$lno,file) $file
3568 $w_line tag add g
$cmit $lno.0 "$lno.0 lineend + 1c"
3569 $w_file tag add g
$cmit $lno.0 "$lno.0 lineend + 1c"
3571 if {$blame_data($w,highlight_line
) == -1} {
3572 if {[lindex
[$w_file yview
] 0] == 0} {
3574 blame_showcommit
$w $w_cmit $w_line $w_file $lno
3576 } elseif
{$blame_data($w,highlight_line
) == $lno} {
3577 blame_showcommit
$w $w_cmit $w_line $w_file $lno
3582 incr blame_data
($w,blame_lines
)
3585 set hc
$blame_data($w,highlight_commit
)
3587 && [expr {$blame_data($w,$hc,order
) + 1}]
3588 == $blame_data($w,$cmit,order
)} {
3589 blame_showcommit
$w $w_cmit $w_line $w_file \
3590 $blame_data($w,highlight_line
)
3592 } elseif
{[regexp
{^
([a-z-
]+) (.
*)$
} $line line header data
]} {
3593 set blame_data
($w,$blame_data($w,commit
),$header) $data
3599 set blame_status
($w) {Annotation complete.
}
3601 blame_incremental_status
$w
3605 proc blame_incremental_status
{w
} {
3606 global blame_status blame_data
3608 set have
$blame_data($w,blame_lines
)
3609 set total
$blame_data($w,total_lines
)
3611 if {$total} {set pdone
[expr {100 * $have / $total}]}
3613 set blame_status
($w) [format \
3614 "Loading annotations... %i of %i lines annotated (%2i%%)" \
3615 $have $total $pdone]
3618 proc blame_click
{w w_cmit w_line w_file cur_w pos
} {
3619 set lno
[lindex
[split [$cur_w index
$pos] .
] 0]
3620 if {$lno eq
{}} return
3622 $w_line tag remove in_sel
0.0 end
3623 $w_file tag remove in_sel
0.0 end
3624 $w_line tag add in_sel
$lno.0 "$lno.0 + 1 line"
3625 $w_file tag add in_sel
$lno.0 "$lno.0 + 1 line"
3627 blame_showcommit
$w $w_cmit $w_line $w_file $lno
3636 proc blame_showcommit
{w w_cmit w_line w_file lno
} {
3637 global blame_colors blame_data repo_config
3639 set cmit
$blame_data($w,highlight_commit
)
3641 set idx
$blame_data($w,$cmit,order
)
3643 foreach c
$blame_colors {
3644 set h
[lindex
$blame_data($w,commit_list
) [expr {$idx - 1 + $i}]]
3645 $w_line tag conf g
$h -background white
3646 $w_file tag conf g
$h -background white
3651 $w_cmit conf
-state normal
3652 $w_cmit delete
0.0 end
3653 if {[catch
{set cmit
$blame_data($w,line
$lno,commit
)}]} {
3655 $w_cmit insert end
"Loading annotation..."
3657 set idx
$blame_data($w,$cmit,order
)
3659 foreach c
$blame_colors {
3660 set h
[lindex
$blame_data($w,commit_list
) [expr {$idx - 1 + $i}]]
3661 $w_line tag conf g
$h -background $c
3662 $w_file tag conf g
$h -background $c
3666 if {[catch
{set msg
$blame_data($w,$cmit,message
)}]} {
3669 set fd
[open
"| git cat-file commit $cmit" r
]
3670 fconfigure
$fd -encoding binary
-translation lf
3671 if {[catch
{set enc
$repo_config(i18n.commitencoding
)}]} {
3674 while {[gets
$fd line
] > 0} {
3675 if {[string match
{encoding
*} $line]} {
3676 set enc
[string tolower
[string range
$line 9 end
]]
3679 fconfigure
$fd -encoding $enc
3680 set msg
[string trim
[read $fd]]
3683 set blame_data
($w,$cmit,message
) $msg
3689 catch
{set author_name
$blame_data($w,$cmit,author
)}
3690 catch
{set author_email
$blame_data($w,$cmit,author-mail
)}
3691 catch
{set author_time
[clock format
$blame_data($w,$cmit,author-time
)]}
3693 set committer_name
{}
3694 set committer_email
{}
3695 set committer_time
{}
3696 catch
{set committer_name
$blame_data($w,$cmit,committer
)}
3697 catch
{set committer_email
$blame_data($w,$cmit,committer-mail
)}
3698 catch
{set committer_time
[clock format
$blame_data($w,$cmit,committer-time
)]}
3700 $w_cmit insert end
"commit $cmit\n"
3701 $w_cmit insert end
"Author: $author_name $author_email $author_time\n"
3702 $w_cmit insert end
"Committer: $committer_name $committer_email $committer_time\n"
3703 $w_cmit insert end
"Original File: [escape_path $blame_data($w,line$lno,file)]\n"
3704 $w_cmit insert end
"\n"
3705 $w_cmit insert end
$msg
3707 $w_cmit conf
-state disabled
3709 set blame_data
($w,highlight_line
) $lno
3710 set blame_data
($w,highlight_commit
) $cmit
3713 proc blame_copycommit
{w i pos
} {
3715 set lno
[lindex
[split [$i index
$pos] .
] 0]
3716 if {![catch
{set commit
$blame_data($w,line
$lno,commit
)}]} {
3725 ######################################################################
3730 #define mask_width 14
3731 #define mask_height 15
3732 static unsigned char mask_bits
[] = {
3733 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3734 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3735 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
3738 image create bitmap file_plain
-background white
-foreground black
-data {
3739 #define plain_width 14
3740 #define plain_height 15
3741 static unsigned char plain_bits
[] = {
3742 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3743 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
3744 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3745 } -maskdata $filemask
3747 image create bitmap file_mod
-background white
-foreground blue
-data {
3748 #define mod_width 14
3749 #define mod_height 15
3750 static unsigned char mod_bits
[] = {
3751 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3752 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3753 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3754 } -maskdata $filemask
3756 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
3757 #define file_fulltick_width 14
3758 #define file_fulltick_height 15
3759 static unsigned char file_fulltick_bits
[] = {
3760 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
3761 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
3762 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3763 } -maskdata $filemask
3765 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
3766 #define parttick_width 14
3767 #define parttick_height 15
3768 static unsigned char parttick_bits
[] = {
3769 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3770 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
3771 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3772 } -maskdata $filemask
3774 image create bitmap file_question
-background white
-foreground black
-data {
3775 #define file_question_width 14
3776 #define file_question_height 15
3777 static unsigned char file_question_bits
[] = {
3778 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
3779 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
3780 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3781 } -maskdata $filemask
3783 image create bitmap file_removed
-background white
-foreground red
-data {
3784 #define file_removed_width 14
3785 #define file_removed_height 15
3786 static unsigned char file_removed_bits
[] = {
3787 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3788 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
3789 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
3790 } -maskdata $filemask
3792 image create bitmap file_merge
-background white
-foreground blue
-data {
3793 #define file_merge_width 14
3794 #define file_merge_height 15
3795 static unsigned char file_merge_bits
[] = {
3796 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
3797 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3798 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3799 } -maskdata $filemask
3802 #define file_width 18
3803 #define file_height 18
3804 static unsigned char file_bits
[] = {
3805 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
3806 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
3807 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
3808 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
3809 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
3811 image create bitmap file_dir
-background white
-foreground blue \
3812 -data $file_dir_data -maskdata $file_dir_data
3815 set file_uplevel_data
{
3817 #define up_height 15
3818 static unsigned char up_bits
[] = {
3819 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
3820 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
3821 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
3823 image create bitmap file_uplevel
-background white
-foreground red \
3824 -data $file_uplevel_data -maskdata $file_uplevel_data
3825 unset file_uplevel_data
3827 set ui_index .vpane.files.index.list
3828 set ui_workdir .vpane.files.workdir.list
3830 set all_icons
(_
$ui_index) file_plain
3831 set all_icons
(A
$ui_index) file_fulltick
3832 set all_icons
(M
$ui_index) file_fulltick
3833 set all_icons
(D
$ui_index) file_removed
3834 set all_icons
(U
$ui_index) file_merge
3836 set all_icons
(_
$ui_workdir) file_plain
3837 set all_icons
(M
$ui_workdir) file_mod
3838 set all_icons
(D
$ui_workdir) file_question
3839 set all_icons
(U
$ui_workdir) file_merge
3840 set all_icons
(O
$ui_workdir) file_plain
3842 set max_status_desc
0
3846 {_M
"Modified, not staged"}
3847 {M_
"Staged for commit"}
3848 {MM
"Portions staged for commit"}
3849 {MD
"Staged for commit, missing"}
3851 {_O
"Untracked, not staged"}
3852 {A_
"Staged for commit"}
3853 {AM
"Portions staged for commit"}
3854 {AD
"Staged for commit, missing"}
3857 {D_
"Staged for removal"}
3858 {DO
"Staged for removal, still present"}
3860 {U_
"Requires merge resolution"}
3861 {UU
"Requires merge resolution"}
3862 {UM
"Requires merge resolution"}
3863 {UD
"Requires merge resolution"}
3865 if {$max_status_desc < [string length
[lindex
$i 1]]} {
3866 set max_status_desc
[string length
[lindex
$i 1]]
3868 set all_descs
([lindex
$i 0]) [lindex
$i 1]
3872 ######################################################################
3876 proc bind_button3
{w cmd
} {
3877 bind $w <Any-Button-3
> $cmd
3879 bind $w <Control-Button-1
> $cmd
3883 proc scrollbar2many
{list mode args
} {
3884 foreach w
$list {eval $w $mode $args}
3887 proc many2scrollbar
{list mode sb top bottom
} {
3888 $sb set $top $bottom
3889 foreach w
$list {$w $mode moveto
$top}
3892 proc incr_font_size
{font
{amt
1}} {
3893 set sz
[font configure
$font -size]
3895 font configure
$font -size $sz
3896 font configure
${font}bold
-size $sz
3899 proc hook_failed_popup
{hook msg
} {
3904 label
$w.m.l1
-text "$hook hook failed:" \
3909 -background white
-borderwidth 1 \
3911 -width 80 -height 10 \
3913 -yscrollcommand [list
$w.m.sby
set]
3915 -text {You must correct the above errors before committing.
} \
3919 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
3920 pack
$w.m.l1
-side top
-fill x
3921 pack
$w.m.l2
-side bottom
-fill x
3922 pack
$w.m.sby
-side right
-fill y
3923 pack
$w.m.t
-side left
-fill both
-expand 1
3924 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
3926 $w.m.t insert
1.0 $msg
3927 $w.m.t conf
-state disabled
3929 button
$w.ok
-text OK \
3932 -command "destroy $w"
3933 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
3935 bind $w <Visibility
> "grab $w; focus $w"
3936 bind $w <Key-Return
> "destroy $w"
3937 wm title
$w "[appname] ([reponame]): error"
3941 set next_console_id
0
3943 proc new_console
{short_title long_title
} {
3944 global next_console_id console_data
3945 set w .console
[incr next_console_id
]
3946 set console_data
($w) [list
$short_title $long_title]
3947 return [console_init
$w]
3950 proc console_init
{w
} {
3951 global console_cr console_data M1B
3953 set console_cr
($w) 1.0
3956 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
3961 -background white
-borderwidth 1 \
3963 -width 80 -height 10 \
3966 -yscrollcommand [list
$w.m.sby
set]
3967 label
$w.m.s
-text {Working... please
wait...
} \
3971 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
3972 pack
$w.m.l1
-side top
-fill x
3973 pack
$w.m.s
-side bottom
-fill x
3974 pack
$w.m.sby
-side right
-fill y
3975 pack
$w.m.t
-side left
-fill both
-expand 1
3976 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
3978 menu
$w.ctxm
-tearoff 0
3979 $w.ctxm add
command -label "Copy" \
3981 -command "tk_textCopy $w.m.t"
3982 $w.ctxm add
command -label "Select All" \
3984 -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
3985 $w.ctxm add
command -label "Copy All" \
3988 $w.m.t tag add sel 0.0 end
3990 $w.m.t tag remove sel 0.0 end
3993 button
$w.ok
-text {Close
} \
3996 -command "destroy $w"
3997 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
3999 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
4000 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
4001 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
4002 bind $w <Visibility
> "focus $w"
4003 wm title
$w "[appname] ([reponame]): [lindex $console_data($w) 0]"
4007 proc console_exec
{w cmd after
} {
4008 # -- Cygwin's Tcl tosses the enviroment when we exec our child.
4009 # But most users need that so we have to relogin. :-(
4012 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
4015 # -- Tcl won't let us redirect both stdout and stderr to
4016 # the same pipe. So pass it through cat...
4018 set cmd
[concat |
$cmd |
& cat]
4020 set fd_f
[open
$cmd r
]
4021 fconfigure
$fd_f -blocking 0 -translation binary
4022 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
4025 proc console_read
{w fd after
} {
4030 if {![winfo exists
$w]} {console_init
$w}
4031 $w.m.t conf
-state normal
4033 set n
[string length
$buf]
4035 set cr
[string first
"\r" $buf $c]
4036 set lf
[string first
"\n" $buf $c]
4037 if {$cr < 0} {set cr
[expr {$n + 1}]}
4038 if {$lf < 0} {set lf
[expr {$n + 1}]}
4041 $w.m.t insert end
[string range
$buf $c $lf]
4042 set console_cr
($w) [$w.m.t index
{end
-1c}]
4046 $w.m.t delete
$console_cr($w) end
4047 $w.m.t insert end
"\n"
4048 $w.m.t insert end
[string range
$buf $c $cr]
4053 $w.m.t conf
-state disabled
4057 fconfigure
$fd -blocking 1
4059 if {[catch
{close
$fd}]} {
4064 uplevel
#0 $after $w $ok
4067 fconfigure
$fd -blocking 0
4070 proc console_chain
{cmdlist w
{ok
1}} {
4072 if {[llength
$cmdlist] == 0} {
4077 set cmd
[lindex
$cmdlist 0]
4078 set cmdlist
[lrange
$cmdlist 1 end
]
4080 if {[lindex
$cmd 0] eq
{console_exec
}} {
4083 [list console_chain
$cmdlist]
4085 uplevel
#0 $cmd $cmdlist $w $ok
4092 proc console_done
{args
} {
4093 global console_cr console_data
4095 switch
-- [llength
$args] {
4097 set w
[lindex
$args 0]
4098 set ok
[lindex
$args 1]
4101 set w
[lindex
$args 1]
4102 set ok
[lindex
$args 2]
4105 error
"wrong number of args: console_done ?ignored? w ok"
4110 if {[winfo exists
$w]} {
4111 $w.m.s conf
-background green
-text {Success
}
4112 $w.ok conf
-state normal
4116 if {![winfo exists
$w]} {
4119 $w.m.s conf
-background red
-text {Error
: Command Failed
}
4120 $w.ok conf
-state normal
4124 array
unset console_cr
$w
4125 array
unset console_data
$w
4128 ######################################################################
4132 set starting_gitk_msg
{Starting gitk... please
wait...
}
4134 proc do_gitk
{revs
} {
4135 global env ui_status_value starting_gitk_msg
4137 # -- Always start gitk through whatever we were loaded with. This
4138 # lets us bypass using shell process on Windows systems.
4140 set cmd
[info nameofexecutable
]
4141 lappend cmd
[gitexec gitk
]
4147 if {[catch
{eval exec $cmd &} err
]} {
4148 error_popup
"Failed to start gitk:\n\n$err"
4150 set ui_status_value
$starting_gitk_msg
4152 if {$ui_status_value eq
$starting_gitk_msg} {
4153 set ui_status_value
{Ready.
}
4160 set fd
[open
"| git count-objects -v" r
]
4161 while {[gets
$fd line
] > 0} {
4162 if {[regexp
{^
([^
:]+): (\d
+)$
} $line _ name value
]} {
4163 set stats
($name) $value
4169 foreach p
[glob
-directory [gitdir objects pack
] \
4172 incr packed_sz
[file size
$p]
4174 if {$packed_sz > 0} {
4175 set stats
(size-pack
) [expr {$packed_sz / 1024}]
4180 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
4182 label
$w.header
-text {Database Statistics
} \
4184 pack
$w.header
-side top
-fill x
4186 frame
$w.buttons
-border 1
4187 button
$w.buttons.close
-text Close \
4190 -command [list destroy
$w]
4191 button
$w.buttons.gc
-text {Compress Database
} \
4194 -command "destroy $w;do_gc"
4195 pack
$w.buttons.close
-side right
4196 pack
$w.buttons.gc
-side left
4197 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
4199 frame
$w.stat
-borderwidth 1 -relief solid
4201 {count
{Number of loose objects
}}
4202 {size
{Disk space used by loose objects
} { KiB
}}
4203 {in-pack
{Number of packed objects
}}
4204 {packs
{Number of packs
}}
4205 {size-pack
{Disk space used by packed objects
} { KiB
}}
4206 {prune-packable
{Packed objects waiting
for pruning
}}
4207 {garbage
{Garbage files
}}
4209 set name
[lindex
$s 0]
4210 set label
[lindex
$s 1]
4211 if {[catch
{set value
$stats($name)}]} continue
4212 if {[llength
$s] > 2} {
4213 set value
"$value[lindex $s 2]"
4216 label
$w.stat.l_
$name -text "$label:" -anchor w
-font font_ui
4217 label
$w.stat.v_
$name -text $value -anchor w
-font font_ui
4218 grid
$w.stat.l_
$name $w.stat.v_
$name -sticky we
-padx {0 5}
4220 pack
$w.stat
-pady 10 -padx 10
4222 bind $w <Visibility
> "grab $w; focus $w.buttons.close"
4223 bind $w <Key-Escape
> [list destroy
$w]
4224 bind $w <Key-Return
> [list destroy
$w]
4225 wm title
$w "[appname] ([reponame]): Database Statistics"
4230 set w
[new_console
{gc
} {Compressing the object database
}]
4232 {console_exec
{git pack-refs
--prune}}
4233 {console_exec
{git reflog expire
--all}}
4234 {console_exec
{git repack
-a -d -l}}
4235 {console_exec
{git rerere gc
}}
4239 proc do_fsck_objects
{} {
4240 set w
[new_console
{fsck-objects
} \
4241 {Verifying the object database with fsck-objects
}]
4242 set cmd
[list git fsck-objects
]
4245 lappend cmd
--strict
4246 console_exec
$w $cmd console_done
4252 global ui_comm is_quitting repo_config commit_type
4254 if {$is_quitting} return
4257 if {[winfo exists
$ui_comm]} {
4258 # -- Stash our current commit buffer.
4260 set save
[gitdir GITGUI_MSG
]
4261 set msg
[string trim
[$ui_comm get
0.0 end
]]
4262 regsub
-all -line {[ \r\t]+$
} $msg {} msg
4263 if {(![string match amend
* $commit_type]
4264 ||
[$ui_comm edit modified
])
4267 set fd
[open
$save w
]
4268 puts
-nonewline $fd $msg
4272 catch
{file delete
$save}
4275 # -- Stash our current window geometry into this repository.
4277 set cfg_geometry
[list
]
4278 lappend cfg_geometry
[wm geometry .
]
4279 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
4280 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
4281 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
4284 if {$cfg_geometry ne
$rc_geometry} {
4285 catch
{git config gui.geometry
$cfg_geometry}
4293 rescan
{set ui_status_value
{Ready.
}}
4296 proc unstage_helper
{txt paths
} {
4297 global file_states current_diff_path
4299 if {![lock_index begin-update
]} return
4303 foreach path
$paths {
4304 switch
-glob -- [lindex
$file_states($path) 0] {
4308 lappend pathList
$path
4309 if {$path eq
$current_diff_path} {
4310 set after
{reshow_diff
;}
4315 if {$pathList eq
{}} {
4321 [concat
$after {set ui_status_value
{Ready.
}}]
4325 proc do_unstage_selection
{} {
4326 global current_diff_path selected_paths
4328 if {[array size selected_paths
] > 0} {
4330 {Unstaging selected files from commit
} \
4331 [array names selected_paths
]
4332 } elseif
{$current_diff_path ne
{}} {
4334 "Unstaging [short_path $current_diff_path] from commit" \
4335 [list
$current_diff_path]
4339 proc add_helper
{txt paths
} {
4340 global file_states current_diff_path
4342 if {![lock_index begin-update
]} return
4346 foreach path
$paths {
4347 switch
-glob -- [lindex
$file_states($path) 0] {
4352 lappend pathList
$path
4353 if {$path eq
$current_diff_path} {
4354 set after
{reshow_diff
;}
4359 if {$pathList eq
{}} {
4365 [concat
$after {set ui_status_value
{Ready to commit.
}}]
4369 proc do_add_selection
{} {
4370 global current_diff_path selected_paths
4372 if {[array size selected_paths
] > 0} {
4374 {Adding selected files
} \
4375 [array names selected_paths
]
4376 } elseif
{$current_diff_path ne
{}} {
4378 "Adding [short_path $current_diff_path]" \
4379 [list
$current_diff_path]
4383 proc do_add_all
{} {
4387 foreach path
[array names file_states
] {
4388 switch
-glob -- [lindex
$file_states($path) 0] {
4391 ?D
{lappend paths
$path}
4394 add_helper
{Adding all changed files
} $paths
4397 proc revert_helper
{txt paths
} {
4398 global file_states current_diff_path
4400 if {![lock_index begin-update
]} return
4404 foreach path
$paths {
4405 switch
-glob -- [lindex
$file_states($path) 0] {
4409 lappend pathList
$path
4410 if {$path eq
$current_diff_path} {
4411 set after
{reshow_diff
;}
4417 set n
[llength
$pathList]
4421 } elseif
{$n == 1} {
4422 set s
"[short_path [lindex $pathList]]"
4424 set s
"these $n files"
4427 set reply
[tk_dialog \
4429 "[appname] ([reponame])" \
4430 "Revert changes in $s?
4432 Any unadded changes will be permanently lost by the revert." \
4442 [concat
$after {set ui_status_value
{Ready.
}}]
4448 proc do_revert_selection
{} {
4449 global current_diff_path selected_paths
4451 if {[array size selected_paths
] > 0} {
4453 {Reverting selected files
} \
4454 [array names selected_paths
]
4455 } elseif
{$current_diff_path ne
{}} {
4457 "Reverting [short_path $current_diff_path]" \
4458 [list
$current_diff_path]
4462 proc do_signoff
{} {
4465 set me
[committer_ident
]
4466 if {$me eq
{}} return
4468 set sob
"Signed-off-by: $me"
4469 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
4470 if {$last ne
$sob} {
4471 $ui_comm edit separator
4473 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
4474 $ui_comm insert end
"\n"
4476 $ui_comm insert end
"\n$sob"
4477 $ui_comm edit separator
4482 proc do_select_commit_type
{} {
4483 global commit_type selected_commit_type
4485 if {$selected_commit_type eq
{new
}
4486 && [string match amend
* $commit_type]} {
4488 } elseif
{$selected_commit_type eq
{amend
}
4489 && ![string match amend
* $commit_type]} {
4492 # The amend request was rejected...
4494 if {![string match amend
* $commit_type]} {
4495 set selected_commit_type new
4505 global appvers copyright
4506 global tcl_patchLevel tk_patchLevel
4510 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
4512 label
$w.header
-text "About [appname]" \
4514 pack
$w.header
-side top
-fill x
4517 button
$w.buttons.close
-text {Close
} \
4520 -command [list destroy
$w]
4521 pack
$w.buttons.close
-side right
4522 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
4525 -text "git-gui - a graphical user interface for Git.
4533 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
4536 append v
"git-gui version $appvers\n"
4537 append v
"[git version]\n"
4539 if {$tcl_patchLevel eq
$tk_patchLevel} {
4540 append v
"Tcl/Tk version $tcl_patchLevel"
4542 append v
"Tcl version $tcl_patchLevel"
4543 append v
", Tk version $tk_patchLevel"
4554 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
4556 menu
$w.ctxm
-tearoff 0
4557 $w.ctxm add
command \
4562 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
4565 bind $w <Visibility
> "grab $w; focus $w.buttons.close"
4566 bind $w <Key-Escape
> "destroy $w"
4567 bind $w <Key-Return
> "destroy $w"
4568 bind_button3
$w.vers
"tk_popup $w.ctxm %X %Y; grab $w; focus $w"
4569 wm title
$w "About [appname]"
4573 proc do_options
{} {
4574 global repo_config global_config font_descs
4575 global repo_config_new global_config_new
4577 array
unset repo_config_new
4578 array
unset global_config_new
4579 foreach name
[array names repo_config
] {
4580 set repo_config_new
($name) $repo_config($name)
4583 foreach name
[array names repo_config
] {
4585 gui.diffcontext
{continue}
4587 set repo_config_new
($name) $repo_config($name)
4589 foreach name
[array names global_config
] {
4590 set global_config_new
($name) $global_config($name)
4593 set w .options_editor
4595 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
4597 label
$w.header
-text "Options" \
4599 pack
$w.header
-side top
-fill x
4602 button
$w.buttons.restore
-text {Restore Defaults
} \
4605 -command do_restore_defaults
4606 pack
$w.buttons.restore
-side left
4607 button
$w.buttons.save
-text Save \
4610 -command [list do_save_config
$w]
4611 pack
$w.buttons.save
-side right
4612 button
$w.buttons.cancel
-text {Cancel
} \
4615 -command [list destroy
$w]
4616 pack
$w.buttons.cancel
-side right
-padx 5
4617 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
4619 labelframe
$w.repo
-text "[reponame] Repository" \
4621 labelframe
$w.global
-text {Global
(All Repositories
)} \
4623 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
4624 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
4628 {t user.name
{User Name
}}
4629 {t user.email
{Email Address
}}
4631 {b merge.summary
{Summarize Merge Commits
}}
4632 {i-1.
.5 merge.verbosity
{Merge Verbosity
}}
4634 {b gui.trustmtime
{Trust File Modification Timestamps
}}
4635 {i-1.
.99 gui.diffcontext
{Number of Diff Context Lines
}}
4636 {t gui.newbranchtemplate
{New Branch Name Template
}}
4638 set type [lindex
$option 0]
4639 set name
[lindex
$option 1]
4640 set text
[lindex
$option 2]
4642 foreach f
{repo global
} {
4643 switch
-glob -- $type {
4645 checkbutton
$w.
$f.
$optid -text $text \
4646 -variable ${f}_config_new
($name) \
4650 pack
$w.
$f.
$optid -side top
-anchor w
4653 regexp
-- {-(\d
+)\.\.
(\d
+)$
} $type _junk min max
4655 label
$w.
$f.
$optid.l
-text "$text:" -font font_ui
4656 pack
$w.
$f.
$optid.l
-side left
-anchor w
-fill x
4657 spinbox
$w.
$f.
$optid.v \
4658 -textvariable ${f}_config_new
($name) \
4662 -width [expr {1 + [string length
$max]}] \
4664 bind $w.
$f.
$optid.v
<FocusIn
> {%W selection range
0 end
}
4665 pack
$w.
$f.
$optid.v
-side right
-anchor e
-padx 5
4666 pack
$w.
$f.
$optid -side top
-anchor w
-fill x
4670 label
$w.
$f.
$optid.l
-text "$text:" -font font_ui
4671 entry
$w.
$f.
$optid.v \
4675 -textvariable ${f}_config_new
($name) \
4677 pack
$w.
$f.
$optid.l
-side left
-anchor w
4678 pack
$w.
$f.
$optid.v
-side left
-anchor w \
4681 pack
$w.
$f.
$optid -side top
-anchor w
-fill x
4687 set all_fonts
[lsort
[font families
]]
4688 foreach option
$font_descs {
4689 set name
[lindex
$option 0]
4690 set font
[lindex
$option 1]
4691 set text
[lindex
$option 2]
4693 set global_config_new
(gui.
$font^^family
) \
4694 [font configure
$font -family]
4695 set global_config_new
(gui.
$font^^size
) \
4696 [font configure
$font -size]
4698 frame
$w.global.
$name
4699 label
$w.global.
$name.l
-text "$text:" -font font_ui
4700 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
4701 set fontmenu
[eval tk_optionMenu
$w.global.
$name.family \
4702 global_config_new
(gui.
$font^^family
) \
4704 $w.global.
$name.family configure
-font font_ui
4705 $fontmenu configure
-font font_ui
4706 spinbox
$w.global.
$name.size \
4707 -textvariable global_config_new
(gui.
$font^^size
) \
4708 -from 2 -to 80 -increment 1 \
4711 bind $w.global.
$name.size
<FocusIn
> {%W selection range
0 end
}
4712 pack
$w.global.
$name.size
-side right
-anchor e
4713 pack
$w.global.
$name.family
-side right
-anchor e
4714 pack
$w.global.
$name -side top
-anchor w
-fill x
4717 bind $w <Visibility
> "grab $w; focus $w.buttons.save"
4718 bind $w <Key-Escape
> "destroy $w"
4719 bind $w <Key-Return
> [list do_save_config
$w]
4720 wm title
$w "[appname] ([reponame]): Options"
4724 proc do_restore_defaults
{} {
4725 global font_descs default_config repo_config
4726 global repo_config_new global_config_new
4728 foreach name
[array names default_config
] {
4729 set repo_config_new
($name) $default_config($name)
4730 set global_config_new
($name) $default_config($name)
4733 foreach option
$font_descs {
4734 set name
[lindex
$option 0]
4735 set repo_config
(gui.
$name) $default_config(gui.
$name)
4739 foreach option
$font_descs {
4740 set name
[lindex
$option 0]
4741 set font
[lindex
$option 1]
4742 set global_config_new
(gui.
$font^^family
) \
4743 [font configure
$font -family]
4744 set global_config_new
(gui.
$font^^size
) \
4745 [font configure
$font -size]
4749 proc do_save_config
{w
} {
4750 if {[catch
{save_config
} err
]} {
4751 error_popup
"Failed to completely save options:\n\n$err"
4757 proc do_windows_shortcut
{} {
4760 set fn
[tk_getSaveFile \
4762 -title "[appname] ([reponame]): Create Desktop Icon" \
4763 -initialfile "Git [reponame].bat"]
4767 puts
$fd "@ECHO Entering [reponame]"
4768 puts
$fd "@ECHO Starting git-gui... please wait..."
4769 puts
$fd "@SET PATH=[file normalize [gitexec]];%PATH%"
4770 puts
$fd "@SET GIT_DIR=[file normalize [gitdir]]"
4771 puts
-nonewline $fd "@\"[info nameofexecutable]\""
4772 puts
$fd " \"[file normalize $argv0]\""
4775 error_popup
"Cannot write script:\n\n$err"
4780 proc do_cygwin_shortcut
{} {
4784 set desktop
[exec cygpath \
4792 set fn
[tk_getSaveFile \
4794 -title "[appname] ([reponame]): Create Desktop Icon" \
4795 -initialdir $desktop \
4796 -initialfile "Git [reponame].bat"]
4800 set sh
[exec cygpath \
4804 set me
[exec cygpath \
4808 set gd
[exec cygpath \
4812 set gw
[exec cygpath \
4815 [file dirname [gitdir
]]]
4816 regsub
-all ' $me "'\\''" me
4817 regsub -all ' $gd "'\\''" gd
4818 puts $fd "@ECHO Entering $gw"
4819 puts $fd "@ECHO Starting git-gui... please wait..."
4820 puts -nonewline $fd "@\"$sh\" --login -c \""
4821 puts -nonewline $fd "GIT_DIR='$gd'"
4822 puts -nonewline $fd " '$me'"
4826 error_popup "Cannot write script:\n\n$err"
4831 proc do_macosx_app {} {
4834 set fn [tk_getSaveFile \
4836 -title "[appname] ([reponame]): Create Desktop Icon" \
4837 -initialdir [file join $env(HOME) Desktop] \
4838 -initialfile "Git [reponame].app"]
4841 set Contents [file join $fn Contents]
4842 set MacOS [file join $Contents MacOS]
4843 set exe [file join $MacOS git-gui]
4847 set fd [open [file join $Contents Info.plist] w]
4848 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
4849 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
4850 <plist version="1.0">
4852 <key>CFBundleDevelopmentRegion</key>
4853 <string>English</string>
4854 <key>CFBundleExecutable</key>
4855 <string>git-gui</string>
4856 <key>CFBundleIdentifier</key>
4857 <string>org.spearce.git-gui</string>
4858 <key>CFBundleInfoDictionaryVersion</key>
4859 <string>6.0</string>
4860 <key>CFBundlePackageType</key>
4861 <string>APPL</string>
4862 <key>CFBundleSignature</key>
4863 <string>????</string>
4864 <key>CFBundleVersion</key>
4865 <string>1.0</string>
4866 <key>NSPrincipalClass</key>
4867 <string>NSApplication</string>
4872 set fd [open $exe w]
4873 set gd [file normalize [gitdir]]
4874 set ep [file normalize [gitexec]]
4875 regsub -all ' $gd "'\\''" gd
4876 regsub
-all ' $ep "'\\''" ep
4877 puts $fd "#!/bin/sh"
4878 foreach name
[array names env
] {
4879 if {[string match GIT_
* $name]} {
4880 regsub
-all ' $env($name) "'\\''" v
4881 puts $fd "export $name='$v'"
4884 puts $fd "export PATH
='$ep':\
$PATH"
4885 puts $fd "export GIT_DIR
='$gd'"
4886 puts $fd "exec [file normalize
$argv0]"
4889 file attributes $exe -permissions u+x,g+x,o+x
4891 error_popup "Cannot
write icon
:\n\n$err"
4896 proc toggle_or_diff {w x y} {
4897 global file_states file_lists current_diff_path ui_index ui_workdir
4898 global last_clicked selected_paths
4900 set pos [split [$w index @$x,$y] .]
4901 set lno [lindex $pos 0]
4902 set col [lindex $pos 1]
4903 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4909 set last_clicked [list $w $lno]
4910 array unset selected_paths
4911 $ui_index tag remove in_sel 0.0 end
4912 $ui_workdir tag remove in_sel 0.0 end
4915 if {$current_diff_path eq $path} {
4916 set after {reshow_diff;}
4920 if {$w eq $ui_index} {
4922 "Unstaging
[short_path
$path] from commit
" \
4924 [concat $after {set ui_status_value {Ready.}}]
4925 } elseif {$w eq $ui_workdir} {
4927 "Adding
[short_path
$path]" \
4929 [concat $after {set ui_status_value {Ready.}}]
4932 show_diff $path $w $lno
4936 proc add_one_to_selection {w x y} {
4937 global file_lists last_clicked selected_paths
4939 set lno [lindex [split [$w index @$x,$y] .] 0]
4940 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4946 if {$last_clicked ne {}
4947 && [lindex $last_clicked 0] ne $w} {
4948 array unset selected_paths
4949 [lindex $last_clicked 0] tag remove in_sel 0.0 end
4952 set last_clicked [list $w $lno]
4953 if {[catch {set in_sel $selected_paths($path)}]} {
4957 unset selected_paths($path)
4958 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
4960 set selected_paths($path) 1
4961 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
4965 proc add_range_to_selection {w x y} {
4966 global file_lists last_clicked selected_paths
4968 if {[lindex $last_clicked 0] ne $w} {
4969 toggle_or_diff $w $x $y
4973 set lno [lindex [split [$w index @$x,$y] .] 0]
4974 set lc [lindex $last_clicked 1]
4983 foreach path [lrange $file_lists($w) \
4984 [expr {$begin - 1}] \
4985 [expr {$end - 1}]] {
4986 set selected_paths($path) 1
4988 $w tag add in_sel $begin.0 [expr {$end + 1}].0
4991 ######################################################################
4995 set cursor_ptr arrow
4996 font create font_diff -family Courier -size 10
5000 eval font configure font_ui [font actual [.dummy cget -font]]
5004 font create font_uibold
5005 font create font_diffbold
5010 } elseif {[is_MacOSX]} {
5018 proc apply_config {} {
5019 global repo_config font_descs
5021 foreach option $font_descs {
5022 set name [lindex $option 0]
5023 set font [lindex $option 1]
5025 foreach {cn cv} $repo_config(gui.$name) {
5026 font configure $font $cn $cv
5029 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
5031 foreach {cn cv} [font configure $font] {
5032 font configure ${font}bold $cn $cv
5034 font configure ${font}bold -weight bold
5038 set default_config(merge.summary) false
5039 set default_config(merge.verbosity) 2
5040 set default_config(user.name) {}
5041 set default_config(user.email) {}
5043 set default_config(gui.trustmtime) false
5044 set default_config(gui.diffcontext) 5
5045 set default_config(gui.newbranchtemplate) {}
5046 set default_config(gui.fontui) [font configure font_ui]
5047 set default_config(gui.fontdiff) [font configure font_diff]
5049 {fontui font_ui {Main Font}}
5050 {fontdiff font_diff {Diff/Console Font}}
5055 ######################################################################
5057 ## feature option selection
5059 if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
5064 if {$subcommand eq {gui.sh}} {
5067 if {$subcommand eq {gui} && [llength $argv] > 0} {
5068 set subcommand [lindex $argv 0]
5069 set argv [lrange $argv 1 end]
5072 enable_option multicommit
5073 enable_option branch
5074 enable_option transport
5076 switch -- $subcommand {
5079 disable_option multicommit
5080 disable_option branch
5081 disable_option transport
5084 enable_option singlecommit
5086 disable_option multicommit
5087 disable_option branch
5088 disable_option transport
5092 ######################################################################
5100 menu .mbar -tearoff 0
5101 .mbar add cascade -label Repository -menu .mbar.repository -font font_ui
5102 .mbar add cascade -label Edit -menu .mbar.edit -font font_ui
5103 if {[is_enabled branch]} {
5104 .mbar add cascade -label Branch -menu .mbar.branch -font font_ui
5106 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
5107 .mbar add cascade -label Commit -menu .mbar.commit -font font_ui
5109 if {[is_enabled transport]} {
5110 .mbar add cascade -label Merge -menu .mbar.merge -font font_ui
5111 .mbar add cascade -label Fetch -menu .mbar.fetch -font font_ui
5112 .mbar add cascade -label Push -menu .mbar.push -font font_ui
5114 . configure -menu .mbar
5116 # -- Repository Menu
5118 menu .mbar.repository
5120 .mbar.repository add command \
5121 -label {Browse Current Branch} \
5122 -command {new_browser $current_branch} \
5124 trace add variable current_branch write ".mbar.repository entryconf
[.mbar.repository index last
] -label \"Browse \
$current_branch\" ;#"
5125 .mbar.repository add separator
5127 .mbar.repository add
command \
5128 -label {Visualize Current Branch
} \
5129 -command {do_gitk
$current_branch} \
5131 trace add variable current_branch
write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
5132 .mbar.repository add
command \
5133 -label {Visualize All Branches
} \
5134 -command {do_gitk
--all} \
5136 .mbar.repository add separator
5138 if {[is_enabled multicommit
]} {
5139 .mbar.repository add
command -label {Database Statistics
} \
5143 .mbar.repository add
command -label {Compress Database
} \
5147 .mbar.repository add
command -label {Verify Database
} \
5148 -command do_fsck_objects \
5151 .mbar.repository add separator
5154 .mbar.repository add
command \
5155 -label {Create Desktop Icon
} \
5156 -command do_cygwin_shortcut \
5158 } elseif
{[is_Windows
]} {
5159 .mbar.repository add
command \
5160 -label {Create Desktop Icon
} \
5161 -command do_windows_shortcut \
5163 } elseif
{[is_MacOSX
]} {
5164 .mbar.repository add
command \
5165 -label {Create Desktop Icon
} \
5166 -command do_macosx_app \
5171 .mbar.repository add
command -label Quit \
5173 -accelerator $M1T-Q \
5179 .mbar.edit add
command -label Undo \
5180 -command {catch
{[focus
] edit undo
}} \
5181 -accelerator $M1T-Z \
5183 .mbar.edit add
command -label Redo \
5184 -command {catch
{[focus
] edit redo
}} \
5185 -accelerator $M1T-Y \
5187 .mbar.edit add separator
5188 .mbar.edit add
command -label Cut \
5189 -command {catch
{tk_textCut
[focus
]}} \
5190 -accelerator $M1T-X \
5192 .mbar.edit add
command -label Copy \
5193 -command {catch
{tk_textCopy
[focus
]}} \
5194 -accelerator $M1T-C \
5196 .mbar.edit add
command -label Paste \
5197 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
5198 -accelerator $M1T-V \
5200 .mbar.edit add
command -label Delete \
5201 -command {catch
{[focus
] delete sel.first sel.last
}} \
5204 .mbar.edit add separator
5205 .mbar.edit add
command -label {Select All
} \
5206 -command {catch
{[focus
] tag add sel
0.0 end
}} \
5207 -accelerator $M1T-A \
5212 if {[is_enabled branch
]} {
5215 .mbar.branch add
command -label {Create...
} \
5216 -command do_create_branch \
5217 -accelerator $M1T-N \
5219 lappend disable_on_lock
[list .mbar.branch entryconf \
5220 [.mbar.branch index last
] -state]
5222 .mbar.branch add
command -label {Delete...
} \
5223 -command do_delete_branch \
5225 lappend disable_on_lock
[list .mbar.branch entryconf \
5226 [.mbar.branch index last
] -state]
5228 .mbar.branch add
command -label {Reset...
} \
5229 -command do_reset_hard \
5231 lappend disable_on_lock
[list .mbar.branch entryconf \
5232 [.mbar.branch index last
] -state]
5237 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
5240 .mbar.commit add radiobutton \
5241 -label {New Commit
} \
5242 -command do_select_commit_type \
5243 -variable selected_commit_type \
5246 lappend disable_on_lock \
5247 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5249 .mbar.commit add radiobutton \
5250 -label {Amend Last Commit
} \
5251 -command do_select_commit_type \
5252 -variable selected_commit_type \
5255 lappend disable_on_lock \
5256 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5258 .mbar.commit add separator
5260 .mbar.commit add
command -label Rescan \
5261 -command do_rescan \
5264 lappend disable_on_lock \
5265 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5267 .mbar.commit add
command -label {Add To Commit
} \
5268 -command do_add_selection \
5270 lappend disable_on_lock \
5271 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5273 .mbar.commit add
command -label {Add Existing To Commit
} \
5274 -command do_add_all \
5275 -accelerator $M1T-I \
5277 lappend disable_on_lock \
5278 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5280 .mbar.commit add
command -label {Unstage From Commit
} \
5281 -command do_unstage_selection \
5283 lappend disable_on_lock \
5284 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5286 .mbar.commit add
command -label {Revert Changes
} \
5287 -command do_revert_selection \
5289 lappend disable_on_lock \
5290 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5292 .mbar.commit add separator
5294 .mbar.commit add
command -label {Sign Off
} \
5295 -command do_signoff \
5296 -accelerator $M1T-S \
5299 .mbar.commit add
command -label Commit \
5300 -command do_commit \
5301 -accelerator $M1T-Return \
5303 lappend disable_on_lock \
5304 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5309 if {[is_enabled branch
]} {
5311 .mbar.merge add
command -label {Local Merge...
} \
5312 -command do_local_merge \
5314 lappend disable_on_lock \
5315 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
5316 .mbar.merge add
command -label {Abort Merge...
} \
5317 -command do_reset_hard \
5319 lappend disable_on_lock \
5320 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
5326 if {[is_enabled transport
]} {
5330 .mbar.push add
command -label {Push...
} \
5331 -command do_push_anywhere \
5336 # -- Apple Menu (Mac OS X only)
5338 .mbar add cascade
-label Apple
-menu .mbar.apple
5341 .mbar.apple add
command -label "About [appname]" \
5344 .mbar.apple add
command -label "Options..." \
5345 -command do_options \
5350 .mbar.edit add separator
5351 .mbar.edit add
command -label {Options...
} \
5352 -command do_options \
5357 if {[file exists
/usr
/local
/miga
/lib
/gui-miga
]
5358 && [file exists .pvcsrc
]} {
5360 global ui_status_value
5361 if {![lock_index update
]} return
5362 set cmd
[list sh
--login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
5363 set miga_fd
[open
"|$cmd" r
]
5364 fconfigure
$miga_fd -blocking 0
5365 fileevent
$miga_fd readable
[list miga_done
$miga_fd]
5366 set ui_status_value
{Running miga...
}
5368 proc miga_done
{fd
} {
5373 rescan
[list
set ui_status_value
{Ready.
}]
5376 .mbar add cascade
-label Tools
-menu .mbar.tools
5378 .mbar.tools add
command -label "Migrate" \
5381 lappend disable_on_lock \
5382 [list .mbar.tools entryconf
[.mbar.tools index last
] -state]
5388 .mbar add cascade
-label Help
-menu .mbar.
help -font font_ui
5392 .mbar.
help add
command -label "About [appname]" \
5398 catch
{set browser
$repo_config(instaweb.browser
)}
5399 set doc_path
[file dirname [gitexec
]]
5400 set doc_path
[file join $doc_path Documentation index.html
]
5403 set doc_path
[exec cygpath
--mixed $doc_path]
5406 if {$browser eq
{}} {
5409 } elseif
{[is_Cygwin
]} {
5410 set program_files
[file dirname [exec cygpath
--windir]]
5411 set program_files
[file join $program_files {Program Files
}]
5412 set firefox
[file join $program_files {Mozilla Firefox
} firefox.exe
]
5413 set ie
[file join $program_files {Internet Explorer
} IEXPLORE.EXE
]
5414 if {[file exists
$firefox]} {
5415 set browser
$firefox
5416 } elseif
{[file exists
$ie]} {
5419 unset program_files firefox ie
5423 if {[file isfile
$doc_path]} {
5424 set doc_url
"file:$doc_path"
5426 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
5429 if {$browser ne
{}} {
5430 .mbar.
help add
command -label {Online Documentation
} \
5431 -command [list
exec $browser $doc_url &] \
5434 unset browser doc_path doc_url
5436 # -- Standard bindings
5438 bind .
<Destroy
> do_quit
5439 bind all
<$M1B-Key-q> do_quit
5440 bind all
<$M1B-Key-Q> do_quit
5441 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
5442 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
5444 # -- Not a normal commit type invocation? Do that instead!
5446 switch
-- $subcommand {
5448 if {[llength
$argv] != 1} {
5449 puts stderr
"usage: $argv0 browser commit"
5452 set current_branch
[lindex
$argv 0]
5453 new_browser
$current_branch
5457 if {[llength
$argv] != 2} {
5458 puts stderr
"usage: $argv0 blame commit path"
5461 set current_branch
[lindex
$argv 0]
5462 show_blame
$current_branch [lindex
$argv 1]
5467 if {[llength
$argv] != 0} {
5468 puts
-nonewline stderr
"usage: $argv0"
5469 if {$subcommand ne
{gui
} && [appname
] ne
"git-$subcommand"} {
5470 puts
-nonewline stderr
" $subcommand"
5475 # fall through to setup UI for commits
5478 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
5489 -text {Current Branch
:} \
5494 -textvariable current_branch \
5498 pack .branch.l1
-side left
5499 pack .branch.cb
-side left
-fill x
5500 pack .branch
-side top
-fill x
5502 # -- Main Window Layout
5504 panedwindow .vpane
-orient vertical
5505 panedwindow .vpane.files
-orient horizontal
5506 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
5507 pack .vpane
-anchor n
-side top
-fill both
-expand 1
5509 # -- Index File List
5511 frame .vpane.files.index
-height 100 -width 200
5512 label .vpane.files.index.title
-text {Changes To Be Committed
} \
5515 text
$ui_index -background white
-borderwidth 0 \
5516 -width 20 -height 10 \
5519 -cursor $cursor_ptr \
5520 -xscrollcommand {.vpane.files.index.sx
set} \
5521 -yscrollcommand {.vpane.files.index.sy
set} \
5523 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
5524 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
5525 pack .vpane.files.index.title
-side top
-fill x
5526 pack .vpane.files.index.sx
-side bottom
-fill x
5527 pack .vpane.files.index.sy
-side right
-fill y
5528 pack
$ui_index -side left
-fill both
-expand 1
5529 .vpane.files add .vpane.files.index
-sticky nsew
5531 # -- Working Directory File List
5533 frame .vpane.files.workdir
-height 100 -width 200
5534 label .vpane.files.workdir.title
-text {Changed But Not Updated
} \
5537 text
$ui_workdir -background white
-borderwidth 0 \
5538 -width 20 -height 10 \
5541 -cursor $cursor_ptr \
5542 -xscrollcommand {.vpane.files.workdir.sx
set} \
5543 -yscrollcommand {.vpane.files.workdir.sy
set} \
5545 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
5546 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
5547 pack .vpane.files.workdir.title
-side top
-fill x
5548 pack .vpane.files.workdir.sx
-side bottom
-fill x
5549 pack .vpane.files.workdir.sy
-side right
-fill y
5550 pack
$ui_workdir -side left
-fill both
-expand 1
5551 .vpane.files add .vpane.files.workdir
-sticky nsew
5553 foreach i
[list
$ui_index $ui_workdir] {
5554 $i tag conf in_diff
-font font_uibold
5555 $i tag conf in_sel \
5556 -background [$i cget
-foreground] \
5557 -foreground [$i cget
-background]
5561 # -- Diff and Commit Area
5563 frame .vpane.lower
-height 300 -width 400
5564 frame .vpane.lower.commarea
5565 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
5566 pack .vpane.lower.commarea
-side top
-fill x
5567 pack .vpane.lower.
diff -side bottom
-fill both
-expand 1
5568 .vpane add .vpane.lower
-sticky nsew
5570 # -- Commit Area Buttons
5572 frame .vpane.lower.commarea.buttons
5573 label .vpane.lower.commarea.buttons.l
-text {} \
5577 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
5578 pack .vpane.lower.commarea.buttons
-side left
-fill y
5580 button .vpane.lower.commarea.buttons.rescan
-text {Rescan
} \
5581 -command do_rescan \
5583 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
5584 lappend disable_on_lock \
5585 {.vpane.lower.commarea.buttons.rescan conf
-state}
5587 button .vpane.lower.commarea.buttons.incall
-text {Add Existing
} \
5588 -command do_add_all \
5590 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
5591 lappend disable_on_lock \
5592 {.vpane.lower.commarea.buttons.incall conf
-state}
5594 button .vpane.lower.commarea.buttons.signoff
-text {Sign Off
} \
5595 -command do_signoff \
5597 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
5599 button .vpane.lower.commarea.buttons.commit
-text {Commit
} \
5600 -command do_commit \
5602 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
5603 lappend disable_on_lock \
5604 {.vpane.lower.commarea.buttons.commit conf
-state}
5606 # -- Commit Message Buffer
5608 frame .vpane.lower.commarea.buffer
5609 frame .vpane.lower.commarea.buffer.header
5610 set ui_comm .vpane.lower.commarea.buffer.t
5611 set ui_coml .vpane.lower.commarea.buffer.header.l
5612 radiobutton .vpane.lower.commarea.buffer.header.new \
5613 -text {New Commit
} \
5614 -command do_select_commit_type \
5615 -variable selected_commit_type \
5618 lappend disable_on_lock \
5619 [list .vpane.lower.commarea.buffer.header.new conf
-state]
5620 radiobutton .vpane.lower.commarea.buffer.header.amend \
5621 -text {Amend Last Commit
} \
5622 -command do_select_commit_type \
5623 -variable selected_commit_type \
5626 lappend disable_on_lock \
5627 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
5632 proc trace_commit_type
{varname args
} {
5633 global ui_coml commit_type
5634 switch
-glob -- $commit_type {
5635 initial
{set txt
{Initial Commit Message
:}}
5636 amend
{set txt
{Amended Commit Message
:}}
5637 amend-initial
{set txt
{Amended Initial Commit Message
:}}
5638 amend-merge
{set txt
{Amended Merge Commit Message
:}}
5639 merge
{set txt
{Merge Commit Message
:}}
5640 * {set txt
{Commit Message
:}}
5642 $ui_coml conf
-text $txt
5644 trace add variable commit_type
write trace_commit_type
5645 pack
$ui_coml -side left
-fill x
5646 pack .vpane.lower.commarea.buffer.header.amend
-side right
5647 pack .vpane.lower.commarea.buffer.header.new
-side right
5649 text
$ui_comm -background white
-borderwidth 1 \
5652 -autoseparators true \
5654 -width 75 -height 9 -wrap none \
5656 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
5657 scrollbar .vpane.lower.commarea.buffer.sby \
5658 -command [list
$ui_comm yview
]
5659 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
5660 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
5661 pack
$ui_comm -side left
-fill y
5662 pack .vpane.lower.commarea.buffer
-side left
-fill y
5664 # -- Commit Message Buffer Context Menu
5666 set ctxm .vpane.lower.commarea.buffer.ctxm
5667 menu
$ctxm -tearoff 0
5671 -command {tk_textCut
$ui_comm}
5675 -command {tk_textCopy
$ui_comm}
5679 -command {tk_textPaste
$ui_comm}
5683 -command {$ui_comm delete sel.first sel.last
}
5686 -label {Select All
} \
5688 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
5693 $ui_comm tag add sel
0.0 end
5694 tk_textCopy
$ui_comm
5695 $ui_comm tag remove sel
0.0 end
5702 bind_button3
$ui_comm "tk_popup $ctxm %X %Y"
5706 proc trace_current_diff_path
{varname args
} {
5707 global current_diff_path diff_actions file_states
5708 if {$current_diff_path eq
{}} {
5714 set p
$current_diff_path
5715 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
5717 set p
[escape_path
$p]
5721 .vpane.lower.
diff.header.status configure
-text $s
5722 .vpane.lower.
diff.header.
file configure
-text $f
5723 .vpane.lower.
diff.header.path configure
-text $p
5724 foreach w
$diff_actions {
5728 trace add variable current_diff_path
write trace_current_diff_path
5730 frame .vpane.lower.
diff.header
-background orange
5731 label .vpane.lower.
diff.header.status \
5732 -background orange \
5733 -width $max_status_desc \
5737 label .vpane.lower.
diff.header.
file \
5738 -background orange \
5742 label .vpane.lower.
diff.header.path \
5743 -background orange \
5747 pack .vpane.lower.
diff.header.status
-side left
5748 pack .vpane.lower.
diff.header.
file -side left
5749 pack .vpane.lower.
diff.header.path
-fill x
5750 set ctxm .vpane.lower.
diff.header.ctxm
5751 menu
$ctxm -tearoff 0
5760 -- $current_diff_path
5762 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5763 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
5767 frame .vpane.lower.
diff.body
5768 set ui_diff .vpane.lower.
diff.body.t
5769 text
$ui_diff -background white
-borderwidth 0 \
5770 -width 80 -height 15 -wrap none \
5772 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
5773 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
5775 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
5776 -command [list
$ui_diff xview
]
5777 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
5778 -command [list
$ui_diff yview
]
5779 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
5780 pack .vpane.lower.
diff.body.sby
-side right
-fill y
5781 pack
$ui_diff -side left
-fill both
-expand 1
5782 pack .vpane.lower.
diff.header
-side top
-fill x
5783 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
5785 $ui_diff tag conf d_cr
-elide true
5786 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
5787 $ui_diff tag conf d_
+ -foreground {#00a000}
5788 $ui_diff tag conf d_-
-foreground red
5790 $ui_diff tag conf d_
++ -foreground {#00a000}
5791 $ui_diff tag conf d_--
-foreground red
5792 $ui_diff tag conf d_
+s \
5793 -foreground {#00a000} \
5794 -background {#e2effa}
5795 $ui_diff tag conf d_-s \
5797 -background {#e2effa}
5798 $ui_diff tag conf d_s
+ \
5799 -foreground {#00a000} \
5801 $ui_diff tag conf d_s- \
5805 $ui_diff tag conf d
<<<<<<< \
5806 -foreground orange \
5808 $ui_diff tag conf d
======= \
5809 -foreground orange \
5811 $ui_diff tag conf d
>>>>>>> \
5812 -foreground orange \
5815 $ui_diff tag raise sel
5817 # -- Diff Body Context Menu
5819 set ctxm .vpane.lower.
diff.body.ctxm
5820 menu
$ctxm -tearoff 0
5824 -command reshow_diff
5825 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5829 -command {tk_textCopy
$ui_diff}
5830 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5832 -label {Select All
} \
5834 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
5835 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5840 $ui_diff tag add sel
0.0 end
5841 tk_textCopy
$ui_diff
5842 $ui_diff tag remove sel
0.0 end
5844 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5847 -label {Apply
/Reverse Hunk
} \
5849 -command {apply_hunk
$cursorX $cursorY}
5850 set ui_diff_applyhunk
[$ctxm index last
]
5851 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
5854 -label {Decrease Font Size
} \
5856 -command {incr_font_size font_diff
-1}
5857 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5859 -label {Increase Font Size
} \
5861 -command {incr_font_size font_diff
1}
5862 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5865 -label {Show Less Context
} \
5867 -command {if {$repo_config(gui.diffcontext
) >= 2} {
5868 incr repo_config
(gui.diffcontext
) -1
5871 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5873 -label {Show More Context
} \
5876 incr repo_config
(gui.diffcontext
)
5879 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5881 $ctxm add
command -label {Options...
} \
5884 bind_button3
$ui_diff "
5887 if {\$ui_index eq \$current_diff_side} {
5888 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
5890 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
5892 tk_popup $ctxm %X %Y
5894 unset ui_diff_applyhunk
5898 label .status
-textvariable ui_status_value \
5904 pack .status
-anchor w
-side bottom
-fill x
5909 set gm
$repo_config(gui.geometry
)
5910 wm geometry .
[lindex
$gm 0]
5911 .vpane sash place
0 \
5912 [lindex
[.vpane sash coord
0] 0] \
5914 .vpane.files sash place
0 \
5916 [lindex
[.vpane.files sash coord
0] 1]
5922 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
5923 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
5924 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
5925 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
5926 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
5927 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
5928 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
5929 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
5930 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
5931 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
5932 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
5934 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
5935 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
5936 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
5937 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
5938 bind $ui_diff <$M1B-Key-v> {break}
5939 bind $ui_diff <$M1B-Key-V> {break}
5940 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
5941 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
5942 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
5943 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
5944 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
5945 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
5946 bind $ui_diff <Button-1
> {focus
%W
}
5948 if {[is_enabled branch
]} {
5949 bind .
<$M1B-Key-n> do_create_branch
5950 bind .
<$M1B-Key-N> do_create_branch
5953 bind all
<Key-F5
> do_rescan
5954 bind all
<$M1B-Key-r> do_rescan
5955 bind all
<$M1B-Key-R> do_rescan
5956 bind .
<$M1B-Key-s> do_signoff
5957 bind .
<$M1B-Key-S> do_signoff
5958 bind .
<$M1B-Key-i> do_add_all
5959 bind .
<$M1B-Key-I> do_add_all
5960 bind .
<$M1B-Key-Return> do_commit
5961 foreach i
[list
$ui_index $ui_workdir] {
5962 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
5963 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
5964 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
5968 set file_lists
($ui_index) [list
]
5969 set file_lists
($ui_workdir) [list
]
5971 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
5972 focus
-force $ui_comm
5974 # -- Warn the user about environmental problems. Cygwin's Tcl
5975 # does *not* pass its env array onto any processes it spawns.
5976 # This means that git processes get none of our environment.
5981 set msg
"Possible environment issues exist.
5983 The following environment variables are probably
5984 going to be ignored by any Git subprocess run
5988 foreach name
[array names env
] {
5989 switch
-regexp -- $name {
5990 {^GIT_INDEX_FILE$
} -
5991 {^GIT_OBJECT_DIRECTORY$
} -
5992 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
5994 {^GIT_EXTERNAL_DIFF$
} -
5998 {^GIT_CONFIG_LOCAL$
} -
5999 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
6000 append msg
" - $name\n"
6003 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
6004 append msg
" - $name\n"
6006 set suggest_user
$name
6010 if {$ignored_env > 0} {
6012 This is due to a known issue with the
6013 Tcl binary distributed by Cygwin."
6015 if {$suggest_user ne
{}} {
6018 A good replacement for $suggest_user
6019 is placing values for the user.name and
6020 user.email settings into your personal
6026 unset ignored_env msg suggest_user name
6029 # -- Only initialize complex UI if we are going to stay running.
6031 if {[is_enabled transport
]} {
6035 populate_branch_menu
6040 # -- Only suggest a gc run if we are going to stay running.
6042 if {[is_enabled multicommit
]} {
6043 set object_limit
2000
6044 if {[is_Windows
]} {set object_limit
200}
6045 regexp
{^
([0-9]+) objects
,} [git count-objects
] _junk objects_current
6046 if {$objects_current >= $object_limit} {
6048 "This repository currently has $objects_current loose objects.
6050 To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
6052 Compress the database now?"] eq
yes} {
6056 unset object_limit _junk objects_current
6059 lock_index begin-read