2 # Tcl ignores the next line -*- tcl -*- \
5 set appvers
{@@GIT_VERSION@@
}
7 Copyright ©
2006, 2007 Shawn Pearce
, Paul Mackerras.
9 This program is free software
; you can redistribute it and
/or modify
10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation
; either version
2 of the License
, or
12 (at your option
) any later version.
14 This program is distributed
in the hope that it will be useful
,
15 but WITHOUT ANY WARRANTY
; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License
for more details.
19 You should have received a copy of the GNU General Public License
20 along with this program
; if not
, write to the Free Software
21 Foundation
, Inc.
, 59 Temple Place
, Suite
330, Boston
, MA
02111-1307 USA
}
23 ######################################################################
27 set _appname
[lindex
[file split $argv0] end
]
41 return [eval [concat
[list
file join $_gitdir] $args]]
49 ######################################################################
53 proc is_many_config
{name
} {
54 switch
-glob -- $name {
63 proc load_config
{include_global
} {
64 global repo_config global_config default_config
66 array
unset global_config
67 if {$include_global} {
69 set fd_rc
[open
"| git repo-config --global --list" r
]
70 while {[gets
$fd_rc line
] >= 0} {
71 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
72 if {[is_many_config
$name]} {
73 lappend global_config
($name) $value
75 set global_config
($name) $value
83 array
unset repo_config
85 set fd_rc
[open
"| git repo-config --list" r
]
86 while {[gets
$fd_rc line
] >= 0} {
87 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
88 if {[is_many_config
$name]} {
89 lappend repo_config
($name) $value
91 set repo_config
($name) $value
98 foreach name
[array names default_config
] {
99 if {[catch
{set v
$global_config($name)}]} {
100 set global_config
($name) $default_config($name)
102 if {[catch
{set v
$repo_config($name)}]} {
103 set repo_config
($name) $default_config($name)
108 proc save_config
{} {
109 global default_config font_descs
110 global repo_config global_config
111 global repo_config_new global_config_new
113 foreach option
$font_descs {
114 set name
[lindex
$option 0]
115 set font
[lindex
$option 1]
116 font configure
$font \
117 -family $global_config_new(gui.
$font^^family
) \
118 -size $global_config_new(gui.
$font^^size
)
119 font configure
${font}bold \
120 -family $global_config_new(gui.
$font^^family
) \
121 -size $global_config_new(gui.
$font^^size
)
122 set global_config_new
(gui.
$name) [font configure
$font]
123 unset global_config_new
(gui.
$font^^family
)
124 unset global_config_new
(gui.
$font^^size
)
127 foreach name
[array names default_config
] {
128 set value
$global_config_new($name)
129 if {$value ne
$global_config($name)} {
130 if {$value eq
$default_config($name)} {
131 catch
{exec git repo-config
--global --unset $name}
133 regsub
-all "\[{}\]" $value {"} value
134 exec git repo-config --global $name $value
136 set global_config($name) $value
137 if {$value eq $repo_config($name)} {
138 catch {exec git repo-config --unset $name}
139 set repo_config($name) $value
144 foreach name [array names default_config] {
145 set value $repo_config_new($name)
146 if {$value ne $repo_config($name)} {
147 if {$value eq $global_config($name)} {
148 catch {exec git repo-config --unset $name}
150 regsub -all "\
[{}\
]" $value {"} value
151 exec git repo-config
$name $value
153 set repo_config
($name) $value
158 proc error_popup
{msg
} {
160 if {[reponame
] ne
{}} {
161 append title
" ([reponame])"
163 set cmd
[list tk_messageBox \
166 -title "$title: error" \
168 if {[winfo ismapped .
]} {
169 lappend cmd
-parent .
174 proc warn_popup
{msg
} {
176 if {[reponame
] ne
{}} {
177 append title
" ([reponame])"
179 set cmd
[list tk_messageBox \
182 -title "$title: warning" \
184 if {[winfo ismapped .
]} {
185 lappend cmd
-parent .
190 proc info_popup
{msg
} {
192 if {[reponame
] ne
{}} {
193 append title
" ([reponame])"
203 proc ask_popup
{msg
} {
205 if {[reponame
] ne
{}} {
206 append title
" ([reponame])"
208 return [tk_messageBox \
216 ######################################################################
220 if { [catch
{set _gitdir
$env(GIT_DIR
)}]
221 && [catch
{set _gitdir
[exec git rev-parse
--git-dir]} err
]} {
222 catch
{wm withdraw .
}
223 error_popup
"Cannot find the git directory:\n\n$err"
226 if {![file isdirectory
$_gitdir]} {
227 catch
{wm withdraw .
}
228 error_popup
"Git directory not found:\n\n$_gitdir"
231 if {[lindex
[file split $_gitdir] end
] ne
{.git
}} {
232 catch
{wm withdraw .
}
233 error_popup
"Cannot use funny .git directory:\n\n$gitdir"
236 if {[catch
{cd [file dirname $_gitdir]} err
]} {
237 catch
{wm withdraw .
}
238 error_popup
"No working directory [file dirname $_gitdir]:\n\n$err"
241 set _reponame
[lindex
[file split \
242 [file normalize
[file dirname $_gitdir]]] \
246 if {[appname
] eq
{git-citool
}} {
250 ######################################################################
258 set disable_on_lock
[list
]
259 set index_lock_type none
261 proc lock_index
{type} {
262 global index_lock_type disable_on_lock
264 if {$index_lock_type eq
{none
}} {
265 set index_lock_type
$type
266 foreach w
$disable_on_lock {
267 uplevel
#0 $w disabled
270 } elseif
{$index_lock_type eq
"begin-$type"} {
271 set index_lock_type
$type
277 proc unlock_index
{} {
278 global index_lock_type disable_on_lock
280 set index_lock_type none
281 foreach w
$disable_on_lock {
286 ######################################################################
290 proc repository_state
{ctvar hdvar mhvar
} {
291 global current_branch
292 upvar
$ctvar ct
$hdvar hd
$mhvar mh
296 if {[catch
{set current_branch
[exec git symbolic-ref HEAD
]}]} {
297 set current_branch
{}
299 regsub ^refs
/((heads|tags|remotes
)/)? \
305 if {[catch
{set hd
[exec git rev-parse
--verify HEAD
]}]} {
311 set merge_head
[gitdir MERGE_HEAD
]
312 if {[file exists
$merge_head]} {
314 set fd_mh
[open
$merge_head r
]
315 while {[gets
$fd_mh line
] >= 0} {
326 global PARENT empty_tree
328 set p
[lindex
$PARENT 0]
332 if {$empty_tree eq
{}} {
333 set empty_tree
[exec git mktree
<< {}]
338 proc rescan
{after
} {
339 global HEAD PARENT MERGE_HEAD commit_type
340 global ui_index ui_workdir ui_status_value ui_comm
341 global rescan_active file_states
344 if {$rescan_active > 0 ||
![lock_index
read]} return
346 repository_state newType newHEAD newMERGE_HEAD
347 if {[string match amend
* $commit_type]
348 && $newType eq
{normal
}
349 && $newHEAD eq
$HEAD} {
353 set MERGE_HEAD
$newMERGE_HEAD
354 set commit_type
$newType
357 array
unset file_states
359 if {![$ui_comm edit modified
]
360 ||
[string trim
[$ui_comm get
0.0 end
]] eq
{}} {
361 if {[load_message GITGUI_MSG
]} {
362 } elseif
{[load_message MERGE_MSG
]} {
363 } elseif
{[load_message SQUASH_MSG
]} {
366 $ui_comm edit modified false
369 if {$repo_config(gui.trustmtime
) eq
{true
}} {
370 rescan_stage2
{} $after
373 set ui_status_value
{Refreshing
file status...
}
374 set cmd
[list git update-index
]
376 lappend cmd
--unmerged
377 lappend cmd
--ignore-missing
378 lappend cmd
--refresh
379 set fd_rf
[open
"| $cmd" r
]
380 fconfigure
$fd_rf -blocking 0 -translation binary
381 fileevent
$fd_rf readable \
382 [list rescan_stage2
$fd_rf $after]
386 proc rescan_stage2
{fd after
} {
387 global ui_status_value
388 global rescan_active buf_rdi buf_rdf buf_rlo
392 if {![eof
$fd]} return
396 set ls_others
[list | git ls-files
--others -z \
397 --exclude-per-directory=.gitignore
]
398 set info_exclude
[gitdir info exclude
]
399 if {[file readable
$info_exclude]} {
400 lappend ls_others
"--exclude-from=$info_exclude"
408 set ui_status_value
{Scanning
for modified files ...
}
409 set fd_di
[open
"| git diff-index --cached -z [PARENT]" r
]
410 set fd_df
[open
"| git diff-files -z" r
]
411 set fd_lo
[open
$ls_others r
]
413 fconfigure
$fd_di -blocking 0 -translation binary
414 fconfigure
$fd_df -blocking 0 -translation binary
415 fconfigure
$fd_lo -blocking 0 -translation binary
416 fileevent
$fd_di readable
[list read_diff_index
$fd_di $after]
417 fileevent
$fd_df readable
[list read_diff_files
$fd_df $after]
418 fileevent
$fd_lo readable
[list read_ls_others
$fd_lo $after]
421 proc load_message
{file} {
425 if {[file isfile
$f]} {
426 if {[catch
{set fd
[open
$f r
]}]} {
429 set content
[string trim
[read $fd]]
431 $ui_comm delete
0.0 end
432 $ui_comm insert end
$content
438 proc read_diff_index
{fd after
} {
441 append buf_rdi
[read $fd]
443 set n
[string length
$buf_rdi]
445 set z1
[string first
"\0" $buf_rdi $c]
448 set z2
[string first
"\0" $buf_rdi $z1]
452 set i
[split [string range
$buf_rdi $c [expr {$z1 - 2}]] { }]
454 [string range
$buf_rdi $z1 [expr {$z2 - 1}]] \
456 [list
[lindex
$i 0] [lindex
$i 2]] \
462 set buf_rdi
[string range
$buf_rdi $c end
]
467 rescan_done
$fd buf_rdi
$after
470 proc read_diff_files
{fd after
} {
473 append buf_rdf
[read $fd]
475 set n
[string length
$buf_rdf]
477 set z1
[string first
"\0" $buf_rdf $c]
480 set z2
[string first
"\0" $buf_rdf $z1]
484 set i
[split [string range
$buf_rdf $c [expr {$z1 - 2}]] { }]
486 [string range
$buf_rdf $z1 [expr {$z2 - 1}]] \
489 [list
[lindex
$i 0] [lindex
$i 2]]
494 set buf_rdf
[string range
$buf_rdf $c end
]
499 rescan_done
$fd buf_rdf
$after
502 proc read_ls_others
{fd after
} {
505 append buf_rlo
[read $fd]
506 set pck
[split $buf_rlo "\0"]
507 set buf_rlo
[lindex
$pck end
]
508 foreach p
[lrange
$pck 0 end-1
] {
511 rescan_done
$fd buf_rlo
$after
514 proc rescan_done
{fd buf after
} {
516 global file_states repo_config
519 if {![eof
$fd]} return
522 if {[incr rescan_active
-1] > 0} return
531 proc prune_selection
{} {
532 global file_states selected_paths
534 foreach path
[array names selected_paths
] {
535 if {[catch
{set still_here
$file_states($path)}]} {
536 unset selected_paths
($path)
541 ######################################################################
546 global ui_diff current_diff_path ui_index ui_workdir
548 $ui_diff conf
-state normal
549 $ui_diff delete
0.0 end
550 $ui_diff conf
-state disabled
552 set current_diff_path
{}
554 $ui_index tag remove in_diff
0.0 end
555 $ui_workdir tag remove in_diff
0.0 end
558 proc reshow_diff
{} {
559 global ui_status_value file_states file_lists
560 global current_diff_path current_diff_side
562 set p
$current_diff_path
564 ||
$current_diff_side eq
{}
565 ||
[catch
{set s
$file_states($p)}]
566 ||
[lsearch
-sorted $file_lists($current_diff_side) $p] == -1} {
569 show_diff
$p $current_diff_side
573 proc handle_empty_diff
{} {
574 global current_diff_path file_states file_lists
576 set path
$current_diff_path
577 set s
$file_states($path)
578 if {[lindex
$s 0] ne
{_M
}} return
580 info_popup
"No differences detected.
582 [short_path $path] has no changes.
584 The modification date of this file was updated
585 by another application and you currently have
586 the Trust File Modification Timestamps option
587 enabled, so Git did not automatically detect
588 that there are no content differences in this
591 This file will now be removed from the modified
592 files list, to prevent possible confusion.
594 if {[catch
{exec git update-index
-- $path} err
]} {
595 error_popup
"Failed to refresh index:\n\n$err"
599 display_file
$path __
602 proc show_diff
{path w
{lno
{}}} {
603 global file_states file_lists
604 global is_3way_diff diff_active repo_config
605 global ui_diff ui_status_value ui_index ui_workdir
606 global current_diff_path current_diff_side
608 if {$diff_active ||
![lock_index
read]} return
611 if {$w eq
{} ||
$lno == {}} {
612 foreach w
[array names file_lists
] {
613 set lno
[lsearch
-sorted $file_lists($w) $path]
620 if {$w ne
{} && $lno >= 1} {
621 $w tag add in_diff
$lno.0 [expr {$lno + 1}].0
624 set s
$file_states($path)
628 set current_diff_path
$path
629 set current_diff_side
$w
630 set ui_status_value
"Loading diff of [escape_path $path]..."
632 # - Git won't give us the diff, there's nothing to compare to!
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.
}
656 if {$w eq
$ui_index} {
657 lappend cmd diff-index
659 } elseif
{$w eq
$ui_workdir} {
660 if {[string index
$m 0] eq
{U
}} {
663 lappend cmd diff-files
668 lappend cmd
--no-color
669 if {$repo_config(gui.diffcontext
) > 0} {
670 lappend cmd
"-U$repo_config(gui.diffcontext)"
672 if {$w eq
$ui_index} {
678 if {[catch
{set fd
[open
$cmd r
]} err
]} {
681 set ui_status_value
"Unable to display [escape_path $path]"
682 error_popup
"Error loading diff:\n\n$err"
686 fconfigure
$fd -blocking 0 -translation auto
687 fileevent
$fd readable
[list read_diff
$fd]
690 proc read_diff
{fd
} {
691 global ui_diff ui_status_value is_3way_diff diff_active
694 $ui_diff conf
-state normal
695 while {[gets
$fd line
] >= 0} {
696 # -- Cleanup uninteresting diff header lines.
698 if {[string match
{diff --git *} $line]} continue
699 if {[string match
{diff --cc *} $line]} continue
700 if {[string match
{diff --combined *} $line]} continue
701 if {[string match
{--- *} $line]} continue
702 if {[string match
{+++ *} $line]} continue
703 if {$line eq
{deleted
file mode
120000}} {
704 set line
"deleted symlink"
707 # -- Automatically detect if this is a 3 way diff.
709 if {[string match
{@@@
*} $line]} {set is_3way_diff
1}
711 if {[string match
{index
*} $line]
712 ||
[regexp
{^\
* Unmerged path
} $line]} {
714 } elseif
{$is_3way_diff} {
715 set op
[string range
$line 0 1]
725 if {[regexp
{^\
+\
+([<>]{7} |
={7})} $line _g op
]} {
726 set line
[string replace
$line 0 1 { }]
733 puts
"error: Unhandled 3 way diff marker: {$op}"
738 set op
[string index
$line 0]
744 if {[regexp
{^\
+([<>]{7} |
={7})} $line _g op
]} {
745 set line
[string replace
$line 0 0 { }]
752 puts
"error: Unhandled 2 way diff marker: {$op}"
757 $ui_diff insert end
$line $tags
758 $ui_diff insert end
"\n" $tags
760 $ui_diff conf
-state disabled
766 set ui_status_value
{Ready.
}
768 if {$repo_config(gui.trustmtime
) eq
{true
}
769 && [$ui_diff index end
] eq
{2.0}} {
775 ######################################################################
779 proc load_last_commit
{} {
780 global HEAD PARENT MERGE_HEAD commit_type ui_comm
782 if {[llength
$PARENT] == 0} {
783 error_popup
{There is nothing to amend.
785 You are about to create the initial commit.
786 There is no commit before this to amend.
791 repository_state curType curHEAD curMERGE_HEAD
792 if {$curType eq
{merge
}} {
793 error_popup
{Cannot amend
while merging.
795 You are currently
in the middle of a merge that
796 has not been fully completed. You cannot amend
797 the prior commit unless you first abort the
798 current merge activity.
806 set fd
[open
"| git cat-file commit $curHEAD" r
]
807 while {[gets
$fd line
] > 0} {
808 if {[string match
{parent
*} $line]} {
809 lappend parents
[string range
$line 7 end
]
812 set msg
[string trim
[read $fd]]
815 error_popup
"Error loading commit data for amend:\n\n$err"
821 set MERGE_HEAD
[list
]
822 switch
-- [llength
$parents] {
823 0 {set commit_type amend-initial
}
824 1 {set commit_type amend
}
825 default
{set commit_type amend-merge
}
828 $ui_comm delete
0.0 end
829 $ui_comm insert end
$msg
831 $ui_comm edit modified false
832 rescan
{set ui_status_value
{Ready.
}}
835 proc create_new_commit
{} {
836 global commit_type ui_comm
838 set commit_type normal
839 $ui_comm delete
0.0 end
841 $ui_comm edit modified false
842 rescan
{set ui_status_value
{Ready.
}}
845 set GIT_COMMITTER_IDENT
{}
847 proc committer_ident
{} {
848 global GIT_COMMITTER_IDENT
850 if {$GIT_COMMITTER_IDENT eq
{}} {
851 if {[catch
{set me
[exec git var GIT_COMMITTER_IDENT
]} err
]} {
852 error_popup
"Unable to obtain your identity:\n\n$err"
855 if {![regexp
{^
(.
*) [0-9]+ [-+0-9]+$
} \
856 $me me GIT_COMMITTER_IDENT
]} {
857 error_popup
"Invalid GIT_COMMITTER_IDENT:\n\n$me"
862 return $GIT_COMMITTER_IDENT
865 proc commit_tree
{} {
866 global HEAD commit_type file_states ui_comm repo_config
867 global ui_status_value pch_error
869 if {![lock_index update
]} return
870 if {[committer_ident
] eq
{}} return
872 # -- Our in memory state should match the repository.
874 repository_state curType curHEAD curMERGE_HEAD
875 if {[string match amend
* $commit_type]
876 && $curType eq
{normal
}
877 && $curHEAD eq
$HEAD} {
878 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
879 info_popup
{Last scanned state does not match repository state.
881 Another Git program has modified this repository
882 since the last scan. A rescan must be performed
883 before another commit can be created.
885 The rescan will be automatically started now.
888 rescan
{set ui_status_value
{Ready.
}}
892 # -- At least one file should differ in the index.
895 foreach path
[array names file_states
] {
896 switch
-glob -- [lindex
$file_states($path) 0] {
900 M?
{set files_ready
1}
902 error_popup
"Unmerged files cannot be committed.
904 File [short_path $path] has merge conflicts.
905 You must resolve them and add the file before committing.
911 error_popup
"Unknown file state [lindex $s 0] detected.
913 File [short_path $path] cannot be committed by this program.
919 info_popup
{No changes to commit.
921 You must add
at least
1 file before you can commit.
927 # -- A message is required.
929 set msg
[string trim
[$ui_comm get
1.0 end
]]
931 error_popup
{Please supply a commit message.
933 A good commit message has the following format
:
935 - First line
: Describe
in one sentance what you did.
937 - Remaining lines
: Describe why this change is good.
943 # -- Run the pre-commit hook.
945 set pchook
[gitdir hooks pre-commit
]
947 # On Cygwin [file executable] might lie so we need to ask
948 # the shell if the hook is executable. Yes that's annoying.
950 if {[is_Windows
] && [file isfile
$pchook]} {
951 set pchook
[list sh
-c [concat \
952 "if test -x \"$pchook\";" \
953 "then exec \"$pchook\" 2>&1;" \
955 } elseif
{[file executable
$pchook]} {
956 set pchook
[list
$pchook |
& cat]
958 commit_writetree
$curHEAD $msg
962 set ui_status_value
{Calling pre-commit hook...
}
964 set fd_ph
[open
"| $pchook" r
]
965 fconfigure
$fd_ph -blocking 0 -translation binary
966 fileevent
$fd_ph readable \
967 [list commit_prehook_wait
$fd_ph $curHEAD $msg]
970 proc commit_prehook_wait
{fd_ph curHEAD msg
} {
971 global pch_error ui_status_value
973 append pch_error
[read $fd_ph]
974 fconfigure
$fd_ph -blocking 1
976 if {[catch
{close
$fd_ph}]} {
977 set ui_status_value
{Commit declined by pre-commit hook.
}
978 hook_failed_popup pre-commit
$pch_error
981 commit_writetree
$curHEAD $msg
986 fconfigure
$fd_ph -blocking 0
989 proc commit_writetree
{curHEAD msg
} {
990 global ui_status_value
992 set ui_status_value
{Committing changes...
}
993 set fd_wt
[open
"| git write-tree" r
]
994 fileevent
$fd_wt readable \
995 [list commit_committree
$fd_wt $curHEAD $msg]
998 proc commit_committree
{fd_wt curHEAD msg
} {
999 global HEAD PARENT MERGE_HEAD commit_type
1000 global single_commit all_heads current_branch
1001 global ui_status_value ui_comm selected_commit_type
1002 global file_states selected_paths rescan_active
1005 if {$tree_id eq
{} ||
[catch
{close
$fd_wt} err
]} {
1006 error_popup
"write-tree failed:\n\n$err"
1007 set ui_status_value
{Commit failed.
}
1012 # -- Create the commit.
1014 set cmd
[list git commit-tree
$tree_id]
1015 set parents
[concat
$PARENT $MERGE_HEAD]
1016 if {[llength
$parents] > 0} {
1017 foreach p
$parents {
1021 # git commit-tree writes to stderr during initial commit.
1022 lappend cmd
2>/dev
/null
1025 if {[catch
{set cmt_id
[eval exec $cmd]} err
]} {
1026 error_popup
"commit-tree failed:\n\n$err"
1027 set ui_status_value
{Commit failed.
}
1032 # -- Update the HEAD ref.
1035 if {$commit_type ne
{normal
}} {
1036 append reflogm
" ($commit_type)"
1038 set i
[string first
"\n" $msg]
1040 append reflogm
{: } [string range
$msg 0 [expr {$i - 1}]]
1042 append reflogm
{: } $msg
1044 set cmd
[list git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD]
1045 if {[catch
{eval exec $cmd} err
]} {
1046 error_popup
"update-ref failed:\n\n$err"
1047 set ui_status_value
{Commit failed.
}
1052 # -- Make sure our current branch exists.
1054 if {$commit_type eq
{initial
}} {
1055 lappend all_heads
$current_branch
1056 set all_heads
[lsort
-unique $all_heads]
1057 populate_branch_menu
1060 # -- Cleanup after ourselves.
1062 catch
{file delete
[gitdir MERGE_HEAD
]}
1063 catch
{file delete
[gitdir MERGE_MSG
]}
1064 catch
{file delete
[gitdir SQUASH_MSG
]}
1065 catch
{file delete
[gitdir GITGUI_MSG
]}
1067 # -- Let rerere do its thing.
1069 if {[file isdirectory
[gitdir rr-cache
]]} {
1070 catch
{exec git rerere
}
1073 # -- Run the post-commit hook.
1075 set pchook
[gitdir hooks post-commit
]
1076 if {[is_Windows
] && [file isfile
$pchook]} {
1077 set pchook
[list sh
-c [concat \
1078 "if test -x \"$pchook\";" \
1079 "then exec \"$pchook\";" \
1081 } elseif
{![file executable
$pchook]} {
1084 if {$pchook ne
{}} {
1085 catch
{exec $pchook &}
1088 $ui_comm delete
0.0 end
1090 $ui_comm edit modified false
1092 if {$single_commit} do_quit
1094 # -- Update in memory status
1096 set selected_commit_type new
1097 set commit_type normal
1100 set MERGE_HEAD
[list
]
1102 foreach path
[array names file_states
] {
1103 set s
$file_states($path)
1105 switch
-glob -- $m {
1113 unset file_states
($path)
1114 catch
{unset selected_paths
($path)}
1117 set file_states
($path) [list _O
[lindex
$s 1] {} {}]
1123 set file_states
($path) [list \
1124 _
[string index
$m 1] \
1135 set ui_status_value \
1136 "Changes committed as [string range $cmt_id 0 7]."
1139 ######################################################################
1143 proc fetch_from
{remote
} {
1144 set w
[new_console
"fetch $remote" \
1145 "Fetching new changes from $remote"]
1146 set cmd
[list git fetch
]
1148 console_exec
$w $cmd
1151 proc pull_remote
{remote branch
} {
1152 global HEAD commit_type file_states repo_config
1154 if {![lock_index update
]} return
1156 # -- Our in memory state should match the repository.
1158 repository_state curType curHEAD curMERGE_HEAD
1159 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1160 info_popup
{Last scanned state does not match repository state.
1162 Another Git program has modified this repository
1163 since the last scan. A rescan must be performed
1164 before a pull operation can be started.
1166 The rescan will be automatically started now.
1169 rescan
{set ui_status_value
{Ready.
}}
1173 # -- No differences should exist before a pull.
1175 if {[array size file_states
] != 0} {
1176 error_popup
{Uncommitted but modified files are present.
1178 You should not perform a pull with unmodified
1179 files
in your working directory as Git will be
1180 unable to recover from an incorrect merge.
1182 You should commit or revert all changes before
1183 starting a pull operation.
1189 set w
[new_console
"pull $remote $branch" \
1190 "Pulling new changes from branch $branch in $remote"]
1191 set cmd
[list git pull
]
1192 if {$repo_config(gui.pullsummary
) eq
{false
}} {
1193 lappend cmd
--no-summary
1197 console_exec
$w $cmd [list post_pull_remote
$remote $branch]
1200 proc post_pull_remote
{remote branch success
} {
1201 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1202 global ui_status_value
1206 repository_state commit_type HEAD MERGE_HEAD
1208 set selected_commit_type new
1209 set ui_status_value
"Pulling $branch from $remote complete."
1211 rescan
[list
set ui_status_value \
1212 "Conflicts detected while pulling $branch from $remote."]
1216 proc push_to
{remote
} {
1217 set w
[new_console
"push $remote" \
1218 "Pushing changes to $remote"]
1219 set cmd
[list git push
]
1221 console_exec
$w $cmd
1224 ######################################################################
1228 proc mapicon
{w state path
} {
1231 if {[catch
{set r
$all_icons($state$w)}]} {
1232 puts
"error: no icon for $w state={$state} $path"
1238 proc mapdesc
{state path
} {
1241 if {[catch
{set r
$all_descs($state)}]} {
1242 puts
"error: no desc for state={$state} $path"
1248 proc escape_path
{path
} {
1249 regsub
-all "\n" $path "\\n" path
1253 proc short_path
{path
} {
1254 return [escape_path
[lindex
[file split $path] end
]]
1258 set null_sha1
[string repeat
0 40]
1260 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1261 global file_states next_icon_id null_sha1
1263 set s0
[string index
$new_state 0]
1264 set s1
[string index
$new_state 1]
1266 if {[catch
{set info
$file_states($path)}]} {
1268 set icon n
[incr next_icon_id
]
1270 set state
[lindex
$info 0]
1271 set icon
[lindex
$info 1]
1272 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1273 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1276 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1277 elseif
{$s0 eq
{_
}} {set s0 _
}
1279 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1280 elseif
{$s1 eq
{_
}} {set s1 _
}
1282 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1283 set head_info
[list
0 $null_sha1]
1284 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1285 && $head_info eq
{}} {
1286 set head_info
$index_info
1289 set file_states
($path) [list
$s0$s1 $icon \
1290 $head_info $index_info \
1295 proc display_file_helper
{w path icon_name old_m new_m
} {
1298 if {$new_m eq
{_
}} {
1299 set lno
[lsearch
-sorted $file_lists($w) $path]
1301 set file_lists
($w) [lreplace
$file_lists($w) $lno $lno]
1303 $w conf
-state normal
1304 $w delete
$lno.0 [expr {$lno + 1}].0
1305 $w conf
-state disabled
1307 } elseif
{$old_m eq
{_
} && $new_m ne
{_
}} {
1308 lappend file_lists
($w) $path
1309 set file_lists
($w) [lsort
-unique $file_lists($w)]
1310 set lno
[lsearch
-sorted $file_lists($w) $path]
1312 $w conf
-state normal
1313 $w image create
$lno.0 \
1314 -align center
-padx 5 -pady 1 \
1316 -image [mapicon
$w $new_m $path]
1317 $w insert
$lno.1 "[escape_path $path]\n"
1318 $w conf
-state disabled
1319 } elseif
{$old_m ne
$new_m} {
1320 $w conf
-state normal
1321 $w image conf
$icon_name -image [mapicon
$w $new_m $path]
1322 $w conf
-state disabled
1326 proc display_file
{path state
} {
1327 global file_states selected_paths
1328 global ui_index ui_workdir
1330 set old_m
[merge_state
$path $state]
1331 set s
$file_states($path)
1332 set new_m
[lindex
$s 0]
1333 set icon_name
[lindex
$s 1]
1335 set o
[string index
$old_m 0]
1336 set n
[string index
$new_m 0]
1343 display_file_helper
$ui_index $path $icon_name $o $n
1345 if {[string index
$old_m 0] eq
{U
}} {
1348 set o
[string index
$old_m 1]
1350 if {[string index
$new_m 0] eq
{U
}} {
1353 set n
[string index
$new_m 1]
1355 display_file_helper
$ui_workdir $path $icon_name $o $n
1357 if {$new_m eq
{__
}} {
1358 unset file_states
($path)
1359 catch
{unset selected_paths
($path)}
1363 proc display_all_files_helper
{w path icon_name m
} {
1366 lappend file_lists
($w) $path
1367 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1368 $w image create end \
1369 -align center
-padx 5 -pady 1 \
1371 -image [mapicon
$w $m $path]
1372 $w insert end
"[escape_path $path]\n"
1375 proc display_all_files
{} {
1376 global ui_index ui_workdir
1377 global file_states file_lists
1380 $ui_index conf
-state normal
1381 $ui_workdir conf
-state normal
1383 $ui_index delete
0.0 end
1384 $ui_workdir delete
0.0 end
1387 set file_lists
($ui_index) [list
]
1388 set file_lists
($ui_workdir) [list
]
1390 foreach path
[lsort
[array names file_states
]] {
1391 set s
$file_states($path)
1393 set icon_name
[lindex
$s 1]
1395 set s
[string index
$m 0]
1396 if {$s ne
{U
} && $s ne
{_
}} {
1397 display_all_files_helper
$ui_index $path \
1401 if {[string index
$m 0] eq
{U
}} {
1404 set s
[string index
$m 1]
1407 display_all_files_helper
$ui_workdir $path \
1412 $ui_index conf
-state disabled
1413 $ui_workdir conf
-state disabled
1416 proc update_indexinfo
{msg pathList after
} {
1417 global update_index_cp ui_status_value
1419 if {![lock_index update
]} return
1421 set update_index_cp
0
1422 set pathList
[lsort
$pathList]
1423 set totalCnt
[llength
$pathList]
1424 set batch [expr {int
($totalCnt * .01) + 1}]
1425 if {$batch > 25} {set batch 25}
1427 set ui_status_value
[format \
1428 "$msg... %i/%i files (%.2f%%)" \
1432 set fd
[open
"| git update-index -z --index-info" w
]
1438 fileevent
$fd writable
[list \
1439 write_update_indexinfo \
1449 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1450 global update_index_cp ui_status_value
1451 global file_states current_diff_path
1453 if {$update_index_cp >= $totalCnt} {
1460 for {set i
$batch} \
1461 {$update_index_cp < $totalCnt && $i > 0} \
1463 set path
[lindex
$pathList $update_index_cp]
1464 incr update_index_cp
1466 set s
$file_states($path)
1467 switch
-glob -- [lindex
$s 0] {
1474 set info
[lindex
$s 2]
1475 if {$info eq
{}} continue
1477 puts
-nonewline $fd "$info\t$path\0"
1478 display_file
$path $new
1481 set ui_status_value
[format \
1482 "$msg... %i/%i files (%.2f%%)" \
1485 [expr {100.0 * $update_index_cp / $totalCnt}]]
1488 proc update_index
{msg pathList after
} {
1489 global update_index_cp ui_status_value
1491 if {![lock_index update
]} return
1493 set update_index_cp
0
1494 set pathList
[lsort
$pathList]
1495 set totalCnt
[llength
$pathList]
1496 set batch [expr {int
($totalCnt * .01) + 1}]
1497 if {$batch > 25} {set batch 25}
1499 set ui_status_value
[format \
1500 "$msg... %i/%i files (%.2f%%)" \
1504 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1510 fileevent
$fd writable
[list \
1511 write_update_index \
1521 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1522 global update_index_cp ui_status_value
1523 global file_states current_diff_path
1525 if {$update_index_cp >= $totalCnt} {
1532 for {set i
$batch} \
1533 {$update_index_cp < $totalCnt && $i > 0} \
1535 set path
[lindex
$pathList $update_index_cp]
1536 incr update_index_cp
1538 switch
-glob -- [lindex
$file_states($path) 0] {
1544 if {[file exists
$path]} {
1553 puts
-nonewline $fd "$path\0"
1554 display_file
$path $new
1557 set ui_status_value
[format \
1558 "$msg... %i/%i files (%.2f%%)" \
1561 [expr {100.0 * $update_index_cp / $totalCnt}]]
1564 proc checkout_index
{msg pathList after
} {
1565 global update_index_cp ui_status_value
1567 if {![lock_index update
]} return
1569 set update_index_cp
0
1570 set pathList
[lsort
$pathList]
1571 set totalCnt
[llength
$pathList]
1572 set batch [expr {int
($totalCnt * .01) + 1}]
1573 if {$batch > 25} {set batch 25}
1575 set ui_status_value
[format \
1576 "$msg... %i/%i files (%.2f%%)" \
1580 set cmd
[list git checkout-index
]
1586 set fd
[open
"| $cmd " w
]
1592 fileevent
$fd writable
[list \
1593 write_checkout_index \
1603 proc write_checkout_index
{fd pathList totalCnt
batch msg after
} {
1604 global update_index_cp ui_status_value
1605 global file_states current_diff_path
1607 if {$update_index_cp >= $totalCnt} {
1614 for {set i
$batch} \
1615 {$update_index_cp < $totalCnt && $i > 0} \
1617 set path
[lindex
$pathList $update_index_cp]
1618 incr update_index_cp
1619 switch
-glob -- [lindex
$file_states($path) 0] {
1623 puts
-nonewline $fd "$path\0"
1624 display_file
$path ?_
1629 set ui_status_value
[format \
1630 "$msg... %i/%i files (%.2f%%)" \
1633 [expr {100.0 * $update_index_cp / $totalCnt}]]
1636 ######################################################################
1638 ## branch management
1640 proc is_tracking_branch
{name
} {
1641 global tracking_branches
1643 if {![catch
{set info
$tracking_branches($name)}]} {
1646 foreach t
[array names tracking_branches
] {
1647 if {[string match
{*/\
*} $t] && [string match
$t $name]} {
1654 proc load_all_heads
{} {
1657 set all_heads
[list
]
1658 set fd
[open
"| git for-each-ref --format=%(refname) refs/heads" r
]
1659 while {[gets
$fd line
] > 0} {
1660 if {[is_tracking_branch
$line]} continue
1661 if {![regsub ^refs
/heads
/ $line {} name
]} continue
1662 lappend all_heads
$name
1666 set all_heads
[lsort
$all_heads]
1669 proc populate_branch_menu
{} {
1670 global all_heads disable_on_lock
1673 set last
[$m index last
]
1674 for {set i
0} {$i <= $last} {incr i
} {
1675 if {[$m type $i] eq
{separator
}} {
1678 foreach a
$disable_on_lock {
1679 if {[lindex
$a 0] ne
$m ||
[lindex
$a 2] < $i} {
1683 set disable_on_lock
$new_dol
1689 foreach b
$all_heads {
1690 $m add radiobutton \
1692 -command [list switch_branch
$b] \
1693 -variable current_branch \
1696 lappend disable_on_lock \
1697 [list
$m entryconf
[$m index last
] -state]
1701 proc all_tracking_branches
{} {
1702 global tracking_branches
1704 set all_trackings
{}
1706 foreach name
[array names tracking_branches
] {
1707 if {[regsub
{/\
*$
} $name {} name
]} {
1710 regsub ^refs
/(heads|remotes
)/ $name {} name
1711 lappend all_trackings
$name
1716 set fd
[open
"| git for-each-ref --format=%(refname) $cmd" r
]
1717 while {[gets
$fd name
] > 0} {
1718 regsub ^refs
/(heads|remotes
)/ $name {} name
1719 lappend all_trackings
$name
1724 return [lsort
-unique $all_trackings]
1727 proc do_create_branch_action
{w
} {
1728 global all_heads null_sha1 repo_config
1729 global create_branch_checkout create_branch_revtype
1730 global create_branch_head create_branch_trackinghead
1732 set newbranch
[string trim
[$w.desc.name_t get
0.0 end
]]
1733 if {$newbranch eq
{}
1734 ||
$newbranch eq
$repo_config(gui.newbranchtemplate
)} {
1738 -title [wm title
$w] \
1740 -message "Please supply a branch name."
1741 focus
$w.desc.name_t
1744 if {![catch
{exec git show-ref
--verify -- "refs/heads/$newbranch"}]} {
1748 -title [wm title
$w] \
1750 -message "Branch '$newbranch' already exists."
1751 focus
$w.desc.name_t
1754 if {[catch
{exec git check-ref-format
"heads/$newbranch"}]} {
1758 -title [wm title
$w] \
1760 -message "We do not like '$newbranch' as a branch name."
1761 focus
$w.desc.name_t
1766 switch
-- $create_branch_revtype {
1767 head {set rev $create_branch_head}
1768 tracking
{set rev $create_branch_trackinghead}
1769 expression
{set rev [string trim
[$w.from.exp_t get
0.0 end
]]}
1771 if {[catch
{set cmt
[exec git rev-parse
--verify "${rev}^0"]}]} {
1775 -title [wm title
$w] \
1777 -message "Invalid starting revision: $rev"
1780 set cmd
[list git update-ref
]
1782 lappend cmd
"branch: Created from $rev"
1783 lappend cmd
"refs/heads/$newbranch"
1785 lappend cmd
$null_sha1
1786 if {[catch
{eval exec $cmd} err
]} {
1790 -title [wm title
$w] \
1792 -message "Failed to create '$newbranch'.\n\n$err"
1796 lappend all_heads
$newbranch
1797 set all_heads
[lsort
$all_heads]
1798 populate_branch_menu
1800 if {$create_branch_checkout} {
1801 switch_branch
$newbranch
1805 proc radio_selector
{varname value args
} {
1806 upvar
#0 $varname var
1810 trace add variable create_branch_head
write \
1811 [list radio_selector create_branch_revtype
head]
1812 trace add variable create_branch_trackinghead
write \
1813 [list radio_selector create_branch_revtype tracking
]
1815 trace add variable delete_branch_head
write \
1816 [list radio_selector delete_branch_checktype
head]
1817 trace add variable delete_branch_trackinghead
write \
1818 [list radio_selector delete_branch_checktype tracking
]
1820 proc do_create_branch
{} {
1821 global all_heads current_branch repo_config
1822 global create_branch_checkout create_branch_revtype
1823 global create_branch_head create_branch_trackinghead
1825 set w .branch_editor
1827 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
1829 label
$w.header
-text {Create New Branch
} \
1831 pack
$w.header
-side top
-fill x
1834 button
$w.buttons.create
-text Create \
1837 -command [list do_create_branch_action
$w]
1838 pack
$w.buttons.create
-side right
1839 button
$w.buttons.cancel
-text {Cancel
} \
1841 -command [list destroy
$w]
1842 pack
$w.buttons.cancel
-side right
-padx 5
1843 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
1845 labelframe
$w.desc \
1846 -text {Branch Description
} \
1848 label
$w.desc.name_l
-text {Name
:} -font font_ui
1849 text
$w.desc.name_t \
1855 $w.desc.name_t insert
0.0 $repo_config(gui.newbranchtemplate
)
1856 grid
$w.desc.name_l
$w.desc.name_t
-stick we
-padx {0 5}
1857 bind $w.desc.name_t
<Shift-Key-Tab
> {focus
[tk_focusPrev
%W
];break}
1858 bind $w.desc.name_t
<Key-Tab
> {focus
[tk_focusNext
%W
];break}
1859 bind $w.desc.name_t
<Key-Return
> "do_create_branch_action $w;break"
1860 bind $w.desc.name_t
<Key
> {
1861 if {{%K
} ne
{BackSpace
}
1864 && {%K
} ne
{Return
}} {
1866 if {[string first
%A
{~^
:?
*[}] >= 0} break
1869 grid columnconfigure
$w.desc
1 -weight 1
1870 pack
$w.desc
-anchor nw
-fill x
-pady 5 -padx 5
1872 labelframe
$w.from \
1873 -text {Starting Revision
} \
1875 radiobutton
$w.from.head_r \
1876 -text {Local Branch
:} \
1878 -variable create_branch_revtype \
1880 eval tk_optionMenu
$w.from.head_m create_branch_head
$all_heads
1881 grid
$w.from.head_r
$w.from.head_m
-sticky w
1882 set all_trackings
[all_tracking_branches
]
1883 if {$all_trackings ne
{}} {
1884 set create_branch_trackinghead
[lindex
$all_trackings 0]
1885 radiobutton
$w.from.tracking_r \
1886 -text {Tracking Branch
:} \
1888 -variable create_branch_revtype \
1890 eval tk_optionMenu
$w.from.tracking_m \
1891 create_branch_trackinghead \
1893 grid
$w.from.tracking_r
$w.from.tracking_m
-sticky w
1895 radiobutton
$w.from.exp_r \
1896 -text {Revision Expression
:} \
1898 -variable create_branch_revtype \
1900 text
$w.from.exp_t \
1906 grid
$w.from.exp_r
$w.from.exp_t
-stick we
-padx {0 5}
1907 bind $w.from.exp_t
<Shift-Key-Tab
> {focus
[tk_focusPrev
%W
];break}
1908 bind $w.from.exp_t
<Key-Tab
> {focus
[tk_focusNext
%W
];break}
1909 bind $w.from.exp_t
<Key-Return
> "do_create_branch_action $w;break"
1910 bind $w.from.exp_t
<Key-space
> break
1911 bind $w.from.exp_t
<Key
> {set create_branch_revtype expression
}
1912 grid columnconfigure
$w.from
1 -weight 1
1913 pack
$w.from
-anchor nw
-fill x
-pady 5 -padx 5
1915 labelframe
$w.postActions \
1916 -text {Post Creation Actions
} \
1918 checkbutton
$w.postActions.checkout \
1919 -text {Checkout after creation
} \
1920 -variable create_branch_checkout \
1922 pack
$w.postActions.checkout
-anchor nw
1923 pack
$w.postActions
-anchor nw
-fill x
-pady 5 -padx 5
1925 set create_branch_checkout
1
1926 set create_branch_head
$current_branch
1927 set create_branch_revtype
head
1929 bind $w <Visibility
> "grab $w; focus $w.desc.name_t"
1930 bind $w <Key-Escape
> "destroy $w"
1931 bind $w <Key-Return
> "do_create_branch_action $w;break"
1932 wm title
$w "[appname] ([reponame]): Create Branch"
1936 proc do_delete_branch_action
{w
} {
1938 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
1941 switch
-- $delete_branch_checktype {
1942 head {set check_rev
$delete_branch_head}
1943 tracking
{set check_rev
$delete_branch_trackinghead}
1944 always
{set check_rev
{:none
}}
1946 if {$check_rev eq
{:none
}} {
1948 } elseif
{[catch
{set check_cmt
[exec git rev-parse
--verify "${check_rev}^0"]}]} {
1952 -title [wm title
$w] \
1954 -message "Invalid check revision: $check_rev"
1958 set to_delete
[list
]
1959 set not_merged
[list
]
1960 foreach i
[$w.list.l curselection
] {
1961 set b
[$w.list.l get
$i]
1962 if {[catch
{set o
[exec git rev-parse
--verify $b]}]} continue
1963 if {$check_cmt ne
{}} {
1964 if {$b eq
$check_rev} continue
1965 if {[catch
{set m
[exec git merge-base
$o $check_cmt]}]} continue
1967 lappend not_merged
$b
1971 lappend to_delete
[list
$b $o]
1973 if {$not_merged ne
{}} {
1974 set msg
"The following branches are not completely merged into $check_rev:
1976 - [join $not_merged "\n - "]"
1980 -title [wm title
$w] \
1984 if {$to_delete eq
{}} return
1985 if {$delete_branch_checktype eq
{always
}} {
1986 set msg
{Recovering deleted branches is difficult.
1988 Delete the selected branches?
}
1989 if {[tk_messageBox \
1992 -title [wm title
$w] \
1994 -message $msg] ne
yes} {
2000 foreach i
$to_delete {
2003 if {[catch
{exec git update-ref
-d "refs/heads/$b" $o} err
]} {
2004 append failed
" - $b: $err\n"
2006 set x
[lsearch
-sorted $all_heads $b]
2008 set all_heads
[lreplace
$all_heads $x $x]
2013 if {$failed ne
{}} {
2017 -title [wm title
$w] \
2019 -message "Failed to delete branches:\n$failed"
2022 set all_heads
[lsort
$all_heads]
2023 populate_branch_menu
2027 proc do_delete_branch
{} {
2028 global all_heads tracking_branches current_branch
2029 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2031 set w .branch_editor
2033 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2035 label
$w.header
-text {Delete Local Branch
} \
2037 pack
$w.header
-side top
-fill x
2040 button
$w.buttons.create
-text Delete \
2042 -command [list do_delete_branch_action
$w]
2043 pack
$w.buttons.create
-side right
2044 button
$w.buttons.cancel
-text {Cancel
} \
2046 -command [list destroy
$w]
2047 pack
$w.buttons.cancel
-side right
-padx 5
2048 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2050 labelframe
$w.list \
2051 -text {Local Branches
} \
2056 -selectmode extended \
2058 foreach h
$all_heads {
2059 if {$h ne
$current_branch} {
2060 $w.list.l insert end
$h
2063 pack
$w.list.l
-fill both
-pady 5 -padx 5
2064 pack
$w.list
-fill both
-pady 5 -padx 5
2066 labelframe
$w.validate \
2067 -text {Delete Only If
} \
2069 radiobutton
$w.validate.head_r \
2070 -text {Merged Into Local Branch
:} \
2072 -variable delete_branch_checktype \
2074 eval tk_optionMenu
$w.validate.head_m delete_branch_head
$all_heads
2075 grid
$w.validate.head_r
$w.validate.head_m
-sticky w
2076 set all_trackings
[all_tracking_branches
]
2077 if {$all_trackings ne
{}} {
2078 set delete_branch_trackinghead
[lindex
$all_trackings 0]
2079 radiobutton
$w.validate.tracking_r \
2080 -text {Merged Into Tracking Branch
:} \
2082 -variable delete_branch_checktype \
2084 eval tk_optionMenu
$w.validate.tracking_m \
2085 delete_branch_trackinghead \
2087 grid
$w.validate.tracking_r
$w.validate.tracking_m
-sticky w
2089 radiobutton
$w.validate.always_r \
2090 -text {Always
(Do not perform merge checks
)} \
2092 -variable delete_branch_checktype \
2094 grid
$w.validate.always_r
-columnspan 2 -sticky w
2095 grid columnconfigure
$w.validate
1 -weight 1
2096 pack
$w.validate
-anchor nw
-fill x
-pady 5 -padx 5
2098 set delete_branch_head
$current_branch
2099 set delete_branch_checktype
head
2101 bind $w <Visibility
> "grab $w; focus $w"
2102 bind $w <Key-Escape
> "destroy $w"
2103 wm title
$w "[appname] ([reponame]): Delete Branch"
2107 proc switch_branch
{b
} {
2108 global HEAD commit_type file_states current_branch
2109 global selected_commit_type ui_comm
2111 if {![lock_index switch
]} return
2113 # -- Backup the selected branch (repository_state resets it)
2115 set new_branch
$current_branch
2117 # -- Our in memory state should match the repository.
2119 repository_state curType curHEAD curMERGE_HEAD
2120 if {[string match amend
* $commit_type]
2121 && $curType eq
{normal
}
2122 && $curHEAD eq
$HEAD} {
2123 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
2124 info_popup
{Last scanned state does not match repository state.
2126 Another Git program has modified this repository
2127 since the last scan. A rescan must be performed
2128 before the current branch can be changed.
2130 The rescan will be automatically started now.
2133 rescan
{set ui_status_value
{Ready.
}}
2137 # -- Toss the message buffer if we are in amend mode.
2139 if {[string match amend
* $curType]} {
2140 $ui_comm delete
0.0 end
2142 $ui_comm edit modified false
2145 set selected_commit_type new
2146 set current_branch
$new_branch
2149 error
"NOT FINISHED"
2152 ######################################################################
2154 ## remote management
2156 proc load_all_remotes
{} {
2158 global all_remotes tracking_branches
2160 set all_remotes
[list
]
2161 array
unset tracking_branches
2163 set rm_dir
[gitdir remotes
]
2164 if {[file isdirectory
$rm_dir]} {
2165 set all_remotes
[glob \
2169 -directory $rm_dir *]
2171 foreach name
$all_remotes {
2173 set fd
[open
[file join $rm_dir $name] r
]
2174 while {[gets
$fd line
] >= 0} {
2175 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
2176 $line line src dst
]} continue
2177 if {![regexp ^refs
/ $dst]} {
2178 set dst
"refs/heads/$dst"
2180 set tracking_branches
($dst) [list
$name $src]
2187 foreach line
[array names repo_config remote.
*.url
] {
2188 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
2189 lappend all_remotes
$name
2191 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
2195 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
2196 if {![regexp ^refs
/ $dst]} {
2197 set dst
"refs/heads/$dst"
2199 set tracking_branches
($dst) [list
$name $src]
2203 set all_remotes
[lsort
-unique $all_remotes]
2206 proc populate_fetch_menu
{m
} {
2207 global all_remotes repo_config
2209 foreach r
$all_remotes {
2211 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2212 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
2217 set fd
[open
[gitdir remotes
$r] r
]
2218 while {[gets
$fd n
] >= 0} {
2219 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
2230 -label "Fetch from $r..." \
2231 -command [list fetch_from
$r] \
2237 proc populate_push_menu
{m
} {
2238 global all_remotes repo_config
2240 foreach r
$all_remotes {
2242 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2243 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
2248 set fd
[open
[gitdir remotes
$r] r
]
2249 while {[gets
$fd n
] >= 0} {
2250 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
2261 -label "Push to $r..." \
2262 -command [list push_to
$r] \
2268 proc populate_pull_menu
{m
} {
2269 global repo_config all_remotes disable_on_lock
2271 foreach remote
$all_remotes {
2273 if {[array get repo_config remote.
$remote.url
] ne
{}} {
2274 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
2275 foreach line
$repo_config(remote.
$remote.fetch
) {
2276 if {[regexp
{^
([^
:]+):} $line line rb
]} {
2283 set fd
[open
[gitdir remotes
$remote] r
]
2284 while {[gets
$fd line
] >= 0} {
2285 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
2293 foreach rb
$rb_list {
2294 regsub ^refs
/heads
/ $rb {} rb_short
2296 -label "Branch $rb_short from $remote..." \
2297 -command [list pull_remote
$remote $rb] \
2299 lappend disable_on_lock \
2300 [list
$m entryconf
[$m index last
] -state]
2305 ######################################################################
2310 #define mask_width 14
2311 #define mask_height 15
2312 static unsigned char mask_bits
[] = {
2313 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2314 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2315 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2318 image create bitmap file_plain
-background white
-foreground black
-data {
2319 #define plain_width 14
2320 #define plain_height 15
2321 static unsigned char plain_bits
[] = {
2322 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2323 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2324 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2325 } -maskdata $filemask
2327 image create bitmap file_mod
-background white
-foreground blue
-data {
2328 #define mod_width 14
2329 #define mod_height 15
2330 static unsigned char mod_bits
[] = {
2331 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2332 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2333 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2334 } -maskdata $filemask
2336 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
2337 #define file_fulltick_width 14
2338 #define file_fulltick_height 15
2339 static unsigned char file_fulltick_bits
[] = {
2340 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2341 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2342 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2343 } -maskdata $filemask
2345 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
2346 #define parttick_width 14
2347 #define parttick_height 15
2348 static unsigned char parttick_bits
[] = {
2349 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2350 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2351 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2352 } -maskdata $filemask
2354 image create bitmap file_question
-background white
-foreground black
-data {
2355 #define file_question_width 14
2356 #define file_question_height 15
2357 static unsigned char file_question_bits
[] = {
2358 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2359 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2360 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2361 } -maskdata $filemask
2363 image create bitmap file_removed
-background white
-foreground red
-data {
2364 #define file_removed_width 14
2365 #define file_removed_height 15
2366 static unsigned char file_removed_bits
[] = {
2367 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2368 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2369 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2370 } -maskdata $filemask
2372 image create bitmap file_merge
-background white
-foreground blue
-data {
2373 #define file_merge_width 14
2374 #define file_merge_height 15
2375 static unsigned char file_merge_bits
[] = {
2376 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2377 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2378 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2379 } -maskdata $filemask
2381 set ui_index .vpane.files.index.list
2382 set ui_workdir .vpane.files.workdir.list
2384 set all_icons
(_
$ui_index) file_plain
2385 set all_icons
(A
$ui_index) file_fulltick
2386 set all_icons
(M
$ui_index) file_fulltick
2387 set all_icons
(D
$ui_index) file_removed
2388 set all_icons
(U
$ui_index) file_merge
2390 set all_icons
(_
$ui_workdir) file_plain
2391 set all_icons
(M
$ui_workdir) file_mod
2392 set all_icons
(D
$ui_workdir) file_question
2393 set all_icons
(U
$ui_workdir) file_merge
2394 set all_icons
(O
$ui_workdir) file_plain
2396 set max_status_desc
0
2400 {_M
"Modified, not staged"}
2401 {M_
"Staged for commit"}
2402 {MM
"Portions staged for commit"}
2403 {MD
"Staged for commit, missing"}
2405 {_O
"Untracked, not staged"}
2406 {A_
"Staged for commit"}
2407 {AM
"Portions staged for commit"}
2408 {AD
"Staged for commit, missing"}
2411 {D_
"Staged for removal"}
2412 {DO
"Staged for removal, still present"}
2414 {U_
"Requires merge resolution"}
2415 {UU
"Requires merge resolution"}
2416 {UM
"Requires merge resolution"}
2417 {UD
"Requires merge resolution"}
2419 if {$max_status_desc < [string length
[lindex
$i 1]]} {
2420 set max_status_desc
[string length
[lindex
$i 1]]
2422 set all_descs
([lindex
$i 0]) [lindex
$i 1]
2426 ######################################################################
2431 global tcl_platform tk_library
2432 if {[tk windowingsystem
] eq
{aqua
}} {
2438 proc is_Windows
{} {
2440 if {$tcl_platform(platform
) eq
{windows
}} {
2446 proc bind_button3
{w cmd
} {
2447 bind $w <Any-Button-3
> $cmd
2449 bind $w <Control-Button-1
> $cmd
2453 proc incr_font_size
{font
{amt
1}} {
2454 set sz
[font configure
$font -size]
2456 font configure
$font -size $sz
2457 font configure
${font}bold
-size $sz
2460 proc hook_failed_popup
{hook msg
} {
2465 label
$w.m.l1
-text "$hook hook failed:" \
2470 -background white
-borderwidth 1 \
2472 -width 80 -height 10 \
2474 -yscrollcommand [list
$w.m.sby
set]
2476 -text {You must correct the above errors before committing.
} \
2480 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2481 pack
$w.m.l1
-side top
-fill x
2482 pack
$w.m.l2
-side bottom
-fill x
2483 pack
$w.m.sby
-side right
-fill y
2484 pack
$w.m.t
-side left
-fill both
-expand 1
2485 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2487 $w.m.t insert
1.0 $msg
2488 $w.m.t conf
-state disabled
2490 button
$w.ok
-text OK \
2493 -command "destroy $w"
2494 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2496 bind $w <Visibility
> "grab $w; focus $w"
2497 bind $w <Key-Return
> "destroy $w"
2498 wm title
$w "[appname] ([reponame]): error"
2502 set next_console_id
0
2504 proc new_console
{short_title long_title
} {
2505 global next_console_id console_data
2506 set w .console
[incr next_console_id
]
2507 set console_data
($w) [list
$short_title $long_title]
2508 return [console_init
$w]
2511 proc console_init
{w
} {
2512 global console_cr console_data M1B
2514 set console_cr
($w) 1.0
2517 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
2522 -background white
-borderwidth 1 \
2524 -width 80 -height 10 \
2527 -yscrollcommand [list
$w.m.sby
set]
2528 label
$w.m.s
-text {Working... please
wait...
} \
2532 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2533 pack
$w.m.l1
-side top
-fill x
2534 pack
$w.m.s
-side bottom
-fill x
2535 pack
$w.m.sby
-side right
-fill y
2536 pack
$w.m.t
-side left
-fill both
-expand 1
2537 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2539 menu
$w.ctxm
-tearoff 0
2540 $w.ctxm add
command -label "Copy" \
2542 -command "tk_textCopy $w.m.t"
2543 $w.ctxm add
command -label "Select All" \
2545 -command "$w.m.t tag add sel 0.0 end"
2546 $w.ctxm add
command -label "Copy All" \
2549 $w.m.t tag add sel 0.0 end
2551 $w.m.t tag remove sel 0.0 end
2554 button
$w.ok
-text {Close
} \
2557 -command "destroy $w"
2558 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2560 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
2561 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2562 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2563 bind $w <Visibility
> "focus $w"
2564 wm title
$w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2568 proc console_exec
{w cmd
{after
{}}} {
2569 # -- Windows tosses the enviroment when we exec our child.
2570 # But most users need that so we have to relogin. :-(
2573 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
2576 # -- Tcl won't let us redirect both stdout and stderr to
2577 # the same pipe. So pass it through cat...
2579 set cmd
[concat |
$cmd |
& cat]
2581 set fd_f
[open
$cmd r
]
2582 fconfigure
$fd_f -blocking 0 -translation binary
2583 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
2586 proc console_read
{w fd after
} {
2587 global console_cr console_data
2591 if {![winfo exists
$w]} {console_init
$w}
2592 $w.m.t conf
-state normal
2594 set n
[string length
$buf]
2596 set cr
[string first
"\r" $buf $c]
2597 set lf
[string first
"\n" $buf $c]
2598 if {$cr < 0} {set cr
[expr {$n + 1}]}
2599 if {$lf < 0} {set lf
[expr {$n + 1}]}
2602 $w.m.t insert end
[string range
$buf $c $lf]
2603 set console_cr
($w) [$w.m.t index
{end
-1c}]
2607 $w.m.t delete
$console_cr($w) end
2608 $w.m.t insert end
"\n"
2609 $w.m.t insert end
[string range
$buf $c $cr]
2614 $w.m.t conf
-state disabled
2618 fconfigure
$fd -blocking 1
2620 if {[catch
{close
$fd}]} {
2621 if {![winfo exists
$w]} {console_init
$w}
2622 $w.m.s conf
-background red
-text {Error
: Command Failed
}
2623 $w.ok conf
-state normal
2625 } elseif
{[winfo exists
$w]} {
2626 $w.m.s conf
-background green
-text {Success
}
2627 $w.ok conf
-state normal
2630 array
unset console_cr
$w
2631 array
unset console_data
$w
2633 uplevel
#0 $after $ok
2637 fconfigure
$fd -blocking 0
2640 ######################################################################
2644 set starting_gitk_msg
{Starting gitk... please
wait...
}
2646 proc do_gitk
{revs
} {
2647 global ui_status_value starting_gitk_msg
2655 set cmd
"sh -c \"exec $cmd\""
2659 if {[catch
{eval exec $cmd} err
]} {
2660 error_popup
"Failed to start gitk:\n\n$err"
2662 set ui_status_value
$starting_gitk_msg
2664 if {$ui_status_value eq
$starting_gitk_msg} {
2665 set ui_status_value
{Ready.
}
2672 set w
[new_console
{gc
} {Compressing the object database
}]
2673 console_exec
$w {git gc
}
2676 proc do_fsck_objects
{} {
2677 set w
[new_console
{fsck-objects
} \
2678 {Verifying the object database with fsck-objects
}]
2679 set cmd
[list git fsck-objects
]
2682 lappend cmd
--strict
2683 console_exec
$w $cmd
2689 global ui_comm is_quitting repo_config commit_type
2691 if {$is_quitting} return
2694 # -- Stash our current commit buffer.
2696 set save
[gitdir GITGUI_MSG
]
2697 set msg
[string trim
[$ui_comm get
0.0 end
]]
2698 if {![string match amend
* $commit_type]
2699 && [$ui_comm edit modified
]
2702 set fd
[open
$save w
]
2703 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
2707 catch
{file delete
$save}
2710 # -- Stash our current window geometry into this repository.
2712 set cfg_geometry
[list
]
2713 lappend cfg_geometry
[wm geometry .
]
2714 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
2715 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
2716 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2719 if {$cfg_geometry ne
$rc_geometry} {
2720 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2727 rescan
{set ui_status_value
{Ready.
}}
2730 proc unstage_helper
{txt paths
} {
2731 global file_states current_diff_path
2733 if {![lock_index begin-update
]} return
2737 foreach path
$paths {
2738 switch
-glob -- [lindex
$file_states($path) 0] {
2742 lappend pathList
$path
2743 if {$path eq
$current_diff_path} {
2744 set after
{reshow_diff
;}
2749 if {$pathList eq
{}} {
2755 [concat
$after {set ui_status_value
{Ready.
}}]
2759 proc do_unstage_selection
{} {
2760 global current_diff_path selected_paths
2762 if {[array size selected_paths
] > 0} {
2764 {Unstaging selected files from commit
} \
2765 [array names selected_paths
]
2766 } elseif
{$current_diff_path ne
{}} {
2768 "Unstaging [short_path $current_diff_path] from commit" \
2769 [list
$current_diff_path]
2773 proc add_helper
{txt paths
} {
2774 global file_states current_diff_path
2776 if {![lock_index begin-update
]} return
2780 foreach path
$paths {
2781 switch
-glob -- [lindex
$file_states($path) 0] {
2786 lappend pathList
$path
2787 if {$path eq
$current_diff_path} {
2788 set after
{reshow_diff
;}
2793 if {$pathList eq
{}} {
2799 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2803 proc do_add_selection
{} {
2804 global current_diff_path selected_paths
2806 if {[array size selected_paths
] > 0} {
2808 {Adding selected files
} \
2809 [array names selected_paths
]
2810 } elseif
{$current_diff_path ne
{}} {
2812 "Adding [short_path $current_diff_path]" \
2813 [list
$current_diff_path]
2817 proc do_add_all
{} {
2821 foreach path
[array names file_states
] {
2822 switch
-glob -- [lindex
$file_states($path) 0] {
2825 ?D
{lappend paths
$path}
2828 add_helper
{Adding all changed files
} $paths
2831 proc revert_helper
{txt paths
} {
2832 global file_states current_diff_path
2834 if {![lock_index begin-update
]} return
2838 foreach path
$paths {
2839 switch
-glob -- [lindex
$file_states($path) 0] {
2843 lappend pathList
$path
2844 if {$path eq
$current_diff_path} {
2845 set after
{reshow_diff
;}
2851 set n
[llength
$pathList]
2855 } elseif
{$n == 1} {
2856 set s
"[short_path [lindex $pathList]]"
2858 set s
"these $n files"
2861 set reply
[tk_dialog \
2863 "[appname] ([reponame])" \
2864 "Revert changes in $s?
2866 Any unadded changes will be permanently lost by the revert." \
2876 [concat
$after {set ui_status_value
{Ready.
}}]
2882 proc do_revert_selection
{} {
2883 global current_diff_path selected_paths
2885 if {[array size selected_paths
] > 0} {
2887 {Reverting selected files
} \
2888 [array names selected_paths
]
2889 } elseif
{$current_diff_path ne
{}} {
2891 "Reverting [short_path $current_diff_path]" \
2892 [list
$current_diff_path]
2896 proc do_signoff
{} {
2899 set me
[committer_ident
]
2900 if {$me eq
{}} return
2902 set sob
"Signed-off-by: $me"
2903 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2904 if {$last ne
$sob} {
2905 $ui_comm edit separator
2907 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2908 $ui_comm insert end
"\n"
2910 $ui_comm insert end
"\n$sob"
2911 $ui_comm edit separator
2916 proc do_select_commit_type
{} {
2917 global commit_type selected_commit_type
2919 if {$selected_commit_type eq
{new
}
2920 && [string match amend
* $commit_type]} {
2922 } elseif
{$selected_commit_type eq
{amend
}
2923 && ![string match amend
* $commit_type]} {
2926 # The amend request was rejected...
2928 if {![string match amend
* $commit_type]} {
2929 set selected_commit_type new
2939 global appvers copyright
2940 global tcl_patchLevel tk_patchLevel
2944 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2946 label
$w.header
-text "About [appname]" \
2948 pack
$w.header
-side top
-fill x
2951 button
$w.buttons.close
-text {Close
} \
2953 -command [list destroy
$w]
2954 pack
$w.buttons.close
-side right
2955 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2958 -text "[appname] - a commit creation tool for Git.
2966 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
2969 append v
"[appname] version $appvers\n"
2970 append v
"[exec git version]\n"
2972 if {$tcl_patchLevel eq
$tk_patchLevel} {
2973 append v
"Tcl/Tk version $tcl_patchLevel"
2975 append v
"Tcl version $tcl_patchLevel"
2976 append v
", Tk version $tk_patchLevel"
2987 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
2989 menu
$w.ctxm
-tearoff 0
2990 $w.ctxm add
command \
2995 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2998 bind $w <Visibility
> "grab $w; focus $w"
2999 bind $w <Key-Escape
> "destroy $w"
3000 bind_button3
$w.vers
"tk_popup $w.ctxm %X %Y; grab $w; focus $w"
3001 wm title
$w "About [appname]"
3005 proc do_options
{} {
3006 global repo_config global_config font_descs
3007 global repo_config_new global_config_new
3009 array
unset repo_config_new
3010 array
unset global_config_new
3011 foreach name
[array names repo_config
] {
3012 set repo_config_new
($name) $repo_config($name)
3015 foreach name
[array names repo_config
] {
3017 gui.diffcontext
{continue}
3019 set repo_config_new
($name) $repo_config($name)
3021 foreach name
[array names global_config
] {
3022 set global_config_new
($name) $global_config($name)
3025 set w .options_editor
3027 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
3029 label
$w.header
-text "[appname] Options" \
3031 pack
$w.header
-side top
-fill x
3034 button
$w.buttons.restore
-text {Restore Defaults
} \
3036 -command do_restore_defaults
3037 pack
$w.buttons.restore
-side left
3038 button
$w.buttons.save
-text Save \
3041 catch {eval \[bind \[focus -displayof $w\] <FocusOut>\]}
3044 pack
$w.buttons.save
-side right
3045 button
$w.buttons.cancel
-text {Cancel
} \
3047 -command [list destroy
$w]
3048 pack
$w.buttons.cancel
-side right
-padx 5
3049 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
3051 labelframe
$w.repo
-text "[reponame] Repository" \
3053 -relief raised
-borderwidth 2
3054 labelframe
$w.global
-text {Global
(All Repositories
)} \
3056 -relief raised
-borderwidth 2
3057 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
3058 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
3061 {b pullsummary
{Show Pull Summary
}}
3062 {b trustmtime
{Trust File Modification Timestamps
}}
3063 {i diffcontext
{Number of Diff Context Lines
}}
3064 {t newbranchtemplate
{New Branch Name Template
}}
3066 set type [lindex
$option 0]
3067 set name
[lindex
$option 1]
3068 set text
[lindex
$option 2]
3069 foreach f
{repo global
} {
3072 checkbutton
$w.
$f.
$name -text $text \
3073 -variable ${f}_config_new
(gui.
$name) \
3077 pack
$w.
$f.
$name -side top
-anchor w
3081 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
3082 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
3083 spinbox
$w.
$f.
$name.v \
3084 -textvariable ${f}_config_new
(gui.
$name) \
3085 -from 1 -to 99 -increment 1 \
3088 bind $w.
$f.
$name.v
<FocusIn
> {%W selection range
0 end
}
3089 pack
$w.
$f.
$name.v
-side right
-anchor e
-padx 5
3090 pack
$w.
$f.
$name -side top
-anchor w
-fill x
3094 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
3095 text
$w.
$f.
$name.v \
3101 $w.
$f.
$name.v insert
0.0 [set ${f}_config_new
(gui.
$name)]
3102 bind $w.
$f.
$name.v
<Shift-Key-Tab
> {focus
[tk_focusPrev
%W
];break}
3103 bind $w.
$f.
$name.v
<Key-Tab
> {focus
[tk_focusNext
%W
];break}
3104 bind $w.
$f.
$name.v
<Key-Return
> break
3105 bind $w.
$f.
$name.v
<FocusIn
> "$w.$f.$name.v tag add sel 0.0 end"
3106 bind $w.
$f.
$name.v
<FocusOut
> "
3107 set ${f}_config_new(gui.$name) \
3108 \[string trim \[$w.$f.$name.v get 0.0 end\]\]
3110 pack
$w.
$f.
$name.l
-side left
-anchor w
3111 pack
$w.
$f.
$name.v
-side left
-anchor w \
3114 pack
$w.
$f.
$name -side top
-anchor w
-fill x
3120 set all_fonts
[lsort
[font families
]]
3121 foreach option
$font_descs {
3122 set name
[lindex
$option 0]
3123 set font
[lindex
$option 1]
3124 set text
[lindex
$option 2]
3126 set global_config_new
(gui.
$font^^family
) \
3127 [font configure
$font -family]
3128 set global_config_new
(gui.
$font^^size
) \
3129 [font configure
$font -size]
3131 frame
$w.global.
$name
3132 label
$w.global.
$name.l
-text "$text:" -font font_ui
3133 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
3134 eval tk_optionMenu
$w.global.
$name.family \
3135 global_config_new
(gui.
$font^^family
) \
3137 spinbox
$w.global.
$name.size \
3138 -textvariable global_config_new
(gui.
$font^^size
) \
3139 -from 2 -to 80 -increment 1 \
3142 bind $w.global.
$name.size
<FocusIn
> {%W selection range
0 end
}
3143 pack
$w.global.
$name.size
-side right
-anchor e
3144 pack
$w.global.
$name.family
-side right
-anchor e
3145 pack
$w.global.
$name -side top
-anchor w
-fill x
3148 bind $w <Visibility
> "grab $w; focus $w"
3149 bind $w <Key-Escape
> "destroy $w"
3150 wm title
$w "[appname] ([reponame]): Options"
3154 proc do_restore_defaults
{} {
3155 global font_descs default_config repo_config
3156 global repo_config_new global_config_new
3158 foreach name
[array names default_config
] {
3159 set repo_config_new
($name) $default_config($name)
3160 set global_config_new
($name) $default_config($name)
3163 foreach option
$font_descs {
3164 set name
[lindex
$option 0]
3165 set repo_config
(gui.
$name) $default_config(gui.
$name)
3169 foreach option
$font_descs {
3170 set name
[lindex
$option 0]
3171 set font
[lindex
$option 1]
3172 set global_config_new
(gui.
$font^^family
) \
3173 [font configure
$font -family]
3174 set global_config_new
(gui.
$font^^size
) \
3175 [font configure
$font -size]
3179 proc do_save_config
{w
} {
3180 if {[catch
{save_config
} err
]} {
3181 error_popup
"Failed to completely save options:\n\n$err"
3187 proc do_windows_shortcut
{} {
3191 set desktop
[exec cygpath \
3199 set fn
[tk_getSaveFile \
3201 -title "[appname] ([reponame]): Create Desktop Icon" \
3202 -initialdir $desktop \
3203 -initialfile "Git [reponame].bat"]
3207 set sh
[exec cygpath \
3211 set me
[exec cygpath \
3215 set gd
[exec cygpath \
3219 set gw
[exec cygpath \
3222 [file dirname [gitdir
]]]
3223 regsub
-all ' $me "'\\''" me
3224 regsub -all ' $gd "'\\''" gd
3225 puts $fd "@ECHO Entering $gw"
3226 puts $fd "@ECHO Starting git-gui... please wait..."
3227 puts -nonewline $fd "@\"$sh\" --login -c \""
3228 puts -nonewline $fd "GIT_DIR='$gd'"
3229 puts -nonewline $fd " '$me'"
3233 error_popup "Cannot write script:\n\n$err"
3238 proc do_macosx_app {} {
3241 set fn [tk_getSaveFile \
3243 -title "[appname] ([reponame]): Create Desktop Icon" \
3244 -initialdir [file join $env(HOME) Desktop] \
3245 -initialfile "Git [reponame].app"]
3248 set Contents [file join $fn Contents]
3249 set MacOS [file join $Contents MacOS]
3250 set exe [file join $MacOS git-gui]
3254 set fd [open [file join $Contents Info.plist] w]
3255 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3256 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3257 <plist version="1.0">
3259 <key>CFBundleDevelopmentRegion</key>
3260 <string>English</string>
3261 <key>CFBundleExecutable</key>
3262 <string>git-gui</string>
3263 <key>CFBundleIdentifier</key>
3264 <string>org.spearce.git-gui</string>
3265 <key>CFBundleInfoDictionaryVersion</key>
3266 <string>6.0</string>
3267 <key>CFBundlePackageType</key>
3268 <string>APPL</string>
3269 <key>CFBundleSignature</key>
3270 <string>????</string>
3271 <key>CFBundleVersion</key>
3272 <string>1.0</string>
3273 <key>NSPrincipalClass</key>
3274 <string>NSApplication</string>
3279 set fd [open $exe w]
3280 set gd [file normalize [gitdir]]
3281 set ep [file normalize [exec git --exec-path]]
3282 regsub -all ' $gd "'\\''" gd
3283 regsub
-all ' $ep "'\\''" ep
3284 puts $fd "#!/bin/sh"
3285 foreach name
[array names env
] {
3286 if {[string match GIT_
* $name]} {
3287 regsub
-all ' $env($name) "'\\''" v
3288 puts $fd "export $name='$v'"
3291 puts $fd "export PATH
='$ep':\
$PATH"
3292 puts $fd "export GIT_DIR
='$gd'"
3293 puts $fd "exec [file normalize
$argv0]"
3296 file attributes $exe -permissions u+x,g+x,o+x
3298 error_popup "Cannot
write icon
:\n\n$err"
3303 proc toggle_or_diff {w x y} {
3304 global file_states file_lists current_diff_path ui_index ui_workdir
3305 global last_clicked selected_paths
3307 set pos [split [$w index @$x,$y] .]
3308 set lno [lindex $pos 0]
3309 set col [lindex $pos 1]
3310 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3316 set last_clicked [list $w $lno]
3317 array unset selected_paths
3318 $ui_index tag remove in_sel 0.0 end
3319 $ui_workdir tag remove in_sel 0.0 end
3322 if {$current_diff_path eq $path} {
3323 set after {reshow_diff;}
3327 if {$w eq $ui_index} {
3329 "Unstaging
[short_path
$path] from commit
" \
3331 [concat $after {set ui_status_value {Ready.}}]
3332 } elseif {$w eq $ui_workdir} {
3334 "Adding
[short_path
$path]" \
3336 [concat $after {set ui_status_value {Ready.}}]
3339 show_diff $path $w $lno
3343 proc add_one_to_selection {w x y} {
3344 global file_lists last_clicked selected_paths
3346 set lno [lindex [split [$w index @$x,$y] .] 0]
3347 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3353 if {$last_clicked ne {}
3354 && [lindex $last_clicked 0] ne $w} {
3355 array unset selected_paths
3356 [lindex $last_clicked 0] tag remove in_sel 0.0 end
3359 set last_clicked [list $w $lno]
3360 if {[catch {set in_sel $selected_paths($path)}]} {
3364 unset selected_paths($path)
3365 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3367 set selected_paths($path) 1
3368 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3372 proc add_range_to_selection {w x y} {
3373 global file_lists last_clicked selected_paths
3375 if {[lindex $last_clicked 0] ne $w} {
3376 toggle_or_diff $w $x $y
3380 set lno [lindex [split [$w index @$x,$y] .] 0]
3381 set lc [lindex $last_clicked 1]
3390 foreach path [lrange $file_lists($w) \
3391 [expr {$begin - 1}] \
3392 [expr {$end - 1}]] {
3393 set selected_paths($path) 1
3395 $w tag add in_sel $begin.0 [expr {$end + 1}].0
3398 ######################################################################
3402 set cursor_ptr arrow
3403 font create font_diff -family Courier -size 10
3407 eval font configure font_ui [font actual [.dummy cget -font]]
3411 font create font_uibold
3412 font create font_diffbold
3417 } elseif {[is_MacOSX]} {
3425 proc apply_config {} {
3426 global repo_config font_descs
3428 foreach option $font_descs {
3429 set name [lindex $option 0]
3430 set font [lindex $option 1]
3432 foreach {cn cv} $repo_config(gui.$name) {
3433 font configure $font $cn $cv
3436 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
3438 foreach {cn cv} [font configure $font] {
3439 font configure ${font}bold $cn $cv
3441 font configure ${font}bold -weight bold
3445 set default_config(gui.trustmtime) false
3446 set default_config(gui.pullsummary) true
3447 set default_config(gui.diffcontext) 5
3448 set default_config(gui.newbranchtemplate) {}
3449 set default_config(gui.fontui) [font configure font_ui]
3450 set default_config(gui.fontdiff) [font configure font_diff]
3452 {fontui font_ui {Main Font}}
3453 {fontdiff font_diff {Diff/Console Font}}
3458 ######################################################################
3464 menu .mbar -tearoff 0
3465 .mbar add cascade -label Repository -menu .mbar.repository
3466 .mbar add cascade -label Edit -menu .mbar.edit
3467 if {!$single_commit} {
3468 .mbar add cascade -label Branch -menu .mbar.branch
3470 .mbar add cascade -label Commit -menu .mbar.commit
3471 if {!$single_commit} {
3472 .mbar add cascade -label Fetch -menu .mbar.fetch
3473 .mbar add cascade -label Pull -menu .mbar.pull
3474 .mbar add cascade -label Push -menu .mbar.push
3476 . configure -menu .mbar
3478 # -- Repository Menu
3480 menu .mbar.repository
3481 .mbar.repository add command \
3482 -label {Visualize Current Branch} \
3483 -command {do_gitk {}} \
3486 .mbar.repository add command \
3487 -label {Visualize All Branches} \
3488 -command {do_gitk {--all}} \
3491 .mbar.repository add separator
3493 if {!$single_commit} {
3494 .mbar.repository add command -label {Compress Database} \
3498 .mbar.repository add command -label {Verify Database} \
3499 -command do_fsck_objects \
3502 .mbar.repository add separator
3505 .mbar.repository add command \
3506 -label {Create Desktop Icon} \
3507 -command do_windows_shortcut \
3509 } elseif {[is_MacOSX]} {
3510 .mbar.repository add command \
3511 -label {Create Desktop Icon} \
3512 -command do_macosx_app \
3517 .mbar.repository add command -label Quit \
3519 -accelerator $M1T-Q \
3525 .mbar.edit add command -label Undo \
3526 -command {catch {[focus] edit undo}} \
3527 -accelerator $M1T-Z \
3529 .mbar.edit add command -label Redo \
3530 -command {catch {[focus] edit redo}} \
3531 -accelerator $M1T-Y \
3533 .mbar.edit add separator
3534 .mbar.edit add command -label Cut \
3535 -command {catch {tk_textCut [focus]}} \
3536 -accelerator $M1T-X \
3538 .mbar.edit add command -label Copy \
3539 -command {catch {tk_textCopy [focus]}} \
3540 -accelerator $M1T-C \
3542 .mbar.edit add command -label Paste \
3543 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3544 -accelerator $M1T-V \
3546 .mbar.edit add command -label Delete \
3547 -command {catch {[focus] delete sel.first sel.last}} \
3550 .mbar.edit add separator
3551 .mbar.edit add command -label {Select All} \
3552 -command {catch {[focus] tag add sel 0.0 end}} \
3553 -accelerator $M1T-A \
3558 if {!$single_commit} {
3561 .mbar.branch add command -label {Create...} \
3562 -command do_create_branch \
3563 -accelerator $M1T-N \
3565 lappend disable_on_lock [list .mbar.branch entryconf \
3566 [.mbar.branch index last] -state]
3568 .mbar.branch add command -label {Delete...} \
3569 -command do_delete_branch \
3571 lappend disable_on_lock [list .mbar.branch entryconf \
3572 [.mbar.branch index last] -state]
3579 .mbar.commit add radiobutton \
3580 -label {New Commit} \
3581 -command do_select_commit_type \
3582 -variable selected_commit_type \
3585 lappend disable_on_lock \
3586 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3588 .mbar.commit add radiobutton \
3589 -label {Amend Last Commit} \
3590 -command do_select_commit_type \
3591 -variable selected_commit_type \
3594 lappend disable_on_lock \
3595 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3597 .mbar.commit add separator
3599 .mbar.commit add command -label Rescan \
3600 -command do_rescan \
3603 lappend disable_on_lock \
3604 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3606 .mbar.commit add command -label {Add To Commit} \
3607 -command do_add_selection \
3609 lappend disable_on_lock \
3610 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3612 .mbar.commit add command -label {Add All To Commit} \
3613 -command do_add_all \
3614 -accelerator $M1T-I \
3616 lappend disable_on_lock \
3617 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3619 .mbar.commit add command -label {Unstage From Commit} \
3620 -command do_unstage_selection \
3622 lappend disable_on_lock \
3623 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3625 .mbar.commit add command -label {Revert Changes} \
3626 -command do_revert_selection \
3628 lappend disable_on_lock \
3629 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3631 .mbar.commit add separator
3633 .mbar.commit add command -label {Sign Off} \
3634 -command do_signoff \
3635 -accelerator $M1T-S \
3638 .mbar.commit add command -label Commit \
3639 -command do_commit \
3640 -accelerator $M1T-Return \
3642 lappend disable_on_lock \
3643 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3645 # -- Transport menus
3647 if {!$single_commit} {
3654 # -- Apple Menu (Mac OS X only)
3656 .mbar add cascade -label Apple -menu .mbar.apple
3659 .mbar.apple add command -label "About
[appname
]" \
3662 .mbar.apple add command -label "[appname
] Options...
" \
3663 -command do_options \
3668 .mbar.edit add separator
3669 .mbar.edit add command -label {Options...} \
3670 -command do_options \
3675 if {[file exists /usr/local/miga/lib/gui-miga]
3676 && [file exists .pvcsrc]} {
3678 global ui_status_value
3679 if {![lock_index update]} return
3680 set cmd [list sh --login -c "/usr
/local
/miga
/lib
/gui-miga
\"[pwd]\""]
3681 set miga_fd [open "|
$cmd" r]
3682 fconfigure $miga_fd -blocking 0
3683 fileevent $miga_fd readable [list miga_done $miga_fd]
3684 set ui_status_value {Running miga...}
3686 proc miga_done {fd} {
3691 rescan [list set ui_status_value {Ready.}]
3694 .mbar add cascade -label Tools -menu .mbar.tools
3696 .mbar.tools add command -label "Migrate
" \
3699 lappend disable_on_lock \
3700 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3705 .mbar add cascade -label Help -menu .mbar.help
3708 .mbar.help add command -label "About
[appname
]" \
3720 -text {Current Branch:} \
3725 -textvariable current_branch \
3729 pack .branch.l1 -side left
3730 pack .branch.cb -side left -fill x
3731 pack .branch -side top -fill x
3733 # -- Main Window Layout
3735 panedwindow .vpane -orient vertical
3736 panedwindow .vpane.files -orient horizontal
3737 .vpane add .vpane.files -sticky nsew -height 100 -width 200
3738 pack .vpane -anchor n -side top -fill both -expand 1
3740 # -- Index File List
3742 frame .vpane.files.index -height 100 -width 200
3743 label .vpane.files.index.title -text {Changes To Be Committed} \
3746 text $ui_index -background white -borderwidth 0 \
3747 -width 20 -height 10 \
3750 -cursor $cursor_ptr \
3751 -xscrollcommand {.vpane.files.index.sx set} \
3752 -yscrollcommand {.vpane.files.index.sy set} \
3754 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3755 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3756 pack .vpane.files.index.title -side top -fill x
3757 pack .vpane.files.index.sx -side bottom -fill x
3758 pack .vpane.files.index.sy -side right -fill y
3759 pack $ui_index -side left -fill both -expand 1
3760 .vpane.files add .vpane.files.index -sticky nsew
3762 # -- Working Directory File List
3764 frame .vpane.files.workdir -height 100 -width 200
3765 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3768 text $ui_workdir -background white -borderwidth 0 \
3769 -width 20 -height 10 \
3772 -cursor $cursor_ptr \
3773 -xscrollcommand {.vpane.files.workdir.sx set} \
3774 -yscrollcommand {.vpane.files.workdir.sy set} \
3776 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3777 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3778 pack .vpane.files.workdir.title -side top -fill x
3779 pack .vpane.files.workdir.sx -side bottom -fill x
3780 pack .vpane.files.workdir.sy -side right -fill y
3781 pack $ui_workdir -side left -fill both -expand 1
3782 .vpane.files add .vpane.files.workdir -sticky nsew
3784 foreach i [list $ui_index $ui_workdir] {
3785 $i tag conf in_diff -font font_uibold
3786 $i tag conf in_sel \
3787 -background [$i cget -foreground] \
3788 -foreground [$i cget -background]
3792 # -- Diff and Commit Area
3794 frame .vpane.lower -height 300 -width 400
3795 frame .vpane.lower.commarea
3796 frame .vpane.lower.diff -relief sunken -borderwidth 1
3797 pack .vpane.lower.commarea -side top -fill x
3798 pack .vpane.lower.diff -side bottom -fill both -expand 1
3799 .vpane add .vpane.lower -stick nsew
3801 # -- Commit Area Buttons
3803 frame .vpane.lower.commarea.buttons
3804 label .vpane.lower.commarea.buttons.l -text {} \
3808 pack .vpane.lower.commarea.buttons.l -side top -fill x
3809 pack .vpane.lower.commarea.buttons -side left -fill y
3811 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3812 -command do_rescan \
3814 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3815 lappend disable_on_lock \
3816 {.vpane.lower.commarea.buttons.rescan conf -state}
3818 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3819 -command do_add_all \
3821 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3822 lappend disable_on_lock \
3823 {.vpane.lower.commarea.buttons.incall conf -state}
3825 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3826 -command do_signoff \
3828 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3830 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3831 -command do_commit \
3833 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3834 lappend disable_on_lock \
3835 {.vpane.lower.commarea.buttons.commit conf -state}
3837 # -- Commit Message Buffer
3839 frame .vpane.lower.commarea.buffer
3840 frame .vpane.lower.commarea.buffer.header
3841 set ui_comm .vpane.lower.commarea.buffer.t
3842 set ui_coml .vpane.lower.commarea.buffer.header.l
3843 radiobutton .vpane.lower.commarea.buffer.header.new \
3844 -text {New Commit} \
3845 -command do_select_commit_type \
3846 -variable selected_commit_type \
3849 lappend disable_on_lock \
3850 [list .vpane.lower.commarea.buffer.header.new conf -state]
3851 radiobutton .vpane.lower.commarea.buffer.header.amend \
3852 -text {Amend Last Commit} \
3853 -command do_select_commit_type \
3854 -variable selected_commit_type \
3857 lappend disable_on_lock \
3858 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3863 proc trace_commit_type {varname args} {
3864 global ui_coml commit_type
3865 switch -glob -- $commit_type {
3866 initial {set txt {Initial Commit Message:}}
3867 amend {set txt {Amended Commit Message:}}
3868 amend-initial {set txt {Amended Initial Commit Message:}}
3869 amend-merge {set txt {Amended Merge Commit Message:}}
3870 merge {set txt {Merge Commit Message:}}
3871 * {set txt {Commit Message:}}
3873 $ui_coml conf -text $txt
3875 trace add variable commit_type write trace_commit_type
3876 pack $ui_coml -side left -fill x
3877 pack .vpane.lower.commarea.buffer.header.amend -side right
3878 pack .vpane.lower.commarea.buffer.header.new -side right
3880 text $ui_comm -background white -borderwidth 1 \
3883 -autoseparators true \
3885 -width 75 -height 9 -wrap none \
3887 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3888 scrollbar .vpane.lower.commarea.buffer.sby \
3889 -command [list $ui_comm yview]
3890 pack .vpane.lower.commarea.buffer.header -side top -fill x
3891 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3892 pack $ui_comm -side left -fill y
3893 pack .vpane.lower.commarea.buffer -side left -fill y
3895 # -- Commit Message Buffer Context Menu
3897 set ctxm .vpane.lower.commarea.buffer.ctxm
3898 menu $ctxm -tearoff 0
3902 -command {tk_textCut $ui_comm}
3906 -command {tk_textCopy $ui_comm}
3910 -command {tk_textPaste $ui_comm}
3914 -command {$ui_comm delete sel.first sel.last}
3917 -label {Select All} \
3919 -command {$ui_comm tag add sel 0.0 end}
3924 $ui_comm tag add sel 0.0 end
3925 tk_textCopy $ui_comm
3926 $ui_comm tag remove sel 0.0 end
3933 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
3937 set current_diff_path {}
3938 set diff_actions [list]
3939 proc trace_current_diff_path {varname args} {
3940 global current_diff_path diff_actions file_states
3941 if {$current_diff_path eq {}} {
3947 set p $current_diff_path
3948 set s [mapdesc [lindex $file_states($p) 0] $p]
3950 set p [escape_path $p]
3954 .vpane.lower.diff.header.status configure -text $s
3955 .vpane.lower.diff.header.file configure -text $f
3956 .vpane.lower.diff.header.path configure -text $p
3957 foreach w $diff_actions {
3961 trace add variable current_diff_path write trace_current_diff_path
3963 frame .vpane.lower.diff.header -background orange
3964 label .vpane.lower.diff.header.status \
3965 -background orange \
3966 -width $max_status_desc \
3970 label .vpane.lower.diff.header.file \
3971 -background orange \
3975 label .vpane.lower.diff.header.path \
3976 -background orange \
3980 pack .vpane.lower.diff.header.status -side left
3981 pack .vpane.lower.diff.header.file -side left
3982 pack .vpane.lower.diff.header.path -fill x
3983 set ctxm .vpane.lower.diff.header.ctxm
3984 menu $ctxm -tearoff 0
3993 -- $current_diff_path
3995 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3996 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
4000 frame .vpane.lower.diff.body
4001 set ui_diff .vpane.lower.diff.body.t
4002 text $ui_diff -background white -borderwidth 0 \
4003 -width 80 -height 15 -wrap none \
4005 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
4006 -yscrollcommand {.vpane.lower.diff.body.sby set} \
4008 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
4009 -command [list $ui_diff xview]
4010 scrollbar .vpane.lower.diff.body.sby -orient vertical \
4011 -command [list $ui_diff yview]
4012 pack .vpane.lower.diff.body.sbx -side bottom -fill x
4013 pack .vpane.lower.diff.body.sby -side right -fill y
4014 pack $ui_diff -side left -fill both -expand 1
4015 pack .vpane.lower.diff.header -side top -fill x
4016 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
4018 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
4019 $ui_diff tag conf d_+ -foreground {#00a000}
4020 $ui_diff tag conf d_- -foreground red
4022 $ui_diff tag conf d_++ -foreground {#00a000}
4023 $ui_diff tag conf d_-- -foreground red
4024 $ui_diff tag conf d_+s \
4025 -foreground {#00a000} \
4026 -background {#e2effa}
4027 $ui_diff tag conf d_-s \
4029 -background {#e2effa}
4030 $ui_diff tag conf d_s+ \
4031 -foreground {#00a000} \
4033 $ui_diff tag conf d_s- \
4037 $ui_diff tag conf d<<<<<<< \
4038 -foreground orange \
4040 $ui_diff tag conf d======= \
4041 -foreground orange \
4043 $ui_diff tag conf d>>>>>>> \
4044 -foreground orange \
4047 $ui_diff tag raise sel
4049 # -- Diff Body Context Menu
4051 set ctxm .vpane.lower.diff.body.ctxm
4052 menu $ctxm -tearoff 0
4056 -command reshow_diff
4060 -command {tk_textCopy $ui_diff}
4061 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4063 -label {Select All} \
4065 -command {$ui_diff tag add sel 0.0 end}
4066 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4071 $ui_diff tag add sel 0.0 end
4072 tk_textCopy $ui_diff
4073 $ui_diff tag remove sel 0.0 end
4075 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4078 -label {Decrease Font Size} \
4080 -command {incr_font_size font_diff -1}
4081 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4083 -label {Increase Font Size} \
4085 -command {incr_font_size font_diff 1}
4086 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4089 -label {Show Less Context} \
4091 -command {if {$repo_config(gui.diffcontext) >= 2} {
4092 incr repo_config(gui.diffcontext) -1
4095 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4097 -label {Show More Context} \
4100 incr repo_config(gui.diffcontext)
4103 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4105 $ctxm add command -label {Options...} \
4108 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
4112 set ui_status_value {Initializing...}
4113 label .status -textvariable ui_status_value \
4119 pack .status -anchor w -side bottom -fill x
4124 set gm $repo_config(gui.geometry)
4125 wm geometry . [lindex $gm 0]
4126 .vpane sash place 0 \
4127 [lindex [.vpane sash coord 0] 0] \
4129 .vpane.files sash place 0 \
4131 [lindex [.vpane.files sash coord 0] 1]
4137 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
4138 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
4139 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
4140 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
4141 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
4142 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
4143 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
4144 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
4145 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
4146 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4147 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4149 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
4150 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
4151 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
4152 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
4153 bind $ui_diff <$M1B-Key-v> {break}
4154 bind $ui_diff <$M1B-Key-V> {break}
4155 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4156 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4157 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
4158 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
4159 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
4160 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
4162 if {!$single_commit} {
4163 bind . <$M1B-Key-n> do_create_branch
4164 bind . <$M1B-Key-N> do_create_branch
4167 bind . <Destroy> do_quit
4168 bind all <Key-F5> do_rescan
4169 bind all <$M1B-Key-r> do_rescan
4170 bind all <$M1B-Key-R> do_rescan
4171 bind . <$M1B-Key-s> do_signoff
4172 bind . <$M1B-Key-S> do_signoff
4173 bind . <$M1B-Key-i> do_add_all
4174 bind . <$M1B-Key-I> do_add_all
4175 bind . <$M1B-Key-Return> do_commit
4176 bind all <$M1B-Key-q> do_quit
4177 bind all <$M1B-Key-Q> do_quit
4178 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
4179 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
4180 foreach i [list $ui_index $ui_workdir] {
4181 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
4182 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
4183 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
4187 set file_lists($ui_index) [list]
4188 set file_lists($ui_workdir) [list]
4192 set MERGE_HEAD [list]
4195 set current_branch {}
4196 set current_diff_path {}
4197 set selected_commit_type new
4199 wm title . "[appname
] ([file normalize
[file dirname [gitdir
]]])"
4200 focus -force $ui_comm
4202 # -- Warn the user about environmental problems. Cygwin's Tcl
4203 # does *not* pass its env array onto any processes it spawns.
4204 # This means that git processes get none of our environment.
4209 set msg "Possible environment issues exist.
4211 The following environment variables are probably
4212 going to be ignored by any Git subprocess run
4216 foreach name [array names env] {
4217 switch -regexp -- $name {
4218 {^GIT_INDEX_FILE$} -
4219 {^GIT_OBJECT_DIRECTORY$} -
4220 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4222 {^GIT_EXTERNAL_DIFF$} -
4226 {^GIT_CONFIG_LOCAL$} -
4227 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4228 append msg " - $name\n"
4231 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4232 append msg " - $name\n"
4234 set suggest_user $name
4238 if {$ignored_env > 0} {
4240 This is due to a known issue with the
4241 Tcl binary distributed by Cygwin.
"
4243 if {$suggest_user ne {}} {
4246 A good replacement
for $suggest_user
4247 is placing values
for the user.name and
4248 user.email settings into your personal
4254 unset ignored_env msg suggest_user name
4257 # -- Only initialize complex UI if we are going to stay running.
4259 if {!$single_commit} {
4263 populate_branch_menu
4264 populate_fetch_menu .mbar.fetch
4265 populate_pull_menu .mbar.pull
4266 populate_push_menu .mbar.push
4269 # -- Only suggest a gc run if we are going to stay running.
4271 if {!$single_commit} {
4272 set object_limit 2000
4273 if {[is_Windows]} {set object_limit 200}
4274 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4275 if {$objects_current >= $object_limit} {
4277 "This repository currently has
$objects_current loose objects.
4279 To maintain optimal performance it is strongly
4280 recommended that you
compress the database
4281 when
more than
$object_limit loose objects exist.
4283 Compress the database now?
"] eq yes} {
4287 unset object_limit _junk objects_current
4290 lock_index begin-read