2 # Tcl ignores the next line -*- tcl -*- \
6 Copyright ©
2006 Shawn Pearce
, Paul Mackerras.
10 This program is free software
; it may be used
, copied
, modified
11 and distributed under the terms of the GNU General Public Licence
,
12 either version
2, or
(at your option
) any later version.
}
14 set appname
[lindex
[file split $argv0] end
]
17 ######################################################################
21 proc is_many_config
{name
} {
22 switch
-glob -- $name {
31 proc load_config
{include_global
} {
32 global repo_config global_config default_config
34 array
unset global_config
35 if {$include_global} {
37 set fd_rc
[open
"| git repo-config --global --list" r
]
38 while {[gets
$fd_rc line
] >= 0} {
39 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
40 if {[is_many_config
$name]} {
41 lappend global_config
($name) $value
43 set global_config
($name) $value
51 array
unset repo_config
53 set fd_rc
[open
"| git repo-config --list" r
]
54 while {[gets
$fd_rc line
] >= 0} {
55 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
56 if {[is_many_config
$name]} {
57 lappend repo_config
($name) $value
59 set repo_config
($name) $value
66 foreach name
[array names default_config
] {
67 if {[catch
{set v
$global_config($name)}]} {
68 set global_config
($name) $default_config($name)
70 if {[catch
{set v
$repo_config($name)}]} {
71 set repo_config
($name) $default_config($name)
77 global default_config font_descs
78 global repo_config global_config
79 global repo_config_new global_config_new
81 foreach option
$font_descs {
82 set name
[lindex
$option 0]
83 set font
[lindex
$option 1]
84 font configure
$font \
85 -family $global_config_new(gui.
$font^^family
) \
86 -size $global_config_new(gui.
$font^^size
)
87 font configure
${font}bold \
88 -family $global_config_new(gui.
$font^^family
) \
89 -size $global_config_new(gui.
$font^^size
)
90 set global_config_new
(gui.
$name) [font configure
$font]
91 unset global_config_new
(gui.
$font^^family
)
92 unset global_config_new
(gui.
$font^^size
)
95 foreach name
[array names default_config
] {
96 set value
$global_config_new($name)
97 if {$value ne
$global_config($name)} {
98 if {$value eq
$default_config($name)} {
99 catch
{exec git repo-config
--global --unset $name}
101 regsub
-all "\[{}\]" $value {"} value
102 exec git repo-config --global $name $value
104 set global_config($name) $value
105 if {$value eq $repo_config($name)} {
106 catch {exec git repo-config --unset $name}
107 set repo_config($name) $value
112 foreach name [array names default_config] {
113 set value $repo_config_new($name)
114 if {$value ne $repo_config($name)} {
115 if {$value eq $global_config($name)} {
116 catch {exec git repo-config --unset $name}
118 regsub -all "\
[{}\
]" $value {"} value
119 exec git repo-config
$name $value
121 set repo_config
($name) $value
126 proc error_popup
{msg
} {
127 global gitdir appname
132 append title
[lindex \
133 [file split [file normalize
[file dirname $gitdir]]] \
137 set cmd
[list tk_messageBox \
140 -title "$title: error" \
142 if {[winfo ismapped .
]} {
143 lappend cmd
-parent .
148 proc warn_popup
{msg
} {
149 global gitdir appname
154 append title
[lindex \
155 [file split [file normalize
[file dirname $gitdir]]] \
159 set cmd
[list tk_messageBox \
162 -title "$title: warning" \
164 if {[winfo ismapped .
]} {
165 lappend cmd
-parent .
170 proc info_popup
{msg
} {
171 global gitdir appname
176 append title
[lindex \
177 [file split [file normalize
[file dirname $gitdir]]] \
189 ######################################################################
193 if { [catch
{set gitdir
$env(GIT_DIR
)}]
194 && [catch
{set gitdir
[exec git rev-parse
--git-dir]} err
]} {
195 catch
{wm withdraw .
}
196 error_popup
"Cannot find the git directory:\n\n$err"
199 if {![file isdirectory
$gitdir]} {
200 catch
{wm withdraw .
}
201 error_popup
"Git directory not found:\n\n$gitdir"
204 if {[lindex
[file split $gitdir] end
] ne
{.git
}} {
205 catch
{wm withdraw .
}
206 error_popup
"Cannot use funny .git directory:\n\n$gitdir"
209 if {[catch
{cd [file dirname $gitdir]} err
]} {
210 catch
{wm withdraw .
}
211 error_popup
"No working directory [file dirname $gitdir]:\n\n$err"
216 if {$appname eq
{git-citool
}} {
220 ######################################################################
228 set disable_on_lock
[list
]
229 set index_lock_type none
231 proc lock_index
{type} {
232 global index_lock_type disable_on_lock
234 if {$index_lock_type eq
{none
}} {
235 set index_lock_type
$type
236 foreach w
$disable_on_lock {
237 uplevel
#0 $w disabled
240 } elseif
{$index_lock_type eq
"begin-$type"} {
241 set index_lock_type
$type
247 proc unlock_index
{} {
248 global index_lock_type disable_on_lock
250 set index_lock_type none
251 foreach w
$disable_on_lock {
256 ######################################################################
260 proc repository_state
{ctvar hdvar mhvar
} {
261 global gitdir current_branch
262 upvar
$ctvar ct
$hdvar hd
$mhvar mh
266 if {[catch
{set current_branch
[exec git symbolic-ref HEAD
]}]} {
267 set current_branch
{}
269 regsub ^refs
/((heads|tags|remotes
)/)? \
275 if {[catch
{set hd
[exec git rev-parse
--verify HEAD
]}]} {
281 set merge_head
[file join $gitdir MERGE_HEAD
]
282 if {[file exists
$merge_head]} {
284 set fd_mh
[open
$merge_head r
]
285 while {[gets
$fd_mh line
] >= 0} {
296 global PARENT empty_tree
298 set p
[lindex
$PARENT 0]
302 if {$empty_tree eq
{}} {
303 set empty_tree
[exec git mktree
<< {}]
308 proc rescan
{after
} {
309 global HEAD PARENT MERGE_HEAD commit_type
310 global ui_index ui_other ui_status_value ui_comm
311 global rescan_active file_states
314 if {$rescan_active > 0 ||
![lock_index
read]} return
316 repository_state newType newHEAD newMERGE_HEAD
317 if {[string match amend
* $commit_type]
318 && $newType eq
{normal
}
319 && $newHEAD eq
$HEAD} {
323 set MERGE_HEAD
$newMERGE_HEAD
324 set commit_type
$newType
327 array
unset file_states
329 if {![$ui_comm edit modified
]
330 ||
[string trim
[$ui_comm get
0.0 end
]] eq
{}} {
331 if {[load_message GITGUI_MSG
]} {
332 } elseif
{[load_message MERGE_MSG
]} {
333 } elseif
{[load_message SQUASH_MSG
]} {
336 $ui_comm edit modified false
339 if {$repo_config(gui.trustmtime
) eq
{true
}} {
340 rescan_stage2
{} $after
343 set ui_status_value
{Refreshing
file status...
}
344 set cmd
[list git update-index
]
346 lappend cmd
--unmerged
347 lappend cmd
--ignore-missing
348 lappend cmd
--refresh
349 set fd_rf
[open
"| $cmd" r
]
350 fconfigure
$fd_rf -blocking 0 -translation binary
351 fileevent
$fd_rf readable \
352 [list rescan_stage2
$fd_rf $after]
356 proc rescan_stage2
{fd after
} {
357 global gitdir ui_status_value
358 global rescan_active buf_rdi buf_rdf buf_rlo
362 if {![eof
$fd]} return
366 set ls_others
[list | git ls-files
--others -z \
367 --exclude-per-directory=.gitignore
]
368 set info_exclude
[file join $gitdir info exclude
]
369 if {[file readable
$info_exclude]} {
370 lappend ls_others
"--exclude-from=$info_exclude"
378 set ui_status_value
{Scanning
for modified files ...
}
379 set fd_di
[open
"| git diff-index --cached -z [PARENT]" r
]
380 set fd_df
[open
"| git diff-files -z" r
]
381 set fd_lo
[open
$ls_others r
]
383 fconfigure
$fd_di -blocking 0 -translation binary
384 fconfigure
$fd_df -blocking 0 -translation binary
385 fconfigure
$fd_lo -blocking 0 -translation binary
386 fileevent
$fd_di readable
[list read_diff_index
$fd_di $after]
387 fileevent
$fd_df readable
[list read_diff_files
$fd_df $after]
388 fileevent
$fd_lo readable
[list read_ls_others
$fd_lo $after]
391 proc load_message
{file} {
392 global gitdir ui_comm
394 set f
[file join $gitdir $file]
395 if {[file isfile
$f]} {
396 if {[catch
{set fd
[open
$f r
]}]} {
399 set content
[string trim
[read $fd]]
401 $ui_comm delete
0.0 end
402 $ui_comm insert end
$content
408 proc read_diff_index
{fd after
} {
411 append buf_rdi
[read $fd]
413 set n
[string length
$buf_rdi]
415 set z1
[string first
"\0" $buf_rdi $c]
418 set z2
[string first
"\0" $buf_rdi $z1]
422 set i
[split [string range
$buf_rdi $c [expr {$z1 - 2}]] { }]
424 [string range
$buf_rdi $z1 [expr {$z2 - 1}]] \
426 [list
[lindex
$i 0] [lindex
$i 2]] \
432 set buf_rdi
[string range
$buf_rdi $c end
]
437 rescan_done
$fd buf_rdi
$after
440 proc read_diff_files
{fd after
} {
443 append buf_rdf
[read $fd]
445 set n
[string length
$buf_rdf]
447 set z1
[string first
"\0" $buf_rdf $c]
450 set z2
[string first
"\0" $buf_rdf $z1]
454 set i
[split [string range
$buf_rdf $c [expr {$z1 - 2}]] { }]
456 [string range
$buf_rdf $z1 [expr {$z2 - 1}]] \
459 [list
[lindex
$i 0] [lindex
$i 2]]
464 set buf_rdf
[string range
$buf_rdf $c end
]
469 rescan_done
$fd buf_rdf
$after
472 proc read_ls_others
{fd after
} {
475 append buf_rlo
[read $fd]
476 set pck
[split $buf_rlo "\0"]
477 set buf_rlo
[lindex
$pck end
]
478 foreach p
[lrange
$pck 0 end-1
] {
481 rescan_done
$fd buf_rlo
$after
484 proc rescan_done
{fd buf after
} {
486 global file_states repo_config
489 if {![eof
$fd]} return
492 if {[incr rescan_active
-1] > 0} return
498 if {$repo_config(gui.partialinclude
) ne
{true
}} {
500 foreach path
[array names file_states
] {
501 switch
-- [lindex
$file_states($path) 0] {
503 M?
{lappend pathList
$path}
506 if {$pathList ne
{}} {
508 "Updating included files" \
510 [concat
{reshow_diff
;} $after]
519 proc prune_selection
{} {
520 global file_states selected_paths
522 foreach path
[array names selected_paths
] {
523 if {[catch
{set still_here
$file_states($path)}]} {
524 unset selected_paths
($path)
529 ######################################################################
534 global ui_diff current_diff ui_index ui_other
536 $ui_diff conf
-state normal
537 $ui_diff delete
0.0 end
538 $ui_diff conf
-state disabled
542 $ui_index tag remove in_diff
0.0 end
543 $ui_other tag remove in_diff
0.0 end
546 proc reshow_diff
{} {
547 global current_diff ui_status_value file_states
549 if {$current_diff eq
{}
550 ||
[catch
{set s
$file_states($current_diff)}]} {
553 show_diff
$current_diff
557 proc handle_empty_diff
{} {
558 global current_diff file_states file_lists
560 set path
$current_diff
561 set s
$file_states($path)
562 if {[lindex
$s 0] ne
{_M
}} return
564 info_popup
"No differences detected.
566 [short_path $path] has no changes.
568 The modification date of this file was updated
569 by another application and you currently have
570 the Trust File Modification Timestamps option
571 enabled, so Git did not automatically detect
572 that there are no content differences in this
575 This file will now be removed from the modified
576 files list, to prevent possible confusion.
578 if {[catch
{exec git update-index
-- $path} err
]} {
579 error_popup
"Failed to refresh index:\n\n$err"
583 set old_w
[mapcol
[lindex
$file_states($path) 0] $path]
584 set lno
[lsearch
-sorted $file_lists($old_w) $path]
586 set file_lists
($old_w) \
587 [lreplace
$file_lists($old_w) $lno $lno]
589 $old_w conf
-state normal
590 $old_w delete
$lno.0 [expr {$lno + 1}].0
591 $old_w conf
-state disabled
595 proc show_diff
{path
{w
{}} {lno
{}}} {
596 global file_states file_lists
597 global is_3way_diff diff_active repo_config
598 global ui_diff current_diff ui_status_value
600 if {$diff_active ||
![lock_index
read]} return
603 if {$w eq
{} ||
$lno == {}} {
604 foreach w
[array names file_lists
] {
605 set lno
[lsearch
-sorted $file_lists($w) $path]
612 if {$w ne
{} && $lno >= 1} {
613 $w tag add in_diff
$lno.0 [expr {$lno + 1}].0
616 set s
$file_states($path)
620 set current_diff
$path
621 set ui_status_value
"Loading diff of [escape_path $path]..."
623 set cmd
[list | git diff-index
]
624 lappend cmd
--no-color
625 if {$repo_config(gui.diffcontext
) > 0} {
626 lappend cmd
"-U$repo_config(gui.diffcontext)"
636 set fd
[open
$path r
]
637 set content
[read $fd]
642 set ui_status_value
"Unable to display [escape_path $path]"
643 error_popup
"Error loading file:\n\n$err"
646 $ui_diff conf
-state normal
647 $ui_diff insert end
$content
648 $ui_diff conf
-state disabled
651 set ui_status_value
{Ready.
}
660 if {[catch
{set fd
[open
$cmd r
]} err
]} {
663 set ui_status_value
"Unable to display [escape_path $path]"
664 error_popup
"Error loading diff:\n\n$err"
668 fconfigure
$fd -blocking 0 -translation auto
669 fileevent
$fd readable
[list read_diff
$fd]
672 proc read_diff
{fd
} {
673 global ui_diff ui_status_value is_3way_diff diff_active
676 $ui_diff conf
-state normal
677 while {[gets
$fd line
] >= 0} {
678 # -- Cleanup uninteresting diff header lines.
680 if {[string match
{diff --git *} $line]} continue
681 if {[string match
{diff --combined *} $line]} continue
682 if {[string match
{--- *} $line]} continue
683 if {[string match
{+++ *} $line]} continue
684 if {$line eq
{deleted
file mode
120000}} {
685 set line
"deleted symlink"
688 # -- Automatically detect if this is a 3 way diff.
690 if {[string match
{@@@
*} $line]} {set is_3way_diff
1}
692 # -- Reformat a 3 way diff, 'cause its too weird.
695 set op
[string range
$line 0 1]
698 {++} {set tags d_
+ ; set op
{ +}}
699 {--} {set tags d_-
; set op
{ -}}
700 { +} {set tags d_
++; set op
{++}}
701 { -} {set tags d_--
; set op
{--}}
702 {+ } {set tags d_-
+; set op
{-+}}
703 {- } {set tags d_
+-; set op
{+-}}
704 default
{set tags
{}}
706 set line
[string replace
$line 0 1 $op]
708 switch
-- [string index
$line 0] {
712 default
{set tags
{}}
715 $ui_diff insert end
$line $tags
716 $ui_diff insert end
"\n" $tags
718 $ui_diff conf
-state disabled
724 set ui_status_value
{Ready.
}
726 if {$repo_config(gui.trustmtime
) eq
{true
}
727 && [$ui_diff index end
] eq
{2.0}} {
733 ######################################################################
737 proc load_last_commit
{} {
738 global HEAD PARENT MERGE_HEAD commit_type ui_comm
740 if {[llength
$PARENT] == 0} {
741 error_popup
{There is nothing to amend.
743 You are about to create the initial commit.
744 There is no commit before this to amend.
749 repository_state curType curHEAD curMERGE_HEAD
750 if {$curType eq
{merge
}} {
751 error_popup
{Cannot amend
while merging.
753 You are currently
in the middle of a merge that
754 has not been fully completed. You cannot amend
755 the prior commit unless you first abort the
756 current merge activity.
764 set fd
[open
"| git cat-file commit $curHEAD" r
]
765 while {[gets
$fd line
] > 0} {
766 if {[string match
{parent
*} $line]} {
767 lappend parents
[string range
$line 7 end
]
770 set msg
[string trim
[read $fd]]
773 error_popup
"Error loading commit data for amend:\n\n$err"
779 set MERGE_HEAD
[list
]
780 switch
-- [llength
$parents] {
781 0 {set commit_type amend-initial
}
782 1 {set commit_type amend
}
783 default
{set commit_type amend-merge
}
786 $ui_comm delete
0.0 end
787 $ui_comm insert end
$msg
789 $ui_comm edit modified false
790 rescan
{set ui_status_value
{Ready.
}}
793 proc create_new_commit
{} {
794 global commit_type ui_comm
796 set commit_type normal
797 $ui_comm delete
0.0 end
799 $ui_comm edit modified false
800 rescan
{set ui_status_value
{Ready.
}}
803 set GIT_COMMITTER_IDENT
{}
805 proc committer_ident
{} {
806 global GIT_COMMITTER_IDENT
808 if {$GIT_COMMITTER_IDENT eq
{}} {
809 if {[catch
{set me
[exec git var GIT_COMMITTER_IDENT
]} err
]} {
810 error_popup
"Unable to obtain your identity:\n\n$err"
813 if {![regexp
{^
(.
*) [0-9]+ [-+0-9]+$
} \
814 $me me GIT_COMMITTER_IDENT
]} {
815 error_popup
"Invalid GIT_COMMITTER_IDENT:\n\n$me"
820 return $GIT_COMMITTER_IDENT
823 proc commit_tree
{} {
824 global HEAD commit_type file_states ui_comm repo_config
826 if {![lock_index update
]} return
827 if {[committer_ident
] eq
{}} return
829 # -- Our in memory state should match the repository.
831 repository_state curType curHEAD curMERGE_HEAD
832 if {[string match amend
* $commit_type]
833 && $curType eq
{normal
}
834 && $curHEAD eq
$HEAD} {
835 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
836 info_popup
{Last scanned state does not match repository state.
838 Another Git program has modified this repository
839 since the last scan. A rescan must be performed
840 before another commit can be created.
842 The rescan will be automatically started now.
845 rescan
{set ui_status_value
{Ready.
}}
849 # -- At least one file should differ in the index.
852 foreach path
[array names file_states
] {
853 switch
-glob -- [lindex
$file_states($path) 0] {
857 M?
{set files_ready
1; break}
859 error_popup
"Unmerged files cannot be committed.
861 File [short_path $path] has merge conflicts.
862 You must resolve them and include the file before committing.
868 error_popup
"Unknown file state [lindex $s 0] detected.
870 File [short_path $path] cannot be committed by this program.
876 error_popup
{No included files to commit.
878 You must include
at least
1 file before you can commit.
884 # -- A message is required.
886 set msg
[string trim
[$ui_comm get
1.0 end
]]
888 error_popup
{Please supply a commit message.
890 A good commit message has the following format
:
892 - First line
: Describe
in one sentance what you did.
894 - Remaining lines
: Describe why this change is good.
900 # -- Update included files if partialincludes are off.
902 if {$repo_config(gui.partialinclude
) ne
{true
}} {
904 foreach path
[array names file_states
] {
905 switch
-glob -- [lindex
$file_states($path) 0] {
907 M?
{lappend pathList
$path}
910 if {$pathList ne
{}} {
913 "Updating included files" \
915 [concat
{lock_index update
;} \
916 [list commit_prehook
$curHEAD $msg]]
921 commit_prehook
$curHEAD $msg
924 proc commit_prehook
{curHEAD msg
} {
925 global gitdir ui_status_value pch_error
927 set pchook
[file join $gitdir hooks pre-commit
]
929 # On Cygwin [file executable] might lie so we need to ask
930 # the shell if the hook is executable. Yes that's annoying.
932 if {[is_Windows
] && [file isfile
$pchook]} {
933 set pchook
[list sh
-c [concat \
934 "if test -x \"$pchook\";" \
935 "then exec \"$pchook\" 2>&1;" \
937 } elseif
{[file executable
$pchook]} {
938 set pchook
[list
$pchook |
& cat]
940 commit_writetree
$curHEAD $msg
944 set ui_status_value
{Calling pre-commit hook...
}
946 set fd_ph
[open
"| $pchook" r
]
947 fconfigure
$fd_ph -blocking 0 -translation binary
948 fileevent
$fd_ph readable \
949 [list commit_prehook_wait
$fd_ph $curHEAD $msg]
952 proc commit_prehook_wait
{fd_ph curHEAD msg
} {
953 global pch_error ui_status_value
955 append pch_error
[read $fd_ph]
956 fconfigure
$fd_ph -blocking 1
958 if {[catch
{close
$fd_ph}]} {
959 set ui_status_value
{Commit declined by pre-commit hook.
}
960 hook_failed_popup pre-commit
$pch_error
963 commit_writetree
$curHEAD $msg
968 fconfigure
$fd_ph -blocking 0
971 proc commit_writetree
{curHEAD msg
} {
972 global ui_status_value
974 set ui_status_value
{Committing changes...
}
975 set fd_wt
[open
"| git write-tree" r
]
976 fileevent
$fd_wt readable \
977 [list commit_committree
$fd_wt $curHEAD $msg]
980 proc commit_committree
{fd_wt curHEAD msg
} {
981 global HEAD PARENT MERGE_HEAD commit_type
982 global single_commit gitdir
983 global ui_status_value ui_comm selected_commit_type
984 global file_states selected_paths rescan_active
987 if {$tree_id eq
{} ||
[catch
{close
$fd_wt} err
]} {
988 error_popup
"write-tree failed:\n\n$err"
989 set ui_status_value
{Commit failed.
}
994 # -- Create the commit.
996 set cmd
[list git commit-tree
$tree_id]
997 set parents
[concat
$PARENT $MERGE_HEAD]
998 if {[llength
$parents] > 0} {
1003 # git commit-tree writes to stderr during initial commit.
1004 lappend cmd
2>/dev
/null
1007 if {[catch
{set cmt_id
[eval exec $cmd]} err
]} {
1008 error_popup
"commit-tree failed:\n\n$err"
1009 set ui_status_value
{Commit failed.
}
1014 # -- Update the HEAD ref.
1017 if {$commit_type ne
{normal
}} {
1018 append reflogm
" ($commit_type)"
1020 set i
[string first
"\n" $msg]
1022 append reflogm
{: } [string range
$msg 0 [expr {$i - 1}]]
1024 append reflogm
{: } $msg
1026 set cmd
[list git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD]
1027 if {[catch
{eval exec $cmd} err
]} {
1028 error_popup
"update-ref failed:\n\n$err"
1029 set ui_status_value
{Commit failed.
}
1034 # -- Cleanup after ourselves.
1036 catch
{file delete
[file join $gitdir MERGE_HEAD
]}
1037 catch
{file delete
[file join $gitdir MERGE_MSG
]}
1038 catch
{file delete
[file join $gitdir SQUASH_MSG
]}
1039 catch
{file delete
[file join $gitdir GITGUI_MSG
]}
1041 # -- Let rerere do its thing.
1043 if {[file isdirectory
[file join $gitdir rr-cache
]]} {
1044 catch
{exec git rerere
}
1047 # -- Run the post-commit hook.
1049 set pchook
[file join $gitdir hooks post-commit
]
1050 if {[is_Windows
] && [file isfile
$pchook]} {
1051 set pchook
[list sh
-c [concat \
1052 "if test -x \"$pchook\";" \
1053 "then exec \"$pchook\";" \
1055 } elseif
{![file executable
$pchook]} {
1058 if {$pchook ne
{}} {
1059 catch
{exec $pchook &}
1062 $ui_comm delete
0.0 end
1064 $ui_comm edit modified false
1066 if {$single_commit} do_quit
1068 # -- Update in memory status
1070 set selected_commit_type new
1071 set commit_type normal
1074 set MERGE_HEAD
[list
]
1076 foreach path
[array names file_states
] {
1077 set s
$file_states($path)
1079 switch
-glob -- $m {
1087 unset file_states
($path)
1088 catch
{unset selected_paths
($path)}
1091 set file_states
($path) [list _O
[lindex
$s 1] {} {}]
1098 set file_states
($path) [list \
1099 _
[string index
$m 1] \
1110 set ui_status_value \
1111 "Changes committed as [string range $cmt_id 0 7]."
1114 ######################################################################
1118 proc fetch_from
{remote
} {
1119 set w
[new_console
"fetch $remote" \
1120 "Fetching new changes from $remote"]
1121 set cmd
[list git fetch
]
1123 console_exec
$w $cmd
1126 proc pull_remote
{remote branch
} {
1127 global HEAD commit_type file_states repo_config
1129 if {![lock_index update
]} return
1131 # -- Our in memory state should match the repository.
1133 repository_state curType curHEAD curMERGE_HEAD
1134 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1135 info_popup
{Last scanned state does not match repository state.
1137 Another Git program has modified this repository
1138 since the last scan. A rescan must be performed
1139 before a pull operation can be started.
1141 The rescan will be automatically started now.
1144 rescan
{set ui_status_value
{Ready.
}}
1148 # -- No differences should exist before a pull.
1150 if {[array size file_states
] != 0} {
1151 error_popup
{Uncommitted but modified files are present.
1153 You should not perform a pull with unmodified
1154 files
in your working directory as Git will be
1155 unable to recover from an incorrect merge.
1157 You should commit or revert all changes before
1158 starting a pull operation.
1164 set w
[new_console
"pull $remote $branch" \
1165 "Pulling new changes from branch $branch in $remote"]
1166 set cmd
[list git pull
]
1167 if {$repo_config(gui.pullsummary
) eq
{false
}} {
1168 lappend cmd
--no-summary
1172 console_exec
$w $cmd [list post_pull_remote
$remote $branch]
1175 proc post_pull_remote
{remote branch success
} {
1176 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1177 global ui_status_value
1181 repository_state commit_type HEAD MERGE_HEAD
1183 set selected_commit_type new
1184 set ui_status_value
"Pulling $branch from $remote complete."
1186 rescan
[list
set ui_status_value \
1187 "Conflicts detected while pulling $branch from $remote."]
1191 proc push_to
{remote
} {
1192 set w
[new_console
"push $remote" \
1193 "Pushing changes to $remote"]
1194 set cmd
[list git push
]
1196 console_exec
$w $cmd
1199 ######################################################################
1203 proc mapcol
{state path
} {
1204 global all_cols ui_other
1206 if {[catch
{set r
$all_cols($state)}]} {
1207 puts
"error: no column for state={$state} $path"
1213 proc mapicon
{state path
} {
1216 if {[catch
{set r
$all_icons($state)}]} {
1217 puts
"error: no icon for state={$state} $path"
1223 proc mapdesc
{state path
} {
1226 if {[catch
{set r
$all_descs($state)}]} {
1227 puts
"error: no desc for state={$state} $path"
1233 proc escape_path
{path
} {
1234 regsub
-all "\n" $path "\\n" path
1238 proc short_path
{path
} {
1239 return [escape_path
[lindex
[file split $path] end
]]
1243 set null_sha1
[string repeat
0 40]
1245 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1246 global file_states next_icon_id null_sha1
1248 set s0
[string index
$new_state 0]
1249 set s1
[string index
$new_state 1]
1251 if {[catch
{set info
$file_states($path)}]} {
1253 set icon n
[incr next_icon_id
]
1255 set state
[lindex
$info 0]
1256 set icon
[lindex
$info 1]
1257 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1258 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1261 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1262 elseif
{$s0 eq
{_
}} {set s0 _
}
1264 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1265 elseif
{$s1 eq
{_
}} {set s1 _
}
1267 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1268 set head_info
[list
0 $null_sha1]
1269 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1270 && $head_info eq
{}} {
1271 set head_info
$index_info
1274 set file_states
($path) [list
$s0$s1 $icon \
1275 $head_info $index_info \
1280 proc display_file
{path state
} {
1281 global file_states file_lists selected_paths
1283 set old_m
[merge_state
$path $state]
1284 set s
$file_states($path)
1285 set new_m
[lindex
$s 0]
1286 set new_w
[mapcol
$new_m $path]
1287 set old_w
[mapcol
$old_m $path]
1288 set new_icon
[mapicon
$new_m $path]
1290 if {$new_m eq
{__
}} {
1291 set lno
[lsearch
-sorted $file_lists($old_w) $path]
1293 set file_lists
($old_w) \
1294 [lreplace
$file_lists($old_w) $lno $lno]
1296 $old_w conf
-state normal
1297 $old_w delete
$lno.0 [expr {$lno + 1}].0
1298 $old_w conf
-state disabled
1300 unset file_states
($path)
1301 catch
{unset selected_paths
($path)}
1305 if {$new_w ne
$old_w} {
1306 set lno
[lsearch
-sorted $file_lists($old_w) $path]
1308 set file_lists
($old_w) \
1309 [lreplace
$file_lists($old_w) $lno $lno]
1311 $old_w conf
-state normal
1312 $old_w delete
$lno.0 [expr {$lno + 1}].0
1313 $old_w conf
-state disabled
1316 lappend file_lists
($new_w) $path
1317 set file_lists
($new_w) [lsort
$file_lists($new_w)]
1318 set lno
[lsearch
-sorted $file_lists($new_w) $path]
1320 $new_w conf
-state normal
1321 $new_w image create
$lno.0 \
1322 -align center
-padx 5 -pady 1 \
1323 -name [lindex
$s 1] \
1325 $new_w insert
$lno.1 "[escape_path $path]\n"
1326 if {[catch
{set in_sel
$selected_paths($path)}]} {
1330 $new_w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1332 $new_w conf
-state disabled
1333 } elseif
{$new_icon ne
[mapicon
$old_m $path]} {
1334 $new_w conf
-state normal
1335 $new_w image conf
[lindex
$s 1] -image $new_icon
1336 $new_w conf
-state disabled
1340 proc display_all_files
{} {
1341 global ui_index ui_other
1342 global file_states file_lists
1343 global last_clicked selected_paths
1345 $ui_index conf
-state normal
1346 $ui_other conf
-state normal
1348 $ui_index delete
0.0 end
1349 $ui_other delete
0.0 end
1352 set file_lists
($ui_index) [list
]
1353 set file_lists
($ui_other) [list
]
1355 foreach path
[lsort
[array names file_states
]] {
1356 set s
$file_states($path)
1358 set w
[mapcol
$m $path]
1359 lappend file_lists
($w) $path
1360 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1361 $w image create end \
1362 -align center
-padx 5 -pady 1 \
1363 -name [lindex
$s 1] \
1364 -image [mapicon
$m $path]
1365 $w insert end
"[escape_path $path]\n"
1366 if {[catch
{set in_sel
$selected_paths($path)}]} {
1370 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1374 $ui_index conf
-state disabled
1375 $ui_other conf
-state disabled
1378 proc update_indexinfo
{msg pathList after
} {
1379 global update_index_cp ui_status_value
1381 if {![lock_index update
]} return
1383 set update_index_cp
0
1384 set pathList
[lsort
$pathList]
1385 set totalCnt
[llength
$pathList]
1386 set batch [expr {int
($totalCnt * .01) + 1}]
1387 if {$batch > 25} {set batch 25}
1389 set ui_status_value
[format \
1390 "$msg... %i/%i files (%.2f%%)" \
1394 set fd
[open
"| git update-index -z --index-info" w
]
1400 fileevent
$fd writable
[list \
1401 write_update_indexinfo \
1411 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1412 global update_index_cp ui_status_value
1413 global file_states current_diff
1415 if {$update_index_cp >= $totalCnt} {
1422 for {set i
$batch} \
1423 {$update_index_cp < $totalCnt && $i > 0} \
1425 set path
[lindex
$pathList $update_index_cp]
1426 incr update_index_cp
1428 set s
$file_states($path)
1429 switch
-glob -- [lindex
$s 0] {
1435 set info
[lindex
$s 2]
1436 if {$info eq
{}} continue
1438 puts
-nonewline $fd $info
1439 puts
-nonewline $fd "\t"
1440 puts
-nonewline $fd $path
1441 puts
-nonewline $fd "\0"
1442 display_file
$path $new
1445 set ui_status_value
[format \
1446 "$msg... %i/%i files (%.2f%%)" \
1449 [expr {100.0 * $update_index_cp / $totalCnt}]]
1452 proc update_index
{msg pathList after
} {
1453 global update_index_cp ui_status_value
1455 if {![lock_index update
]} return
1457 set update_index_cp
0
1458 set pathList
[lsort
$pathList]
1459 set totalCnt
[llength
$pathList]
1460 set batch [expr {int
($totalCnt * .01) + 1}]
1461 if {$batch > 25} {set batch 25}
1463 set ui_status_value
[format \
1464 "$msg... %i/%i files (%.2f%%)" \
1468 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1474 fileevent
$fd writable
[list \
1475 write_update_index \
1485 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1486 global update_index_cp ui_status_value
1487 global file_states current_diff
1489 if {$update_index_cp >= $totalCnt} {
1496 for {set i
$batch} \
1497 {$update_index_cp < $totalCnt && $i > 0} \
1499 set path
[lindex
$pathList $update_index_cp]
1500 incr update_index_cp
1502 switch
-glob -- [lindex
$file_states($path) 0] {
1521 puts
-nonewline $fd $path
1522 puts
-nonewline $fd "\0"
1523 display_file
$path $new
1526 set ui_status_value
[format \
1527 "$msg... %i/%i files (%.2f%%)" \
1530 [expr {100.0 * $update_index_cp / $totalCnt}]]
1533 proc checkout_index
{msg pathList after
} {
1534 global update_index_cp ui_status_value
1536 if {![lock_index update
]} return
1538 set update_index_cp
0
1539 set pathList
[lsort
$pathList]
1540 set totalCnt
[llength
$pathList]
1541 set batch [expr {int
($totalCnt * .01) + 1}]
1542 if {$batch > 25} {set batch 25}
1544 set ui_status_value
[format \
1545 "$msg... %i/%i files (%.2f%%)" \
1549 set cmd
[list git checkout-index
]
1555 set fd
[open
"| $cmd " w
]
1561 fileevent
$fd writable
[list \
1562 write_checkout_index \
1572 proc write_checkout_index
{fd pathList totalCnt
batch msg after
} {
1573 global update_index_cp ui_status_value
1574 global file_states current_diff
1576 if {$update_index_cp >= $totalCnt} {
1583 for {set i
$batch} \
1584 {$update_index_cp < $totalCnt && $i > 0} \
1586 set path
[lindex
$pathList $update_index_cp]
1587 incr update_index_cp
1589 switch
-glob -- [lindex
$file_states($path) 0] {
1599 puts
-nonewline $fd $path
1600 puts
-nonewline $fd "\0"
1601 display_file
$path $new
1604 set ui_status_value
[format \
1605 "$msg... %i/%i files (%.2f%%)" \
1608 [expr {100.0 * $update_index_cp / $totalCnt}]]
1611 ######################################################################
1613 ## branch management
1615 proc load_all_heads
{} {
1616 global all_heads tracking_branches
1618 set all_heads
[list
]
1619 set cmd
[list git for-each-ref
]
1620 lappend cmd
--format=%(refname
)
1621 lappend cmd refs
/heads
1622 set fd
[open
"| $cmd" r
]
1623 while {[gets
$fd line
] > 0} {
1624 if {![catch
{set info
$tracking_branches($line)}]} continue
1625 if {![regsub ^refs
/heads
/ $line {} name
]} continue
1626 lappend all_heads
$name
1630 set all_heads
[lsort
$all_heads]
1633 proc populate_branch_menu
{m
} {
1634 global all_heads disable_on_lock
1637 foreach b
$all_heads {
1638 $m add radiobutton \
1640 -command [list switch_branch
$b] \
1641 -variable current_branch \
1644 lappend disable_on_lock \
1645 [list
$m entryconf
[$m index last
] -state]
1649 proc do_create_branch
{} {
1650 error
"NOT IMPLEMENTED"
1653 proc do_delete_branch
{} {
1654 error
"NOT IMPLEMENTED"
1657 proc switch_branch
{b
} {
1658 global HEAD commit_type file_states current_branch
1659 global selected_commit_type ui_comm
1661 if {![lock_index switch
]} return
1663 # -- Backup the selected branch (repository_state resets it)
1665 set new_branch
$current_branch
1667 # -- Our in memory state should match the repository.
1669 repository_state curType curHEAD curMERGE_HEAD
1670 if {[string match amend
* $commit_type]
1671 && $curType eq
{normal
}
1672 && $curHEAD eq
$HEAD} {
1673 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1674 info_popup
{Last scanned state does not match repository state.
1676 Another Git program has modified this repository
1677 since the last scan. A rescan must be performed
1678 before the current branch can be changed.
1680 The rescan will be automatically started now.
1683 rescan
{set ui_status_value
{Ready.
}}
1687 # -- Toss the message buffer if we are in amend mode.
1689 if {[string match amend
* $curType]} {
1690 $ui_comm delete
0.0 end
1692 $ui_comm edit modified false
1695 set selected_commit_type new
1696 set current_branch
$new_branch
1699 error
"NOT FINISHED"
1702 ######################################################################
1704 ## remote management
1706 proc load_all_remotes
{} {
1707 global gitdir repo_config
1708 global all_remotes tracking_branches
1710 set all_remotes
[list
]
1711 array
unset tracking_branches
1713 set rm_dir
[file join $gitdir remotes
]
1714 if {[file isdirectory
$rm_dir]} {
1715 set all_remotes
[glob \
1719 -directory $rm_dir *]
1721 foreach name
$all_remotes {
1723 set fd
[open
[file join $rm_dir $name] r
]
1724 while {[gets
$fd line
] >= 0} {
1725 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
1726 $line line src dst
]} continue
1727 if {![regexp ^refs
/ $dst]} {
1728 set dst
"refs/heads/$dst"
1730 set tracking_branches
($dst) [list
$name $src]
1737 foreach line
[array names repo_config remote.
*.url
] {
1738 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
1739 lappend all_remotes
$name
1741 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
1745 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
1746 if {![regexp ^refs
/ $dst]} {
1747 set dst
"refs/heads/$dst"
1749 set tracking_branches
($dst) [list
$name $src]
1753 set all_remotes
[lsort
-unique $all_remotes]
1756 proc populate_fetch_menu
{m
} {
1757 global gitdir all_remotes repo_config
1759 foreach r
$all_remotes {
1761 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1762 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
1767 set fd
[open
[file join $gitdir remotes
$r] r
]
1768 while {[gets
$fd n
] >= 0} {
1769 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
1780 -label "Fetch from $r..." \
1781 -command [list fetch_from
$r] \
1787 proc populate_push_menu
{m
} {
1788 global gitdir all_remotes repo_config
1790 foreach r
$all_remotes {
1792 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1793 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
1798 set fd
[open
[file join $gitdir remotes
$r] r
]
1799 while {[gets
$fd n
] >= 0} {
1800 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
1811 -label "Push to $r..." \
1812 -command [list push_to
$r] \
1818 proc populate_pull_menu
{m
} {
1819 global gitdir repo_config all_remotes disable_on_lock
1821 foreach remote
$all_remotes {
1823 if {[array get repo_config remote.
$remote.url
] ne
{}} {
1824 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
1825 foreach line
$repo_config(remote.
$remote.fetch
) {
1826 if {[regexp
{^
([^
:]+):} $line line rb
]} {
1833 set fd
[open
[file join $gitdir remotes
$remote] r
]
1834 while {[gets
$fd line
] >= 0} {
1835 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
1843 foreach rb
$rb_list {
1844 regsub ^refs
/heads
/ $rb {} rb_short
1846 -label "Branch $rb_short from $remote..." \
1847 -command [list pull_remote
$remote $rb] \
1849 lappend disable_on_lock \
1850 [list
$m entryconf
[$m index last
] -state]
1855 ######################################################################
1860 #define mask_width 14
1861 #define mask_height 15
1862 static unsigned char mask_bits
[] = {
1863 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1864 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1865 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1868 image create bitmap file_plain
-background white
-foreground black
-data {
1869 #define plain_width 14
1870 #define plain_height 15
1871 static unsigned char plain_bits
[] = {
1872 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1873 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1874 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1875 } -maskdata $filemask
1877 image create bitmap file_mod
-background white
-foreground blue
-data {
1878 #define mod_width 14
1879 #define mod_height 15
1880 static unsigned char mod_bits
[] = {
1881 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1882 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1883 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1884 } -maskdata $filemask
1886 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
1887 #define file_fulltick_width 14
1888 #define file_fulltick_height 15
1889 static unsigned char file_fulltick_bits
[] = {
1890 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1891 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1892 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1893 } -maskdata $filemask
1895 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1896 #define parttick_width 14
1897 #define parttick_height 15
1898 static unsigned char parttick_bits
[] = {
1899 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1900 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1901 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1902 } -maskdata $filemask
1904 image create bitmap file_question
-background white
-foreground black
-data {
1905 #define file_question_width 14
1906 #define file_question_height 15
1907 static unsigned char file_question_bits
[] = {
1908 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1909 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1910 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1911 } -maskdata $filemask
1913 image create bitmap file_removed
-background white
-foreground red
-data {
1914 #define file_removed_width 14
1915 #define file_removed_height 15
1916 static unsigned char file_removed_bits
[] = {
1917 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1918 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1919 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1920 } -maskdata $filemask
1922 image create bitmap file_merge
-background white
-foreground blue
-data {
1923 #define file_merge_width 14
1924 #define file_merge_height 15
1925 static unsigned char file_merge_bits
[] = {
1926 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1927 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1928 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1929 } -maskdata $filemask
1931 set ui_index .vpane.files.index.list
1932 set ui_other .vpane.files.other.list
1933 set max_status_desc
0
1935 {__ i plain
"Unmodified"}
1936 {_M i mod
"Modified"}
1937 {M_ i fulltick
"Included in commit"}
1938 {MM i parttick
"Partially included"}
1939 {MD i question
"Included (but gone)"}
1941 {_O o plain
"Untracked"}
1942 {A_ o fulltick
"Added by commit"}
1943 {AM o parttick
"Partially added"}
1944 {AD o question
"Added (but gone)"}
1946 {_D i question
"Missing"}
1947 {DD i removed
"Removed by commit"}
1948 {DO i removed
"Removed (still exists)"}
1949 {DM i removed
"Removed (but modified)"}
1951 {UD i merge
"Merge conflicts"}
1952 {UM i merge
"Merge conflicts"}
1953 {U_ i merge
"Merge conflicts"}
1955 if {$max_status_desc < [string length
[lindex
$i 3]]} {
1956 set max_status_desc
[string length
[lindex
$i 3]]
1958 if {[lindex
$i 1] eq
{i
}} {
1959 set all_cols
([lindex
$i 0]) $ui_index
1961 set all_cols
([lindex
$i 0]) $ui_other
1963 set all_icons
([lindex
$i 0]) file_
[lindex
$i 2]
1964 set all_descs
([lindex
$i 0]) [lindex
$i 3]
1968 ######################################################################
1973 global tcl_platform tk_library
1974 if {[tk windowingsystem
] eq
{aqua
}} {
1980 proc is_Windows
{} {
1982 if {$tcl_platform(platform
) eq
{windows
}} {
1988 proc bind_button3
{w cmd
} {
1989 bind $w <Any-Button-3
> $cmd
1991 bind $w <Control-Button-1
> $cmd
1995 proc incr_font_size
{font
{amt
1}} {
1996 set sz
[font configure
$font -size]
1998 font configure
$font -size $sz
1999 font configure
${font}bold
-size $sz
2002 proc hook_failed_popup
{hook msg
} {
2003 global gitdir appname
2009 label
$w.m.l1
-text "$hook hook failed:" \
2014 -background white
-borderwidth 1 \
2016 -width 80 -height 10 \
2018 -yscrollcommand [list
$w.m.sby
set]
2020 -text {You must correct the above errors before committing.
} \
2024 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2025 pack
$w.m.l1
-side top
-fill x
2026 pack
$w.m.l2
-side bottom
-fill x
2027 pack
$w.m.sby
-side right
-fill y
2028 pack
$w.m.t
-side left
-fill both
-expand 1
2029 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2031 $w.m.t insert
1.0 $msg
2032 $w.m.t conf
-state disabled
2034 button
$w.ok
-text OK \
2037 -command "destroy $w"
2038 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2040 bind $w <Visibility
> "grab $w; focus $w"
2041 bind $w <Key-Return
> "destroy $w"
2042 wm title
$w "$appname ([lindex [file split \
2043 [file normalize [file dirname $gitdir]]] \
2048 set next_console_id
0
2050 proc new_console
{short_title long_title
} {
2051 global next_console_id console_data
2052 set w .console
[incr next_console_id
]
2053 set console_data
($w) [list
$short_title $long_title]
2054 return [console_init
$w]
2057 proc console_init
{w
} {
2058 global console_cr console_data
2059 global gitdir appname M1B
2061 set console_cr
($w) 1.0
2064 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
2069 -background white
-borderwidth 1 \
2071 -width 80 -height 10 \
2074 -yscrollcommand [list
$w.m.sby
set]
2075 label
$w.m.s
-text {Working... please
wait...
} \
2079 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2080 pack
$w.m.l1
-side top
-fill x
2081 pack
$w.m.s
-side bottom
-fill x
2082 pack
$w.m.sby
-side right
-fill y
2083 pack
$w.m.t
-side left
-fill both
-expand 1
2084 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2086 menu
$w.ctxm
-tearoff 0
2087 $w.ctxm add
command -label "Copy" \
2089 -command "tk_textCopy $w.m.t"
2090 $w.ctxm add
command -label "Select All" \
2092 -command "$w.m.t tag add sel 0.0 end"
2093 $w.ctxm add
command -label "Copy All" \
2096 $w.m.t tag add sel 0.0 end
2098 $w.m.t tag remove sel 0.0 end
2101 button
$w.ok
-text {Close
} \
2104 -command "destroy $w"
2105 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2107 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
2108 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2109 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2110 bind $w <Visibility
> "focus $w"
2111 wm title
$w "$appname ([lindex [file split \
2112 [file normalize [file dirname $gitdir]]] \
2113 end]): [lindex $console_data($w) 0]"
2117 proc console_exec
{w cmd
{after
{}}} {
2118 # -- Windows tosses the enviroment when we exec our child.
2119 # But most users need that so we have to relogin. :-(
2122 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
2125 # -- Tcl won't let us redirect both stdout and stderr to
2126 # the same pipe. So pass it through cat...
2128 set cmd
[concat |
$cmd |
& cat]
2130 set fd_f
[open
$cmd r
]
2131 fconfigure
$fd_f -blocking 0 -translation binary
2132 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
2135 proc console_read
{w fd after
} {
2136 global console_cr console_data
2140 if {![winfo exists
$w]} {console_init
$w}
2141 $w.m.t conf
-state normal
2143 set n
[string length
$buf]
2145 set cr
[string first
"\r" $buf $c]
2146 set lf
[string first
"\n" $buf $c]
2147 if {$cr < 0} {set cr
[expr {$n + 1}]}
2148 if {$lf < 0} {set lf
[expr {$n + 1}]}
2151 $w.m.t insert end
[string range
$buf $c $lf]
2152 set console_cr
($w) [$w.m.t index
{end
-1c}]
2156 $w.m.t delete
$console_cr($w) end
2157 $w.m.t insert end
"\n"
2158 $w.m.t insert end
[string range
$buf $c $cr]
2163 $w.m.t conf
-state disabled
2167 fconfigure
$fd -blocking 1
2169 if {[catch
{close
$fd}]} {
2170 if {![winfo exists
$w]} {console_init
$w}
2171 $w.m.s conf
-background red
-text {Error
: Command Failed
}
2172 $w.ok conf
-state normal
2174 } elseif
{[winfo exists
$w]} {
2175 $w.m.s conf
-background green
-text {Success
}
2176 $w.ok conf
-state normal
2179 array
unset console_cr
$w
2180 array
unset console_data
$w
2182 uplevel
#0 $after $ok
2186 fconfigure
$fd -blocking 0
2189 ######################################################################
2193 set starting_gitk_msg
{Please
wait... Starting gitk...
}
2195 proc do_gitk
{revs
} {
2196 global ui_status_value starting_gitk_msg
2204 set cmd
"sh -c \"exec $cmd\""
2208 if {[catch
{eval exec $cmd} err
]} {
2209 error_popup
"Failed to start gitk:\n\n$err"
2211 set ui_status_value
$starting_gitk_msg
2213 if {$ui_status_value eq
$starting_gitk_msg} {
2214 set ui_status_value
{Ready.
}
2221 set w
[new_console
{gc
} {Compressing the object database
}]
2222 console_exec
$w {git gc
}
2225 proc do_fsck_objects
{} {
2226 set w
[new_console
{fsck-objects
} \
2227 {Verifying the object database with fsck-objects
}]
2228 set cmd
[list git fsck-objects
]
2231 lappend cmd
--strict
2232 console_exec
$w $cmd
2238 global gitdir ui_comm is_quitting repo_config commit_type
2240 if {$is_quitting} return
2243 # -- Stash our current commit buffer.
2245 set save
[file join $gitdir GITGUI_MSG
]
2246 set msg
[string trim
[$ui_comm get
0.0 end
]]
2247 if {![string match amend
* $commit_type]
2248 && [$ui_comm edit modified
]
2251 set fd
[open
$save w
]
2252 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
2256 catch
{file delete
$save}
2259 # -- Stash our current window geometry into this repository.
2261 set cfg_geometry
[list
]
2262 lappend cfg_geometry
[wm geometry .
]
2263 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
2264 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
2265 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2268 if {$cfg_geometry ne
$rc_geometry} {
2269 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2276 rescan
{set ui_status_value
{Ready.
}}
2279 proc remove_helper
{txt paths
} {
2280 global file_states current_diff
2282 if {![lock_index begin-update
]} return
2286 foreach path
$paths {
2287 switch
-glob -- [lindex
$file_states($path) 0] {
2291 lappend pathList
$path
2292 if {$path eq
$current_diff} {
2293 set after
{reshow_diff
;}
2298 if {$pathList eq
{}} {
2304 [concat
$after {set ui_status_value
{Ready.
}}]
2308 proc do_remove_selection
{} {
2309 global current_diff selected_paths
2311 if {[array size selected_paths
] > 0} {
2313 {Removing selected files from commit
} \
2314 [array names selected_paths
]
2315 } elseif
{$current_diff ne
{}} {
2317 "Removing [short_path $current_diff] from commit" \
2318 [list
$current_diff]
2322 proc include_helper
{txt paths
} {
2323 global file_states current_diff
2325 if {![lock_index begin-update
]} return
2329 foreach path
$paths {
2330 switch
-glob -- [lindex
$file_states($path) 0] {
2339 lappend pathList
$path
2340 if {$path eq
$current_diff} {
2341 set after
{reshow_diff
;}
2346 if {$pathList eq
{}} {
2352 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2356 proc do_include_selection
{} {
2357 global current_diff selected_paths
2359 if {[array size selected_paths
] > 0} {
2361 {Including selected files
} \
2362 [array names selected_paths
]
2363 } elseif
{$current_diff ne
{}} {
2365 "Including [short_path $current_diff]" \
2366 [list
$current_diff]
2370 proc do_include_all
{} {
2374 foreach path
[array names file_states
] {
2375 switch
-- [lindex
$file_states($path) 0] {
2381 _D
{lappend paths
$path}
2385 {Including all modified files
} \
2389 proc revert_helper
{txt paths
} {
2390 global gitdir appname
2391 global file_states current_diff
2393 if {![lock_index begin-update
]} return
2397 foreach path
$paths {
2398 switch
-glob -- [lindex
$file_states($path) 0] {
2405 lappend pathList
$path
2406 if {$path eq
$current_diff} {
2407 set after
{reshow_diff
;}
2413 set n
[llength
$pathList]
2417 } elseif
{$n == 1} {
2418 set s
"[short_path [lindex $pathList]]"
2420 set s
"these $n files"
2423 set reponame
[lindex
[file split \
2424 [file normalize
[file dirname $gitdir]]] \
2427 set reply
[tk_dialog \
2429 "$appname ($reponame)" \
2430 "Revert unincluded changes in $s?
2432 Any unincluded changes will be permanently lost by the revert." \
2442 [concat
$after {set ui_status_value
{Ready.
}}]
2448 proc do_revert_selection
{} {
2449 global current_diff selected_paths
2451 if {[array size selected_paths
] > 0} {
2453 {Reverting selected files
} \
2454 [array names selected_paths
]
2455 } elseif
{$current_diff ne
{}} {
2457 "Reverting [short_path $current_diff]" \
2458 [list
$current_diff]
2462 proc do_signoff
{} {
2465 set me
[committer_ident
]
2466 if {$me eq
{}} return
2468 set sob
"Signed-off-by: $me"
2469 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2470 if {$last ne
$sob} {
2471 $ui_comm edit separator
2473 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2474 $ui_comm insert end
"\n"
2476 $ui_comm insert end
"\n$sob"
2477 $ui_comm edit separator
2482 proc do_select_commit_type
{} {
2483 global commit_type selected_commit_type
2485 if {$selected_commit_type eq
{new
}
2486 && [string match amend
* $commit_type]} {
2488 } elseif
{$selected_commit_type eq
{amend
}
2489 && ![string match amend
* $commit_type]} {
2492 # The amend request was rejected...
2494 if {![string match amend
* $commit_type]} {
2495 set selected_commit_type new
2505 global appname copyright
2506 global tcl_patchLevel tk_patchLevel
2510 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2512 label
$w.header
-text "About $appname" \
2514 pack
$w.header
-side top
-fill x
2517 button
$w.buttons.close
-text {Close
} \
2519 -command [list destroy
$w]
2520 pack
$w.buttons.close
-side right
2521 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2524 -text "$appname - a commit creation tool for Git.
2532 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
2534 set v
[exec git
--version]
2536 if {$tcl_patchLevel eq
$tk_patchLevel} {
2537 append v
"Tcl/Tk version $tcl_patchLevel"
2539 append v
"Tcl version $tcl_patchLevel"
2540 append v
", Tk version $tk_patchLevel"
2551 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
2553 bind $w <Visibility
> "grab $w; focus $w"
2554 bind $w <Key-Escape
> "destroy $w"
2555 wm title
$w "About $appname"
2559 proc do_options
{} {
2560 global appname gitdir font_descs
2561 global repo_config global_config
2562 global repo_config_new global_config_new
2564 array
unset repo_config_new
2565 array
unset global_config_new
2566 foreach name
[array names repo_config
] {
2567 set repo_config_new
($name) $repo_config($name)
2570 foreach name
[array names repo_config
] {
2572 gui.diffcontext
{continue}
2574 set repo_config_new
($name) $repo_config($name)
2576 foreach name
[array names global_config
] {
2577 set global_config_new
($name) $global_config($name)
2579 set reponame
[lindex
[file split \
2580 [file normalize
[file dirname $gitdir]]] \
2583 set w .options_editor
2585 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2587 label
$w.header
-text "$appname Options" \
2589 pack
$w.header
-side top
-fill x
2592 button
$w.buttons.restore
-text {Restore Defaults
} \
2594 -command do_restore_defaults
2595 pack
$w.buttons.restore
-side left
2596 button
$w.buttons.save
-text Save \
2598 -command [list do_save_config
$w]
2599 pack
$w.buttons.save
-side right
2600 button
$w.buttons.cancel
-text {Cancel
} \
2602 -command [list destroy
$w]
2603 pack
$w.buttons.cancel
-side right
2604 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2606 labelframe
$w.repo
-text "$reponame Repository" \
2608 -relief raised
-borderwidth 2
2609 labelframe
$w.global
-text {Global
(All Repositories
)} \
2611 -relief raised
-borderwidth 2
2612 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
2613 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
2616 {b partialinclude
{Allow Partially Included Files
}}
2617 {b pullsummary
{Show Pull Summary
}}
2618 {b trustmtime
{Trust File Modification Timestamps
}}
2619 {i diffcontext
{Number of Diff Context Lines
}}
2621 set type [lindex
$option 0]
2622 set name
[lindex
$option 1]
2623 set text
[lindex
$option 2]
2624 foreach f
{repo global
} {
2627 checkbutton
$w.
$f.
$name -text $text \
2628 -variable ${f}_config_new
(gui.
$name) \
2632 pack
$w.
$f.
$name -side top
-anchor w
2636 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
2637 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
2638 spinbox
$w.
$f.
$name.v \
2639 -textvariable ${f}_config_new
(gui.
$name) \
2640 -from 1 -to 99 -increment 1 \
2643 pack
$w.
$f.
$name.v
-side right
-anchor e
2644 pack
$w.
$f.
$name -side top
-anchor w
-fill x
2650 set all_fonts
[lsort
[font families
]]
2651 foreach option
$font_descs {
2652 set name
[lindex
$option 0]
2653 set font
[lindex
$option 1]
2654 set text
[lindex
$option 2]
2656 set global_config_new
(gui.
$font^^family
) \
2657 [font configure
$font -family]
2658 set global_config_new
(gui.
$font^^size
) \
2659 [font configure
$font -size]
2661 frame
$w.global.
$name
2662 label
$w.global.
$name.l
-text "$text:" -font font_ui
2663 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
2664 eval tk_optionMenu
$w.global.
$name.family \
2665 global_config_new
(gui.
$font^^family
) \
2667 spinbox
$w.global.
$name.size \
2668 -textvariable global_config_new
(gui.
$font^^size
) \
2669 -from 2 -to 80 -increment 1 \
2672 pack
$w.global.
$name.size
-side right
-anchor e
2673 pack
$w.global.
$name.family
-side right
-anchor e
2674 pack
$w.global.
$name -side top
-anchor w
-fill x
2677 bind $w <Visibility
> "grab $w; focus $w"
2678 bind $w <Key-Escape
> "destroy $w"
2679 wm title
$w "$appname ($reponame): Options"
2683 proc do_restore_defaults
{} {
2684 global font_descs default_config repo_config
2685 global repo_config_new global_config_new
2687 foreach name
[array names default_config
] {
2688 set repo_config_new
($name) $default_config($name)
2689 set global_config_new
($name) $default_config($name)
2692 foreach option
$font_descs {
2693 set name
[lindex
$option 0]
2694 set repo_config
(gui.
$name) $default_config(gui.
$name)
2698 foreach option
$font_descs {
2699 set name
[lindex
$option 0]
2700 set font
[lindex
$option 1]
2701 set global_config_new
(gui.
$font^^family
) \
2702 [font configure
$font -family]
2703 set global_config_new
(gui.
$font^^size
) \
2704 [font configure
$font -size]
2708 proc do_save_config
{w
} {
2709 if {[catch
{save_config
} err
]} {
2710 error_popup
"Failed to completely save options:\n\n$err"
2716 proc do_windows_shortcut
{} {
2717 global gitdir appname argv0
2719 set reponame
[lindex
[file split \
2720 [file normalize
[file dirname $gitdir]]] \
2724 set desktop
[exec cygpath \
2732 set fn
[tk_getSaveFile \
2734 -title "$appname ($reponame): Create Desktop Icon" \
2735 -initialdir $desktop \
2736 -initialfile "Git $reponame.bat"]
2740 set sh
[exec cygpath \
2745 set me
[exec cygpath \
2749 set gd
[exec cygpath \
2753 regsub
-all ' $me "'\\''" me
2754 regsub -all ' $gd "'\\''" gd
2755 puts -nonewline $fd "\"$sh\" --login -c \""
2756 puts -nonewline $fd "GIT_DIR='$gd'"
2757 puts -nonewline $fd " '$me'"
2761 error_popup "Cannot write script:\n\n$err"
2766 proc do_macosx_app {} {
2767 global gitdir appname argv0 env
2769 set reponame [lindex [file split \
2770 [file normalize [file dirname $gitdir]]] \
2773 set fn [tk_getSaveFile \
2775 -title "$appname ($reponame): Create Desktop Icon" \
2776 -initialdir [file join $env(HOME) Desktop] \
2777 -initialfile "Git $reponame.app"]
2780 set Contents [file join $fn Contents]
2781 set MacOS [file join $Contents MacOS]
2782 set exe [file join $MacOS git-gui]
2786 set fd [open [file join $Contents Info.plist] w]
2787 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2788 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2789 <plist version="1.0">
2791 <key>CFBundleDevelopmentRegion</key>
2792 <string>English</string>
2793 <key>CFBundleExecutable</key>
2794 <string>git-gui</string>
2795 <key>CFBundleIdentifier</key>
2796 <string>org.spearce.git-gui</string>
2797 <key>CFBundleInfoDictionaryVersion</key>
2798 <string>6.0</string>
2799 <key>CFBundlePackageType</key>
2800 <string>APPL</string>
2801 <key>CFBundleSignature</key>
2802 <string>????</string>
2803 <key>CFBundleVersion</key>
2804 <string>1.0</string>
2805 <key>NSPrincipalClass</key>
2806 <string>NSApplication</string>
2811 set fd [open $exe w]
2812 set gd [file normalize $gitdir]
2813 set ep [file normalize [exec git --exec-path]]
2814 regsub -all ' $gd "'\\''" gd
2815 regsub
-all ' $ep "'\\''" ep
2816 puts $fd "#!/bin/sh"
2817 foreach name
[array names env
] {
2818 if {[string match GIT_
* $name]} {
2819 regsub
-all ' $env($name) "'\\''" v
2820 puts $fd "export $name='$v'"
2823 puts $fd "export PATH
='$ep':\
$PATH"
2824 puts $fd "export GIT_DIR
='$gd'"
2825 puts $fd "exec [file normalize
$argv0]"
2828 file attributes $exe -permissions u+x,g+x,o+x
2830 error_popup "Cannot
write icon
:\n\n$err"
2835 proc toggle_or_diff {w x y} {
2836 global file_states file_lists current_diff ui_index ui_other
2837 global last_clicked selected_paths
2839 set pos [split [$w index @$x,$y] .]
2840 set lno [lindex $pos 0]
2841 set col [lindex $pos 1]
2842 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2848 set last_clicked [list $w $lno]
2849 array unset selected_paths
2850 $ui_index tag remove in_sel 0.0 end
2851 $ui_other tag remove in_sel 0.0 end
2854 if {$current_diff eq $path} {
2855 set after {reshow_diff;}
2859 switch -glob -- [lindex $file_states($path) 0] {
2866 "Removing
[short_path
$path] from commit
" \
2868 [concat $after {set ui_status_value {Ready.}}]
2872 "Including
[short_path
$path]" \
2874 [concat $after {set ui_status_value {Ready.}}]
2878 show_diff $path $w $lno
2882 proc add_one_to_selection {w x y} {
2884 global last_clicked selected_paths
2886 set pos [split [$w index @$x,$y] .]
2887 set lno [lindex $pos 0]
2888 set col [lindex $pos 1]
2889 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2895 set last_clicked [list $w $lno]
2896 if {[catch {set in_sel $selected_paths($path)}]} {
2900 unset selected_paths($path)
2901 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2903 set selected_paths($path) 1
2904 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2908 proc add_range_to_selection {w x y} {
2910 global last_clicked selected_paths
2912 if {[lindex $last_clicked 0] ne $w} {
2913 toggle_or_diff $w $x $y
2917 set pos [split [$w index @$x,$y] .]
2918 set lno [lindex $pos 0]
2919 set lc [lindex $last_clicked 1]
2928 foreach path [lrange $file_lists($w) \
2929 [expr {$begin - 1}] \
2930 [expr {$end - 1}]] {
2931 set selected_paths($path) 1
2933 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2936 ######################################################################
2940 set cursor_ptr arrow
2941 font create font_diff -family Courier -size 10
2945 eval font configure font_ui [font actual [.dummy cget -font]]
2949 font create font_uibold
2950 font create font_diffbold
2955 } elseif {[is_MacOSX]} {
2963 proc apply_config {} {
2964 global repo_config font_descs
2966 foreach option $font_descs {
2967 set name [lindex $option 0]
2968 set font [lindex $option 1]
2970 foreach {cn cv} $repo_config(gui.$name) {
2971 font configure $font $cn $cv
2974 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
2976 foreach {cn cv} [font configure $font] {
2977 font configure ${font}bold $cn $cv
2979 font configure ${font}bold -weight bold
2983 set default_config(gui.trustmtime) false
2984 set default_config(gui.pullsummary) true
2985 set default_config(gui.partialinclude) false
2986 set default_config(gui.diffcontext) 5
2987 set default_config(gui.fontui) [font configure font_ui]
2988 set default_config(gui.fontdiff) [font configure font_diff]
2990 {fontui font_ui {Main Font}}
2991 {fontdiff font_diff {Diff/Console Font}}
2996 ######################################################################
3002 menu .mbar -tearoff 0
3003 .mbar add cascade -label Repository -menu .mbar.repository
3004 .mbar add cascade -label Edit -menu .mbar.edit
3005 if {!$single_commit} {
3006 .mbar add cascade -label Branch -menu .mbar.branch
3008 .mbar add cascade -label Commit -menu .mbar.commit
3009 if {!$single_commit} {
3010 .mbar add cascade -label Fetch -menu .mbar.fetch
3011 .mbar add cascade -label Pull -menu .mbar.pull
3012 .mbar add cascade -label Push -menu .mbar.push
3014 . configure -menu .mbar
3016 # -- Repository Menu
3018 menu .mbar.repository
3019 .mbar.repository add command \
3020 -label {Visualize Current Branch} \
3021 -command {do_gitk {}} \
3024 .mbar.repository add command \
3025 -label {Visualize All Branches} \
3026 -command {do_gitk {--all}} \
3029 .mbar.repository add separator
3031 if {!$single_commit} {
3032 .mbar.repository add command -label {Compress Database} \
3036 .mbar.repository add command -label {Verify Database} \
3037 -command do_fsck_objects \
3040 .mbar.repository add separator
3043 .mbar.repository add command \
3044 -label {Create Desktop Icon} \
3045 -command do_windows_shortcut \
3047 } elseif {[is_MacOSX]} {
3048 .mbar.repository add command \
3049 -label {Create Desktop Icon} \
3050 -command do_macosx_app \
3055 .mbar.repository add command -label Quit \
3057 -accelerator $M1T-Q \
3063 .mbar.edit add command -label Undo \
3064 -command {catch {[focus] edit undo}} \
3065 -accelerator $M1T-Z \
3067 .mbar.edit add command -label Redo \
3068 -command {catch {[focus] edit redo}} \
3069 -accelerator $M1T-Y \
3071 .mbar.edit add separator
3072 .mbar.edit add command -label Cut \
3073 -command {catch {tk_textCut [focus]}} \
3074 -accelerator $M1T-X \
3076 .mbar.edit add command -label Copy \
3077 -command {catch {tk_textCopy [focus]}} \
3078 -accelerator $M1T-C \
3080 .mbar.edit add command -label Paste \
3081 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3082 -accelerator $M1T-V \
3084 .mbar.edit add command -label Delete \
3085 -command {catch {[focus] delete sel.first sel.last}} \
3088 .mbar.edit add separator
3089 .mbar.edit add command -label {Select All} \
3090 -command {catch {[focus] tag add sel 0.0 end}} \
3091 -accelerator $M1T-A \
3096 if {!$single_commit} {
3099 .mbar.branch add command -label {Create...} \
3100 -command do_create_branch \
3102 lappend disable_on_lock [list .mbar.branch entryconf \
3103 [.mbar.branch index last] -state]
3105 .mbar.branch add command -label {Delete...} \
3106 -command do_delete_branch \
3108 lappend disable_on_lock [list .mbar.branch entryconf \
3109 [.mbar.branch index last] -state]
3116 .mbar.commit add radiobutton \
3117 -label {New Commit} \
3118 -command do_select_commit_type \
3119 -variable selected_commit_type \
3122 lappend disable_on_lock \
3123 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3125 .mbar.commit add radiobutton \
3126 -label {Amend Last Commit} \
3127 -command do_select_commit_type \
3128 -variable selected_commit_type \
3131 lappend disable_on_lock \
3132 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3134 .mbar.commit add separator
3136 .mbar.commit add command -label Rescan \
3137 -command do_rescan \
3140 lappend disable_on_lock \
3141 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3143 .mbar.commit add command -label {Add To Commit} \
3144 -command do_include_selection \
3146 lappend disable_on_lock \
3147 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3149 .mbar.commit add command -label {Add All To Commit} \
3150 -command do_include_all \
3151 -accelerator $M1T-I \
3153 lappend disable_on_lock \
3154 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3156 .mbar.commit add command -label {Remove From Commit} \
3157 -command do_remove_selection \
3159 lappend disable_on_lock \
3160 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3162 .mbar.commit add command -label {Revert Changes} \
3163 -command do_revert_selection \
3165 lappend disable_on_lock \
3166 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3168 .mbar.commit add separator
3170 .mbar.commit add command -label {Sign Off} \
3171 -command do_signoff \
3172 -accelerator $M1T-S \
3175 .mbar.commit add command -label Commit \
3176 -command do_commit \
3177 -accelerator $M1T-Return \
3179 lappend disable_on_lock \
3180 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3182 # -- Transport menus
3184 if {!$single_commit} {
3191 # -- Apple Menu (Mac OS X only)
3193 .mbar add cascade -label Apple -menu .mbar.apple
3196 .mbar.apple add command -label "About
$appname" \
3199 .mbar.apple add command -label "$appname Options...
" \
3200 -command do_options \
3205 .mbar.edit add separator
3206 .mbar.edit add command -label {Options...} \
3207 -command do_options \
3212 if {[file exists /usr/local/miga/lib/gui-miga]} {
3214 global gitdir ui_status_value
3215 if {![lock_index update]} return
3216 set cmd [list sh --login -c "/usr
/local
/miga
/lib
/gui-miga
\"[pwd]\""]
3217 set miga_fd [open "|
$cmd" r]
3218 fconfigure $miga_fd -blocking 0
3219 fileevent $miga_fd readable [list miga_done $miga_fd]
3220 set ui_status_value {Running miga...}
3222 proc miga_done {fd} {
3227 rescan [list set ui_status_value {Ready.}]
3230 .mbar add cascade -label Tools -menu .mbar.tools
3232 .mbar.tools add command -label "Migrate
" \
3235 lappend disable_on_lock \
3236 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3241 .mbar add cascade -label Help -menu .mbar.help
3244 .mbar.help add command -label "About
$appname" \
3256 -text {Current Branch:} \
3261 -textvariable current_branch \
3265 pack .branch.l1 -side left
3266 pack .branch.cb -side left -fill x
3267 pack .branch -side top -fill x
3269 # -- Main Window Layout
3271 panedwindow .vpane -orient vertical
3272 panedwindow .vpane.files -orient horizontal
3273 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3274 pack .vpane -anchor n -side top -fill both -expand 1
3276 # -- Index File List
3278 frame .vpane.files.index -height 100 -width 400
3279 label .vpane.files.index.title -text {Modified Files} \
3282 text $ui_index -background white -borderwidth 0 \
3283 -width 40 -height 10 \
3285 -cursor $cursor_ptr \
3286 -yscrollcommand {.vpane.files.index.sb set} \
3288 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3289 pack .vpane.files.index.title -side top -fill x
3290 pack .vpane.files.index.sb -side right -fill y
3291 pack $ui_index -side left -fill both -expand 1
3292 .vpane.files add .vpane.files.index -sticky nsew
3294 # -- Other (Add) File List
3296 frame .vpane.files.other -height 100 -width 100
3297 label .vpane.files.other.title -text {Untracked Files} \
3300 text $ui_other -background white -borderwidth 0 \
3301 -width 40 -height 10 \
3303 -cursor $cursor_ptr \
3304 -yscrollcommand {.vpane.files.other.sb set} \
3306 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
3307 pack .vpane.files.other.title -side top -fill x
3308 pack .vpane.files.other.sb -side right -fill y
3309 pack $ui_other -side left -fill both -expand 1
3310 .vpane.files add .vpane.files.other -sticky nsew
3312 foreach i [list $ui_index $ui_other] {
3313 $i tag conf in_diff -font font_uibold
3314 $i tag conf in_sel \
3315 -background [$i cget -foreground] \
3316 -foreground [$i cget -background]
3320 # -- Diff and Commit Area
3322 frame .vpane.lower -height 300 -width 400
3323 frame .vpane.lower.commarea
3324 frame .vpane.lower.diff -relief sunken -borderwidth 1
3325 pack .vpane.lower.commarea -side top -fill x
3326 pack .vpane.lower.diff -side bottom -fill both -expand 1
3327 .vpane add .vpane.lower -stick nsew
3329 # -- Commit Area Buttons
3331 frame .vpane.lower.commarea.buttons
3332 label .vpane.lower.commarea.buttons.l -text {} \
3336 pack .vpane.lower.commarea.buttons.l -side top -fill x
3337 pack .vpane.lower.commarea.buttons -side left -fill y
3339 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3340 -command do_rescan \
3342 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3343 lappend disable_on_lock \
3344 {.vpane.lower.commarea.buttons.rescan conf -state}
3346 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3347 -command do_include_all \
3349 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3350 lappend disable_on_lock \
3351 {.vpane.lower.commarea.buttons.incall conf -state}
3353 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3354 -command do_signoff \
3356 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3358 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3359 -command do_commit \
3361 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3362 lappend disable_on_lock \
3363 {.vpane.lower.commarea.buttons.commit conf -state}
3365 # -- Commit Message Buffer
3367 frame .vpane.lower.commarea.buffer
3368 frame .vpane.lower.commarea.buffer.header
3369 set ui_comm .vpane.lower.commarea.buffer.t
3370 set ui_coml .vpane.lower.commarea.buffer.header.l
3371 radiobutton .vpane.lower.commarea.buffer.header.new \
3372 -text {New Commit} \
3373 -command do_select_commit_type \
3374 -variable selected_commit_type \
3377 lappend disable_on_lock \
3378 [list .vpane.lower.commarea.buffer.header.new conf -state]
3379 radiobutton .vpane.lower.commarea.buffer.header.amend \
3380 -text {Amend Last Commit} \
3381 -command do_select_commit_type \
3382 -variable selected_commit_type \
3385 lappend disable_on_lock \
3386 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3391 proc trace_commit_type {varname args} {
3392 global ui_coml commit_type
3393 switch -glob -- $commit_type {
3394 initial {set txt {Initial Commit Message:}}
3395 amend {set txt {Amended Commit Message:}}
3396 amend-initial {set txt {Amended Initial Commit Message:}}
3397 amend-merge {set txt {Amended Merge Commit Message:}}
3398 merge {set txt {Merge Commit Message:}}
3399 * {set txt {Commit Message:}}
3401 $ui_coml conf -text $txt
3403 trace add variable commit_type write trace_commit_type
3404 pack $ui_coml -side left -fill x
3405 pack .vpane.lower.commarea.buffer.header.amend -side right
3406 pack .vpane.lower.commarea.buffer.header.new -side right
3408 text $ui_comm -background white -borderwidth 1 \
3411 -autoseparators true \
3413 -width 75 -height 9 -wrap none \
3415 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3416 scrollbar .vpane.lower.commarea.buffer.sby \
3417 -command [list $ui_comm yview]
3418 pack .vpane.lower.commarea.buffer.header -side top -fill x
3419 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3420 pack $ui_comm -side left -fill y
3421 pack .vpane.lower.commarea.buffer -side left -fill y
3423 # -- Commit Message Buffer Context Menu
3425 set ctxm .vpane.lower.commarea.buffer.ctxm
3426 menu $ctxm -tearoff 0
3430 -command {tk_textCut $ui_comm}
3434 -command {tk_textCopy $ui_comm}
3438 -command {tk_textPaste $ui_comm}
3442 -command {$ui_comm delete sel.first sel.last}
3445 -label {Select All} \
3447 -command {$ui_comm tag add sel 0.0 end}
3452 $ui_comm tag add sel 0.0 end
3453 tk_textCopy $ui_comm
3454 $ui_comm tag remove sel 0.0 end
3461 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
3466 set diff_actions [list]
3467 proc trace_current_diff {varname args} {
3468 global current_diff diff_actions file_states
3469 if {$current_diff eq {}} {
3476 set s [mapdesc [lindex $file_states($p) 0] $p]
3478 set p [escape_path $p]
3482 .vpane.lower.diff.header.status configure -text $s
3483 .vpane.lower.diff.header.file configure -text $f
3484 .vpane.lower.diff.header.path configure -text $p
3485 foreach w $diff_actions {
3489 trace add variable current_diff write trace_current_diff
3491 frame .vpane.lower.diff.header -background orange
3492 label .vpane.lower.diff.header.status \
3493 -background orange \
3494 -width $max_status_desc \
3498 label .vpane.lower.diff.header.file \
3499 -background orange \
3503 label .vpane.lower.diff.header.path \
3504 -background orange \
3508 pack .vpane.lower.diff.header.status -side left
3509 pack .vpane.lower.diff.header.file -side left
3510 pack .vpane.lower.diff.header.path -fill x
3511 set ctxm .vpane.lower.diff.header.ctxm
3512 menu $ctxm -tearoff 0
3523 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3524 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
3528 frame .vpane.lower.diff.body
3529 set ui_diff .vpane.lower.diff.body.t
3530 text $ui_diff -background white -borderwidth 0 \
3531 -width 80 -height 15 -wrap none \
3533 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3534 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3536 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3537 -command [list $ui_diff xview]
3538 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3539 -command [list $ui_diff yview]
3540 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3541 pack .vpane.lower.diff.body.sby -side right -fill y
3542 pack $ui_diff -side left -fill both -expand 1
3543 pack .vpane.lower.diff.header -side top -fill x
3544 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3546 $ui_diff tag conf d_@ -font font_diffbold
3547 $ui_diff tag conf d_+ -foreground blue
3548 $ui_diff tag conf d_- -foreground red
3549 $ui_diff tag conf d_++ -foreground {#00a000}
3550 $ui_diff tag conf d_-- -foreground {#a000a0}
3551 $ui_diff tag conf d_+- \
3553 -background {light goldenrod yellow}
3554 $ui_diff tag conf d_-+ \
3558 # -- Diff Body Context Menu
3560 set ctxm .vpane.lower.diff.body.ctxm
3561 menu $ctxm -tearoff 0
3565 -command {tk_textCopy $ui_diff}
3566 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3568 -label {Select All} \
3570 -command {$ui_diff tag add sel 0.0 end}
3571 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3576 $ui_diff tag add sel 0.0 end
3577 tk_textCopy $ui_diff
3578 $ui_diff tag remove sel 0.0 end
3580 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3583 -label {Decrease Font Size} \
3585 -command {incr_font_size font_diff -1}
3586 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3588 -label {Increase Font Size} \
3590 -command {incr_font_size font_diff 1}
3591 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3594 -label {Show Less Context} \
3596 -command {if {$repo_config(gui.diffcontext) >= 2} {
3597 incr repo_config(gui.diffcontext) -1
3600 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3602 -label {Show More Context} \
3605 incr repo_config(gui.diffcontext)
3608 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3610 $ctxm add command -label {Options...} \
3613 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
3617 set ui_status_value {Initializing...}
3618 label .status -textvariable ui_status_value \
3624 pack .status -anchor w -side bottom -fill x
3629 set gm $repo_config(gui.geometry)
3630 wm geometry . [lindex $gm 0]
3631 .vpane sash place 0 \
3632 [lindex [.vpane sash coord 0] 0] \
3634 .vpane.files sash place 0 \
3636 [lindex [.vpane.files sash coord 0] 1]
3642 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3643 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3644 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3645 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3646 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3647 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3648 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3649 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3650 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3651 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3652 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3654 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3655 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3656 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3657 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3658 bind $ui_diff <$M1B-Key-v> {break}
3659 bind $ui_diff <$M1B-Key-V> {break}
3660 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3661 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3662 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3663 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3664 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3665 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3667 bind . <Destroy> do_quit
3668 bind all <Key-F5> do_rescan
3669 bind all <$M1B-Key-r> do_rescan
3670 bind all <$M1B-Key-R> do_rescan
3671 bind . <$M1B-Key-s> do_signoff
3672 bind . <$M1B-Key-S> do_signoff
3673 bind . <$M1B-Key-i> do_include_all
3674 bind . <$M1B-Key-I> do_include_all
3675 bind . <$M1B-Key-Return> do_commit
3676 bind all <$M1B-Key-q> do_quit
3677 bind all <$M1B-Key-Q> do_quit
3678 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3679 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3680 foreach i [list $ui_index $ui_other] {
3681 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
3682 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
3683 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
3687 set file_lists($ui_index) [list]
3688 set file_lists($ui_other) [list]
3692 set MERGE_HEAD [list]
3695 set current_branch {}
3697 set selected_commit_type new
3699 wm title . "$appname ([file normalize
[file dirname $gitdir]])"
3700 focus -force $ui_comm
3702 # -- Warn the user about environmental problems. Cygwin's Tcl
3703 # does *not* pass its env array onto any processes it spawns.
3704 # This means that git processes get none of our environment.
3709 set msg "Possible environment issues exist.
3711 The following environment variables are probably
3712 going to be ignored by any Git subprocess run
3716 foreach name [array names env] {
3717 switch -regexp -- $name {
3718 {^GIT_INDEX_FILE$} -
3719 {^GIT_OBJECT_DIRECTORY$} -
3720 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3722 {^GIT_EXTERNAL_DIFF$} -
3726 {^GIT_CONFIG_LOCAL$} -
3727 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3728 append msg " - $name\n"
3731 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3732 append msg " - $name\n"
3734 set suggest_user $name
3738 if {$ignored_env > 0} {
3740 This is due to a known issue with the
3741 Tcl binary distributed by Cygwin.
"
3743 if {$suggest_user ne {}} {
3746 A good replacement
for $suggest_user
3747 is placing values
for the user.name and
3748 user.email settings into your personal
3754 unset ignored_env msg suggest_user name
3757 # -- Only initialize complex UI if we are going to stay running.
3759 if {!$single_commit} {
3763 populate_branch_menu .mbar.branch
3764 populate_fetch_menu .mbar.fetch
3765 populate_pull_menu .mbar.pull
3766 populate_push_menu .mbar.push
3769 lock_index begin-read