2 # Tcl ignores the next line -*- tcl -*- \
5 # Copyright (C) 2006 Shawn Pearce, Paul Mackerras. All rights reserved.
6 # This program is free software; it may be used, copied, modified
7 # and distributed under the terms of the GNU General Public Licence,
8 # either version 2, or (at your option) any later version.
10 set appname
[lindex
[file split $argv0] end
]
13 ######################################################################
17 proc is_many_config
{name
} {
18 switch
-glob -- $name {
27 proc load_config
{include_global
} {
28 global repo_config global_config default_config
30 array
unset global_config
31 if {$include_global} {
33 set fd_rc
[open
"| git repo-config --global --list" r
]
34 while {[gets
$fd_rc line
] >= 0} {
35 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
36 if {[is_many_config
$name]} {
37 lappend global_config
($name) $value
39 set global_config
($name) $value
47 array
unset repo_config
49 set fd_rc
[open
"| git repo-config --list" r
]
50 while {[gets
$fd_rc line
] >= 0} {
51 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
52 if {[is_many_config
$name]} {
53 lappend repo_config
($name) $value
55 set repo_config
($name) $value
62 foreach name
[array names default_config
] {
63 if {[catch
{set v
$global_config($name)}]} {
64 set global_config
($name) $default_config($name)
66 if {[catch
{set v
$repo_config($name)}]} {
67 set repo_config
($name) $default_config($name)
73 global default_config font_descs
74 global repo_config global_config
75 global repo_config_new global_config_new
77 foreach option
$font_descs {
78 set name
[lindex
$option 0]
79 set font
[lindex
$option 1]
80 font configure
$font \
81 -family $global_config_new(gui.
$font^^family
) \
82 -size $global_config_new(gui.
$font^^size
)
83 font configure
${font}bold \
84 -family $global_config_new(gui.
$font^^family
) \
85 -size $global_config_new(gui.
$font^^size
)
86 set global_config_new
(gui.
$name) [font configure
$font]
87 unset global_config_new
(gui.
$font^^family
)
88 unset global_config_new
(gui.
$font^^size
)
91 foreach name
[array names default_config
] {
92 set value
$global_config_new($name)
93 if {$value ne
$global_config($name)} {
94 if {$value eq
$default_config($name)} {
95 catch
{exec git repo-config
--global --unset $name}
97 regsub
-all "\[{}\]" $value {"} value
98 exec git repo-config --global $name $value
100 set global_config($name) $value
101 if {$value eq $repo_config($name)} {
102 catch {exec git repo-config --unset $name}
103 set repo_config($name) $value
108 foreach name [array names default_config] {
109 set value $repo_config_new($name)
110 if {$value ne $repo_config($name)} {
111 if {$value eq $global_config($name)} {
112 catch {exec git repo-config --unset $name}
114 regsub -all "\
[{}\
]" $value {"} value
115 exec git repo-config
$name $value
117 set repo_config
($name) $value
122 proc error_popup
{msg
} {
123 global gitdir appname
128 append title
[lindex \
129 [file split [file normalize
[file dirname $gitdir]]] \
133 set cmd
[list tk_messageBox \
136 -title "$title: error" \
138 if {[winfo ismapped .
]} {
139 lappend cmd
-parent .
144 proc info_popup
{msg
} {
145 global gitdir appname
150 append title
[lindex \
151 [file split [file normalize
[file dirname $gitdir]]] \
163 ######################################################################
167 if { [catch
{set gitdir
$env(GIT_DIR
)}]
168 && [catch
{set gitdir
[exec git rev-parse
--git-dir]} err
]} {
169 catch
{wm withdraw .
}
170 error_popup
"Cannot find the git directory:\n\n$err"
173 if {![file isdirectory
$gitdir]} {
174 catch
{wm withdraw .
}
175 error_popup
"Git directory not found:\n\n$gitdir"
178 if {[lindex
[file split $gitdir] end
] ne
{.git
}} {
179 catch
{wm withdraw .
}
180 error_popup
"Cannot use funny .git directory:\n\n$gitdir"
183 if {[catch
{cd [file dirname $gitdir]} err
]} {
184 catch
{wm withdraw .
}
185 error_popup
"No working directory [file dirname $gitdir]:\n\n$err"
190 if {$appname eq
{git-citool
}} {
194 ######################################################################
202 set disable_on_lock
[list
]
203 set index_lock_type none
205 proc lock_index
{type} {
206 global index_lock_type disable_on_lock
208 if {$index_lock_type eq
{none
}} {
209 set index_lock_type
$type
210 foreach w
$disable_on_lock {
211 uplevel
#0 $w disabled
214 } elseif
{$index_lock_type eq
"begin-$type"} {
215 set index_lock_type
$type
221 proc unlock_index
{} {
222 global index_lock_type disable_on_lock
224 set index_lock_type none
225 foreach w
$disable_on_lock {
230 ######################################################################
234 proc repository_state
{ctvar hdvar mhvar
} {
236 upvar
$ctvar ct
$hdvar hd
$mhvar mh
240 if {[catch
{set hd
[exec git rev-parse
--verify HEAD
]}]} {
246 set merge_head
[file join $gitdir MERGE_HEAD
]
247 if {[file exists
$merge_head]} {
249 set fd_mh
[open
$merge_head r
]
250 while {[gets
$fd_mh line
] >= 0} {
261 global PARENT empty_tree
263 set p
[lindex
$PARENT 0]
267 if {$empty_tree eq
{}} {
268 set empty_tree
[exec git mktree
<< {}]
273 proc rescan
{after
} {
274 global HEAD PARENT MERGE_HEAD commit_type
275 global ui_index ui_other ui_status_value ui_comm
276 global rescan_active file_states
279 if {$rescan_active > 0 ||
![lock_index
read]} return
281 repository_state newType newHEAD newMERGE_HEAD
282 if {[string match amend
* $commit_type]
283 && $newType eq
{normal
}
284 && $newHEAD eq
$HEAD} {
288 set MERGE_HEAD
$newMERGE_HEAD
289 set commit_type
$newType
292 array
unset file_states
294 if {![$ui_comm edit modified
]
295 ||
[string trim
[$ui_comm get
0.0 end
]] eq
{}} {
296 if {[load_message GITGUI_MSG
]} {
297 } elseif
{[load_message MERGE_MSG
]} {
298 } elseif
{[load_message SQUASH_MSG
]} {
300 $ui_comm edit modified false
304 if {$repo_config(gui.trustmtime
) eq
{true
}} {
305 rescan_stage2
{} $after
308 set ui_status_value
{Refreshing
file status...
}
309 set cmd
[list git update-index
]
311 lappend cmd
--unmerged
312 lappend cmd
--ignore-missing
313 lappend cmd
--refresh
314 set fd_rf
[open
"| $cmd" r
]
315 fconfigure
$fd_rf -blocking 0 -translation binary
316 fileevent
$fd_rf readable \
317 [list rescan_stage2
$fd_rf $after]
321 proc rescan_stage2
{fd after
} {
322 global gitdir ui_status_value
323 global rescan_active buf_rdi buf_rdf buf_rlo
327 if {![eof
$fd]} return
331 set ls_others
[list | git ls-files
--others -z \
332 --exclude-per-directory=.gitignore
]
333 set info_exclude
[file join $gitdir info exclude
]
334 if {[file readable
$info_exclude]} {
335 lappend ls_others
"--exclude-from=$info_exclude"
343 set ui_status_value
{Scanning
for modified files ...
}
344 set fd_di
[open
"| git diff-index --cached -z [PARENT]" r
]
345 set fd_df
[open
"| git diff-files -z" r
]
346 set fd_lo
[open
$ls_others r
]
348 fconfigure
$fd_di -blocking 0 -translation binary
349 fconfigure
$fd_df -blocking 0 -translation binary
350 fconfigure
$fd_lo -blocking 0 -translation binary
351 fileevent
$fd_di readable
[list read_diff_index
$fd_di $after]
352 fileevent
$fd_df readable
[list read_diff_files
$fd_df $after]
353 fileevent
$fd_lo readable
[list read_ls_others
$fd_lo $after]
356 proc load_message
{file} {
357 global gitdir ui_comm
359 set f
[file join $gitdir $file]
360 if {[file isfile
$f]} {
361 if {[catch
{set fd
[open
$f r
]}]} {
364 set content
[string trim
[read $fd]]
366 $ui_comm delete
0.0 end
367 $ui_comm insert end
$content
373 proc read_diff_index
{fd after
} {
376 append buf_rdi
[read $fd]
378 set n
[string length
$buf_rdi]
380 set z1
[string first
"\0" $buf_rdi $c]
383 set z2
[string first
"\0" $buf_rdi $z1]
387 set i
[split [string range
$buf_rdi $c [expr {$z1 - 2}]] { }]
389 [string range
$buf_rdi $z1 [expr {$z2 - 1}]] \
391 [list
[lindex
$i 0] [lindex
$i 2]] \
397 set buf_rdi
[string range
$buf_rdi $c end
]
402 rescan_done
$fd buf_rdi
$after
405 proc read_diff_files
{fd after
} {
408 append buf_rdf
[read $fd]
410 set n
[string length
$buf_rdf]
412 set z1
[string first
"\0" $buf_rdf $c]
415 set z2
[string first
"\0" $buf_rdf $z1]
419 set i
[split [string range
$buf_rdf $c [expr {$z1 - 2}]] { }]
421 [string range
$buf_rdf $z1 [expr {$z2 - 1}]] \
424 [list
[lindex
$i 0] [lindex
$i 2]]
429 set buf_rdf
[string range
$buf_rdf $c end
]
434 rescan_done
$fd buf_rdf
$after
437 proc read_ls_others
{fd after
} {
440 append buf_rlo
[read $fd]
441 set pck
[split $buf_rlo "\0"]
442 set buf_rlo
[lindex
$pck end
]
443 foreach p
[lrange
$pck 0 end-1
] {
446 rescan_done
$fd buf_rlo
$after
449 proc rescan_done
{fd buf after
} {
451 global file_states repo_config
454 if {![eof
$fd]} return
457 if {[incr rescan_active
-1] > 0} return
463 if {$repo_config(gui.partialinclude
) ne
{true
}} {
465 foreach path
[array names file_states
] {
466 switch
-- [lindex
$file_states($path) 0] {
468 MM
{lappend pathList
$path}
471 if {$pathList ne
{}} {
473 "Updating included files" \
475 [concat
{reshow_diff
;} $after]
484 proc prune_selection
{} {
485 global file_states selected_paths
487 foreach path
[array names selected_paths
] {
488 if {[catch
{set still_here
$file_states($path)}]} {
489 unset selected_paths
($path)
494 ######################################################################
499 global ui_diff current_diff ui_index ui_other
501 $ui_diff conf
-state normal
502 $ui_diff delete
0.0 end
503 $ui_diff conf
-state disabled
507 $ui_index tag remove in_diff
0.0 end
508 $ui_other tag remove in_diff
0.0 end
511 proc reshow_diff
{} {
512 global current_diff ui_status_value file_states
514 if {$current_diff eq
{}
515 ||
[catch
{set s
$file_states($current_diff)}]} {
518 show_diff
$current_diff
522 proc handle_empty_diff
{} {
523 global current_diff file_states file_lists
525 set path
$current_diff
526 set s
$file_states($path)
527 if {[lindex
$s 0] ne
{_M
}} return
529 info_popup
"No differences detected.
531 [short_path $path] has no changes.
533 The modification date of this file was updated
534 by another application and you currently have
535 the Trust File Modification Timestamps option
536 enabled, so Git did not automatically detect
537 that there are no content differences in this
540 This file will now be removed from the modified
541 files list, to prevent possible confusion.
543 if {[catch
{exec git update-index
-- $path} err
]} {
544 error_popup
"Failed to refresh index:\n\n$err"
548 set old_w
[mapcol
[lindex
$file_states($path) 0] $path]
549 set lno
[lsearch
-sorted $file_lists($old_w) $path]
551 set file_lists
($old_w) \
552 [lreplace
$file_lists($old_w) $lno $lno]
554 $old_w conf
-state normal
555 $old_w delete
$lno.0 [expr {$lno + 1}].0
556 $old_w conf
-state disabled
560 proc show_diff
{path
{w
{}} {lno
{}}} {
561 global file_states file_lists
562 global is_3way_diff diff_active repo_config
563 global ui_diff current_diff ui_status_value
565 if {$diff_active ||
![lock_index
read]} return
568 if {$w eq
{} ||
$lno == {}} {
569 foreach w
[array names file_lists
] {
570 set lno
[lsearch
-sorted $file_lists($w) $path]
577 if {$w ne
{} && $lno >= 1} {
578 $w tag add in_diff
$lno.0 [expr {$lno + 1}].0
581 set s
$file_states($path)
585 set current_diff
$path
586 set ui_status_value
"Loading diff of [escape_path $path]..."
588 set cmd
[list | git diff-index
]
589 lappend cmd
--no-color
590 if {$repo_config(gui.diffcontext
) > 0} {
591 lappend cmd
"-U$repo_config(gui.diffcontext)"
601 set fd
[open
$path r
]
602 set content
[read $fd]
607 set ui_status_value
"Unable to display [escape_path $path]"
608 error_popup
"Error loading file:\n\n$err"
611 $ui_diff conf
-state normal
612 $ui_diff insert end
$content
613 $ui_diff conf
-state disabled
616 set ui_status_value
{Ready.
}
625 if {[catch
{set fd
[open
$cmd r
]} err
]} {
628 set ui_status_value
"Unable to display [escape_path $path]"
629 error_popup
"Error loading diff:\n\n$err"
633 fconfigure
$fd -blocking 0 -translation auto
634 fileevent
$fd readable
[list read_diff
$fd]
637 proc read_diff
{fd
} {
638 global ui_diff ui_status_value is_3way_diff diff_active
641 $ui_diff conf
-state normal
642 while {[gets
$fd line
] >= 0} {
643 # -- Cleanup uninteresting diff header lines.
645 if {[string match
{diff --git *} $line]} continue
646 if {[string match
{diff --combined *} $line]} continue
647 if {[string match
{--- *} $line]} continue
648 if {[string match
{+++ *} $line]} continue
649 if {$line eq
{deleted
file mode
120000}} {
650 set line
"deleted symlink"
653 # -- Automatically detect if this is a 3 way diff.
655 if {[string match
{@@@
*} $line]} {set is_3way_diff
1}
657 # -- Reformat a 3 way diff, 'cause its too weird.
660 set op
[string range
$line 0 1]
663 {++} {set tags d_
+ ; set op
{ +}}
664 {--} {set tags d_-
; set op
{ -}}
665 { +} {set tags d_
++; set op
{++}}
666 { -} {set tags d_--
; set op
{--}}
667 {+ } {set tags d_-
+; set op
{-+}}
668 {- } {set tags d_
+-; set op
{+-}}
669 default
{set tags
{}}
671 set line
[string replace
$line 0 1 $op]
673 switch
-- [string index
$line 0] {
677 default
{set tags
{}}
680 $ui_diff insert end
$line $tags
681 $ui_diff insert end
"\n" $tags
683 $ui_diff conf
-state disabled
689 set ui_status_value
{Ready.
}
691 if {$repo_config(gui.trustmtime
) eq
{true
}
692 && [$ui_diff index end
] eq
{2.0}} {
698 ######################################################################
702 proc load_last_commit
{} {
703 global HEAD PARENT MERGE_HEAD commit_type ui_comm
705 if {[llength
$PARENT] == 0} {
706 error_popup
{There is nothing to amend.
708 You are about to create the initial commit.
709 There is no commit before this to amend.
714 repository_state curType curHEAD curMERGE_HEAD
715 if {$curType eq
{merge
}} {
716 error_popup
{Cannot amend
while merging.
718 You are currently
in the middle of a merge that
719 has not been fully completed. You cannot amend
720 the prior commit unless you first abort the
721 current merge activity.
729 set fd
[open
"| git cat-file commit $curHEAD" r
]
730 while {[gets
$fd line
] > 0} {
731 if {[string match
{parent
*} $line]} {
732 lappend parents
[string range
$line 7 end
]
735 set msg
[string trim
[read $fd]]
738 error_popup
"Error loading commit data for amend:\n\n$err"
744 set MERGE_HEAD
[list
]
745 switch
-- [llength
$parents] {
746 0 {set commit_type amend-initial
}
747 1 {set commit_type amend
}
748 default
{set commit_type amend-merge
}
751 $ui_comm delete
0.0 end
752 $ui_comm insert end
$msg
753 $ui_comm edit modified false
755 rescan
{set ui_status_value
{Ready.
}}
758 proc create_new_commit
{} {
759 global commit_type ui_comm
761 set commit_type normal
762 $ui_comm delete
0.0 end
763 $ui_comm edit modified false
765 rescan
{set ui_status_value
{Ready.
}}
768 set GIT_COMMITTER_IDENT
{}
770 proc committer_ident
{} {
771 global GIT_COMMITTER_IDENT
773 if {$GIT_COMMITTER_IDENT eq
{}} {
774 if {[catch
{set me
[exec git var GIT_COMMITTER_IDENT
]} err
]} {
775 error_popup
"Unable to obtain your identity:\n\n$err"
778 if {![regexp
{^
(.
*) [0-9]+ [-+0-9]+$
} \
779 $me me GIT_COMMITTER_IDENT
]} {
780 error_popup
"Invalid GIT_COMMITTER_IDENT:\n\n$me"
785 return $GIT_COMMITTER_IDENT
788 proc commit_tree
{} {
789 global HEAD commit_type file_states ui_comm repo_config
791 if {![lock_index update
]} return
792 if {[committer_ident
] eq
{}} return
794 # -- Our in memory state should match the repository.
796 repository_state curType curHEAD curMERGE_HEAD
797 if {[string match amend
* $commit_type]
798 && $curType eq
{normal
}
799 && $curHEAD eq
$HEAD} {
800 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
801 info_popup
{Last scanned state does not match repository state.
803 Another Git program has modified this repository
804 since the last scan. A rescan must be performed
805 before another commit can be created.
807 The rescan will be automatically started now.
810 rescan
{set ui_status_value
{Ready.
}}
814 # -- At least one file should differ in the index.
817 foreach path
[array names file_states
] {
818 switch
-glob -- [lindex
$file_states($path) 0] {
822 M?
{set files_ready
1; break}
824 error_popup
"Unmerged files cannot be committed.
826 File [short_path $path] has merge conflicts.
827 You must resolve them and include the file before committing.
833 error_popup
"Unknown file state [lindex $s 0] detected.
835 File [short_path $path] cannot be committed by this program.
841 error_popup
{No included files to commit.
843 You must include
at least
1 file before you can commit.
849 # -- A message is required.
851 set msg
[string trim
[$ui_comm get
1.0 end
]]
853 error_popup
{Please supply a commit message.
855 A good commit message has the following format
:
857 - First line
: Describe
in one sentance what you did.
859 - Remaining lines
: Describe why this change is good.
865 # -- Update included files if partialincludes are off.
867 if {$repo_config(gui.partialinclude
) ne
{true
}} {
869 foreach path
[array names file_states
] {
870 switch
-glob -- [lindex
$file_states($path) 0] {
872 M?
{lappend pathList
$path}
875 if {$pathList ne
{}} {
878 "Updating included files" \
880 [concat
{lock_index update
;} \
881 [list commit_prehook
$curHEAD $msg]]
886 commit_prehook
$curHEAD $msg
889 proc commit_prehook
{curHEAD msg
} {
890 global tcl_platform gitdir ui_status_value pch_error
892 # On Cygwin [file executable] might lie so we need to ask
893 # the shell if the hook is executable. Yes that's annoying.
895 set pchook
[file join $gitdir hooks pre-commit
]
896 if {$tcl_platform(platform
) eq
{windows
}
897 && [file isfile
$pchook]} {
898 set pchook
[list sh
-c [concat \
899 "if test -x \"$pchook\";" \
900 "then exec \"$pchook\" 2>&1;" \
902 } elseif
{[file executable
$pchook]} {
903 set pchook
[list
$pchook |
& cat]
905 commit_writetree
$curHEAD $msg
909 set ui_status_value
{Calling pre-commit hook...
}
911 set fd_ph
[open
"| $pchook" r
]
912 fconfigure
$fd_ph -blocking 0 -translation binary
913 fileevent
$fd_ph readable \
914 [list commit_prehook_wait
$fd_ph $curHEAD $msg]
917 proc commit_prehook_wait
{fd_ph curHEAD msg
} {
918 global pch_error ui_status_value
920 append pch_error
[read $fd_ph]
921 fconfigure
$fd_ph -blocking 1
923 if {[catch
{close
$fd_ph}]} {
924 set ui_status_value
{Commit declined by pre-commit hook.
}
925 hook_failed_popup pre-commit
$pch_error
928 commit_writetree
$curHEAD $msg
933 fconfigure
$fd_ph -blocking 0
936 proc commit_writetree
{curHEAD msg
} {
937 global ui_status_value
939 set ui_status_value
{Committing changes...
}
940 set fd_wt
[open
"| git write-tree" r
]
941 fileevent
$fd_wt readable \
942 [list commit_committree
$fd_wt $curHEAD $msg]
945 proc commit_committree
{fd_wt curHEAD msg
} {
946 global HEAD PARENT MERGE_HEAD commit_type
947 global single_commit gitdir tcl_platform
948 global ui_status_value ui_comm selected_commit_type
949 global file_states selected_paths rescan_active
952 if {$tree_id eq
{} ||
[catch
{close
$fd_wt} err
]} {
953 error_popup
"write-tree failed:\n\n$err"
954 set ui_status_value
{Commit failed.
}
959 # -- Create the commit.
961 set cmd
[list git commit-tree
$tree_id]
962 set parents
[concat
$PARENT $MERGE_HEAD]
963 if {[llength
$parents] > 0} {
968 # git commit-tree writes to stderr during initial commit.
969 lappend cmd
2>/dev
/null
972 if {[catch
{set cmt_id
[eval exec $cmd]} err
]} {
973 error_popup
"commit-tree failed:\n\n$err"
974 set ui_status_value
{Commit failed.
}
979 # -- Update the HEAD ref.
982 if {$commit_type ne
{normal
}} {
983 append reflogm
" ($commit_type)"
985 set i
[string first
"\n" $msg]
987 append reflogm
{: } [string range
$msg 0 [expr {$i - 1}]]
989 append reflogm
{: } $msg
991 set cmd
[list git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD]
992 if {[catch
{eval exec $cmd} err
]} {
993 error_popup
"update-ref failed:\n\n$err"
994 set ui_status_value
{Commit failed.
}
999 # -- Cleanup after ourselves.
1001 catch
{file delete
[file join $gitdir MERGE_HEAD
]}
1002 catch
{file delete
[file join $gitdir MERGE_MSG
]}
1003 catch
{file delete
[file join $gitdir SQUASH_MSG
]}
1004 catch
{file delete
[file join $gitdir GITGUI_MSG
]}
1006 # -- Let rerere do its thing.
1008 if {[file isdirectory
[file join $gitdir rr-cache
]]} {
1009 catch
{exec git rerere
}
1012 # -- Run the post-commit hook.
1014 set pchook
[file join $gitdir hooks post-commit
]
1015 if {$tcl_platform(platform
) eq
{windows
} && [file isfile
$pchook]} {
1016 set pchook
[list sh
-c [concat \
1017 "if test -x \"$pchook\";" \
1018 "then exec \"$pchook\";" \
1020 } elseif
{![file executable
$pchook]} {
1023 if {$pchook ne
{}} {
1024 catch
{exec $pchook &}
1027 $ui_comm delete
0.0 end
1028 $ui_comm edit modified false
1031 if {$single_commit} do_quit
1033 # -- Update in memory status
1035 set selected_commit_type new
1036 set commit_type normal
1039 set MERGE_HEAD
[list
]
1041 foreach path
[array names file_states
] {
1042 set s
$file_states($path)
1044 switch
-glob -- $m {
1052 unset file_states
($path)
1053 catch
{unset selected_paths
($path)}
1056 set file_states
($path) [list _O
[lindex
$s 1] {} {}]
1062 set file_states
($path) [list \
1063 _
[string index
$m 1] \
1074 set ui_status_value \
1075 "Changes committed as [string range $cmt_id 0 7]."
1078 ######################################################################
1082 proc fetch_from
{remote
} {
1083 set w
[new_console
"fetch $remote" \
1084 "Fetching new changes from $remote"]
1085 set cmd
[list git fetch
]
1087 console_exec
$w $cmd
1090 proc pull_remote
{remote branch
} {
1091 global HEAD commit_type file_states repo_config
1093 if {![lock_index update
]} return
1095 # -- Our in memory state should match the repository.
1097 repository_state curType curHEAD curMERGE_HEAD
1098 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1099 error_popup
{Last scanned state does not match repository state.
1101 Its highly likely that another Git program modified the
1102 repository since our last scan. A rescan is required
1103 before a pull can be started.
1106 rescan
{set ui_status_value
{Ready.
}}
1110 # -- No differences should exist before a pull.
1112 if {[array size file_states
] != 0} {
1113 error_popup
{Uncommitted but modified files are present.
1115 You should not perform a pull with unmodified files
in your working
1116 directory as Git would be unable to recover from an incorrect merge.
1118 Commit or throw away all changes before starting a pull operation.
1124 set w
[new_console
"pull $remote $branch" \
1125 "Pulling new changes from branch $branch in $remote"]
1126 set cmd
[list git pull
]
1127 if {$repo_config(gui.pullsummary
) eq
{false
}} {
1128 lappend cmd
--no-summary
1132 console_exec
$w $cmd [list post_pull_remote
$remote $branch]
1135 proc post_pull_remote
{remote branch success
} {
1136 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1137 global ui_status_value
1141 repository_state commit_type HEAD MERGE_HEAD
1143 set selected_commit_type new
1144 set ui_status_value
"Pulling $branch from $remote complete."
1146 rescan
[list
set ui_status_value \
1147 "Conflicts detected while pulling $branch from $remote."]
1151 proc push_to
{remote
} {
1152 set w
[new_console
"push $remote" \
1153 "Pushing changes to $remote"]
1154 set cmd
[list git push
]
1156 console_exec
$w $cmd
1159 ######################################################################
1163 proc mapcol
{state path
} {
1164 global all_cols ui_other
1166 if {[catch
{set r
$all_cols($state)}]} {
1167 puts
"error: no column for state={$state} $path"
1173 proc mapicon
{state path
} {
1176 if {[catch
{set r
$all_icons($state)}]} {
1177 puts
"error: no icon for state={$state} $path"
1183 proc mapdesc
{state path
} {
1186 if {[catch
{set r
$all_descs($state)}]} {
1187 puts
"error: no desc for state={$state} $path"
1193 proc escape_path
{path
} {
1194 regsub
-all "\n" $path "\\n" path
1198 proc short_path
{path
} {
1199 return [escape_path
[lindex
[file split $path] end
]]
1203 set null_sha1
[string repeat
0 40]
1205 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1206 global file_states next_icon_id null_sha1
1208 set s0
[string index
$new_state 0]
1209 set s1
[string index
$new_state 1]
1211 if {[catch
{set info
$file_states($path)}]} {
1213 set icon n
[incr next_icon_id
]
1215 set state
[lindex
$info 0]
1216 set icon
[lindex
$info 1]
1217 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1218 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1221 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1222 elseif
{$s0 eq
{_
}} {set s0 _
}
1224 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1225 elseif
{$s1 eq
{_
}} {set s1 _
}
1227 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1228 set head_info
[list
0 $null_sha1]
1229 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1230 && $head_info eq
{}} {
1231 set head_info
$index_info
1234 set file_states
($path) [list
$s0$s1 $icon \
1235 $head_info $index_info \
1240 proc display_file
{path state
} {
1241 global file_states file_lists selected_paths
1243 set old_m
[merge_state
$path $state]
1244 set s
$file_states($path)
1245 set new_m
[lindex
$s 0]
1246 set new_w
[mapcol
$new_m $path]
1247 set old_w
[mapcol
$old_m $path]
1248 set new_icon
[mapicon
$new_m $path]
1250 if {$new_w ne
$old_w} {
1251 set lno
[lsearch
-sorted $file_lists($old_w) $path]
1254 $old_w conf
-state normal
1255 $old_w delete
$lno.0 [expr {$lno + 1}].0
1256 $old_w conf
-state disabled
1259 lappend file_lists
($new_w) $path
1260 set file_lists
($new_w) [lsort
$file_lists($new_w)]
1261 set lno
[lsearch
-sorted $file_lists($new_w) $path]
1263 $new_w conf
-state normal
1264 $new_w image create
$lno.0 \
1265 -align center
-padx 5 -pady 1 \
1266 -name [lindex
$s 1] \
1268 $new_w insert
$lno.1 "[escape_path $path]\n"
1269 if {[catch
{set in_sel
$selected_paths($path)}]} {
1273 $new_w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1275 $new_w conf
-state disabled
1276 } elseif
{$new_icon ne
[mapicon
$old_m $path]} {
1277 $new_w conf
-state normal
1278 $new_w image conf
[lindex
$s 1] -image $new_icon
1279 $new_w conf
-state disabled
1283 proc display_all_files
{} {
1284 global ui_index ui_other
1285 global file_states file_lists
1286 global last_clicked selected_paths
1288 $ui_index conf
-state normal
1289 $ui_other conf
-state normal
1291 $ui_index delete
0.0 end
1292 $ui_other delete
0.0 end
1295 set file_lists
($ui_index) [list
]
1296 set file_lists
($ui_other) [list
]
1298 foreach path
[lsort
[array names file_states
]] {
1299 set s
$file_states($path)
1301 set w
[mapcol
$m $path]
1302 lappend file_lists
($w) $path
1303 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1304 $w image create end \
1305 -align center
-padx 5 -pady 1 \
1306 -name [lindex
$s 1] \
1307 -image [mapicon
$m $path]
1308 $w insert end
"[escape_path $path]\n"
1309 if {[catch
{set in_sel
$selected_paths($path)}]} {
1313 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1317 $ui_index conf
-state disabled
1318 $ui_other conf
-state disabled
1321 proc update_indexinfo
{msg pathList after
} {
1322 global update_index_cp ui_status_value
1324 if {![lock_index update
]} return
1326 set update_index_cp
0
1327 set pathList
[lsort
$pathList]
1328 set totalCnt
[llength
$pathList]
1329 set batch [expr {int
($totalCnt * .01) + 1}]
1330 if {$batch > 25} {set batch 25}
1332 set ui_status_value
[format \
1333 "$msg... %i/%i files (%.2f%%)" \
1337 set fd
[open
"| git update-index -z --index-info" w
]
1343 fileevent
$fd writable
[list \
1344 write_update_indexinfo \
1354 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1355 global update_index_cp ui_status_value
1356 global file_states current_diff
1358 if {$update_index_cp >= $totalCnt} {
1365 for {set i
$batch} \
1366 {$update_index_cp < $totalCnt && $i > 0} \
1368 set path
[lindex
$pathList $update_index_cp]
1369 incr update_index_cp
1371 set s
$file_states($path)
1372 switch
-glob -- [lindex
$s 0] {
1378 set info
[lindex
$s 2]
1379 if {$info eq
{}} continue
1381 puts
-nonewline $fd $info
1382 puts
-nonewline $fd "\t"
1383 puts
-nonewline $fd $path
1384 puts
-nonewline $fd "\0"
1385 display_file
$path $new
1388 set ui_status_value
[format \
1389 "$msg... %i/%i files (%.2f%%)" \
1392 [expr {100.0 * $update_index_cp / $totalCnt}]]
1395 proc update_index
{msg pathList after
} {
1396 global update_index_cp ui_status_value
1398 if {![lock_index update
]} return
1400 set update_index_cp
0
1401 set pathList
[lsort
$pathList]
1402 set totalCnt
[llength
$pathList]
1403 set batch [expr {int
($totalCnt * .01) + 1}]
1404 if {$batch > 25} {set batch 25}
1406 set ui_status_value
[format \
1407 "$msg... %i/%i files (%.2f%%)" \
1411 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1417 fileevent
$fd writable
[list \
1418 write_update_index \
1428 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1429 global update_index_cp ui_status_value
1430 global file_states current_diff
1432 if {$update_index_cp >= $totalCnt} {
1439 for {set i
$batch} \
1440 {$update_index_cp < $totalCnt && $i > 0} \
1442 set path
[lindex
$pathList $update_index_cp]
1443 incr update_index_cp
1445 switch
-glob -- [lindex
$file_states($path) 0] {
1461 puts
-nonewline $fd $path
1462 puts
-nonewline $fd "\0"
1463 display_file
$path $new
1466 set ui_status_value
[format \
1467 "$msg... %i/%i files (%.2f%%)" \
1470 [expr {100.0 * $update_index_cp / $totalCnt}]]
1473 ######################################################################
1475 ## remote management
1477 proc load_all_remotes
{} {
1478 global gitdir all_remotes repo_config
1480 set all_remotes
[list
]
1481 set rm_dir
[file join $gitdir remotes
]
1482 if {[file isdirectory
$rm_dir]} {
1483 set all_remotes
[concat
$all_remotes [glob \
1487 -directory $rm_dir *]]
1490 foreach line
[array names repo_config remote.
*.url
] {
1491 if {[regexp ^remote\.
(.
*)\.url\$
$line line name
]} {
1492 lappend all_remotes
$name
1496 set all_remotes
[lsort
-unique $all_remotes]
1499 proc populate_fetch_menu
{m
} {
1500 global gitdir all_remotes repo_config
1502 foreach r
$all_remotes {
1504 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1505 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
1510 set fd
[open
[file join $gitdir remotes
$r] r
]
1511 while {[gets
$fd n
] >= 0} {
1512 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
1523 -label "Fetch from $r..." \
1524 -command [list fetch_from
$r] \
1530 proc populate_push_menu
{m
} {
1531 global gitdir all_remotes repo_config
1533 foreach r
$all_remotes {
1535 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1536 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
1541 set fd
[open
[file join $gitdir remotes
$r] r
]
1542 while {[gets
$fd n
] >= 0} {
1543 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
1554 -label "Push to $r..." \
1555 -command [list push_to
$r] \
1561 proc populate_pull_menu
{m
} {
1562 global gitdir repo_config all_remotes disable_on_lock
1564 foreach remote
$all_remotes {
1566 if {[array get repo_config remote.
$remote.url
] ne
{}} {
1567 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
1568 regexp
{^
([^
:]+):} \
1569 [lindex
$repo_config(remote.
$remote.fetch
) 0] \
1574 set fd
[open
[file join $gitdir remotes
$remote] r
]
1575 while {[gets
$fd line
] >= 0} {
1576 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
1585 regsub ^refs
/heads
/ $rb {} rb_short
1586 if {$rb_short ne
{}} {
1588 -label "Branch $rb_short from $remote..." \
1589 -command [list pull_remote
$remote $rb] \
1591 lappend disable_on_lock \
1592 [list
$m entryconf
[$m index last
] -state]
1597 ######################################################################
1602 #define mask_width 14
1603 #define mask_height 15
1604 static unsigned char mask_bits
[] = {
1605 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1606 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1607 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1610 image create bitmap file_plain
-background white
-foreground black
-data {
1611 #define plain_width 14
1612 #define plain_height 15
1613 static unsigned char plain_bits
[] = {
1614 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1615 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1616 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1617 } -maskdata $filemask
1619 image create bitmap file_mod
-background white
-foreground blue
-data {
1620 #define mod_width 14
1621 #define mod_height 15
1622 static unsigned char mod_bits
[] = {
1623 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1624 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1625 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1626 } -maskdata $filemask
1628 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
1629 #define file_fulltick_width 14
1630 #define file_fulltick_height 15
1631 static unsigned char file_fulltick_bits
[] = {
1632 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1633 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1634 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1635 } -maskdata $filemask
1637 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1638 #define parttick_width 14
1639 #define parttick_height 15
1640 static unsigned char parttick_bits
[] = {
1641 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1642 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1643 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1644 } -maskdata $filemask
1646 image create bitmap file_question
-background white
-foreground black
-data {
1647 #define file_question_width 14
1648 #define file_question_height 15
1649 static unsigned char file_question_bits
[] = {
1650 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1651 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1652 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1653 } -maskdata $filemask
1655 image create bitmap file_removed
-background white
-foreground red
-data {
1656 #define file_removed_width 14
1657 #define file_removed_height 15
1658 static unsigned char file_removed_bits
[] = {
1659 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1660 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1661 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1662 } -maskdata $filemask
1664 image create bitmap file_merge
-background white
-foreground blue
-data {
1665 #define file_merge_width 14
1666 #define file_merge_height 15
1667 static unsigned char file_merge_bits
[] = {
1668 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1669 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1670 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1671 } -maskdata $filemask
1673 set ui_index .vpane.files.index.list
1674 set ui_other .vpane.files.other.list
1675 set max_status_desc
0
1677 {__ i plain
"Unmodified"}
1678 {_M i mod
"Modified"}
1679 {M_ i fulltick
"Included in commit"}
1680 {MM i parttick
"Partially included"}
1682 {_O o plain
"Untracked"}
1683 {A_ o fulltick
"Added by commit"}
1684 {AM o parttick
"Partially added"}
1685 {AD o question
"Added (but now gone)"}
1687 {_D i question
"Missing"}
1688 {DD i removed
"Removed by commit"}
1689 {DO i removed
"Removed (still exists)"}
1690 {DM i removed
"Removed (but modified)"}
1692 {UD i merge
"Merge conflicts"}
1693 {UM i merge
"Merge conflicts"}
1694 {U_ i merge
"Merge conflicts"}
1696 if {$max_status_desc < [string length
[lindex
$i 3]]} {
1697 set max_status_desc
[string length
[lindex
$i 3]]
1699 if {[lindex
$i 1] eq
{i
}} {
1700 set all_cols
([lindex
$i 0]) $ui_index
1702 set all_cols
([lindex
$i 0]) $ui_other
1704 set all_icons
([lindex
$i 0]) file_
[lindex
$i 2]
1705 set all_descs
([lindex
$i 0]) [lindex
$i 3]
1709 ######################################################################
1714 global tcl_platform tk_library
1715 if {$tcl_platform(platform
) eq
{unix
}
1716 && $tcl_platform(os
) eq
{Darwin
}
1717 && [string match
/Library
/Frameworks
/* $tk_library]} {
1723 proc bind_button3
{w cmd
} {
1724 bind $w <Any-Button-3
> $cmd
1726 bind $w <Control-Button-1
> $cmd
1730 proc incr_font_size
{font
{amt
1}} {
1731 set sz
[font configure
$font -size]
1733 font configure
$font -size $sz
1734 font configure
${font}bold
-size $sz
1737 proc hook_failed_popup
{hook msg
} {
1738 global gitdir appname
1744 label
$w.m.l1
-text "$hook hook failed:" \
1749 -background white
-borderwidth 1 \
1751 -width 80 -height 10 \
1753 -yscrollcommand [list
$w.m.sby
set]
1755 -text {You must correct the above errors before committing.
} \
1759 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
1760 pack
$w.m.l1
-side top
-fill x
1761 pack
$w.m.l2
-side bottom
-fill x
1762 pack
$w.m.sby
-side right
-fill y
1763 pack
$w.m.t
-side left
-fill both
-expand 1
1764 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
1766 $w.m.t insert
1.0 $msg
1767 $w.m.t conf
-state disabled
1769 button
$w.ok
-text OK \
1772 -command "destroy $w"
1773 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
1775 bind $w <Visibility
> "grab $w; focus $w"
1776 bind $w <Key-Return
> "destroy $w"
1777 wm title
$w "$appname ([lindex [file split \
1778 [file normalize [file dirname $gitdir]]] \
1783 set next_console_id
0
1785 proc new_console
{short_title long_title
} {
1786 global next_console_id console_data
1787 set w .console
[incr next_console_id
]
1788 set console_data
($w) [list
$short_title $long_title]
1789 return [console_init
$w]
1792 proc console_init
{w
} {
1793 global console_cr console_data
1794 global gitdir appname M1B
1796 set console_cr
($w) 1.0
1799 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
1804 -background white
-borderwidth 1 \
1806 -width 80 -height 10 \
1809 -yscrollcommand [list
$w.m.sby
set]
1810 label
$w.m.s
-text {Working... please
wait...
} \
1814 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
1815 pack
$w.m.l1
-side top
-fill x
1816 pack
$w.m.s
-side bottom
-fill x
1817 pack
$w.m.sby
-side right
-fill y
1818 pack
$w.m.t
-side left
-fill both
-expand 1
1819 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
1821 menu
$w.ctxm
-tearoff 0
1822 $w.ctxm add
command -label "Copy" \
1824 -command "tk_textCopy $w.m.t"
1825 $w.ctxm add
command -label "Select All" \
1827 -command "$w.m.t tag add sel 0.0 end"
1828 $w.ctxm add
command -label "Copy All" \
1831 $w.m.t tag add sel 0.0 end
1833 $w.m.t tag remove sel 0.0 end
1836 button
$w.ok
-text {Close
} \
1839 -command "destroy $w"
1840 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
1842 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
1843 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
1844 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
1845 bind $w <Visibility
> "focus $w"
1846 wm title
$w "$appname ([lindex [file split \
1847 [file normalize [file dirname $gitdir]]] \
1848 end]): [lindex $console_data($w) 0]"
1852 proc console_exec
{w cmd
{after
{}}} {
1855 # -- Windows tosses the enviroment when we exec our child.
1856 # But most users need that so we have to relogin. :-(
1858 if {$tcl_platform(platform
) eq
{windows
}} {
1859 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
1862 # -- Tcl won't let us redirect both stdout and stderr to
1863 # the same pipe. So pass it through cat...
1865 set cmd
[concat |
$cmd |
& cat]
1867 set fd_f
[open
$cmd r
]
1868 fconfigure
$fd_f -blocking 0 -translation binary
1869 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
1872 proc console_read
{w fd after
} {
1873 global console_cr console_data
1877 if {![winfo exists
$w]} {console_init
$w}
1878 $w.m.t conf
-state normal
1880 set n
[string length
$buf]
1882 set cr
[string first
"\r" $buf $c]
1883 set lf
[string first
"\n" $buf $c]
1884 if {$cr < 0} {set cr
[expr {$n + 1}]}
1885 if {$lf < 0} {set lf
[expr {$n + 1}]}
1888 $w.m.t insert end
[string range
$buf $c $lf]
1889 set console_cr
($w) [$w.m.t index
{end
-1c}]
1893 $w.m.t delete
$console_cr($w) end
1894 $w.m.t insert end
"\n"
1895 $w.m.t insert end
[string range
$buf $c $cr]
1900 $w.m.t conf
-state disabled
1904 fconfigure
$fd -blocking 1
1906 if {[catch
{close
$fd}]} {
1907 if {![winfo exists
$w]} {console_init
$w}
1908 $w.m.s conf
-background red
-text {Error
: Command Failed
}
1909 $w.ok conf
-state normal
1911 } elseif
{[winfo exists
$w]} {
1912 $w.m.s conf
-background green
-text {Success
}
1913 $w.ok conf
-state normal
1916 array
unset console_cr
$w
1917 array
unset console_data
$w
1919 uplevel
#0 $after $ok
1923 fconfigure
$fd -blocking 0
1926 ######################################################################
1930 set starting_gitk_msg
{Please
wait... Starting gitk...
}
1933 global tcl_platform ui_status_value starting_gitk_msg
1935 set ui_status_value
$starting_gitk_msg
1937 if {$ui_status_value eq
$starting_gitk_msg} {
1938 set ui_status_value
{Ready.
}
1942 if {$tcl_platform(platform
) eq
{windows
}} {
1950 set w
[new_console
"repack" "Repacking the object database"]
1951 set cmd
[list git repack
]
1954 console_exec
$w $cmd
1957 proc do_fsck_objects
{} {
1958 set w
[new_console
"verify" "Verifying the object database"]
1959 set cmd
[list git fsck-objects
]
1962 lappend cmd
--strict
1963 console_exec
$w $cmd
1969 global gitdir ui_comm is_quitting repo_config
1971 if {$is_quitting} return
1974 # -- Stash our current commit buffer.
1976 set save
[file join $gitdir GITGUI_MSG
]
1977 set msg
[string trim
[$ui_comm get
0.0 end
]]
1978 if {[$ui_comm edit modified
] && $msg ne
{}} {
1980 set fd
[open
$save w
]
1981 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
1984 } elseif
{$msg eq
{} && [file exists
$save]} {
1988 # -- Stash our current window geometry into this repository.
1990 set cfg_geometry
[list
]
1991 lappend cfg_geometry
[wm geometry .
]
1992 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
1993 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
1994 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1997 if {$cfg_geometry ne
$rc_geometry} {
1998 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2005 rescan
{set ui_status_value
{Ready.
}}
2008 proc remove_helper
{txt paths
} {
2009 global file_states current_diff
2011 if {![lock_index begin-update
]} return
2015 foreach path
$paths {
2016 switch
-glob -- [lindex
$file_states($path) 0] {
2020 lappend pathList
$path
2021 if {$path eq
$current_diff} {
2022 set after
{reshow_diff
;}
2027 if {$pathList eq
{}} {
2033 [concat
$after {set ui_status_value
{Ready.
}}]
2037 proc do_remove_selection
{} {
2038 global current_diff selected_paths
2040 if {[array size selected_paths
] > 0} {
2042 {Removing selected files from commit
} \
2043 [array names selected_paths
]
2044 } elseif
{$current_diff ne
{}} {
2046 "Removing [short_path $current_diff] from commit" \
2047 [list
$current_diff]
2051 proc include_helper
{txt paths
} {
2052 global file_states current_diff
2054 if {![lock_index begin-update
]} return
2058 foreach path
$paths {
2059 switch
-glob -- [lindex
$file_states($path) 0] {
2067 lappend pathList
$path
2068 if {$path eq
$current_diff} {
2069 set after
{reshow_diff
;}
2074 if {$pathList eq
{}} {
2080 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2084 proc do_include_selection
{} {
2085 global current_diff selected_paths
2087 if {[array size selected_paths
] > 0} {
2089 {Including selected files
} \
2090 [array names selected_paths
]
2091 } elseif
{$current_diff ne
{}} {
2093 "Including [short_path $current_diff]" \
2094 [list
$current_diff]
2098 proc do_include_all
{} {
2102 foreach path
[array names file_states
] {
2103 switch
-- [lindex
$file_states($path) 0] {
2108 _D
{lappend paths
$path}
2112 {Including all modified files
} \
2116 proc do_signoff
{} {
2119 set me
[committer_ident
]
2120 if {$me eq
{}} return
2122 set sob
"Signed-off-by: $me"
2123 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2124 if {$last ne
$sob} {
2125 $ui_comm edit separator
2127 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2128 $ui_comm insert end
"\n"
2130 $ui_comm insert end
"\n$sob"
2131 $ui_comm edit separator
2136 proc do_select_commit_type
{} {
2137 global commit_type selected_commit_type
2139 if {$selected_commit_type eq
{new
}
2140 && [string match amend
* $commit_type]} {
2142 } elseif
{$selected_commit_type eq
{amend
}
2143 && ![string match amend
* $commit_type]} {
2146 # The amend request was rejected...
2148 if {![string match amend
* $commit_type]} {
2149 set selected_commit_type new
2158 proc do_options
{} {
2159 global appname gitdir font_descs
2160 global repo_config global_config
2161 global repo_config_new global_config_new
2163 array
unset repo_config_new
2164 array
unset global_config_new
2165 foreach name
[array names repo_config
] {
2166 set repo_config_new
($name) $repo_config($name)
2169 foreach name
[array names repo_config
] {
2171 gui.diffcontext
{continue}
2173 set repo_config_new
($name) $repo_config($name)
2175 foreach name
[array names global_config
] {
2176 set global_config_new
($name) $global_config($name)
2178 set reponame
[lindex
[file split \
2179 [file normalize
[file dirname $gitdir]]] \
2182 set w .options_editor
2184 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2186 label
$w.header
-text "$appname Options" \
2188 pack
$w.header
-side top
-fill x
2191 button
$w.buttons.restore
-text {Restore Defaults
} \
2193 -command do_restore_defaults
2194 pack
$w.buttons.restore
-side left
2195 button
$w.buttons.save
-text Save \
2197 -command [list do_save_config
$w]
2198 pack
$w.buttons.save
-side right
2199 button
$w.buttons.cancel
-text {Cancel
} \
2201 -command [list destroy
$w]
2202 pack
$w.buttons.cancel
-side right
2203 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2205 labelframe
$w.repo
-text "$reponame Repository" \
2207 -relief raised
-borderwidth 2
2208 labelframe
$w.global
-text {Global
(All Repositories
)} \
2210 -relief raised
-borderwidth 2
2211 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
2212 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
2215 {b partialinclude
{Allow Partially Included Files
}}
2216 {b pullsummary
{Show Pull Summary
}}
2217 {b trustmtime
{Trust File Modification Timestamps
}}
2218 {i diffcontext
{Number of Diff Context Lines
}}
2220 set type [lindex
$option 0]
2221 set name
[lindex
$option 1]
2222 set text
[lindex
$option 2]
2223 foreach f
{repo global
} {
2226 checkbutton
$w.
$f.
$name -text $text \
2227 -variable ${f}_config_new
(gui.
$name) \
2231 pack
$w.
$f.
$name -side top
-anchor w
2235 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
2236 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
2237 spinbox
$w.
$f.
$name.v \
2238 -textvariable ${f}_config_new
(gui.
$name) \
2239 -from 1 -to 99 -increment 1 \
2242 pack
$w.
$f.
$name.v
-side right
-anchor e
2243 pack
$w.
$f.
$name -side top
-anchor w
-fill x
2249 set all_fonts
[lsort
[font families
]]
2250 foreach option
$font_descs {
2251 set name
[lindex
$option 0]
2252 set font
[lindex
$option 1]
2253 set text
[lindex
$option 2]
2255 set global_config_new
(gui.
$font^^family
) \
2256 [font configure
$font -family]
2257 set global_config_new
(gui.
$font^^size
) \
2258 [font configure
$font -size]
2260 frame
$w.global.
$name
2261 label
$w.global.
$name.l
-text "$text:" -font font_ui
2262 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
2263 eval tk_optionMenu
$w.global.
$name.family \
2264 global_config_new
(gui.
$font^^family
) \
2266 spinbox
$w.global.
$name.size \
2267 -textvariable global_config_new
(gui.
$font^^size
) \
2268 -from 2 -to 80 -increment 1 \
2271 pack
$w.global.
$name.size
-side right
-anchor e
2272 pack
$w.global.
$name.family
-side right
-anchor e
2273 pack
$w.global.
$name -side top
-anchor w
-fill x
2276 bind $w <Visibility
> "grab $w; focus $w"
2277 bind $w <Key-Escape
> "destroy $w"
2278 wm title
$w "$appname ($reponame): Options"
2282 proc do_restore_defaults
{} {
2283 global font_descs default_config repo_config
2284 global repo_config_new global_config_new
2286 foreach name
[array names default_config
] {
2287 set repo_config_new
($name) $default_config($name)
2288 set global_config_new
($name) $default_config($name)
2291 foreach option
$font_descs {
2292 set name
[lindex
$option 0]
2293 set repo_config
(gui.
$name) $default_config(gui.
$name)
2297 foreach option
$font_descs {
2298 set name
[lindex
$option 0]
2299 set font
[lindex
$option 1]
2300 set global_config_new
(gui.
$font^^family
) \
2301 [font configure
$font -family]
2302 set global_config_new
(gui.
$font^^size
) \
2303 [font configure
$font -size]
2307 proc do_save_config
{w
} {
2308 if {[catch
{save_config
} err
]} {
2309 error_popup
"Failed to completely save options:\n\n$err"
2315 proc do_windows_shortcut
{} {
2316 global gitdir appname argv0
2318 set reponame
[lindex
[file split \
2319 [file normalize
[file dirname $gitdir]]] \
2323 set desktop
[exec cygpath \
2331 set fn
[tk_getSaveFile \
2333 -title "$appname ($reponame): Create Desktop Icon" \
2334 -initialdir $desktop \
2335 -initialfile "Git $reponame.bat"]
2339 set sh
[exec cygpath \
2344 set me
[exec cygpath \
2348 set gd
[exec cygpath \
2352 regsub
-all ' $me "'\\''" me
2353 regsub -all ' $gd "'\\''" gd
2354 puts -nonewline $fd "\"$sh\" --login -c \""
2355 puts -nonewline $fd "GIT_DIR='$gd'"
2356 puts -nonewline $fd " '$me'"
2360 error_popup "Cannot write script:\n\n$err"
2365 proc do_macosx_app {} {
2366 global gitdir appname argv0 env
2368 set reponame [lindex [file split \
2369 [file normalize [file dirname $gitdir]]] \
2372 set fn [tk_getSaveFile \
2374 -title "$appname ($reponame): Create Desktop Icon" \
2375 -initialdir [file join $env(HOME) Desktop] \
2376 -initialfile "Git $reponame.app"]
2379 set Contents [file join $fn Contents]
2380 set MacOS [file join $Contents MacOS]
2381 set exe [file join $MacOS git-gui]
2385 set fd [open [file join $Contents Info.plist] w]
2386 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2387 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2388 <plist version="1.0">
2390 <key>CFBundleDevelopmentRegion</key>
2391 <string>English</string>
2392 <key>CFBundleExecutable</key>
2393 <string>git-gui</string>
2394 <key>CFBundleIdentifier</key>
2395 <string>org.spearce.git-gui</string>
2396 <key>CFBundleInfoDictionaryVersion</key>
2397 <string>6.0</string>
2398 <key>CFBundlePackageType</key>
2399 <string>APPL</string>
2400 <key>CFBundleSignature</key>
2401 <string>????</string>
2402 <key>CFBundleVersion</key>
2403 <string>1.0</string>
2404 <key>NSPrincipalClass</key>
2405 <string>NSApplication</string>
2410 set fd [open $exe w]
2411 set gd [file normalize $gitdir]
2412 set ep [file normalize [exec git --exec-path]]
2413 regsub -all ' $gd "'\\''" gd
2414 regsub
-all ' $ep "'\\''" ep
2415 puts $fd "#!/bin/sh"
2416 foreach name
[array names env
] {
2417 if {[string match GIT_
* $name]} {
2418 regsub
-all ' $env($name) "'\\''" v
2419 puts $fd "export $name='$v'"
2422 puts $fd "export PATH
='$ep':\
$PATH"
2423 puts $fd "export GIT_DIR
='$gd'"
2424 puts $fd "exec [file normalize
$argv0]"
2427 file attributes $exe -permissions u+x,g+x,o+x
2429 error_popup "Cannot
write icon
:\n\n$err"
2434 proc toggle_or_diff {w x y} {
2435 global file_states file_lists current_diff ui_index ui_other
2436 global last_clicked selected_paths
2438 set pos [split [$w index @$x,$y] .]
2439 set lno [lindex $pos 0]
2440 set col [lindex $pos 1]
2441 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2447 set last_clicked [list $w $lno]
2448 array unset selected_paths
2449 $ui_index tag remove in_sel 0.0 end
2450 $ui_other tag remove in_sel 0.0 end
2453 if {$current_diff eq $path} {
2454 set after {reshow_diff;}
2458 switch -glob -- [lindex $file_states($path) 0] {
2465 "Removing
[short_path
$path] from commit
" \
2467 [concat $after {set ui_status_value {Ready.}}]
2471 "Including
[short_path
$path]" \
2473 [concat $after {set ui_status_value {Ready.}}]
2477 show_diff $path $w $lno
2481 proc add_one_to_selection {w x y} {
2483 global last_clicked selected_paths
2485 set pos [split [$w index @$x,$y] .]
2486 set lno [lindex $pos 0]
2487 set col [lindex $pos 1]
2488 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2494 set last_clicked [list $w $lno]
2495 if {[catch {set in_sel $selected_paths($path)}]} {
2499 unset selected_paths($path)
2500 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2502 set selected_paths($path) 1
2503 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2507 proc add_range_to_selection {w x y} {
2509 global last_clicked selected_paths
2511 if {[lindex $last_clicked 0] ne $w} {
2512 toggle_or_diff $w $x $y
2516 set pos [split [$w index @$x,$y] .]
2517 set lno [lindex $pos 0]
2518 set lc [lindex $last_clicked 1]
2527 foreach path [lrange $file_lists($w) \
2528 [expr {$begin - 1}] \
2529 [expr {$end - 1}]] {
2530 set selected_paths($path) 1
2532 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2535 ######################################################################
2539 set cursor_ptr arrow
2540 font create font_diff -family Courier -size 10
2544 eval font configure font_ui [font actual [.dummy cget -font]]
2548 font create font_uibold
2549 font create font_diffbold
2553 if {$tcl_platform(platform) eq {windows}} {
2556 } elseif {[is_MacOSX]} {
2561 proc apply_config {} {
2562 global repo_config font_descs
2564 foreach option $font_descs {
2565 set name [lindex $option 0]
2566 set font [lindex $option 1]
2568 foreach {cn cv} $repo_config(gui.$name) {
2569 font configure $font $cn $cv
2572 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
2574 foreach {cn cv} [font configure $font] {
2575 font configure ${font}bold $cn $cv
2577 font configure ${font}bold -weight bold
2581 set default_config(gui.trustmtime) false
2582 set default_config(gui.pullsummary) true
2583 set default_config(gui.partialinclude) false
2584 set default_config(gui.diffcontext) 5
2585 set default_config(gui.fontui) [font configure font_ui]
2586 set default_config(gui.fontdiff) [font configure font_diff]
2588 {fontui font_ui {Main Font}}
2589 {fontdiff font_diff {Diff/Console Font}}
2594 ######################################################################
2600 menu .mbar -tearoff 0
2601 .mbar add cascade -label Project -menu .mbar.project
2602 .mbar add cascade -label Edit -menu .mbar.edit
2603 .mbar add cascade -label Commit -menu .mbar.commit
2604 if {!$single_commit} {
2605 .mbar add cascade -label Fetch -menu .mbar.fetch
2606 .mbar add cascade -label Pull -menu .mbar.pull
2607 .mbar add cascade -label Push -menu .mbar.push
2609 . configure -menu .mbar
2614 .mbar.project add command -label Visualize \
2617 if {!$single_commit} {
2618 .mbar.project add command -label {Repack Database} \
2619 -command do_repack \
2622 .mbar.project add command -label {Verify Database} \
2623 -command do_fsck_objects \
2626 if {$tcl_platform(platform) eq {windows}} {
2627 .mbar.project add command \
2628 -label {Create Desktop Icon} \
2629 -command do_windows_shortcut \
2631 } elseif {[is_MacOSX]} {
2632 .mbar.project add command \
2633 -label {Create Desktop Icon} \
2634 -command do_macosx_app \
2638 .mbar.project add command -label Quit \
2640 -accelerator $M1T-Q \
2646 .mbar.edit add command -label Undo \
2647 -command {catch {[focus] edit undo}} \
2648 -accelerator $M1T-Z \
2650 .mbar.edit add command -label Redo \
2651 -command {catch {[focus] edit redo}} \
2652 -accelerator $M1T-Y \
2654 .mbar.edit add separator
2655 .mbar.edit add command -label Cut \
2656 -command {catch {tk_textCut [focus]}} \
2657 -accelerator $M1T-X \
2659 .mbar.edit add command -label Copy \
2660 -command {catch {tk_textCopy [focus]}} \
2661 -accelerator $M1T-C \
2663 .mbar.edit add command -label Paste \
2664 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2665 -accelerator $M1T-V \
2667 .mbar.edit add command -label Delete \
2668 -command {catch {[focus] delete sel.first sel.last}} \
2671 .mbar.edit add separator
2672 .mbar.edit add command -label {Select All} \
2673 -command {catch {[focus] tag add sel 0.0 end}} \
2674 -accelerator $M1T-A \
2676 .mbar.edit add separator
2677 .mbar.edit add command -label {Options...} \
2678 -command do_options \
2685 .mbar.commit add radiobutton \
2686 -label {New Commit} \
2687 -command do_select_commit_type \
2688 -variable selected_commit_type \
2691 lappend disable_on_lock \
2692 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2694 .mbar.commit add radiobutton \
2695 -label {Amend Last Commit} \
2696 -command do_select_commit_type \
2697 -variable selected_commit_type \
2700 lappend disable_on_lock \
2701 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2703 .mbar.commit add separator
2705 .mbar.commit add command -label Rescan \
2706 -command do_rescan \
2709 lappend disable_on_lock \
2710 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2712 .mbar.commit add command -label {Remove From Commit} \
2713 -command do_remove_selection \
2715 lappend disable_on_lock \
2716 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2718 .mbar.commit add command -label {Include In Commit} \
2719 -command do_include_selection \
2721 lappend disable_on_lock \
2722 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2724 .mbar.commit add command -label {Include All} \
2725 -command do_include_all \
2726 -accelerator $M1T-I \
2728 lappend disable_on_lock \
2729 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2731 .mbar.commit add separator
2733 .mbar.commit add command -label {Sign Off} \
2734 -command do_signoff \
2735 -accelerator $M1T-S \
2738 .mbar.commit add command -label Commit \
2739 -command do_commit \
2740 -accelerator $M1T-Return \
2742 lappend disable_on_lock \
2743 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2745 # -- Transport menus
2747 if {!$single_commit} {
2753 # -- Main Window Layout
2755 panedwindow .vpane -orient vertical
2756 panedwindow .vpane.files -orient horizontal
2757 .vpane add .vpane.files -sticky nsew -height 100 -width 400
2758 pack .vpane -anchor n -side top -fill both -expand 1
2760 # -- Index File List
2762 frame .vpane.files.index -height 100 -width 400
2763 label .vpane.files.index.title -text {Modified Files} \
2766 text $ui_index -background white -borderwidth 0 \
2767 -width 40 -height 10 \
2769 -cursor $cursor_ptr \
2770 -yscrollcommand {.vpane.files.index.sb set} \
2772 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
2773 pack .vpane.files.index.title -side top -fill x
2774 pack .vpane.files.index.sb -side right -fill y
2775 pack $ui_index -side left -fill both -expand 1
2776 .vpane.files add .vpane.files.index -sticky nsew
2778 # -- Other (Add) File List
2780 frame .vpane.files.other -height 100 -width 100
2781 label .vpane.files.other.title -text {Untracked Files} \
2784 text $ui_other -background white -borderwidth 0 \
2785 -width 40 -height 10 \
2787 -cursor $cursor_ptr \
2788 -yscrollcommand {.vpane.files.other.sb set} \
2790 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
2791 pack .vpane.files.other.title -side top -fill x
2792 pack .vpane.files.other.sb -side right -fill y
2793 pack $ui_other -side left -fill both -expand 1
2794 .vpane.files add .vpane.files.other -sticky nsew
2796 foreach i [list $ui_index $ui_other] {
2797 $i tag conf in_diff -font font_uibold
2798 $i tag conf in_sel \
2799 -background [$i cget -foreground] \
2800 -foreground [$i cget -background]
2804 # -- Diff and Commit Area
2806 frame .vpane.lower -height 300 -width 400
2807 frame .vpane.lower.commarea
2808 frame .vpane.lower.diff -relief sunken -borderwidth 1
2809 pack .vpane.lower.commarea -side top -fill x
2810 pack .vpane.lower.diff -side bottom -fill both -expand 1
2811 .vpane add .vpane.lower -stick nsew
2813 # -- Commit Area Buttons
2815 frame .vpane.lower.commarea.buttons
2816 label .vpane.lower.commarea.buttons.l -text {} \
2820 pack .vpane.lower.commarea.buttons.l -side top -fill x
2821 pack .vpane.lower.commarea.buttons -side left -fill y
2823 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2824 -command do_rescan \
2826 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2827 lappend disable_on_lock \
2828 {.vpane.lower.commarea.buttons.rescan conf -state}
2830 button .vpane.lower.commarea.buttons.incall -text {Include All} \
2831 -command do_include_all \
2833 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2834 lappend disable_on_lock \
2835 {.vpane.lower.commarea.buttons.incall conf -state}
2837 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2838 -command do_signoff \
2840 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2842 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2843 -command do_commit \
2845 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2846 lappend disable_on_lock \
2847 {.vpane.lower.commarea.buttons.commit conf -state}
2849 # -- Commit Message Buffer
2851 frame .vpane.lower.commarea.buffer
2852 frame .vpane.lower.commarea.buffer.header
2853 set ui_comm .vpane.lower.commarea.buffer.t
2854 set ui_coml .vpane.lower.commarea.buffer.header.l
2855 radiobutton .vpane.lower.commarea.buffer.header.new \
2856 -text {New Commit} \
2857 -command do_select_commit_type \
2858 -variable selected_commit_type \
2861 lappend disable_on_lock \
2862 [list .vpane.lower.commarea.buffer.header.new conf -state]
2863 radiobutton .vpane.lower.commarea.buffer.header.amend \
2864 -text {Amend Last Commit} \
2865 -command do_select_commit_type \
2866 -variable selected_commit_type \
2869 lappend disable_on_lock \
2870 [list .vpane.lower.commarea.buffer.header.amend conf -state]
2875 proc trace_commit_type {varname args} {
2876 global ui_coml commit_type
2877 switch -glob -- $commit_type {
2878 initial {set txt {Initial Commit Message:}}
2879 amend {set txt {Amended Commit Message:}}
2880 amend-initial {set txt {Amended Initial Commit Message:}}
2881 amend-merge {set txt {Amended Merge Commit Message:}}
2882 merge {set txt {Merge Commit Message:}}
2883 * {set txt {Commit Message:}}
2885 $ui_coml conf -text $txt
2887 trace add variable commit_type write trace_commit_type
2888 pack $ui_coml -side left -fill x
2889 pack .vpane.lower.commarea.buffer.header.amend -side right
2890 pack .vpane.lower.commarea.buffer.header.new -side right
2892 text $ui_comm -background white -borderwidth 1 \
2895 -autoseparators true \
2897 -width 75 -height 9 -wrap none \
2899 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2900 scrollbar .vpane.lower.commarea.buffer.sby \
2901 -command [list $ui_comm yview]
2902 pack .vpane.lower.commarea.buffer.header -side top -fill x
2903 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2904 pack $ui_comm -side left -fill y
2905 pack .vpane.lower.commarea.buffer -side left -fill y
2907 # -- Commit Message Buffer Context Menu
2909 set ctxm .vpane.lower.commarea.buffer.ctxm
2910 menu $ctxm -tearoff 0
2914 -command {tk_textCut $ui_comm}
2918 -command {tk_textCopy $ui_comm}
2922 -command {tk_textPaste $ui_comm}
2926 -command {$ui_comm delete sel.first sel.last}
2929 -label {Select All} \
2931 -command {$ui_comm tag add sel 0.0 end}
2936 $ui_comm tag add sel 0.0 end
2937 tk_textCopy $ui_comm
2938 $ui_comm tag remove sel 0.0 end
2945 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
2950 set diff_actions [list]
2951 proc trace_current_diff {varname args} {
2952 global current_diff diff_actions file_states
2953 if {$current_diff eq {}} {
2960 set s [mapdesc [lindex $file_states($p) 0] $p]
2962 set p [escape_path $p]
2966 .vpane.lower.diff.header.status configure -text $s
2967 .vpane.lower.diff.header.file configure -text $f
2968 .vpane.lower.diff.header.path configure -text $p
2969 foreach w $diff_actions {
2973 trace add variable current_diff write trace_current_diff
2975 frame .vpane.lower.diff.header -background orange
2976 label .vpane.lower.diff.header.status \
2977 -background orange \
2978 -width $max_status_desc \
2982 label .vpane.lower.diff.header.file \
2983 -background orange \
2987 label .vpane.lower.diff.header.path \
2988 -background orange \
2992 pack .vpane.lower.diff.header.status -side left
2993 pack .vpane.lower.diff.header.file -side left
2994 pack .vpane.lower.diff.header.path -fill x
2995 set ctxm .vpane.lower.diff.header.ctxm
2996 menu $ctxm -tearoff 0
3007 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3008 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
3012 frame .vpane.lower.diff.body
3013 set ui_diff .vpane.lower.diff.body.t
3014 text $ui_diff -background white -borderwidth 0 \
3015 -width 80 -height 15 -wrap none \
3017 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3018 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3020 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3021 -command [list $ui_diff xview]
3022 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3023 -command [list $ui_diff yview]
3024 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3025 pack .vpane.lower.diff.body.sby -side right -fill y
3026 pack $ui_diff -side left -fill both -expand 1
3027 pack .vpane.lower.diff.header -side top -fill x
3028 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3030 $ui_diff tag conf d_@ -font font_diffbold
3031 $ui_diff tag conf d_+ -foreground blue
3032 $ui_diff tag conf d_- -foreground red
3033 $ui_diff tag conf d_++ -foreground {#00a000}
3034 $ui_diff tag conf d_-- -foreground {#a000a0}
3035 $ui_diff tag conf d_+- \
3037 -background {light goldenrod yellow}
3038 $ui_diff tag conf d_-+ \
3042 # -- Diff Body Context Menu
3044 set ctxm .vpane.lower.diff.body.ctxm
3045 menu $ctxm -tearoff 0
3049 -command {tk_textCopy $ui_diff}
3050 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3052 -label {Select All} \
3054 -command {$ui_diff tag add sel 0.0 end}
3055 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3060 $ui_diff tag add sel 0.0 end
3061 tk_textCopy $ui_diff
3062 $ui_diff tag remove sel 0.0 end
3064 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3067 -label {Decrease Font Size} \
3069 -command {incr_font_size font_diff -1}
3070 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3072 -label {Increase Font Size} \
3074 -command {incr_font_size font_diff 1}
3075 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3078 -label {Show Less Context} \
3080 -command {if {$repo_config(gui.diffcontext) >= 2} {
3081 incr repo_config(gui.diffcontext) -1
3084 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3086 -label {Show More Context} \
3089 incr repo_config(gui.diffcontext)
3092 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3094 $ctxm add command -label {Options...} \
3097 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
3101 set ui_status_value {Initializing...}
3102 label .status -textvariable ui_status_value \
3108 pack .status -anchor w -side bottom -fill x
3113 set gm $repo_config(gui.geometry)
3114 wm geometry . [lindex $gm 0]
3115 .vpane sash place 0 \
3116 [lindex [.vpane sash coord 0] 0] \
3118 .vpane.files sash place 0 \
3120 [lindex [.vpane.files sash coord 0] 1]
3126 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3127 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3128 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3129 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3130 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3131 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3132 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3133 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3134 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3135 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3136 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3138 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3139 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3140 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3141 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3142 bind $ui_diff <$M1B-Key-v> {break}
3143 bind $ui_diff <$M1B-Key-V> {break}
3144 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3145 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3146 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3147 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3148 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3149 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3151 bind . <Destroy> do_quit
3152 bind all <Key-F5> do_rescan
3153 bind all <$M1B-Key-r> do_rescan
3154 bind all <$M1B-Key-R> do_rescan
3155 bind . <$M1B-Key-s> do_signoff
3156 bind . <$M1B-Key-S> do_signoff
3157 bind . <$M1B-Key-i> do_include_all
3158 bind . <$M1B-Key-I> do_include_all
3159 bind . <$M1B-Key-Return> do_commit
3160 bind all <$M1B-Key-q> do_quit
3161 bind all <$M1B-Key-Q> do_quit
3162 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3163 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3164 foreach i [list $ui_index $ui_other] {
3165 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
3166 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
3167 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
3171 set file_lists($ui_index) [list]
3172 set file_lists($ui_other) [list]
3176 set MERGE_HEAD [list]
3180 set selected_commit_type new
3182 wm title . "$appname ([file normalize
[file dirname $gitdir]])"
3183 focus -force $ui_comm
3184 if {!$single_commit} {
3186 populate_fetch_menu .mbar.fetch
3187 populate_pull_menu .mbar.pull
3188 populate_push_menu .mbar.push
3190 lock_index begin-read