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] {} {}]
1118 set file_states
($path) [list \
1119 _
[string index
$m 1] \
1130 set ui_status_value \
1131 "Changes committed as [string range $cmt_id 0 7]."
1134 ######################################################################
1138 proc fetch_from
{remote
} {
1139 set w
[new_console
"fetch $remote" \
1140 "Fetching new changes from $remote"]
1141 set cmd
[list git fetch
]
1143 console_exec
$w $cmd
1146 proc pull_remote
{remote branch
} {
1147 global HEAD commit_type file_states repo_config
1149 if {![lock_index update
]} return
1151 # -- Our in memory state should match the repository.
1153 repository_state curType curHEAD curMERGE_HEAD
1154 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1155 info_popup
{Last scanned state does not match repository state.
1157 Another Git program has modified this repository
1158 since the last scan. A rescan must be performed
1159 before a pull operation can be started.
1161 The rescan will be automatically started now.
1164 rescan
{set ui_status_value
{Ready.
}}
1168 # -- No differences should exist before a pull.
1170 if {[array size file_states
] != 0} {
1171 error_popup
{Uncommitted but modified files are present.
1173 You should not perform a pull with unmodified
1174 files
in your working directory as Git will be
1175 unable to recover from an incorrect merge.
1177 You should commit or revert all changes before
1178 starting a pull operation.
1184 set w
[new_console
"pull $remote $branch" \
1185 "Pulling new changes from branch $branch in $remote"]
1186 set cmd
[list git pull
]
1187 if {$repo_config(gui.pullsummary
) eq
{false
}} {
1188 lappend cmd
--no-summary
1192 console_exec
$w $cmd [list post_pull_remote
$remote $branch]
1195 proc post_pull_remote
{remote branch success
} {
1196 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1197 global ui_status_value
1201 repository_state commit_type HEAD MERGE_HEAD
1203 set selected_commit_type new
1204 set ui_status_value
"Pulling $branch from $remote complete."
1206 rescan
[list
set ui_status_value \
1207 "Conflicts detected while pulling $branch from $remote."]
1211 proc push_to
{remote
} {
1212 set w
[new_console
"push $remote" \
1213 "Pushing changes to $remote"]
1214 set cmd
[list git push
]
1216 console_exec
$w $cmd
1219 ######################################################################
1223 proc mapicon
{w state path
} {
1226 if {[catch
{set r
$all_icons($state$w)}]} {
1227 puts
"error: no icon for $w state={$state} $path"
1233 proc mapdesc
{state path
} {
1236 if {[catch
{set r
$all_descs($state)}]} {
1237 puts
"error: no desc for state={$state} $path"
1243 proc escape_path
{path
} {
1244 regsub
-all "\n" $path "\\n" path
1248 proc short_path
{path
} {
1249 return [escape_path
[lindex
[file split $path] end
]]
1253 set null_sha1
[string repeat
0 40]
1255 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1256 global file_states next_icon_id null_sha1
1258 set s0
[string index
$new_state 0]
1259 set s1
[string index
$new_state 1]
1261 if {[catch
{set info
$file_states($path)}]} {
1263 set icon n
[incr next_icon_id
]
1265 set state
[lindex
$info 0]
1266 set icon
[lindex
$info 1]
1267 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1268 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1271 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1272 elseif
{$s0 eq
{_
}} {set s0 _
}
1274 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1275 elseif
{$s1 eq
{_
}} {set s1 _
}
1277 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1278 set head_info
[list
0 $null_sha1]
1279 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1280 && $head_info eq
{}} {
1281 set head_info
$index_info
1284 set file_states
($path) [list
$s0$s1 $icon \
1285 $head_info $index_info \
1290 proc display_file_helper
{w path icon_name old_m new_m
} {
1293 if {$new_m eq
{_
}} {
1294 set lno
[lsearch
-sorted $file_lists($w) $path]
1296 set file_lists
($w) [lreplace
$file_lists($w) $lno $lno]
1298 $w conf
-state normal
1299 $w delete
$lno.0 [expr {$lno + 1}].0
1300 $w conf
-state disabled
1302 } elseif
{$old_m eq
{_
} && $new_m ne
{_
}} {
1303 lappend file_lists
($w) $path
1304 set file_lists
($w) [lsort
-unique $file_lists($w)]
1305 set lno
[lsearch
-sorted $file_lists($w) $path]
1307 $w conf
-state normal
1308 $w image create
$lno.0 \
1309 -align center
-padx 5 -pady 1 \
1311 -image [mapicon
$w $new_m $path]
1312 $w insert
$lno.1 "[escape_path $path]\n"
1313 $w conf
-state disabled
1314 } elseif
{$old_m ne
$new_m} {
1315 $w conf
-state normal
1316 $w image conf
$icon_name -image [mapicon
$w $new_m $path]
1317 $w conf
-state disabled
1321 proc display_file
{path state
} {
1322 global file_states selected_paths
1323 global ui_index ui_workdir
1325 set old_m
[merge_state
$path $state]
1326 set s
$file_states($path)
1327 set new_m
[lindex
$s 0]
1328 set icon_name
[lindex
$s 1]
1330 display_file_helper
$ui_index $path $icon_name \
1331 [string index
$old_m 0] \
1332 [string index
$new_m 0]
1333 display_file_helper
$ui_workdir $path $icon_name \
1334 [string index
$old_m 1] \
1335 [string index
$new_m 1]
1337 if {$new_m eq
{__
}} {
1338 unset file_states
($path)
1339 catch
{unset selected_paths
($path)}
1343 proc display_all_files_helper
{w path icon_name m
} {
1346 lappend file_lists
($w) $path
1347 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1348 $w image create end \
1349 -align center
-padx 5 -pady 1 \
1351 -image [mapicon
$w $m $path]
1352 $w insert end
"[escape_path $path]\n"
1355 proc display_all_files
{} {
1356 global ui_index ui_workdir
1357 global file_states file_lists
1360 $ui_index conf
-state normal
1361 $ui_workdir conf
-state normal
1363 $ui_index delete
0.0 end
1364 $ui_workdir delete
0.0 end
1367 set file_lists
($ui_index) [list
]
1368 set file_lists
($ui_workdir) [list
]
1370 foreach path
[lsort
[array names file_states
]] {
1371 set s
$file_states($path)
1373 set icon_name
[lindex
$s 1]
1375 if {[string index
$m 0] ne
{_
}} {
1376 display_all_files_helper
$ui_index $path \
1377 $icon_name [string index
$m 0]
1379 if {[string index
$m 1] ne
{_
}} {
1380 display_all_files_helper
$ui_workdir $path \
1381 $icon_name [string index
$m 1]
1385 $ui_index conf
-state disabled
1386 $ui_workdir conf
-state disabled
1389 proc update_indexinfo
{msg pathList after
} {
1390 global update_index_cp ui_status_value
1392 if {![lock_index update
]} return
1394 set update_index_cp
0
1395 set pathList
[lsort
$pathList]
1396 set totalCnt
[llength
$pathList]
1397 set batch [expr {int
($totalCnt * .01) + 1}]
1398 if {$batch > 25} {set batch 25}
1400 set ui_status_value
[format \
1401 "$msg... %i/%i files (%.2f%%)" \
1405 set fd
[open
"| git update-index -z --index-info" w
]
1411 fileevent
$fd writable
[list \
1412 write_update_indexinfo \
1422 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1423 global update_index_cp ui_status_value
1424 global file_states current_diff
1426 if {$update_index_cp >= $totalCnt} {
1433 for {set i
$batch} \
1434 {$update_index_cp < $totalCnt && $i > 0} \
1436 set path
[lindex
$pathList $update_index_cp]
1437 incr update_index_cp
1439 set s
$file_states($path)
1440 switch
-glob -- [lindex
$s 0] {
1447 set info
[lindex
$s 2]
1448 if {$info eq
{}} continue
1450 puts
-nonewline $fd "$info\t$path\0"
1451 display_file
$path $new
1454 set ui_status_value
[format \
1455 "$msg... %i/%i files (%.2f%%)" \
1458 [expr {100.0 * $update_index_cp / $totalCnt}]]
1461 proc update_index
{msg pathList after
} {
1462 global update_index_cp ui_status_value
1464 if {![lock_index update
]} return
1466 set update_index_cp
0
1467 set pathList
[lsort
$pathList]
1468 set totalCnt
[llength
$pathList]
1469 set batch [expr {int
($totalCnt * .01) + 1}]
1470 if {$batch > 25} {set batch 25}
1472 set ui_status_value
[format \
1473 "$msg... %i/%i files (%.2f%%)" \
1477 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1483 fileevent
$fd writable
[list \
1484 write_update_index \
1494 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1495 global update_index_cp ui_status_value
1496 global file_states current_diff
1498 if {$update_index_cp >= $totalCnt} {
1505 for {set i
$batch} \
1506 {$update_index_cp < $totalCnt && $i > 0} \
1508 set path
[lindex
$pathList $update_index_cp]
1509 incr update_index_cp
1511 switch
-glob -- [lindex
$file_states($path) 0] {
1520 puts
-nonewline $fd "$path\0"
1521 display_file
$path $new
1524 set ui_status_value
[format \
1525 "$msg... %i/%i files (%.2f%%)" \
1528 [expr {100.0 * $update_index_cp / $totalCnt}]]
1531 proc checkout_index
{msg pathList after
} {
1532 global update_index_cp ui_status_value
1534 if {![lock_index update
]} return
1536 set update_index_cp
0
1537 set pathList
[lsort
$pathList]
1538 set totalCnt
[llength
$pathList]
1539 set batch [expr {int
($totalCnt * .01) + 1}]
1540 if {$batch > 25} {set batch 25}
1542 set ui_status_value
[format \
1543 "$msg... %i/%i files (%.2f%%)" \
1547 set cmd
[list git checkout-index
]
1553 set fd
[open
"| $cmd " w
]
1559 fileevent
$fd writable
[list \
1560 write_checkout_index \
1570 proc write_checkout_index
{fd pathList totalCnt
batch msg after
} {
1571 global update_index_cp ui_status_value
1572 global file_states current_diff
1574 if {$update_index_cp >= $totalCnt} {
1581 for {set i
$batch} \
1582 {$update_index_cp < $totalCnt && $i > 0} \
1584 set path
[lindex
$pathList $update_index_cp]
1585 incr update_index_cp
1586 switch
-glob -- [lindex
$file_states($path) 0] {
1590 puts
-nonewline $fd "$path\0"
1591 display_file
$path ?_
1596 set ui_status_value
[format \
1597 "$msg... %i/%i files (%.2f%%)" \
1600 [expr {100.0 * $update_index_cp / $totalCnt}]]
1603 ######################################################################
1605 ## branch management
1607 proc load_all_heads
{} {
1608 global all_heads tracking_branches
1610 set all_heads
[list
]
1611 set cmd
[list git for-each-ref
]
1612 lappend cmd
--format=%(refname
)
1613 lappend cmd refs
/heads
1614 set fd
[open
"| $cmd" r
]
1615 while {[gets
$fd line
] > 0} {
1616 if {![catch
{set info
$tracking_branches($line)}]} continue
1617 if {![regsub ^refs
/heads
/ $line {} name
]} continue
1618 lappend all_heads
$name
1622 set all_heads
[lsort
$all_heads]
1625 proc populate_branch_menu
{m
} {
1626 global all_heads disable_on_lock
1629 foreach b
$all_heads {
1630 $m add radiobutton \
1632 -command [list switch_branch
$b] \
1633 -variable current_branch \
1636 lappend disable_on_lock \
1637 [list
$m entryconf
[$m index last
] -state]
1641 proc do_create_branch
{} {
1642 error
"NOT IMPLEMENTED"
1645 proc do_delete_branch
{} {
1646 error
"NOT IMPLEMENTED"
1649 proc switch_branch
{b
} {
1650 global HEAD commit_type file_states current_branch
1651 global selected_commit_type ui_comm
1653 if {![lock_index switch
]} return
1655 # -- Backup the selected branch (repository_state resets it)
1657 set new_branch
$current_branch
1659 # -- Our in memory state should match the repository.
1661 repository_state curType curHEAD curMERGE_HEAD
1662 if {[string match amend
* $commit_type]
1663 && $curType eq
{normal
}
1664 && $curHEAD eq
$HEAD} {
1665 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1666 info_popup
{Last scanned state does not match repository state.
1668 Another Git program has modified this repository
1669 since the last scan. A rescan must be performed
1670 before the current branch can be changed.
1672 The rescan will be automatically started now.
1675 rescan
{set ui_status_value
{Ready.
}}
1679 # -- Toss the message buffer if we are in amend mode.
1681 if {[string match amend
* $curType]} {
1682 $ui_comm delete
0.0 end
1684 $ui_comm edit modified false
1687 set selected_commit_type new
1688 set current_branch
$new_branch
1691 error
"NOT FINISHED"
1694 ######################################################################
1696 ## remote management
1698 proc load_all_remotes
{} {
1700 global all_remotes tracking_branches
1702 set all_remotes
[list
]
1703 array
unset tracking_branches
1705 set rm_dir
[gitdir remotes
]
1706 if {[file isdirectory
$rm_dir]} {
1707 set all_remotes
[glob \
1711 -directory $rm_dir *]
1713 foreach name
$all_remotes {
1715 set fd
[open
[file join $rm_dir $name] r
]
1716 while {[gets
$fd line
] >= 0} {
1717 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
1718 $line line src dst
]} continue
1719 if {![regexp ^refs
/ $dst]} {
1720 set dst
"refs/heads/$dst"
1722 set tracking_branches
($dst) [list
$name $src]
1729 foreach line
[array names repo_config remote.
*.url
] {
1730 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
1731 lappend all_remotes
$name
1733 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
1737 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
1738 if {![regexp ^refs
/ $dst]} {
1739 set dst
"refs/heads/$dst"
1741 set tracking_branches
($dst) [list
$name $src]
1745 set all_remotes
[lsort
-unique $all_remotes]
1748 proc populate_fetch_menu
{m
} {
1749 global all_remotes repo_config
1751 foreach r
$all_remotes {
1753 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1754 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
1759 set fd
[open
[gitdir remotes
$r] r
]
1760 while {[gets
$fd n
] >= 0} {
1761 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
1772 -label "Fetch from $r..." \
1773 -command [list fetch_from
$r] \
1779 proc populate_push_menu
{m
} {
1780 global all_remotes repo_config
1782 foreach r
$all_remotes {
1784 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1785 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
1790 set fd
[open
[gitdir remotes
$r] r
]
1791 while {[gets
$fd n
] >= 0} {
1792 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
1803 -label "Push to $r..." \
1804 -command [list push_to
$r] \
1810 proc populate_pull_menu
{m
} {
1811 global repo_config all_remotes disable_on_lock
1813 foreach remote
$all_remotes {
1815 if {[array get repo_config remote.
$remote.url
] ne
{}} {
1816 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
1817 foreach line
$repo_config(remote.
$remote.fetch
) {
1818 if {[regexp
{^
([^
:]+):} $line line rb
]} {
1825 set fd
[open
[gitdir remotes
$remote] r
]
1826 while {[gets
$fd line
] >= 0} {
1827 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
1835 foreach rb
$rb_list {
1836 regsub ^refs
/heads
/ $rb {} rb_short
1838 -label "Branch $rb_short from $remote..." \
1839 -command [list pull_remote
$remote $rb] \
1841 lappend disable_on_lock \
1842 [list
$m entryconf
[$m index last
] -state]
1847 ######################################################################
1852 #define mask_width 14
1853 #define mask_height 15
1854 static unsigned char mask_bits
[] = {
1855 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1856 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1857 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1860 image create bitmap file_plain
-background white
-foreground black
-data {
1861 #define plain_width 14
1862 #define plain_height 15
1863 static unsigned char plain_bits
[] = {
1864 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1865 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1866 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1867 } -maskdata $filemask
1869 image create bitmap file_mod
-background white
-foreground blue
-data {
1870 #define mod_width 14
1871 #define mod_height 15
1872 static unsigned char mod_bits
[] = {
1873 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1874 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1875 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1876 } -maskdata $filemask
1878 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
1879 #define file_fulltick_width 14
1880 #define file_fulltick_height 15
1881 static unsigned char file_fulltick_bits
[] = {
1882 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1883 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1884 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1885 } -maskdata $filemask
1887 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1888 #define parttick_width 14
1889 #define parttick_height 15
1890 static unsigned char parttick_bits
[] = {
1891 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1892 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1893 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1894 } -maskdata $filemask
1896 image create bitmap file_question
-background white
-foreground black
-data {
1897 #define file_question_width 14
1898 #define file_question_height 15
1899 static unsigned char file_question_bits
[] = {
1900 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1901 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1902 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1903 } -maskdata $filemask
1905 image create bitmap file_removed
-background white
-foreground red
-data {
1906 #define file_removed_width 14
1907 #define file_removed_height 15
1908 static unsigned char file_removed_bits
[] = {
1909 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1910 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1911 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1912 } -maskdata $filemask
1914 image create bitmap file_merge
-background white
-foreground blue
-data {
1915 #define file_merge_width 14
1916 #define file_merge_height 15
1917 static unsigned char file_merge_bits
[] = {
1918 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1919 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1920 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1921 } -maskdata $filemask
1923 set ui_index .vpane.files.index.list
1924 set ui_workdir .vpane.files.workdir.list
1926 set all_icons
(_
$ui_index) file_plain
1927 set all_icons
(A
$ui_index) file_fulltick
1928 set all_icons
(M
$ui_index) file_fulltick
1929 set all_icons
(D
$ui_index) file_removed
1930 set all_icons
(U
$ui_index) file_merge
1932 set all_icons
(_
$ui_workdir) file_plain
1933 set all_icons
(M
$ui_workdir) file_mod
1934 set all_icons
(D
$ui_workdir) file_question
1935 set all_icons
(O
$ui_workdir) file_plain
1937 set max_status_desc
0
1941 {_M
"Modified, not staged"}
1942 {M_
"Staged for commit"}
1943 {MM
"Portions staged for commit"}
1944 {MD
"Staged for commit, missing"}
1946 {_O
"Untracked, not staged"}
1947 {A_
"Staged for commit"}
1948 {AM
"Portions staged for commit"}
1949 {AD
"Staged for commit, missing"}
1952 {D_
"Staged for removal"}
1953 {DO
"Staged for removal, still present"}
1955 {U_
"Requires merge resolution"}
1956 {UM
"Requires merge resolution"}
1957 {UD
"Requires merge resolution"}
1959 if {$max_status_desc < [string length
[lindex
$i 1]]} {
1960 set max_status_desc
[string length
[lindex
$i 1]]
1962 set all_descs
([lindex
$i 0]) [lindex
$i 1]
1966 ######################################################################
1971 global tcl_platform tk_library
1972 if {[tk windowingsystem
] eq
{aqua
}} {
1978 proc is_Windows
{} {
1980 if {$tcl_platform(platform
) eq
{windows
}} {
1986 proc bind_button3
{w cmd
} {
1987 bind $w <Any-Button-3
> $cmd
1989 bind $w <Control-Button-1
> $cmd
1993 proc incr_font_size
{font
{amt
1}} {
1994 set sz
[font configure
$font -size]
1996 font configure
$font -size $sz
1997 font configure
${font}bold
-size $sz
2000 proc hook_failed_popup
{hook msg
} {
2005 label
$w.m.l1
-text "$hook hook failed:" \
2010 -background white
-borderwidth 1 \
2012 -width 80 -height 10 \
2014 -yscrollcommand [list
$w.m.sby
set]
2016 -text {You must correct the above errors before committing.
} \
2020 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2021 pack
$w.m.l1
-side top
-fill x
2022 pack
$w.m.l2
-side bottom
-fill x
2023 pack
$w.m.sby
-side right
-fill y
2024 pack
$w.m.t
-side left
-fill both
-expand 1
2025 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2027 $w.m.t insert
1.0 $msg
2028 $w.m.t conf
-state disabled
2030 button
$w.ok
-text OK \
2033 -command "destroy $w"
2034 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2036 bind $w <Visibility
> "grab $w; focus $w"
2037 bind $w <Key-Return
> "destroy $w"
2038 wm title
$w "[appname] ([reponame]): error"
2042 set next_console_id
0
2044 proc new_console
{short_title long_title
} {
2045 global next_console_id console_data
2046 set w .console
[incr next_console_id
]
2047 set console_data
($w) [list
$short_title $long_title]
2048 return [console_init
$w]
2051 proc console_init
{w
} {
2052 global console_cr console_data M1B
2054 set console_cr
($w) 1.0
2057 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
2062 -background white
-borderwidth 1 \
2064 -width 80 -height 10 \
2067 -yscrollcommand [list
$w.m.sby
set]
2068 label
$w.m.s
-text {Working... please
wait...
} \
2072 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2073 pack
$w.m.l1
-side top
-fill x
2074 pack
$w.m.s
-side bottom
-fill x
2075 pack
$w.m.sby
-side right
-fill y
2076 pack
$w.m.t
-side left
-fill both
-expand 1
2077 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2079 menu
$w.ctxm
-tearoff 0
2080 $w.ctxm add
command -label "Copy" \
2082 -command "tk_textCopy $w.m.t"
2083 $w.ctxm add
command -label "Select All" \
2085 -command "$w.m.t tag add sel 0.0 end"
2086 $w.ctxm add
command -label "Copy All" \
2089 $w.m.t tag add sel 0.0 end
2091 $w.m.t tag remove sel 0.0 end
2094 button
$w.ok
-text {Close
} \
2097 -command "destroy $w"
2098 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2100 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
2101 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2102 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2103 bind $w <Visibility
> "focus $w"
2104 wm title
$w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2108 proc console_exec
{w cmd
{after
{}}} {
2109 # -- Windows tosses the enviroment when we exec our child.
2110 # But most users need that so we have to relogin. :-(
2113 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
2116 # -- Tcl won't let us redirect both stdout and stderr to
2117 # the same pipe. So pass it through cat...
2119 set cmd
[concat |
$cmd |
& cat]
2121 set fd_f
[open
$cmd r
]
2122 fconfigure
$fd_f -blocking 0 -translation binary
2123 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
2126 proc console_read
{w fd after
} {
2127 global console_cr console_data
2131 if {![winfo exists
$w]} {console_init
$w}
2132 $w.m.t conf
-state normal
2134 set n
[string length
$buf]
2136 set cr
[string first
"\r" $buf $c]
2137 set lf
[string first
"\n" $buf $c]
2138 if {$cr < 0} {set cr
[expr {$n + 1}]}
2139 if {$lf < 0} {set lf
[expr {$n + 1}]}
2142 $w.m.t insert end
[string range
$buf $c $lf]
2143 set console_cr
($w) [$w.m.t index
{end
-1c}]
2147 $w.m.t delete
$console_cr($w) end
2148 $w.m.t insert end
"\n"
2149 $w.m.t insert end
[string range
$buf $c $cr]
2154 $w.m.t conf
-state disabled
2158 fconfigure
$fd -blocking 1
2160 if {[catch
{close
$fd}]} {
2161 if {![winfo exists
$w]} {console_init
$w}
2162 $w.m.s conf
-background red
-text {Error
: Command Failed
}
2163 $w.ok conf
-state normal
2165 } elseif
{[winfo exists
$w]} {
2166 $w.m.s conf
-background green
-text {Success
}
2167 $w.ok conf
-state normal
2170 array
unset console_cr
$w
2171 array
unset console_data
$w
2173 uplevel
#0 $after $ok
2177 fconfigure
$fd -blocking 0
2180 ######################################################################
2184 set starting_gitk_msg
{Starting gitk... please
wait...
}
2186 proc do_gitk
{revs
} {
2187 global ui_status_value starting_gitk_msg
2195 set cmd
"sh -c \"exec $cmd\""
2199 if {[catch
{eval exec $cmd} err
]} {
2200 error_popup
"Failed to start gitk:\n\n$err"
2202 set ui_status_value
$starting_gitk_msg
2204 if {$ui_status_value eq
$starting_gitk_msg} {
2205 set ui_status_value
{Ready.
}
2212 set w
[new_console
{gc
} {Compressing the object database
}]
2213 console_exec
$w {git gc
}
2216 proc do_fsck_objects
{} {
2217 set w
[new_console
{fsck-objects
} \
2218 {Verifying the object database with fsck-objects
}]
2219 set cmd
[list git fsck-objects
]
2222 lappend cmd
--strict
2223 console_exec
$w $cmd
2229 global ui_comm is_quitting repo_config commit_type
2231 if {$is_quitting} return
2234 # -- Stash our current commit buffer.
2236 set save
[gitdir GITGUI_MSG
]
2237 set msg
[string trim
[$ui_comm get
0.0 end
]]
2238 if {![string match amend
* $commit_type]
2239 && [$ui_comm edit modified
]
2242 set fd
[open
$save w
]
2243 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
2247 catch
{file delete
$save}
2250 # -- Stash our current window geometry into this repository.
2252 set cfg_geometry
[list
]
2253 lappend cfg_geometry
[wm geometry .
]
2254 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
2255 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
2256 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2259 if {$cfg_geometry ne
$rc_geometry} {
2260 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2267 rescan
{set ui_status_value
{Ready.
}}
2270 proc unstage_helper
{txt paths
} {
2271 global file_states current_diff
2273 if {![lock_index begin-update
]} return
2277 foreach path
$paths {
2278 switch
-glob -- [lindex
$file_states($path) 0] {
2282 lappend pathList
$path
2283 if {$path eq
$current_diff} {
2284 set after
{reshow_diff
;}
2289 if {$pathList eq
{}} {
2295 [concat
$after {set ui_status_value
{Ready.
}}]
2299 proc do_unstage_selection
{} {
2300 global current_diff selected_paths
2302 if {[array size selected_paths
] > 0} {
2304 {Unstaging selected files from commit
} \
2305 [array names selected_paths
]
2306 } elseif
{$current_diff ne
{}} {
2308 "Unstaging [short_path $current_diff] from commit" \
2309 [list
$current_diff]
2313 proc add_helper
{txt paths
} {
2314 global file_states current_diff
2316 if {![lock_index begin-update
]} return
2320 foreach path
$paths {
2321 switch
-glob -- [lindex
$file_states($path) 0] {
2326 lappend pathList
$path
2327 if {$path eq
$current_diff} {
2328 set after
{reshow_diff
;}
2333 if {$pathList eq
{}} {
2339 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2343 proc do_add_selection
{} {
2344 global current_diff selected_paths
2346 if {[array size selected_paths
] > 0} {
2348 {Adding selected files
} \
2349 [array names selected_paths
]
2350 } elseif
{$current_diff ne
{}} {
2352 "Adding [short_path $current_diff]" \
2353 [list
$current_diff]
2357 proc do_add_all
{} {
2361 foreach path
[array names file_states
] {
2362 switch
-glob -- [lindex
$file_states($path) 0] {
2365 ?D
{lappend paths
$path}
2368 add_helper
{Adding all changed files
} $paths
2371 proc revert_helper
{txt paths
} {
2372 global file_states current_diff
2374 if {![lock_index begin-update
]} return
2378 foreach path
$paths {
2379 switch
-glob -- [lindex
$file_states($path) 0] {
2383 lappend pathList
$path
2384 if {$path eq
$current_diff} {
2385 set after
{reshow_diff
;}
2391 set n
[llength
$pathList]
2395 } elseif
{$n == 1} {
2396 set s
"[short_path [lindex $pathList]]"
2398 set s
"these $n files"
2401 set reply
[tk_dialog \
2403 "[appname] ([reponame])" \
2404 "Revert changes in $s?
2406 Any unadded changes will be permanently lost by the revert." \
2416 [concat
$after {set ui_status_value
{Ready.
}}]
2422 proc do_revert_selection
{} {
2423 global current_diff selected_paths
2425 if {[array size selected_paths
] > 0} {
2427 {Reverting selected files
} \
2428 [array names selected_paths
]
2429 } elseif
{$current_diff ne
{}} {
2431 "Reverting [short_path $current_diff]" \
2432 [list
$current_diff]
2436 proc do_signoff
{} {
2439 set me
[committer_ident
]
2440 if {$me eq
{}} return
2442 set sob
"Signed-off-by: $me"
2443 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2444 if {$last ne
$sob} {
2445 $ui_comm edit separator
2447 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2448 $ui_comm insert end
"\n"
2450 $ui_comm insert end
"\n$sob"
2451 $ui_comm edit separator
2456 proc do_select_commit_type
{} {
2457 global commit_type selected_commit_type
2459 if {$selected_commit_type eq
{new
}
2460 && [string match amend
* $commit_type]} {
2462 } elseif
{$selected_commit_type eq
{amend
}
2463 && ![string match amend
* $commit_type]} {
2466 # The amend request was rejected...
2468 if {![string match amend
* $commit_type]} {
2469 set selected_commit_type new
2479 global appvers copyright
2480 global tcl_patchLevel tk_patchLevel
2484 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2486 label
$w.header
-text "About [appname]" \
2488 pack
$w.header
-side top
-fill x
2491 button
$w.buttons.close
-text {Close
} \
2493 -command [list destroy
$w]
2494 pack
$w.buttons.close
-side right
2495 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2498 -text "[appname] - a commit creation tool for Git.
2506 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
2509 append v
"[appname] version $appvers\n"
2510 append v
"[exec git version]\n"
2512 if {$tcl_patchLevel eq
$tk_patchLevel} {
2513 append v
"Tcl/Tk version $tcl_patchLevel"
2515 append v
"Tcl version $tcl_patchLevel"
2516 append v
", Tk version $tk_patchLevel"
2527 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
2529 menu
$w.ctxm
-tearoff 0
2530 $w.ctxm add
command \
2535 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2538 bind $w <Visibility
> "grab $w; focus $w"
2539 bind $w <Key-Escape
> "destroy $w"
2540 bind_button3
$w.vers
"tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2541 wm title
$w "About [appname]"
2545 proc do_options
{} {
2546 global repo_config global_config font_descs
2547 global repo_config_new global_config_new
2549 array
unset repo_config_new
2550 array
unset global_config_new
2551 foreach name
[array names repo_config
] {
2552 set repo_config_new
($name) $repo_config($name)
2555 foreach name
[array names repo_config
] {
2557 gui.diffcontext
{continue}
2559 set repo_config_new
($name) $repo_config($name)
2561 foreach name
[array names global_config
] {
2562 set global_config_new
($name) $global_config($name)
2565 set w .options_editor
2567 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2569 label
$w.header
-text "[appname] Options" \
2571 pack
$w.header
-side top
-fill x
2574 button
$w.buttons.restore
-text {Restore Defaults
} \
2576 -command do_restore_defaults
2577 pack
$w.buttons.restore
-side left
2578 button
$w.buttons.save
-text Save \
2580 -command [list do_save_config
$w]
2581 pack
$w.buttons.save
-side right
2582 button
$w.buttons.cancel
-text {Cancel
} \
2584 -command [list destroy
$w]
2585 pack
$w.buttons.cancel
-side right
-padx 5
2586 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2588 labelframe
$w.repo
-text "[reponame] Repository" \
2590 -relief raised
-borderwidth 2
2591 labelframe
$w.global
-text {Global
(All Repositories
)} \
2593 -relief raised
-borderwidth 2
2594 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
2595 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
2598 {b partialinclude
{Allow Partially Added Files
}}
2599 {b pullsummary
{Show Pull Summary
}}
2600 {b trustmtime
{Trust File Modification Timestamps
}}
2601 {i diffcontext
{Number of Diff Context Lines
}}
2603 set type [lindex
$option 0]
2604 set name
[lindex
$option 1]
2605 set text
[lindex
$option 2]
2606 foreach f
{repo global
} {
2609 checkbutton
$w.
$f.
$name -text $text \
2610 -variable ${f}_config_new
(gui.
$name) \
2614 pack
$w.
$f.
$name -side top
-anchor w
2618 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
2619 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
2620 spinbox
$w.
$f.
$name.v \
2621 -textvariable ${f}_config_new
(gui.
$name) \
2622 -from 1 -to 99 -increment 1 \
2625 pack
$w.
$f.
$name.v
-side right
-anchor e
2626 pack
$w.
$f.
$name -side top
-anchor w
-fill x
2632 set all_fonts
[lsort
[font families
]]
2633 foreach option
$font_descs {
2634 set name
[lindex
$option 0]
2635 set font
[lindex
$option 1]
2636 set text
[lindex
$option 2]
2638 set global_config_new
(gui.
$font^^family
) \
2639 [font configure
$font -family]
2640 set global_config_new
(gui.
$font^^size
) \
2641 [font configure
$font -size]
2643 frame
$w.global.
$name
2644 label
$w.global.
$name.l
-text "$text:" -font font_ui
2645 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
2646 eval tk_optionMenu
$w.global.
$name.family \
2647 global_config_new
(gui.
$font^^family
) \
2649 spinbox
$w.global.
$name.size \
2650 -textvariable global_config_new
(gui.
$font^^size
) \
2651 -from 2 -to 80 -increment 1 \
2654 pack
$w.global.
$name.size
-side right
-anchor e
2655 pack
$w.global.
$name.family
-side right
-anchor e
2656 pack
$w.global.
$name -side top
-anchor w
-fill x
2659 bind $w <Visibility
> "grab $w; focus $w"
2660 bind $w <Key-Escape
> "destroy $w"
2661 wm title
$w "[appname] ([reponame]): Options"
2665 proc do_restore_defaults
{} {
2666 global font_descs default_config repo_config
2667 global repo_config_new global_config_new
2669 foreach name
[array names default_config
] {
2670 set repo_config_new
($name) $default_config($name)
2671 set global_config_new
($name) $default_config($name)
2674 foreach option
$font_descs {
2675 set name
[lindex
$option 0]
2676 set repo_config
(gui.
$name) $default_config(gui.
$name)
2680 foreach option
$font_descs {
2681 set name
[lindex
$option 0]
2682 set font
[lindex
$option 1]
2683 set global_config_new
(gui.
$font^^family
) \
2684 [font configure
$font -family]
2685 set global_config_new
(gui.
$font^^size
) \
2686 [font configure
$font -size]
2690 proc do_save_config
{w
} {
2691 if {[catch
{save_config
} err
]} {
2692 error_popup
"Failed to completely save options:\n\n$err"
2698 proc do_windows_shortcut
{} {
2702 set desktop
[exec cygpath \
2710 set fn
[tk_getSaveFile \
2712 -title "[appname] ([reponame]): Create Desktop Icon" \
2713 -initialdir $desktop \
2714 -initialfile "Git [reponame].bat"]
2718 set sh
[exec cygpath \
2722 set me
[exec cygpath \
2726 set gd
[exec cygpath \
2730 set gw
[exec cygpath \
2733 [file dirname [gitdir
]]]
2734 regsub
-all ' $me "'\\''" me
2735 regsub -all ' $gd "'\\''" gd
2736 puts $fd "@ECHO Entering $gw"
2737 puts $fd "@ECHO Starting git-gui... please wait..."
2738 puts -nonewline $fd "@\"$sh\" --login -c \""
2739 puts -nonewline $fd "GIT_DIR='$gd'"
2740 puts -nonewline $fd " '$me'"
2744 error_popup "Cannot write script:\n\n$err"
2749 proc do_macosx_app {} {
2752 set fn [tk_getSaveFile \
2754 -title "[appname] ([reponame]): Create Desktop Icon" \
2755 -initialdir [file join $env(HOME) Desktop] \
2756 -initialfile "Git [reponame].app"]
2759 set Contents [file join $fn Contents]
2760 set MacOS [file join $Contents MacOS]
2761 set exe [file join $MacOS git-gui]
2765 set fd [open [file join $Contents Info.plist] w]
2766 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2767 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2768 <plist version="1.0">
2770 <key>CFBundleDevelopmentRegion</key>
2771 <string>English</string>
2772 <key>CFBundleExecutable</key>
2773 <string>git-gui</string>
2774 <key>CFBundleIdentifier</key>
2775 <string>org.spearce.git-gui</string>
2776 <key>CFBundleInfoDictionaryVersion</key>
2777 <string>6.0</string>
2778 <key>CFBundlePackageType</key>
2779 <string>APPL</string>
2780 <key>CFBundleSignature</key>
2781 <string>????</string>
2782 <key>CFBundleVersion</key>
2783 <string>1.0</string>
2784 <key>NSPrincipalClass</key>
2785 <string>NSApplication</string>
2790 set fd [open $exe w]
2791 set gd [file normalize [gitdir]]
2792 set ep [file normalize [exec git --exec-path]]
2793 regsub -all ' $gd "'\\''" gd
2794 regsub
-all ' $ep "'\\''" ep
2795 puts $fd "#!/bin/sh"
2796 foreach name
[array names env
] {
2797 if {[string match GIT_
* $name]} {
2798 regsub
-all ' $env($name) "'\\''" v
2799 puts $fd "export $name='$v'"
2802 puts $fd "export PATH
='$ep':\
$PATH"
2803 puts $fd "export GIT_DIR
='$gd'"
2804 puts $fd "exec [file normalize
$argv0]"
2807 file attributes $exe -permissions u+x,g+x,o+x
2809 error_popup "Cannot
write icon
:\n\n$err"
2814 proc toggle_or_diff {w x y} {
2815 global file_states file_lists current_diff ui_index ui_workdir
2816 global last_clicked selected_paths
2818 set pos [split [$w index @$x,$y] .]
2819 set lno [lindex $pos 0]
2820 set col [lindex $pos 1]
2821 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2827 set last_clicked [list $w $lno]
2828 array unset selected_paths
2829 $ui_index tag remove in_sel 0.0 end
2830 $ui_workdir tag remove in_sel 0.0 end
2833 if {$current_diff eq $path} {
2834 set after {reshow_diff;}
2838 if {$w eq $ui_index} {
2840 "Unstaging
[short_path
$path] from commit
" \
2842 [concat $after {set ui_status_value {Ready.}}]
2843 } elseif {$w eq $ui_workdir} {
2845 "Adding
[short_path
$path]" \
2847 [concat $after {set ui_status_value {Ready.}}]
2850 show_diff $path $w $lno
2854 proc add_one_to_selection {w x y} {
2855 global file_lists last_clicked selected_paths
2857 set lno [lindex [split [$w index @$x,$y] .] 0]
2858 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2864 if {$last_clicked ne {}
2865 && [lindex $last_clicked 0] ne $w} {
2866 array unset selected_paths
2867 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2870 set last_clicked [list $w $lno]
2871 if {[catch {set in_sel $selected_paths($path)}]} {
2875 unset selected_paths($path)
2876 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2878 set selected_paths($path) 1
2879 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2883 proc add_range_to_selection {w x y} {
2884 global file_lists last_clicked selected_paths
2886 if {[lindex $last_clicked 0] ne $w} {
2887 toggle_or_diff $w $x $y
2891 set lno [lindex [split [$w index @$x,$y] .] 0]
2892 set lc [lindex $last_clicked 1]
2901 foreach path [lrange $file_lists($w) \
2902 [expr {$begin - 1}] \
2903 [expr {$end - 1}]] {
2904 set selected_paths($path) 1
2906 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2909 ######################################################################
2913 set cursor_ptr arrow
2914 font create font_diff -family Courier -size 10
2918 eval font configure font_ui [font actual [.dummy cget -font]]
2922 font create font_uibold
2923 font create font_diffbold
2928 } elseif {[is_MacOSX]} {
2936 proc apply_config {} {
2937 global repo_config font_descs
2939 foreach option $font_descs {
2940 set name [lindex $option 0]
2941 set font [lindex $option 1]
2943 foreach {cn cv} $repo_config(gui.$name) {
2944 font configure $font $cn $cv
2947 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
2949 foreach {cn cv} [font configure $font] {
2950 font configure ${font}bold $cn $cv
2952 font configure ${font}bold -weight bold
2956 set default_config(gui.trustmtime) false
2957 set default_config(gui.pullsummary) true
2958 set default_config(gui.partialinclude) false
2959 set default_config(gui.diffcontext) 5
2960 set default_config(gui.fontui) [font configure font_ui]
2961 set default_config(gui.fontdiff) [font configure font_diff]
2963 {fontui font_ui {Main Font}}
2964 {fontdiff font_diff {Diff/Console Font}}
2969 ######################################################################
2975 menu .mbar -tearoff 0
2976 .mbar add cascade -label Repository -menu .mbar.repository
2977 .mbar add cascade -label Edit -menu .mbar.edit
2978 if {!$single_commit} {
2979 .mbar add cascade -label Branch -menu .mbar.branch
2981 .mbar add cascade -label Commit -menu .mbar.commit
2982 if {!$single_commit} {
2983 .mbar add cascade -label Fetch -menu .mbar.fetch
2984 .mbar add cascade -label Pull -menu .mbar.pull
2985 .mbar add cascade -label Push -menu .mbar.push
2987 . configure -menu .mbar
2989 # -- Repository Menu
2991 menu .mbar.repository
2992 .mbar.repository add command \
2993 -label {Visualize Current Branch} \
2994 -command {do_gitk {}} \
2997 .mbar.repository add command \
2998 -label {Visualize All Branches} \
2999 -command {do_gitk {--all}} \
3002 .mbar.repository add separator
3004 if {!$single_commit} {
3005 .mbar.repository add command -label {Compress Database} \
3009 .mbar.repository add command -label {Verify Database} \
3010 -command do_fsck_objects \
3013 .mbar.repository add separator
3016 .mbar.repository add command \
3017 -label {Create Desktop Icon} \
3018 -command do_windows_shortcut \
3020 } elseif {[is_MacOSX]} {
3021 .mbar.repository add command \
3022 -label {Create Desktop Icon} \
3023 -command do_macosx_app \
3028 .mbar.repository add command -label Quit \
3030 -accelerator $M1T-Q \
3036 .mbar.edit add command -label Undo \
3037 -command {catch {[focus] edit undo}} \
3038 -accelerator $M1T-Z \
3040 .mbar.edit add command -label Redo \
3041 -command {catch {[focus] edit redo}} \
3042 -accelerator $M1T-Y \
3044 .mbar.edit add separator
3045 .mbar.edit add command -label Cut \
3046 -command {catch {tk_textCut [focus]}} \
3047 -accelerator $M1T-X \
3049 .mbar.edit add command -label Copy \
3050 -command {catch {tk_textCopy [focus]}} \
3051 -accelerator $M1T-C \
3053 .mbar.edit add command -label Paste \
3054 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3055 -accelerator $M1T-V \
3057 .mbar.edit add command -label Delete \
3058 -command {catch {[focus] delete sel.first sel.last}} \
3061 .mbar.edit add separator
3062 .mbar.edit add command -label {Select All} \
3063 -command {catch {[focus] tag add sel 0.0 end}} \
3064 -accelerator $M1T-A \
3069 if {!$single_commit} {
3072 .mbar.branch add command -label {Create...} \
3073 -command do_create_branch \
3075 lappend disable_on_lock [list .mbar.branch entryconf \
3076 [.mbar.branch index last] -state]
3078 .mbar.branch add command -label {Delete...} \
3079 -command do_delete_branch \
3081 lappend disable_on_lock [list .mbar.branch entryconf \
3082 [.mbar.branch index last] -state]
3089 .mbar.commit add radiobutton \
3090 -label {New Commit} \
3091 -command do_select_commit_type \
3092 -variable selected_commit_type \
3095 lappend disable_on_lock \
3096 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3098 .mbar.commit add radiobutton \
3099 -label {Amend Last Commit} \
3100 -command do_select_commit_type \
3101 -variable selected_commit_type \
3104 lappend disable_on_lock \
3105 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3107 .mbar.commit add separator
3109 .mbar.commit add command -label Rescan \
3110 -command do_rescan \
3113 lappend disable_on_lock \
3114 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3116 .mbar.commit add command -label {Add To Commit} \
3117 -command do_add_selection \
3119 lappend disable_on_lock \
3120 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3122 .mbar.commit add command -label {Add All To Commit} \
3123 -command do_add_all \
3124 -accelerator $M1T-I \
3126 lappend disable_on_lock \
3127 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3129 .mbar.commit add command -label {Unstage From Commit} \
3130 -command do_unstage_selection \
3132 lappend disable_on_lock \
3133 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3135 .mbar.commit add command -label {Revert Changes} \
3136 -command do_revert_selection \
3138 lappend disable_on_lock \
3139 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3141 .mbar.commit add separator
3143 .mbar.commit add command -label {Sign Off} \
3144 -command do_signoff \
3145 -accelerator $M1T-S \
3148 .mbar.commit add command -label Commit \
3149 -command do_commit \
3150 -accelerator $M1T-Return \
3152 lappend disable_on_lock \
3153 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3155 # -- Transport menus
3157 if {!$single_commit} {
3164 # -- Apple Menu (Mac OS X only)
3166 .mbar add cascade -label Apple -menu .mbar.apple
3169 .mbar.apple add command -label "About
[appname
]" \
3172 .mbar.apple add command -label "[appname
] Options...
" \
3173 -command do_options \
3178 .mbar.edit add separator
3179 .mbar.edit add command -label {Options...} \
3180 -command do_options \
3185 if {[file exists /usr/local/miga/lib/gui-miga]
3186 && [file exists .pvcsrc]} {
3188 global ui_status_value
3189 if {![lock_index update]} return
3190 set cmd [list sh --login -c "/usr
/local
/miga
/lib
/gui-miga
\"[pwd]\""]
3191 set miga_fd [open "|
$cmd" r]
3192 fconfigure $miga_fd -blocking 0
3193 fileevent $miga_fd readable [list miga_done $miga_fd]
3194 set ui_status_value {Running miga...}
3196 proc miga_done {fd} {
3201 rescan [list set ui_status_value {Ready.}]
3204 .mbar add cascade -label Tools -menu .mbar.tools
3206 .mbar.tools add command -label "Migrate
" \
3209 lappend disable_on_lock \
3210 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3215 .mbar add cascade -label Help -menu .mbar.help
3218 .mbar.help add command -label "About
[appname
]" \
3230 -text {Current Branch:} \
3235 -textvariable current_branch \
3239 pack .branch.l1 -side left
3240 pack .branch.cb -side left -fill x
3241 pack .branch -side top -fill x
3243 # -- Main Window Layout
3245 panedwindow .vpane -orient vertical
3246 panedwindow .vpane.files -orient horizontal
3247 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3248 pack .vpane -anchor n -side top -fill both -expand 1
3250 # -- Index File List
3252 frame .vpane.files.index -height 100 -width 400
3253 label .vpane.files.index.title -text {Changes To Be Committed} \
3256 text $ui_index -background white -borderwidth 0 \
3257 -width 40 -height 10 \
3259 -cursor $cursor_ptr \
3260 -yscrollcommand {.vpane.files.index.sb set} \
3262 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3263 pack .vpane.files.index.title -side top -fill x
3264 pack .vpane.files.index.sb -side right -fill y
3265 pack $ui_index -side left -fill both -expand 1
3266 .vpane.files add .vpane.files.index -sticky nsew
3268 # -- Working Directory File List
3270 frame .vpane.files.workdir -height 100 -width 100
3271 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3274 text $ui_workdir -background white -borderwidth 0 \
3275 -width 40 -height 10 \
3277 -cursor $cursor_ptr \
3278 -yscrollcommand {.vpane.files.workdir.sb set} \
3280 scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
3281 pack .vpane.files.workdir.title -side top -fill x
3282 pack .vpane.files.workdir.sb -side right -fill y
3283 pack $ui_workdir -side left -fill both -expand 1
3284 .vpane.files add .vpane.files.workdir -sticky nsew
3286 foreach i [list $ui_index $ui_workdir] {
3287 $i tag conf in_diff -font font_uibold
3288 $i tag conf in_sel \
3289 -background [$i cget -foreground] \
3290 -foreground [$i cget -background]
3294 # -- Diff and Commit Area
3296 frame .vpane.lower -height 300 -width 400
3297 frame .vpane.lower.commarea
3298 frame .vpane.lower.diff -relief sunken -borderwidth 1
3299 pack .vpane.lower.commarea -side top -fill x
3300 pack .vpane.lower.diff -side bottom -fill both -expand 1
3301 .vpane add .vpane.lower -stick nsew
3303 # -- Commit Area Buttons
3305 frame .vpane.lower.commarea.buttons
3306 label .vpane.lower.commarea.buttons.l -text {} \
3310 pack .vpane.lower.commarea.buttons.l -side top -fill x
3311 pack .vpane.lower.commarea.buttons -side left -fill y
3313 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3314 -command do_rescan \
3316 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3317 lappend disable_on_lock \
3318 {.vpane.lower.commarea.buttons.rescan conf -state}
3320 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3321 -command do_add_all \
3323 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3324 lappend disable_on_lock \
3325 {.vpane.lower.commarea.buttons.incall conf -state}
3327 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3328 -command do_signoff \
3330 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3332 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3333 -command do_commit \
3335 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3336 lappend disable_on_lock \
3337 {.vpane.lower.commarea.buttons.commit conf -state}
3339 # -- Commit Message Buffer
3341 frame .vpane.lower.commarea.buffer
3342 frame .vpane.lower.commarea.buffer.header
3343 set ui_comm .vpane.lower.commarea.buffer.t
3344 set ui_coml .vpane.lower.commarea.buffer.header.l
3345 radiobutton .vpane.lower.commarea.buffer.header.new \
3346 -text {New Commit} \
3347 -command do_select_commit_type \
3348 -variable selected_commit_type \
3351 lappend disable_on_lock \
3352 [list .vpane.lower.commarea.buffer.header.new conf -state]
3353 radiobutton .vpane.lower.commarea.buffer.header.amend \
3354 -text {Amend Last Commit} \
3355 -command do_select_commit_type \
3356 -variable selected_commit_type \
3359 lappend disable_on_lock \
3360 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3365 proc trace_commit_type {varname args} {
3366 global ui_coml commit_type
3367 switch -glob -- $commit_type {
3368 initial {set txt {Initial Commit Message:}}
3369 amend {set txt {Amended Commit Message:}}
3370 amend-initial {set txt {Amended Initial Commit Message:}}
3371 amend-merge {set txt {Amended Merge Commit Message:}}
3372 merge {set txt {Merge Commit Message:}}
3373 * {set txt {Commit Message:}}
3375 $ui_coml conf -text $txt
3377 trace add variable commit_type write trace_commit_type
3378 pack $ui_coml -side left -fill x
3379 pack .vpane.lower.commarea.buffer.header.amend -side right
3380 pack .vpane.lower.commarea.buffer.header.new -side right
3382 text $ui_comm -background white -borderwidth 1 \
3385 -autoseparators true \
3387 -width 75 -height 9 -wrap none \
3389 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3390 scrollbar .vpane.lower.commarea.buffer.sby \
3391 -command [list $ui_comm yview]
3392 pack .vpane.lower.commarea.buffer.header -side top -fill x
3393 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3394 pack $ui_comm -side left -fill y
3395 pack .vpane.lower.commarea.buffer -side left -fill y
3397 # -- Commit Message Buffer Context Menu
3399 set ctxm .vpane.lower.commarea.buffer.ctxm
3400 menu $ctxm -tearoff 0
3404 -command {tk_textCut $ui_comm}
3408 -command {tk_textCopy $ui_comm}
3412 -command {tk_textPaste $ui_comm}
3416 -command {$ui_comm delete sel.first sel.last}
3419 -label {Select All} \
3421 -command {$ui_comm tag add sel 0.0 end}
3426 $ui_comm tag add sel 0.0 end
3427 tk_textCopy $ui_comm
3428 $ui_comm tag remove sel 0.0 end
3435 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
3440 set diff_actions [list]
3441 proc trace_current_diff {varname args} {
3442 global current_diff diff_actions file_states
3443 if {$current_diff eq {}} {
3450 set s [mapdesc [lindex $file_states($p) 0] $p]
3452 set p [escape_path $p]
3456 .vpane.lower.diff.header.status configure -text $s
3457 .vpane.lower.diff.header.file configure -text $f
3458 .vpane.lower.diff.header.path configure -text $p
3459 foreach w $diff_actions {
3463 trace add variable current_diff write trace_current_diff
3465 frame .vpane.lower.diff.header -background orange
3466 label .vpane.lower.diff.header.status \
3467 -background orange \
3468 -width $max_status_desc \
3472 label .vpane.lower.diff.header.file \
3473 -background orange \
3477 label .vpane.lower.diff.header.path \
3478 -background orange \
3482 pack .vpane.lower.diff.header.status -side left
3483 pack .vpane.lower.diff.header.file -side left
3484 pack .vpane.lower.diff.header.path -fill x
3485 set ctxm .vpane.lower.diff.header.ctxm
3486 menu $ctxm -tearoff 0
3497 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3498 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
3502 frame .vpane.lower.diff.body
3503 set ui_diff .vpane.lower.diff.body.t
3504 text $ui_diff -background white -borderwidth 0 \
3505 -width 80 -height 15 -wrap none \
3507 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3508 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3510 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3511 -command [list $ui_diff xview]
3512 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3513 -command [list $ui_diff yview]
3514 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3515 pack .vpane.lower.diff.body.sby -side right -fill y
3516 pack $ui_diff -side left -fill both -expand 1
3517 pack .vpane.lower.diff.header -side top -fill x
3518 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3520 $ui_diff tag conf d_@ -font font_diffbold
3521 $ui_diff tag conf d_+ -foreground blue
3522 $ui_diff tag conf d_- -foreground red
3523 $ui_diff tag conf d_++ -foreground {#00a000}
3524 $ui_diff tag conf d_-- -foreground {#a000a0}
3525 $ui_diff tag conf d_+- \
3527 -background {light goldenrod yellow}
3528 $ui_diff tag conf d_-+ \
3532 # -- Diff Body Context Menu
3534 set ctxm .vpane.lower.diff.body.ctxm
3535 menu $ctxm -tearoff 0
3539 -command {tk_textCopy $ui_diff}
3540 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3542 -label {Select All} \
3544 -command {$ui_diff tag add sel 0.0 end}
3545 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3550 $ui_diff tag add sel 0.0 end
3551 tk_textCopy $ui_diff
3552 $ui_diff tag remove sel 0.0 end
3554 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3557 -label {Decrease Font Size} \
3559 -command {incr_font_size font_diff -1}
3560 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3562 -label {Increase Font Size} \
3564 -command {incr_font_size font_diff 1}
3565 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3568 -label {Show Less Context} \
3570 -command {if {$repo_config(gui.diffcontext) >= 2} {
3571 incr repo_config(gui.diffcontext) -1
3574 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3576 -label {Show More Context} \
3579 incr repo_config(gui.diffcontext)
3582 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3584 $ctxm add command -label {Options...} \
3587 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
3591 set ui_status_value {Initializing...}
3592 label .status -textvariable ui_status_value \
3598 pack .status -anchor w -side bottom -fill x
3603 set gm $repo_config(gui.geometry)
3604 wm geometry . [lindex $gm 0]
3605 .vpane sash place 0 \
3606 [lindex [.vpane sash coord 0] 0] \
3608 .vpane.files sash place 0 \
3610 [lindex [.vpane.files sash coord 0] 1]
3616 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3617 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3618 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3619 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3620 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3621 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3622 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3623 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3624 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3625 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3626 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3628 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3629 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3630 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3631 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3632 bind $ui_diff <$M1B-Key-v> {break}
3633 bind $ui_diff <$M1B-Key-V> {break}
3634 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3635 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3636 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3637 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3638 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3639 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3641 bind . <Destroy> do_quit
3642 bind all <Key-F5> do_rescan
3643 bind all <$M1B-Key-r> do_rescan
3644 bind all <$M1B-Key-R> do_rescan
3645 bind . <$M1B-Key-s> do_signoff
3646 bind . <$M1B-Key-S> do_signoff
3647 bind . <$M1B-Key-i> do_add_all
3648 bind . <$M1B-Key-I> do_add_all
3649 bind . <$M1B-Key-Return> do_commit
3650 bind all <$M1B-Key-q> do_quit
3651 bind all <$M1B-Key-Q> do_quit
3652 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3653 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3654 foreach i [list $ui_index $ui_workdir] {
3655 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
3656 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
3657 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
3661 set file_lists($ui_index) [list]
3662 set file_lists($ui_workdir) [list]
3666 set MERGE_HEAD [list]
3669 set current_branch {}
3671 set selected_commit_type new
3673 wm title . "[appname
] ([file normalize
[file dirname [gitdir
]]])"
3674 focus -force $ui_comm
3676 # -- Warn the user about environmental problems. Cygwin's Tcl
3677 # does *not* pass its env array onto any processes it spawns.
3678 # This means that git processes get none of our environment.
3683 set msg "Possible environment issues exist.
3685 The following environment variables are probably
3686 going to be ignored by any Git subprocess run
3690 foreach name [array names env] {
3691 switch -regexp -- $name {
3692 {^GIT_INDEX_FILE$} -
3693 {^GIT_OBJECT_DIRECTORY$} -
3694 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3696 {^GIT_EXTERNAL_DIFF$} -
3700 {^GIT_CONFIG_LOCAL$} -
3701 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3702 append msg " - $name\n"
3705 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3706 append msg " - $name\n"
3708 set suggest_user $name
3712 if {$ignored_env > 0} {
3714 This is due to a known issue with the
3715 Tcl binary distributed by Cygwin.
"
3717 if {$suggest_user ne {}} {
3720 A good replacement
for $suggest_user
3721 is placing values
for the user.name and
3722 user.email settings into your personal
3728 unset ignored_env msg suggest_user name
3731 # -- Only initialize complex UI if we are going to stay running.
3733 if {!$single_commit} {
3737 populate_branch_menu .mbar.branch
3738 populate_fetch_menu .mbar.fetch
3739 populate_pull_menu .mbar.pull
3740 populate_push_menu .mbar.push
3743 # -- Only suggest a gc run if we are going to stay running.
3745 if {!$single_commit} {
3746 set object_limit 2000
3747 if {[is_Windows]} {set object_limit 200}
3748 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
3749 if {$objects_current >= $object_limit} {
3751 "This repository currently has
$objects_current loose objects.
3753 To maintain optimal performance it is strongly
3754 recommended that you
compress the database
3755 when
more than
$object_limit loose objects exist.
3757 Compress the database now?
"] eq yes} {
3761 unset object_limit _junk objects_current
3764 lock_index begin-read