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
1358 global last_clicked selected_paths
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
1451 puts
-nonewline $fd "\t"
1452 puts
-nonewline $fd $path
1453 puts
-nonewline $fd "\0"
1454 display_file
$path $new
1457 set ui_status_value
[format \
1458 "$msg... %i/%i files (%.2f%%)" \
1461 [expr {100.0 * $update_index_cp / $totalCnt}]]
1464 proc update_index
{msg pathList after
} {
1465 global update_index_cp ui_status_value
1467 if {![lock_index update
]} return
1469 set update_index_cp
0
1470 set pathList
[lsort
$pathList]
1471 set totalCnt
[llength
$pathList]
1472 set batch [expr {int
($totalCnt * .01) + 1}]
1473 if {$batch > 25} {set batch 25}
1475 set ui_status_value
[format \
1476 "$msg... %i/%i files (%.2f%%)" \
1480 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1486 fileevent
$fd writable
[list \
1487 write_update_index \
1497 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1498 global update_index_cp ui_status_value
1499 global file_states current_diff
1501 if {$update_index_cp >= $totalCnt} {
1508 for {set i
$batch} \
1509 {$update_index_cp < $totalCnt && $i > 0} \
1511 set path
[lindex
$pathList $update_index_cp]
1512 incr update_index_cp
1514 switch
-glob -- [lindex
$file_states($path) 0] {
1523 puts
-nonewline $fd "$path\0"
1524 display_file
$path $new
1527 set ui_status_value
[format \
1528 "$msg... %i/%i files (%.2f%%)" \
1531 [expr {100.0 * $update_index_cp / $totalCnt}]]
1534 proc checkout_index
{msg pathList after
} {
1535 global update_index_cp ui_status_value
1537 if {![lock_index update
]} return
1539 set update_index_cp
0
1540 set pathList
[lsort
$pathList]
1541 set totalCnt
[llength
$pathList]
1542 set batch [expr {int
($totalCnt * .01) + 1}]
1543 if {$batch > 25} {set batch 25}
1545 set ui_status_value
[format \
1546 "$msg... %i/%i files (%.2f%%)" \
1550 set cmd
[list git checkout-index
]
1556 set fd
[open
"| $cmd " w
]
1562 fileevent
$fd writable
[list \
1563 write_checkout_index \
1573 proc write_checkout_index
{fd pathList totalCnt
batch msg after
} {
1574 global update_index_cp ui_status_value
1575 global file_states current_diff
1577 if {$update_index_cp >= $totalCnt} {
1584 for {set i
$batch} \
1585 {$update_index_cp < $totalCnt && $i > 0} \
1587 set path
[lindex
$pathList $update_index_cp]
1588 incr update_index_cp
1589 switch
-glob -- [lindex
$file_states($path) 0] {
1593 puts
-nonewline $fd "$path\0"
1594 display_file
$path ?_
1599 set ui_status_value
[format \
1600 "$msg... %i/%i files (%.2f%%)" \
1603 [expr {100.0 * $update_index_cp / $totalCnt}]]
1606 ######################################################################
1608 ## branch management
1610 proc load_all_heads
{} {
1611 global all_heads tracking_branches
1613 set all_heads
[list
]
1614 set cmd
[list git for-each-ref
]
1615 lappend cmd
--format=%(refname
)
1616 lappend cmd refs
/heads
1617 set fd
[open
"| $cmd" r
]
1618 while {[gets
$fd line
] > 0} {
1619 if {![catch
{set info
$tracking_branches($line)}]} continue
1620 if {![regsub ^refs
/heads
/ $line {} name
]} continue
1621 lappend all_heads
$name
1625 set all_heads
[lsort
$all_heads]
1628 proc populate_branch_menu
{m
} {
1629 global all_heads disable_on_lock
1632 foreach b
$all_heads {
1633 $m add radiobutton \
1635 -command [list switch_branch
$b] \
1636 -variable current_branch \
1639 lappend disable_on_lock \
1640 [list
$m entryconf
[$m index last
] -state]
1644 proc do_create_branch
{} {
1645 error
"NOT IMPLEMENTED"
1648 proc do_delete_branch
{} {
1649 error
"NOT IMPLEMENTED"
1652 proc switch_branch
{b
} {
1653 global HEAD commit_type file_states current_branch
1654 global selected_commit_type ui_comm
1656 if {![lock_index switch
]} return
1658 # -- Backup the selected branch (repository_state resets it)
1660 set new_branch
$current_branch
1662 # -- Our in memory state should match the repository.
1664 repository_state curType curHEAD curMERGE_HEAD
1665 if {[string match amend
* $commit_type]
1666 && $curType eq
{normal
}
1667 && $curHEAD eq
$HEAD} {
1668 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1669 info_popup
{Last scanned state does not match repository state.
1671 Another Git program has modified this repository
1672 since the last scan. A rescan must be performed
1673 before the current branch can be changed.
1675 The rescan will be automatically started now.
1678 rescan
{set ui_status_value
{Ready.
}}
1682 # -- Toss the message buffer if we are in amend mode.
1684 if {[string match amend
* $curType]} {
1685 $ui_comm delete
0.0 end
1687 $ui_comm edit modified false
1690 set selected_commit_type new
1691 set current_branch
$new_branch
1694 error
"NOT FINISHED"
1697 ######################################################################
1699 ## remote management
1701 proc load_all_remotes
{} {
1703 global all_remotes tracking_branches
1705 set all_remotes
[list
]
1706 array
unset tracking_branches
1708 set rm_dir
[gitdir remotes
]
1709 if {[file isdirectory
$rm_dir]} {
1710 set all_remotes
[glob \
1714 -directory $rm_dir *]
1716 foreach name
$all_remotes {
1718 set fd
[open
[file join $rm_dir $name] r
]
1719 while {[gets
$fd line
] >= 0} {
1720 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
1721 $line line src dst
]} continue
1722 if {![regexp ^refs
/ $dst]} {
1723 set dst
"refs/heads/$dst"
1725 set tracking_branches
($dst) [list
$name $src]
1732 foreach line
[array names repo_config remote.
*.url
] {
1733 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
1734 lappend all_remotes
$name
1736 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
1740 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
1741 if {![regexp ^refs
/ $dst]} {
1742 set dst
"refs/heads/$dst"
1744 set tracking_branches
($dst) [list
$name $src]
1748 set all_remotes
[lsort
-unique $all_remotes]
1751 proc populate_fetch_menu
{m
} {
1752 global all_remotes repo_config
1754 foreach r
$all_remotes {
1756 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1757 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
1762 set fd
[open
[gitdir remotes
$r] r
]
1763 while {[gets
$fd n
] >= 0} {
1764 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
1775 -label "Fetch from $r..." \
1776 -command [list fetch_from
$r] \
1782 proc populate_push_menu
{m
} {
1783 global all_remotes repo_config
1785 foreach r
$all_remotes {
1787 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1788 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
1793 set fd
[open
[gitdir remotes
$r] r
]
1794 while {[gets
$fd n
] >= 0} {
1795 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
1806 -label "Push to $r..." \
1807 -command [list push_to
$r] \
1813 proc populate_pull_menu
{m
} {
1814 global repo_config all_remotes disable_on_lock
1816 foreach remote
$all_remotes {
1818 if {[array get repo_config remote.
$remote.url
] ne
{}} {
1819 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
1820 foreach line
$repo_config(remote.
$remote.fetch
) {
1821 if {[regexp
{^
([^
:]+):} $line line rb
]} {
1828 set fd
[open
[gitdir remotes
$remote] r
]
1829 while {[gets
$fd line
] >= 0} {
1830 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
1838 foreach rb
$rb_list {
1839 regsub ^refs
/heads
/ $rb {} rb_short
1841 -label "Branch $rb_short from $remote..." \
1842 -command [list pull_remote
$remote $rb] \
1844 lappend disable_on_lock \
1845 [list
$m entryconf
[$m index last
] -state]
1850 ######################################################################
1855 #define mask_width 14
1856 #define mask_height 15
1857 static unsigned char mask_bits
[] = {
1858 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1859 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1860 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1863 image create bitmap file_plain
-background white
-foreground black
-data {
1864 #define plain_width 14
1865 #define plain_height 15
1866 static unsigned char plain_bits
[] = {
1867 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1868 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1869 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1870 } -maskdata $filemask
1872 image create bitmap file_mod
-background white
-foreground blue
-data {
1873 #define mod_width 14
1874 #define mod_height 15
1875 static unsigned char mod_bits
[] = {
1876 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1877 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1878 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1879 } -maskdata $filemask
1881 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
1882 #define file_fulltick_width 14
1883 #define file_fulltick_height 15
1884 static unsigned char file_fulltick_bits
[] = {
1885 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1886 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1887 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1888 } -maskdata $filemask
1890 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1891 #define parttick_width 14
1892 #define parttick_height 15
1893 static unsigned char parttick_bits
[] = {
1894 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1895 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1896 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1897 } -maskdata $filemask
1899 image create bitmap file_question
-background white
-foreground black
-data {
1900 #define file_question_width 14
1901 #define file_question_height 15
1902 static unsigned char file_question_bits
[] = {
1903 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1904 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1905 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1906 } -maskdata $filemask
1908 image create bitmap file_removed
-background white
-foreground red
-data {
1909 #define file_removed_width 14
1910 #define file_removed_height 15
1911 static unsigned char file_removed_bits
[] = {
1912 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1913 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1914 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1915 } -maskdata $filemask
1917 image create bitmap file_merge
-background white
-foreground blue
-data {
1918 #define file_merge_width 14
1919 #define file_merge_height 15
1920 static unsigned char file_merge_bits
[] = {
1921 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1922 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1923 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1924 } -maskdata $filemask
1926 set ui_index .vpane.files.index.list
1927 set ui_workdir .vpane.files.workdir.list
1929 set all_icons
(_
$ui_index) file_plain
1930 set all_icons
(A
$ui_index) file_fulltick
1931 set all_icons
(M
$ui_index) file_fulltick
1932 set all_icons
(D
$ui_index) file_removed
1933 set all_icons
(U
$ui_index) file_merge
1935 set all_icons
(_
$ui_workdir) file_plain
1936 set all_icons
(M
$ui_workdir) file_mod
1937 set all_icons
(D
$ui_workdir) file_question
1938 set all_icons
(O
$ui_workdir) file_plain
1940 set max_status_desc
0
1944 {_M
"Modified, not staged"}
1945 {M_
"Staged for commit"}
1946 {MM
"Portions staged for commit"}
1947 {MD
"Staged for commit, missing"}
1949 {_O
"Untracked, not staged"}
1950 {A_
"Staged for commit"}
1951 {AM
"Portions staged for commit"}
1952 {AD
"Staged for commit, missing"}
1955 {D_
"Staged for removal"}
1956 {DO
"Staged for removal, still present"}
1958 {U_
"Requires merge resolution"}
1959 {UM
"Requires merge resolution"}
1960 {UD
"Requires merge resolution"}
1962 if {$max_status_desc < [string length
[lindex
$i 1]]} {
1963 set max_status_desc
[string length
[lindex
$i 1]]
1965 set all_descs
([lindex
$i 0]) [lindex
$i 1]
1969 ######################################################################
1974 global tcl_platform tk_library
1975 if {[tk windowingsystem
] eq
{aqua
}} {
1981 proc is_Windows
{} {
1983 if {$tcl_platform(platform
) eq
{windows
}} {
1989 proc bind_button3
{w cmd
} {
1990 bind $w <Any-Button-3
> $cmd
1992 bind $w <Control-Button-1
> $cmd
1996 proc incr_font_size
{font
{amt
1}} {
1997 set sz
[font configure
$font -size]
1999 font configure
$font -size $sz
2000 font configure
${font}bold
-size $sz
2003 proc hook_failed_popup
{hook msg
} {
2008 label
$w.m.l1
-text "$hook hook failed:" \
2013 -background white
-borderwidth 1 \
2015 -width 80 -height 10 \
2017 -yscrollcommand [list
$w.m.sby
set]
2019 -text {You must correct the above errors before committing.
} \
2023 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2024 pack
$w.m.l1
-side top
-fill x
2025 pack
$w.m.l2
-side bottom
-fill x
2026 pack
$w.m.sby
-side right
-fill y
2027 pack
$w.m.t
-side left
-fill both
-expand 1
2028 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2030 $w.m.t insert
1.0 $msg
2031 $w.m.t conf
-state disabled
2033 button
$w.ok
-text OK \
2036 -command "destroy $w"
2037 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2039 bind $w <Visibility
> "grab $w; focus $w"
2040 bind $w <Key-Return
> "destroy $w"
2041 wm title
$w "[appname] ([reponame]): error"
2045 set next_console_id
0
2047 proc new_console
{short_title long_title
} {
2048 global next_console_id console_data
2049 set w .console
[incr next_console_id
]
2050 set console_data
($w) [list
$short_title $long_title]
2051 return [console_init
$w]
2054 proc console_init
{w
} {
2055 global console_cr console_data M1B
2057 set console_cr
($w) 1.0
2060 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
2065 -background white
-borderwidth 1 \
2067 -width 80 -height 10 \
2070 -yscrollcommand [list
$w.m.sby
set]
2071 label
$w.m.s
-text {Working... please
wait...
} \
2075 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2076 pack
$w.m.l1
-side top
-fill x
2077 pack
$w.m.s
-side bottom
-fill x
2078 pack
$w.m.sby
-side right
-fill y
2079 pack
$w.m.t
-side left
-fill both
-expand 1
2080 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2082 menu
$w.ctxm
-tearoff 0
2083 $w.ctxm add
command -label "Copy" \
2085 -command "tk_textCopy $w.m.t"
2086 $w.ctxm add
command -label "Select All" \
2088 -command "$w.m.t tag add sel 0.0 end"
2089 $w.ctxm add
command -label "Copy All" \
2092 $w.m.t tag add sel 0.0 end
2094 $w.m.t tag remove sel 0.0 end
2097 button
$w.ok
-text {Close
} \
2100 -command "destroy $w"
2101 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2103 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
2104 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2105 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2106 bind $w <Visibility
> "focus $w"
2107 wm title
$w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2111 proc console_exec
{w cmd
{after
{}}} {
2112 # -- Windows tosses the enviroment when we exec our child.
2113 # But most users need that so we have to relogin. :-(
2116 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
2119 # -- Tcl won't let us redirect both stdout and stderr to
2120 # the same pipe. So pass it through cat...
2122 set cmd
[concat |
$cmd |
& cat]
2124 set fd_f
[open
$cmd r
]
2125 fconfigure
$fd_f -blocking 0 -translation binary
2126 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
2129 proc console_read
{w fd after
} {
2130 global console_cr console_data
2134 if {![winfo exists
$w]} {console_init
$w}
2135 $w.m.t conf
-state normal
2137 set n
[string length
$buf]
2139 set cr
[string first
"\r" $buf $c]
2140 set lf
[string first
"\n" $buf $c]
2141 if {$cr < 0} {set cr
[expr {$n + 1}]}
2142 if {$lf < 0} {set lf
[expr {$n + 1}]}
2145 $w.m.t insert end
[string range
$buf $c $lf]
2146 set console_cr
($w) [$w.m.t index
{end
-1c}]
2150 $w.m.t delete
$console_cr($w) end
2151 $w.m.t insert end
"\n"
2152 $w.m.t insert end
[string range
$buf $c $cr]
2157 $w.m.t conf
-state disabled
2161 fconfigure
$fd -blocking 1
2163 if {[catch
{close
$fd}]} {
2164 if {![winfo exists
$w]} {console_init
$w}
2165 $w.m.s conf
-background red
-text {Error
: Command Failed
}
2166 $w.ok conf
-state normal
2168 } elseif
{[winfo exists
$w]} {
2169 $w.m.s conf
-background green
-text {Success
}
2170 $w.ok conf
-state normal
2173 array
unset console_cr
$w
2174 array
unset console_data
$w
2176 uplevel
#0 $after $ok
2180 fconfigure
$fd -blocking 0
2183 ######################################################################
2187 set starting_gitk_msg
{Starting gitk... please
wait...
}
2189 proc do_gitk
{revs
} {
2190 global ui_status_value starting_gitk_msg
2198 set cmd
"sh -c \"exec $cmd\""
2202 if {[catch
{eval exec $cmd} err
]} {
2203 error_popup
"Failed to start gitk:\n\n$err"
2205 set ui_status_value
$starting_gitk_msg
2207 if {$ui_status_value eq
$starting_gitk_msg} {
2208 set ui_status_value
{Ready.
}
2215 set w
[new_console
{gc
} {Compressing the object database
}]
2216 console_exec
$w {git gc
}
2219 proc do_fsck_objects
{} {
2220 set w
[new_console
{fsck-objects
} \
2221 {Verifying the object database with fsck-objects
}]
2222 set cmd
[list git fsck-objects
]
2225 lappend cmd
--strict
2226 console_exec
$w $cmd
2232 global ui_comm is_quitting repo_config commit_type
2234 if {$is_quitting} return
2237 # -- Stash our current commit buffer.
2239 set save
[gitdir GITGUI_MSG
]
2240 set msg
[string trim
[$ui_comm get
0.0 end
]]
2241 if {![string match amend
* $commit_type]
2242 && [$ui_comm edit modified
]
2245 set fd
[open
$save w
]
2246 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
2250 catch
{file delete
$save}
2253 # -- Stash our current window geometry into this repository.
2255 set cfg_geometry
[list
]
2256 lappend cfg_geometry
[wm geometry .
]
2257 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
2258 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
2259 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2262 if {$cfg_geometry ne
$rc_geometry} {
2263 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2270 rescan
{set ui_status_value
{Ready.
}}
2273 proc unstage_helper
{txt paths
} {
2274 global file_states current_diff
2276 if {![lock_index begin-update
]} return
2280 foreach path
$paths {
2281 switch
-glob -- [lindex
$file_states($path) 0] {
2285 lappend pathList
$path
2286 if {$path eq
$current_diff} {
2287 set after
{reshow_diff
;}
2292 if {$pathList eq
{}} {
2298 [concat
$after {set ui_status_value
{Ready.
}}]
2302 proc do_unstage_selection
{} {
2303 global current_diff selected_paths
2305 if {[array size selected_paths
] > 0} {
2307 {Unstaging selected files from commit
} \
2308 [array names selected_paths
]
2309 } elseif
{$current_diff ne
{}} {
2311 "Unstaging [short_path $current_diff] from commit" \
2312 [list
$current_diff]
2316 proc add_helper
{txt paths
} {
2317 global file_states current_diff
2319 if {![lock_index begin-update
]} return
2323 foreach path
$paths {
2324 switch
-glob -- [lindex
$file_states($path) 0] {
2329 lappend pathList
$path
2330 if {$path eq
$current_diff} {
2331 set after
{reshow_diff
;}
2336 if {$pathList eq
{}} {
2342 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2346 proc do_add_selection
{} {
2347 global current_diff selected_paths
2349 if {[array size selected_paths
] > 0} {
2351 {Adding selected files
} \
2352 [array names selected_paths
]
2353 } elseif
{$current_diff ne
{}} {
2355 "Adding [short_path $current_diff]" \
2356 [list
$current_diff]
2360 proc do_add_all
{} {
2364 foreach path
[array names file_states
] {
2365 switch
-glob -- [lindex
$file_states($path) 0] {
2368 ?D
{lappend paths
$path}
2371 add_helper
{Adding all changed files
} $paths
2374 proc revert_helper
{txt paths
} {
2375 global file_states current_diff
2377 if {![lock_index begin-update
]} return
2381 foreach path
$paths {
2382 switch
-glob -- [lindex
$file_states($path) 0] {
2386 lappend pathList
$path
2387 if {$path eq
$current_diff} {
2388 set after
{reshow_diff
;}
2394 set n
[llength
$pathList]
2398 } elseif
{$n == 1} {
2399 set s
"[short_path [lindex $pathList]]"
2401 set s
"these $n files"
2404 set reply
[tk_dialog \
2406 "[appname] ([reponame])" \
2407 "Revert changes in $s?
2409 Any unadded changes will be permanently lost by the revert." \
2419 [concat
$after {set ui_status_value
{Ready.
}}]
2425 proc do_revert_selection
{} {
2426 global current_diff selected_paths
2428 if {[array size selected_paths
] > 0} {
2430 {Reverting selected files
} \
2431 [array names selected_paths
]
2432 } elseif
{$current_diff ne
{}} {
2434 "Reverting [short_path $current_diff]" \
2435 [list
$current_diff]
2439 proc do_signoff
{} {
2442 set me
[committer_ident
]
2443 if {$me eq
{}} return
2445 set sob
"Signed-off-by: $me"
2446 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2447 if {$last ne
$sob} {
2448 $ui_comm edit separator
2450 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2451 $ui_comm insert end
"\n"
2453 $ui_comm insert end
"\n$sob"
2454 $ui_comm edit separator
2459 proc do_select_commit_type
{} {
2460 global commit_type selected_commit_type
2462 if {$selected_commit_type eq
{new
}
2463 && [string match amend
* $commit_type]} {
2465 } elseif
{$selected_commit_type eq
{amend
}
2466 && ![string match amend
* $commit_type]} {
2469 # The amend request was rejected...
2471 if {![string match amend
* $commit_type]} {
2472 set selected_commit_type new
2482 global appvers copyright
2483 global tcl_patchLevel tk_patchLevel
2487 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2489 label
$w.header
-text "About [appname]" \
2491 pack
$w.header
-side top
-fill x
2494 button
$w.buttons.close
-text {Close
} \
2496 -command [list destroy
$w]
2497 pack
$w.buttons.close
-side right
2498 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2501 -text "[appname] - a commit creation tool for Git.
2509 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
2512 append v
"[appname] version $appvers\n"
2513 append v
"[exec git version]\n"
2515 if {$tcl_patchLevel eq
$tk_patchLevel} {
2516 append v
"Tcl/Tk version $tcl_patchLevel"
2518 append v
"Tcl version $tcl_patchLevel"
2519 append v
", Tk version $tk_patchLevel"
2530 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
2532 menu
$w.ctxm
-tearoff 0
2533 $w.ctxm add
command \
2538 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2541 bind $w <Visibility
> "grab $w; focus $w"
2542 bind $w <Key-Escape
> "destroy $w"
2543 bind_button3
$w.vers
"tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2544 wm title
$w "About [appname]"
2548 proc do_options
{} {
2549 global repo_config global_config font_descs
2550 global repo_config_new global_config_new
2552 array
unset repo_config_new
2553 array
unset global_config_new
2554 foreach name
[array names repo_config
] {
2555 set repo_config_new
($name) $repo_config($name)
2558 foreach name
[array names repo_config
] {
2560 gui.diffcontext
{continue}
2562 set repo_config_new
($name) $repo_config($name)
2564 foreach name
[array names global_config
] {
2565 set global_config_new
($name) $global_config($name)
2568 set w .options_editor
2570 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2572 label
$w.header
-text "[appname] Options" \
2574 pack
$w.header
-side top
-fill x
2577 button
$w.buttons.restore
-text {Restore Defaults
} \
2579 -command do_restore_defaults
2580 pack
$w.buttons.restore
-side left
2581 button
$w.buttons.save
-text Save \
2583 -command [list do_save_config
$w]
2584 pack
$w.buttons.save
-side right
2585 button
$w.buttons.cancel
-text {Cancel
} \
2587 -command [list destroy
$w]
2588 pack
$w.buttons.cancel
-side right
2589 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2591 labelframe
$w.repo
-text "[reponame] Repository" \
2593 -relief raised
-borderwidth 2
2594 labelframe
$w.global
-text {Global
(All Repositories
)} \
2596 -relief raised
-borderwidth 2
2597 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
2598 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
2601 {b partialinclude
{Allow Partially Added Files
}}
2602 {b pullsummary
{Show Pull Summary
}}
2603 {b trustmtime
{Trust File Modification Timestamps
}}
2604 {i diffcontext
{Number of Diff Context Lines
}}
2606 set type [lindex
$option 0]
2607 set name
[lindex
$option 1]
2608 set text
[lindex
$option 2]
2609 foreach f
{repo global
} {
2612 checkbutton
$w.
$f.
$name -text $text \
2613 -variable ${f}_config_new
(gui.
$name) \
2617 pack
$w.
$f.
$name -side top
-anchor w
2621 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
2622 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
2623 spinbox
$w.
$f.
$name.v \
2624 -textvariable ${f}_config_new
(gui.
$name) \
2625 -from 1 -to 99 -increment 1 \
2628 pack
$w.
$f.
$name.v
-side right
-anchor e
2629 pack
$w.
$f.
$name -side top
-anchor w
-fill x
2635 set all_fonts
[lsort
[font families
]]
2636 foreach option
$font_descs {
2637 set name
[lindex
$option 0]
2638 set font
[lindex
$option 1]
2639 set text
[lindex
$option 2]
2641 set global_config_new
(gui.
$font^^family
) \
2642 [font configure
$font -family]
2643 set global_config_new
(gui.
$font^^size
) \
2644 [font configure
$font -size]
2646 frame
$w.global.
$name
2647 label
$w.global.
$name.l
-text "$text:" -font font_ui
2648 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
2649 eval tk_optionMenu
$w.global.
$name.family \
2650 global_config_new
(gui.
$font^^family
) \
2652 spinbox
$w.global.
$name.size \
2653 -textvariable global_config_new
(gui.
$font^^size
) \
2654 -from 2 -to 80 -increment 1 \
2657 pack
$w.global.
$name.size
-side right
-anchor e
2658 pack
$w.global.
$name.family
-side right
-anchor e
2659 pack
$w.global.
$name -side top
-anchor w
-fill x
2662 bind $w <Visibility
> "grab $w; focus $w"
2663 bind $w <Key-Escape
> "destroy $w"
2664 wm title
$w "[appname] ([reponame]): Options"
2668 proc do_restore_defaults
{} {
2669 global font_descs default_config repo_config
2670 global repo_config_new global_config_new
2672 foreach name
[array names default_config
] {
2673 set repo_config_new
($name) $default_config($name)
2674 set global_config_new
($name) $default_config($name)
2677 foreach option
$font_descs {
2678 set name
[lindex
$option 0]
2679 set repo_config
(gui.
$name) $default_config(gui.
$name)
2683 foreach option
$font_descs {
2684 set name
[lindex
$option 0]
2685 set font
[lindex
$option 1]
2686 set global_config_new
(gui.
$font^^family
) \
2687 [font configure
$font -family]
2688 set global_config_new
(gui.
$font^^size
) \
2689 [font configure
$font -size]
2693 proc do_save_config
{w
} {
2694 if {[catch
{save_config
} err
]} {
2695 error_popup
"Failed to completely save options:\n\n$err"
2701 proc do_windows_shortcut
{} {
2705 set desktop
[exec cygpath \
2713 set fn
[tk_getSaveFile \
2715 -title "[appname] ([reponame]): Create Desktop Icon" \
2716 -initialdir $desktop \
2717 -initialfile "Git [reponame].bat"]
2721 set sh
[exec cygpath \
2725 set me
[exec cygpath \
2729 set gd
[exec cygpath \
2733 set gw
[exec cygpath \
2736 [file dirname [gitdir
]]]
2737 regsub
-all ' $me "'\\''" me
2738 regsub -all ' $gd "'\\''" gd
2739 puts $fd "@ECHO Entering $gw"
2740 puts $fd "@ECHO Starting git-gui... please wait..."
2741 puts -nonewline $fd "@\"$sh\" --login -c \""
2742 puts -nonewline $fd "GIT_DIR='$gd'"
2743 puts -nonewline $fd " '$me'"
2747 error_popup "Cannot write script:\n\n$err"
2752 proc do_macosx_app {} {
2755 set fn [tk_getSaveFile \
2757 -title "[appname] ([reponame]): Create Desktop Icon" \
2758 -initialdir [file join $env(HOME) Desktop] \
2759 -initialfile "Git [reponame].app"]
2762 set Contents [file join $fn Contents]
2763 set MacOS [file join $Contents MacOS]
2764 set exe [file join $MacOS git-gui]
2768 set fd [open [file join $Contents Info.plist] w]
2769 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2770 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2771 <plist version="1.0">
2773 <key>CFBundleDevelopmentRegion</key>
2774 <string>English</string>
2775 <key>CFBundleExecutable</key>
2776 <string>git-gui</string>
2777 <key>CFBundleIdentifier</key>
2778 <string>org.spearce.git-gui</string>
2779 <key>CFBundleInfoDictionaryVersion</key>
2780 <string>6.0</string>
2781 <key>CFBundlePackageType</key>
2782 <string>APPL</string>
2783 <key>CFBundleSignature</key>
2784 <string>????</string>
2785 <key>CFBundleVersion</key>
2786 <string>1.0</string>
2787 <key>NSPrincipalClass</key>
2788 <string>NSApplication</string>
2793 set fd [open $exe w]
2794 set gd [file normalize [gitdir]]
2795 set ep [file normalize [exec git --exec-path]]
2796 regsub -all ' $gd "'\\''" gd
2797 regsub
-all ' $ep "'\\''" ep
2798 puts $fd "#!/bin/sh"
2799 foreach name
[array names env
] {
2800 if {[string match GIT_
* $name]} {
2801 regsub
-all ' $env($name) "'\\''" v
2802 puts $fd "export $name='$v'"
2805 puts $fd "export PATH
='$ep':\
$PATH"
2806 puts $fd "export GIT_DIR
='$gd'"
2807 puts $fd "exec [file normalize
$argv0]"
2810 file attributes $exe -permissions u+x,g+x,o+x
2812 error_popup "Cannot
write icon
:\n\n$err"
2817 proc toggle_or_diff {w x y} {
2818 global file_states file_lists current_diff ui_index ui_workdir
2819 global last_clicked selected_paths
2821 set pos [split [$w index @$x,$y] .]
2822 set lno [lindex $pos 0]
2823 set col [lindex $pos 1]
2824 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2830 set last_clicked [list $w $lno]
2831 array unset selected_paths
2832 $ui_index tag remove in_sel 0.0 end
2833 $ui_workdir tag remove in_sel 0.0 end
2836 if {$current_diff eq $path} {
2837 set after {reshow_diff;}
2841 if {$w eq $ui_index} {
2843 "Unstaging
[short_path
$path] from commit
" \
2845 [concat $after {set ui_status_value {Ready.}}]
2846 } elseif {$w eq $ui_workdir} {
2848 "Adding
[short_path
$path]" \
2850 [concat $after {set ui_status_value {Ready.}}]
2853 show_diff $path $w $lno
2857 proc add_one_to_selection {w x y} {
2859 global last_clicked selected_paths
2861 set pos [split [$w index @$x,$y] .]
2862 set lno [lindex $pos 0]
2863 set col [lindex $pos 1]
2864 set path [lindex $file_lists($w) [expr {$lno - 1}]]
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} {
2885 global last_clicked selected_paths
2887 if {[lindex $last_clicked 0] ne $w} {
2888 toggle_or_diff $w $x $y
2892 set pos [split [$w index @$x,$y] .]
2893 set lno [lindex $pos 0]
2894 set lc [lindex $last_clicked 1]
2903 foreach path [lrange $file_lists($w) \
2904 [expr {$begin - 1}] \
2905 [expr {$end - 1}]] {
2906 set selected_paths($path) 1
2908 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2911 ######################################################################
2915 set cursor_ptr arrow
2916 font create font_diff -family Courier -size 10
2920 eval font configure font_ui [font actual [.dummy cget -font]]
2924 font create font_uibold
2925 font create font_diffbold
2930 } elseif {[is_MacOSX]} {
2938 proc apply_config {} {
2939 global repo_config font_descs
2941 foreach option $font_descs {
2942 set name [lindex $option 0]
2943 set font [lindex $option 1]
2945 foreach {cn cv} $repo_config(gui.$name) {
2946 font configure $font $cn $cv
2949 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
2951 foreach {cn cv} [font configure $font] {
2952 font configure ${font}bold $cn $cv
2954 font configure ${font}bold -weight bold
2958 set default_config(gui.trustmtime) false
2959 set default_config(gui.pullsummary) true
2960 set default_config(gui.partialinclude) false
2961 set default_config(gui.diffcontext) 5
2962 set default_config(gui.fontui) [font configure font_ui]
2963 set default_config(gui.fontdiff) [font configure font_diff]
2965 {fontui font_ui {Main Font}}
2966 {fontdiff font_diff {Diff/Console Font}}
2971 ######################################################################
2977 menu .mbar -tearoff 0
2978 .mbar add cascade -label Repository -menu .mbar.repository
2979 .mbar add cascade -label Edit -menu .mbar.edit
2980 if {!$single_commit} {
2981 .mbar add cascade -label Branch -menu .mbar.branch
2983 .mbar add cascade -label Commit -menu .mbar.commit
2984 if {!$single_commit} {
2985 .mbar add cascade -label Fetch -menu .mbar.fetch
2986 .mbar add cascade -label Pull -menu .mbar.pull
2987 .mbar add cascade -label Push -menu .mbar.push
2989 . configure -menu .mbar
2991 # -- Repository Menu
2993 menu .mbar.repository
2994 .mbar.repository add command \
2995 -label {Visualize Current Branch} \
2996 -command {do_gitk {}} \
2999 .mbar.repository add command \
3000 -label {Visualize All Branches} \
3001 -command {do_gitk {--all}} \
3004 .mbar.repository add separator
3006 if {!$single_commit} {
3007 .mbar.repository add command -label {Compress Database} \
3011 .mbar.repository add command -label {Verify Database} \
3012 -command do_fsck_objects \
3015 .mbar.repository add separator
3018 .mbar.repository add command \
3019 -label {Create Desktop Icon} \
3020 -command do_windows_shortcut \
3022 } elseif {[is_MacOSX]} {
3023 .mbar.repository add command \
3024 -label {Create Desktop Icon} \
3025 -command do_macosx_app \
3030 .mbar.repository add command -label Quit \
3032 -accelerator $M1T-Q \
3038 .mbar.edit add command -label Undo \
3039 -command {catch {[focus] edit undo}} \
3040 -accelerator $M1T-Z \
3042 .mbar.edit add command -label Redo \
3043 -command {catch {[focus] edit redo}} \
3044 -accelerator $M1T-Y \
3046 .mbar.edit add separator
3047 .mbar.edit add command -label Cut \
3048 -command {catch {tk_textCut [focus]}} \
3049 -accelerator $M1T-X \
3051 .mbar.edit add command -label Copy \
3052 -command {catch {tk_textCopy [focus]}} \
3053 -accelerator $M1T-C \
3055 .mbar.edit add command -label Paste \
3056 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3057 -accelerator $M1T-V \
3059 .mbar.edit add command -label Delete \
3060 -command {catch {[focus] delete sel.first sel.last}} \
3063 .mbar.edit add separator
3064 .mbar.edit add command -label {Select All} \
3065 -command {catch {[focus] tag add sel 0.0 end}} \
3066 -accelerator $M1T-A \
3071 if {!$single_commit} {
3074 .mbar.branch add command -label {Create...} \
3075 -command do_create_branch \
3077 lappend disable_on_lock [list .mbar.branch entryconf \
3078 [.mbar.branch index last] -state]
3080 .mbar.branch add command -label {Delete...} \
3081 -command do_delete_branch \
3083 lappend disable_on_lock [list .mbar.branch entryconf \
3084 [.mbar.branch index last] -state]
3091 .mbar.commit add radiobutton \
3092 -label {New Commit} \
3093 -command do_select_commit_type \
3094 -variable selected_commit_type \
3097 lappend disable_on_lock \
3098 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3100 .mbar.commit add radiobutton \
3101 -label {Amend Last Commit} \
3102 -command do_select_commit_type \
3103 -variable selected_commit_type \
3106 lappend disable_on_lock \
3107 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3109 .mbar.commit add separator
3111 .mbar.commit add command -label Rescan \
3112 -command do_rescan \
3115 lappend disable_on_lock \
3116 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3118 .mbar.commit add command -label {Add To Commit} \
3119 -command do_add_selection \
3121 lappend disable_on_lock \
3122 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3124 .mbar.commit add command -label {Add All To Commit} \
3125 -command do_add_all \
3126 -accelerator $M1T-I \
3128 lappend disable_on_lock \
3129 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3131 .mbar.commit add command -label {Unstage From Commit} \
3132 -command do_unstage_selection \
3134 lappend disable_on_lock \
3135 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3137 .mbar.commit add command -label {Revert Changes} \
3138 -command do_revert_selection \
3140 lappend disable_on_lock \
3141 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3143 .mbar.commit add separator
3145 .mbar.commit add command -label {Sign Off} \
3146 -command do_signoff \
3147 -accelerator $M1T-S \
3150 .mbar.commit add command -label Commit \
3151 -command do_commit \
3152 -accelerator $M1T-Return \
3154 lappend disable_on_lock \
3155 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3157 # -- Transport menus
3159 if {!$single_commit} {
3166 # -- Apple Menu (Mac OS X only)
3168 .mbar add cascade -label Apple -menu .mbar.apple
3171 .mbar.apple add command -label "About
[appname
]" \
3174 .mbar.apple add command -label "[appname
] Options...
" \
3175 -command do_options \
3180 .mbar.edit add separator
3181 .mbar.edit add command -label {Options...} \
3182 -command do_options \
3187 if {[file exists /usr/local/miga/lib/gui-miga]
3188 && [file exists .pvcsrc]} {
3190 global ui_status_value
3191 if {![lock_index update]} return
3192 set cmd [list sh --login -c "/usr
/local
/miga
/lib
/gui-miga
\"[pwd]\""]
3193 set miga_fd [open "|
$cmd" r]
3194 fconfigure $miga_fd -blocking 0
3195 fileevent $miga_fd readable [list miga_done $miga_fd]
3196 set ui_status_value {Running miga...}
3198 proc miga_done {fd} {
3203 rescan [list set ui_status_value {Ready.}]
3206 .mbar add cascade -label Tools -menu .mbar.tools
3208 .mbar.tools add command -label "Migrate
" \
3211 lappend disable_on_lock \
3212 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3217 .mbar add cascade -label Help -menu .mbar.help
3220 .mbar.help add command -label "About
[appname
]" \
3232 -text {Current Branch:} \
3237 -textvariable current_branch \
3241 pack .branch.l1 -side left
3242 pack .branch.cb -side left -fill x
3243 pack .branch -side top -fill x
3245 # -- Main Window Layout
3247 panedwindow .vpane -orient vertical
3248 panedwindow .vpane.files -orient horizontal
3249 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3250 pack .vpane -anchor n -side top -fill both -expand 1
3252 # -- Index File List
3254 frame .vpane.files.index -height 100 -width 400
3255 label .vpane.files.index.title -text {Changes To Be Committed} \
3258 text $ui_index -background white -borderwidth 0 \
3259 -width 40 -height 10 \
3261 -cursor $cursor_ptr \
3262 -yscrollcommand {.vpane.files.index.sb set} \
3264 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3265 pack .vpane.files.index.title -side top -fill x
3266 pack .vpane.files.index.sb -side right -fill y
3267 pack $ui_index -side left -fill both -expand 1
3268 .vpane.files add .vpane.files.index -sticky nsew
3270 # -- Working Directory File List
3272 frame .vpane.files.workdir -height 100 -width 100
3273 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3276 text $ui_workdir -background white -borderwidth 0 \
3277 -width 40 -height 10 \
3279 -cursor $cursor_ptr \
3280 -yscrollcommand {.vpane.files.workdir.sb set} \
3282 scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
3283 pack .vpane.files.workdir.title -side top -fill x
3284 pack .vpane.files.workdir.sb -side right -fill y
3285 pack $ui_workdir -side left -fill both -expand 1
3286 .vpane.files add .vpane.files.workdir -sticky nsew
3288 foreach i [list $ui_index $ui_workdir] {
3289 $i tag conf in_diff -font font_uibold
3290 $i tag conf in_sel \
3291 -background [$i cget -foreground] \
3292 -foreground [$i cget -background]
3296 # -- Diff and Commit Area
3298 frame .vpane.lower -height 300 -width 400
3299 frame .vpane.lower.commarea
3300 frame .vpane.lower.diff -relief sunken -borderwidth 1
3301 pack .vpane.lower.commarea -side top -fill x
3302 pack .vpane.lower.diff -side bottom -fill both -expand 1
3303 .vpane add .vpane.lower -stick nsew
3305 # -- Commit Area Buttons
3307 frame .vpane.lower.commarea.buttons
3308 label .vpane.lower.commarea.buttons.l -text {} \
3312 pack .vpane.lower.commarea.buttons.l -side top -fill x
3313 pack .vpane.lower.commarea.buttons -side left -fill y
3315 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3316 -command do_rescan \
3318 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3319 lappend disable_on_lock \
3320 {.vpane.lower.commarea.buttons.rescan conf -state}
3322 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3323 -command do_add_all \
3325 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3326 lappend disable_on_lock \
3327 {.vpane.lower.commarea.buttons.incall conf -state}
3329 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3330 -command do_signoff \
3332 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3334 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3335 -command do_commit \
3337 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3338 lappend disable_on_lock \
3339 {.vpane.lower.commarea.buttons.commit conf -state}
3341 # -- Commit Message Buffer
3343 frame .vpane.lower.commarea.buffer
3344 frame .vpane.lower.commarea.buffer.header
3345 set ui_comm .vpane.lower.commarea.buffer.t
3346 set ui_coml .vpane.lower.commarea.buffer.header.l
3347 radiobutton .vpane.lower.commarea.buffer.header.new \
3348 -text {New Commit} \
3349 -command do_select_commit_type \
3350 -variable selected_commit_type \
3353 lappend disable_on_lock \
3354 [list .vpane.lower.commarea.buffer.header.new conf -state]
3355 radiobutton .vpane.lower.commarea.buffer.header.amend \
3356 -text {Amend Last Commit} \
3357 -command do_select_commit_type \
3358 -variable selected_commit_type \
3361 lappend disable_on_lock \
3362 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3367 proc trace_commit_type {varname args} {
3368 global ui_coml commit_type
3369 switch -glob -- $commit_type {
3370 initial {set txt {Initial Commit Message:}}
3371 amend {set txt {Amended Commit Message:}}
3372 amend-initial {set txt {Amended Initial Commit Message:}}
3373 amend-merge {set txt {Amended Merge Commit Message:}}
3374 merge {set txt {Merge Commit Message:}}
3375 * {set txt {Commit Message:}}
3377 $ui_coml conf -text $txt
3379 trace add variable commit_type write trace_commit_type
3380 pack $ui_coml -side left -fill x
3381 pack .vpane.lower.commarea.buffer.header.amend -side right
3382 pack .vpane.lower.commarea.buffer.header.new -side right
3384 text $ui_comm -background white -borderwidth 1 \
3387 -autoseparators true \
3389 -width 75 -height 9 -wrap none \
3391 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3392 scrollbar .vpane.lower.commarea.buffer.sby \
3393 -command [list $ui_comm yview]
3394 pack .vpane.lower.commarea.buffer.header -side top -fill x
3395 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3396 pack $ui_comm -side left -fill y
3397 pack .vpane.lower.commarea.buffer -side left -fill y
3399 # -- Commit Message Buffer Context Menu
3401 set ctxm .vpane.lower.commarea.buffer.ctxm
3402 menu $ctxm -tearoff 0
3406 -command {tk_textCut $ui_comm}
3410 -command {tk_textCopy $ui_comm}
3414 -command {tk_textPaste $ui_comm}
3418 -command {$ui_comm delete sel.first sel.last}
3421 -label {Select All} \
3423 -command {$ui_comm tag add sel 0.0 end}
3428 $ui_comm tag add sel 0.0 end
3429 tk_textCopy $ui_comm
3430 $ui_comm tag remove sel 0.0 end
3437 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
3442 set diff_actions [list]
3443 proc trace_current_diff {varname args} {
3444 global current_diff diff_actions file_states
3445 if {$current_diff eq {}} {
3452 set s [mapdesc [lindex $file_states($p) 0] $p]
3454 set p [escape_path $p]
3458 .vpane.lower.diff.header.status configure -text $s
3459 .vpane.lower.diff.header.file configure -text $f
3460 .vpane.lower.diff.header.path configure -text $p
3461 foreach w $diff_actions {
3465 trace add variable current_diff write trace_current_diff
3467 frame .vpane.lower.diff.header -background orange
3468 label .vpane.lower.diff.header.status \
3469 -background orange \
3470 -width $max_status_desc \
3474 label .vpane.lower.diff.header.file \
3475 -background orange \
3479 label .vpane.lower.diff.header.path \
3480 -background orange \
3484 pack .vpane.lower.diff.header.status -side left
3485 pack .vpane.lower.diff.header.file -side left
3486 pack .vpane.lower.diff.header.path -fill x
3487 set ctxm .vpane.lower.diff.header.ctxm
3488 menu $ctxm -tearoff 0
3499 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3500 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
3504 frame .vpane.lower.diff.body
3505 set ui_diff .vpane.lower.diff.body.t
3506 text $ui_diff -background white -borderwidth 0 \
3507 -width 80 -height 15 -wrap none \
3509 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3510 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3512 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3513 -command [list $ui_diff xview]
3514 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3515 -command [list $ui_diff yview]
3516 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3517 pack .vpane.lower.diff.body.sby -side right -fill y
3518 pack $ui_diff -side left -fill both -expand 1
3519 pack .vpane.lower.diff.header -side top -fill x
3520 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3522 $ui_diff tag conf d_@ -font font_diffbold
3523 $ui_diff tag conf d_+ -foreground blue
3524 $ui_diff tag conf d_- -foreground red
3525 $ui_diff tag conf d_++ -foreground {#00a000}
3526 $ui_diff tag conf d_-- -foreground {#a000a0}
3527 $ui_diff tag conf d_+- \
3529 -background {light goldenrod yellow}
3530 $ui_diff tag conf d_-+ \
3534 # -- Diff Body Context Menu
3536 set ctxm .vpane.lower.diff.body.ctxm
3537 menu $ctxm -tearoff 0
3541 -command {tk_textCopy $ui_diff}
3542 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3544 -label {Select All} \
3546 -command {$ui_diff tag add sel 0.0 end}
3547 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3552 $ui_diff tag add sel 0.0 end
3553 tk_textCopy $ui_diff
3554 $ui_diff tag remove sel 0.0 end
3556 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3559 -label {Decrease Font Size} \
3561 -command {incr_font_size font_diff -1}
3562 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3564 -label {Increase Font Size} \
3566 -command {incr_font_size font_diff 1}
3567 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3570 -label {Show Less Context} \
3572 -command {if {$repo_config(gui.diffcontext) >= 2} {
3573 incr repo_config(gui.diffcontext) -1
3576 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3578 -label {Show More Context} \
3581 incr repo_config(gui.diffcontext)
3584 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3586 $ctxm add command -label {Options...} \
3589 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
3593 set ui_status_value {Initializing...}
3594 label .status -textvariable ui_status_value \
3600 pack .status -anchor w -side bottom -fill x
3605 set gm $repo_config(gui.geometry)
3606 wm geometry . [lindex $gm 0]
3607 .vpane sash place 0 \
3608 [lindex [.vpane sash coord 0] 0] \
3610 .vpane.files sash place 0 \
3612 [lindex [.vpane.files sash coord 0] 1]
3618 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3619 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3620 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3621 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3622 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3623 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3624 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3625 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3626 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3627 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3628 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3630 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3631 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3632 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3633 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3634 bind $ui_diff <$M1B-Key-v> {break}
3635 bind $ui_diff <$M1B-Key-V> {break}
3636 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3637 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3638 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3639 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3640 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3641 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3643 bind . <Destroy> do_quit
3644 bind all <Key-F5> do_rescan
3645 bind all <$M1B-Key-r> do_rescan
3646 bind all <$M1B-Key-R> do_rescan
3647 bind . <$M1B-Key-s> do_signoff
3648 bind . <$M1B-Key-S> do_signoff
3649 bind . <$M1B-Key-i> do_add_all
3650 bind . <$M1B-Key-I> do_add_all
3651 bind . <$M1B-Key-Return> do_commit
3652 bind all <$M1B-Key-q> do_quit
3653 bind all <$M1B-Key-Q> do_quit
3654 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3655 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3656 foreach i [list $ui_index $ui_workdir] {
3657 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
3658 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
3659 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
3663 set file_lists($ui_index) [list]
3664 set file_lists($ui_workdir) [list]
3668 set MERGE_HEAD [list]
3671 set current_branch {}
3673 set selected_commit_type new
3675 wm title . "[appname
] ([file normalize
[file dirname [gitdir
]]])"
3676 focus -force $ui_comm
3678 # -- Warn the user about environmental problems. Cygwin's Tcl
3679 # does *not* pass its env array onto any processes it spawns.
3680 # This means that git processes get none of our environment.
3685 set msg "Possible environment issues exist.
3687 The following environment variables are probably
3688 going to be ignored by any Git subprocess run
3692 foreach name [array names env] {
3693 switch -regexp -- $name {
3694 {^GIT_INDEX_FILE$} -
3695 {^GIT_OBJECT_DIRECTORY$} -
3696 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3698 {^GIT_EXTERNAL_DIFF$} -
3702 {^GIT_CONFIG_LOCAL$} -
3703 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3704 append msg " - $name\n"
3707 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3708 append msg " - $name\n"
3710 set suggest_user $name
3714 if {$ignored_env > 0} {
3716 This is due to a known issue with the
3717 Tcl binary distributed by Cygwin.
"
3719 if {$suggest_user ne {}} {
3722 A good replacement
for $suggest_user
3723 is placing values
for the user.name and
3724 user.email settings into your personal
3730 unset ignored_env msg suggest_user name
3733 # -- Only initialize complex UI if we are going to stay running.
3735 if {!$single_commit} {
3739 populate_branch_menu .mbar.branch
3740 populate_fetch_menu .mbar.fetch
3741 populate_pull_menu .mbar.pull
3742 populate_push_menu .mbar.push
3745 # -- Only suggest a gc run if we are going to stay running.
3747 if {!$single_commit} {
3748 set object_limit 2000
3749 if {[is_Windows]} {set object_limit 200}
3750 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
3751 if {$objects_current >= $object_limit} {
3753 "This repository currently has
$objects_current loose objects.
3755 To maintain optimal performance it is strongly
3756 recommended that you
compress the database
3757 when
more than
$object_limit loose objects exist.
3759 Compress the database now?
"] eq yes} {
3763 unset object_limit _junk objects_current
3766 lock_index begin-read