2 # Tcl ignores the next line -*- tcl -*- \
5 set appvers
{@@GIT_VERSION@@
}
7 Copyright ©
2006, 2007 Shawn Pearce
, Paul Mackerras.
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
]
41 return [eval [concat
[list
file join $_gitdir] $args]]
49 ######################################################################
53 proc is_many_config
{name
} {
54 switch
-glob -- $name {
63 proc load_config
{include_global
} {
64 global repo_config global_config default_config
66 array
unset global_config
67 if {$include_global} {
69 set fd_rc
[open
"| git repo-config --global --list" r
]
70 while {[gets
$fd_rc line
] >= 0} {
71 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
72 if {[is_many_config
$name]} {
73 lappend global_config
($name) $value
75 set global_config
($name) $value
83 array
unset repo_config
85 set fd_rc
[open
"| git repo-config --list" r
]
86 while {[gets
$fd_rc line
] >= 0} {
87 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
88 if {[is_many_config
$name]} {
89 lappend repo_config
($name) $value
91 set repo_config
($name) $value
98 foreach name
[array names default_config
] {
99 if {[catch
{set v
$global_config($name)}]} {
100 set global_config
($name) $default_config($name)
102 if {[catch
{set v
$repo_config($name)}]} {
103 set repo_config
($name) $default_config($name)
108 proc save_config
{} {
109 global default_config font_descs
110 global repo_config global_config
111 global repo_config_new global_config_new
113 foreach option
$font_descs {
114 set name
[lindex
$option 0]
115 set font
[lindex
$option 1]
116 font configure
$font \
117 -family $global_config_new(gui.
$font^^family
) \
118 -size $global_config_new(gui.
$font^^size
)
119 font configure
${font}bold \
120 -family $global_config_new(gui.
$font^^family
) \
121 -size $global_config_new(gui.
$font^^size
)
122 set global_config_new
(gui.
$name) [font configure
$font]
123 unset global_config_new
(gui.
$font^^family
)
124 unset global_config_new
(gui.
$font^^size
)
127 foreach name
[array names default_config
] {
128 set value
$global_config_new($name)
129 if {$value ne
$global_config($name)} {
130 if {$value eq
$default_config($name)} {
131 catch
{exec git repo-config
--global --unset $name}
133 regsub
-all "\[{}\]" $value {"} value
134 exec git repo-config --global $name $value
136 set global_config($name) $value
137 if {$value eq $repo_config($name)} {
138 catch {exec git repo-config --unset $name}
139 set repo_config($name) $value
144 foreach name [array names default_config] {
145 set value $repo_config_new($name)
146 if {$value ne $repo_config($name)} {
147 if {$value eq $global_config($name)} {
148 catch {exec git repo-config --unset $name}
150 regsub -all "\
[{}\
]" $value {"} value
151 exec git repo-config
$name $value
153 set repo_config
($name) $value
158 proc error_popup
{msg
} {
160 if {[reponame
] ne
{}} {
161 append title
" ([reponame])"
163 set cmd
[list tk_messageBox \
166 -title "$title: error" \
168 if {[winfo ismapped .
]} {
169 lappend cmd
-parent .
174 proc warn_popup
{msg
} {
176 if {[reponame
] ne
{}} {
177 append title
" ([reponame])"
179 set cmd
[list tk_messageBox \
182 -title "$title: warning" \
184 if {[winfo ismapped .
]} {
185 lappend cmd
-parent .
190 proc info_popup
{msg
} {
192 if {[reponame
] ne
{}} {
193 append title
" ([reponame])"
203 proc ask_popup
{msg
} {
205 if {[reponame
] ne
{}} {
206 append title
" ([reponame])"
208 return [tk_messageBox \
216 ######################################################################
220 if { [catch
{set _gitdir
$env(GIT_DIR
)}]
221 && [catch
{set _gitdir
[exec git rev-parse
--git-dir]} err
]} {
222 catch
{wm withdraw .
}
223 error_popup
"Cannot find the git directory:\n\n$err"
226 if {![file isdirectory
$_gitdir]} {
227 catch
{wm withdraw .
}
228 error_popup
"Git directory not found:\n\n$_gitdir"
231 if {[lindex
[file split $_gitdir] end
] ne
{.git
}} {
232 catch
{wm withdraw .
}
233 error_popup
"Cannot use funny .git directory:\n\n$gitdir"
236 if {[catch
{cd [file dirname $_gitdir]} err
]} {
237 catch
{wm withdraw .
}
238 error_popup
"No working directory [file dirname $_gitdir]:\n\n$err"
241 set _reponame
[lindex
[file split \
242 [file normalize
[file dirname $_gitdir]]] \
246 if {[appname
] eq
{git-citool
}} {
250 ######################################################################
258 set disable_on_lock
[list
]
259 set index_lock_type none
261 proc lock_index
{type} {
262 global index_lock_type disable_on_lock
264 if {$index_lock_type eq
{none
}} {
265 set index_lock_type
$type
266 foreach w
$disable_on_lock {
267 uplevel
#0 $w disabled
270 } elseif
{$index_lock_type eq
"begin-$type"} {
271 set index_lock_type
$type
277 proc unlock_index
{} {
278 global index_lock_type disable_on_lock
280 set index_lock_type none
281 foreach w
$disable_on_lock {
286 ######################################################################
290 proc repository_state
{ctvar hdvar mhvar
} {
291 global current_branch
292 upvar
$ctvar ct
$hdvar hd
$mhvar mh
296 if {[catch
{set current_branch
[exec git symbolic-ref HEAD
]}]} {
297 set current_branch
{}
299 regsub ^refs
/((heads|tags|remotes
)/)? \
305 if {[catch
{set hd
[exec git rev-parse
--verify HEAD
]}]} {
311 set merge_head
[gitdir MERGE_HEAD
]
312 if {[file exists
$merge_head]} {
314 set fd_mh
[open
$merge_head r
]
315 while {[gets
$fd_mh line
] >= 0} {
326 global PARENT empty_tree
328 set p
[lindex
$PARENT 0]
332 if {$empty_tree eq
{}} {
333 set empty_tree
[exec git mktree
<< {}]
338 proc rescan
{after
} {
339 global HEAD PARENT MERGE_HEAD commit_type
340 global ui_index ui_workdir ui_status_value ui_comm
341 global rescan_active file_states
344 if {$rescan_active > 0 ||
![lock_index
read]} return
346 repository_state newType newHEAD newMERGE_HEAD
347 if {[string match amend
* $commit_type]
348 && $newType eq
{normal
}
349 && $newHEAD eq
$HEAD} {
353 set MERGE_HEAD
$newMERGE_HEAD
354 set commit_type
$newType
357 array
unset file_states
359 if {![$ui_comm edit modified
]
360 ||
[string trim
[$ui_comm get
0.0 end
]] eq
{}} {
361 if {[load_message GITGUI_MSG
]} {
362 } elseif
{[load_message MERGE_MSG
]} {
363 } elseif
{[load_message SQUASH_MSG
]} {
366 $ui_comm edit modified false
369 if {$repo_config(gui.trustmtime
) eq
{true
}} {
370 rescan_stage2
{} $after
373 set ui_status_value
{Refreshing
file status...
}
374 set cmd
[list git update-index
]
376 lappend cmd
--unmerged
377 lappend cmd
--ignore-missing
378 lappend cmd
--refresh
379 set fd_rf
[open
"| $cmd" r
]
380 fconfigure
$fd_rf -blocking 0 -translation binary
381 fileevent
$fd_rf readable \
382 [list rescan_stage2
$fd_rf $after]
386 proc rescan_stage2
{fd after
} {
387 global ui_status_value
388 global rescan_active buf_rdi buf_rdf buf_rlo
392 if {![eof
$fd]} return
396 set ls_others
[list | git ls-files
--others -z \
397 --exclude-per-directory=.gitignore
]
398 set info_exclude
[gitdir info exclude
]
399 if {[file readable
$info_exclude]} {
400 lappend ls_others
"--exclude-from=$info_exclude"
408 set ui_status_value
{Scanning
for modified files ...
}
409 set fd_di
[open
"| git diff-index --cached -z [PARENT]" r
]
410 set fd_df
[open
"| git diff-files -z" r
]
411 set fd_lo
[open
$ls_others r
]
413 fconfigure
$fd_di -blocking 0 -translation binary
414 fconfigure
$fd_df -blocking 0 -translation binary
415 fconfigure
$fd_lo -blocking 0 -translation binary
416 fileevent
$fd_di readable
[list read_diff_index
$fd_di $after]
417 fileevent
$fd_df readable
[list read_diff_files
$fd_df $after]
418 fileevent
$fd_lo readable
[list read_ls_others
$fd_lo $after]
421 proc load_message
{file} {
425 if {[file isfile
$f]} {
426 if {[catch
{set fd
[open
$f r
]}]} {
429 set content
[string trim
[read $fd]]
431 $ui_comm delete
0.0 end
432 $ui_comm insert end
$content
438 proc read_diff_index
{fd after
} {
441 append buf_rdi
[read $fd]
443 set n
[string length
$buf_rdi]
445 set z1
[string first
"\0" $buf_rdi $c]
448 set z2
[string first
"\0" $buf_rdi $z1]
452 set i
[split [string range
$buf_rdi $c [expr {$z1 - 2}]] { }]
454 [string range
$buf_rdi $z1 [expr {$z2 - 1}]] \
456 [list
[lindex
$i 0] [lindex
$i 2]] \
462 set buf_rdi
[string range
$buf_rdi $c end
]
467 rescan_done
$fd buf_rdi
$after
470 proc read_diff_files
{fd after
} {
473 append buf_rdf
[read $fd]
475 set n
[string length
$buf_rdf]
477 set z1
[string first
"\0" $buf_rdf $c]
480 set z2
[string first
"\0" $buf_rdf $z1]
484 set i
[split [string range
$buf_rdf $c [expr {$z1 - 2}]] { }]
486 [string range
$buf_rdf $z1 [expr {$z2 - 1}]] \
489 [list
[lindex
$i 0] [lindex
$i 2]]
494 set buf_rdf
[string range
$buf_rdf $c end
]
499 rescan_done
$fd buf_rdf
$after
502 proc read_ls_others
{fd after
} {
505 append buf_rlo
[read $fd]
506 set pck
[split $buf_rlo "\0"]
507 set buf_rlo
[lindex
$pck end
]
508 foreach p
[lrange
$pck 0 end-1
] {
511 rescan_done
$fd buf_rlo
$after
514 proc rescan_done
{fd buf after
} {
516 global file_states repo_config
519 if {![eof
$fd]} return
522 if {[incr rescan_active
-1] > 0} return
528 if {$repo_config(gui.partialinclude
) ne
{true
}} {
530 foreach path
[array names file_states
] {
531 switch
-- [lindex
$file_states($path) 0] {
533 M?
{lappend pathList
$path}
536 if {$pathList ne
{}} {
538 "Updating included files" \
540 [concat
{reshow_diff
;} $after]
549 proc prune_selection
{} {
550 global file_states selected_paths
552 foreach path
[array names selected_paths
] {
553 if {[catch
{set still_here
$file_states($path)}]} {
554 unset selected_paths
($path)
559 ######################################################################
564 global ui_diff current_diff ui_index ui_workdir
566 $ui_diff conf
-state normal
567 $ui_diff delete
0.0 end
568 $ui_diff conf
-state disabled
572 $ui_index tag remove in_diff
0.0 end
573 $ui_workdir tag remove in_diff
0.0 end
576 proc reshow_diff
{} {
577 global current_diff ui_status_value file_states
579 if {$current_diff eq
{}
580 ||
[catch
{set s
$file_states($current_diff)}]} {
583 show_diff
$current_diff
587 proc handle_empty_diff
{} {
588 global current_diff file_states file_lists
590 set path
$current_diff
591 set s
$file_states($path)
592 if {[lindex
$s 0] ne
{_M
}} return
594 info_popup
"No differences detected.
596 [short_path $path] has no changes.
598 The modification date of this file was updated
599 by another application and you currently have
600 the Trust File Modification Timestamps option
601 enabled, so Git did not automatically detect
602 that there are no content differences in this
605 This file will now be removed from the modified
606 files list, to prevent possible confusion.
608 if {[catch
{exec git update-index
-- $path} err
]} {
609 error_popup
"Failed to refresh index:\n\n$err"
613 display_file
$path __
616 proc show_diff
{path
{w
{}} {lno
{}}} {
617 global file_states file_lists
618 global is_3way_diff diff_active repo_config
619 global ui_diff current_diff ui_status_value
621 if {$diff_active ||
![lock_index
read]} return
624 if {$w eq
{} ||
$lno == {}} {
625 foreach w
[array names file_lists
] {
626 set lno
[lsearch
-sorted $file_lists($w) $path]
633 if {$w ne
{} && $lno >= 1} {
634 $w tag add in_diff
$lno.0 [expr {$lno + 1}].0
637 set s
$file_states($path)
641 set current_diff
$path
642 set ui_status_value
"Loading diff of [escape_path $path]..."
644 set cmd
[list | git diff-index
]
645 lappend cmd
--no-color
646 if {$repo_config(gui.diffcontext
) > 0} {
647 lappend cmd
"-U$repo_config(gui.diffcontext)"
657 set fd
[open
$path r
]
658 set content
[read $fd]
663 set ui_status_value
"Unable to display [escape_path $path]"
664 error_popup
"Error loading file:\n\n$err"
667 $ui_diff conf
-state normal
668 $ui_diff insert end
$content
669 $ui_diff conf
-state disabled
672 set ui_status_value
{Ready.
}
681 if {[catch
{set fd
[open
$cmd r
]} err
]} {
684 set ui_status_value
"Unable to display [escape_path $path]"
685 error_popup
"Error loading diff:\n\n$err"
689 fconfigure
$fd -blocking 0 -translation auto
690 fileevent
$fd readable
[list read_diff
$fd]
693 proc read_diff
{fd
} {
694 global ui_diff ui_status_value is_3way_diff diff_active
697 $ui_diff conf
-state normal
698 while {[gets
$fd line
] >= 0} {
699 # -- Cleanup uninteresting diff header lines.
701 if {[string match
{diff --git *} $line]} continue
702 if {[string match
{diff --combined *} $line]} continue
703 if {[string match
{--- *} $line]} continue
704 if {[string match
{+++ *} $line]} continue
705 if {$line eq
{deleted
file mode
120000}} {
706 set line
"deleted symlink"
709 # -- Automatically detect if this is a 3 way diff.
711 if {[string match
{@@@
*} $line]} {set is_3way_diff
1}
713 # -- Reformat a 3 way diff, 'cause its too weird.
716 set op
[string range
$line 0 1]
719 {++} {set tags d_
+ ; set op
{ +}}
720 {--} {set tags d_-
; set op
{ -}}
721 { +} {set tags d_
++; set op
{++}}
722 { -} {set tags d_--
; set op
{--}}
723 {+ } {set tags d_-
+; set op
{-+}}
724 {- } {set tags d_
+-; set op
{+-}}
725 default
{set tags
{}}
727 set line
[string replace
$line 0 1 $op]
729 switch
-- [string index
$line 0] {
733 default
{set tags
{}}
736 $ui_diff insert end
$line $tags
737 $ui_diff insert end
"\n" $tags
739 $ui_diff conf
-state disabled
745 set ui_status_value
{Ready.
}
747 if {$repo_config(gui.trustmtime
) eq
{true
}
748 && [$ui_diff index end
] eq
{2.0}} {
754 ######################################################################
758 proc load_last_commit
{} {
759 global HEAD PARENT MERGE_HEAD commit_type ui_comm
761 if {[llength
$PARENT] == 0} {
762 error_popup
{There is nothing to amend.
764 You are about to create the initial commit.
765 There is no commit before this to amend.
770 repository_state curType curHEAD curMERGE_HEAD
771 if {$curType eq
{merge
}} {
772 error_popup
{Cannot amend
while merging.
774 You are currently
in the middle of a merge that
775 has not been fully completed. You cannot amend
776 the prior commit unless you first abort the
777 current merge activity.
785 set fd
[open
"| git cat-file commit $curHEAD" r
]
786 while {[gets
$fd line
] > 0} {
787 if {[string match
{parent
*} $line]} {
788 lappend parents
[string range
$line 7 end
]
791 set msg
[string trim
[read $fd]]
794 error_popup
"Error loading commit data for amend:\n\n$err"
800 set MERGE_HEAD
[list
]
801 switch
-- [llength
$parents] {
802 0 {set commit_type amend-initial
}
803 1 {set commit_type amend
}
804 default
{set commit_type amend-merge
}
807 $ui_comm delete
0.0 end
808 $ui_comm insert end
$msg
810 $ui_comm edit modified false
811 rescan
{set ui_status_value
{Ready.
}}
814 proc create_new_commit
{} {
815 global commit_type ui_comm
817 set commit_type normal
818 $ui_comm delete
0.0 end
820 $ui_comm edit modified false
821 rescan
{set ui_status_value
{Ready.
}}
824 set GIT_COMMITTER_IDENT
{}
826 proc committer_ident
{} {
827 global GIT_COMMITTER_IDENT
829 if {$GIT_COMMITTER_IDENT eq
{}} {
830 if {[catch
{set me
[exec git var GIT_COMMITTER_IDENT
]} err
]} {
831 error_popup
"Unable to obtain your identity:\n\n$err"
834 if {![regexp
{^
(.
*) [0-9]+ [-+0-9]+$
} \
835 $me me GIT_COMMITTER_IDENT
]} {
836 error_popup
"Invalid GIT_COMMITTER_IDENT:\n\n$me"
841 return $GIT_COMMITTER_IDENT
844 proc commit_tree
{} {
845 global HEAD commit_type file_states ui_comm repo_config
847 if {![lock_index update
]} return
848 if {[committer_ident
] eq
{}} return
850 # -- Our in memory state should match the repository.
852 repository_state curType curHEAD curMERGE_HEAD
853 if {[string match amend
* $commit_type]
854 && $curType eq
{normal
}
855 && $curHEAD eq
$HEAD} {
856 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
857 info_popup
{Last scanned state does not match repository state.
859 Another Git program has modified this repository
860 since the last scan. A rescan must be performed
861 before another commit can be created.
863 The rescan will be automatically started now.
866 rescan
{set ui_status_value
{Ready.
}}
870 # -- At least one file should differ in the index.
873 foreach path
[array names file_states
] {
874 switch
-glob -- [lindex
$file_states($path) 0] {
878 M?
{set files_ready
1; break}
880 error_popup
"Unmerged files cannot be committed.
882 File [short_path $path] has merge conflicts.
883 You must resolve them and include the file before committing.
889 error_popup
"Unknown file state [lindex $s 0] detected.
891 File [short_path $path] cannot be committed by this program.
897 error_popup
{No included files to commit.
899 You must include
at least
1 file before you can commit.
905 # -- A message is required.
907 set msg
[string trim
[$ui_comm get
1.0 end
]]
909 error_popup
{Please supply a commit message.
911 A good commit message has the following format
:
913 - First line
: Describe
in one sentance what you did.
915 - Remaining lines
: Describe why this change is good.
921 # -- Update included files if partialincludes are off.
923 if {$repo_config(gui.partialinclude
) ne
{true
}} {
925 foreach path
[array names file_states
] {
926 switch
-glob -- [lindex
$file_states($path) 0] {
928 M?
{lappend pathList
$path}
931 if {$pathList ne
{}} {
934 "Updating included files" \
936 [concat
{lock_index update
;} \
937 [list commit_prehook
$curHEAD $msg]]
942 commit_prehook
$curHEAD $msg
945 proc commit_prehook
{curHEAD msg
} {
946 global ui_status_value pch_error
948 set pchook
[gitdir hooks pre-commit
]
950 # On Cygwin [file executable] might lie so we need to ask
951 # the shell if the hook is executable. Yes that's annoying.
953 if {[is_Windows
] && [file isfile
$pchook]} {
954 set pchook
[list sh
-c [concat \
955 "if test -x \"$pchook\";" \
956 "then exec \"$pchook\" 2>&1;" \
958 } elseif
{[file executable
$pchook]} {
959 set pchook
[list
$pchook |
& cat]
961 commit_writetree
$curHEAD $msg
965 set ui_status_value
{Calling pre-commit hook...
}
967 set fd_ph
[open
"| $pchook" r
]
968 fconfigure
$fd_ph -blocking 0 -translation binary
969 fileevent
$fd_ph readable \
970 [list commit_prehook_wait
$fd_ph $curHEAD $msg]
973 proc commit_prehook_wait
{fd_ph curHEAD msg
} {
974 global pch_error ui_status_value
976 append pch_error
[read $fd_ph]
977 fconfigure
$fd_ph -blocking 1
979 if {[catch
{close
$fd_ph}]} {
980 set ui_status_value
{Commit declined by pre-commit hook.
}
981 hook_failed_popup pre-commit
$pch_error
984 commit_writetree
$curHEAD $msg
989 fconfigure
$fd_ph -blocking 0
992 proc commit_writetree
{curHEAD msg
} {
993 global ui_status_value
995 set ui_status_value
{Committing changes...
}
996 set fd_wt
[open
"| git write-tree" r
]
997 fileevent
$fd_wt readable \
998 [list commit_committree
$fd_wt $curHEAD $msg]
1001 proc commit_committree
{fd_wt curHEAD msg
} {
1002 global HEAD PARENT MERGE_HEAD commit_type
1003 global single_commit
1004 global ui_status_value ui_comm selected_commit_type
1005 global file_states selected_paths rescan_active
1008 if {$tree_id eq
{} ||
[catch
{close
$fd_wt} err
]} {
1009 error_popup
"write-tree failed:\n\n$err"
1010 set ui_status_value
{Commit failed.
}
1015 # -- Create the commit.
1017 set cmd
[list git commit-tree
$tree_id]
1018 set parents
[concat
$PARENT $MERGE_HEAD]
1019 if {[llength
$parents] > 0} {
1020 foreach p
$parents {
1024 # git commit-tree writes to stderr during initial commit.
1025 lappend cmd
2>/dev
/null
1028 if {[catch
{set cmt_id
[eval exec $cmd]} err
]} {
1029 error_popup
"commit-tree failed:\n\n$err"
1030 set ui_status_value
{Commit failed.
}
1035 # -- Update the HEAD ref.
1038 if {$commit_type ne
{normal
}} {
1039 append reflogm
" ($commit_type)"
1041 set i
[string first
"\n" $msg]
1043 append reflogm
{: } [string range
$msg 0 [expr {$i - 1}]]
1045 append reflogm
{: } $msg
1047 set cmd
[list git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD]
1048 if {[catch
{eval exec $cmd} err
]} {
1049 error_popup
"update-ref failed:\n\n$err"
1050 set ui_status_value
{Commit failed.
}
1055 # -- Cleanup after ourselves.
1057 catch
{file delete
[gitdir MERGE_HEAD
]}
1058 catch
{file delete
[gitdir MERGE_MSG
]}
1059 catch
{file delete
[gitdir SQUASH_MSG
]}
1060 catch
{file delete
[gitdir GITGUI_MSG
]}
1062 # -- Let rerere do its thing.
1064 if {[file isdirectory
[gitdir rr-cache
]]} {
1065 catch
{exec git rerere
}
1068 # -- Run the post-commit hook.
1070 set pchook
[gitdir hooks post-commit
]
1071 if {[is_Windows
] && [file isfile
$pchook]} {
1072 set pchook
[list sh
-c [concat \
1073 "if test -x \"$pchook\";" \
1074 "then exec \"$pchook\";" \
1076 } elseif
{![file executable
$pchook]} {
1079 if {$pchook ne
{}} {
1080 catch
{exec $pchook &}
1083 $ui_comm delete
0.0 end
1085 $ui_comm edit modified false
1087 if {$single_commit} do_quit
1089 # -- Update in memory status
1091 set selected_commit_type new
1092 set commit_type normal
1095 set MERGE_HEAD
[list
]
1097 foreach path
[array names file_states
] {
1098 set s
$file_states($path)
1100 switch
-glob -- $m {
1108 unset file_states
($path)
1109 catch
{unset selected_paths
($path)}
1112 set file_states
($path) [list _O
[lindex
$s 1] {} {}]
1119 set file_states
($path) [list \
1120 _
[string index
$m 1] \
1131 set ui_status_value \
1132 "Changes committed as [string range $cmt_id 0 7]."
1135 ######################################################################
1139 proc fetch_from
{remote
} {
1140 set w
[new_console
"fetch $remote" \
1141 "Fetching new changes from $remote"]
1142 set cmd
[list git fetch
]
1144 console_exec
$w $cmd
1147 proc pull_remote
{remote branch
} {
1148 global HEAD commit_type file_states repo_config
1150 if {![lock_index update
]} return
1152 # -- Our in memory state should match the repository.
1154 repository_state curType curHEAD curMERGE_HEAD
1155 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1156 info_popup
{Last scanned state does not match repository state.
1158 Another Git program has modified this repository
1159 since the last scan. A rescan must be performed
1160 before a pull operation can be started.
1162 The rescan will be automatically started now.
1165 rescan
{set ui_status_value
{Ready.
}}
1169 # -- No differences should exist before a pull.
1171 if {[array size file_states
] != 0} {
1172 error_popup
{Uncommitted but modified files are present.
1174 You should not perform a pull with unmodified
1175 files
in your working directory as Git will be
1176 unable to recover from an incorrect merge.
1178 You should commit or revert all changes before
1179 starting a pull operation.
1185 set w
[new_console
"pull $remote $branch" \
1186 "Pulling new changes from branch $branch in $remote"]
1187 set cmd
[list git pull
]
1188 if {$repo_config(gui.pullsummary
) eq
{false
}} {
1189 lappend cmd
--no-summary
1193 console_exec
$w $cmd [list post_pull_remote
$remote $branch]
1196 proc post_pull_remote
{remote branch success
} {
1197 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1198 global ui_status_value
1202 repository_state commit_type HEAD MERGE_HEAD
1204 set selected_commit_type new
1205 set ui_status_value
"Pulling $branch from $remote complete."
1207 rescan
[list
set ui_status_value \
1208 "Conflicts detected while pulling $branch from $remote."]
1212 proc push_to
{remote
} {
1213 set w
[new_console
"push $remote" \
1214 "Pushing changes to $remote"]
1215 set cmd
[list git push
]
1217 console_exec
$w $cmd
1220 ######################################################################
1224 proc mapicon
{w state path
} {
1227 if {[catch
{set r
$all_icons($state$w)}]} {
1228 puts
"error: no icon for $w state={$state} $path"
1234 proc mapdesc
{state path
} {
1237 if {[catch
{set r
$all_descs($state)}]} {
1238 puts
"error: no desc for state={$state} $path"
1244 proc escape_path
{path
} {
1245 regsub
-all "\n" $path "\\n" path
1249 proc short_path
{path
} {
1250 return [escape_path
[lindex
[file split $path] end
]]
1254 set null_sha1
[string repeat
0 40]
1256 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1257 global file_states next_icon_id null_sha1
1259 set s0
[string index
$new_state 0]
1260 set s1
[string index
$new_state 1]
1262 if {[catch
{set info
$file_states($path)}]} {
1264 set icon n
[incr next_icon_id
]
1266 set state
[lindex
$info 0]
1267 set icon
[lindex
$info 1]
1268 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1269 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1272 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1273 elseif
{$s0 eq
{_
}} {set s0 _
}
1275 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1276 elseif
{$s1 eq
{_
}} {set s1 _
}
1278 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1279 set head_info
[list
0 $null_sha1]
1280 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1281 && $head_info eq
{}} {
1282 set head_info
$index_info
1285 set file_states
($path) [list
$s0$s1 $icon \
1286 $head_info $index_info \
1291 proc display_file_helper
{w path icon_name old_m new_m
} {
1294 if {$new_m eq
{_
}} {
1295 set lno
[lsearch
-sorted $file_lists($w) $path]
1297 set file_lists
($w) [lreplace
$file_lists($w) $lno $lno]
1299 $w conf
-state normal
1300 $w delete
$lno.0 [expr {$lno + 1}].0
1301 $w conf
-state disabled
1303 } elseif
{$old_m eq
{_
} && $new_m ne
{_
}} {
1304 lappend file_lists
($w) $path
1305 set file_lists
($w) [lsort
-unique $file_lists($w)]
1306 set lno
[lsearch
-sorted $file_lists($w) $path]
1308 $w conf
-state normal
1309 $w image create
$lno.0 \
1310 -align center
-padx 5 -pady 1 \
1312 -image [mapicon
$w $new_m $path]
1313 $w insert
$lno.1 "[escape_path $path]\n"
1314 $w conf
-state disabled
1315 } elseif
{$old_m ne
$new_m} {
1316 $w conf
-state normal
1317 $w image conf
$icon_name -image [mapicon
$w $new_m $path]
1318 $w conf
-state disabled
1322 proc display_file
{path state
} {
1323 global file_states selected_paths
1324 global ui_index ui_workdir
1326 set old_m
[merge_state
$path $state]
1327 set s
$file_states($path)
1328 set new_m
[lindex
$s 0]
1329 set icon_name
[lindex
$s 1]
1331 display_file_helper
$ui_index $path $icon_name \
1332 [string index
$old_m 0] \
1333 [string index
$new_m 0]
1334 display_file_helper
$ui_workdir $path $icon_name \
1335 [string index
$old_m 1] \
1336 [string index
$new_m 1]
1338 if {$new_m eq
{__
}} {
1339 unset file_states
($path)
1340 catch
{unset selected_paths
($path)}
1344 proc display_all_files_helper
{w path icon_name m
} {
1347 lappend file_lists
($w) $path
1348 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1349 $w image create end \
1350 -align center
-padx 5 -pady 1 \
1352 -image [mapicon
$w $m $path]
1353 $w insert end
"[escape_path $path]\n"
1356 proc display_all_files
{} {
1357 global ui_index ui_workdir
1358 global file_states file_lists
1359 global last_clicked selected_paths
1361 $ui_index conf
-state normal
1362 $ui_workdir conf
-state normal
1364 $ui_index delete
0.0 end
1365 $ui_workdir delete
0.0 end
1368 set file_lists
($ui_index) [list
]
1369 set file_lists
($ui_workdir) [list
]
1371 foreach path
[lsort
[array names file_states
]] {
1372 set s
$file_states($path)
1374 set icon_name
[lindex
$s 1]
1376 if {[string index
$m 0] ne
{_
}} {
1377 display_all_files_helper
$ui_index $path \
1378 $icon_name [string index
$m 0]
1380 if {[string index
$m 1] ne
{_
}} {
1381 display_all_files_helper
$ui_workdir $path \
1382 $icon_name [string index
$m 1]
1386 $ui_index conf
-state disabled
1387 $ui_workdir conf
-state disabled
1390 proc update_indexinfo
{msg pathList after
} {
1391 global update_index_cp ui_status_value
1393 if {![lock_index update
]} return
1395 set update_index_cp
0
1396 set pathList
[lsort
$pathList]
1397 set totalCnt
[llength
$pathList]
1398 set batch [expr {int
($totalCnt * .01) + 1}]
1399 if {$batch > 25} {set batch 25}
1401 set ui_status_value
[format \
1402 "$msg... %i/%i files (%.2f%%)" \
1406 set fd
[open
"| git update-index -z --index-info" w
]
1412 fileevent
$fd writable
[list \
1413 write_update_indexinfo \
1423 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1424 global update_index_cp ui_status_value
1425 global file_states current_diff
1427 if {$update_index_cp >= $totalCnt} {
1434 for {set i
$batch} \
1435 {$update_index_cp < $totalCnt && $i > 0} \
1437 set path
[lindex
$pathList $update_index_cp]
1438 incr update_index_cp
1440 set s
$file_states($path)
1441 switch
-glob -- [lindex
$s 0] {
1448 set info
[lindex
$s 2]
1449 if {$info eq
{}} continue
1451 puts
-nonewline $fd $info
1452 puts
-nonewline $fd "\t"
1453 puts
-nonewline $fd $path
1454 puts
-nonewline $fd "\0"
1455 display_file
$path $new
1458 set ui_status_value
[format \
1459 "$msg... %i/%i files (%.2f%%)" \
1462 [expr {100.0 * $update_index_cp / $totalCnt}]]
1465 proc update_index
{msg pathList after
} {
1466 global update_index_cp ui_status_value
1468 if {![lock_index update
]} return
1470 set update_index_cp
0
1471 set pathList
[lsort
$pathList]
1472 set totalCnt
[llength
$pathList]
1473 set batch [expr {int
($totalCnt * .01) + 1}]
1474 if {$batch > 25} {set batch 25}
1476 set ui_status_value
[format \
1477 "$msg... %i/%i files (%.2f%%)" \
1481 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1487 fileevent
$fd writable
[list \
1488 write_update_index \
1498 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1499 global update_index_cp ui_status_value
1500 global file_states current_diff
1502 if {$update_index_cp >= $totalCnt} {
1509 for {set i
$batch} \
1510 {$update_index_cp < $totalCnt && $i > 0} \
1512 set path
[lindex
$pathList $update_index_cp]
1513 incr update_index_cp
1515 switch
-glob -- [lindex
$file_states($path) 0] {
1534 puts
-nonewline $fd $path
1535 puts
-nonewline $fd "\0"
1536 display_file
$path $new
1539 set ui_status_value
[format \
1540 "$msg... %i/%i files (%.2f%%)" \
1543 [expr {100.0 * $update_index_cp / $totalCnt}]]
1546 proc checkout_index
{msg pathList after
} {
1547 global update_index_cp ui_status_value
1549 if {![lock_index update
]} return
1551 set update_index_cp
0
1552 set pathList
[lsort
$pathList]
1553 set totalCnt
[llength
$pathList]
1554 set batch [expr {int
($totalCnt * .01) + 1}]
1555 if {$batch > 25} {set batch 25}
1557 set ui_status_value
[format \
1558 "$msg... %i/%i files (%.2f%%)" \
1562 set cmd
[list git checkout-index
]
1568 set fd
[open
"| $cmd " w
]
1574 fileevent
$fd writable
[list \
1575 write_checkout_index \
1585 proc write_checkout_index
{fd pathList totalCnt
batch msg after
} {
1586 global update_index_cp ui_status_value
1587 global file_states current_diff
1589 if {$update_index_cp >= $totalCnt} {
1596 for {set i
$batch} \
1597 {$update_index_cp < $totalCnt && $i > 0} \
1599 set path
[lindex
$pathList $update_index_cp]
1600 incr update_index_cp
1602 switch
-glob -- [lindex
$file_states($path) 0] {
1612 puts
-nonewline $fd $path
1613 puts
-nonewline $fd "\0"
1614 display_file
$path $new
1617 set ui_status_value
[format \
1618 "$msg... %i/%i files (%.2f%%)" \
1621 [expr {100.0 * $update_index_cp / $totalCnt}]]
1624 ######################################################################
1626 ## branch management
1628 proc load_all_heads
{} {
1629 global all_heads tracking_branches
1631 set all_heads
[list
]
1632 set cmd
[list git for-each-ref
]
1633 lappend cmd
--format=%(refname
)
1634 lappend cmd refs
/heads
1635 set fd
[open
"| $cmd" r
]
1636 while {[gets
$fd line
] > 0} {
1637 if {![catch
{set info
$tracking_branches($line)}]} continue
1638 if {![regsub ^refs
/heads
/ $line {} name
]} continue
1639 lappend all_heads
$name
1643 set all_heads
[lsort
$all_heads]
1646 proc populate_branch_menu
{m
} {
1647 global all_heads disable_on_lock
1650 foreach b
$all_heads {
1651 $m add radiobutton \
1653 -command [list switch_branch
$b] \
1654 -variable current_branch \
1657 lappend disable_on_lock \
1658 [list
$m entryconf
[$m index last
] -state]
1662 proc do_create_branch
{} {
1663 error
"NOT IMPLEMENTED"
1666 proc do_delete_branch
{} {
1667 error
"NOT IMPLEMENTED"
1670 proc switch_branch
{b
} {
1671 global HEAD commit_type file_states current_branch
1672 global selected_commit_type ui_comm
1674 if {![lock_index switch
]} return
1676 # -- Backup the selected branch (repository_state resets it)
1678 set new_branch
$current_branch
1680 # -- Our in memory state should match the repository.
1682 repository_state curType curHEAD curMERGE_HEAD
1683 if {[string match amend
* $commit_type]
1684 && $curType eq
{normal
}
1685 && $curHEAD eq
$HEAD} {
1686 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1687 info_popup
{Last scanned state does not match repository state.
1689 Another Git program has modified this repository
1690 since the last scan. A rescan must be performed
1691 before the current branch can be changed.
1693 The rescan will be automatically started now.
1696 rescan
{set ui_status_value
{Ready.
}}
1700 # -- Toss the message buffer if we are in amend mode.
1702 if {[string match amend
* $curType]} {
1703 $ui_comm delete
0.0 end
1705 $ui_comm edit modified false
1708 set selected_commit_type new
1709 set current_branch
$new_branch
1712 error
"NOT FINISHED"
1715 ######################################################################
1717 ## remote management
1719 proc load_all_remotes
{} {
1721 global all_remotes tracking_branches
1723 set all_remotes
[list
]
1724 array
unset tracking_branches
1726 set rm_dir
[gitdir remotes
]
1727 if {[file isdirectory
$rm_dir]} {
1728 set all_remotes
[glob \
1732 -directory $rm_dir *]
1734 foreach name
$all_remotes {
1736 set fd
[open
[file join $rm_dir $name] r
]
1737 while {[gets
$fd line
] >= 0} {
1738 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
1739 $line line src dst
]} continue
1740 if {![regexp ^refs
/ $dst]} {
1741 set dst
"refs/heads/$dst"
1743 set tracking_branches
($dst) [list
$name $src]
1750 foreach line
[array names repo_config remote.
*.url
] {
1751 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
1752 lappend all_remotes
$name
1754 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
1758 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
1759 if {![regexp ^refs
/ $dst]} {
1760 set dst
"refs/heads/$dst"
1762 set tracking_branches
($dst) [list
$name $src]
1766 set all_remotes
[lsort
-unique $all_remotes]
1769 proc populate_fetch_menu
{m
} {
1770 global all_remotes repo_config
1772 foreach r
$all_remotes {
1774 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1775 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
1780 set fd
[open
[gitdir remotes
$r] r
]
1781 while {[gets
$fd n
] >= 0} {
1782 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
1793 -label "Fetch from $r..." \
1794 -command [list fetch_from
$r] \
1800 proc populate_push_menu
{m
} {
1801 global all_remotes repo_config
1803 foreach r
$all_remotes {
1805 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1806 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
1811 set fd
[open
[gitdir remotes
$r] r
]
1812 while {[gets
$fd n
] >= 0} {
1813 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
1824 -label "Push to $r..." \
1825 -command [list push_to
$r] \
1831 proc populate_pull_menu
{m
} {
1832 global repo_config all_remotes disable_on_lock
1834 foreach remote
$all_remotes {
1836 if {[array get repo_config remote.
$remote.url
] ne
{}} {
1837 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
1838 foreach line
$repo_config(remote.
$remote.fetch
) {
1839 if {[regexp
{^
([^
:]+):} $line line rb
]} {
1846 set fd
[open
[gitdir remotes
$remote] r
]
1847 while {[gets
$fd line
] >= 0} {
1848 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
1856 foreach rb
$rb_list {
1857 regsub ^refs
/heads
/ $rb {} rb_short
1859 -label "Branch $rb_short from $remote..." \
1860 -command [list pull_remote
$remote $rb] \
1862 lappend disable_on_lock \
1863 [list
$m entryconf
[$m index last
] -state]
1868 ######################################################################
1873 #define mask_width 14
1874 #define mask_height 15
1875 static unsigned char mask_bits
[] = {
1876 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1877 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1878 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1881 image create bitmap file_plain
-background white
-foreground black
-data {
1882 #define plain_width 14
1883 #define plain_height 15
1884 static unsigned char plain_bits
[] = {
1885 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1886 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1887 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1888 } -maskdata $filemask
1890 image create bitmap file_mod
-background white
-foreground blue
-data {
1891 #define mod_width 14
1892 #define mod_height 15
1893 static unsigned char mod_bits
[] = {
1894 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1895 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1896 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1897 } -maskdata $filemask
1899 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
1900 #define file_fulltick_width 14
1901 #define file_fulltick_height 15
1902 static unsigned char file_fulltick_bits
[] = {
1903 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1904 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1905 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1906 } -maskdata $filemask
1908 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1909 #define parttick_width 14
1910 #define parttick_height 15
1911 static unsigned char parttick_bits
[] = {
1912 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1913 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1914 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1915 } -maskdata $filemask
1917 image create bitmap file_question
-background white
-foreground black
-data {
1918 #define file_question_width 14
1919 #define file_question_height 15
1920 static unsigned char file_question_bits
[] = {
1921 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1922 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1923 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1924 } -maskdata $filemask
1926 image create bitmap file_removed
-background white
-foreground red
-data {
1927 #define file_removed_width 14
1928 #define file_removed_height 15
1929 static unsigned char file_removed_bits
[] = {
1930 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1931 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1932 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1933 } -maskdata $filemask
1935 image create bitmap file_merge
-background white
-foreground blue
-data {
1936 #define file_merge_width 14
1937 #define file_merge_height 15
1938 static unsigned char file_merge_bits
[] = {
1939 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1940 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1941 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1942 } -maskdata $filemask
1944 set ui_index .vpane.files.index.list
1945 set ui_workdir .vpane.files.workdir.list
1947 set all_icons
(_
$ui_index) file_plain
1948 set all_icons
(A
$ui_index) file_fulltick
1949 set all_icons
(M
$ui_index) file_fulltick
1950 set all_icons
(D
$ui_index) file_removed
1951 set all_icons
(U
$ui_index) file_merge
1953 set all_icons
(_
$ui_workdir) file_plain
1954 set all_icons
(M
$ui_workdir) file_mod
1955 set all_icons
(D
$ui_workdir) file_question
1956 set all_icons
(O
$ui_workdir) file_plain
1958 set max_status_desc
0
1962 {M_
"Added to commit"}
1963 {MM
"Partially added"}
1964 {MD
"Added (but gone)"}
1967 {A_
"Added by commit"}
1968 {AM
"Partially added"}
1969 {AD
"Added (but gone)"}
1972 {DD
"Removed by commit"}
1973 {D_
"Removed by commit"}
1974 {DO
"Removed (still exists)"}
1975 {DM
"Removed (but modified)"}
1977 {UD
"Merge conflicts"}
1978 {UM
"Merge conflicts"}
1979 {U_
"Merge conflicts"}
1981 if {$max_status_desc < [string length
[lindex
$i 1]]} {
1982 set max_status_desc
[string length
[lindex
$i 1]]
1984 set all_descs
([lindex
$i 0]) [lindex
$i 1]
1988 ######################################################################
1993 global tcl_platform tk_library
1994 if {[tk windowingsystem
] eq
{aqua
}} {
2000 proc is_Windows
{} {
2002 if {$tcl_platform(platform
) eq
{windows
}} {
2008 proc bind_button3
{w cmd
} {
2009 bind $w <Any-Button-3
> $cmd
2011 bind $w <Control-Button-1
> $cmd
2015 proc incr_font_size
{font
{amt
1}} {
2016 set sz
[font configure
$font -size]
2018 font configure
$font -size $sz
2019 font configure
${font}bold
-size $sz
2022 proc hook_failed_popup
{hook msg
} {
2027 label
$w.m.l1
-text "$hook hook failed:" \
2032 -background white
-borderwidth 1 \
2034 -width 80 -height 10 \
2036 -yscrollcommand [list
$w.m.sby
set]
2038 -text {You must correct the above errors before committing.
} \
2042 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2043 pack
$w.m.l1
-side top
-fill x
2044 pack
$w.m.l2
-side bottom
-fill x
2045 pack
$w.m.sby
-side right
-fill y
2046 pack
$w.m.t
-side left
-fill both
-expand 1
2047 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2049 $w.m.t insert
1.0 $msg
2050 $w.m.t conf
-state disabled
2052 button
$w.ok
-text OK \
2055 -command "destroy $w"
2056 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2058 bind $w <Visibility
> "grab $w; focus $w"
2059 bind $w <Key-Return
> "destroy $w"
2060 wm title
$w "[appname] ([reponame]): error"
2064 set next_console_id
0
2066 proc new_console
{short_title long_title
} {
2067 global next_console_id console_data
2068 set w .console
[incr next_console_id
]
2069 set console_data
($w) [list
$short_title $long_title]
2070 return [console_init
$w]
2073 proc console_init
{w
} {
2074 global console_cr console_data M1B
2076 set console_cr
($w) 1.0
2079 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
2084 -background white
-borderwidth 1 \
2086 -width 80 -height 10 \
2089 -yscrollcommand [list
$w.m.sby
set]
2090 label
$w.m.s
-text {Working... please
wait...
} \
2094 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2095 pack
$w.m.l1
-side top
-fill x
2096 pack
$w.m.s
-side bottom
-fill x
2097 pack
$w.m.sby
-side right
-fill y
2098 pack
$w.m.t
-side left
-fill both
-expand 1
2099 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2101 menu
$w.ctxm
-tearoff 0
2102 $w.ctxm add
command -label "Copy" \
2104 -command "tk_textCopy $w.m.t"
2105 $w.ctxm add
command -label "Select All" \
2107 -command "$w.m.t tag add sel 0.0 end"
2108 $w.ctxm add
command -label "Copy All" \
2111 $w.m.t tag add sel 0.0 end
2113 $w.m.t tag remove sel 0.0 end
2116 button
$w.ok
-text {Close
} \
2119 -command "destroy $w"
2120 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2122 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
2123 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2124 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2125 bind $w <Visibility
> "focus $w"
2126 wm title
$w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2130 proc console_exec
{w cmd
{after
{}}} {
2131 # -- Windows tosses the enviroment when we exec our child.
2132 # But most users need that so we have to relogin. :-(
2135 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
2138 # -- Tcl won't let us redirect both stdout and stderr to
2139 # the same pipe. So pass it through cat...
2141 set cmd
[concat |
$cmd |
& cat]
2143 set fd_f
[open
$cmd r
]
2144 fconfigure
$fd_f -blocking 0 -translation binary
2145 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
2148 proc console_read
{w fd after
} {
2149 global console_cr console_data
2153 if {![winfo exists
$w]} {console_init
$w}
2154 $w.m.t conf
-state normal
2156 set n
[string length
$buf]
2158 set cr
[string first
"\r" $buf $c]
2159 set lf
[string first
"\n" $buf $c]
2160 if {$cr < 0} {set cr
[expr {$n + 1}]}
2161 if {$lf < 0} {set lf
[expr {$n + 1}]}
2164 $w.m.t insert end
[string range
$buf $c $lf]
2165 set console_cr
($w) [$w.m.t index
{end
-1c}]
2169 $w.m.t delete
$console_cr($w) end
2170 $w.m.t insert end
"\n"
2171 $w.m.t insert end
[string range
$buf $c $cr]
2176 $w.m.t conf
-state disabled
2180 fconfigure
$fd -blocking 1
2182 if {[catch
{close
$fd}]} {
2183 if {![winfo exists
$w]} {console_init
$w}
2184 $w.m.s conf
-background red
-text {Error
: Command Failed
}
2185 $w.ok conf
-state normal
2187 } elseif
{[winfo exists
$w]} {
2188 $w.m.s conf
-background green
-text {Success
}
2189 $w.ok conf
-state normal
2192 array
unset console_cr
$w
2193 array
unset console_data
$w
2195 uplevel
#0 $after $ok
2199 fconfigure
$fd -blocking 0
2202 ######################################################################
2206 set starting_gitk_msg
{Starting gitk... please
wait...
}
2208 proc do_gitk
{revs
} {
2209 global ui_status_value starting_gitk_msg
2217 set cmd
"sh -c \"exec $cmd\""
2221 if {[catch
{eval exec $cmd} err
]} {
2222 error_popup
"Failed to start gitk:\n\n$err"
2224 set ui_status_value
$starting_gitk_msg
2226 if {$ui_status_value eq
$starting_gitk_msg} {
2227 set ui_status_value
{Ready.
}
2234 set w
[new_console
{gc
} {Compressing the object database
}]
2235 console_exec
$w {git gc
}
2238 proc do_fsck_objects
{} {
2239 set w
[new_console
{fsck-objects
} \
2240 {Verifying the object database with fsck-objects
}]
2241 set cmd
[list git fsck-objects
]
2244 lappend cmd
--strict
2245 console_exec
$w $cmd
2251 global ui_comm is_quitting repo_config commit_type
2253 if {$is_quitting} return
2256 # -- Stash our current commit buffer.
2258 set save
[gitdir GITGUI_MSG
]
2259 set msg
[string trim
[$ui_comm get
0.0 end
]]
2260 if {![string match amend
* $commit_type]
2261 && [$ui_comm edit modified
]
2264 set fd
[open
$save w
]
2265 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
2269 catch
{file delete
$save}
2272 # -- Stash our current window geometry into this repository.
2274 set cfg_geometry
[list
]
2275 lappend cfg_geometry
[wm geometry .
]
2276 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
2277 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
2278 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2281 if {$cfg_geometry ne
$rc_geometry} {
2282 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2289 rescan
{set ui_status_value
{Ready.
}}
2292 proc remove_helper
{txt paths
} {
2293 global file_states current_diff
2295 if {![lock_index begin-update
]} return
2299 foreach path
$paths {
2300 switch
-glob -- [lindex
$file_states($path) 0] {
2304 lappend pathList
$path
2305 if {$path eq
$current_diff} {
2306 set after
{reshow_diff
;}
2311 if {$pathList eq
{}} {
2317 [concat
$after {set ui_status_value
{Ready.
}}]
2321 proc do_remove_selection
{} {
2322 global current_diff selected_paths
2324 if {[array size selected_paths
] > 0} {
2326 {Removing selected files from commit
} \
2327 [array names selected_paths
]
2328 } elseif
{$current_diff ne
{}} {
2330 "Removing [short_path $current_diff] from commit" \
2331 [list
$current_diff]
2335 proc include_helper
{txt paths
} {
2336 global file_states current_diff
2338 if {![lock_index begin-update
]} return
2342 foreach path
$paths {
2343 switch
-glob -- [lindex
$file_states($path) 0] {
2352 lappend pathList
$path
2353 if {$path eq
$current_diff} {
2354 set after
{reshow_diff
;}
2359 if {$pathList eq
{}} {
2365 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2369 proc do_include_selection
{} {
2370 global current_diff selected_paths
2372 if {[array size selected_paths
] > 0} {
2374 {Adding selected files
} \
2375 [array names selected_paths
]
2376 } elseif
{$current_diff ne
{}} {
2378 "Adding [short_path $current_diff]" \
2379 [list
$current_diff]
2383 proc do_include_all
{} {
2387 foreach path
[array names file_states
] {
2388 switch
-- [lindex
$file_states($path) 0] {
2394 _D
{lappend paths
$path}
2398 {Adding all modified files
} \
2402 proc revert_helper
{txt paths
} {
2403 global file_states current_diff
2405 if {![lock_index begin-update
]} return
2409 foreach path
$paths {
2410 switch
-glob -- [lindex
$file_states($path) 0] {
2417 lappend pathList
$path
2418 if {$path eq
$current_diff} {
2419 set after
{reshow_diff
;}
2425 set n
[llength
$pathList]
2429 } elseif
{$n == 1} {
2430 set s
"[short_path [lindex $pathList]]"
2432 set s
"these $n files"
2435 set reply
[tk_dialog \
2437 "[appname] ([reponame])" \
2438 "Revert changes in $s?
2440 Any unadded changes will be permanently lost by the revert." \
2450 [concat
$after {set ui_status_value
{Ready.
}}]
2456 proc do_revert_selection
{} {
2457 global current_diff selected_paths
2459 if {[array size selected_paths
] > 0} {
2461 {Reverting selected files
} \
2462 [array names selected_paths
]
2463 } elseif
{$current_diff ne
{}} {
2465 "Reverting [short_path $current_diff]" \
2466 [list
$current_diff]
2470 proc do_signoff
{} {
2473 set me
[committer_ident
]
2474 if {$me eq
{}} return
2476 set sob
"Signed-off-by: $me"
2477 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2478 if {$last ne
$sob} {
2479 $ui_comm edit separator
2481 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2482 $ui_comm insert end
"\n"
2484 $ui_comm insert end
"\n$sob"
2485 $ui_comm edit separator
2490 proc do_select_commit_type
{} {
2491 global commit_type selected_commit_type
2493 if {$selected_commit_type eq
{new
}
2494 && [string match amend
* $commit_type]} {
2496 } elseif
{$selected_commit_type eq
{amend
}
2497 && ![string match amend
* $commit_type]} {
2500 # The amend request was rejected...
2502 if {![string match amend
* $commit_type]} {
2503 set selected_commit_type new
2513 global appvers copyright
2514 global tcl_patchLevel tk_patchLevel
2518 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2520 label
$w.header
-text "About [appname]" \
2522 pack
$w.header
-side top
-fill x
2525 button
$w.buttons.close
-text {Close
} \
2527 -command [list destroy
$w]
2528 pack
$w.buttons.close
-side right
2529 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2532 -text "[appname] - a commit creation tool for Git.
2540 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
2543 append v
"[appname] version $appvers\n"
2544 append v
"[exec git version]\n"
2546 if {$tcl_patchLevel eq
$tk_patchLevel} {
2547 append v
"Tcl/Tk version $tcl_patchLevel"
2549 append v
"Tcl version $tcl_patchLevel"
2550 append v
", Tk version $tk_patchLevel"
2561 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
2563 menu
$w.ctxm
-tearoff 0
2564 $w.ctxm add
command \
2569 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2572 bind $w <Visibility
> "grab $w; focus $w"
2573 bind $w <Key-Escape
> "destroy $w"
2574 bind_button3
$w.vers
"tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2575 wm title
$w "About [appname]"
2579 proc do_options
{} {
2580 global repo_config global_config font_descs
2581 global repo_config_new global_config_new
2583 array
unset repo_config_new
2584 array
unset global_config_new
2585 foreach name
[array names repo_config
] {
2586 set repo_config_new
($name) $repo_config($name)
2589 foreach name
[array names repo_config
] {
2591 gui.diffcontext
{continue}
2593 set repo_config_new
($name) $repo_config($name)
2595 foreach name
[array names global_config
] {
2596 set global_config_new
($name) $global_config($name)
2599 set w .options_editor
2601 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2603 label
$w.header
-text "[appname] Options" \
2605 pack
$w.header
-side top
-fill x
2608 button
$w.buttons.restore
-text {Restore Defaults
} \
2610 -command do_restore_defaults
2611 pack
$w.buttons.restore
-side left
2612 button
$w.buttons.save
-text Save \
2614 -command [list do_save_config
$w]
2615 pack
$w.buttons.save
-side right
2616 button
$w.buttons.cancel
-text {Cancel
} \
2618 -command [list destroy
$w]
2619 pack
$w.buttons.cancel
-side right
2620 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2622 labelframe
$w.repo
-text "[reponame] Repository" \
2624 -relief raised
-borderwidth 2
2625 labelframe
$w.global
-text {Global
(All Repositories
)} \
2627 -relief raised
-borderwidth 2
2628 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
2629 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
2632 {b partialinclude
{Allow Partially Added Files
}}
2633 {b pullsummary
{Show Pull Summary
}}
2634 {b trustmtime
{Trust File Modification Timestamps
}}
2635 {i diffcontext
{Number of Diff Context Lines
}}
2637 set type [lindex
$option 0]
2638 set name
[lindex
$option 1]
2639 set text
[lindex
$option 2]
2640 foreach f
{repo global
} {
2643 checkbutton
$w.
$f.
$name -text $text \
2644 -variable ${f}_config_new
(gui.
$name) \
2648 pack
$w.
$f.
$name -side top
-anchor w
2652 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
2653 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
2654 spinbox
$w.
$f.
$name.v \
2655 -textvariable ${f}_config_new
(gui.
$name) \
2656 -from 1 -to 99 -increment 1 \
2659 pack
$w.
$f.
$name.v
-side right
-anchor e
2660 pack
$w.
$f.
$name -side top
-anchor w
-fill x
2666 set all_fonts
[lsort
[font families
]]
2667 foreach option
$font_descs {
2668 set name
[lindex
$option 0]
2669 set font
[lindex
$option 1]
2670 set text
[lindex
$option 2]
2672 set global_config_new
(gui.
$font^^family
) \
2673 [font configure
$font -family]
2674 set global_config_new
(gui.
$font^^size
) \
2675 [font configure
$font -size]
2677 frame
$w.global.
$name
2678 label
$w.global.
$name.l
-text "$text:" -font font_ui
2679 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
2680 eval tk_optionMenu
$w.global.
$name.family \
2681 global_config_new
(gui.
$font^^family
) \
2683 spinbox
$w.global.
$name.size \
2684 -textvariable global_config_new
(gui.
$font^^size
) \
2685 -from 2 -to 80 -increment 1 \
2688 pack
$w.global.
$name.size
-side right
-anchor e
2689 pack
$w.global.
$name.family
-side right
-anchor e
2690 pack
$w.global.
$name -side top
-anchor w
-fill x
2693 bind $w <Visibility
> "grab $w; focus $w"
2694 bind $w <Key-Escape
> "destroy $w"
2695 wm title
$w "[appname] ([reponame]): Options"
2699 proc do_restore_defaults
{} {
2700 global font_descs default_config repo_config
2701 global repo_config_new global_config_new
2703 foreach name
[array names default_config
] {
2704 set repo_config_new
($name) $default_config($name)
2705 set global_config_new
($name) $default_config($name)
2708 foreach option
$font_descs {
2709 set name
[lindex
$option 0]
2710 set repo_config
(gui.
$name) $default_config(gui.
$name)
2714 foreach option
$font_descs {
2715 set name
[lindex
$option 0]
2716 set font
[lindex
$option 1]
2717 set global_config_new
(gui.
$font^^family
) \
2718 [font configure
$font -family]
2719 set global_config_new
(gui.
$font^^size
) \
2720 [font configure
$font -size]
2724 proc do_save_config
{w
} {
2725 if {[catch
{save_config
} err
]} {
2726 error_popup
"Failed to completely save options:\n\n$err"
2732 proc do_windows_shortcut
{} {
2736 set desktop
[exec cygpath \
2744 set fn
[tk_getSaveFile \
2746 -title "[appname] ([reponame]): Create Desktop Icon" \
2747 -initialdir $desktop \
2748 -initialfile "Git [reponame].bat"]
2752 set sh
[exec cygpath \
2756 set me
[exec cygpath \
2760 set gd
[exec cygpath \
2764 set gw
[exec cygpath \
2767 [file dirname [gitdir
]]]
2768 regsub
-all ' $me "'\\''" me
2769 regsub -all ' $gd "'\\''" gd
2770 puts $fd "@ECHO Entering $gw"
2771 puts $fd "@ECHO Starting git-gui... please wait..."
2772 puts -nonewline $fd "@\"$sh\" --login -c \""
2773 puts -nonewline $fd "GIT_DIR='$gd'"
2774 puts -nonewline $fd " '$me'"
2778 error_popup "Cannot write script:\n\n$err"
2783 proc do_macosx_app {} {
2786 set fn [tk_getSaveFile \
2788 -title "[appname] ([reponame]): Create Desktop Icon" \
2789 -initialdir [file join $env(HOME) Desktop] \
2790 -initialfile "Git [reponame].app"]
2793 set Contents [file join $fn Contents]
2794 set MacOS [file join $Contents MacOS]
2795 set exe [file join $MacOS git-gui]
2799 set fd [open [file join $Contents Info.plist] w]
2800 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2801 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2802 <plist version="1.0">
2804 <key>CFBundleDevelopmentRegion</key>
2805 <string>English</string>
2806 <key>CFBundleExecutable</key>
2807 <string>git-gui</string>
2808 <key>CFBundleIdentifier</key>
2809 <string>org.spearce.git-gui</string>
2810 <key>CFBundleInfoDictionaryVersion</key>
2811 <string>6.0</string>
2812 <key>CFBundlePackageType</key>
2813 <string>APPL</string>
2814 <key>CFBundleSignature</key>
2815 <string>????</string>
2816 <key>CFBundleVersion</key>
2817 <string>1.0</string>
2818 <key>NSPrincipalClass</key>
2819 <string>NSApplication</string>
2824 set fd [open $exe w]
2825 set gd [file normalize [gitdir]]
2826 set ep [file normalize [exec git --exec-path]]
2827 regsub -all ' $gd "'\\''" gd
2828 regsub
-all ' $ep "'\\''" ep
2829 puts $fd "#!/bin/sh"
2830 foreach name
[array names env
] {
2831 if {[string match GIT_
* $name]} {
2832 regsub
-all ' $env($name) "'\\''" v
2833 puts $fd "export $name='$v'"
2836 puts $fd "export PATH
='$ep':\
$PATH"
2837 puts $fd "export GIT_DIR
='$gd'"
2838 puts $fd "exec [file normalize
$argv0]"
2841 file attributes $exe -permissions u+x,g+x,o+x
2843 error_popup "Cannot
write icon
:\n\n$err"
2848 proc toggle_or_diff {w x y} {
2849 global file_states file_lists current_diff ui_index ui_workdir
2850 global last_clicked selected_paths
2852 set pos [split [$w index @$x,$y] .]
2853 set lno [lindex $pos 0]
2854 set col [lindex $pos 1]
2855 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2861 set last_clicked [list $w $lno]
2862 array unset selected_paths
2863 $ui_index tag remove in_sel 0.0 end
2864 $ui_workdir tag remove in_sel 0.0 end
2867 if {$current_diff eq $path} {
2868 set after {reshow_diff;}
2872 switch -glob -- [lindex $file_states($path) 0] {
2879 "Removing
[short_path
$path] from commit
" \
2881 [concat $after {set ui_status_value {Ready.}}]
2885 "Adding
[short_path
$path]" \
2887 [concat $after {set ui_status_value {Ready.}}]
2891 show_diff $path $w $lno
2895 proc add_one_to_selection {w x y} {
2897 global last_clicked selected_paths
2899 set pos [split [$w index @$x,$y] .]
2900 set lno [lindex $pos 0]
2901 set col [lindex $pos 1]
2902 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2908 set last_clicked [list $w $lno]
2909 if {[catch {set in_sel $selected_paths($path)}]} {
2913 unset selected_paths($path)
2914 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2916 set selected_paths($path) 1
2917 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2921 proc add_range_to_selection {w x y} {
2923 global last_clicked selected_paths
2925 if {[lindex $last_clicked 0] ne $w} {
2926 toggle_or_diff $w $x $y
2930 set pos [split [$w index @$x,$y] .]
2931 set lno [lindex $pos 0]
2932 set lc [lindex $last_clicked 1]
2941 foreach path [lrange $file_lists($w) \
2942 [expr {$begin - 1}] \
2943 [expr {$end - 1}]] {
2944 set selected_paths($path) 1
2946 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2949 ######################################################################
2953 set cursor_ptr arrow
2954 font create font_diff -family Courier -size 10
2958 eval font configure font_ui [font actual [.dummy cget -font]]
2962 font create font_uibold
2963 font create font_diffbold
2968 } elseif {[is_MacOSX]} {
2976 proc apply_config {} {
2977 global repo_config font_descs
2979 foreach option $font_descs {
2980 set name [lindex $option 0]
2981 set font [lindex $option 1]
2983 foreach {cn cv} $repo_config(gui.$name) {
2984 font configure $font $cn $cv
2987 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
2989 foreach {cn cv} [font configure $font] {
2990 font configure ${font}bold $cn $cv
2992 font configure ${font}bold -weight bold
2996 set default_config(gui.trustmtime) false
2997 set default_config(gui.pullsummary) true
2998 set default_config(gui.partialinclude) false
2999 set default_config(gui.diffcontext) 5
3000 set default_config(gui.fontui) [font configure font_ui]
3001 set default_config(gui.fontdiff) [font configure font_diff]
3003 {fontui font_ui {Main Font}}
3004 {fontdiff font_diff {Diff/Console Font}}
3009 ######################################################################
3015 menu .mbar -tearoff 0
3016 .mbar add cascade -label Repository -menu .mbar.repository
3017 .mbar add cascade -label Edit -menu .mbar.edit
3018 if {!$single_commit} {
3019 .mbar add cascade -label Branch -menu .mbar.branch
3021 .mbar add cascade -label Commit -menu .mbar.commit
3022 if {!$single_commit} {
3023 .mbar add cascade -label Fetch -menu .mbar.fetch
3024 .mbar add cascade -label Pull -menu .mbar.pull
3025 .mbar add cascade -label Push -menu .mbar.push
3027 . configure -menu .mbar
3029 # -- Repository Menu
3031 menu .mbar.repository
3032 .mbar.repository add command \
3033 -label {Visualize Current Branch} \
3034 -command {do_gitk {}} \
3037 .mbar.repository add command \
3038 -label {Visualize All Branches} \
3039 -command {do_gitk {--all}} \
3042 .mbar.repository add separator
3044 if {!$single_commit} {
3045 .mbar.repository add command -label {Compress Database} \
3049 .mbar.repository add command -label {Verify Database} \
3050 -command do_fsck_objects \
3053 .mbar.repository add separator
3056 .mbar.repository add command \
3057 -label {Create Desktop Icon} \
3058 -command do_windows_shortcut \
3060 } elseif {[is_MacOSX]} {
3061 .mbar.repository add command \
3062 -label {Create Desktop Icon} \
3063 -command do_macosx_app \
3068 .mbar.repository add command -label Quit \
3070 -accelerator $M1T-Q \
3076 .mbar.edit add command -label Undo \
3077 -command {catch {[focus] edit undo}} \
3078 -accelerator $M1T-Z \
3080 .mbar.edit add command -label Redo \
3081 -command {catch {[focus] edit redo}} \
3082 -accelerator $M1T-Y \
3084 .mbar.edit add separator
3085 .mbar.edit add command -label Cut \
3086 -command {catch {tk_textCut [focus]}} \
3087 -accelerator $M1T-X \
3089 .mbar.edit add command -label Copy \
3090 -command {catch {tk_textCopy [focus]}} \
3091 -accelerator $M1T-C \
3093 .mbar.edit add command -label Paste \
3094 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3095 -accelerator $M1T-V \
3097 .mbar.edit add command -label Delete \
3098 -command {catch {[focus] delete sel.first sel.last}} \
3101 .mbar.edit add separator
3102 .mbar.edit add command -label {Select All} \
3103 -command {catch {[focus] tag add sel 0.0 end}} \
3104 -accelerator $M1T-A \
3109 if {!$single_commit} {
3112 .mbar.branch add command -label {Create...} \
3113 -command do_create_branch \
3115 lappend disable_on_lock [list .mbar.branch entryconf \
3116 [.mbar.branch index last] -state]
3118 .mbar.branch add command -label {Delete...} \
3119 -command do_delete_branch \
3121 lappend disable_on_lock [list .mbar.branch entryconf \
3122 [.mbar.branch index last] -state]
3129 .mbar.commit add radiobutton \
3130 -label {New Commit} \
3131 -command do_select_commit_type \
3132 -variable selected_commit_type \
3135 lappend disable_on_lock \
3136 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3138 .mbar.commit add radiobutton \
3139 -label {Amend Last Commit} \
3140 -command do_select_commit_type \
3141 -variable selected_commit_type \
3144 lappend disable_on_lock \
3145 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3147 .mbar.commit add separator
3149 .mbar.commit add command -label Rescan \
3150 -command do_rescan \
3153 lappend disable_on_lock \
3154 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3156 .mbar.commit add command -label {Add To Commit} \
3157 -command do_include_selection \
3159 lappend disable_on_lock \
3160 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3162 .mbar.commit add command -label {Add All To Commit} \
3163 -command do_include_all \
3164 -accelerator $M1T-I \
3166 lappend disable_on_lock \
3167 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3169 .mbar.commit add command -label {Remove From Commit} \
3170 -command do_remove_selection \
3172 lappend disable_on_lock \
3173 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3175 .mbar.commit add command -label {Revert Changes} \
3176 -command do_revert_selection \
3178 lappend disable_on_lock \
3179 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3181 .mbar.commit add separator
3183 .mbar.commit add command -label {Sign Off} \
3184 -command do_signoff \
3185 -accelerator $M1T-S \
3188 .mbar.commit add command -label Commit \
3189 -command do_commit \
3190 -accelerator $M1T-Return \
3192 lappend disable_on_lock \
3193 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3195 # -- Transport menus
3197 if {!$single_commit} {
3204 # -- Apple Menu (Mac OS X only)
3206 .mbar add cascade -label Apple -menu .mbar.apple
3209 .mbar.apple add command -label "About
[appname
]" \
3212 .mbar.apple add command -label "[appname
] Options...
" \
3213 -command do_options \
3218 .mbar.edit add separator
3219 .mbar.edit add command -label {Options...} \
3220 -command do_options \
3225 if {[file exists /usr/local/miga/lib/gui-miga]
3226 && [file exists .pvcsrc]} {
3228 global ui_status_value
3229 if {![lock_index update]} return
3230 set cmd [list sh --login -c "/usr
/local
/miga
/lib
/gui-miga
\"[pwd]\""]
3231 set miga_fd [open "|
$cmd" r]
3232 fconfigure $miga_fd -blocking 0
3233 fileevent $miga_fd readable [list miga_done $miga_fd]
3234 set ui_status_value {Running miga...}
3236 proc miga_done {fd} {
3241 rescan [list set ui_status_value {Ready.}]
3244 .mbar add cascade -label Tools -menu .mbar.tools
3246 .mbar.tools add command -label "Migrate
" \
3249 lappend disable_on_lock \
3250 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3255 .mbar add cascade -label Help -menu .mbar.help
3258 .mbar.help add command -label "About
[appname
]" \
3270 -text {Current Branch:} \
3275 -textvariable current_branch \
3279 pack .branch.l1 -side left
3280 pack .branch.cb -side left -fill x
3281 pack .branch -side top -fill x
3283 # -- Main Window Layout
3285 panedwindow .vpane -orient vertical
3286 panedwindow .vpane.files -orient horizontal
3287 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3288 pack .vpane -anchor n -side top -fill both -expand 1
3290 # -- Index File List
3292 frame .vpane.files.index -height 100 -width 400
3293 label .vpane.files.index.title -text {Changes To Be Committed} \
3296 text $ui_index -background white -borderwidth 0 \
3297 -width 40 -height 10 \
3299 -cursor $cursor_ptr \
3300 -yscrollcommand {.vpane.files.index.sb set} \
3302 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3303 pack .vpane.files.index.title -side top -fill x
3304 pack .vpane.files.index.sb -side right -fill y
3305 pack $ui_index -side left -fill both -expand 1
3306 .vpane.files add .vpane.files.index -sticky nsew
3308 # -- Working Directory File List
3310 frame .vpane.files.workdir -height 100 -width 100
3311 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3314 text $ui_workdir -background white -borderwidth 0 \
3315 -width 40 -height 10 \
3317 -cursor $cursor_ptr \
3318 -yscrollcommand {.vpane.files.workdir.sb set} \
3320 scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
3321 pack .vpane.files.workdir.title -side top -fill x
3322 pack .vpane.files.workdir.sb -side right -fill y
3323 pack $ui_workdir -side left -fill both -expand 1
3324 .vpane.files add .vpane.files.workdir -sticky nsew
3326 foreach i [list $ui_index $ui_workdir] {
3327 $i tag conf in_diff -font font_uibold
3328 $i tag conf in_sel \
3329 -background [$i cget -foreground] \
3330 -foreground [$i cget -background]
3334 # -- Diff and Commit Area
3336 frame .vpane.lower -height 300 -width 400
3337 frame .vpane.lower.commarea
3338 frame .vpane.lower.diff -relief sunken -borderwidth 1
3339 pack .vpane.lower.commarea -side top -fill x
3340 pack .vpane.lower.diff -side bottom -fill both -expand 1
3341 .vpane add .vpane.lower -stick nsew
3343 # -- Commit Area Buttons
3345 frame .vpane.lower.commarea.buttons
3346 label .vpane.lower.commarea.buttons.l -text {} \
3350 pack .vpane.lower.commarea.buttons.l -side top -fill x
3351 pack .vpane.lower.commarea.buttons -side left -fill y
3353 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3354 -command do_rescan \
3356 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3357 lappend disable_on_lock \
3358 {.vpane.lower.commarea.buttons.rescan conf -state}
3360 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3361 -command do_include_all \
3363 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3364 lappend disable_on_lock \
3365 {.vpane.lower.commarea.buttons.incall conf -state}
3367 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3368 -command do_signoff \
3370 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3372 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3373 -command do_commit \
3375 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3376 lappend disable_on_lock \
3377 {.vpane.lower.commarea.buttons.commit conf -state}
3379 # -- Commit Message Buffer
3381 frame .vpane.lower.commarea.buffer
3382 frame .vpane.lower.commarea.buffer.header
3383 set ui_comm .vpane.lower.commarea.buffer.t
3384 set ui_coml .vpane.lower.commarea.buffer.header.l
3385 radiobutton .vpane.lower.commarea.buffer.header.new \
3386 -text {New Commit} \
3387 -command do_select_commit_type \
3388 -variable selected_commit_type \
3391 lappend disable_on_lock \
3392 [list .vpane.lower.commarea.buffer.header.new conf -state]
3393 radiobutton .vpane.lower.commarea.buffer.header.amend \
3394 -text {Amend Last Commit} \
3395 -command do_select_commit_type \
3396 -variable selected_commit_type \
3399 lappend disable_on_lock \
3400 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3405 proc trace_commit_type {varname args} {
3406 global ui_coml commit_type
3407 switch -glob -- $commit_type {
3408 initial {set txt {Initial Commit Message:}}
3409 amend {set txt {Amended Commit Message:}}
3410 amend-initial {set txt {Amended Initial Commit Message:}}
3411 amend-merge {set txt {Amended Merge Commit Message:}}
3412 merge {set txt {Merge Commit Message:}}
3413 * {set txt {Commit Message:}}
3415 $ui_coml conf -text $txt
3417 trace add variable commit_type write trace_commit_type
3418 pack $ui_coml -side left -fill x
3419 pack .vpane.lower.commarea.buffer.header.amend -side right
3420 pack .vpane.lower.commarea.buffer.header.new -side right
3422 text $ui_comm -background white -borderwidth 1 \
3425 -autoseparators true \
3427 -width 75 -height 9 -wrap none \
3429 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3430 scrollbar .vpane.lower.commarea.buffer.sby \
3431 -command [list $ui_comm yview]
3432 pack .vpane.lower.commarea.buffer.header -side top -fill x
3433 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3434 pack $ui_comm -side left -fill y
3435 pack .vpane.lower.commarea.buffer -side left -fill y
3437 # -- Commit Message Buffer Context Menu
3439 set ctxm .vpane.lower.commarea.buffer.ctxm
3440 menu $ctxm -tearoff 0
3444 -command {tk_textCut $ui_comm}
3448 -command {tk_textCopy $ui_comm}
3452 -command {tk_textPaste $ui_comm}
3456 -command {$ui_comm delete sel.first sel.last}
3459 -label {Select All} \
3461 -command {$ui_comm tag add sel 0.0 end}
3466 $ui_comm tag add sel 0.0 end
3467 tk_textCopy $ui_comm
3468 $ui_comm tag remove sel 0.0 end
3475 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
3480 set diff_actions [list]
3481 proc trace_current_diff {varname args} {
3482 global current_diff diff_actions file_states
3483 if {$current_diff eq {}} {
3490 set s [mapdesc [lindex $file_states($p) 0] $p]
3492 set p [escape_path $p]
3496 .vpane.lower.diff.header.status configure -text $s
3497 .vpane.lower.diff.header.file configure -text $f
3498 .vpane.lower.diff.header.path configure -text $p
3499 foreach w $diff_actions {
3503 trace add variable current_diff write trace_current_diff
3505 frame .vpane.lower.diff.header -background orange
3506 label .vpane.lower.diff.header.status \
3507 -background orange \
3508 -width $max_status_desc \
3512 label .vpane.lower.diff.header.file \
3513 -background orange \
3517 label .vpane.lower.diff.header.path \
3518 -background orange \
3522 pack .vpane.lower.diff.header.status -side left
3523 pack .vpane.lower.diff.header.file -side left
3524 pack .vpane.lower.diff.header.path -fill x
3525 set ctxm .vpane.lower.diff.header.ctxm
3526 menu $ctxm -tearoff 0
3537 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3538 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
3542 frame .vpane.lower.diff.body
3543 set ui_diff .vpane.lower.diff.body.t
3544 text $ui_diff -background white -borderwidth 0 \
3545 -width 80 -height 15 -wrap none \
3547 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3548 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3550 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3551 -command [list $ui_diff xview]
3552 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3553 -command [list $ui_diff yview]
3554 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3555 pack .vpane.lower.diff.body.sby -side right -fill y
3556 pack $ui_diff -side left -fill both -expand 1
3557 pack .vpane.lower.diff.header -side top -fill x
3558 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3560 $ui_diff tag conf d_@ -font font_diffbold
3561 $ui_diff tag conf d_+ -foreground blue
3562 $ui_diff tag conf d_- -foreground red
3563 $ui_diff tag conf d_++ -foreground {#00a000}
3564 $ui_diff tag conf d_-- -foreground {#a000a0}
3565 $ui_diff tag conf d_+- \
3567 -background {light goldenrod yellow}
3568 $ui_diff tag conf d_-+ \
3572 # -- Diff Body Context Menu
3574 set ctxm .vpane.lower.diff.body.ctxm
3575 menu $ctxm -tearoff 0
3579 -command {tk_textCopy $ui_diff}
3580 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3582 -label {Select All} \
3584 -command {$ui_diff tag add sel 0.0 end}
3585 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3590 $ui_diff tag add sel 0.0 end
3591 tk_textCopy $ui_diff
3592 $ui_diff tag remove sel 0.0 end
3594 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3597 -label {Decrease Font Size} \
3599 -command {incr_font_size font_diff -1}
3600 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3602 -label {Increase Font Size} \
3604 -command {incr_font_size font_diff 1}
3605 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3608 -label {Show Less Context} \
3610 -command {if {$repo_config(gui.diffcontext) >= 2} {
3611 incr repo_config(gui.diffcontext) -1
3614 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3616 -label {Show More Context} \
3619 incr repo_config(gui.diffcontext)
3622 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3624 $ctxm add command -label {Options...} \
3627 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
3631 set ui_status_value {Initializing...}
3632 label .status -textvariable ui_status_value \
3638 pack .status -anchor w -side bottom -fill x
3643 set gm $repo_config(gui.geometry)
3644 wm geometry . [lindex $gm 0]
3645 .vpane sash place 0 \
3646 [lindex [.vpane sash coord 0] 0] \
3648 .vpane.files sash place 0 \
3650 [lindex [.vpane.files sash coord 0] 1]
3656 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3657 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3658 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3659 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3660 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3661 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3662 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3663 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3664 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3665 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3666 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3668 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3669 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3670 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3671 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3672 bind $ui_diff <$M1B-Key-v> {break}
3673 bind $ui_diff <$M1B-Key-V> {break}
3674 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3675 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3676 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3677 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3678 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3679 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3681 bind . <Destroy> do_quit
3682 bind all <Key-F5> do_rescan
3683 bind all <$M1B-Key-r> do_rescan
3684 bind all <$M1B-Key-R> do_rescan
3685 bind . <$M1B-Key-s> do_signoff
3686 bind . <$M1B-Key-S> do_signoff
3687 bind . <$M1B-Key-i> do_include_all
3688 bind . <$M1B-Key-I> do_include_all
3689 bind . <$M1B-Key-Return> do_commit
3690 bind all <$M1B-Key-q> do_quit
3691 bind all <$M1B-Key-Q> do_quit
3692 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3693 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3694 foreach i [list $ui_index $ui_workdir] {
3695 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
3696 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
3697 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
3701 set file_lists($ui_index) [list]
3702 set file_lists($ui_workdir) [list]
3706 set MERGE_HEAD [list]
3709 set current_branch {}
3711 set selected_commit_type new
3713 wm title . "[appname
] ([file normalize
[file dirname [gitdir
]]])"
3714 focus -force $ui_comm
3716 # -- Warn the user about environmental problems. Cygwin's Tcl
3717 # does *not* pass its env array onto any processes it spawns.
3718 # This means that git processes get none of our environment.
3723 set msg "Possible environment issues exist.
3725 The following environment variables are probably
3726 going to be ignored by any Git subprocess run
3730 foreach name [array names env] {
3731 switch -regexp -- $name {
3732 {^GIT_INDEX_FILE$} -
3733 {^GIT_OBJECT_DIRECTORY$} -
3734 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3736 {^GIT_EXTERNAL_DIFF$} -
3740 {^GIT_CONFIG_LOCAL$} -
3741 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3742 append msg " - $name\n"
3745 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3746 append msg " - $name\n"
3748 set suggest_user $name
3752 if {$ignored_env > 0} {
3754 This is due to a known issue with the
3755 Tcl binary distributed by Cygwin.
"
3757 if {$suggest_user ne {}} {
3760 A good replacement
for $suggest_user
3761 is placing values
for the user.name and
3762 user.email settings into your personal
3768 unset ignored_env msg suggest_user name
3771 # -- Only initialize complex UI if we are going to stay running.
3773 if {!$single_commit} {
3777 populate_branch_menu .mbar.branch
3778 populate_fetch_menu .mbar.fetch
3779 populate_pull_menu .mbar.pull
3780 populate_push_menu .mbar.push
3783 # -- Only suggest a gc run if we are going to stay running.
3785 if {!$single_commit} {
3786 set object_limit 2000
3787 if {[is_Windows]} {set object_limit 200}
3788 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
3789 if {$objects_current >= $object_limit} {
3791 "This repository currently has
$objects_current loose objects.
3793 To maintain optimal performance it is strongly
3794 recommended that you
compress the database
3795 when
more than
$object_limit loose objects exist.
3797 Compress the database now?
"] eq yes} {
3801 unset object_limit _junk objects_current
3804 lock_index begin-read