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
739 by another application, but the content within
740 the file was not changed.
742 A rescan will be automatically started to find
743 other files which may have the same state."
746 display_file
$path __
747 rescan
{set ui_status_value
{Ready.
}} 0
750 proc show_diff
{path w
{lno
{}}} {
751 global file_states file_lists
752 global is_3way_diff diff_active repo_config
753 global ui_diff ui_status_value ui_index ui_workdir
754 global current_diff_path current_diff_side current_diff_header
756 if {$diff_active ||
![lock_index
read]} return
760 set lno
[lsearch
-sorted -exact $file_lists($w) $path]
766 $w tag add in_diff
$lno.0 [expr {$lno + 1}].0
769 set s
$file_states($path)
773 set current_diff_path
$path
774 set current_diff_side
$w
775 set current_diff_header
{}
776 set ui_status_value
"Loading diff of [escape_path $path]..."
778 # - Git won't give us the diff, there's nothing to compare to!
781 set max_sz
[expr {128 * 1024}]
783 set fd
[open
$path r
]
784 set content
[read $fd $max_sz]
786 set sz
[file size
$path]
790 set ui_status_value
"Unable to display [escape_path $path]"
791 error_popup
"Error loading file:\n\n$err"
794 $ui_diff conf
-state normal
795 if {![catch
{set type [exec file $path]}]} {
796 set n
[string length
$path]
797 if {[string equal
-length $n $path $type]} {
798 set type [string range
$type $n end
]
799 regsub
{^
:?\s
*} $type {} type
801 $ui_diff insert end
"* $type\n" d_@
803 if {[string first
"\0" $content] != -1} {
804 $ui_diff insert end \
805 "* Binary file (not showing content)." \
809 $ui_diff insert end \
810 "* Untracked file is $sz bytes.
811 * Showing only first $max_sz bytes.
814 $ui_diff insert end
$content
816 $ui_diff insert end
"
817 * Untracked file clipped here by [appname].
818 * To see the entire file, use an external editor.
822 $ui_diff conf
-state disabled
825 set ui_status_value
{Ready.
}
830 if {$w eq
$ui_index} {
831 lappend cmd diff-index
833 } elseif
{$w eq
$ui_workdir} {
834 if {[string index
$m 0] eq
{U
}} {
837 lappend cmd diff-files
842 lappend cmd
--no-color
843 if {$repo_config(gui.diffcontext
) > 0} {
844 lappend cmd
"-U$repo_config(gui.diffcontext)"
846 if {$w eq
$ui_index} {
852 if {[catch
{set fd
[open
$cmd r
]} err
]} {
855 set ui_status_value
"Unable to display [escape_path $path]"
856 error_popup
"Error loading diff:\n\n$err"
864 fileevent
$fd readable
[list read_diff
$fd]
867 proc read_diff
{fd
} {
868 global ui_diff ui_status_value diff_active
869 global is_3way_diff current_diff_header
871 $ui_diff conf
-state normal
872 while {[gets
$fd line
] >= 0} {
873 # -- Cleanup uninteresting diff header lines.
875 if { [string match
{diff --git *} $line]
876 ||
[string match
{diff --cc *} $line]
877 ||
[string match
{diff --combined *} $line]
878 ||
[string match
{--- *} $line]
879 ||
[string match
{+++ *} $line]} {
880 append current_diff_header
$line "\n"
883 if {[string match
{index
*} $line]} continue
884 if {$line eq
{deleted
file mode
120000}} {
885 set line
"deleted symlink"
888 # -- Automatically detect if this is a 3 way diff.
890 if {[string match
{@@@
*} $line]} {set is_3way_diff
1}
892 if {[string match
{mode
*} $line]
893 ||
[string match
{new
file *} $line]
894 ||
[string match
{deleted
file *} $line]
895 ||
[string match
{Binary files
* and
* differ
} $line]
896 ||
$line eq
{\ No newline
at end of
file}
897 ||
[regexp
{^\
* Unmerged path
} $line]} {
899 } elseif
{$is_3way_diff} {
900 set op
[string range
$line 0 1]
910 if {[regexp
{^\
+\
+([<>]{7} |
={7})} $line _g op
]} {
911 set line
[string replace
$line 0 1 { }]
918 puts
"error: Unhandled 3 way diff marker: {$op}"
923 set op
[string index
$line 0]
929 if {[regexp
{^\
+([<>]{7} |
={7})} $line _g op
]} {
930 set line
[string replace
$line 0 0 { }]
937 puts
"error: Unhandled 2 way diff marker: {$op}"
942 $ui_diff insert end
$line $tags
943 if {[string index
$line end
] eq
"\r"} {
944 $ui_diff tag add d_cr
{end
- 2c
}
946 $ui_diff insert end
"\n" $tags
948 $ui_diff conf
-state disabled
954 set ui_status_value
{Ready.
}
956 if {[$ui_diff index end
] eq
{2.0}} {
962 proc apply_hunk
{x y
} {
963 global current_diff_path current_diff_header current_diff_side
964 global ui_diff ui_index file_states
966 if {$current_diff_path eq
{} ||
$current_diff_header eq
{}} return
967 if {![lock_index apply_hunk
]} return
969 set apply_cmd
{git apply
--cached --whitespace=nowarn
}
970 set mi
[lindex
$file_states($current_diff_path) 0]
971 if {$current_diff_side eq
$ui_index} {
973 lappend apply_cmd
--reverse
974 if {[string index
$mi 0] ne
{M
}} {
980 if {[string index
$mi 1] ne
{M
}} {
986 set s_lno
[lindex
[split [$ui_diff index @
$x,$y] .
] 0]
987 set s_lno
[$ui_diff search
-backwards -regexp ^@@
$s_lno.0 0.0]
993 set e_lno
[$ui_diff search
-forwards -regexp ^@@
"$s_lno + 1 lines" end
]
999 set p
[open
"| $apply_cmd" w
]
1000 fconfigure
$p -translation binary
-encoding binary
1001 puts
-nonewline $p $current_diff_header
1002 puts
-nonewline $p [$ui_diff get
$s_lno $e_lno]
1004 error_popup
"Failed to $mode selected hunk.\n\n$err"
1009 $ui_diff conf
-state normal
1010 $ui_diff delete
$s_lno $e_lno
1011 $ui_diff conf
-state disabled
1013 if {[$ui_diff get
1.0 end
] eq
"\n"} {
1019 if {$current_diff_side eq
$ui_index} {
1021 } elseif
{[string index
$mi 0] eq
{_
}} {
1027 display_file
$current_diff_path $mi
1033 ######################################################################
1037 proc load_last_commit
{} {
1038 global HEAD PARENT MERGE_HEAD commit_type ui_comm
1041 if {[llength
$PARENT] == 0} {
1042 error_popup
{There is nothing to amend.
1044 You are about to create the initial commit.
1045 There is no commit before this to amend.
1050 repository_state curType curHEAD curMERGE_HEAD
1051 if {$curType eq
{merge
}} {
1052 error_popup
{Cannot amend
while merging.
1054 You are currently
in the middle of a merge that
1055 has not been fully completed. You cannot amend
1056 the prior commit unless you first abort the
1057 current merge activity.
1065 set fd
[open
"| git cat-file commit $curHEAD" r
]
1066 fconfigure
$fd -encoding binary
-translation lf
1067 if {[catch
{set enc
$repo_config(i18n.commitencoding
)}]} {
1070 while {[gets
$fd line
] > 0} {
1071 if {[string match
{parent
*} $line]} {
1072 lappend parents
[string range
$line 7 end
]
1073 } elseif
{[string match
{encoding
*} $line]} {
1074 set enc
[string tolower
[string range
$line 9 end
]]
1077 fconfigure
$fd -encoding $enc
1078 set msg
[string trim
[read $fd]]
1081 error_popup
"Error loading commit data for amend:\n\n$err"
1087 set MERGE_HEAD
[list
]
1088 switch
-- [llength
$parents] {
1089 0 {set commit_type amend-initial
}
1090 1 {set commit_type amend
}
1091 default
{set commit_type amend-merge
}
1094 $ui_comm delete
0.0 end
1095 $ui_comm insert end
$msg
1097 $ui_comm edit modified false
1098 rescan
{set ui_status_value
{Ready.
}}
1101 proc create_new_commit
{} {
1102 global commit_type ui_comm
1104 set commit_type normal
1105 $ui_comm delete
0.0 end
1107 $ui_comm edit modified false
1108 rescan
{set ui_status_value
{Ready.
}}
1111 set GIT_COMMITTER_IDENT
{}
1113 proc committer_ident
{} {
1114 global GIT_COMMITTER_IDENT
1116 if {$GIT_COMMITTER_IDENT eq
{}} {
1117 if {[catch
{set me
[git var GIT_COMMITTER_IDENT
]} err
]} {
1118 error_popup
"Unable to obtain your identity:\n\n$err"
1121 if {![regexp
{^
(.
*) [0-9]+ [-+0-9]+$
} \
1122 $me me GIT_COMMITTER_IDENT
]} {
1123 error_popup
"Invalid GIT_COMMITTER_IDENT:\n\n$me"
1128 return $GIT_COMMITTER_IDENT
1131 proc commit_tree
{} {
1132 global HEAD commit_type file_states ui_comm repo_config
1133 global ui_status_value pch_error
1135 if {[committer_ident
] eq
{}} return
1136 if {![lock_index update
]} return
1138 # -- Our in memory state should match the repository.
1140 repository_state curType curHEAD curMERGE_HEAD
1141 if {[string match amend
* $commit_type]
1142 && $curType eq
{normal
}
1143 && $curHEAD eq
$HEAD} {
1144 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1145 info_popup
{Last scanned state does not match repository state.
1147 Another Git program has modified this repository
1148 since the last scan. A rescan must be performed
1149 before another commit can be created.
1151 The rescan will be automatically started now.
1154 rescan
{set ui_status_value
{Ready.
}}
1158 # -- At least one file should differ in the index.
1161 foreach path
[array names file_states
] {
1162 switch
-glob -- [lindex
$file_states($path) 0] {
1166 M?
{set files_ready
1}
1168 error_popup
"Unmerged files cannot be committed.
1170 File [short_path $path] has merge conflicts.
1171 You must resolve them and add the file before committing.
1177 error_popup
"Unknown file state [lindex $s 0] detected.
1179 File [short_path $path] cannot be committed by this program.
1184 if {!$files_ready && ![string match
*merge
$curType]} {
1185 info_popup
{No changes to commit.
1187 You must add
at least
1 file before you can commit.
1193 # -- A message is required.
1195 set msg
[string trim
[$ui_comm get
1.0 end
]]
1196 regsub
-all -line {[ \t\r]+$
} $msg {} msg
1198 error_popup
{Please supply a commit message.
1200 A good commit message has the following format
:
1202 - First line
: Describe
in one sentance what you did.
1203 - Second line
: Blank
1204 - Remaining lines
: Describe why this change is good.
1210 # -- Run the pre-commit hook.
1212 set pchook
[gitdir hooks pre-commit
]
1214 # On Cygwin [file executable] might lie so we need to ask
1215 # the shell if the hook is executable. Yes that's annoying.
1217 if {[is_Cygwin
] && [file isfile
$pchook]} {
1218 set pchook
[list sh
-c [concat \
1219 "if test -x \"$pchook\";" \
1220 "then exec \"$pchook\" 2>&1;" \
1222 } elseif
{[file executable
$pchook]} {
1223 set pchook
[list
$pchook |
& cat]
1225 commit_writetree
$curHEAD $msg
1229 set ui_status_value
{Calling pre-commit hook...
}
1231 set fd_ph
[open
"| $pchook" r
]
1232 fconfigure
$fd_ph -blocking 0 -translation binary
1233 fileevent
$fd_ph readable \
1234 [list commit_prehook_wait
$fd_ph $curHEAD $msg]
1237 proc commit_prehook_wait
{fd_ph curHEAD msg
} {
1238 global pch_error ui_status_value
1240 append pch_error
[read $fd_ph]
1241 fconfigure
$fd_ph -blocking 1
1243 if {[catch
{close
$fd_ph}]} {
1244 set ui_status_value
{Commit declined by pre-commit hook.
}
1245 hook_failed_popup pre-commit
$pch_error
1248 commit_writetree
$curHEAD $msg
1253 fconfigure
$fd_ph -blocking 0
1256 proc commit_writetree
{curHEAD msg
} {
1257 global ui_status_value
1259 set ui_status_value
{Committing changes...
}
1260 set fd_wt
[open
"| git write-tree" r
]
1261 fileevent
$fd_wt readable \
1262 [list commit_committree
$fd_wt $curHEAD $msg]
1265 proc commit_committree
{fd_wt curHEAD msg
} {
1266 global HEAD PARENT MERGE_HEAD commit_type
1267 global all_heads current_branch
1268 global ui_status_value ui_comm selected_commit_type
1269 global file_states selected_paths rescan_active
1273 if {$tree_id eq
{} ||
[catch
{close
$fd_wt} err
]} {
1274 error_popup
"write-tree failed:\n\n$err"
1275 set ui_status_value
{Commit failed.
}
1280 # -- Verify this wasn't an empty change.
1282 if {$commit_type eq
{normal
}} {
1283 set old_tree
[git rev-parse
"$PARENT^{tree}"]
1284 if {$tree_id eq
$old_tree} {
1285 info_popup
{No changes to commit.
1287 No files were modified by this commit and it
1288 was not a merge commit.
1290 A rescan will be automatically started now.
1293 rescan
{set ui_status_value
{No changes to commit.
}}
1298 # -- Build the message.
1300 set msg_p
[gitdir COMMIT_EDITMSG
]
1301 set msg_wt
[open
$msg_p w
]
1302 if {[catch
{set enc
$repo_config(i18n.commitencoding
)}]} {
1305 fconfigure
$msg_wt -encoding $enc -translation binary
1306 puts
-nonewline $msg_wt $msg
1309 # -- Create the commit.
1311 set cmd
[list git commit-tree
$tree_id]
1312 foreach p
[concat
$PARENT $MERGE_HEAD] {
1316 if {[catch
{set cmt_id
[eval exec $cmd]} err
]} {
1317 error_popup
"commit-tree failed:\n\n$err"
1318 set ui_status_value
{Commit failed.
}
1323 # -- Update the HEAD ref.
1326 if {$commit_type ne
{normal
}} {
1327 append reflogm
" ($commit_type)"
1329 set i
[string first
"\n" $msg]
1331 append reflogm
{: } [string range
$msg 0 [expr {$i - 1}]]
1333 append reflogm
{: } $msg
1335 set cmd
[list git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD]
1336 if {[catch
{eval exec $cmd} err
]} {
1337 error_popup
"update-ref failed:\n\n$err"
1338 set ui_status_value
{Commit failed.
}
1343 # -- Cleanup after ourselves.
1345 catch
{file delete
$msg_p}
1346 catch
{file delete
[gitdir MERGE_HEAD
]}
1347 catch
{file delete
[gitdir MERGE_MSG
]}
1348 catch
{file delete
[gitdir SQUASH_MSG
]}
1349 catch
{file delete
[gitdir GITGUI_MSG
]}
1351 # -- Let rerere do its thing.
1353 if {[file isdirectory
[gitdir rr-cache
]]} {
1357 # -- Run the post-commit hook.
1359 set pchook
[gitdir hooks post-commit
]
1360 if {[is_Cygwin
] && [file isfile
$pchook]} {
1361 set pchook
[list sh
-c [concat \
1362 "if test -x \"$pchook\";" \
1363 "then exec \"$pchook\";" \
1365 } elseif
{![file executable
$pchook]} {
1368 if {$pchook ne
{}} {
1369 catch
{exec $pchook &}
1372 $ui_comm delete
0.0 end
1374 $ui_comm edit modified false
1376 if {[is_enabled singlecommit
]} do_quit
1378 # -- Make sure our current branch exists.
1380 if {$commit_type eq
{initial
}} {
1381 lappend all_heads
$current_branch
1382 set all_heads
[lsort
-unique $all_heads]
1383 populate_branch_menu
1386 # -- Update in memory status
1388 set selected_commit_type new
1389 set commit_type normal
1392 set MERGE_HEAD
[list
]
1394 foreach path
[array names file_states
] {
1395 set s
$file_states($path)
1397 switch
-glob -- $m {
1405 unset file_states
($path)
1406 catch
{unset selected_paths
($path)}
1409 set file_states
($path) [list _O
[lindex
$s 1] {} {}]
1415 set file_states
($path) [list \
1416 _
[string index
$m 1] \
1427 set ui_status_value \
1428 "Changes committed as [string range $cmt_id 0 7]."
1431 ######################################################################
1435 proc fetch_from
{remote
} {
1436 set w
[new_console \
1438 "Fetching new changes from $remote"]
1439 set cmd
[list git fetch
]
1441 console_exec
$w $cmd console_done
1444 proc push_to
{remote
} {
1445 set w
[new_console \
1447 "Pushing changes to $remote"]
1448 set cmd
[list git push
]
1451 console_exec
$w $cmd console_done
1454 ######################################################################
1458 proc mapicon
{w state path
} {
1461 if {[catch
{set r
$all_icons($state$w)}]} {
1462 puts
"error: no icon for $w state={$state} $path"
1468 proc mapdesc
{state path
} {
1471 if {[catch
{set r
$all_descs($state)}]} {
1472 puts
"error: no desc for state={$state} $path"
1478 proc escape_path
{path
} {
1479 regsub
-all {\\} $path "\\\\" path
1480 regsub
-all "\n" $path "\\n" path
1484 proc short_path
{path
} {
1485 return [escape_path
[lindex
[file split $path] end
]]
1489 set null_sha1
[string repeat
0 40]
1491 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1492 global file_states next_icon_id null_sha1
1494 set s0
[string index
$new_state 0]
1495 set s1
[string index
$new_state 1]
1497 if {[catch
{set info
$file_states($path)}]} {
1499 set icon n
[incr next_icon_id
]
1501 set state
[lindex
$info 0]
1502 set icon
[lindex
$info 1]
1503 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1504 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1507 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1508 elseif
{$s0 eq
{_
}} {set s0 _
}
1510 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1511 elseif
{$s1 eq
{_
}} {set s1 _
}
1513 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1514 set head_info
[list
0 $null_sha1]
1515 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1516 && $head_info eq
{}} {
1517 set head_info
$index_info
1520 set file_states
($path) [list
$s0$s1 $icon \
1521 $head_info $index_info \
1526 proc display_file_helper
{w path icon_name old_m new_m
} {
1529 if {$new_m eq
{_
}} {
1530 set lno
[lsearch
-sorted -exact $file_lists($w) $path]
1532 set file_lists
($w) [lreplace
$file_lists($w) $lno $lno]
1534 $w conf
-state normal
1535 $w delete
$lno.0 [expr {$lno + 1}].0
1536 $w conf
-state disabled
1538 } elseif
{$old_m eq
{_
} && $new_m ne
{_
}} {
1539 lappend file_lists
($w) $path
1540 set file_lists
($w) [lsort
-unique $file_lists($w)]
1541 set lno
[lsearch
-sorted -exact $file_lists($w) $path]
1543 $w conf
-state normal
1544 $w image create
$lno.0 \
1545 -align center
-padx 5 -pady 1 \
1547 -image [mapicon
$w $new_m $path]
1548 $w insert
$lno.1 "[escape_path $path]\n"
1549 $w conf
-state disabled
1550 } elseif
{$old_m ne
$new_m} {
1551 $w conf
-state normal
1552 $w image conf
$icon_name -image [mapicon
$w $new_m $path]
1553 $w conf
-state disabled
1557 proc display_file
{path state
} {
1558 global file_states selected_paths
1559 global ui_index ui_workdir
1561 set old_m
[merge_state
$path $state]
1562 set s
$file_states($path)
1563 set new_m
[lindex
$s 0]
1564 set icon_name
[lindex
$s 1]
1566 set o
[string index
$old_m 0]
1567 set n
[string index
$new_m 0]
1574 display_file_helper
$ui_index $path $icon_name $o $n
1576 if {[string index
$old_m 0] eq
{U
}} {
1579 set o
[string index
$old_m 1]
1581 if {[string index
$new_m 0] eq
{U
}} {
1584 set n
[string index
$new_m 1]
1586 display_file_helper
$ui_workdir $path $icon_name $o $n
1588 if {$new_m eq
{__
}} {
1589 unset file_states
($path)
1590 catch
{unset selected_paths
($path)}
1594 proc display_all_files_helper
{w path icon_name m
} {
1597 lappend file_lists
($w) $path
1598 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1599 $w image create end \
1600 -align center
-padx 5 -pady 1 \
1602 -image [mapicon
$w $m $path]
1603 $w insert end
"[escape_path $path]\n"
1606 proc display_all_files
{} {
1607 global ui_index ui_workdir
1608 global file_states file_lists
1611 $ui_index conf
-state normal
1612 $ui_workdir conf
-state normal
1614 $ui_index delete
0.0 end
1615 $ui_workdir delete
0.0 end
1618 set file_lists
($ui_index) [list
]
1619 set file_lists
($ui_workdir) [list
]
1621 foreach path
[lsort
[array names file_states
]] {
1622 set s
$file_states($path)
1624 set icon_name
[lindex
$s 1]
1626 set s
[string index
$m 0]
1627 if {$s ne
{U
} && $s ne
{_
}} {
1628 display_all_files_helper
$ui_index $path \
1632 if {[string index
$m 0] eq
{U
}} {
1635 set s
[string index
$m 1]
1638 display_all_files_helper
$ui_workdir $path \
1643 $ui_index conf
-state disabled
1644 $ui_workdir conf
-state disabled
1647 proc update_indexinfo
{msg pathList after
} {
1648 global update_index_cp ui_status_value
1650 if {![lock_index update
]} return
1652 set update_index_cp
0
1653 set pathList
[lsort
$pathList]
1654 set totalCnt
[llength
$pathList]
1655 set batch [expr {int
($totalCnt * .01) + 1}]
1656 if {$batch > 25} {set batch 25}
1658 set ui_status_value
[format \
1659 "$msg... %i/%i files (%.2f%%)" \
1663 set fd
[open
"| git update-index -z --index-info" w
]
1670 fileevent
$fd writable
[list \
1671 write_update_indexinfo \
1681 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1682 global update_index_cp ui_status_value
1683 global file_states current_diff_path
1685 if {$update_index_cp >= $totalCnt} {
1692 for {set i
$batch} \
1693 {$update_index_cp < $totalCnt && $i > 0} \
1695 set path
[lindex
$pathList $update_index_cp]
1696 incr update_index_cp
1698 set s
$file_states($path)
1699 switch
-glob -- [lindex
$s 0] {
1706 set info
[lindex
$s 2]
1707 if {$info eq
{}} continue
1709 puts
-nonewline $fd "$info\t[encoding convertto $path]\0"
1710 display_file
$path $new
1713 set ui_status_value
[format \
1714 "$msg... %i/%i files (%.2f%%)" \
1717 [expr {100.0 * $update_index_cp / $totalCnt}]]
1720 proc update_index
{msg pathList after
} {
1721 global update_index_cp ui_status_value
1723 if {![lock_index update
]} return
1725 set update_index_cp
0
1726 set pathList
[lsort
$pathList]
1727 set totalCnt
[llength
$pathList]
1728 set batch [expr {int
($totalCnt * .01) + 1}]
1729 if {$batch > 25} {set batch 25}
1731 set ui_status_value
[format \
1732 "$msg... %i/%i files (%.2f%%)" \
1736 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1743 fileevent
$fd writable
[list \
1744 write_update_index \
1754 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1755 global update_index_cp ui_status_value
1756 global file_states current_diff_path
1758 if {$update_index_cp >= $totalCnt} {
1765 for {set i
$batch} \
1766 {$update_index_cp < $totalCnt && $i > 0} \
1768 set path
[lindex
$pathList $update_index_cp]
1769 incr update_index_cp
1771 switch
-glob -- [lindex
$file_states($path) 0] {
1777 if {[file exists
$path]} {
1786 puts
-nonewline $fd "[encoding convertto $path]\0"
1787 display_file
$path $new
1790 set ui_status_value
[format \
1791 "$msg... %i/%i files (%.2f%%)" \
1794 [expr {100.0 * $update_index_cp / $totalCnt}]]
1797 proc checkout_index
{msg pathList after
} {
1798 global update_index_cp ui_status_value
1800 if {![lock_index update
]} return
1802 set update_index_cp
0
1803 set pathList
[lsort
$pathList]
1804 set totalCnt
[llength
$pathList]
1805 set batch [expr {int
($totalCnt * .01) + 1}]
1806 if {$batch > 25} {set batch 25}
1808 set ui_status_value
[format \
1809 "$msg... %i/%i files (%.2f%%)" \
1813 set cmd
[list git checkout-index
]
1819 set fd
[open
"| $cmd " w
]
1826 fileevent
$fd writable
[list \
1827 write_checkout_index \
1837 proc write_checkout_index
{fd pathList totalCnt
batch msg after
} {
1838 global update_index_cp ui_status_value
1839 global file_states current_diff_path
1841 if {$update_index_cp >= $totalCnt} {
1848 for {set i
$batch} \
1849 {$update_index_cp < $totalCnt && $i > 0} \
1851 set path
[lindex
$pathList $update_index_cp]
1852 incr update_index_cp
1853 switch
-glob -- [lindex
$file_states($path) 0] {
1857 puts
-nonewline $fd "[encoding convertto $path]\0"
1858 display_file
$path ?_
1863 set ui_status_value
[format \
1864 "$msg... %i/%i files (%.2f%%)" \
1867 [expr {100.0 * $update_index_cp / $totalCnt}]]
1870 ######################################################################
1872 ## branch management
1874 proc is_tracking_branch
{name
} {
1875 global tracking_branches
1877 if {![catch
{set info
$tracking_branches($name)}]} {
1880 foreach t
[array names tracking_branches
] {
1881 if {[string match
{*/\
*} $t] && [string match
$t $name]} {
1888 proc load_all_heads
{} {
1891 set all_heads
[list
]
1892 set fd
[open
"| git for-each-ref --format=%(refname) refs/heads" r
]
1893 while {[gets
$fd line
] > 0} {
1894 if {[is_tracking_branch
$line]} continue
1895 if {![regsub ^refs
/heads
/ $line {} name
]} continue
1896 lappend all_heads
$name
1900 set all_heads
[lsort
$all_heads]
1903 proc populate_branch_menu
{} {
1904 global all_heads disable_on_lock
1907 set last
[$m index last
]
1908 for {set i
0} {$i <= $last} {incr i
} {
1909 if {[$m type $i] eq
{separator
}} {
1912 foreach a
$disable_on_lock {
1913 if {[lindex
$a 0] ne
$m ||
[lindex
$a 2] < $i} {
1917 set disable_on_lock
$new_dol
1922 if {$all_heads ne
{}} {
1925 foreach b
$all_heads {
1926 $m add radiobutton \
1928 -command [list switch_branch
$b] \
1929 -variable current_branch \
1932 lappend disable_on_lock \
1933 [list
$m entryconf
[$m index last
] -state]
1937 proc all_tracking_branches
{} {
1938 global tracking_branches
1940 set all_trackings
{}
1942 foreach name
[array names tracking_branches
] {
1943 if {[regsub
{/\
*$
} $name {} name
]} {
1946 regsub ^refs
/(heads|remotes
)/ $name {} name
1947 lappend all_trackings
$name
1952 set fd
[open
"| git for-each-ref --format=%(refname) $cmd" r
]
1953 while {[gets
$fd name
] > 0} {
1954 regsub ^refs
/(heads|remotes
)/ $name {} name
1955 lappend all_trackings
$name
1960 return [lsort
-unique $all_trackings]
1963 proc load_all_tags
{} {
1965 set fd
[open
"| git for-each-ref --format=%(refname) refs/tags" r
]
1966 while {[gets
$fd line
] > 0} {
1967 if {![regsub ^refs
/tags
/ $line {} name
]} continue
1968 lappend all_tags
$name
1972 return [lsort
$all_tags]
1975 proc do_create_branch_action
{w
} {
1976 global all_heads null_sha1 repo_config
1977 global create_branch_checkout create_branch_revtype
1978 global create_branch_head create_branch_trackinghead
1979 global create_branch_name create_branch_revexp
1980 global create_branch_tag
1982 set newbranch
$create_branch_name
1983 if {$newbranch eq
{}
1984 ||
$newbranch eq
$repo_config(gui.newbranchtemplate
)} {
1988 -title [wm title
$w] \
1990 -message "Please supply a branch name."
1991 focus
$w.desc.name_t
1994 if {![catch
{git show-ref
--verify -- "refs/heads/$newbranch"}]} {
1998 -title [wm title
$w] \
2000 -message "Branch '$newbranch' already exists."
2001 focus
$w.desc.name_t
2004 if {[catch
{git check-ref-format
"heads/$newbranch"}]} {
2008 -title [wm title
$w] \
2010 -message "We do not like '$newbranch' as a branch name."
2011 focus
$w.desc.name_t
2016 switch
-- $create_branch_revtype {
2017 head {set rev $create_branch_head}
2018 tracking
{set rev $create_branch_trackinghead}
2019 tag
{set rev $create_branch_tag}
2020 expression
{set rev $create_branch_revexp}
2022 if {[catch
{set cmt
[git rev-parse
--verify "${rev}^0"]}]} {
2026 -title [wm title
$w] \
2028 -message "Invalid starting revision: $rev"
2031 set cmd
[list git update-ref
]
2033 lappend cmd
"branch: Created from $rev"
2034 lappend cmd
"refs/heads/$newbranch"
2036 lappend cmd
$null_sha1
2037 if {[catch
{eval exec $cmd} err
]} {
2041 -title [wm title
$w] \
2043 -message "Failed to create '$newbranch'.\n\n$err"
2047 lappend all_heads
$newbranch
2048 set all_heads
[lsort
$all_heads]
2049 populate_branch_menu
2051 if {$create_branch_checkout} {
2052 switch_branch
$newbranch
2056 proc radio_selector
{varname value args
} {
2057 upvar
#0 $varname var
2061 trace add variable create_branch_head
write \
2062 [list radio_selector create_branch_revtype
head]
2063 trace add variable create_branch_trackinghead
write \
2064 [list radio_selector create_branch_revtype tracking
]
2065 trace add variable create_branch_tag
write \
2066 [list radio_selector create_branch_revtype tag
]
2068 trace add variable delete_branch_head
write \
2069 [list radio_selector delete_branch_checktype
head]
2070 trace add variable delete_branch_trackinghead
write \
2071 [list radio_selector delete_branch_checktype tracking
]
2073 proc do_create_branch
{} {
2074 global all_heads current_branch repo_config
2075 global create_branch_checkout create_branch_revtype
2076 global create_branch_head create_branch_trackinghead
2077 global create_branch_name create_branch_revexp
2078 global create_branch_tag
2080 set w .branch_editor
2082 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2084 label
$w.header
-text {Create New Branch
} \
2086 pack
$w.header
-side top
-fill x
2089 button
$w.buttons.create
-text Create \
2092 -command [list do_create_branch_action
$w]
2093 pack
$w.buttons.create
-side right
2094 button
$w.buttons.cancel
-text {Cancel
} \
2096 -command [list destroy
$w]
2097 pack
$w.buttons.cancel
-side right
-padx 5
2098 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2100 labelframe
$w.desc \
2101 -text {Branch Description
} \
2103 label
$w.desc.name_l
-text {Name
:} -font font_ui
2104 entry
$w.desc.name_t \
2108 -textvariable create_branch_name \
2112 if {%d
== 1 && [regexp
{[~^
:?
*\
[\
0- ]} %S
]} {return 0}
2115 grid
$w.desc.name_l
$w.desc.name_t
-sticky we
-padx {0 5}
2116 grid columnconfigure
$w.desc
1 -weight 1
2117 pack
$w.desc
-anchor nw
-fill x
-pady 5 -padx 5
2119 labelframe
$w.from \
2120 -text {Starting Revision
} \
2122 radiobutton
$w.from.head_r \
2123 -text {Local Branch
:} \
2125 -variable create_branch_revtype \
2127 set lbranchm
[eval tk_optionMenu
$w.from.head_m create_branch_head \
2129 $lbranchm configure
-font font_ui
2130 $w.from.head_m configure
-font font_ui
2131 grid
$w.from.head_r
$w.from.head_m
-sticky w
2132 set all_trackings
[all_tracking_branches
]
2133 if {$all_trackings ne
{}} {
2134 set create_branch_trackinghead
[lindex
$all_trackings 0]
2135 radiobutton
$w.from.tracking_r \
2136 -text {Tracking Branch
:} \
2138 -variable create_branch_revtype \
2140 set tbranchm
[eval tk_optionMenu
$w.from.tracking_m \
2141 create_branch_trackinghead \
2143 $tbranchm configure
-font font_ui
2144 $w.from.tracking_m configure
-font font_ui
2145 grid
$w.from.tracking_r
$w.from.tracking_m
-sticky w
2147 set all_tags
[load_all_tags
]
2148 if {$all_tags ne
{}} {
2149 set create_branch_tag
[lindex
$all_tags 0]
2150 radiobutton
$w.from.tag_r \
2153 -variable create_branch_revtype \
2155 set tagsm
[eval tk_optionMenu
$w.from.tag_m \
2158 $tagsm configure
-font font_ui
2159 $w.from.tag_m configure
-font font_ui
2160 grid
$w.from.tag_r
$w.from.tag_m
-sticky w
2162 radiobutton
$w.from.exp_r \
2163 -text {Revision Expression
:} \
2165 -variable create_branch_revtype \
2167 entry
$w.from.exp_t \
2171 -textvariable create_branch_revexp \
2175 if {%d
== 1 && [regexp
{\s
} %S
]} {return 0}
2176 if {%d
== 1 && [string length
%S
] > 0} {
2177 set create_branch_revtype expression
2181 grid
$w.from.exp_r
$w.from.exp_t
-sticky we
-padx {0 5}
2182 grid columnconfigure
$w.from
1 -weight 1
2183 pack
$w.from
-anchor nw
-fill x
-pady 5 -padx 5
2185 labelframe
$w.postActions \
2186 -text {Post Creation Actions
} \
2188 checkbutton
$w.postActions.checkout \
2189 -text {Checkout after creation
} \
2190 -variable create_branch_checkout \
2192 pack
$w.postActions.checkout
-anchor nw
2193 pack
$w.postActions
-anchor nw
-fill x
-pady 5 -padx 5
2195 set create_branch_checkout
1
2196 set create_branch_head
$current_branch
2197 set create_branch_revtype
head
2198 set create_branch_name
$repo_config(gui.newbranchtemplate
)
2199 set create_branch_revexp
{}
2201 bind $w <Visibility
> "
2203 $w.desc.name_t icursor end
2204 focus $w.desc.name_t
2206 bind $w <Key-Escape
> "destroy $w"
2207 bind $w <Key-Return
> "do_create_branch_action $w;break"
2208 wm title
$w "[appname] ([reponame]): Create Branch"
2212 proc do_delete_branch_action
{w
} {
2214 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2217 switch
-- $delete_branch_checktype {
2218 head {set check_rev
$delete_branch_head}
2219 tracking
{set check_rev
$delete_branch_trackinghead}
2220 always
{set check_rev
{:none
}}
2222 if {$check_rev eq
{:none
}} {
2224 } elseif
{[catch
{set check_cmt
[git rev-parse
--verify "${check_rev}^0"]}]} {
2228 -title [wm title
$w] \
2230 -message "Invalid check revision: $check_rev"
2234 set to_delete
[list
]
2235 set not_merged
[list
]
2236 foreach i
[$w.list.l curselection
] {
2237 set b
[$w.list.l get
$i]
2238 if {[catch
{set o
[git rev-parse
--verify $b]}]} continue
2239 if {$check_cmt ne
{}} {
2240 if {$b eq
$check_rev} continue
2241 if {[catch
{set m
[git merge-base
$o $check_cmt]}]} continue
2243 lappend not_merged
$b
2247 lappend to_delete
[list
$b $o]
2249 if {$not_merged ne
{}} {
2250 set msg
"The following branches are not completely merged into $check_rev:
2252 - [join $not_merged "\n - "]"
2256 -title [wm title
$w] \
2260 if {$to_delete eq
{}} return
2261 if {$delete_branch_checktype eq
{always
}} {
2262 set msg
{Recovering deleted branches is difficult.
2264 Delete the selected branches?
}
2265 if {[tk_messageBox \
2268 -title [wm title
$w] \
2270 -message $msg] ne
yes} {
2276 foreach i
$to_delete {
2279 if {[catch
{git update-ref
-d "refs/heads/$b" $o} err
]} {
2280 append failed
" - $b: $err\n"
2282 set x
[lsearch
-sorted -exact $all_heads $b]
2284 set all_heads
[lreplace
$all_heads $x $x]
2289 if {$failed ne
{}} {
2293 -title [wm title
$w] \
2295 -message "Failed to delete branches:\n$failed"
2298 set all_heads
[lsort
$all_heads]
2299 populate_branch_menu
2303 proc do_delete_branch
{} {
2304 global all_heads tracking_branches current_branch
2305 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2307 set w .branch_editor
2309 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2311 label
$w.header
-text {Delete Local Branch
} \
2313 pack
$w.header
-side top
-fill x
2316 button
$w.buttons.create
-text Delete \
2318 -command [list do_delete_branch_action
$w]
2319 pack
$w.buttons.create
-side right
2320 button
$w.buttons.cancel
-text {Cancel
} \
2322 -command [list destroy
$w]
2323 pack
$w.buttons.cancel
-side right
-padx 5
2324 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2326 labelframe
$w.list \
2327 -text {Local Branches
} \
2332 -selectmode extended \
2333 -yscrollcommand [list
$w.list.sby
set] \
2335 foreach h
$all_heads {
2336 if {$h ne
$current_branch} {
2337 $w.list.l insert end
$h
2340 scrollbar
$w.list.sby
-command [list
$w.list.l yview
]
2341 pack
$w.list.sby
-side right
-fill y
2342 pack
$w.list.l
-side left
-fill both
-expand 1
2343 pack
$w.list
-fill both
-expand 1 -pady 5 -padx 5
2345 labelframe
$w.validate \
2346 -text {Delete Only If
} \
2348 radiobutton
$w.validate.head_r \
2349 -text {Merged Into Local Branch
:} \
2351 -variable delete_branch_checktype \
2353 set mergedlocalm
[eval tk_optionMenu
$w.validate.head_m \
2354 delete_branch_head \
2356 $mergedlocalm configure
-font font_ui
2357 $w.validate.head_m configure
-font font_ui
2358 grid
$w.validate.head_r
$w.validate.head_m
-sticky w
2359 set all_trackings
[all_tracking_branches
]
2360 if {$all_trackings ne
{}} {
2361 set delete_branch_trackinghead
[lindex
$all_trackings 0]
2362 radiobutton
$w.validate.tracking_r \
2363 -text {Merged Into Tracking Branch
:} \
2365 -variable delete_branch_checktype \
2367 set mergedtrackm
[eval tk_optionMenu
$w.validate.tracking_m \
2368 delete_branch_trackinghead \
2370 $mergedtrackm configure
-font font_ui
2371 $w.validate.tracking_m configure
-font font_ui
2372 grid
$w.validate.tracking_r
$w.validate.tracking_m
-sticky w
2374 radiobutton
$w.validate.always_r \
2375 -text {Always
(Do not perform merge checks
)} \
2377 -variable delete_branch_checktype \
2379 grid
$w.validate.always_r
-columnspan 2 -sticky w
2380 grid columnconfigure
$w.validate
1 -weight 1
2381 pack
$w.validate
-anchor nw
-fill x
-pady 5 -padx 5
2383 set delete_branch_head
$current_branch
2384 set delete_branch_checktype
head
2386 bind $w <Visibility
> "grab $w; focus $w"
2387 bind $w <Key-Escape
> "destroy $w"
2388 wm title
$w "[appname] ([reponame]): Delete Branch"
2392 proc switch_branch
{new_branch
} {
2393 global HEAD commit_type current_branch repo_config
2395 if {![lock_index switch
]} return
2397 # -- Our in memory state should match the repository.
2399 repository_state curType curHEAD curMERGE_HEAD
2400 if {[string match amend
* $commit_type]
2401 && $curType eq
{normal
}
2402 && $curHEAD eq
$HEAD} {
2403 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
2404 info_popup
{Last scanned state does not match repository state.
2406 Another Git program has modified this repository
2407 since the last scan. A rescan must be performed
2408 before the current branch can be changed.
2410 The rescan will be automatically started now.
2413 rescan
{set ui_status_value
{Ready.
}}
2417 # -- Don't do a pointless switch.
2419 if {$current_branch eq
$new_branch} {
2424 if {$repo_config(gui.trustmtime
) eq
{true
}} {
2425 switch_branch_stage2
{} $new_branch
2427 set ui_status_value
{Refreshing
file status...
}
2428 set cmd
[list git update-index
]
2430 lappend cmd
--unmerged
2431 lappend cmd
--ignore-missing
2432 lappend cmd
--refresh
2433 set fd_rf
[open
"| $cmd" r
]
2434 fconfigure
$fd_rf -blocking 0 -translation binary
2435 fileevent
$fd_rf readable \
2436 [list switch_branch_stage2
$fd_rf $new_branch]
2440 proc switch_branch_stage2
{fd_rf new_branch
} {
2441 global ui_status_value HEAD
2445 if {![eof
$fd_rf]} return
2449 set ui_status_value
"Updating working directory to '$new_branch'..."
2450 set cmd
[list git read-tree
]
2453 lappend cmd
--exclude-per-directory=.gitignore
2455 lappend cmd
$new_branch
2456 set fd_rt
[open
"| $cmd" r
]
2457 fconfigure
$fd_rt -blocking 0 -translation binary
2458 fileevent
$fd_rt readable \
2459 [list switch_branch_readtree_wait
$fd_rt $new_branch]
2462 proc switch_branch_readtree_wait
{fd_rt new_branch
} {
2463 global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
2464 global current_branch
2465 global ui_comm ui_status_value
2467 # -- We never get interesting output on stdout; only stderr.
2470 fconfigure
$fd_rt -blocking 1
2471 if {![eof
$fd_rt]} {
2472 fconfigure
$fd_rt -blocking 0
2476 # -- The working directory wasn't in sync with the index and
2477 # we'd have to overwrite something to make the switch. A
2478 # merge is required.
2480 if {[catch
{close
$fd_rt} err
]} {
2481 regsub
{^fatal
: } $err {} err
2482 warn_popup
"File level merge required.
2486 Staying on branch '$current_branch'."
2487 set ui_status_value
"Aborted checkout of '$new_branch' (file level merging is required)."
2492 # -- Update the symbolic ref. Core git doesn't even check for failure
2493 # here, it Just Works(tm). If it doesn't we are in some really ugly
2494 # state that is difficult to recover from within git-gui.
2496 if {[catch
{git symbolic-ref HEAD
"refs/heads/$new_branch"} err
]} {
2497 error_popup
"Failed to set current branch.
2499 This working directory is only partially switched.
2500 We successfully updated your files, but failed to
2501 update an internal Git file.
2503 This should not have occurred. [appname] will now
2511 # -- Update our repository state. If we were previously in amend mode
2512 # we need to toss the current buffer and do a full rescan to update
2513 # our file lists. If we weren't in amend mode our file lists are
2514 # accurate and we can avoid the rescan.
2517 set selected_commit_type new
2518 if {[string match amend
* $commit_type]} {
2519 $ui_comm delete
0.0 end
2521 $ui_comm edit modified false
2522 rescan
{set ui_status_value
"Checked out branch '$current_branch'."}
2524 repository_state commit_type HEAD MERGE_HEAD
2526 set ui_status_value
"Checked out branch '$current_branch'."
2530 ######################################################################
2532 ## remote management
2534 proc load_all_remotes
{} {
2536 global all_remotes tracking_branches
2538 set all_remotes
[list
]
2539 array
unset tracking_branches
2541 set rm_dir
[gitdir remotes
]
2542 if {[file isdirectory
$rm_dir]} {
2543 set all_remotes
[glob \
2547 -directory $rm_dir *]
2549 foreach name
$all_remotes {
2551 set fd
[open
[file join $rm_dir $name] r
]
2552 while {[gets
$fd line
] >= 0} {
2553 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
2554 $line line src dst
]} continue
2555 if {![regexp ^refs
/ $dst]} {
2556 set dst
"refs/heads/$dst"
2558 set tracking_branches
($dst) [list
$name $src]
2565 foreach line
[array names repo_config remote.
*.url
] {
2566 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
2567 lappend all_remotes
$name
2569 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
2573 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
2574 if {![regexp ^refs
/ $dst]} {
2575 set dst
"refs/heads/$dst"
2577 set tracking_branches
($dst) [list
$name $src]
2581 set all_remotes
[lsort
-unique $all_remotes]
2584 proc populate_fetch_menu
{} {
2585 global all_remotes repo_config
2588 foreach r
$all_remotes {
2590 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2591 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
2596 set fd
[open
[gitdir remotes
$r] r
]
2597 while {[gets
$fd n
] >= 0} {
2598 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
2609 -label "Fetch from $r..." \
2610 -command [list fetch_from
$r] \
2616 proc populate_push_menu
{} {
2617 global all_remotes repo_config
2621 foreach r
$all_remotes {
2623 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2624 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
2629 set fd
[open
[gitdir remotes
$r] r
]
2630 while {[gets
$fd n
] >= 0} {
2631 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
2645 -label "Push to $r..." \
2646 -command [list push_to
$r] \
2653 proc start_push_anywhere_action
{w
} {
2654 global push_urltype push_remote push_url push_thin push_tags
2657 switch
-- $push_urltype {
2658 remote
{set r_url
$push_remote}
2659 url
{set r_url
$push_url}
2661 if {$r_url eq
{}} return
2663 set cmd
[list git push
]
2673 foreach i
[$w.
source.l curselection
] {
2674 set b
[$w.
source.l get
$i]
2675 lappend cmd
"refs/heads/$b:refs/heads/$b"
2680 } elseif
{$cnt == 1} {
2686 set cons
[new_console
"push $r_url" "Pushing $cnt $unit to $r_url"]
2687 console_exec
$cons $cmd console_done
2691 trace add variable push_remote
write \
2692 [list radio_selector push_urltype remote
]
2694 proc do_push_anywhere
{} {
2695 global all_heads all_remotes current_branch
2696 global push_urltype push_remote push_url push_thin push_tags
2700 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2702 label
$w.header
-text {Push Branches
} -font font_uibold
2703 pack
$w.header
-side top
-fill x
2706 button
$w.buttons.create
-text Push \
2709 -command [list start_push_anywhere_action
$w]
2710 pack
$w.buttons.create
-side right
2711 button
$w.buttons.cancel
-text {Cancel
} \
2714 -command [list destroy
$w]
2715 pack
$w.buttons.cancel
-side right
-padx 5
2716 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2718 labelframe
$w.
source \
2719 -text {Source Branches
} \
2721 listbox
$w.
source.l \
2724 -selectmode extended \
2725 -yscrollcommand [list
$w.
source.sby
set] \
2727 foreach h
$all_heads {
2728 $w.
source.l insert end
$h
2729 if {$h eq
$current_branch} {
2730 $w.
source.l
select set end
2733 scrollbar
$w.
source.sby
-command [list
$w.
source.l yview
]
2734 pack
$w.
source.sby
-side right
-fill y
2735 pack
$w.
source.l
-side left
-fill both
-expand 1
2736 pack
$w.
source -fill both
-expand 1 -pady 5 -padx 5
2738 labelframe
$w.dest \
2739 -text {Destination Repository
} \
2741 if {$all_remotes ne
{}} {
2742 radiobutton
$w.dest.remote_r \
2745 -variable push_urltype \
2747 set remmenu
[eval tk_optionMenu
$w.dest.remote_m push_remote \
2749 $remmenu configure
-font font_ui
2750 $w.dest.remote_m configure
-font font_ui
2751 grid
$w.dest.remote_r
$w.dest.remote_m
-sticky w
2752 if {[lsearch
-sorted -exact $all_remotes origin
] != -1} {
2753 set push_remote origin
2755 set push_remote
[lindex
$all_remotes 0]
2757 set push_urltype remote
2759 set push_urltype url
2761 radiobutton
$w.dest.url_r \
2762 -text {Arbitrary URL
:} \
2764 -variable push_urltype \
2766 entry
$w.dest.url_t \
2770 -textvariable push_url \
2774 if {%d
== 1 && [regexp
{\s
} %S
]} {return 0}
2775 if {%d
== 1 && [string length
%S
] > 0} {
2776 set push_urltype url
2780 grid
$w.dest.url_r
$w.dest.url_t
-sticky we
-padx {0 5}
2781 grid columnconfigure
$w.dest
1 -weight 1
2782 pack
$w.dest
-anchor nw
-fill x
-pady 5 -padx 5
2784 labelframe
$w.options \
2785 -text {Transfer Options
} \
2787 checkbutton
$w.options.thin \
2788 -text {Use thin pack
(for slow network connections
)} \
2789 -variable push_thin \
2791 grid
$w.options.thin
-columnspan 2 -sticky w
2792 checkbutton
$w.options.tags \
2793 -text {Include tags
} \
2794 -variable push_tags \
2796 grid
$w.options.tags
-columnspan 2 -sticky w
2797 grid columnconfigure
$w.options
1 -weight 1
2798 pack
$w.options
-anchor nw
-fill x
-pady 5 -padx 5
2804 bind $w <Visibility
> "grab $w; focus $w.buttons.create"
2805 bind $w <Key-Escape
> "destroy $w"
2806 wm title
$w "[appname] ([reponame]): Push"
2810 ######################################################################
2815 global HEAD commit_type file_states
2817 if {[string match amend
* $commit_type]} {
2818 info_popup
{Cannot merge
while amending.
2820 You must finish amending this commit before
2821 starting any
type of merge.
2826 if {[committer_ident
] eq
{}} {return 0}
2827 if {![lock_index merge
]} {return 0}
2829 # -- Our in memory state should match the repository.
2831 repository_state curType curHEAD curMERGE_HEAD
2832 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
2833 info_popup
{Last scanned state does not match repository state.
2835 Another Git program has modified this repository
2836 since the last scan. A rescan must be performed
2837 before a merge can be performed.
2839 The rescan will be automatically started now.
2842 rescan
{set ui_status_value
{Ready.
}}
2846 foreach path
[array names file_states
] {
2847 switch
-glob -- [lindex
$file_states($path) 0] {
2849 continue; # and pray it works!
2852 error_popup
"You are in the middle of a conflicted merge.
2854 File [short_path $path] has merge conflicts.
2856 You must resolve them, add the file, and commit to
2857 complete the current merge. Only then can you
2858 begin another merge.
2864 error_popup
"You are in the middle of a change.
2866 File [short_path $path] is modified.
2868 You should complete the current commit before
2869 starting a merge. Doing so will help you abort
2870 a failed merge, should the need arise.
2881 proc visualize_local_merge
{w
} {
2883 foreach i
[$w.
source.l curselection
] {
2884 lappend revs
[$w.
source.l get
$i]
2886 if {$revs eq
{}} return
2887 lappend revs
--not HEAD
2891 proc start_local_merge_action
{w
} {
2892 global HEAD ui_status_value current_branch
2894 set cmd
[list git merge
]
2897 foreach i
[$w.
source.l curselection
] {
2898 set b
[$w.
source.l get
$i]
2906 } elseif
{$revcnt == 1} {
2908 } elseif
{$revcnt <= 15} {
2914 -title [wm title
$w] \
2916 -message "Too many branches selected.
2918 You have requested to merge $revcnt branches
2919 in an octopus merge. This exceeds Git's
2920 internal limit of 15 branches per merge.
2922 Please select fewer branches. To merge more
2923 than 15 branches, merge the branches in batches.
2928 set msg
"Merging $current_branch, [join $names {, }]"
2929 set ui_status_value
"$msg..."
2930 set cons
[new_console
"Merge" $msg]
2931 console_exec
$cons $cmd [list finish_merge
$revcnt]
2932 bind $w <Destroy
> {}
2936 proc finish_merge
{revcnt w ok
} {
2939 set msg
{Merge completed successfully.
}
2942 info_popup
"Octopus merge failed.
2944 Your merge of $revcnt branches has failed.
2946 There are file-level conflicts between the
2947 branches which must be resolved manually.
2949 The working directory will now be reset.
2951 You can attempt this merge again
2952 by merging only one branch at a time." $w
2954 set fd
[open
"| git read-tree --reset -u HEAD" r
]
2955 fconfigure
$fd -blocking 0 -translation binary
2956 fileevent
$fd readable
[list reset_hard_wait
$fd]
2957 set ui_status_value
{Aborting... please
wait...
}
2961 set msg
{Merge failed. Conflict resolution is required.
}
2964 rescan
[list
set ui_status_value
$msg]
2967 proc do_local_merge
{} {
2968 global current_branch
2970 if {![can_merge
]} return
2974 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2977 -text "Merge Into $current_branch" \
2979 pack
$w.header
-side top
-fill x
2982 button
$w.buttons.visualize
-text Visualize \
2984 -command [list visualize_local_merge
$w]
2985 pack
$w.buttons.visualize
-side left
2986 button
$w.buttons.create
-text Merge \
2988 -command [list start_local_merge_action
$w]
2989 pack
$w.buttons.create
-side right
2990 button
$w.buttons.cancel
-text {Cancel
} \
2992 -command [list destroy
$w]
2993 pack
$w.buttons.cancel
-side right
-padx 5
2994 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2996 labelframe
$w.
source \
2997 -text {Source Branches
} \
2999 listbox
$w.
source.l \
3002 -selectmode extended \
3003 -yscrollcommand [list
$w.
source.sby
set] \
3005 scrollbar
$w.
source.sby
-command [list
$w.
source.l yview
]
3006 pack
$w.
source.sby
-side right
-fill y
3007 pack
$w.
source.l
-side left
-fill both
-expand 1
3008 pack
$w.
source -fill both
-expand 1 -pady 5 -padx 5
3010 set cmd
[list git for-each-ref
]
3011 lappend cmd
{--format=%(objectname
) %(*objectname
) %(refname
)}
3012 lappend cmd refs
/heads
3013 lappend cmd refs
/remotes
3014 lappend cmd refs
/tags
3015 set fr_fd
[open
"| $cmd" r
]
3016 fconfigure
$fr_fd -translation binary
3017 while {[gets
$fr_fd line
] > 0} {
3018 set line
[split $line { }]
3019 set sha1
([lindex
$line 0]) [lindex
$line 2]
3020 set sha1
([lindex
$line 1]) [lindex
$line 2]
3025 set fr_fd
[open
"| git rev-list --all --not HEAD"]
3026 while {[gets
$fr_fd line
] > 0} {
3027 if {[catch
{set ref
$sha1($line)}]} continue
3028 regsub ^refs
/(heads|remotes|tags
)/ $ref {} ref
3029 lappend to_show
$ref
3033 foreach ref
[lsort
-unique $to_show] {
3034 $w.
source.l insert end
$ref
3037 bind $w <Visibility
> "grab $w"
3038 bind $w <Key-Escape
> "unlock_index;destroy $w"
3039 bind $w <Destroy
> unlock_index
3040 wm title
$w "[appname] ([reponame]): Merge"
3044 proc do_reset_hard
{} {
3045 global HEAD commit_type file_states
3047 if {[string match amend
* $commit_type]} {
3048 info_popup
{Cannot abort
while amending.
3050 You must finish amending this commit.
3055 if {![lock_index abort
]} return
3057 if {[string match
*merge
* $commit_type]} {
3063 if {[ask_popup
"Abort $op?
3065 Aborting the current $op will cause
3066 *ALL* uncommitted changes to be lost.
3068 Continue with aborting the current $op?"] eq
{yes}} {
3069 set fd
[open
"| git read-tree --reset -u HEAD" r
]
3070 fconfigure
$fd -blocking 0 -translation binary
3071 fileevent
$fd readable
[list reset_hard_wait
$fd]
3072 set ui_status_value
{Aborting... please
wait...
}
3078 proc reset_hard_wait
{fd
} {
3086 $ui_comm delete
0.0 end
3087 $ui_comm edit modified false
3089 catch
{file delete
[gitdir MERGE_HEAD
]}
3090 catch
{file delete
[gitdir rr-cache MERGE_RR
]}
3091 catch
{file delete
[gitdir SQUASH_MSG
]}
3092 catch
{file delete
[gitdir MERGE_MSG
]}
3093 catch
{file delete
[gitdir GITGUI_MSG
]}
3095 rescan
{set ui_status_value
{Abort completed. Ready.
}}
3099 ######################################################################
3103 set next_browser_id
0
3105 proc new_browser
{commit
} {
3106 global next_browser_id cursor_ptr M1B
3107 global browser_commit browser_status browser_stack browser_path browser_busy
3109 if {[winfo ismapped .
]} {
3110 set w .browser
[incr next_browser_id
]
3117 set w_list
$w.list.l
3118 set browser_commit
($w_list) $commit
3119 set browser_status
($w_list) {Starting...
}
3120 set browser_stack
($w_list) {}
3121 set browser_path
($w_list) $browser_commit($w_list):
3122 set browser_busy
($w_list) 1
3124 label
$w.path
-textvariable browser_path
($w_list) \
3130 pack
$w.path
-anchor w
-side top
-fill x
3133 text
$w_list -background white
-borderwidth 0 \
3134 -cursor $cursor_ptr \
3139 -xscrollcommand [list
$w.list.sbx
set] \
3140 -yscrollcommand [list
$w.list.sby
set] \
3142 $w_list tag conf in_sel \
3143 -background [$w_list cget
-foreground] \
3144 -foreground [$w_list cget
-background]
3145 scrollbar
$w.list.sbx
-orient h
-command [list
$w_list xview
]
3146 scrollbar
$w.list.sby
-orient v
-command [list
$w_list yview
]
3147 pack
$w.list.sbx
-side bottom
-fill x
3148 pack
$w.list.sby
-side right
-fill y
3149 pack
$w_list -side left
-fill both
-expand 1
3150 pack
$w.list
-side top
-fill both
-expand 1
3152 label
$w.status
-textvariable browser_status
($w_list) \
3158 pack
$w.status
-anchor w
-side bottom
-fill x
3160 bind $w_list <Button-1
> "browser_click 0 $w_list @%x,%y;break"
3161 bind $w_list <Double-Button-1
> "browser_click 1 $w_list @%x,%y;break"
3162 bind $w_list <$M1B-Up> "browser_parent $w_list;break"
3163 bind $w_list <$M1B-Left> "browser_parent $w_list;break"
3164 bind $w_list <Up
> "browser_move -1 $w_list;break"
3165 bind $w_list <Down
> "browser_move 1 $w_list;break"
3166 bind $w_list <$M1B-Right> "browser_enter $w_list;break"
3167 bind $w_list <Return
> "browser_enter $w_list;break"
3168 bind $w_list <Prior
> "browser_page -1 $w_list;break"
3169 bind $w_list <Next
> "browser_page 1 $w_list;break"
3170 bind $w_list <Left
> break
3171 bind $w_list <Right
> break
3173 bind $tl <Visibility
> "focus $w"
3174 bind $tl <Destroy
> "
3175 array unset browser_buffer $w_list
3176 array unset browser_files $w_list
3177 array unset browser_status $w_list
3178 array unset browser_stack $w_list
3179 array unset browser_path $w_list
3180 array unset browser_commit $w_list
3181 array unset browser_busy $w_list
3183 wm title
$tl "[appname] ([reponame]): File Browser"
3184 ls_tree
$w_list $browser_commit($w_list) {}
3187 proc browser_move
{dir w
} {
3188 global browser_files browser_busy
3190 if {$browser_busy($w)} return
3191 set lno
[lindex
[split [$w index in_sel.first
] .
] 0]
3193 if {[lindex
$browser_files($w) [expr {$lno - 1}]] ne
{}} {
3194 $w tag remove in_sel
0.0 end
3195 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
3200 proc browser_page
{dir w
} {
3201 global browser_files browser_busy
3203 if {$browser_busy($w)} return
3204 $w yview scroll
$dir pages
3206 [lindex
[$w yview
] 0]
3207 * [llength
$browser_files($w)]
3209 if {[lindex
$browser_files($w) [expr {$lno - 1}]] ne
{}} {
3210 $w tag remove in_sel
0.0 end
3211 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
3216 proc browser_parent
{w
} {
3217 global browser_files browser_status browser_path
3218 global browser_stack browser_busy
3220 if {$browser_busy($w)} return
3221 set info
[lindex
$browser_files($w) 0]
3222 if {[lindex
$info 0] eq
{parent
}} {
3223 set parent
[lindex
$browser_stack($w) end-1
]
3224 set browser_stack
($w) [lrange
$browser_stack($w) 0 end-2
]
3225 if {$browser_stack($w) eq
{}} {
3226 regsub
{:.
*$
} $browser_path($w) {:} browser_path
($w)
3228 regsub
{/[^
/]+$
} $browser_path($w) {} browser_path
($w)
3230 set browser_status
($w) "Loading $browser_path($w)..."
3231 ls_tree
$w [lindex
$parent 0] [lindex
$parent 1]
3235 proc browser_enter
{w
} {
3236 global browser_files browser_status browser_path
3237 global browser_commit browser_stack browser_busy
3239 if {$browser_busy($w)} return
3240 set lno
[lindex
[split [$w index in_sel.first
] .
] 0]
3241 set info
[lindex
$browser_files($w) [expr {$lno - 1}]]
3243 switch
-- [lindex
$info 0] {
3248 set name
[lindex
$info 2]
3249 set escn
[escape_path
$name]
3250 set browser_status
($w) "Loading $escn..."
3251 append browser_path
($w) $escn
3252 ls_tree
$w [lindex
$info 1] $name
3255 set name
[lindex
$info 2]
3257 foreach n
$browser_stack($w) {
3258 append p
[lindex
$n 1]
3261 show_blame
$browser_commit($w) $p
3267 proc browser_click
{was_double_click w pos
} {
3268 global browser_files browser_busy
3270 if {$browser_busy($w)} return
3271 set lno
[lindex
[split [$w index
$pos] .
] 0]
3274 if {[lindex
$browser_files($w) [expr {$lno - 1}]] ne
{}} {
3275 $w tag remove in_sel
0.0 end
3276 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
3277 if {$was_double_click} {
3283 proc ls_tree
{w tree_id name
} {
3284 global browser_buffer browser_files browser_stack browser_busy
3286 set browser_buffer
($w) {}
3287 set browser_files
($w) {}
3288 set browser_busy
($w) 1
3290 $w conf
-state normal
3291 $w tag remove in_sel
0.0 end
3293 if {$browser_stack($w) ne
{}} {
3294 $w image create end \
3295 -align center
-padx 5 -pady 1 \
3298 $w insert end
{[Up To Parent
]}
3299 lappend browser_files
($w) parent
3301 lappend browser_stack
($w) [list
$tree_id $name]
3302 $w conf
-state disabled
3304 set cmd
[list git ls-tree
-z $tree_id]
3305 set fd
[open
"| $cmd" r
]
3306 fconfigure
$fd -blocking 0 -translation binary
-encoding binary
3307 fileevent
$fd readable
[list read_ls_tree
$fd $w]
3310 proc read_ls_tree
{fd w
} {
3311 global browser_buffer browser_files browser_status browser_busy
3313 if {![winfo exists
$w]} {
3318 append browser_buffer
($w) [read $fd]
3319 set pck
[split $browser_buffer($w) "\0"]
3320 set browser_buffer
($w) [lindex
$pck end
]
3322 set n
[llength
$browser_files($w)]
3323 $w conf
-state normal
3324 foreach p
[lrange
$pck 0 end-1
] {
3325 set info
[split $p "\t"]
3326 set path
[lindex
$info 1]
3327 set info
[split [lindex
$info 0] { }]
3328 set type [lindex
$info 1]
3329 set object
[lindex
$info 2]
3340 set image file_question
3344 if {$n > 0} {$w insert end
"\n"}
3345 $w image create end \
3346 -align center
-padx 5 -pady 1 \
3347 -name icon
[incr n
] \
3349 $w insert end
[escape_path
$path]
3350 lappend browser_files
($w) [list
$type $object $path]
3352 $w conf
-state disabled
3356 set browser_status
($w) Ready.
3357 set browser_busy
($w) 0
3358 array
unset browser_buffer
$w
3360 $w tag add in_sel
1.0 2.0
3366 proc show_blame
{commit path
} {
3367 global next_browser_id blame_status blame_data
3369 if {[winfo ismapped .
]} {
3370 set w .browser
[incr next_browser_id
]
3377 set blame_status
($w) {Loading current
file content...
}
3379 label
$w.path
-text "$commit:$path" \
3385 pack
$w.path
-side top
-fill x
3388 text
$w.out.loaded_t \
3389 -background white
-borderwidth 0 \
3395 $w.out.loaded_t tag conf annotated
-background grey
3397 text
$w.out.linenumber_t \
3398 -background white
-borderwidth 0 \
3404 $w.out.linenumber_t tag conf linenumber
-justify right
3406 text
$w.out.file_t \
3407 -background white
-borderwidth 0 \
3412 -xscrollcommand [list
$w.out.sbx
set] \
3415 scrollbar
$w.out.sbx
-orient h
-command [list
$w.out.file_t xview
]
3416 scrollbar
$w.out.sby
-orient v \
3417 -command [list scrollbar2many
[list \
3419 $w.out.linenumber_t \
3423 $w.out.linenumber_t \
3428 grid conf
$w.out.sbx
-column 2 -sticky we
3429 grid columnconfigure
$w.out
2 -weight 1
3430 grid rowconfigure
$w.out
0 -weight 1
3431 pack
$w.out
-fill both
-expand 1
3433 label
$w.status
-textvariable blame_status
($w) \
3439 pack
$w.status
-side bottom
-fill x
3443 -background white
-borderwidth 0 \
3448 -xscrollcommand [list
$w.cm.sbx
set] \
3449 -yscrollcommand [list
$w.cm.sby
set] \
3451 scrollbar
$w.cm.sbx
-orient h
-command [list
$w.cm.t xview
]
3452 scrollbar
$w.cm.sby
-orient v
-command [list
$w.cm.t yview
]
3453 pack
$w.cm.sby
-side right
-fill y
3454 pack
$w.cm.sbx
-side bottom
-fill x
3455 pack
$w.cm.t
-expand 1 -fill both
3456 pack
$w.cm
-side bottom
-fill x
3458 menu
$w.ctxm
-tearoff 0
3459 $w.ctxm add
command -label "Copy Commit" \
3461 -command "blame_copycommit $w \$cursorW @\$cursorX,\$cursorY"
3465 $w.out.linenumber_t \
3467 $i tag conf in_sel \
3468 -background [$i cget
-foreground] \
3469 -foreground [$i cget
-background]
3470 $i conf
-yscrollcommand \
3471 [list many2scrollbar
[list \
3473 $w.out.linenumber_t \
3476 bind $i <Button-1
> "
3479 $w.out.linenumber_t \\
3488 tk_popup $w.ctxm %X %Y
3492 bind $w.cm.t
<Button-1
> "focus $w.cm.t"
3493 bind $tl <Visibility
> "focus $tl"
3494 bind $tl <Destroy
> "
3495 array unset blame_status {$w}
3496 array unset blame_data $w,*
3498 wm title
$tl "[appname] ([reponame]): File Viewer"
3500 set blame_data
($w,commit_count
) 0
3501 set blame_data
($w,commit_list
) {}
3502 set blame_data
($w,total_lines
) 0
3503 set blame_data
($w,blame_lines
) 0
3504 set blame_data
($w,highlight_commit
) {}
3505 set blame_data
($w,highlight_line
) -1
3507 set cmd
[list git cat-file blob
"$commit:$path"]
3508 set fd
[open
"| $cmd" r
]
3509 fconfigure
$fd -blocking 0 -translation lf
-encoding binary
3510 fileevent
$fd readable
[list read_blame_catfile \
3511 $fd $w $commit $path \
3512 $w.cm.t
$w.out.loaded_t
$w.out.linenumber_t
$w.out.file_t
]
3515 proc read_blame_catfile
{fd w commit path w_cmit w_load w_line w_file
} {
3516 global blame_status blame_data
3518 if {![winfo exists
$w_file]} {
3523 set n
$blame_data($w,total_lines
)
3524 $w_load conf
-state normal
3525 $w_line conf
-state normal
3526 $w_file conf
-state normal
3527 while {[gets
$fd line
] >= 0} {
3528 regsub
"\r\$" $line {} line
3530 $w_load insert end
"\n"
3531 $w_line insert end
"$n\n" linenumber
3532 $w_file insert end
"$line\n"
3534 $w_load conf
-state disabled
3535 $w_line conf
-state disabled
3536 $w_file conf
-state disabled
3537 set blame_data
($w,total_lines
) $n
3541 blame_incremental_status
$w
3542 set cmd
[list git blame
-M -C --incremental]
3543 lappend cmd
$commit -- $path
3544 set fd
[open
"| $cmd" r
]
3545 fconfigure
$fd -blocking 0 -translation lf
-encoding binary
3546 fileevent
$fd readable
[list read_blame_incremental
$fd $w \
3547 $w_load $w_cmit $w_line $w_file]
3551 proc read_blame_incremental
{fd w w_load w_cmit w_line w_file
} {
3552 global blame_status blame_data
3554 if {![winfo exists
$w_file]} {
3559 while {[gets
$fd line
] >= 0} {
3560 if {[regexp
{^
([a-z0-9
]{40}) (\d
+) (\d
+) (\d
+)$
} $line line \
3561 cmit original_line final_line line_count
]} {
3562 set blame_data
($w,commit
) $cmit
3563 set blame_data
($w,original_line
) $original_line
3564 set blame_data
($w,final_line
) $final_line
3565 set blame_data
($w,line_count
) $line_count
3567 if {[catch
{set g
$blame_data($w,$cmit,order
)}]} {
3568 $w_line tag conf g
$cmit
3569 $w_file tag conf g
$cmit
3570 $w_line tag raise in_sel
3571 $w_file tag raise in_sel
3572 $w_file tag raise sel
3573 set blame_data
($w,$cmit,order
) $blame_data($w,commit_count
)
3574 incr blame_data
($w,commit_count
)
3575 lappend blame_data
($w,commit_list
) $cmit
3577 } elseif
{[string match
{filename
*} $line]} {
3578 set file [string range
$line 9 end
]
3579 set n
$blame_data($w,line_count
)
3580 set lno
$blame_data($w,final_line
)
3581 set cmit
$blame_data($w,commit
)
3584 if {[catch
{set g g
$blame_data($w,line
$lno,commit
)}]} {
3585 $w_load tag add annotated
$lno.0 "$lno.0 lineend + 1c"
3587 $w_line tag remove g
$g $lno.0 "$lno.0 lineend + 1c"
3588 $w_file tag remove g
$g $lno.0 "$lno.0 lineend + 1c"
3591 set blame_data
($w,line
$lno,commit
) $cmit
3592 set blame_data
($w,line
$lno,file) $file
3593 $w_line tag add g
$cmit $lno.0 "$lno.0 lineend + 1c"
3594 $w_file tag add g
$cmit $lno.0 "$lno.0 lineend + 1c"
3596 if {$blame_data($w,highlight_line
) == -1} {
3597 if {[lindex
[$w_file yview
] 0] == 0} {
3599 blame_showcommit
$w $w_cmit $w_line $w_file $lno
3601 } elseif
{$blame_data($w,highlight_line
) == $lno} {
3602 blame_showcommit
$w $w_cmit $w_line $w_file $lno
3607 incr blame_data
($w,blame_lines
)
3610 set hc
$blame_data($w,highlight_commit
)
3612 && [expr {$blame_data($w,$hc,order
) + 1}]
3613 == $blame_data($w,$cmit,order
)} {
3614 blame_showcommit
$w $w_cmit $w_line $w_file \
3615 $blame_data($w,highlight_line
)
3617 } elseif
{[regexp
{^
([a-z-
]+) (.
*)$
} $line line header data
]} {
3618 set blame_data
($w,$blame_data($w,commit
),$header) $data
3624 set blame_status
($w) {Annotation complete.
}
3626 blame_incremental_status
$w
3630 proc blame_incremental_status
{w
} {
3631 global blame_status blame_data
3633 set blame_status
($w) [format \
3634 "Loading annotations... %i of %i lines annotated (%2i%%)" \
3635 $blame_data($w,blame_lines
) \
3636 $blame_data($w,total_lines
) \
3637 [expr {100 * $blame_data($w,blame_lines
)
3638 / $blame_data($w,total_lines
)}]]
3641 proc blame_click
{w w_cmit w_line w_file cur_w pos
} {
3642 set lno
[lindex
[split [$cur_w index
$pos] .
] 0]
3643 if {$lno eq
{}} return
3645 $w_line tag remove in_sel
0.0 end
3646 $w_file tag remove in_sel
0.0 end
3647 $w_line tag add in_sel
$lno.0 "$lno.0 + 1 line"
3648 $w_file tag add in_sel
$lno.0 "$lno.0 + 1 line"
3650 blame_showcommit
$w $w_cmit $w_line $w_file $lno
3659 proc blame_showcommit
{w w_cmit w_line w_file lno
} {
3660 global blame_colors blame_data repo_config
3662 set cmit
$blame_data($w,highlight_commit
)
3664 set idx
$blame_data($w,$cmit,order
)
3666 foreach c
$blame_colors {
3667 set h
[lindex
$blame_data($w,commit_list
) [expr {$idx - 1 + $i}]]
3668 $w_line tag conf g
$h -background white
3669 $w_file tag conf g
$h -background white
3674 $w_cmit conf
-state normal
3675 $w_cmit delete
0.0 end
3676 if {[catch
{set cmit
$blame_data($w,line
$lno,commit
)}]} {
3678 $w_cmit insert end
"Loading annotation..."
3680 set idx
$blame_data($w,$cmit,order
)
3682 foreach c
$blame_colors {
3683 set h
[lindex
$blame_data($w,commit_list
) [expr {$idx - 1 + $i}]]
3684 $w_line tag conf g
$h -background $c
3685 $w_file tag conf g
$h -background $c
3689 if {[catch
{set msg
$blame_data($w,$cmit,message
)}]} {
3692 set fd
[open
"| git cat-file commit $cmit" r
]
3693 fconfigure
$fd -encoding binary
-translation lf
3694 if {[catch
{set enc
$repo_config(i18n.commitencoding
)}]} {
3697 while {[gets
$fd line
] > 0} {
3698 if {[string match
{encoding
*} $line]} {
3699 set enc
[string tolower
[string range
$line 9 end
]]
3702 fconfigure
$fd -encoding $enc
3703 set msg
[string trim
[read $fd]]
3706 set blame_data
($w,$cmit,message
) $msg
3712 catch
{set author_name
$blame_data($w,$cmit,author
)}
3713 catch
{set author_email
$blame_data($w,$cmit,author-mail
)}
3714 catch
{set author_time
[clock format
$blame_data($w,$cmit,author-time
)]}
3716 set committer_name
{}
3717 set committer_email
{}
3718 set committer_time
{}
3719 catch
{set committer_name
$blame_data($w,$cmit,committer
)}
3720 catch
{set committer_email
$blame_data($w,$cmit,committer-mail
)}
3721 catch
{set committer_time
[clock format
$blame_data($w,$cmit,committer-time
)]}
3723 $w_cmit insert end
"commit $cmit\n"
3724 $w_cmit insert end
"Author: $author_name $author_email $author_time\n"
3725 $w_cmit insert end
"Committer: $committer_name $committer_email $committer_time\n"
3726 $w_cmit insert end
"Original File: [escape_path $blame_data($w,line$lno,file)]\n"
3727 $w_cmit insert end
"\n"
3728 $w_cmit insert end
$msg
3730 $w_cmit conf
-state disabled
3732 set blame_data
($w,highlight_line
) $lno
3733 set blame_data
($w,highlight_commit
) $cmit
3736 proc blame_copycommit
{w i pos
} {
3738 set lno
[lindex
[split [$i index
$pos] .
] 0]
3739 if {![catch
{set commit
$blame_data($w,line
$lno,commit
)}]} {
3748 ######################################################################
3753 #define mask_width 14
3754 #define mask_height 15
3755 static unsigned char mask_bits
[] = {
3756 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3757 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3758 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
3761 image create bitmap file_plain
-background white
-foreground black
-data {
3762 #define plain_width 14
3763 #define plain_height 15
3764 static unsigned char plain_bits
[] = {
3765 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3766 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
3767 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3768 } -maskdata $filemask
3770 image create bitmap file_mod
-background white
-foreground blue
-data {
3771 #define mod_width 14
3772 #define mod_height 15
3773 static unsigned char mod_bits
[] = {
3774 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3775 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3776 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3777 } -maskdata $filemask
3779 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
3780 #define file_fulltick_width 14
3781 #define file_fulltick_height 15
3782 static unsigned char file_fulltick_bits
[] = {
3783 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
3784 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
3785 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3786 } -maskdata $filemask
3788 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
3789 #define parttick_width 14
3790 #define parttick_height 15
3791 static unsigned char parttick_bits
[] = {
3792 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3793 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
3794 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3795 } -maskdata $filemask
3797 image create bitmap file_question
-background white
-foreground black
-data {
3798 #define file_question_width 14
3799 #define file_question_height 15
3800 static unsigned char file_question_bits
[] = {
3801 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
3802 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
3803 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3804 } -maskdata $filemask
3806 image create bitmap file_removed
-background white
-foreground red
-data {
3807 #define file_removed_width 14
3808 #define file_removed_height 15
3809 static unsigned char file_removed_bits
[] = {
3810 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3811 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
3812 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
3813 } -maskdata $filemask
3815 image create bitmap file_merge
-background white
-foreground blue
-data {
3816 #define file_merge_width 14
3817 #define file_merge_height 15
3818 static unsigned char file_merge_bits
[] = {
3819 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
3820 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3821 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3822 } -maskdata $filemask
3825 #define file_width 18
3826 #define file_height 18
3827 static unsigned char file_bits
[] = {
3828 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
3829 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
3830 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
3831 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
3832 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
3834 image create bitmap file_dir
-background white
-foreground blue \
3835 -data $file_dir_data -maskdata $file_dir_data
3838 set file_uplevel_data
{
3840 #define up_height 15
3841 static unsigned char up_bits
[] = {
3842 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
3843 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
3844 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
3846 image create bitmap file_uplevel
-background white
-foreground red \
3847 -data $file_uplevel_data -maskdata $file_uplevel_data
3848 unset file_uplevel_data
3850 set ui_index .vpane.files.index.list
3851 set ui_workdir .vpane.files.workdir.list
3853 set all_icons
(_
$ui_index) file_plain
3854 set all_icons
(A
$ui_index) file_fulltick
3855 set all_icons
(M
$ui_index) file_fulltick
3856 set all_icons
(D
$ui_index) file_removed
3857 set all_icons
(U
$ui_index) file_merge
3859 set all_icons
(_
$ui_workdir) file_plain
3860 set all_icons
(M
$ui_workdir) file_mod
3861 set all_icons
(D
$ui_workdir) file_question
3862 set all_icons
(U
$ui_workdir) file_merge
3863 set all_icons
(O
$ui_workdir) file_plain
3865 set max_status_desc
0
3869 {_M
"Modified, not staged"}
3870 {M_
"Staged for commit"}
3871 {MM
"Portions staged for commit"}
3872 {MD
"Staged for commit, missing"}
3874 {_O
"Untracked, not staged"}
3875 {A_
"Staged for commit"}
3876 {AM
"Portions staged for commit"}
3877 {AD
"Staged for commit, missing"}
3880 {D_
"Staged for removal"}
3881 {DO
"Staged for removal, still present"}
3883 {U_
"Requires merge resolution"}
3884 {UU
"Requires merge resolution"}
3885 {UM
"Requires merge resolution"}
3886 {UD
"Requires merge resolution"}
3888 if {$max_status_desc < [string length
[lindex
$i 1]]} {
3889 set max_status_desc
[string length
[lindex
$i 1]]
3891 set all_descs
([lindex
$i 0]) [lindex
$i 1]
3895 ######################################################################
3899 proc bind_button3
{w cmd
} {
3900 bind $w <Any-Button-3
> $cmd
3902 bind $w <Control-Button-1
> $cmd
3906 proc scrollbar2many
{list mode args
} {
3907 foreach w
$list {eval $w $mode $args}
3910 proc many2scrollbar
{list mode sb top bottom
} {
3911 $sb set $top $bottom
3912 foreach w
$list {$w $mode moveto
$top}
3915 proc incr_font_size
{font
{amt
1}} {
3916 set sz
[font configure
$font -size]
3918 font configure
$font -size $sz
3919 font configure
${font}bold
-size $sz
3922 proc hook_failed_popup
{hook msg
} {
3927 label
$w.m.l1
-text "$hook hook failed:" \
3932 -background white
-borderwidth 1 \
3934 -width 80 -height 10 \
3936 -yscrollcommand [list
$w.m.sby
set]
3938 -text {You must correct the above errors before committing.
} \
3942 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
3943 pack
$w.m.l1
-side top
-fill x
3944 pack
$w.m.l2
-side bottom
-fill x
3945 pack
$w.m.sby
-side right
-fill y
3946 pack
$w.m.t
-side left
-fill both
-expand 1
3947 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
3949 $w.m.t insert
1.0 $msg
3950 $w.m.t conf
-state disabled
3952 button
$w.ok
-text OK \
3955 -command "destroy $w"
3956 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
3958 bind $w <Visibility
> "grab $w; focus $w"
3959 bind $w <Key-Return
> "destroy $w"
3960 wm title
$w "[appname] ([reponame]): error"
3964 set next_console_id
0
3966 proc new_console
{short_title long_title
} {
3967 global next_console_id console_data
3968 set w .console
[incr next_console_id
]
3969 set console_data
($w) [list
$short_title $long_title]
3970 return [console_init
$w]
3973 proc console_init
{w
} {
3974 global console_cr console_data M1B
3976 set console_cr
($w) 1.0
3979 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
3984 -background white
-borderwidth 1 \
3986 -width 80 -height 10 \
3989 -yscrollcommand [list
$w.m.sby
set]
3990 label
$w.m.s
-text {Working... please
wait...
} \
3994 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
3995 pack
$w.m.l1
-side top
-fill x
3996 pack
$w.m.s
-side bottom
-fill x
3997 pack
$w.m.sby
-side right
-fill y
3998 pack
$w.m.t
-side left
-fill both
-expand 1
3999 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
4001 menu
$w.ctxm
-tearoff 0
4002 $w.ctxm add
command -label "Copy" \
4004 -command "tk_textCopy $w.m.t"
4005 $w.ctxm add
command -label "Select All" \
4007 -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
4008 $w.ctxm add
command -label "Copy All" \
4011 $w.m.t tag add sel 0.0 end
4013 $w.m.t tag remove sel 0.0 end
4016 button
$w.ok
-text {Close
} \
4019 -command "destroy $w"
4020 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
4022 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
4023 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
4024 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
4025 bind $w <Visibility
> "focus $w"
4026 wm title
$w "[appname] ([reponame]): [lindex $console_data($w) 0]"
4030 proc console_exec
{w cmd after
} {
4031 # -- Cygwin's Tcl tosses the enviroment when we exec our child.
4032 # But most users need that so we have to relogin. :-(
4035 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
4038 # -- Tcl won't let us redirect both stdout and stderr to
4039 # the same pipe. So pass it through cat...
4041 set cmd
[concat |
$cmd |
& cat]
4043 set fd_f
[open
$cmd r
]
4044 fconfigure
$fd_f -blocking 0 -translation binary
4045 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
4048 proc console_read
{w fd after
} {
4053 if {![winfo exists
$w]} {console_init
$w}
4054 $w.m.t conf
-state normal
4056 set n
[string length
$buf]
4058 set cr
[string first
"\r" $buf $c]
4059 set lf
[string first
"\n" $buf $c]
4060 if {$cr < 0} {set cr
[expr {$n + 1}]}
4061 if {$lf < 0} {set lf
[expr {$n + 1}]}
4064 $w.m.t insert end
[string range
$buf $c $lf]
4065 set console_cr
($w) [$w.m.t index
{end
-1c}]
4069 $w.m.t delete
$console_cr($w) end
4070 $w.m.t insert end
"\n"
4071 $w.m.t insert end
[string range
$buf $c $cr]
4076 $w.m.t conf
-state disabled
4080 fconfigure
$fd -blocking 1
4082 if {[catch
{close
$fd}]} {
4087 uplevel
#0 $after $w $ok
4090 fconfigure
$fd -blocking 0
4093 proc console_chain
{cmdlist w
{ok
1}} {
4095 if {[llength
$cmdlist] == 0} {
4100 set cmd
[lindex
$cmdlist 0]
4101 set cmdlist
[lrange
$cmdlist 1 end
]
4103 if {[lindex
$cmd 0] eq
{console_exec
}} {
4106 [list console_chain
$cmdlist]
4108 uplevel
#0 $cmd $cmdlist $w $ok
4115 proc console_done
{args
} {
4116 global console_cr console_data
4118 switch
-- [llength
$args] {
4120 set w
[lindex
$args 0]
4121 set ok
[lindex
$args 1]
4124 set w
[lindex
$args 1]
4125 set ok
[lindex
$args 2]
4128 error
"wrong number of args: console_done ?ignored? w ok"
4133 if {[winfo exists
$w]} {
4134 $w.m.s conf
-background green
-text {Success
}
4135 $w.ok conf
-state normal
4139 if {![winfo exists
$w]} {
4142 $w.m.s conf
-background red
-text {Error
: Command Failed
}
4143 $w.ok conf
-state normal
4147 array
unset console_cr
$w
4148 array
unset console_data
$w
4151 ######################################################################
4155 set starting_gitk_msg
{Starting gitk... please
wait...
}
4157 proc do_gitk
{revs
} {
4158 global env ui_status_value starting_gitk_msg
4160 # -- Always start gitk through whatever we were loaded with. This
4161 # lets us bypass using shell process on Windows systems.
4163 set cmd
[info nameofexecutable
]
4164 lappend cmd
[gitexec gitk
]
4170 if {[catch
{eval exec $cmd &} err
]} {
4171 error_popup
"Failed to start gitk:\n\n$err"
4173 set ui_status_value
$starting_gitk_msg
4175 if {$ui_status_value eq
$starting_gitk_msg} {
4176 set ui_status_value
{Ready.
}
4183 set fd
[open
"| git count-objects -v" r
]
4184 while {[gets
$fd line
] > 0} {
4185 if {[regexp
{^
([^
:]+): (\d
+)$
} $line _ name value
]} {
4186 set stats
($name) $value
4192 foreach p
[glob
-directory [gitdir objects pack
] \
4195 incr packed_sz
[file size
$p]
4197 if {$packed_sz > 0} {
4198 set stats
(size-pack
) [expr {$packed_sz / 1024}]
4203 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
4205 label
$w.header
-text {Database Statistics
} \
4207 pack
$w.header
-side top
-fill x
4209 frame
$w.buttons
-border 1
4210 button
$w.buttons.close
-text Close \
4213 -command [list destroy
$w]
4214 button
$w.buttons.gc
-text {Compress Database
} \
4217 -command "destroy $w;do_gc"
4218 pack
$w.buttons.close
-side right
4219 pack
$w.buttons.gc
-side left
4220 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
4222 frame
$w.stat
-borderwidth 1 -relief solid
4224 {count
{Number of loose objects
}}
4225 {size
{Disk space used by loose objects
} { KiB
}}
4226 {in-pack
{Number of packed objects
}}
4227 {packs
{Number of packs
}}
4228 {size-pack
{Disk space used by packed objects
} { KiB
}}
4229 {prune-packable
{Packed objects waiting
for pruning
}}
4230 {garbage
{Garbage files
}}
4232 set name
[lindex
$s 0]
4233 set label
[lindex
$s 1]
4234 if {[catch
{set value
$stats($name)}]} continue
4235 if {[llength
$s] > 2} {
4236 set value
"$value[lindex $s 2]"
4239 label
$w.stat.l_
$name -text "$label:" -anchor w
-font font_ui
4240 label
$w.stat.v_
$name -text $value -anchor w
-font font_ui
4241 grid
$w.stat.l_
$name $w.stat.v_
$name -sticky we
-padx {0 5}
4243 pack
$w.stat
-pady 10 -padx 10
4245 bind $w <Visibility
> "grab $w; focus $w.buttons.close"
4246 bind $w <Key-Escape
> [list destroy
$w]
4247 bind $w <Key-Return
> [list destroy
$w]
4248 wm title
$w "[appname] ([reponame]): Database Statistics"
4253 set w
[new_console
{gc
} {Compressing the object database
}]
4255 {console_exec
{git pack-refs
--prune}}
4256 {console_exec
{git reflog expire
--all}}
4257 {console_exec
{git repack
-a -d -l}}
4258 {console_exec
{git rerere gc
}}
4262 proc do_fsck_objects
{} {
4263 set w
[new_console
{fsck-objects
} \
4264 {Verifying the object database with fsck-objects
}]
4265 set cmd
[list git fsck-objects
]
4268 lappend cmd
--strict
4269 console_exec
$w $cmd console_done
4275 global ui_comm is_quitting repo_config commit_type
4277 if {$is_quitting} return
4280 if {[winfo exists
$ui_comm]} {
4281 # -- Stash our current commit buffer.
4283 set save
[gitdir GITGUI_MSG
]
4284 set msg
[string trim
[$ui_comm get
0.0 end
]]
4285 regsub
-all -line {[ \r\t]+$
} $msg {} msg
4286 if {(![string match amend
* $commit_type]
4287 ||
[$ui_comm edit modified
])
4290 set fd
[open
$save w
]
4291 puts
-nonewline $fd $msg
4295 catch
{file delete
$save}
4298 # -- Stash our current window geometry into this repository.
4300 set cfg_geometry
[list
]
4301 lappend cfg_geometry
[wm geometry .
]
4302 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
4303 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
4304 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
4307 if {$cfg_geometry ne
$rc_geometry} {
4308 catch
{git config gui.geometry
$cfg_geometry}
4316 rescan
{set ui_status_value
{Ready.
}}
4319 proc unstage_helper
{txt paths
} {
4320 global file_states current_diff_path
4322 if {![lock_index begin-update
]} return
4326 foreach path
$paths {
4327 switch
-glob -- [lindex
$file_states($path) 0] {
4331 lappend pathList
$path
4332 if {$path eq
$current_diff_path} {
4333 set after
{reshow_diff
;}
4338 if {$pathList eq
{}} {
4344 [concat
$after {set ui_status_value
{Ready.
}}]
4348 proc do_unstage_selection
{} {
4349 global current_diff_path selected_paths
4351 if {[array size selected_paths
] > 0} {
4353 {Unstaging selected files from commit
} \
4354 [array names selected_paths
]
4355 } elseif
{$current_diff_path ne
{}} {
4357 "Unstaging [short_path $current_diff_path] from commit" \
4358 [list
$current_diff_path]
4362 proc add_helper
{txt paths
} {
4363 global file_states current_diff_path
4365 if {![lock_index begin-update
]} return
4369 foreach path
$paths {
4370 switch
-glob -- [lindex
$file_states($path) 0] {
4375 lappend pathList
$path
4376 if {$path eq
$current_diff_path} {
4377 set after
{reshow_diff
;}
4382 if {$pathList eq
{}} {
4388 [concat
$after {set ui_status_value
{Ready to commit.
}}]
4392 proc do_add_selection
{} {
4393 global current_diff_path selected_paths
4395 if {[array size selected_paths
] > 0} {
4397 {Adding selected files
} \
4398 [array names selected_paths
]
4399 } elseif
{$current_diff_path ne
{}} {
4401 "Adding [short_path $current_diff_path]" \
4402 [list
$current_diff_path]
4406 proc do_add_all
{} {
4410 foreach path
[array names file_states
] {
4411 switch
-glob -- [lindex
$file_states($path) 0] {
4414 ?D
{lappend paths
$path}
4417 add_helper
{Adding all changed files
} $paths
4420 proc revert_helper
{txt paths
} {
4421 global file_states current_diff_path
4423 if {![lock_index begin-update
]} return
4427 foreach path
$paths {
4428 switch
-glob -- [lindex
$file_states($path) 0] {
4432 lappend pathList
$path
4433 if {$path eq
$current_diff_path} {
4434 set after
{reshow_diff
;}
4440 set n
[llength
$pathList]
4444 } elseif
{$n == 1} {
4445 set s
"[short_path [lindex $pathList]]"
4447 set s
"these $n files"
4450 set reply
[tk_dialog \
4452 "[appname] ([reponame])" \
4453 "Revert changes in $s?
4455 Any unadded changes will be permanently lost by the revert." \
4465 [concat
$after {set ui_status_value
{Ready.
}}]
4471 proc do_revert_selection
{} {
4472 global current_diff_path selected_paths
4474 if {[array size selected_paths
] > 0} {
4476 {Reverting selected files
} \
4477 [array names selected_paths
]
4478 } elseif
{$current_diff_path ne
{}} {
4480 "Reverting [short_path $current_diff_path]" \
4481 [list
$current_diff_path]
4485 proc do_signoff
{} {
4488 set me
[committer_ident
]
4489 if {$me eq
{}} return
4491 set sob
"Signed-off-by: $me"
4492 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
4493 if {$last ne
$sob} {
4494 $ui_comm edit separator
4496 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
4497 $ui_comm insert end
"\n"
4499 $ui_comm insert end
"\n$sob"
4500 $ui_comm edit separator
4505 proc do_select_commit_type
{} {
4506 global commit_type selected_commit_type
4508 if {$selected_commit_type eq
{new
}
4509 && [string match amend
* $commit_type]} {
4511 } elseif
{$selected_commit_type eq
{amend
}
4512 && ![string match amend
* $commit_type]} {
4515 # The amend request was rejected...
4517 if {![string match amend
* $commit_type]} {
4518 set selected_commit_type new
4528 global appvers copyright
4529 global tcl_patchLevel tk_patchLevel
4533 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
4535 label
$w.header
-text "About [appname]" \
4537 pack
$w.header
-side top
-fill x
4540 button
$w.buttons.close
-text {Close
} \
4543 -command [list destroy
$w]
4544 pack
$w.buttons.close
-side right
4545 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
4548 -text "git-gui - a graphical user interface for Git.
4556 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
4559 append v
"git-gui version $appvers\n"
4560 append v
"[git version]\n"
4562 if {$tcl_patchLevel eq
$tk_patchLevel} {
4563 append v
"Tcl/Tk version $tcl_patchLevel"
4565 append v
"Tcl version $tcl_patchLevel"
4566 append v
", Tk version $tk_patchLevel"
4577 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
4579 menu
$w.ctxm
-tearoff 0
4580 $w.ctxm add
command \
4585 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
4588 bind $w <Visibility
> "grab $w; focus $w.buttons.close"
4589 bind $w <Key-Escape
> "destroy $w"
4590 bind $w <Key-Return
> "destroy $w"
4591 bind_button3
$w.vers
"tk_popup $w.ctxm %X %Y; grab $w; focus $w"
4592 wm title
$w "About [appname]"
4596 proc do_options
{} {
4597 global repo_config global_config font_descs
4598 global repo_config_new global_config_new
4600 array
unset repo_config_new
4601 array
unset global_config_new
4602 foreach name
[array names repo_config
] {
4603 set repo_config_new
($name) $repo_config($name)
4606 foreach name
[array names repo_config
] {
4608 gui.diffcontext
{continue}
4610 set repo_config_new
($name) $repo_config($name)
4612 foreach name
[array names global_config
] {
4613 set global_config_new
($name) $global_config($name)
4616 set w .options_editor
4618 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
4620 label
$w.header
-text "Options" \
4622 pack
$w.header
-side top
-fill x
4625 button
$w.buttons.restore
-text {Restore Defaults
} \
4628 -command do_restore_defaults
4629 pack
$w.buttons.restore
-side left
4630 button
$w.buttons.save
-text Save \
4633 -command [list do_save_config
$w]
4634 pack
$w.buttons.save
-side right
4635 button
$w.buttons.cancel
-text {Cancel
} \
4638 -command [list destroy
$w]
4639 pack
$w.buttons.cancel
-side right
-padx 5
4640 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
4642 labelframe
$w.repo
-text "[reponame] Repository" \
4644 labelframe
$w.global
-text {Global
(All Repositories
)} \
4646 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
4647 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
4651 {t user.name
{User Name
}}
4652 {t user.email
{Email Address
}}
4654 {b merge.summary
{Summarize Merge Commits
}}
4655 {i-1.
.5 merge.verbosity
{Merge Verbosity
}}
4657 {b gui.trustmtime
{Trust File Modification Timestamps
}}
4658 {i-1.
.99 gui.diffcontext
{Number of Diff Context Lines
}}
4659 {t gui.newbranchtemplate
{New Branch Name Template
}}
4661 set type [lindex
$option 0]
4662 set name
[lindex
$option 1]
4663 set text
[lindex
$option 2]
4665 foreach f
{repo global
} {
4666 switch
-glob -- $type {
4668 checkbutton
$w.
$f.
$optid -text $text \
4669 -variable ${f}_config_new
($name) \
4673 pack
$w.
$f.
$optid -side top
-anchor w
4676 regexp
-- {-(\d
+)\.\.
(\d
+)$
} $type _junk min max
4678 label
$w.
$f.
$optid.l
-text "$text:" -font font_ui
4679 pack
$w.
$f.
$optid.l
-side left
-anchor w
-fill x
4680 spinbox
$w.
$f.
$optid.v \
4681 -textvariable ${f}_config_new
($name) \
4685 -width [expr {1 + [string length
$max]}] \
4687 bind $w.
$f.
$optid.v
<FocusIn
> {%W selection range
0 end
}
4688 pack
$w.
$f.
$optid.v
-side right
-anchor e
-padx 5
4689 pack
$w.
$f.
$optid -side top
-anchor w
-fill x
4693 label
$w.
$f.
$optid.l
-text "$text:" -font font_ui
4694 entry
$w.
$f.
$optid.v \
4698 -textvariable ${f}_config_new
($name) \
4700 pack
$w.
$f.
$optid.l
-side left
-anchor w
4701 pack
$w.
$f.
$optid.v
-side left
-anchor w \
4704 pack
$w.
$f.
$optid -side top
-anchor w
-fill x
4710 set all_fonts
[lsort
[font families
]]
4711 foreach option
$font_descs {
4712 set name
[lindex
$option 0]
4713 set font
[lindex
$option 1]
4714 set text
[lindex
$option 2]
4716 set global_config_new
(gui.
$font^^family
) \
4717 [font configure
$font -family]
4718 set global_config_new
(gui.
$font^^size
) \
4719 [font configure
$font -size]
4721 frame
$w.global.
$name
4722 label
$w.global.
$name.l
-text "$text:" -font font_ui
4723 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
4724 set fontmenu
[eval tk_optionMenu
$w.global.
$name.family \
4725 global_config_new
(gui.
$font^^family
) \
4727 $w.global.
$name.family configure
-font font_ui
4728 $fontmenu configure
-font font_ui
4729 spinbox
$w.global.
$name.size \
4730 -textvariable global_config_new
(gui.
$font^^size
) \
4731 -from 2 -to 80 -increment 1 \
4734 bind $w.global.
$name.size
<FocusIn
> {%W selection range
0 end
}
4735 pack
$w.global.
$name.size
-side right
-anchor e
4736 pack
$w.global.
$name.family
-side right
-anchor e
4737 pack
$w.global.
$name -side top
-anchor w
-fill x
4740 bind $w <Visibility
> "grab $w; focus $w.buttons.save"
4741 bind $w <Key-Escape
> "destroy $w"
4742 wm title
$w "[appname] ([reponame]): Options"
4746 proc do_restore_defaults
{} {
4747 global font_descs default_config repo_config
4748 global repo_config_new global_config_new
4750 foreach name
[array names default_config
] {
4751 set repo_config_new
($name) $default_config($name)
4752 set global_config_new
($name) $default_config($name)
4755 foreach option
$font_descs {
4756 set name
[lindex
$option 0]
4757 set repo_config
(gui.
$name) $default_config(gui.
$name)
4761 foreach option
$font_descs {
4762 set name
[lindex
$option 0]
4763 set font
[lindex
$option 1]
4764 set global_config_new
(gui.
$font^^family
) \
4765 [font configure
$font -family]
4766 set global_config_new
(gui.
$font^^size
) \
4767 [font configure
$font -size]
4771 proc do_save_config
{w
} {
4772 if {[catch
{save_config
} err
]} {
4773 error_popup
"Failed to completely save options:\n\n$err"
4779 proc do_windows_shortcut
{} {
4782 set fn
[tk_getSaveFile \
4784 -title "[appname] ([reponame]): Create Desktop Icon" \
4785 -initialfile "Git [reponame].bat"]
4789 puts
$fd "@ECHO Entering [reponame]"
4790 puts
$fd "@ECHO Starting git-gui... please wait..."
4791 puts
$fd "@SET PATH=[file normalize [gitexec]];%PATH%"
4792 puts
$fd "@SET GIT_DIR=[file normalize [gitdir]]"
4793 puts
-nonewline $fd "@\"[info nameofexecutable]\""
4794 puts
$fd " \"[file normalize $argv0]\""
4797 error_popup
"Cannot write script:\n\n$err"
4802 proc do_cygwin_shortcut
{} {
4806 set desktop
[exec cygpath \
4814 set fn
[tk_getSaveFile \
4816 -title "[appname] ([reponame]): Create Desktop Icon" \
4817 -initialdir $desktop \
4818 -initialfile "Git [reponame].bat"]
4822 set sh
[exec cygpath \
4826 set me
[exec cygpath \
4830 set gd
[exec cygpath \
4834 set gw
[exec cygpath \
4837 [file dirname [gitdir
]]]
4838 regsub
-all ' $me "'\\''" me
4839 regsub -all ' $gd "'\\''" gd
4840 puts $fd "@ECHO Entering $gw"
4841 puts $fd "@ECHO Starting git-gui... please wait..."
4842 puts -nonewline $fd "@\"$sh\" --login -c \""
4843 puts -nonewline $fd "GIT_DIR='$gd'"
4844 puts -nonewline $fd " '$me'"
4848 error_popup "Cannot write script:\n\n$err"
4853 proc do_macosx_app {} {
4856 set fn [tk_getSaveFile \
4858 -title "[appname] ([reponame]): Create Desktop Icon" \
4859 -initialdir [file join $env(HOME) Desktop] \
4860 -initialfile "Git [reponame].app"]
4863 set Contents [file join $fn Contents]
4864 set MacOS [file join $Contents MacOS]
4865 set exe [file join $MacOS git-gui]
4869 set fd [open [file join $Contents Info.plist] w]
4870 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
4871 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
4872 <plist version="1.0">
4874 <key>CFBundleDevelopmentRegion</key>
4875 <string>English</string>
4876 <key>CFBundleExecutable</key>
4877 <string>git-gui</string>
4878 <key>CFBundleIdentifier</key>
4879 <string>org.spearce.git-gui</string>
4880 <key>CFBundleInfoDictionaryVersion</key>
4881 <string>6.0</string>
4882 <key>CFBundlePackageType</key>
4883 <string>APPL</string>
4884 <key>CFBundleSignature</key>
4885 <string>????</string>
4886 <key>CFBundleVersion</key>
4887 <string>1.0</string>
4888 <key>NSPrincipalClass</key>
4889 <string>NSApplication</string>
4894 set fd [open $exe w]
4895 set gd [file normalize [gitdir]]
4896 set ep [file normalize [gitexec]]
4897 regsub -all ' $gd "'\\''" gd
4898 regsub
-all ' $ep "'\\''" ep
4899 puts $fd "#!/bin/sh"
4900 foreach name
[array names env
] {
4901 if {[string match GIT_
* $name]} {
4902 regsub
-all ' $env($name) "'\\''" v
4903 puts $fd "export $name='$v'"
4906 puts $fd "export PATH
='$ep':\
$PATH"
4907 puts $fd "export GIT_DIR
='$gd'"
4908 puts $fd "exec [file normalize
$argv0]"
4911 file attributes $exe -permissions u+x,g+x,o+x
4913 error_popup "Cannot
write icon
:\n\n$err"
4918 proc toggle_or_diff {w x y} {
4919 global file_states file_lists current_diff_path ui_index ui_workdir
4920 global last_clicked selected_paths
4922 set pos [split [$w index @$x,$y] .]
4923 set lno [lindex $pos 0]
4924 set col [lindex $pos 1]
4925 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4931 set last_clicked [list $w $lno]
4932 array unset selected_paths
4933 $ui_index tag remove in_sel 0.0 end
4934 $ui_workdir tag remove in_sel 0.0 end
4937 if {$current_diff_path eq $path} {
4938 set after {reshow_diff;}
4942 if {$w eq $ui_index} {
4944 "Unstaging
[short_path
$path] from commit
" \
4946 [concat $after {set ui_status_value {Ready.}}]
4947 } elseif {$w eq $ui_workdir} {
4949 "Adding
[short_path
$path]" \
4951 [concat $after {set ui_status_value {Ready.}}]
4954 show_diff $path $w $lno
4958 proc add_one_to_selection {w x y} {
4959 global file_lists last_clicked selected_paths
4961 set lno [lindex [split [$w index @$x,$y] .] 0]
4962 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4968 if {$last_clicked ne {}
4969 && [lindex $last_clicked 0] ne $w} {
4970 array unset selected_paths
4971 [lindex $last_clicked 0] tag remove in_sel 0.0 end
4974 set last_clicked [list $w $lno]
4975 if {[catch {set in_sel $selected_paths($path)}]} {
4979 unset selected_paths($path)
4980 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
4982 set selected_paths($path) 1
4983 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
4987 proc add_range_to_selection {w x y} {
4988 global file_lists last_clicked selected_paths
4990 if {[lindex $last_clicked 0] ne $w} {
4991 toggle_or_diff $w $x $y
4995 set lno [lindex [split [$w index @$x,$y] .] 0]
4996 set lc [lindex $last_clicked 1]
5005 foreach path [lrange $file_lists($w) \
5006 [expr {$begin - 1}] \
5007 [expr {$end - 1}]] {
5008 set selected_paths($path) 1
5010 $w tag add in_sel $begin.0 [expr {$end + 1}].0
5013 ######################################################################
5017 set cursor_ptr arrow
5018 font create font_diff -family Courier -size 10
5022 eval font configure font_ui [font actual [.dummy cget -font]]
5026 font create font_uibold
5027 font create font_diffbold
5032 } elseif {[is_MacOSX]} {
5040 proc apply_config {} {
5041 global repo_config font_descs
5043 foreach option $font_descs {
5044 set name [lindex $option 0]
5045 set font [lindex $option 1]
5047 foreach {cn cv} $repo_config(gui.$name) {
5048 font configure $font $cn $cv
5051 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
5053 foreach {cn cv} [font configure $font] {
5054 font configure ${font}bold $cn $cv
5056 font configure ${font}bold -weight bold
5060 set default_config(merge.summary) false
5061 set default_config(merge.verbosity) 2
5062 set default_config(user.name) {}
5063 set default_config(user.email) {}
5065 set default_config(gui.trustmtime) false
5066 set default_config(gui.diffcontext) 5
5067 set default_config(gui.newbranchtemplate) {}
5068 set default_config(gui.fontui) [font configure font_ui]
5069 set default_config(gui.fontdiff) [font configure font_diff]
5071 {fontui font_ui {Main Font}}
5072 {fontdiff font_diff {Diff/Console Font}}
5077 ######################################################################
5079 ## feature option selection
5081 if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
5086 if {$subcommand eq {gui.sh}} {
5089 if {$subcommand eq {gui} && [llength $argv] > 0} {
5090 set subcommand [lindex $argv 0]
5091 set argv [lrange $argv 1 end]
5094 enable_option multicommit
5095 enable_option branch
5096 enable_option transport
5098 switch -- $subcommand {
5101 disable_option multicommit
5102 disable_option branch
5103 disable_option transport
5106 enable_option singlecommit
5108 disable_option multicommit
5109 disable_option branch
5110 disable_option transport
5114 ######################################################################
5122 menu .mbar -tearoff 0
5123 .mbar add cascade -label Repository -menu .mbar.repository -font font_ui
5124 .mbar add cascade -label Edit -menu .mbar.edit -font font_ui
5125 if {[is_enabled branch]} {
5126 .mbar add cascade -label Branch -menu .mbar.branch -font font_ui
5128 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
5129 .mbar add cascade -label Commit -menu .mbar.commit -font font_ui
5131 if {[is_enabled transport]} {
5132 .mbar add cascade -label Merge -menu .mbar.merge -font font_ui
5133 .mbar add cascade -label Fetch -menu .mbar.fetch -font font_ui
5134 .mbar add cascade -label Push -menu .mbar.push -font font_ui
5136 . configure -menu .mbar
5138 # -- Repository Menu
5140 menu .mbar.repository
5142 .mbar.repository add command \
5143 -label {Browse Current Branch} \
5144 -command {new_browser $current_branch} \
5146 trace add variable current_branch write ".mbar.repository entryconf
[.mbar.repository index last
] -label \"Browse \
$current_branch\" ;#"
5147 .mbar.repository add separator
5149 .mbar.repository add
command \
5150 -label {Visualize Current Branch
} \
5151 -command {do_gitk
$current_branch} \
5153 trace add variable current_branch
write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
5154 .mbar.repository add
command \
5155 -label {Visualize All Branches
} \
5156 -command {do_gitk
--all} \
5158 .mbar.repository add separator
5160 if {[is_enabled multicommit
]} {
5161 .mbar.repository add
command -label {Database Statistics
} \
5165 .mbar.repository add
command -label {Compress Database
} \
5169 .mbar.repository add
command -label {Verify Database
} \
5170 -command do_fsck_objects \
5173 .mbar.repository add separator
5176 .mbar.repository add
command \
5177 -label {Create Desktop Icon
} \
5178 -command do_cygwin_shortcut \
5180 } elseif
{[is_Windows
]} {
5181 .mbar.repository add
command \
5182 -label {Create Desktop Icon
} \
5183 -command do_windows_shortcut \
5185 } elseif
{[is_MacOSX
]} {
5186 .mbar.repository add
command \
5187 -label {Create Desktop Icon
} \
5188 -command do_macosx_app \
5193 .mbar.repository add
command -label Quit \
5195 -accelerator $M1T-Q \
5201 .mbar.edit add
command -label Undo \
5202 -command {catch
{[focus
] edit undo
}} \
5203 -accelerator $M1T-Z \
5205 .mbar.edit add
command -label Redo \
5206 -command {catch
{[focus
] edit redo
}} \
5207 -accelerator $M1T-Y \
5209 .mbar.edit add separator
5210 .mbar.edit add
command -label Cut \
5211 -command {catch
{tk_textCut
[focus
]}} \
5212 -accelerator $M1T-X \
5214 .mbar.edit add
command -label Copy \
5215 -command {catch
{tk_textCopy
[focus
]}} \
5216 -accelerator $M1T-C \
5218 .mbar.edit add
command -label Paste \
5219 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
5220 -accelerator $M1T-V \
5222 .mbar.edit add
command -label Delete \
5223 -command {catch
{[focus
] delete sel.first sel.last
}} \
5226 .mbar.edit add separator
5227 .mbar.edit add
command -label {Select All
} \
5228 -command {catch
{[focus
] tag add sel
0.0 end
}} \
5229 -accelerator $M1T-A \
5234 if {[is_enabled branch
]} {
5237 .mbar.branch add
command -label {Create...
} \
5238 -command do_create_branch \
5239 -accelerator $M1T-N \
5241 lappend disable_on_lock
[list .mbar.branch entryconf \
5242 [.mbar.branch index last
] -state]
5244 .mbar.branch add
command -label {Delete...
} \
5245 -command do_delete_branch \
5247 lappend disable_on_lock
[list .mbar.branch entryconf \
5248 [.mbar.branch index last
] -state]
5250 .mbar.branch add
command -label {Reset...
} \
5251 -command do_reset_hard \
5253 lappend disable_on_lock
[list .mbar.branch entryconf \
5254 [.mbar.branch index last
] -state]
5259 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
5262 .mbar.commit add radiobutton \
5263 -label {New Commit
} \
5264 -command do_select_commit_type \
5265 -variable selected_commit_type \
5268 lappend disable_on_lock \
5269 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5271 .mbar.commit add radiobutton \
5272 -label {Amend Last Commit
} \
5273 -command do_select_commit_type \
5274 -variable selected_commit_type \
5277 lappend disable_on_lock \
5278 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5280 .mbar.commit add separator
5282 .mbar.commit add
command -label Rescan \
5283 -command do_rescan \
5286 lappend disable_on_lock \
5287 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5289 .mbar.commit add
command -label {Add To Commit
} \
5290 -command do_add_selection \
5292 lappend disable_on_lock \
5293 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5295 .mbar.commit add
command -label {Add Existing To Commit
} \
5296 -command do_add_all \
5297 -accelerator $M1T-I \
5299 lappend disable_on_lock \
5300 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5302 .mbar.commit add
command -label {Unstage From Commit
} \
5303 -command do_unstage_selection \
5305 lappend disable_on_lock \
5306 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5308 .mbar.commit add
command -label {Revert Changes
} \
5309 -command do_revert_selection \
5311 lappend disable_on_lock \
5312 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5314 .mbar.commit add separator
5316 .mbar.commit add
command -label {Sign Off
} \
5317 -command do_signoff \
5318 -accelerator $M1T-S \
5321 .mbar.commit add
command -label Commit \
5322 -command do_commit \
5323 -accelerator $M1T-Return \
5325 lappend disable_on_lock \
5326 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
5331 if {[is_enabled branch
]} {
5333 .mbar.merge add
command -label {Local Merge...
} \
5334 -command do_local_merge \
5336 lappend disable_on_lock \
5337 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
5338 .mbar.merge add
command -label {Abort Merge...
} \
5339 -command do_reset_hard \
5341 lappend disable_on_lock \
5342 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
5348 if {[is_enabled transport
]} {
5352 .mbar.push add
command -label {Push...
} \
5353 -command do_push_anywhere \
5358 # -- Apple Menu (Mac OS X only)
5360 .mbar add cascade
-label Apple
-menu .mbar.apple
5363 .mbar.apple add
command -label "About [appname]" \
5366 .mbar.apple add
command -label "Options..." \
5367 -command do_options \
5372 .mbar.edit add separator
5373 .mbar.edit add
command -label {Options...
} \
5374 -command do_options \
5379 if {[file exists
/usr
/local
/miga
/lib
/gui-miga
]
5380 && [file exists .pvcsrc
]} {
5382 global ui_status_value
5383 if {![lock_index update
]} return
5384 set cmd
[list sh
--login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
5385 set miga_fd
[open
"|$cmd" r
]
5386 fconfigure
$miga_fd -blocking 0
5387 fileevent
$miga_fd readable
[list miga_done
$miga_fd]
5388 set ui_status_value
{Running miga...
}
5390 proc miga_done
{fd
} {
5395 rescan
[list
set ui_status_value
{Ready.
}]
5398 .mbar add cascade
-label Tools
-menu .mbar.tools
5400 .mbar.tools add
command -label "Migrate" \
5403 lappend disable_on_lock \
5404 [list .mbar.tools entryconf
[.mbar.tools index last
] -state]
5410 .mbar add cascade
-label Help
-menu .mbar.
help -font font_ui
5414 .mbar.
help add
command -label "About [appname]" \
5420 catch
{set browser
$repo_config(instaweb.browser
)}
5421 set doc_path
[file dirname [gitexec
]]
5422 set doc_path
[file join $doc_path Documentation index.html
]
5425 set doc_path
[exec cygpath
--mixed $doc_path]
5428 if {$browser eq
{}} {
5431 } elseif
{[is_Cygwin
]} {
5432 set program_files
[file dirname [exec cygpath
--windir]]
5433 set program_files
[file join $program_files {Program Files
}]
5434 set firefox
[file join $program_files {Mozilla Firefox
} firefox.exe
]
5435 set ie
[file join $program_files {Internet Explorer
} IEXPLORE.EXE
]
5436 if {[file exists
$firefox]} {
5437 set browser
$firefox
5438 } elseif
{[file exists
$ie]} {
5441 unset program_files firefox ie
5445 if {[file isfile
$doc_path]} {
5446 set doc_url
"file:$doc_path"
5448 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
5451 if {$browser ne
{}} {
5452 .mbar.
help add
command -label {Online Documentation
} \
5453 -command [list
exec $browser $doc_url &] \
5456 unset browser doc_path doc_url
5458 # -- Standard bindings
5460 bind .
<Destroy
> do_quit
5461 bind all
<$M1B-Key-q> do_quit
5462 bind all
<$M1B-Key-Q> do_quit
5463 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
5464 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
5466 # -- Not a normal commit type invocation? Do that instead!
5468 switch
-- $subcommand {
5470 if {[llength
$argv] != 1} {
5471 puts stderr
"usage: $argv0 browser commit"
5474 set current_branch
[lindex
$argv 0]
5475 new_browser
$current_branch
5479 if {[llength
$argv] != 2} {
5480 puts stderr
"usage: $argv0 blame commit path"
5483 set current_branch
[lindex
$argv 0]
5484 show_blame
$current_branch [lindex
$argv 1]
5489 if {[llength
$argv] != 0} {
5490 puts
-nonewline stderr
"usage: $argv0"
5491 if {$subcommand ne
{gui
} && [appname
] ne
"git-$subcommand"} {
5492 puts
-nonewline stderr
" $subcommand"
5497 # fall through to setup UI for commits
5500 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
5511 -text {Current Branch
:} \
5516 -textvariable current_branch \
5520 pack .branch.l1
-side left
5521 pack .branch.cb
-side left
-fill x
5522 pack .branch
-side top
-fill x
5524 # -- Main Window Layout
5526 panedwindow .vpane
-orient vertical
5527 panedwindow .vpane.files
-orient horizontal
5528 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
5529 pack .vpane
-anchor n
-side top
-fill both
-expand 1
5531 # -- Index File List
5533 frame .vpane.files.index
-height 100 -width 200
5534 label .vpane.files.index.title
-text {Changes To Be Committed
} \
5537 text
$ui_index -background white
-borderwidth 0 \
5538 -width 20 -height 10 \
5541 -cursor $cursor_ptr \
5542 -xscrollcommand {.vpane.files.index.sx
set} \
5543 -yscrollcommand {.vpane.files.index.sy
set} \
5545 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
5546 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
5547 pack .vpane.files.index.title
-side top
-fill x
5548 pack .vpane.files.index.sx
-side bottom
-fill x
5549 pack .vpane.files.index.sy
-side right
-fill y
5550 pack
$ui_index -side left
-fill both
-expand 1
5551 .vpane.files add .vpane.files.index
-sticky nsew
5553 # -- Working Directory File List
5555 frame .vpane.files.workdir
-height 100 -width 200
5556 label .vpane.files.workdir.title
-text {Changed But Not Updated
} \
5559 text
$ui_workdir -background white
-borderwidth 0 \
5560 -width 20 -height 10 \
5563 -cursor $cursor_ptr \
5564 -xscrollcommand {.vpane.files.workdir.sx
set} \
5565 -yscrollcommand {.vpane.files.workdir.sy
set} \
5567 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
5568 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
5569 pack .vpane.files.workdir.title
-side top
-fill x
5570 pack .vpane.files.workdir.sx
-side bottom
-fill x
5571 pack .vpane.files.workdir.sy
-side right
-fill y
5572 pack
$ui_workdir -side left
-fill both
-expand 1
5573 .vpane.files add .vpane.files.workdir
-sticky nsew
5575 foreach i
[list
$ui_index $ui_workdir] {
5576 $i tag conf in_diff
-font font_uibold
5577 $i tag conf in_sel \
5578 -background [$i cget
-foreground] \
5579 -foreground [$i cget
-background]
5583 # -- Diff and Commit Area
5585 frame .vpane.lower
-height 300 -width 400
5586 frame .vpane.lower.commarea
5587 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
5588 pack .vpane.lower.commarea
-side top
-fill x
5589 pack .vpane.lower.
diff -side bottom
-fill both
-expand 1
5590 .vpane add .vpane.lower
-sticky nsew
5592 # -- Commit Area Buttons
5594 frame .vpane.lower.commarea.buttons
5595 label .vpane.lower.commarea.buttons.l
-text {} \
5599 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
5600 pack .vpane.lower.commarea.buttons
-side left
-fill y
5602 button .vpane.lower.commarea.buttons.rescan
-text {Rescan
} \
5603 -command do_rescan \
5605 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
5606 lappend disable_on_lock \
5607 {.vpane.lower.commarea.buttons.rescan conf
-state}
5609 button .vpane.lower.commarea.buttons.incall
-text {Add Existing
} \
5610 -command do_add_all \
5612 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
5613 lappend disable_on_lock \
5614 {.vpane.lower.commarea.buttons.incall conf
-state}
5616 button .vpane.lower.commarea.buttons.signoff
-text {Sign Off
} \
5617 -command do_signoff \
5619 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
5621 button .vpane.lower.commarea.buttons.commit
-text {Commit
} \
5622 -command do_commit \
5624 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
5625 lappend disable_on_lock \
5626 {.vpane.lower.commarea.buttons.commit conf
-state}
5628 # -- Commit Message Buffer
5630 frame .vpane.lower.commarea.buffer
5631 frame .vpane.lower.commarea.buffer.header
5632 set ui_comm .vpane.lower.commarea.buffer.t
5633 set ui_coml .vpane.lower.commarea.buffer.header.l
5634 radiobutton .vpane.lower.commarea.buffer.header.new \
5635 -text {New Commit
} \
5636 -command do_select_commit_type \
5637 -variable selected_commit_type \
5640 lappend disable_on_lock \
5641 [list .vpane.lower.commarea.buffer.header.new conf
-state]
5642 radiobutton .vpane.lower.commarea.buffer.header.amend \
5643 -text {Amend Last Commit
} \
5644 -command do_select_commit_type \
5645 -variable selected_commit_type \
5648 lappend disable_on_lock \
5649 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
5654 proc trace_commit_type
{varname args
} {
5655 global ui_coml commit_type
5656 switch
-glob -- $commit_type {
5657 initial
{set txt
{Initial Commit Message
:}}
5658 amend
{set txt
{Amended Commit Message
:}}
5659 amend-initial
{set txt
{Amended Initial Commit Message
:}}
5660 amend-merge
{set txt
{Amended Merge Commit Message
:}}
5661 merge
{set txt
{Merge Commit Message
:}}
5662 * {set txt
{Commit Message
:}}
5664 $ui_coml conf
-text $txt
5666 trace add variable commit_type
write trace_commit_type
5667 pack
$ui_coml -side left
-fill x
5668 pack .vpane.lower.commarea.buffer.header.amend
-side right
5669 pack .vpane.lower.commarea.buffer.header.new
-side right
5671 text
$ui_comm -background white
-borderwidth 1 \
5674 -autoseparators true \
5676 -width 75 -height 9 -wrap none \
5678 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
5679 scrollbar .vpane.lower.commarea.buffer.sby \
5680 -command [list
$ui_comm yview
]
5681 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
5682 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
5683 pack
$ui_comm -side left
-fill y
5684 pack .vpane.lower.commarea.buffer
-side left
-fill y
5686 # -- Commit Message Buffer Context Menu
5688 set ctxm .vpane.lower.commarea.buffer.ctxm
5689 menu
$ctxm -tearoff 0
5693 -command {tk_textCut
$ui_comm}
5697 -command {tk_textCopy
$ui_comm}
5701 -command {tk_textPaste
$ui_comm}
5705 -command {$ui_comm delete sel.first sel.last
}
5708 -label {Select All
} \
5710 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
5715 $ui_comm tag add sel
0.0 end
5716 tk_textCopy
$ui_comm
5717 $ui_comm tag remove sel
0.0 end
5724 bind_button3
$ui_comm "tk_popup $ctxm %X %Y"
5728 proc trace_current_diff_path
{varname args
} {
5729 global current_diff_path diff_actions file_states
5730 if {$current_diff_path eq
{}} {
5736 set p
$current_diff_path
5737 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
5739 set p
[escape_path
$p]
5743 .vpane.lower.
diff.header.status configure
-text $s
5744 .vpane.lower.
diff.header.
file configure
-text $f
5745 .vpane.lower.
diff.header.path configure
-text $p
5746 foreach w
$diff_actions {
5750 trace add variable current_diff_path
write trace_current_diff_path
5752 frame .vpane.lower.
diff.header
-background orange
5753 label .vpane.lower.
diff.header.status \
5754 -background orange \
5755 -width $max_status_desc \
5759 label .vpane.lower.
diff.header.
file \
5760 -background orange \
5764 label .vpane.lower.
diff.header.path \
5765 -background orange \
5769 pack .vpane.lower.
diff.header.status
-side left
5770 pack .vpane.lower.
diff.header.
file -side left
5771 pack .vpane.lower.
diff.header.path
-fill x
5772 set ctxm .vpane.lower.
diff.header.ctxm
5773 menu
$ctxm -tearoff 0
5782 -- $current_diff_path
5784 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5785 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
5789 frame .vpane.lower.
diff.body
5790 set ui_diff .vpane.lower.
diff.body.t
5791 text
$ui_diff -background white
-borderwidth 0 \
5792 -width 80 -height 15 -wrap none \
5794 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
5795 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
5797 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
5798 -command [list
$ui_diff xview
]
5799 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
5800 -command [list
$ui_diff yview
]
5801 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
5802 pack .vpane.lower.
diff.body.sby
-side right
-fill y
5803 pack
$ui_diff -side left
-fill both
-expand 1
5804 pack .vpane.lower.
diff.header
-side top
-fill x
5805 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
5807 $ui_diff tag conf d_cr
-elide true
5808 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
5809 $ui_diff tag conf d_
+ -foreground {#00a000}
5810 $ui_diff tag conf d_-
-foreground red
5812 $ui_diff tag conf d_
++ -foreground {#00a000}
5813 $ui_diff tag conf d_--
-foreground red
5814 $ui_diff tag conf d_
+s \
5815 -foreground {#00a000} \
5816 -background {#e2effa}
5817 $ui_diff tag conf d_-s \
5819 -background {#e2effa}
5820 $ui_diff tag conf d_s
+ \
5821 -foreground {#00a000} \
5823 $ui_diff tag conf d_s- \
5827 $ui_diff tag conf d
<<<<<<< \
5828 -foreground orange \
5830 $ui_diff tag conf d
======= \
5831 -foreground orange \
5833 $ui_diff tag conf d
>>>>>>> \
5834 -foreground orange \
5837 $ui_diff tag raise sel
5839 # -- Diff Body Context Menu
5841 set ctxm .vpane.lower.
diff.body.ctxm
5842 menu
$ctxm -tearoff 0
5846 -command reshow_diff
5847 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5851 -command {tk_textCopy
$ui_diff}
5852 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5854 -label {Select All
} \
5856 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
5857 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5862 $ui_diff tag add sel
0.0 end
5863 tk_textCopy
$ui_diff
5864 $ui_diff tag remove sel
0.0 end
5866 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5869 -label {Apply
/Reverse Hunk
} \
5871 -command {apply_hunk
$cursorX $cursorY}
5872 set ui_diff_applyhunk
[$ctxm index last
]
5873 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
5876 -label {Decrease Font Size
} \
5878 -command {incr_font_size font_diff
-1}
5879 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5881 -label {Increase Font Size
} \
5883 -command {incr_font_size font_diff
1}
5884 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5887 -label {Show Less Context
} \
5889 -command {if {$repo_config(gui.diffcontext
) >= 2} {
5890 incr repo_config
(gui.diffcontext
) -1
5893 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5895 -label {Show More Context
} \
5898 incr repo_config
(gui.diffcontext
)
5901 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
5903 $ctxm add
command -label {Options...
} \
5906 bind_button3
$ui_diff "
5909 if {\$ui_index eq \$current_diff_side} {
5910 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
5912 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
5914 tk_popup $ctxm %X %Y
5916 unset ui_diff_applyhunk
5920 label .status
-textvariable ui_status_value \
5926 pack .status
-anchor w
-side bottom
-fill x
5931 set gm
$repo_config(gui.geometry
)
5932 wm geometry .
[lindex
$gm 0]
5933 .vpane sash place
0 \
5934 [lindex
[.vpane sash coord
0] 0] \
5936 .vpane.files sash place
0 \
5938 [lindex
[.vpane.files sash coord
0] 1]
5944 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
5945 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
5946 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
5947 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
5948 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
5949 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
5950 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
5951 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
5952 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
5953 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
5954 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
5956 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
5957 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
5958 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
5959 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
5960 bind $ui_diff <$M1B-Key-v> {break}
5961 bind $ui_diff <$M1B-Key-V> {break}
5962 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
5963 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
5964 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
5965 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
5966 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
5967 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
5968 bind $ui_diff <Button-1
> {focus
%W
}
5970 if {[is_enabled branch
]} {
5971 bind .
<$M1B-Key-n> do_create_branch
5972 bind .
<$M1B-Key-N> do_create_branch
5975 bind all
<Key-F5
> do_rescan
5976 bind all
<$M1B-Key-r> do_rescan
5977 bind all
<$M1B-Key-R> do_rescan
5978 bind .
<$M1B-Key-s> do_signoff
5979 bind .
<$M1B-Key-S> do_signoff
5980 bind .
<$M1B-Key-i> do_add_all
5981 bind .
<$M1B-Key-I> do_add_all
5982 bind .
<$M1B-Key-Return> do_commit
5983 foreach i
[list
$ui_index $ui_workdir] {
5984 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
5985 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
5986 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
5990 set file_lists
($ui_index) [list
]
5991 set file_lists
($ui_workdir) [list
]
5993 wm title .
"[appname] ([file normalize [file dirname [gitdir]]])"
5994 focus
-force $ui_comm
5996 # -- Warn the user about environmental problems. Cygwin's Tcl
5997 # does *not* pass its env array onto any processes it spawns.
5998 # This means that git processes get none of our environment.
6003 set msg
"Possible environment issues exist.
6005 The following environment variables are probably
6006 going to be ignored by any Git subprocess run
6010 foreach name
[array names env
] {
6011 switch
-regexp -- $name {
6012 {^GIT_INDEX_FILE$
} -
6013 {^GIT_OBJECT_DIRECTORY$
} -
6014 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
6016 {^GIT_EXTERNAL_DIFF$
} -
6020 {^GIT_CONFIG_LOCAL$
} -
6021 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
6022 append msg
" - $name\n"
6025 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
6026 append msg
" - $name\n"
6028 set suggest_user
$name
6032 if {$ignored_env > 0} {
6034 This is due to a known issue with the
6035 Tcl binary distributed by Cygwin."
6037 if {$suggest_user ne
{}} {
6040 A good replacement for $suggest_user
6041 is placing values for the user.name and
6042 user.email settings into your personal
6048 unset ignored_env msg suggest_user name
6051 # -- Only initialize complex UI if we are going to stay running.
6053 if {[is_enabled transport
]} {
6057 populate_branch_menu
6062 # -- Only suggest a gc run if we are going to stay running.
6064 if {[is_enabled multicommit
]} {
6065 set object_limit
2000
6066 if {[is_Windows
]} {set object_limit
200}
6067 regexp
{^
([0-9]+) objects
,} [git count-objects
] _junk objects_current
6068 if {$objects_current >= $object_limit} {
6070 "This repository currently has $objects_current loose objects.
6072 To maintain optimal performance it is strongly
6073 recommended that you compress the database
6074 when more than $object_limit loose objects exist.
6076 Compress the database now?"] eq
yes} {
6080 unset object_limit _junk objects_current
6083 lock_index begin-read