2 # Tcl ignores the next line -*- tcl -*- \
6 Copyright ©
2006 Shawn Pearce
, Paul Mackerras.
10 This program is free software
; it may be used
, copied
, modified
11 and distributed under the terms of the GNU General Public Licence
,
12 either version
2, or
(at your option
) any later version.
}
14 set appname
[lindex
[file split $argv0] end
]
17 ######################################################################
21 proc is_many_config
{name
} {
22 switch
-glob -- $name {
31 proc load_config
{include_global
} {
32 global repo_config global_config default_config
34 array
unset global_config
35 if {$include_global} {
37 set fd_rc
[open
"| git repo-config --global --list" r
]
38 while {[gets
$fd_rc line
] >= 0} {
39 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
40 if {[is_many_config
$name]} {
41 lappend global_config
($name) $value
43 set global_config
($name) $value
51 array
unset repo_config
53 set fd_rc
[open
"| git repo-config --list" r
]
54 while {[gets
$fd_rc line
] >= 0} {
55 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
56 if {[is_many_config
$name]} {
57 lappend repo_config
($name) $value
59 set repo_config
($name) $value
66 foreach name
[array names default_config
] {
67 if {[catch
{set v
$global_config($name)}]} {
68 set global_config
($name) $default_config($name)
70 if {[catch
{set v
$repo_config($name)}]} {
71 set repo_config
($name) $default_config($name)
77 global default_config font_descs
78 global repo_config global_config
79 global repo_config_new global_config_new
81 foreach option
$font_descs {
82 set name
[lindex
$option 0]
83 set font
[lindex
$option 1]
84 font configure
$font \
85 -family $global_config_new(gui.
$font^^family
) \
86 -size $global_config_new(gui.
$font^^size
)
87 font configure
${font}bold \
88 -family $global_config_new(gui.
$font^^family
) \
89 -size $global_config_new(gui.
$font^^size
)
90 set global_config_new
(gui.
$name) [font configure
$font]
91 unset global_config_new
(gui.
$font^^family
)
92 unset global_config_new
(gui.
$font^^size
)
95 foreach name
[array names default_config
] {
96 set value
$global_config_new($name)
97 if {$value ne
$global_config($name)} {
98 if {$value eq
$default_config($name)} {
99 catch
{exec git repo-config
--global --unset $name}
101 regsub
-all "\[{}\]" $value {"} value
102 exec git repo-config --global $name $value
104 set global_config($name) $value
105 if {$value eq $repo_config($name)} {
106 catch {exec git repo-config --unset $name}
107 set repo_config($name) $value
112 foreach name [array names default_config] {
113 set value $repo_config_new($name)
114 if {$value ne $repo_config($name)} {
115 if {$value eq $global_config($name)} {
116 catch {exec git repo-config --unset $name}
118 regsub -all "\
[{}\
]" $value {"} value
119 exec git repo-config
$name $value
121 set repo_config
($name) $value
126 proc error_popup
{msg
} {
127 global gitdir appname
132 append title
[lindex \
133 [file split [file normalize
[file dirname $gitdir]]] \
137 set cmd
[list tk_messageBox \
140 -title "$title: error" \
142 if {[winfo ismapped .
]} {
143 lappend cmd
-parent .
148 proc warn_popup
{msg
} {
149 global gitdir appname
154 append title
[lindex \
155 [file split [file normalize
[file dirname $gitdir]]] \
159 set cmd
[list tk_messageBox \
162 -title "$title: warning" \
164 if {[winfo ismapped .
]} {
165 lappend cmd
-parent .
170 proc info_popup
{msg
} {
171 global gitdir appname
176 append title
[lindex \
177 [file split [file normalize
[file dirname $gitdir]]] \
189 ######################################################################
193 if { [catch
{set gitdir
$env(GIT_DIR
)}]
194 && [catch
{set gitdir
[exec git rev-parse
--git-dir]} err
]} {
195 catch
{wm withdraw .
}
196 error_popup
"Cannot find the git directory:\n\n$err"
199 if {![file isdirectory
$gitdir]} {
200 catch
{wm withdraw .
}
201 error_popup
"Git directory not found:\n\n$gitdir"
204 if {[lindex
[file split $gitdir] end
] ne
{.git
}} {
205 catch
{wm withdraw .
}
206 error_popup
"Cannot use funny .git directory:\n\n$gitdir"
209 if {[catch
{cd [file dirname $gitdir]} err
]} {
210 catch
{wm withdraw .
}
211 error_popup
"No working directory [file dirname $gitdir]:\n\n$err"
216 if {$appname eq
{git-citool
}} {
220 ######################################################################
228 set disable_on_lock
[list
]
229 set index_lock_type none
231 proc lock_index
{type} {
232 global index_lock_type disable_on_lock
234 if {$index_lock_type eq
{none
}} {
235 set index_lock_type
$type
236 foreach w
$disable_on_lock {
237 uplevel
#0 $w disabled
240 } elseif
{$index_lock_type eq
"begin-$type"} {
241 set index_lock_type
$type
247 proc unlock_index
{} {
248 global index_lock_type disable_on_lock
250 set index_lock_type none
251 foreach w
$disable_on_lock {
256 ######################################################################
260 proc repository_state
{ctvar hdvar mhvar
} {
262 upvar
$ctvar ct
$hdvar hd
$mhvar mh
266 if {[catch
{set hd
[exec git rev-parse
--verify HEAD
]}]} {
272 set merge_head
[file join $gitdir MERGE_HEAD
]
273 if {[file exists
$merge_head]} {
275 set fd_mh
[open
$merge_head r
]
276 while {[gets
$fd_mh line
] >= 0} {
287 global PARENT empty_tree
289 set p
[lindex
$PARENT 0]
293 if {$empty_tree eq
{}} {
294 set empty_tree
[exec git mktree
<< {}]
299 proc rescan
{after
} {
300 global HEAD PARENT MERGE_HEAD commit_type
301 global ui_index ui_other ui_status_value ui_comm
302 global rescan_active file_states
305 if {$rescan_active > 0 ||
![lock_index
read]} return
307 repository_state newType newHEAD newMERGE_HEAD
308 if {[string match amend
* $commit_type]
309 && $newType eq
{normal
}
310 && $newHEAD eq
$HEAD} {
314 set MERGE_HEAD
$newMERGE_HEAD
315 set commit_type
$newType
318 array
unset file_states
320 if {![$ui_comm edit modified
]
321 ||
[string trim
[$ui_comm get
0.0 end
]] eq
{}} {
322 if {[load_message GITGUI_MSG
]} {
323 } elseif
{[load_message MERGE_MSG
]} {
324 } elseif
{[load_message SQUASH_MSG
]} {
327 $ui_comm edit modified false
330 if {$repo_config(gui.trustmtime
) eq
{true
}} {
331 rescan_stage2
{} $after
334 set ui_status_value
{Refreshing
file status...
}
335 set cmd
[list git update-index
]
337 lappend cmd
--unmerged
338 lappend cmd
--ignore-missing
339 lappend cmd
--refresh
340 set fd_rf
[open
"| $cmd" r
]
341 fconfigure
$fd_rf -blocking 0 -translation binary
342 fileevent
$fd_rf readable \
343 [list rescan_stage2
$fd_rf $after]
347 proc rescan_stage2
{fd after
} {
348 global gitdir ui_status_value
349 global rescan_active buf_rdi buf_rdf buf_rlo
353 if {![eof
$fd]} return
357 set ls_others
[list | git ls-files
--others -z \
358 --exclude-per-directory=.gitignore
]
359 set info_exclude
[file join $gitdir info exclude
]
360 if {[file readable
$info_exclude]} {
361 lappend ls_others
"--exclude-from=$info_exclude"
369 set ui_status_value
{Scanning
for modified files ...
}
370 set fd_di
[open
"| git diff-index --cached -z [PARENT]" r
]
371 set fd_df
[open
"| git diff-files -z" r
]
372 set fd_lo
[open
$ls_others r
]
374 fconfigure
$fd_di -blocking 0 -translation binary
375 fconfigure
$fd_df -blocking 0 -translation binary
376 fconfigure
$fd_lo -blocking 0 -translation binary
377 fileevent
$fd_di readable
[list read_diff_index
$fd_di $after]
378 fileevent
$fd_df readable
[list read_diff_files
$fd_df $after]
379 fileevent
$fd_lo readable
[list read_ls_others
$fd_lo $after]
382 proc load_message
{file} {
383 global gitdir ui_comm
385 set f
[file join $gitdir $file]
386 if {[file isfile
$f]} {
387 if {[catch
{set fd
[open
$f r
]}]} {
390 set content
[string trim
[read $fd]]
392 $ui_comm delete
0.0 end
393 $ui_comm insert end
$content
399 proc read_diff_index
{fd after
} {
402 append buf_rdi
[read $fd]
404 set n
[string length
$buf_rdi]
406 set z1
[string first
"\0" $buf_rdi $c]
409 set z2
[string first
"\0" $buf_rdi $z1]
413 set i
[split [string range
$buf_rdi $c [expr {$z1 - 2}]] { }]
415 [string range
$buf_rdi $z1 [expr {$z2 - 1}]] \
417 [list
[lindex
$i 0] [lindex
$i 2]] \
423 set buf_rdi
[string range
$buf_rdi $c end
]
428 rescan_done
$fd buf_rdi
$after
431 proc read_diff_files
{fd after
} {
434 append buf_rdf
[read $fd]
436 set n
[string length
$buf_rdf]
438 set z1
[string first
"\0" $buf_rdf $c]
441 set z2
[string first
"\0" $buf_rdf $z1]
445 set i
[split [string range
$buf_rdf $c [expr {$z1 - 2}]] { }]
447 [string range
$buf_rdf $z1 [expr {$z2 - 1}]] \
450 [list
[lindex
$i 0] [lindex
$i 2]]
455 set buf_rdf
[string range
$buf_rdf $c end
]
460 rescan_done
$fd buf_rdf
$after
463 proc read_ls_others
{fd after
} {
466 append buf_rlo
[read $fd]
467 set pck
[split $buf_rlo "\0"]
468 set buf_rlo
[lindex
$pck end
]
469 foreach p
[lrange
$pck 0 end-1
] {
472 rescan_done
$fd buf_rlo
$after
475 proc rescan_done
{fd buf after
} {
477 global file_states repo_config
480 if {![eof
$fd]} return
483 if {[incr rescan_active
-1] > 0} return
489 if {$repo_config(gui.partialinclude
) ne
{true
}} {
491 foreach path
[array names file_states
] {
492 switch
-- [lindex
$file_states($path) 0] {
494 MM
{lappend pathList
$path}
497 if {$pathList ne
{}} {
499 "Updating included files" \
501 [concat
{reshow_diff
;} $after]
510 proc prune_selection
{} {
511 global file_states selected_paths
513 foreach path
[array names selected_paths
] {
514 if {[catch
{set still_here
$file_states($path)}]} {
515 unset selected_paths
($path)
520 ######################################################################
525 global ui_diff current_diff ui_index ui_other
527 $ui_diff conf
-state normal
528 $ui_diff delete
0.0 end
529 $ui_diff conf
-state disabled
533 $ui_index tag remove in_diff
0.0 end
534 $ui_other tag remove in_diff
0.0 end
537 proc reshow_diff
{} {
538 global current_diff ui_status_value file_states
540 if {$current_diff eq
{}
541 ||
[catch
{set s
$file_states($current_diff)}]} {
544 show_diff
$current_diff
548 proc handle_empty_diff
{} {
549 global current_diff file_states file_lists
551 set path
$current_diff
552 set s
$file_states($path)
553 if {[lindex
$s 0] ne
{_M
}} return
555 info_popup
"No differences detected.
557 [short_path $path] has no changes.
559 The modification date of this file was updated
560 by another application and you currently have
561 the Trust File Modification Timestamps option
562 enabled, so Git did not automatically detect
563 that there are no content differences in this
566 This file will now be removed from the modified
567 files list, to prevent possible confusion.
569 if {[catch
{exec git update-index
-- $path} err
]} {
570 error_popup
"Failed to refresh index:\n\n$err"
574 set old_w
[mapcol
[lindex
$file_states($path) 0] $path]
575 set lno
[lsearch
-sorted $file_lists($old_w) $path]
577 set file_lists
($old_w) \
578 [lreplace
$file_lists($old_w) $lno $lno]
580 $old_w conf
-state normal
581 $old_w delete
$lno.0 [expr {$lno + 1}].0
582 $old_w conf
-state disabled
586 proc show_diff
{path
{w
{}} {lno
{}}} {
587 global file_states file_lists
588 global is_3way_diff diff_active repo_config
589 global ui_diff current_diff ui_status_value
591 if {$diff_active ||
![lock_index
read]} return
594 if {$w eq
{} ||
$lno == {}} {
595 foreach w
[array names file_lists
] {
596 set lno
[lsearch
-sorted $file_lists($w) $path]
603 if {$w ne
{} && $lno >= 1} {
604 $w tag add in_diff
$lno.0 [expr {$lno + 1}].0
607 set s
$file_states($path)
611 set current_diff
$path
612 set ui_status_value
"Loading diff of [escape_path $path]..."
614 set cmd
[list | git diff-index
]
615 lappend cmd
--no-color
616 if {$repo_config(gui.diffcontext
) > 0} {
617 lappend cmd
"-U$repo_config(gui.diffcontext)"
627 set fd
[open
$path r
]
628 set content
[read $fd]
633 set ui_status_value
"Unable to display [escape_path $path]"
634 error_popup
"Error loading file:\n\n$err"
637 $ui_diff conf
-state normal
638 $ui_diff insert end
$content
639 $ui_diff conf
-state disabled
642 set ui_status_value
{Ready.
}
651 if {[catch
{set fd
[open
$cmd r
]} err
]} {
654 set ui_status_value
"Unable to display [escape_path $path]"
655 error_popup
"Error loading diff:\n\n$err"
659 fconfigure
$fd -blocking 0 -translation auto
660 fileevent
$fd readable
[list read_diff
$fd]
663 proc read_diff
{fd
} {
664 global ui_diff ui_status_value is_3way_diff diff_active
667 $ui_diff conf
-state normal
668 while {[gets
$fd line
] >= 0} {
669 # -- Cleanup uninteresting diff header lines.
671 if {[string match
{diff --git *} $line]} continue
672 if {[string match
{diff --combined *} $line]} continue
673 if {[string match
{--- *} $line]} continue
674 if {[string match
{+++ *} $line]} continue
675 if {$line eq
{deleted
file mode
120000}} {
676 set line
"deleted symlink"
679 # -- Automatically detect if this is a 3 way diff.
681 if {[string match
{@@@
*} $line]} {set is_3way_diff
1}
683 # -- Reformat a 3 way diff, 'cause its too weird.
686 set op
[string range
$line 0 1]
689 {++} {set tags d_
+ ; set op
{ +}}
690 {--} {set tags d_-
; set op
{ -}}
691 { +} {set tags d_
++; set op
{++}}
692 { -} {set tags d_--
; set op
{--}}
693 {+ } {set tags d_-
+; set op
{-+}}
694 {- } {set tags d_
+-; set op
{+-}}
695 default
{set tags
{}}
697 set line
[string replace
$line 0 1 $op]
699 switch
-- [string index
$line 0] {
703 default
{set tags
{}}
706 $ui_diff insert end
$line $tags
707 $ui_diff insert end
"\n" $tags
709 $ui_diff conf
-state disabled
715 set ui_status_value
{Ready.
}
717 if {$repo_config(gui.trustmtime
) eq
{true
}
718 && [$ui_diff index end
] eq
{2.0}} {
724 ######################################################################
728 proc load_last_commit
{} {
729 global HEAD PARENT MERGE_HEAD commit_type ui_comm
731 if {[llength
$PARENT] == 0} {
732 error_popup
{There is nothing to amend.
734 You are about to create the initial commit.
735 There is no commit before this to amend.
740 repository_state curType curHEAD curMERGE_HEAD
741 if {$curType eq
{merge
}} {
742 error_popup
{Cannot amend
while merging.
744 You are currently
in the middle of a merge that
745 has not been fully completed. You cannot amend
746 the prior commit unless you first abort the
747 current merge activity.
755 set fd
[open
"| git cat-file commit $curHEAD" r
]
756 while {[gets
$fd line
] > 0} {
757 if {[string match
{parent
*} $line]} {
758 lappend parents
[string range
$line 7 end
]
761 set msg
[string trim
[read $fd]]
764 error_popup
"Error loading commit data for amend:\n\n$err"
770 set MERGE_HEAD
[list
]
771 switch
-- [llength
$parents] {
772 0 {set commit_type amend-initial
}
773 1 {set commit_type amend
}
774 default
{set commit_type amend-merge
}
777 $ui_comm delete
0.0 end
778 $ui_comm insert end
$msg
780 $ui_comm edit modified false
781 rescan
{set ui_status_value
{Ready.
}}
784 proc create_new_commit
{} {
785 global commit_type ui_comm
787 set commit_type normal
788 $ui_comm delete
0.0 end
790 $ui_comm edit modified false
791 rescan
{set ui_status_value
{Ready.
}}
794 set GIT_COMMITTER_IDENT
{}
796 proc committer_ident
{} {
797 global GIT_COMMITTER_IDENT
799 if {$GIT_COMMITTER_IDENT eq
{}} {
800 if {[catch
{set me
[exec git var GIT_COMMITTER_IDENT
]} err
]} {
801 error_popup
"Unable to obtain your identity:\n\n$err"
804 if {![regexp
{^
(.
*) [0-9]+ [-+0-9]+$
} \
805 $me me GIT_COMMITTER_IDENT
]} {
806 error_popup
"Invalid GIT_COMMITTER_IDENT:\n\n$me"
811 return $GIT_COMMITTER_IDENT
814 proc commit_tree
{} {
815 global HEAD commit_type file_states ui_comm repo_config
817 if {![lock_index update
]} return
818 if {[committer_ident
] eq
{}} return
820 # -- Our in memory state should match the repository.
822 repository_state curType curHEAD curMERGE_HEAD
823 if {[string match amend
* $commit_type]
824 && $curType eq
{normal
}
825 && $curHEAD eq
$HEAD} {
826 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
827 info_popup
{Last scanned state does not match repository state.
829 Another Git program has modified this repository
830 since the last scan. A rescan must be performed
831 before another commit can be created.
833 The rescan will be automatically started now.
836 rescan
{set ui_status_value
{Ready.
}}
840 # -- At least one file should differ in the index.
843 foreach path
[array names file_states
] {
844 switch
-glob -- [lindex
$file_states($path) 0] {
848 M?
{set files_ready
1; break}
850 error_popup
"Unmerged files cannot be committed.
852 File [short_path $path] has merge conflicts.
853 You must resolve them and include the file before committing.
859 error_popup
"Unknown file state [lindex $s 0] detected.
861 File [short_path $path] cannot be committed by this program.
867 error_popup
{No included files to commit.
869 You must include
at least
1 file before you can commit.
875 # -- A message is required.
877 set msg
[string trim
[$ui_comm get
1.0 end
]]
879 error_popup
{Please supply a commit message.
881 A good commit message has the following format
:
883 - First line
: Describe
in one sentance what you did.
885 - Remaining lines
: Describe why this change is good.
891 # -- Update included files if partialincludes are off.
893 if {$repo_config(gui.partialinclude
) ne
{true
}} {
895 foreach path
[array names file_states
] {
896 switch
-glob -- [lindex
$file_states($path) 0] {
898 M?
{lappend pathList
$path}
901 if {$pathList ne
{}} {
904 "Updating included files" \
906 [concat
{lock_index update
;} \
907 [list commit_prehook
$curHEAD $msg]]
912 commit_prehook
$curHEAD $msg
915 proc commit_prehook
{curHEAD msg
} {
916 global gitdir ui_status_value pch_error
918 set pchook
[file join $gitdir hooks pre-commit
]
920 # On Cygwin [file executable] might lie so we need to ask
921 # the shell if the hook is executable. Yes that's annoying.
923 if {[is_Windows
] && [file isfile
$pchook]} {
924 set pchook
[list sh
-c [concat \
925 "if test -x \"$pchook\";" \
926 "then exec \"$pchook\" 2>&1;" \
928 } elseif
{[file executable
$pchook]} {
929 set pchook
[list
$pchook |
& cat]
931 commit_writetree
$curHEAD $msg
935 set ui_status_value
{Calling pre-commit hook...
}
937 set fd_ph
[open
"| $pchook" r
]
938 fconfigure
$fd_ph -blocking 0 -translation binary
939 fileevent
$fd_ph readable \
940 [list commit_prehook_wait
$fd_ph $curHEAD $msg]
943 proc commit_prehook_wait
{fd_ph curHEAD msg
} {
944 global pch_error ui_status_value
946 append pch_error
[read $fd_ph]
947 fconfigure
$fd_ph -blocking 1
949 if {[catch
{close
$fd_ph}]} {
950 set ui_status_value
{Commit declined by pre-commit hook.
}
951 hook_failed_popup pre-commit
$pch_error
954 commit_writetree
$curHEAD $msg
959 fconfigure
$fd_ph -blocking 0
962 proc commit_writetree
{curHEAD msg
} {
963 global ui_status_value
965 set ui_status_value
{Committing changes...
}
966 set fd_wt
[open
"| git write-tree" r
]
967 fileevent
$fd_wt readable \
968 [list commit_committree
$fd_wt $curHEAD $msg]
971 proc commit_committree
{fd_wt curHEAD msg
} {
972 global HEAD PARENT MERGE_HEAD commit_type
973 global single_commit gitdir
974 global ui_status_value ui_comm selected_commit_type
975 global file_states selected_paths rescan_active
978 if {$tree_id eq
{} ||
[catch
{close
$fd_wt} err
]} {
979 error_popup
"write-tree failed:\n\n$err"
980 set ui_status_value
{Commit failed.
}
985 # -- Create the commit.
987 set cmd
[list git commit-tree
$tree_id]
988 set parents
[concat
$PARENT $MERGE_HEAD]
989 if {[llength
$parents] > 0} {
994 # git commit-tree writes to stderr during initial commit.
995 lappend cmd
2>/dev
/null
998 if {[catch
{set cmt_id
[eval exec $cmd]} err
]} {
999 error_popup
"commit-tree failed:\n\n$err"
1000 set ui_status_value
{Commit failed.
}
1005 # -- Update the HEAD ref.
1008 if {$commit_type ne
{normal
}} {
1009 append reflogm
" ($commit_type)"
1011 set i
[string first
"\n" $msg]
1013 append reflogm
{: } [string range
$msg 0 [expr {$i - 1}]]
1015 append reflogm
{: } $msg
1017 set cmd
[list git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD]
1018 if {[catch
{eval exec $cmd} err
]} {
1019 error_popup
"update-ref failed:\n\n$err"
1020 set ui_status_value
{Commit failed.
}
1025 # -- Cleanup after ourselves.
1027 catch
{file delete
[file join $gitdir MERGE_HEAD
]}
1028 catch
{file delete
[file join $gitdir MERGE_MSG
]}
1029 catch
{file delete
[file join $gitdir SQUASH_MSG
]}
1030 catch
{file delete
[file join $gitdir GITGUI_MSG
]}
1032 # -- Let rerere do its thing.
1034 if {[file isdirectory
[file join $gitdir rr-cache
]]} {
1035 catch
{exec git rerere
}
1038 # -- Run the post-commit hook.
1040 set pchook
[file join $gitdir hooks post-commit
]
1041 if {[is_Windows
] && [file isfile
$pchook]} {
1042 set pchook
[list sh
-c [concat \
1043 "if test -x \"$pchook\";" \
1044 "then exec \"$pchook\";" \
1046 } elseif
{![file executable
$pchook]} {
1049 if {$pchook ne
{}} {
1050 catch
{exec $pchook &}
1053 $ui_comm delete
0.0 end
1055 $ui_comm edit modified false
1057 if {$single_commit} do_quit
1059 # -- Update in memory status
1061 set selected_commit_type new
1062 set commit_type normal
1065 set MERGE_HEAD
[list
]
1067 foreach path
[array names file_states
] {
1068 set s
$file_states($path)
1070 switch
-glob -- $m {
1078 unset file_states
($path)
1079 catch
{unset selected_paths
($path)}
1082 set file_states
($path) [list _O
[lindex
$s 1] {} {}]
1088 set file_states
($path) [list \
1089 _
[string index
$m 1] \
1100 set ui_status_value \
1101 "Changes committed as [string range $cmt_id 0 7]."
1104 ######################################################################
1108 proc fetch_from
{remote
} {
1109 set w
[new_console
"fetch $remote" \
1110 "Fetching new changes from $remote"]
1111 set cmd
[list git fetch
]
1113 console_exec
$w $cmd
1116 proc pull_remote
{remote branch
} {
1117 global HEAD commit_type file_states repo_config
1119 if {![lock_index update
]} return
1121 # -- Our in memory state should match the repository.
1123 repository_state curType curHEAD curMERGE_HEAD
1124 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1125 error_popup
{Last scanned state does not match repository state.
1127 Its highly likely that another Git program modified the
1128 repository since our last scan. A rescan is required
1129 before a pull can be started.
1132 rescan
{set ui_status_value
{Ready.
}}
1136 # -- No differences should exist before a pull.
1138 if {[array size file_states
] != 0} {
1139 error_popup
{Uncommitted but modified files are present.
1141 You should not perform a pull with unmodified files
in your working
1142 directory as Git would be unable to recover from an incorrect merge.
1144 Commit or throw away all changes before starting a pull operation.
1150 set w
[new_console
"pull $remote $branch" \
1151 "Pulling new changes from branch $branch in $remote"]
1152 set cmd
[list git pull
]
1153 if {$repo_config(gui.pullsummary
) eq
{false
}} {
1154 lappend cmd
--no-summary
1158 console_exec
$w $cmd [list post_pull_remote
$remote $branch]
1161 proc post_pull_remote
{remote branch success
} {
1162 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1163 global ui_status_value
1167 repository_state commit_type HEAD MERGE_HEAD
1169 set selected_commit_type new
1170 set ui_status_value
"Pulling $branch from $remote complete."
1172 rescan
[list
set ui_status_value \
1173 "Conflicts detected while pulling $branch from $remote."]
1177 proc push_to
{remote
} {
1178 set w
[new_console
"push $remote" \
1179 "Pushing changes to $remote"]
1180 set cmd
[list git push
]
1182 console_exec
$w $cmd
1185 ######################################################################
1189 proc mapcol
{state path
} {
1190 global all_cols ui_other
1192 if {[catch
{set r
$all_cols($state)}]} {
1193 puts
"error: no column for state={$state} $path"
1199 proc mapicon
{state path
} {
1202 if {[catch
{set r
$all_icons($state)}]} {
1203 puts
"error: no icon for state={$state} $path"
1209 proc mapdesc
{state path
} {
1212 if {[catch
{set r
$all_descs($state)}]} {
1213 puts
"error: no desc for state={$state} $path"
1219 proc escape_path
{path
} {
1220 regsub
-all "\n" $path "\\n" path
1224 proc short_path
{path
} {
1225 return [escape_path
[lindex
[file split $path] end
]]
1229 set null_sha1
[string repeat
0 40]
1231 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1232 global file_states next_icon_id null_sha1
1234 set s0
[string index
$new_state 0]
1235 set s1
[string index
$new_state 1]
1237 if {[catch
{set info
$file_states($path)}]} {
1239 set icon n
[incr next_icon_id
]
1241 set state
[lindex
$info 0]
1242 set icon
[lindex
$info 1]
1243 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1244 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1247 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1248 elseif
{$s0 eq
{_
}} {set s0 _
}
1250 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1251 elseif
{$s1 eq
{_
}} {set s1 _
}
1253 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1254 set head_info
[list
0 $null_sha1]
1255 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1256 && $head_info eq
{}} {
1257 set head_info
$index_info
1260 set file_states
($path) [list
$s0$s1 $icon \
1261 $head_info $index_info \
1266 proc display_file
{path state
} {
1267 global file_states file_lists selected_paths
1269 set old_m
[merge_state
$path $state]
1270 set s
$file_states($path)
1271 set new_m
[lindex
$s 0]
1272 set new_w
[mapcol
$new_m $path]
1273 set old_w
[mapcol
$old_m $path]
1274 set new_icon
[mapicon
$new_m $path]
1276 if {$new_w ne
$old_w} {
1277 set lno
[lsearch
-sorted $file_lists($old_w) $path]
1280 $old_w conf
-state normal
1281 $old_w delete
$lno.0 [expr {$lno + 1}].0
1282 $old_w conf
-state disabled
1285 lappend file_lists
($new_w) $path
1286 set file_lists
($new_w) [lsort
$file_lists($new_w)]
1287 set lno
[lsearch
-sorted $file_lists($new_w) $path]
1289 $new_w conf
-state normal
1290 $new_w image create
$lno.0 \
1291 -align center
-padx 5 -pady 1 \
1292 -name [lindex
$s 1] \
1294 $new_w insert
$lno.1 "[escape_path $path]\n"
1295 if {[catch
{set in_sel
$selected_paths($path)}]} {
1299 $new_w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1301 $new_w conf
-state disabled
1302 } elseif
{$new_icon ne
[mapicon
$old_m $path]} {
1303 $new_w conf
-state normal
1304 $new_w image conf
[lindex
$s 1] -image $new_icon
1305 $new_w conf
-state disabled
1309 proc display_all_files
{} {
1310 global ui_index ui_other
1311 global file_states file_lists
1312 global last_clicked selected_paths
1314 $ui_index conf
-state normal
1315 $ui_other conf
-state normal
1317 $ui_index delete
0.0 end
1318 $ui_other delete
0.0 end
1321 set file_lists
($ui_index) [list
]
1322 set file_lists
($ui_other) [list
]
1324 foreach path
[lsort
[array names file_states
]] {
1325 set s
$file_states($path)
1327 set w
[mapcol
$m $path]
1328 lappend file_lists
($w) $path
1329 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1330 $w image create end \
1331 -align center
-padx 5 -pady 1 \
1332 -name [lindex
$s 1] \
1333 -image [mapicon
$m $path]
1334 $w insert end
"[escape_path $path]\n"
1335 if {[catch
{set in_sel
$selected_paths($path)}]} {
1339 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1343 $ui_index conf
-state disabled
1344 $ui_other conf
-state disabled
1347 proc update_indexinfo
{msg pathList after
} {
1348 global update_index_cp ui_status_value
1350 if {![lock_index update
]} return
1352 set update_index_cp
0
1353 set pathList
[lsort
$pathList]
1354 set totalCnt
[llength
$pathList]
1355 set batch [expr {int
($totalCnt * .01) + 1}]
1356 if {$batch > 25} {set batch 25}
1358 set ui_status_value
[format \
1359 "$msg... %i/%i files (%.2f%%)" \
1363 set fd
[open
"| git update-index -z --index-info" w
]
1369 fileevent
$fd writable
[list \
1370 write_update_indexinfo \
1380 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1381 global update_index_cp ui_status_value
1382 global file_states current_diff
1384 if {$update_index_cp >= $totalCnt} {
1391 for {set i
$batch} \
1392 {$update_index_cp < $totalCnt && $i > 0} \
1394 set path
[lindex
$pathList $update_index_cp]
1395 incr update_index_cp
1397 set s
$file_states($path)
1398 switch
-glob -- [lindex
$s 0] {
1404 set info
[lindex
$s 2]
1405 if {$info eq
{}} continue
1407 puts
-nonewline $fd $info
1408 puts
-nonewline $fd "\t"
1409 puts
-nonewline $fd $path
1410 puts
-nonewline $fd "\0"
1411 display_file
$path $new
1414 set ui_status_value
[format \
1415 "$msg... %i/%i files (%.2f%%)" \
1418 [expr {100.0 * $update_index_cp / $totalCnt}]]
1421 proc update_index
{msg pathList after
} {
1422 global update_index_cp ui_status_value
1424 if {![lock_index update
]} return
1426 set update_index_cp
0
1427 set pathList
[lsort
$pathList]
1428 set totalCnt
[llength
$pathList]
1429 set batch [expr {int
($totalCnt * .01) + 1}]
1430 if {$batch > 25} {set batch 25}
1432 set ui_status_value
[format \
1433 "$msg... %i/%i files (%.2f%%)" \
1437 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1443 fileevent
$fd writable
[list \
1444 write_update_index \
1454 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1455 global update_index_cp ui_status_value
1456 global file_states current_diff
1458 if {$update_index_cp >= $totalCnt} {
1465 for {set i
$batch} \
1466 {$update_index_cp < $totalCnt && $i > 0} \
1468 set path
[lindex
$pathList $update_index_cp]
1469 incr update_index_cp
1471 switch
-glob -- [lindex
$file_states($path) 0] {
1487 puts
-nonewline $fd $path
1488 puts
-nonewline $fd "\0"
1489 display_file
$path $new
1492 set ui_status_value
[format \
1493 "$msg... %i/%i files (%.2f%%)" \
1496 [expr {100.0 * $update_index_cp / $totalCnt}]]
1499 ######################################################################
1501 ## remote management
1503 proc load_all_remotes
{} {
1504 global gitdir all_remotes repo_config
1506 set all_remotes
[list
]
1507 set rm_dir
[file join $gitdir remotes
]
1508 if {[file isdirectory
$rm_dir]} {
1509 set all_remotes
[concat
$all_remotes [glob \
1513 -directory $rm_dir *]]
1516 foreach line
[array names repo_config remote.
*.url
] {
1517 if {[regexp ^remote\.
(.
*)\.url\$
$line line name
]} {
1518 lappend all_remotes
$name
1522 set all_remotes
[lsort
-unique $all_remotes]
1525 proc populate_fetch_menu
{m
} {
1526 global gitdir all_remotes repo_config
1528 foreach r
$all_remotes {
1530 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1531 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
1536 set fd
[open
[file join $gitdir remotes
$r] r
]
1537 while {[gets
$fd n
] >= 0} {
1538 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
1549 -label "Fetch from $r..." \
1550 -command [list fetch_from
$r] \
1556 proc populate_push_menu
{m
} {
1557 global gitdir all_remotes repo_config
1559 foreach r
$all_remotes {
1561 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1562 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
1567 set fd
[open
[file join $gitdir remotes
$r] r
]
1568 while {[gets
$fd n
] >= 0} {
1569 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
1580 -label "Push to $r..." \
1581 -command [list push_to
$r] \
1587 proc populate_pull_menu
{m
} {
1588 global gitdir repo_config all_remotes disable_on_lock
1590 foreach remote
$all_remotes {
1592 if {[array get repo_config remote.
$remote.url
] ne
{}} {
1593 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
1594 regexp
{^
([^
:]+):} \
1595 [lindex
$repo_config(remote.
$remote.fetch
) 0] \
1600 set fd
[open
[file join $gitdir remotes
$remote] r
]
1601 while {[gets
$fd line
] >= 0} {
1602 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
1611 regsub ^refs
/heads
/ $rb {} rb_short
1612 if {$rb_short ne
{}} {
1614 -label "Branch $rb_short from $remote..." \
1615 -command [list pull_remote
$remote $rb] \
1617 lappend disable_on_lock \
1618 [list
$m entryconf
[$m index last
] -state]
1623 ######################################################################
1628 #define mask_width 14
1629 #define mask_height 15
1630 static unsigned char mask_bits
[] = {
1631 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1632 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1633 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1636 image create bitmap file_plain
-background white
-foreground black
-data {
1637 #define plain_width 14
1638 #define plain_height 15
1639 static unsigned char plain_bits
[] = {
1640 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1641 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1642 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1643 } -maskdata $filemask
1645 image create bitmap file_mod
-background white
-foreground blue
-data {
1646 #define mod_width 14
1647 #define mod_height 15
1648 static unsigned char mod_bits
[] = {
1649 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1650 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1651 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1652 } -maskdata $filemask
1654 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
1655 #define file_fulltick_width 14
1656 #define file_fulltick_height 15
1657 static unsigned char file_fulltick_bits
[] = {
1658 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1659 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1660 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1661 } -maskdata $filemask
1663 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1664 #define parttick_width 14
1665 #define parttick_height 15
1666 static unsigned char parttick_bits
[] = {
1667 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1668 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1669 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1670 } -maskdata $filemask
1672 image create bitmap file_question
-background white
-foreground black
-data {
1673 #define file_question_width 14
1674 #define file_question_height 15
1675 static unsigned char file_question_bits
[] = {
1676 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1677 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1678 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1679 } -maskdata $filemask
1681 image create bitmap file_removed
-background white
-foreground red
-data {
1682 #define file_removed_width 14
1683 #define file_removed_height 15
1684 static unsigned char file_removed_bits
[] = {
1685 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1686 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1687 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1688 } -maskdata $filemask
1690 image create bitmap file_merge
-background white
-foreground blue
-data {
1691 #define file_merge_width 14
1692 #define file_merge_height 15
1693 static unsigned char file_merge_bits
[] = {
1694 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1695 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1696 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1697 } -maskdata $filemask
1699 set ui_index .vpane.files.index.list
1700 set ui_other .vpane.files.other.list
1701 set max_status_desc
0
1703 {__ i plain
"Unmodified"}
1704 {_M i mod
"Modified"}
1705 {M_ i fulltick
"Included in commit"}
1706 {MM i parttick
"Partially included"}
1708 {_O o plain
"Untracked"}
1709 {A_ o fulltick
"Added by commit"}
1710 {AM o parttick
"Partially added"}
1711 {AD o question
"Added (but now gone)"}
1713 {_D i question
"Missing"}
1714 {DD i removed
"Removed by commit"}
1715 {DO i removed
"Removed (still exists)"}
1716 {DM i removed
"Removed (but modified)"}
1718 {UD i merge
"Merge conflicts"}
1719 {UM i merge
"Merge conflicts"}
1720 {U_ i merge
"Merge conflicts"}
1722 if {$max_status_desc < [string length
[lindex
$i 3]]} {
1723 set max_status_desc
[string length
[lindex
$i 3]]
1725 if {[lindex
$i 1] eq
{i
}} {
1726 set all_cols
([lindex
$i 0]) $ui_index
1728 set all_cols
([lindex
$i 0]) $ui_other
1730 set all_icons
([lindex
$i 0]) file_
[lindex
$i 2]
1731 set all_descs
([lindex
$i 0]) [lindex
$i 3]
1735 ######################################################################
1740 global tcl_platform tk_library
1741 if {[tk windowingsystem
] eq
{aqua
}} {
1747 proc is_Windows
{} {
1749 if {$tcl_platform(platform
) eq
{windows
}} {
1755 proc bind_button3
{w cmd
} {
1756 bind $w <Any-Button-3
> $cmd
1758 bind $w <Control-Button-1
> $cmd
1762 proc incr_font_size
{font
{amt
1}} {
1763 set sz
[font configure
$font -size]
1765 font configure
$font -size $sz
1766 font configure
${font}bold
-size $sz
1769 proc hook_failed_popup
{hook msg
} {
1770 global gitdir appname
1776 label
$w.m.l1
-text "$hook hook failed:" \
1781 -background white
-borderwidth 1 \
1783 -width 80 -height 10 \
1785 -yscrollcommand [list
$w.m.sby
set]
1787 -text {You must correct the above errors before committing.
} \
1791 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
1792 pack
$w.m.l1
-side top
-fill x
1793 pack
$w.m.l2
-side bottom
-fill x
1794 pack
$w.m.sby
-side right
-fill y
1795 pack
$w.m.t
-side left
-fill both
-expand 1
1796 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
1798 $w.m.t insert
1.0 $msg
1799 $w.m.t conf
-state disabled
1801 button
$w.ok
-text OK \
1804 -command "destroy $w"
1805 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
1807 bind $w <Visibility
> "grab $w; focus $w"
1808 bind $w <Key-Return
> "destroy $w"
1809 wm title
$w "$appname ([lindex [file split \
1810 [file normalize [file dirname $gitdir]]] \
1815 set next_console_id
0
1817 proc new_console
{short_title long_title
} {
1818 global next_console_id console_data
1819 set w .console
[incr next_console_id
]
1820 set console_data
($w) [list
$short_title $long_title]
1821 return [console_init
$w]
1824 proc console_init
{w
} {
1825 global console_cr console_data
1826 global gitdir appname M1B
1828 set console_cr
($w) 1.0
1831 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
1836 -background white
-borderwidth 1 \
1838 -width 80 -height 10 \
1841 -yscrollcommand [list
$w.m.sby
set]
1842 label
$w.m.s
-text {Working... please
wait...
} \
1846 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
1847 pack
$w.m.l1
-side top
-fill x
1848 pack
$w.m.s
-side bottom
-fill x
1849 pack
$w.m.sby
-side right
-fill y
1850 pack
$w.m.t
-side left
-fill both
-expand 1
1851 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
1853 menu
$w.ctxm
-tearoff 0
1854 $w.ctxm add
command -label "Copy" \
1856 -command "tk_textCopy $w.m.t"
1857 $w.ctxm add
command -label "Select All" \
1859 -command "$w.m.t tag add sel 0.0 end"
1860 $w.ctxm add
command -label "Copy All" \
1863 $w.m.t tag add sel 0.0 end
1865 $w.m.t tag remove sel 0.0 end
1868 button
$w.ok
-text {Close
} \
1871 -command "destroy $w"
1872 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
1874 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
1875 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
1876 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
1877 bind $w <Visibility
> "focus $w"
1878 wm title
$w "$appname ([lindex [file split \
1879 [file normalize [file dirname $gitdir]]] \
1880 end]): [lindex $console_data($w) 0]"
1884 proc console_exec
{w cmd
{after
{}}} {
1885 # -- Windows tosses the enviroment when we exec our child.
1886 # But most users need that so we have to relogin. :-(
1889 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
1892 # -- Tcl won't let us redirect both stdout and stderr to
1893 # the same pipe. So pass it through cat...
1895 set cmd
[concat |
$cmd |
& cat]
1897 set fd_f
[open
$cmd r
]
1898 fconfigure
$fd_f -blocking 0 -translation binary
1899 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
1902 proc console_read
{w fd after
} {
1903 global console_cr console_data
1907 if {![winfo exists
$w]} {console_init
$w}
1908 $w.m.t conf
-state normal
1910 set n
[string length
$buf]
1912 set cr
[string first
"\r" $buf $c]
1913 set lf
[string first
"\n" $buf $c]
1914 if {$cr < 0} {set cr
[expr {$n + 1}]}
1915 if {$lf < 0} {set lf
[expr {$n + 1}]}
1918 $w.m.t insert end
[string range
$buf $c $lf]
1919 set console_cr
($w) [$w.m.t index
{end
-1c}]
1923 $w.m.t delete
$console_cr($w) end
1924 $w.m.t insert end
"\n"
1925 $w.m.t insert end
[string range
$buf $c $cr]
1930 $w.m.t conf
-state disabled
1934 fconfigure
$fd -blocking 1
1936 if {[catch
{close
$fd}]} {
1937 if {![winfo exists
$w]} {console_init
$w}
1938 $w.m.s conf
-background red
-text {Error
: Command Failed
}
1939 $w.ok conf
-state normal
1941 } elseif
{[winfo exists
$w]} {
1942 $w.m.s conf
-background green
-text {Success
}
1943 $w.ok conf
-state normal
1946 array
unset console_cr
$w
1947 array
unset console_data
$w
1949 uplevel
#0 $after $ok
1953 fconfigure
$fd -blocking 0
1956 ######################################################################
1960 set starting_gitk_msg
{Please
wait... Starting gitk...
}
1963 global ui_status_value starting_gitk_msg
1965 set ui_status_value
$starting_gitk_msg
1967 if {$ui_status_value eq
$starting_gitk_msg} {
1968 set ui_status_value
{Ready.
}
1980 set w
[new_console
{repack
} \
1981 {Repacking the object database
}]
1982 set cmd
[list git repack
]
1985 console_exec
$w $cmd
1988 proc do_fsck_objects
{} {
1989 set w
[new_console
{fsck-objects
} \
1990 {Verifying the object database with fsck-objects
}]
1991 set cmd
[list git fsck-objects
]
1994 lappend cmd
--strict
1995 console_exec
$w $cmd
2001 global gitdir ui_comm is_quitting repo_config commit_type
2003 if {$is_quitting} return
2006 # -- Stash our current commit buffer.
2008 set save
[file join $gitdir GITGUI_MSG
]
2009 set msg
[string trim
[$ui_comm get
0.0 end
]]
2010 if {![string match amend
* $commit_type]
2011 && [$ui_comm edit modified
]
2014 set fd
[open
$save w
]
2015 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
2019 catch
{file delete
$save}
2022 # -- Stash our current window geometry into this repository.
2024 set cfg_geometry
[list
]
2025 lappend cfg_geometry
[wm geometry .
]
2026 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
2027 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
2028 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2031 if {$cfg_geometry ne
$rc_geometry} {
2032 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2039 rescan
{set ui_status_value
{Ready.
}}
2042 proc remove_helper
{txt paths
} {
2043 global file_states current_diff
2045 if {![lock_index begin-update
]} return
2049 foreach path
$paths {
2050 switch
-glob -- [lindex
$file_states($path) 0] {
2054 lappend pathList
$path
2055 if {$path eq
$current_diff} {
2056 set after
{reshow_diff
;}
2061 if {$pathList eq
{}} {
2067 [concat
$after {set ui_status_value
{Ready.
}}]
2071 proc do_remove_selection
{} {
2072 global current_diff selected_paths
2074 if {[array size selected_paths
] > 0} {
2076 {Removing selected files from commit
} \
2077 [array names selected_paths
]
2078 } elseif
{$current_diff ne
{}} {
2080 "Removing [short_path $current_diff] from commit" \
2081 [list
$current_diff]
2085 proc include_helper
{txt paths
} {
2086 global file_states current_diff
2088 if {![lock_index begin-update
]} return
2092 foreach path
$paths {
2093 switch
-glob -- [lindex
$file_states($path) 0] {
2101 lappend pathList
$path
2102 if {$path eq
$current_diff} {
2103 set after
{reshow_diff
;}
2108 if {$pathList eq
{}} {
2114 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2118 proc do_include_selection
{} {
2119 global current_diff selected_paths
2121 if {[array size selected_paths
] > 0} {
2123 {Including selected files
} \
2124 [array names selected_paths
]
2125 } elseif
{$current_diff ne
{}} {
2127 "Including [short_path $current_diff]" \
2128 [list
$current_diff]
2132 proc do_include_all
{} {
2136 foreach path
[array names file_states
] {
2137 switch
-- [lindex
$file_states($path) 0] {
2142 _D
{lappend paths
$path}
2146 {Including all modified files
} \
2150 proc do_signoff
{} {
2153 set me
[committer_ident
]
2154 if {$me eq
{}} return
2156 set sob
"Signed-off-by: $me"
2157 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2158 if {$last ne
$sob} {
2159 $ui_comm edit separator
2161 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2162 $ui_comm insert end
"\n"
2164 $ui_comm insert end
"\n$sob"
2165 $ui_comm edit separator
2170 proc do_select_commit_type
{} {
2171 global commit_type selected_commit_type
2173 if {$selected_commit_type eq
{new
}
2174 && [string match amend
* $commit_type]} {
2176 } elseif
{$selected_commit_type eq
{amend
}
2177 && ![string match amend
* $commit_type]} {
2180 # The amend request was rejected...
2182 if {![string match amend
* $commit_type]} {
2183 set selected_commit_type new
2193 global appname copyright
2194 global tcl_patchLevel tk_patchLevel
2198 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2200 label
$w.header
-text "About $appname" \
2202 pack
$w.header
-side top
-fill x
2205 button
$w.buttons.close
-text {Close
} \
2207 -command [list destroy
$w]
2208 pack
$w.buttons.close
-side right
2209 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2212 -text "$appname - a commit creation tool for Git.
2220 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
2222 set v
[exec git
--version]
2224 if {$tcl_patchLevel eq
$tk_patchLevel} {
2225 append v
"Tcl/Tk version $tcl_patchLevel"
2227 append v
"Tcl version $tcl_patchLevel"
2228 append v
", Tk version $tk_patchLevel"
2239 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
2241 bind $w <Visibility
> "grab $w; focus $w"
2242 bind $w <Key-Escape
> "destroy $w"
2243 wm title
$w "About $appname"
2247 proc do_options
{} {
2248 global appname gitdir font_descs
2249 global repo_config global_config
2250 global repo_config_new global_config_new
2252 array
unset repo_config_new
2253 array
unset global_config_new
2254 foreach name
[array names repo_config
] {
2255 set repo_config_new
($name) $repo_config($name)
2258 foreach name
[array names repo_config
] {
2260 gui.diffcontext
{continue}
2262 set repo_config_new
($name) $repo_config($name)
2264 foreach name
[array names global_config
] {
2265 set global_config_new
($name) $global_config($name)
2267 set reponame
[lindex
[file split \
2268 [file normalize
[file dirname $gitdir]]] \
2271 set w .options_editor
2273 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2275 label
$w.header
-text "$appname Options" \
2277 pack
$w.header
-side top
-fill x
2280 button
$w.buttons.restore
-text {Restore Defaults
} \
2282 -command do_restore_defaults
2283 pack
$w.buttons.restore
-side left
2284 button
$w.buttons.save
-text Save \
2286 -command [list do_save_config
$w]
2287 pack
$w.buttons.save
-side right
2288 button
$w.buttons.cancel
-text {Cancel
} \
2290 -command [list destroy
$w]
2291 pack
$w.buttons.cancel
-side right
2292 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2294 labelframe
$w.repo
-text "$reponame Repository" \
2296 -relief raised
-borderwidth 2
2297 labelframe
$w.global
-text {Global
(All Repositories
)} \
2299 -relief raised
-borderwidth 2
2300 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
2301 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
2304 {b partialinclude
{Allow Partially Included Files
}}
2305 {b pullsummary
{Show Pull Summary
}}
2306 {b trustmtime
{Trust File Modification Timestamps
}}
2307 {i diffcontext
{Number of Diff Context Lines
}}
2309 set type [lindex
$option 0]
2310 set name
[lindex
$option 1]
2311 set text
[lindex
$option 2]
2312 foreach f
{repo global
} {
2315 checkbutton
$w.
$f.
$name -text $text \
2316 -variable ${f}_config_new
(gui.
$name) \
2320 pack
$w.
$f.
$name -side top
-anchor w
2324 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
2325 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
2326 spinbox
$w.
$f.
$name.v \
2327 -textvariable ${f}_config_new
(gui.
$name) \
2328 -from 1 -to 99 -increment 1 \
2331 pack
$w.
$f.
$name.v
-side right
-anchor e
2332 pack
$w.
$f.
$name -side top
-anchor w
-fill x
2338 set all_fonts
[lsort
[font families
]]
2339 foreach option
$font_descs {
2340 set name
[lindex
$option 0]
2341 set font
[lindex
$option 1]
2342 set text
[lindex
$option 2]
2344 set global_config_new
(gui.
$font^^family
) \
2345 [font configure
$font -family]
2346 set global_config_new
(gui.
$font^^size
) \
2347 [font configure
$font -size]
2349 frame
$w.global.
$name
2350 label
$w.global.
$name.l
-text "$text:" -font font_ui
2351 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
2352 eval tk_optionMenu
$w.global.
$name.family \
2353 global_config_new
(gui.
$font^^family
) \
2355 spinbox
$w.global.
$name.size \
2356 -textvariable global_config_new
(gui.
$font^^size
) \
2357 -from 2 -to 80 -increment 1 \
2360 pack
$w.global.
$name.size
-side right
-anchor e
2361 pack
$w.global.
$name.family
-side right
-anchor e
2362 pack
$w.global.
$name -side top
-anchor w
-fill x
2365 bind $w <Visibility
> "grab $w; focus $w"
2366 bind $w <Key-Escape
> "destroy $w"
2367 wm title
$w "$appname ($reponame): Options"
2371 proc do_restore_defaults
{} {
2372 global font_descs default_config repo_config
2373 global repo_config_new global_config_new
2375 foreach name
[array names default_config
] {
2376 set repo_config_new
($name) $default_config($name)
2377 set global_config_new
($name) $default_config($name)
2380 foreach option
$font_descs {
2381 set name
[lindex
$option 0]
2382 set repo_config
(gui.
$name) $default_config(gui.
$name)
2386 foreach option
$font_descs {
2387 set name
[lindex
$option 0]
2388 set font
[lindex
$option 1]
2389 set global_config_new
(gui.
$font^^family
) \
2390 [font configure
$font -family]
2391 set global_config_new
(gui.
$font^^size
) \
2392 [font configure
$font -size]
2396 proc do_save_config
{w
} {
2397 if {[catch
{save_config
} err
]} {
2398 error_popup
"Failed to completely save options:\n\n$err"
2404 proc do_windows_shortcut
{} {
2405 global gitdir appname argv0
2407 set reponame
[lindex
[file split \
2408 [file normalize
[file dirname $gitdir]]] \
2412 set desktop
[exec cygpath \
2420 set fn
[tk_getSaveFile \
2422 -title "$appname ($reponame): Create Desktop Icon" \
2423 -initialdir $desktop \
2424 -initialfile "Git $reponame.bat"]
2428 set sh
[exec cygpath \
2433 set me
[exec cygpath \
2437 set gd
[exec cygpath \
2441 regsub
-all ' $me "'\\''" me
2442 regsub -all ' $gd "'\\''" gd
2443 puts -nonewline $fd "\"$sh\" --login -c \""
2444 puts -nonewline $fd "GIT_DIR='$gd'"
2445 puts -nonewline $fd " '$me'"
2449 error_popup "Cannot write script:\n\n$err"
2454 proc do_macosx_app {} {
2455 global gitdir appname argv0 env
2457 set reponame [lindex [file split \
2458 [file normalize [file dirname $gitdir]]] \
2461 set fn [tk_getSaveFile \
2463 -title "$appname ($reponame): Create Desktop Icon" \
2464 -initialdir [file join $env(HOME) Desktop] \
2465 -initialfile "Git $reponame.app"]
2468 set Contents [file join $fn Contents]
2469 set MacOS [file join $Contents MacOS]
2470 set exe [file join $MacOS git-gui]
2474 set fd [open [file join $Contents Info.plist] w]
2475 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2476 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2477 <plist version="1.0">
2479 <key>CFBundleDevelopmentRegion</key>
2480 <string>English</string>
2481 <key>CFBundleExecutable</key>
2482 <string>git-gui</string>
2483 <key>CFBundleIdentifier</key>
2484 <string>org.spearce.git-gui</string>
2485 <key>CFBundleInfoDictionaryVersion</key>
2486 <string>6.0</string>
2487 <key>CFBundlePackageType</key>
2488 <string>APPL</string>
2489 <key>CFBundleSignature</key>
2490 <string>????</string>
2491 <key>CFBundleVersion</key>
2492 <string>1.0</string>
2493 <key>NSPrincipalClass</key>
2494 <string>NSApplication</string>
2499 set fd [open $exe w]
2500 set gd [file normalize $gitdir]
2501 set ep [file normalize [exec git --exec-path]]
2502 regsub -all ' $gd "'\\''" gd
2503 regsub
-all ' $ep "'\\''" ep
2504 puts $fd "#!/bin/sh"
2505 foreach name
[array names env
] {
2506 if {[string match GIT_
* $name]} {
2507 regsub
-all ' $env($name) "'\\''" v
2508 puts $fd "export $name='$v'"
2511 puts $fd "export PATH
='$ep':\
$PATH"
2512 puts $fd "export GIT_DIR
='$gd'"
2513 puts $fd "exec [file normalize
$argv0]"
2516 file attributes $exe -permissions u+x,g+x,o+x
2518 error_popup "Cannot
write icon
:\n\n$err"
2523 proc toggle_or_diff {w x y} {
2524 global file_states file_lists current_diff ui_index ui_other
2525 global last_clicked selected_paths
2527 set pos [split [$w index @$x,$y] .]
2528 set lno [lindex $pos 0]
2529 set col [lindex $pos 1]
2530 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2536 set last_clicked [list $w $lno]
2537 array unset selected_paths
2538 $ui_index tag remove in_sel 0.0 end
2539 $ui_other tag remove in_sel 0.0 end
2542 if {$current_diff eq $path} {
2543 set after {reshow_diff;}
2547 switch -glob -- [lindex $file_states($path) 0] {
2554 "Removing
[short_path
$path] from commit
" \
2556 [concat $after {set ui_status_value {Ready.}}]
2560 "Including
[short_path
$path]" \
2562 [concat $after {set ui_status_value {Ready.}}]
2566 show_diff $path $w $lno
2570 proc add_one_to_selection {w x y} {
2572 global last_clicked selected_paths
2574 set pos [split [$w index @$x,$y] .]
2575 set lno [lindex $pos 0]
2576 set col [lindex $pos 1]
2577 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2583 set last_clicked [list $w $lno]
2584 if {[catch {set in_sel $selected_paths($path)}]} {
2588 unset selected_paths($path)
2589 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2591 set selected_paths($path) 1
2592 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2596 proc add_range_to_selection {w x y} {
2598 global last_clicked selected_paths
2600 if {[lindex $last_clicked 0] ne $w} {
2601 toggle_or_diff $w $x $y
2605 set pos [split [$w index @$x,$y] .]
2606 set lno [lindex $pos 0]
2607 set lc [lindex $last_clicked 1]
2616 foreach path [lrange $file_lists($w) \
2617 [expr {$begin - 1}] \
2618 [expr {$end - 1}]] {
2619 set selected_paths($path) 1
2621 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2624 ######################################################################
2628 set cursor_ptr arrow
2629 font create font_diff -family Courier -size 10
2633 eval font configure font_ui [font actual [.dummy cget -font]]
2637 font create font_uibold
2638 font create font_diffbold
2643 } elseif {[is_MacOSX]} {
2651 proc apply_config {} {
2652 global repo_config font_descs
2654 foreach option $font_descs {
2655 set name [lindex $option 0]
2656 set font [lindex $option 1]
2658 foreach {cn cv} $repo_config(gui.$name) {
2659 font configure $font $cn $cv
2662 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
2664 foreach {cn cv} [font configure $font] {
2665 font configure ${font}bold $cn $cv
2667 font configure ${font}bold -weight bold
2671 set default_config(gui.trustmtime) false
2672 set default_config(gui.pullsummary) true
2673 set default_config(gui.partialinclude) false
2674 set default_config(gui.diffcontext) 5
2675 set default_config(gui.fontui) [font configure font_ui]
2676 set default_config(gui.fontdiff) [font configure font_diff]
2678 {fontui font_ui {Main Font}}
2679 {fontdiff font_diff {Diff/Console Font}}
2684 ######################################################################
2690 menu .mbar -tearoff 0
2691 .mbar add cascade -label Repository -menu .mbar.repository
2692 .mbar add cascade -label Edit -menu .mbar.edit
2693 .mbar add cascade -label Commit -menu .mbar.commit
2694 if {!$single_commit} {
2695 .mbar add cascade -label Fetch -menu .mbar.fetch
2696 .mbar add cascade -label Pull -menu .mbar.pull
2697 .mbar add cascade -label Push -menu .mbar.push
2699 . configure -menu .mbar
2701 # -- Repository Menu
2703 menu .mbar.repository
2704 .mbar.repository add command -label Visualize \
2707 if {!$single_commit} {
2708 .mbar.repository add separator
2710 .mbar.repository add command -label {Repack Database} \
2711 -command do_repack \
2714 .mbar.repository add command -label {Verify Database} \
2715 -command do_fsck_objects \
2718 .mbar.repository add separator
2721 .mbar.repository add command \
2722 -label {Create Desktop Icon} \
2723 -command do_windows_shortcut \
2725 } elseif {[is_MacOSX]} {
2726 .mbar.repository add command \
2727 -label {Create Desktop Icon} \
2728 -command do_macosx_app \
2732 .mbar.repository add command -label Quit \
2734 -accelerator $M1T-Q \
2740 .mbar.edit add command -label Undo \
2741 -command {catch {[focus] edit undo}} \
2742 -accelerator $M1T-Z \
2744 .mbar.edit add command -label Redo \
2745 -command {catch {[focus] edit redo}} \
2746 -accelerator $M1T-Y \
2748 .mbar.edit add separator
2749 .mbar.edit add command -label Cut \
2750 -command {catch {tk_textCut [focus]}} \
2751 -accelerator $M1T-X \
2753 .mbar.edit add command -label Copy \
2754 -command {catch {tk_textCopy [focus]}} \
2755 -accelerator $M1T-C \
2757 .mbar.edit add command -label Paste \
2758 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2759 -accelerator $M1T-V \
2761 .mbar.edit add command -label Delete \
2762 -command {catch {[focus] delete sel.first sel.last}} \
2765 .mbar.edit add separator
2766 .mbar.edit add command -label {Select All} \
2767 -command {catch {[focus] tag add sel 0.0 end}} \
2768 -accelerator $M1T-A \
2775 .mbar.commit add radiobutton \
2776 -label {New Commit} \
2777 -command do_select_commit_type \
2778 -variable selected_commit_type \
2781 lappend disable_on_lock \
2782 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2784 .mbar.commit add radiobutton \
2785 -label {Amend Last Commit} \
2786 -command do_select_commit_type \
2787 -variable selected_commit_type \
2790 lappend disable_on_lock \
2791 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2793 .mbar.commit add separator
2795 .mbar.commit add command -label Rescan \
2796 -command do_rescan \
2799 lappend disable_on_lock \
2800 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2802 .mbar.commit add command -label {Remove From Commit} \
2803 -command do_remove_selection \
2805 lappend disable_on_lock \
2806 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2808 .mbar.commit add command -label {Include In Commit} \
2809 -command do_include_selection \
2811 lappend disable_on_lock \
2812 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2814 .mbar.commit add command -label {Include All In Commit} \
2815 -command do_include_all \
2816 -accelerator $M1T-I \
2818 lappend disable_on_lock \
2819 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2821 .mbar.commit add separator
2823 .mbar.commit add command -label {Sign Off} \
2824 -command do_signoff \
2825 -accelerator $M1T-S \
2828 .mbar.commit add command -label Commit \
2829 -command do_commit \
2830 -accelerator $M1T-Return \
2832 lappend disable_on_lock \
2833 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2835 # -- Transport menus
2837 if {!$single_commit} {
2844 # -- Apple Menu (Mac OS X only)
2846 .mbar add cascade -label Apple -menu .mbar.apple
2849 .mbar.apple add command -label "About
$appname" \
2852 .mbar.apple add command -label "$appname Options...
" \
2853 -command do_options \
2858 .mbar.edit add separator
2859 .mbar.edit add command -label {Options...} \
2860 -command do_options \
2865 .mbar add cascade -label Help -menu .mbar.help
2868 .mbar.help add command -label "About
$appname" \
2874 # -- Main Window Layout
2876 panedwindow .vpane -orient vertical
2877 panedwindow .vpane.files -orient horizontal
2878 .vpane add .vpane.files -sticky nsew -height 100 -width 400
2879 pack .vpane -anchor n -side top -fill both -expand 1
2881 # -- Index File List
2883 frame .vpane.files.index -height 100 -width 400
2884 label .vpane.files.index.title -text {Modified Files} \
2887 text $ui_index -background white -borderwidth 0 \
2888 -width 40 -height 10 \
2890 -cursor $cursor_ptr \
2891 -yscrollcommand {.vpane.files.index.sb set} \
2893 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
2894 pack .vpane.files.index.title -side top -fill x
2895 pack .vpane.files.index.sb -side right -fill y
2896 pack $ui_index -side left -fill both -expand 1
2897 .vpane.files add .vpane.files.index -sticky nsew
2899 # -- Other (Add) File List
2901 frame .vpane.files.other -height 100 -width 100
2902 label .vpane.files.other.title -text {Untracked Files} \
2905 text $ui_other -background white -borderwidth 0 \
2906 -width 40 -height 10 \
2908 -cursor $cursor_ptr \
2909 -yscrollcommand {.vpane.files.other.sb set} \
2911 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
2912 pack .vpane.files.other.title -side top -fill x
2913 pack .vpane.files.other.sb -side right -fill y
2914 pack $ui_other -side left -fill both -expand 1
2915 .vpane.files add .vpane.files.other -sticky nsew
2917 foreach i [list $ui_index $ui_other] {
2918 $i tag conf in_diff -font font_uibold
2919 $i tag conf in_sel \
2920 -background [$i cget -foreground] \
2921 -foreground [$i cget -background]
2925 # -- Diff and Commit Area
2927 frame .vpane.lower -height 300 -width 400
2928 frame .vpane.lower.commarea
2929 frame .vpane.lower.diff -relief sunken -borderwidth 1
2930 pack .vpane.lower.commarea -side top -fill x
2931 pack .vpane.lower.diff -side bottom -fill both -expand 1
2932 .vpane add .vpane.lower -stick nsew
2934 # -- Commit Area Buttons
2936 frame .vpane.lower.commarea.buttons
2937 label .vpane.lower.commarea.buttons.l -text {} \
2941 pack .vpane.lower.commarea.buttons.l -side top -fill x
2942 pack .vpane.lower.commarea.buttons -side left -fill y
2944 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2945 -command do_rescan \
2947 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2948 lappend disable_on_lock \
2949 {.vpane.lower.commarea.buttons.rescan conf -state}
2951 button .vpane.lower.commarea.buttons.incall -text {Include All} \
2952 -command do_include_all \
2954 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2955 lappend disable_on_lock \
2956 {.vpane.lower.commarea.buttons.incall conf -state}
2958 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2959 -command do_signoff \
2961 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2963 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2964 -command do_commit \
2966 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2967 lappend disable_on_lock \
2968 {.vpane.lower.commarea.buttons.commit conf -state}
2970 # -- Commit Message Buffer
2972 frame .vpane.lower.commarea.buffer
2973 frame .vpane.lower.commarea.buffer.header
2974 set ui_comm .vpane.lower.commarea.buffer.t
2975 set ui_coml .vpane.lower.commarea.buffer.header.l
2976 radiobutton .vpane.lower.commarea.buffer.header.new \
2977 -text {New Commit} \
2978 -command do_select_commit_type \
2979 -variable selected_commit_type \
2982 lappend disable_on_lock \
2983 [list .vpane.lower.commarea.buffer.header.new conf -state]
2984 radiobutton .vpane.lower.commarea.buffer.header.amend \
2985 -text {Amend Last Commit} \
2986 -command do_select_commit_type \
2987 -variable selected_commit_type \
2990 lappend disable_on_lock \
2991 [list .vpane.lower.commarea.buffer.header.amend conf -state]
2996 proc trace_commit_type {varname args} {
2997 global ui_coml commit_type
2998 switch -glob -- $commit_type {
2999 initial {set txt {Initial Commit Message:}}
3000 amend {set txt {Amended Commit Message:}}
3001 amend-initial {set txt {Amended Initial Commit Message:}}
3002 amend-merge {set txt {Amended Merge Commit Message:}}
3003 merge {set txt {Merge Commit Message:}}
3004 * {set txt {Commit Message:}}
3006 $ui_coml conf -text $txt
3008 trace add variable commit_type write trace_commit_type
3009 pack $ui_coml -side left -fill x
3010 pack .vpane.lower.commarea.buffer.header.amend -side right
3011 pack .vpane.lower.commarea.buffer.header.new -side right
3013 text $ui_comm -background white -borderwidth 1 \
3016 -autoseparators true \
3018 -width 75 -height 9 -wrap none \
3020 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3021 scrollbar .vpane.lower.commarea.buffer.sby \
3022 -command [list $ui_comm yview]
3023 pack .vpane.lower.commarea.buffer.header -side top -fill x
3024 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3025 pack $ui_comm -side left -fill y
3026 pack .vpane.lower.commarea.buffer -side left -fill y
3028 # -- Commit Message Buffer Context Menu
3030 set ctxm .vpane.lower.commarea.buffer.ctxm
3031 menu $ctxm -tearoff 0
3035 -command {tk_textCut $ui_comm}
3039 -command {tk_textCopy $ui_comm}
3043 -command {tk_textPaste $ui_comm}
3047 -command {$ui_comm delete sel.first sel.last}
3050 -label {Select All} \
3052 -command {$ui_comm tag add sel 0.0 end}
3057 $ui_comm tag add sel 0.0 end
3058 tk_textCopy $ui_comm
3059 $ui_comm tag remove sel 0.0 end
3066 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
3071 set diff_actions [list]
3072 proc trace_current_diff {varname args} {
3073 global current_diff diff_actions file_states
3074 if {$current_diff eq {}} {
3081 set s [mapdesc [lindex $file_states($p) 0] $p]
3083 set p [escape_path $p]
3087 .vpane.lower.diff.header.status configure -text $s
3088 .vpane.lower.diff.header.file configure -text $f
3089 .vpane.lower.diff.header.path configure -text $p
3090 foreach w $diff_actions {
3094 trace add variable current_diff write trace_current_diff
3096 frame .vpane.lower.diff.header -background orange
3097 label .vpane.lower.diff.header.status \
3098 -background orange \
3099 -width $max_status_desc \
3103 label .vpane.lower.diff.header.file \
3104 -background orange \
3108 label .vpane.lower.diff.header.path \
3109 -background orange \
3113 pack .vpane.lower.diff.header.status -side left
3114 pack .vpane.lower.diff.header.file -side left
3115 pack .vpane.lower.diff.header.path -fill x
3116 set ctxm .vpane.lower.diff.header.ctxm
3117 menu $ctxm -tearoff 0
3128 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3129 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
3133 frame .vpane.lower.diff.body
3134 set ui_diff .vpane.lower.diff.body.t
3135 text $ui_diff -background white -borderwidth 0 \
3136 -width 80 -height 15 -wrap none \
3138 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3139 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3141 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3142 -command [list $ui_diff xview]
3143 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3144 -command [list $ui_diff yview]
3145 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3146 pack .vpane.lower.diff.body.sby -side right -fill y
3147 pack $ui_diff -side left -fill both -expand 1
3148 pack .vpane.lower.diff.header -side top -fill x
3149 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3151 $ui_diff tag conf d_@ -font font_diffbold
3152 $ui_diff tag conf d_+ -foreground blue
3153 $ui_diff tag conf d_- -foreground red
3154 $ui_diff tag conf d_++ -foreground {#00a000}
3155 $ui_diff tag conf d_-- -foreground {#a000a0}
3156 $ui_diff tag conf d_+- \
3158 -background {light goldenrod yellow}
3159 $ui_diff tag conf d_-+ \
3163 # -- Diff Body Context Menu
3165 set ctxm .vpane.lower.diff.body.ctxm
3166 menu $ctxm -tearoff 0
3170 -command {tk_textCopy $ui_diff}
3171 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3173 -label {Select All} \
3175 -command {$ui_diff tag add sel 0.0 end}
3176 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3181 $ui_diff tag add sel 0.0 end
3182 tk_textCopy $ui_diff
3183 $ui_diff tag remove sel 0.0 end
3185 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3188 -label {Decrease Font Size} \
3190 -command {incr_font_size font_diff -1}
3191 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3193 -label {Increase Font Size} \
3195 -command {incr_font_size font_diff 1}
3196 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3199 -label {Show Less Context} \
3201 -command {if {$repo_config(gui.diffcontext) >= 2} {
3202 incr repo_config(gui.diffcontext) -1
3205 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3207 -label {Show More Context} \
3210 incr repo_config(gui.diffcontext)
3213 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3215 $ctxm add command -label {Options...} \
3218 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
3222 set ui_status_value {Initializing...}
3223 label .status -textvariable ui_status_value \
3229 pack .status -anchor w -side bottom -fill x
3234 set gm $repo_config(gui.geometry)
3235 wm geometry . [lindex $gm 0]
3236 .vpane sash place 0 \
3237 [lindex [.vpane sash coord 0] 0] \
3239 .vpane.files sash place 0 \
3241 [lindex [.vpane.files sash coord 0] 1]
3247 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3248 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3249 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3250 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3251 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3252 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3253 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3254 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3255 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3256 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3257 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3259 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3260 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3261 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3262 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3263 bind $ui_diff <$M1B-Key-v> {break}
3264 bind $ui_diff <$M1B-Key-V> {break}
3265 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3266 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3267 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3268 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3269 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3270 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3272 bind . <Destroy> do_quit
3273 bind all <Key-F5> do_rescan
3274 bind all <$M1B-Key-r> do_rescan
3275 bind all <$M1B-Key-R> do_rescan
3276 bind . <$M1B-Key-s> do_signoff
3277 bind . <$M1B-Key-S> do_signoff
3278 bind . <$M1B-Key-i> do_include_all
3279 bind . <$M1B-Key-I> do_include_all
3280 bind . <$M1B-Key-Return> do_commit
3281 bind all <$M1B-Key-q> do_quit
3282 bind all <$M1B-Key-Q> do_quit
3283 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3284 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3285 foreach i [list $ui_index $ui_other] {
3286 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
3287 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
3288 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
3292 set file_lists($ui_index) [list]
3293 set file_lists($ui_other) [list]
3297 set MERGE_HEAD [list]
3301 set selected_commit_type new
3303 wm title . "$appname ([file normalize
[file dirname $gitdir]])"
3304 focus -force $ui_comm
3306 # -- Warn the user about environmental problems.
3307 # Cygwin's Tcl does *not* pass its env array
3308 # onto any processes it spawns. This means
3309 # that the git processes get none of our
3310 # environment. That may not work...
3315 set msg "Possible environment issues exist.
3317 The following environment variables are probably
3318 going to be ignored by any Git subprocess run
3322 foreach name [array names env] {
3323 switch -regexp -- $name {
3324 {^GIT_INDEX_FILE$} -
3325 {^GIT_OBJECT_DIRECTORY$} -
3326 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3328 {^GIT_EXTERNAL_DIFF$} -
3332 {^GIT_CONFIG_LOCAL$} -
3333 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3334 append msg " - $name\n"
3337 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3338 append msg " - $name\n"
3340 set suggest_user $name
3344 if {$ignored_env > 0} {
3346 This is due to a known issue with the
3347 Tcl binary distributed by Cygwin.
"
3349 if {$suggest_user ne {}} {
3352 A good replacement
for $suggest_user
3353 is placing values
for the user.name and
3354 user.email settings into your personal
3360 unset ignored_env msg suggest_user name
3363 if {!$single_commit} {
3365 populate_fetch_menu .mbar.fetch
3366 populate_pull_menu .mbar.pull
3367 populate_push_menu .mbar.push
3369 lock_index begin-read