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
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 # -- Cleanup after ourselves.
1054 catch
{file delete
[gitdir MERGE_HEAD
]}
1055 catch
{file delete
[gitdir MERGE_MSG
]}
1056 catch
{file delete
[gitdir SQUASH_MSG
]}
1057 catch
{file delete
[gitdir GITGUI_MSG
]}
1059 # -- Let rerere do its thing.
1061 if {[file isdirectory
[gitdir rr-cache
]]} {
1062 catch
{exec git rerere
}
1065 # -- Run the post-commit hook.
1067 set pchook
[gitdir hooks post-commit
]
1068 if {[is_Windows
] && [file isfile
$pchook]} {
1069 set pchook
[list sh
-c [concat \
1070 "if test -x \"$pchook\";" \
1071 "then exec \"$pchook\";" \
1073 } elseif
{![file executable
$pchook]} {
1076 if {$pchook ne
{}} {
1077 catch
{exec $pchook &}
1080 $ui_comm delete
0.0 end
1082 $ui_comm edit modified false
1084 if {$single_commit} do_quit
1086 # -- Update in memory status
1088 set selected_commit_type new
1089 set commit_type normal
1092 set MERGE_HEAD
[list
]
1094 foreach path
[array names file_states
] {
1095 set s
$file_states($path)
1097 switch
-glob -- $m {
1105 unset file_states
($path)
1106 catch
{unset selected_paths
($path)}
1109 set file_states
($path) [list _O
[lindex
$s 1] {} {}]
1115 set file_states
($path) [list \
1116 _
[string index
$m 1] \
1127 set ui_status_value \
1128 "Changes committed as [string range $cmt_id 0 7]."
1131 ######################################################################
1135 proc fetch_from
{remote
} {
1136 set w
[new_console
"fetch $remote" \
1137 "Fetching new changes from $remote"]
1138 set cmd
[list git fetch
]
1140 console_exec
$w $cmd
1143 proc pull_remote
{remote branch
} {
1144 global HEAD commit_type file_states repo_config
1146 if {![lock_index update
]} return
1148 # -- Our in memory state should match the repository.
1150 repository_state curType curHEAD curMERGE_HEAD
1151 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1152 info_popup
{Last scanned state does not match repository state.
1154 Another Git program has modified this repository
1155 since the last scan. A rescan must be performed
1156 before a pull operation can be started.
1158 The rescan will be automatically started now.
1161 rescan
{set ui_status_value
{Ready.
}}
1165 # -- No differences should exist before a pull.
1167 if {[array size file_states
] != 0} {
1168 error_popup
{Uncommitted but modified files are present.
1170 You should not perform a pull with unmodified
1171 files
in your working directory as Git will be
1172 unable to recover from an incorrect merge.
1174 You should commit or revert all changes before
1175 starting a pull operation.
1181 set w
[new_console
"pull $remote $branch" \
1182 "Pulling new changes from branch $branch in $remote"]
1183 set cmd
[list git pull
]
1184 if {$repo_config(gui.pullsummary
) eq
{false
}} {
1185 lappend cmd
--no-summary
1189 console_exec
$w $cmd [list post_pull_remote
$remote $branch]
1192 proc post_pull_remote
{remote branch success
} {
1193 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1194 global ui_status_value
1198 repository_state commit_type HEAD MERGE_HEAD
1200 set selected_commit_type new
1201 set ui_status_value
"Pulling $branch from $remote complete."
1203 rescan
[list
set ui_status_value \
1204 "Conflicts detected while pulling $branch from $remote."]
1208 proc push_to
{remote
} {
1209 set w
[new_console
"push $remote" \
1210 "Pushing changes to $remote"]
1211 set cmd
[list git push
]
1213 console_exec
$w $cmd
1216 ######################################################################
1220 proc mapicon
{w state path
} {
1223 if {[catch
{set r
$all_icons($state$w)}]} {
1224 puts
"error: no icon for $w state={$state} $path"
1230 proc mapdesc
{state path
} {
1233 if {[catch
{set r
$all_descs($state)}]} {
1234 puts
"error: no desc for state={$state} $path"
1240 proc escape_path
{path
} {
1241 regsub
-all "\n" $path "\\n" path
1245 proc short_path
{path
} {
1246 return [escape_path
[lindex
[file split $path] end
]]
1250 set null_sha1
[string repeat
0 40]
1252 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1253 global file_states next_icon_id null_sha1
1255 set s0
[string index
$new_state 0]
1256 set s1
[string index
$new_state 1]
1258 if {[catch
{set info
$file_states($path)}]} {
1260 set icon n
[incr next_icon_id
]
1262 set state
[lindex
$info 0]
1263 set icon
[lindex
$info 1]
1264 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1265 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1268 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1269 elseif
{$s0 eq
{_
}} {set s0 _
}
1271 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1272 elseif
{$s1 eq
{_
}} {set s1 _
}
1274 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1275 set head_info
[list
0 $null_sha1]
1276 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1277 && $head_info eq
{}} {
1278 set head_info
$index_info
1281 set file_states
($path) [list
$s0$s1 $icon \
1282 $head_info $index_info \
1287 proc display_file_helper
{w path icon_name old_m new_m
} {
1290 if {$new_m eq
{_
}} {
1291 set lno
[lsearch
-sorted $file_lists($w) $path]
1293 set file_lists
($w) [lreplace
$file_lists($w) $lno $lno]
1295 $w conf
-state normal
1296 $w delete
$lno.0 [expr {$lno + 1}].0
1297 $w conf
-state disabled
1299 } elseif
{$old_m eq
{_
} && $new_m ne
{_
}} {
1300 lappend file_lists
($w) $path
1301 set file_lists
($w) [lsort
-unique $file_lists($w)]
1302 set lno
[lsearch
-sorted $file_lists($w) $path]
1304 $w conf
-state normal
1305 $w image create
$lno.0 \
1306 -align center
-padx 5 -pady 1 \
1308 -image [mapicon
$w $new_m $path]
1309 $w insert
$lno.1 "[escape_path $path]\n"
1310 $w conf
-state disabled
1311 } elseif
{$old_m ne
$new_m} {
1312 $w conf
-state normal
1313 $w image conf
$icon_name -image [mapicon
$w $new_m $path]
1314 $w conf
-state disabled
1318 proc display_file
{path state
} {
1319 global file_states selected_paths
1320 global ui_index ui_workdir
1322 set old_m
[merge_state
$path $state]
1323 set s
$file_states($path)
1324 set new_m
[lindex
$s 0]
1325 set icon_name
[lindex
$s 1]
1327 set o
[string index
$old_m 0]
1328 set n
[string index
$new_m 0]
1335 display_file_helper
$ui_index $path $icon_name $o $n
1337 if {[string index
$old_m 0] eq
{U
}} {
1340 set o
[string index
$old_m 1]
1342 if {[string index
$new_m 0] eq
{U
}} {
1345 set n
[string index
$new_m 1]
1347 display_file_helper
$ui_workdir $path $icon_name $o $n
1349 if {$new_m eq
{__
}} {
1350 unset file_states
($path)
1351 catch
{unset selected_paths
($path)}
1355 proc display_all_files_helper
{w path icon_name m
} {
1358 lappend file_lists
($w) $path
1359 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1360 $w image create end \
1361 -align center
-padx 5 -pady 1 \
1363 -image [mapicon
$w $m $path]
1364 $w insert end
"[escape_path $path]\n"
1367 proc display_all_files
{} {
1368 global ui_index ui_workdir
1369 global file_states file_lists
1372 $ui_index conf
-state normal
1373 $ui_workdir conf
-state normal
1375 $ui_index delete
0.0 end
1376 $ui_workdir delete
0.0 end
1379 set file_lists
($ui_index) [list
]
1380 set file_lists
($ui_workdir) [list
]
1382 foreach path
[lsort
[array names file_states
]] {
1383 set s
$file_states($path)
1385 set icon_name
[lindex
$s 1]
1387 set s
[string index
$m 0]
1388 if {$s ne
{U
} && $s ne
{_
}} {
1389 display_all_files_helper
$ui_index $path \
1393 if {[string index
$m 0] eq
{U
}} {
1396 set s
[string index
$m 1]
1399 display_all_files_helper
$ui_workdir $path \
1404 $ui_index conf
-state disabled
1405 $ui_workdir conf
-state disabled
1408 proc update_indexinfo
{msg pathList after
} {
1409 global update_index_cp ui_status_value
1411 if {![lock_index update
]} return
1413 set update_index_cp
0
1414 set pathList
[lsort
$pathList]
1415 set totalCnt
[llength
$pathList]
1416 set batch [expr {int
($totalCnt * .01) + 1}]
1417 if {$batch > 25} {set batch 25}
1419 set ui_status_value
[format \
1420 "$msg... %i/%i files (%.2f%%)" \
1424 set fd
[open
"| git update-index -z --index-info" w
]
1430 fileevent
$fd writable
[list \
1431 write_update_indexinfo \
1441 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1442 global update_index_cp ui_status_value
1443 global file_states current_diff_path
1445 if {$update_index_cp >= $totalCnt} {
1452 for {set i
$batch} \
1453 {$update_index_cp < $totalCnt && $i > 0} \
1455 set path
[lindex
$pathList $update_index_cp]
1456 incr update_index_cp
1458 set s
$file_states($path)
1459 switch
-glob -- [lindex
$s 0] {
1466 set info
[lindex
$s 2]
1467 if {$info eq
{}} continue
1469 puts
-nonewline $fd "$info\t$path\0"
1470 display_file
$path $new
1473 set ui_status_value
[format \
1474 "$msg... %i/%i files (%.2f%%)" \
1477 [expr {100.0 * $update_index_cp / $totalCnt}]]
1480 proc update_index
{msg pathList after
} {
1481 global update_index_cp ui_status_value
1483 if {![lock_index update
]} return
1485 set update_index_cp
0
1486 set pathList
[lsort
$pathList]
1487 set totalCnt
[llength
$pathList]
1488 set batch [expr {int
($totalCnt * .01) + 1}]
1489 if {$batch > 25} {set batch 25}
1491 set ui_status_value
[format \
1492 "$msg... %i/%i files (%.2f%%)" \
1496 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1502 fileevent
$fd writable
[list \
1503 write_update_index \
1513 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1514 global update_index_cp ui_status_value
1515 global file_states current_diff_path
1517 if {$update_index_cp >= $totalCnt} {
1524 for {set i
$batch} \
1525 {$update_index_cp < $totalCnt && $i > 0} \
1527 set path
[lindex
$pathList $update_index_cp]
1528 incr update_index_cp
1530 switch
-glob -- [lindex
$file_states($path) 0] {
1536 if {[file exists
$path]} {
1545 puts
-nonewline $fd "$path\0"
1546 display_file
$path $new
1549 set ui_status_value
[format \
1550 "$msg... %i/%i files (%.2f%%)" \
1553 [expr {100.0 * $update_index_cp / $totalCnt}]]
1556 proc checkout_index
{msg pathList after
} {
1557 global update_index_cp ui_status_value
1559 if {![lock_index update
]} return
1561 set update_index_cp
0
1562 set pathList
[lsort
$pathList]
1563 set totalCnt
[llength
$pathList]
1564 set batch [expr {int
($totalCnt * .01) + 1}]
1565 if {$batch > 25} {set batch 25}
1567 set ui_status_value
[format \
1568 "$msg... %i/%i files (%.2f%%)" \
1572 set cmd
[list git checkout-index
]
1578 set fd
[open
"| $cmd " w
]
1584 fileevent
$fd writable
[list \
1585 write_checkout_index \
1595 proc write_checkout_index
{fd pathList totalCnt
batch msg after
} {
1596 global update_index_cp ui_status_value
1597 global file_states current_diff_path
1599 if {$update_index_cp >= $totalCnt} {
1606 for {set i
$batch} \
1607 {$update_index_cp < $totalCnt && $i > 0} \
1609 set path
[lindex
$pathList $update_index_cp]
1610 incr update_index_cp
1611 switch
-glob -- [lindex
$file_states($path) 0] {
1615 puts
-nonewline $fd "$path\0"
1616 display_file
$path ?_
1621 set ui_status_value
[format \
1622 "$msg... %i/%i files (%.2f%%)" \
1625 [expr {100.0 * $update_index_cp / $totalCnt}]]
1628 ######################################################################
1630 ## branch management
1632 proc load_all_heads
{} {
1633 global all_heads tracking_branches
1635 set all_heads
[list
]
1636 set cmd
[list git for-each-ref
]
1637 lappend cmd
--format=%(refname
)
1638 lappend cmd refs
/heads
1639 set fd
[open
"| $cmd" r
]
1640 while {[gets
$fd line
] > 0} {
1641 if {![catch
{set info
$tracking_branches($line)}]} continue
1642 if {![regsub ^refs
/heads
/ $line {} name
]} continue
1643 lappend all_heads
$name
1647 set all_heads
[lsort
$all_heads]
1650 proc populate_branch_menu
{} {
1651 global all_heads disable_on_lock
1654 set last
[$m index last
]
1655 for {set i
0} {$i <= $last} {incr i
} {
1656 if {[$m type $i] eq
{separator
}} {
1659 foreach a
$disable_on_lock {
1660 if {[lindex
$a 0] ne
$m ||
[lindex
$a 2] < $i} {
1664 set disable_on_lock
$new_dol
1670 foreach b
$all_heads {
1671 $m add radiobutton \
1673 -command [list switch_branch
$b] \
1674 -variable current_branch \
1677 lappend disable_on_lock \
1678 [list
$m entryconf
[$m index last
] -state]
1682 proc all_tracking_branches
{} {
1683 global tracking_branches
1685 set all_trackings
[list
]
1686 foreach b
[array names tracking_branches
] {
1687 regsub ^refs
/(heads|remotes
)/ $b {} b
1688 lappend all_trackings
$b
1690 return [lsort
-unique $all_trackings]
1693 proc do_create_branch_action
{w
} {
1694 global all_heads null_sha1 repo_config
1695 global create_branch_checkout create_branch_revtype
1696 global create_branch_head create_branch_trackinghead
1698 set newbranch
[string trim
[$w.desc.name_t get
0.0 end
]]
1699 if {$newbranch eq
{}
1700 ||
$newbranch eq
$repo_config(gui.newbranchtemplate
)} {
1704 -title [wm title
$w] \
1706 -message "Please supply a branch name."
1707 focus
$w.desc.name_t
1710 if {![catch
{exec git show-ref
--verify -- "refs/heads/$newbranch"}]} {
1714 -title [wm title
$w] \
1716 -message "Branch '$newbranch' already exists."
1717 focus
$w.desc.name_t
1720 if {[catch
{exec git check-ref-format
"heads/$newbranch"}]} {
1724 -title [wm title
$w] \
1726 -message "We do not like '$newbranch' as a branch name."
1727 focus
$w.desc.name_t
1732 switch
-- $create_branch_revtype {
1733 head {set rev $create_branch_head}
1734 tracking
{set rev $create_branch_trackinghead}
1735 expression
{set rev [string trim
[$w.from.exp_t get
0.0 end
]]}
1737 if {[catch
{set cmt
[exec git rev-parse
--verify "${rev}^0"]}]} {
1741 -title [wm title
$w] \
1743 -message "Invalid starting revision: $rev"
1746 set cmd
[list git update-ref
]
1748 lappend cmd
"branch: Created from $rev"
1749 lappend cmd
"refs/heads/$newbranch"
1751 lappend cmd
$null_sha1
1752 if {[catch
{eval exec $cmd} err
]} {
1756 -title [wm title
$w] \
1758 -message "Failed to create '$newbranch'.\n\n$err"
1762 lappend all_heads
$newbranch
1763 set all_heads
[lsort
$all_heads]
1764 populate_branch_menu
1766 if {$create_branch_checkout} {
1767 switch_branch
$newbranch
1771 proc do_create_branch
{} {
1772 global all_heads current_branch repo_config
1773 global create_branch_checkout create_branch_revtype
1774 global create_branch_head create_branch_trackinghead
1776 set create_branch_checkout
1
1777 set create_branch_revtype
head
1778 set create_branch_head
$current_branch
1779 set create_branch_trackinghead
{}
1781 set w .branch_editor
1783 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
1785 label
$w.header
-text {Create New Branch
} \
1787 pack
$w.header
-side top
-fill x
1790 button
$w.buttons.create
-text Create \
1793 -command [list do_create_branch_action
$w]
1794 pack
$w.buttons.create
-side right
1795 button
$w.buttons.cancel
-text {Cancel
} \
1797 -command [list destroy
$w]
1798 pack
$w.buttons.cancel
-side right
-padx 5
1799 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
1801 labelframe
$w.desc \
1802 -text {Branch Description
} \
1804 label
$w.desc.name_l
-text {Name
:} -font font_ui
1805 text
$w.desc.name_t \
1811 $w.desc.name_t insert
0.0 $repo_config(gui.newbranchtemplate
)
1812 grid
$w.desc.name_l
$w.desc.name_t
-stick we
-padx {0 5}
1813 bind $w.desc.name_t
<Shift-Key-Tab
> {focus
[tk_focusPrev
%W
];break}
1814 bind $w.desc.name_t
<Key-Tab
> {focus
[tk_focusNext
%W
];break}
1815 bind $w.desc.name_t
<Key-Return
> "do_create_branch_action $w;break"
1816 bind $w.desc.name_t
<Key
> {
1817 if {{%K
} ne
{BackSpace
}
1820 && {%K
} ne
{Return
}} {
1822 if {[string first
%A
{~^
:?
*[}] >= 0} break
1825 grid columnconfigure
$w.desc
1 -weight 1
1826 pack
$w.desc
-anchor nw
-fill x
-pady 5 -padx 5
1828 labelframe
$w.from \
1829 -text {Starting Revision
} \
1831 radiobutton
$w.from.head_r \
1832 -text {Local Branch
:} \
1834 -variable create_branch_revtype \
1836 eval tk_optionMenu
$w.from.head_m create_branch_head
$all_heads
1837 grid
$w.from.head_r
$w.from.head_m
-sticky w
1838 set all_trackings
[all_tracking_branches
]
1839 if {$all_trackings ne
{}} {
1840 set create_branch_trackinghead
[lindex
$all_trackings 0]
1841 radiobutton
$w.from.tracking_r \
1842 -text {Tracking Branch
:} \
1844 -variable create_branch_revtype \
1846 eval tk_optionMenu
$w.from.tracking_m \
1847 create_branch_trackinghead \
1849 grid
$w.from.tracking_r
$w.from.tracking_m
-sticky w
1851 radiobutton
$w.from.exp_r \
1852 -text {Revision Expression
:} \
1854 -variable create_branch_revtype \
1856 text
$w.from.exp_t \
1862 grid
$w.from.exp_r
$w.from.exp_t
-stick we
-padx {0 5}
1863 bind $w.from.exp_t
<Shift-Key-Tab
> {focus
[tk_focusPrev
%W
];break}
1864 bind $w.from.exp_t
<Key-Tab
> {focus
[tk_focusNext
%W
];break}
1865 bind $w.from.exp_t
<Key-Return
> "do_create_branch_action $w;break"
1866 grid columnconfigure
$w.from
1 -weight 1
1867 pack
$w.from
-anchor nw
-fill x
-pady 5 -padx 5
1869 labelframe
$w.postActions \
1870 -text {Post Creation Actions
} \
1872 checkbutton
$w.postActions.checkout \
1873 -text {Checkout after creation
} \
1874 -variable create_branch_checkout \
1876 pack
$w.postActions.checkout
-anchor nw
1877 pack
$w.postActions
-anchor nw
-fill x
-pady 5 -padx 5
1879 bind $w <Visibility
> "grab $w; focus $w.desc.name_t"
1880 bind $w <Key-Escape
> "destroy $w"
1881 bind $w <Key-Return
> "do_create_branch_action $w;break"
1882 wm title
$w "[appname] ([reponame]): Create Branch"
1886 proc do_delete_branch_action
{w
} {
1888 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
1891 switch
-- $delete_branch_checktype {
1892 head {set check_rev
$delete_branch_head}
1893 tracking
{set check_rev
$delete_branch_trackinghead}
1894 always
{set check_rev
{:none
}}
1896 if {$check_rev eq
{:none
}} {
1898 } elseif
{[catch
{set check_cmt
[exec git rev-parse
--verify "${check_rev}^0"]}]} {
1902 -title [wm title
$w] \
1904 -message "Invalid check revision: $check_rev"
1908 set to_delete
[list
]
1909 set not_merged
[list
]
1910 foreach i
[$w.list.l curselection
] {
1911 set b
[$w.list.l get
$i]
1912 if {[catch
{set o
[exec git rev-parse
--verify $b]}]} continue
1913 if {$check_cmt ne
{}} {
1914 if {$b eq
$check_rev} continue
1915 if {[catch
{set m
[exec git merge-base
$o $check_cmt]}]} continue
1917 lappend not_merged
$b
1921 lappend to_delete
[list
$b $o]
1923 if {$not_merged ne
{}} {
1924 set msg
"The following branches are not completely merged into $check_rev:
1926 - [join $not_merged "\n - "]"
1930 -title [wm title
$w] \
1934 if {$to_delete eq
{}} return
1935 if {$delete_branch_checktype eq
{always
}} {
1936 set msg
{Recovering deleted branches is difficult.
1938 Delete the selected branches?
}
1939 if {[tk_messageBox \
1942 -title [wm title
$w] \
1944 -message $msg] ne
yes} {
1950 foreach i
$to_delete {
1953 if {[catch
{exec git update-ref
-d "refs/heads/$b" $o} err
]} {
1954 append failed
" - $b: $err\n"
1956 set x
[lsearch
-sorted $all_heads $b]
1958 set all_heads
[lreplace
$all_heads $x $x]
1963 if {$failed ne
{}} {
1967 -title [wm title
$w] \
1969 -message "Failed to delete branches:\n$failed"
1972 set all_heads
[lsort
$all_heads]
1973 populate_branch_menu
1977 proc do_delete_branch
{} {
1978 global all_heads tracking_branches current_branch
1979 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
1981 set delete_branch_checktype
head
1982 set delete_branch_head
$current_branch
1983 set delete_branch_trackinghead
{}
1985 set w .branch_editor
1987 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
1989 label
$w.header
-text {Delete Local Branch
} \
1991 pack
$w.header
-side top
-fill x
1994 button
$w.buttons.create
-text Delete \
1996 -command [list do_delete_branch_action
$w]
1997 pack
$w.buttons.create
-side right
1998 button
$w.buttons.cancel
-text {Cancel
} \
2000 -command [list destroy
$w]
2001 pack
$w.buttons.cancel
-side right
-padx 5
2002 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2004 labelframe
$w.list \
2005 -text {Local Branches
} \
2010 -selectmode extended \
2012 foreach h
$all_heads {
2013 if {$h ne
$current_branch} {
2014 $w.list.l insert end
$h
2017 pack
$w.list.l
-fill both
-pady 5 -padx 5
2018 pack
$w.list
-fill both
-pady 5 -padx 5
2020 labelframe
$w.validate \
2021 -text {Delete Only If
} \
2023 radiobutton
$w.validate.head_r \
2024 -text {Merged Into Local Branch
:} \
2026 -variable delete_branch_checktype \
2028 eval tk_optionMenu
$w.validate.head_m delete_branch_head
$all_heads
2029 grid
$w.validate.head_r
$w.validate.head_m
-sticky w
2030 set all_trackings
[all_tracking_branches
]
2031 if {$all_trackings ne
{}} {
2032 set delete_branch_trackinghead
[lindex
$all_trackings 0]
2033 radiobutton
$w.validate.tracking_r \
2034 -text {Merged Into Tracking Branch
:} \
2036 -variable delete_branch_checktype \
2038 eval tk_optionMenu
$w.validate.tracking_m \
2039 delete_branch_trackinghead \
2041 grid
$w.validate.tracking_r
$w.validate.tracking_m
-sticky w
2043 radiobutton
$w.validate.always_r \
2044 -text {Always
(Do not perform merge checks
)} \
2046 -variable delete_branch_checktype \
2048 grid
$w.validate.always_r
-columnspan 2 -sticky w
2049 grid columnconfigure
$w.validate
1 -weight 1
2050 pack
$w.validate
-anchor nw
-fill x
-pady 5 -padx 5
2052 bind $w <Visibility
> "grab $w; focus $w"
2053 bind $w <Key-Escape
> "destroy $w"
2054 wm title
$w "[appname] ([reponame]): Delete Branch"
2058 proc switch_branch
{b
} {
2059 global HEAD commit_type file_states current_branch
2060 global selected_commit_type ui_comm
2062 if {![lock_index switch
]} return
2064 # -- Backup the selected branch (repository_state resets it)
2066 set new_branch
$current_branch
2068 # -- Our in memory state should match the repository.
2070 repository_state curType curHEAD curMERGE_HEAD
2071 if {[string match amend
* $commit_type]
2072 && $curType eq
{normal
}
2073 && $curHEAD eq
$HEAD} {
2074 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
2075 info_popup
{Last scanned state does not match repository state.
2077 Another Git program has modified this repository
2078 since the last scan. A rescan must be performed
2079 before the current branch can be changed.
2081 The rescan will be automatically started now.
2084 rescan
{set ui_status_value
{Ready.
}}
2088 # -- Toss the message buffer if we are in amend mode.
2090 if {[string match amend
* $curType]} {
2091 $ui_comm delete
0.0 end
2093 $ui_comm edit modified false
2096 set selected_commit_type new
2097 set current_branch
$new_branch
2100 error
"NOT FINISHED"
2103 ######################################################################
2105 ## remote management
2107 proc load_all_remotes
{} {
2109 global all_remotes tracking_branches
2111 set all_remotes
[list
]
2112 array
unset tracking_branches
2114 set rm_dir
[gitdir remotes
]
2115 if {[file isdirectory
$rm_dir]} {
2116 set all_remotes
[glob \
2120 -directory $rm_dir *]
2122 foreach name
$all_remotes {
2124 set fd
[open
[file join $rm_dir $name] r
]
2125 while {[gets
$fd line
] >= 0} {
2126 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
2127 $line line src dst
]} continue
2128 if {![regexp ^refs
/ $dst]} {
2129 set dst
"refs/heads/$dst"
2131 set tracking_branches
($dst) [list
$name $src]
2138 foreach line
[array names repo_config remote.
*.url
] {
2139 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
2140 lappend all_remotes
$name
2142 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
2146 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
2147 if {![regexp ^refs
/ $dst]} {
2148 set dst
"refs/heads/$dst"
2150 set tracking_branches
($dst) [list
$name $src]
2154 set all_remotes
[lsort
-unique $all_remotes]
2157 proc populate_fetch_menu
{m
} {
2158 global all_remotes repo_config
2160 foreach r
$all_remotes {
2162 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2163 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
2168 set fd
[open
[gitdir remotes
$r] r
]
2169 while {[gets
$fd n
] >= 0} {
2170 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
2181 -label "Fetch from $r..." \
2182 -command [list fetch_from
$r] \
2188 proc populate_push_menu
{m
} {
2189 global all_remotes repo_config
2191 foreach r
$all_remotes {
2193 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2194 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
2199 set fd
[open
[gitdir remotes
$r] r
]
2200 while {[gets
$fd n
] >= 0} {
2201 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
2212 -label "Push to $r..." \
2213 -command [list push_to
$r] \
2219 proc populate_pull_menu
{m
} {
2220 global repo_config all_remotes disable_on_lock
2222 foreach remote
$all_remotes {
2224 if {[array get repo_config remote.
$remote.url
] ne
{}} {
2225 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
2226 foreach line
$repo_config(remote.
$remote.fetch
) {
2227 if {[regexp
{^
([^
:]+):} $line line rb
]} {
2234 set fd
[open
[gitdir remotes
$remote] r
]
2235 while {[gets
$fd line
] >= 0} {
2236 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
2244 foreach rb
$rb_list {
2245 regsub ^refs
/heads
/ $rb {} rb_short
2247 -label "Branch $rb_short from $remote..." \
2248 -command [list pull_remote
$remote $rb] \
2250 lappend disable_on_lock \
2251 [list
$m entryconf
[$m index last
] -state]
2256 ######################################################################
2261 #define mask_width 14
2262 #define mask_height 15
2263 static unsigned char mask_bits
[] = {
2264 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2265 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2266 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2269 image create bitmap file_plain
-background white
-foreground black
-data {
2270 #define plain_width 14
2271 #define plain_height 15
2272 static unsigned char plain_bits
[] = {
2273 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2274 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2275 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2276 } -maskdata $filemask
2278 image create bitmap file_mod
-background white
-foreground blue
-data {
2279 #define mod_width 14
2280 #define mod_height 15
2281 static unsigned char mod_bits
[] = {
2282 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2283 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2284 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2285 } -maskdata $filemask
2287 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
2288 #define file_fulltick_width 14
2289 #define file_fulltick_height 15
2290 static unsigned char file_fulltick_bits
[] = {
2291 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2292 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2293 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2294 } -maskdata $filemask
2296 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
2297 #define parttick_width 14
2298 #define parttick_height 15
2299 static unsigned char parttick_bits
[] = {
2300 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2301 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2302 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2303 } -maskdata $filemask
2305 image create bitmap file_question
-background white
-foreground black
-data {
2306 #define file_question_width 14
2307 #define file_question_height 15
2308 static unsigned char file_question_bits
[] = {
2309 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2310 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2311 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2312 } -maskdata $filemask
2314 image create bitmap file_removed
-background white
-foreground red
-data {
2315 #define file_removed_width 14
2316 #define file_removed_height 15
2317 static unsigned char file_removed_bits
[] = {
2318 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2319 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2320 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2321 } -maskdata $filemask
2323 image create bitmap file_merge
-background white
-foreground blue
-data {
2324 #define file_merge_width 14
2325 #define file_merge_height 15
2326 static unsigned char file_merge_bits
[] = {
2327 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2328 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2329 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2330 } -maskdata $filemask
2332 set ui_index .vpane.files.index.list
2333 set ui_workdir .vpane.files.workdir.list
2335 set all_icons
(_
$ui_index) file_plain
2336 set all_icons
(A
$ui_index) file_fulltick
2337 set all_icons
(M
$ui_index) file_fulltick
2338 set all_icons
(D
$ui_index) file_removed
2339 set all_icons
(U
$ui_index) file_merge
2341 set all_icons
(_
$ui_workdir) file_plain
2342 set all_icons
(M
$ui_workdir) file_mod
2343 set all_icons
(D
$ui_workdir) file_question
2344 set all_icons
(U
$ui_workdir) file_merge
2345 set all_icons
(O
$ui_workdir) file_plain
2347 set max_status_desc
0
2351 {_M
"Modified, not staged"}
2352 {M_
"Staged for commit"}
2353 {MM
"Portions staged for commit"}
2354 {MD
"Staged for commit, missing"}
2356 {_O
"Untracked, not staged"}
2357 {A_
"Staged for commit"}
2358 {AM
"Portions staged for commit"}
2359 {AD
"Staged for commit, missing"}
2362 {D_
"Staged for removal"}
2363 {DO
"Staged for removal, still present"}
2365 {U_
"Requires merge resolution"}
2366 {UU
"Requires merge resolution"}
2367 {UM
"Requires merge resolution"}
2368 {UD
"Requires merge resolution"}
2370 if {$max_status_desc < [string length
[lindex
$i 1]]} {
2371 set max_status_desc
[string length
[lindex
$i 1]]
2373 set all_descs
([lindex
$i 0]) [lindex
$i 1]
2377 ######################################################################
2382 global tcl_platform tk_library
2383 if {[tk windowingsystem
] eq
{aqua
}} {
2389 proc is_Windows
{} {
2391 if {$tcl_platform(platform
) eq
{windows
}} {
2397 proc bind_button3
{w cmd
} {
2398 bind $w <Any-Button-3
> $cmd
2400 bind $w <Control-Button-1
> $cmd
2404 proc incr_font_size
{font
{amt
1}} {
2405 set sz
[font configure
$font -size]
2407 font configure
$font -size $sz
2408 font configure
${font}bold
-size $sz
2411 proc hook_failed_popup
{hook msg
} {
2416 label
$w.m.l1
-text "$hook hook failed:" \
2421 -background white
-borderwidth 1 \
2423 -width 80 -height 10 \
2425 -yscrollcommand [list
$w.m.sby
set]
2427 -text {You must correct the above errors before committing.
} \
2431 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2432 pack
$w.m.l1
-side top
-fill x
2433 pack
$w.m.l2
-side bottom
-fill x
2434 pack
$w.m.sby
-side right
-fill y
2435 pack
$w.m.t
-side left
-fill both
-expand 1
2436 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2438 $w.m.t insert
1.0 $msg
2439 $w.m.t conf
-state disabled
2441 button
$w.ok
-text OK \
2444 -command "destroy $w"
2445 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2447 bind $w <Visibility
> "grab $w; focus $w"
2448 bind $w <Key-Return
> "destroy $w"
2449 wm title
$w "[appname] ([reponame]): error"
2453 set next_console_id
0
2455 proc new_console
{short_title long_title
} {
2456 global next_console_id console_data
2457 set w .console
[incr next_console_id
]
2458 set console_data
($w) [list
$short_title $long_title]
2459 return [console_init
$w]
2462 proc console_init
{w
} {
2463 global console_cr console_data M1B
2465 set console_cr
($w) 1.0
2468 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
2473 -background white
-borderwidth 1 \
2475 -width 80 -height 10 \
2478 -yscrollcommand [list
$w.m.sby
set]
2479 label
$w.m.s
-text {Working... please
wait...
} \
2483 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2484 pack
$w.m.l1
-side top
-fill x
2485 pack
$w.m.s
-side bottom
-fill x
2486 pack
$w.m.sby
-side right
-fill y
2487 pack
$w.m.t
-side left
-fill both
-expand 1
2488 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2490 menu
$w.ctxm
-tearoff 0
2491 $w.ctxm add
command -label "Copy" \
2493 -command "tk_textCopy $w.m.t"
2494 $w.ctxm add
command -label "Select All" \
2496 -command "$w.m.t tag add sel 0.0 end"
2497 $w.ctxm add
command -label "Copy All" \
2500 $w.m.t tag add sel 0.0 end
2502 $w.m.t tag remove sel 0.0 end
2505 button
$w.ok
-text {Close
} \
2508 -command "destroy $w"
2509 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2511 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
2512 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2513 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2514 bind $w <Visibility
> "focus $w"
2515 wm title
$w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2519 proc console_exec
{w cmd
{after
{}}} {
2520 # -- Windows tosses the enviroment when we exec our child.
2521 # But most users need that so we have to relogin. :-(
2524 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
2527 # -- Tcl won't let us redirect both stdout and stderr to
2528 # the same pipe. So pass it through cat...
2530 set cmd
[concat |
$cmd |
& cat]
2532 set fd_f
[open
$cmd r
]
2533 fconfigure
$fd_f -blocking 0 -translation binary
2534 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
2537 proc console_read
{w fd after
} {
2538 global console_cr console_data
2542 if {![winfo exists
$w]} {console_init
$w}
2543 $w.m.t conf
-state normal
2545 set n
[string length
$buf]
2547 set cr
[string first
"\r" $buf $c]
2548 set lf
[string first
"\n" $buf $c]
2549 if {$cr < 0} {set cr
[expr {$n + 1}]}
2550 if {$lf < 0} {set lf
[expr {$n + 1}]}
2553 $w.m.t insert end
[string range
$buf $c $lf]
2554 set console_cr
($w) [$w.m.t index
{end
-1c}]
2558 $w.m.t delete
$console_cr($w) end
2559 $w.m.t insert end
"\n"
2560 $w.m.t insert end
[string range
$buf $c $cr]
2565 $w.m.t conf
-state disabled
2569 fconfigure
$fd -blocking 1
2571 if {[catch
{close
$fd}]} {
2572 if {![winfo exists
$w]} {console_init
$w}
2573 $w.m.s conf
-background red
-text {Error
: Command Failed
}
2574 $w.ok conf
-state normal
2576 } elseif
{[winfo exists
$w]} {
2577 $w.m.s conf
-background green
-text {Success
}
2578 $w.ok conf
-state normal
2581 array
unset console_cr
$w
2582 array
unset console_data
$w
2584 uplevel
#0 $after $ok
2588 fconfigure
$fd -blocking 0
2591 ######################################################################
2595 set starting_gitk_msg
{Starting gitk... please
wait...
}
2597 proc do_gitk
{revs
} {
2598 global ui_status_value starting_gitk_msg
2606 set cmd
"sh -c \"exec $cmd\""
2610 if {[catch
{eval exec $cmd} err
]} {
2611 error_popup
"Failed to start gitk:\n\n$err"
2613 set ui_status_value
$starting_gitk_msg
2615 if {$ui_status_value eq
$starting_gitk_msg} {
2616 set ui_status_value
{Ready.
}
2623 set w
[new_console
{gc
} {Compressing the object database
}]
2624 console_exec
$w {git gc
}
2627 proc do_fsck_objects
{} {
2628 set w
[new_console
{fsck-objects
} \
2629 {Verifying the object database with fsck-objects
}]
2630 set cmd
[list git fsck-objects
]
2633 lappend cmd
--strict
2634 console_exec
$w $cmd
2640 global ui_comm is_quitting repo_config commit_type
2642 if {$is_quitting} return
2645 # -- Stash our current commit buffer.
2647 set save
[gitdir GITGUI_MSG
]
2648 set msg
[string trim
[$ui_comm get
0.0 end
]]
2649 if {![string match amend
* $commit_type]
2650 && [$ui_comm edit modified
]
2653 set fd
[open
$save w
]
2654 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
2658 catch
{file delete
$save}
2661 # -- Stash our current window geometry into this repository.
2663 set cfg_geometry
[list
]
2664 lappend cfg_geometry
[wm geometry .
]
2665 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
2666 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
2667 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2670 if {$cfg_geometry ne
$rc_geometry} {
2671 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2678 rescan
{set ui_status_value
{Ready.
}}
2681 proc unstage_helper
{txt paths
} {
2682 global file_states current_diff_path
2684 if {![lock_index begin-update
]} return
2688 foreach path
$paths {
2689 switch
-glob -- [lindex
$file_states($path) 0] {
2693 lappend pathList
$path
2694 if {$path eq
$current_diff_path} {
2695 set after
{reshow_diff
;}
2700 if {$pathList eq
{}} {
2706 [concat
$after {set ui_status_value
{Ready.
}}]
2710 proc do_unstage_selection
{} {
2711 global current_diff_path selected_paths
2713 if {[array size selected_paths
] > 0} {
2715 {Unstaging selected files from commit
} \
2716 [array names selected_paths
]
2717 } elseif
{$current_diff_path ne
{}} {
2719 "Unstaging [short_path $current_diff_path] from commit" \
2720 [list
$current_diff_path]
2724 proc add_helper
{txt paths
} {
2725 global file_states current_diff_path
2727 if {![lock_index begin-update
]} return
2731 foreach path
$paths {
2732 switch
-glob -- [lindex
$file_states($path) 0] {
2737 lappend pathList
$path
2738 if {$path eq
$current_diff_path} {
2739 set after
{reshow_diff
;}
2744 if {$pathList eq
{}} {
2750 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2754 proc do_add_selection
{} {
2755 global current_diff_path selected_paths
2757 if {[array size selected_paths
] > 0} {
2759 {Adding selected files
} \
2760 [array names selected_paths
]
2761 } elseif
{$current_diff_path ne
{}} {
2763 "Adding [short_path $current_diff_path]" \
2764 [list
$current_diff_path]
2768 proc do_add_all
{} {
2772 foreach path
[array names file_states
] {
2773 switch
-glob -- [lindex
$file_states($path) 0] {
2776 ?D
{lappend paths
$path}
2779 add_helper
{Adding all changed files
} $paths
2782 proc revert_helper
{txt paths
} {
2783 global file_states current_diff_path
2785 if {![lock_index begin-update
]} return
2789 foreach path
$paths {
2790 switch
-glob -- [lindex
$file_states($path) 0] {
2794 lappend pathList
$path
2795 if {$path eq
$current_diff_path} {
2796 set after
{reshow_diff
;}
2802 set n
[llength
$pathList]
2806 } elseif
{$n == 1} {
2807 set s
"[short_path [lindex $pathList]]"
2809 set s
"these $n files"
2812 set reply
[tk_dialog \
2814 "[appname] ([reponame])" \
2815 "Revert changes in $s?
2817 Any unadded changes will be permanently lost by the revert." \
2827 [concat
$after {set ui_status_value
{Ready.
}}]
2833 proc do_revert_selection
{} {
2834 global current_diff_path selected_paths
2836 if {[array size selected_paths
] > 0} {
2838 {Reverting selected files
} \
2839 [array names selected_paths
]
2840 } elseif
{$current_diff_path ne
{}} {
2842 "Reverting [short_path $current_diff_path]" \
2843 [list
$current_diff_path]
2847 proc do_signoff
{} {
2850 set me
[committer_ident
]
2851 if {$me eq
{}} return
2853 set sob
"Signed-off-by: $me"
2854 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2855 if {$last ne
$sob} {
2856 $ui_comm edit separator
2858 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2859 $ui_comm insert end
"\n"
2861 $ui_comm insert end
"\n$sob"
2862 $ui_comm edit separator
2867 proc do_select_commit_type
{} {
2868 global commit_type selected_commit_type
2870 if {$selected_commit_type eq
{new
}
2871 && [string match amend
* $commit_type]} {
2873 } elseif
{$selected_commit_type eq
{amend
}
2874 && ![string match amend
* $commit_type]} {
2877 # The amend request was rejected...
2879 if {![string match amend
* $commit_type]} {
2880 set selected_commit_type new
2890 global appvers copyright
2891 global tcl_patchLevel tk_patchLevel
2895 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2897 label
$w.header
-text "About [appname]" \
2899 pack
$w.header
-side top
-fill x
2902 button
$w.buttons.close
-text {Close
} \
2904 -command [list destroy
$w]
2905 pack
$w.buttons.close
-side right
2906 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2909 -text "[appname] - a commit creation tool for Git.
2917 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
2920 append v
"[appname] version $appvers\n"
2921 append v
"[exec git version]\n"
2923 if {$tcl_patchLevel eq
$tk_patchLevel} {
2924 append v
"Tcl/Tk version $tcl_patchLevel"
2926 append v
"Tcl version $tcl_patchLevel"
2927 append v
", Tk version $tk_patchLevel"
2938 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
2940 menu
$w.ctxm
-tearoff 0
2941 $w.ctxm add
command \
2946 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2949 bind $w <Visibility
> "grab $w; focus $w"
2950 bind $w <Key-Escape
> "destroy $w"
2951 bind_button3
$w.vers
"tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2952 wm title
$w "About [appname]"
2956 proc do_options
{} {
2957 global repo_config global_config font_descs
2958 global repo_config_new global_config_new
2960 array
unset repo_config_new
2961 array
unset global_config_new
2962 foreach name
[array names repo_config
] {
2963 set repo_config_new
($name) $repo_config($name)
2966 foreach name
[array names repo_config
] {
2968 gui.diffcontext
{continue}
2970 set repo_config_new
($name) $repo_config($name)
2972 foreach name
[array names global_config
] {
2973 set global_config_new
($name) $global_config($name)
2976 set w .options_editor
2978 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2980 label
$w.header
-text "[appname] Options" \
2982 pack
$w.header
-side top
-fill x
2985 button
$w.buttons.restore
-text {Restore Defaults
} \
2987 -command do_restore_defaults
2988 pack
$w.buttons.restore
-side left
2989 button
$w.buttons.save
-text Save \
2992 catch {eval \[bind \[focus -displayof $w\] <FocusOut>\]}
2995 pack
$w.buttons.save
-side right
2996 button
$w.buttons.cancel
-text {Cancel
} \
2998 -command [list destroy
$w]
2999 pack
$w.buttons.cancel
-side right
-padx 5
3000 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
3002 labelframe
$w.repo
-text "[reponame] Repository" \
3004 -relief raised
-borderwidth 2
3005 labelframe
$w.global
-text {Global
(All Repositories
)} \
3007 -relief raised
-borderwidth 2
3008 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
3009 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
3012 {b pullsummary
{Show Pull Summary
}}
3013 {b trustmtime
{Trust File Modification Timestamps
}}
3014 {i diffcontext
{Number of Diff Context Lines
}}
3015 {t newbranchtemplate
{New Branch Name Template
}}
3017 set type [lindex
$option 0]
3018 set name
[lindex
$option 1]
3019 set text
[lindex
$option 2]
3020 foreach f
{repo global
} {
3023 checkbutton
$w.
$f.
$name -text $text \
3024 -variable ${f}_config_new
(gui.
$name) \
3028 pack
$w.
$f.
$name -side top
-anchor w
3032 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
3033 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
3034 spinbox
$w.
$f.
$name.v \
3035 -textvariable ${f}_config_new
(gui.
$name) \
3036 -from 1 -to 99 -increment 1 \
3039 bind $w.
$f.
$name.v
<FocusIn
> {%W selection range
0 end
}
3040 pack
$w.
$f.
$name.v
-side right
-anchor e
-padx 5
3041 pack
$w.
$f.
$name -side top
-anchor w
-fill x
3045 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
3046 text
$w.
$f.
$name.v \
3052 $w.
$f.
$name.v insert
0.0 [set ${f}_config_new
(gui.
$name)]
3053 bind $w.
$f.
$name.v
<Shift-Key-Tab
> {focus
[tk_focusPrev
%W
];break}
3054 bind $w.
$f.
$name.v
<Key-Tab
> {focus
[tk_focusNext
%W
];break}
3055 bind $w.
$f.
$name.v
<Key-Return
> break
3056 bind $w.
$f.
$name.v
<FocusIn
> "$w.$f.$name.v tag add sel 0.0 end"
3057 bind $w.
$f.
$name.v
<FocusOut
> "
3058 set ${f}_config_new(gui.$name) \
3059 \[string trim \[$w.$f.$name.v get 0.0 end\]\]
3061 pack
$w.
$f.
$name.l
-side left
-anchor w
3062 pack
$w.
$f.
$name.v
-side left
-anchor w \
3065 pack
$w.
$f.
$name -side top
-anchor w
-fill x
3071 set all_fonts
[lsort
[font families
]]
3072 foreach option
$font_descs {
3073 set name
[lindex
$option 0]
3074 set font
[lindex
$option 1]
3075 set text
[lindex
$option 2]
3077 set global_config_new
(gui.
$font^^family
) \
3078 [font configure
$font -family]
3079 set global_config_new
(gui.
$font^^size
) \
3080 [font configure
$font -size]
3082 frame
$w.global.
$name
3083 label
$w.global.
$name.l
-text "$text:" -font font_ui
3084 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
3085 eval tk_optionMenu
$w.global.
$name.family \
3086 global_config_new
(gui.
$font^^family
) \
3088 spinbox
$w.global.
$name.size \
3089 -textvariable global_config_new
(gui.
$font^^size
) \
3090 -from 2 -to 80 -increment 1 \
3093 bind $w.global.
$name.size
<FocusIn
> {%W selection range
0 end
}
3094 pack
$w.global.
$name.size
-side right
-anchor e
3095 pack
$w.global.
$name.family
-side right
-anchor e
3096 pack
$w.global.
$name -side top
-anchor w
-fill x
3099 bind $w <Visibility
> "grab $w; focus $w"
3100 bind $w <Key-Escape
> "destroy $w"
3101 wm title
$w "[appname] ([reponame]): Options"
3105 proc do_restore_defaults
{} {
3106 global font_descs default_config repo_config
3107 global repo_config_new global_config_new
3109 foreach name
[array names default_config
] {
3110 set repo_config_new
($name) $default_config($name)
3111 set global_config_new
($name) $default_config($name)
3114 foreach option
$font_descs {
3115 set name
[lindex
$option 0]
3116 set repo_config
(gui.
$name) $default_config(gui.
$name)
3120 foreach option
$font_descs {
3121 set name
[lindex
$option 0]
3122 set font
[lindex
$option 1]
3123 set global_config_new
(gui.
$font^^family
) \
3124 [font configure
$font -family]
3125 set global_config_new
(gui.
$font^^size
) \
3126 [font configure
$font -size]
3130 proc do_save_config
{w
} {
3131 if {[catch
{save_config
} err
]} {
3132 error_popup
"Failed to completely save options:\n\n$err"
3138 proc do_windows_shortcut
{} {
3142 set desktop
[exec cygpath \
3150 set fn
[tk_getSaveFile \
3152 -title "[appname] ([reponame]): Create Desktop Icon" \
3153 -initialdir $desktop \
3154 -initialfile "Git [reponame].bat"]
3158 set sh
[exec cygpath \
3162 set me
[exec cygpath \
3166 set gd
[exec cygpath \
3170 set gw
[exec cygpath \
3173 [file dirname [gitdir
]]]
3174 regsub
-all ' $me "'\\''" me
3175 regsub -all ' $gd "'\\''" gd
3176 puts $fd "@ECHO Entering $gw"
3177 puts $fd "@ECHO Starting git-gui... please wait..."
3178 puts -nonewline $fd "@\"$sh\" --login -c \""
3179 puts -nonewline $fd "GIT_DIR='$gd'"
3180 puts -nonewline $fd " '$me'"
3184 error_popup "Cannot write script:\n\n$err"
3189 proc do_macosx_app {} {
3192 set fn [tk_getSaveFile \
3194 -title "[appname] ([reponame]): Create Desktop Icon" \
3195 -initialdir [file join $env(HOME) Desktop] \
3196 -initialfile "Git [reponame].app"]
3199 set Contents [file join $fn Contents]
3200 set MacOS [file join $Contents MacOS]
3201 set exe [file join $MacOS git-gui]
3205 set fd [open [file join $Contents Info.plist] w]
3206 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3207 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3208 <plist version="1.0">
3210 <key>CFBundleDevelopmentRegion</key>
3211 <string>English</string>
3212 <key>CFBundleExecutable</key>
3213 <string>git-gui</string>
3214 <key>CFBundleIdentifier</key>
3215 <string>org.spearce.git-gui</string>
3216 <key>CFBundleInfoDictionaryVersion</key>
3217 <string>6.0</string>
3218 <key>CFBundlePackageType</key>
3219 <string>APPL</string>
3220 <key>CFBundleSignature</key>
3221 <string>????</string>
3222 <key>CFBundleVersion</key>
3223 <string>1.0</string>
3224 <key>NSPrincipalClass</key>
3225 <string>NSApplication</string>
3230 set fd [open $exe w]
3231 set gd [file normalize [gitdir]]
3232 set ep [file normalize [exec git --exec-path]]
3233 regsub -all ' $gd "'\\''" gd
3234 regsub
-all ' $ep "'\\''" ep
3235 puts $fd "#!/bin/sh"
3236 foreach name
[array names env
] {
3237 if {[string match GIT_
* $name]} {
3238 regsub
-all ' $env($name) "'\\''" v
3239 puts $fd "export $name='$v'"
3242 puts $fd "export PATH
='$ep':\
$PATH"
3243 puts $fd "export GIT_DIR
='$gd'"
3244 puts $fd "exec [file normalize
$argv0]"
3247 file attributes $exe -permissions u+x,g+x,o+x
3249 error_popup "Cannot
write icon
:\n\n$err"
3254 proc toggle_or_diff {w x y} {
3255 global file_states file_lists current_diff_path ui_index ui_workdir
3256 global last_clicked selected_paths
3258 set pos [split [$w index @$x,$y] .]
3259 set lno [lindex $pos 0]
3260 set col [lindex $pos 1]
3261 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3267 set last_clicked [list $w $lno]
3268 array unset selected_paths
3269 $ui_index tag remove in_sel 0.0 end
3270 $ui_workdir tag remove in_sel 0.0 end
3273 if {$current_diff_path eq $path} {
3274 set after {reshow_diff;}
3278 if {$w eq $ui_index} {
3280 "Unstaging
[short_path
$path] from commit
" \
3282 [concat $after {set ui_status_value {Ready.}}]
3283 } elseif {$w eq $ui_workdir} {
3285 "Adding
[short_path
$path]" \
3287 [concat $after {set ui_status_value {Ready.}}]
3290 show_diff $path $w $lno
3294 proc add_one_to_selection {w x y} {
3295 global file_lists last_clicked selected_paths
3297 set lno [lindex [split [$w index @$x,$y] .] 0]
3298 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3304 if {$last_clicked ne {}
3305 && [lindex $last_clicked 0] ne $w} {
3306 array unset selected_paths
3307 [lindex $last_clicked 0] tag remove in_sel 0.0 end
3310 set last_clicked [list $w $lno]
3311 if {[catch {set in_sel $selected_paths($path)}]} {
3315 unset selected_paths($path)
3316 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3318 set selected_paths($path) 1
3319 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3323 proc add_range_to_selection {w x y} {
3324 global file_lists last_clicked selected_paths
3326 if {[lindex $last_clicked 0] ne $w} {
3327 toggle_or_diff $w $x $y
3331 set lno [lindex [split [$w index @$x,$y] .] 0]
3332 set lc [lindex $last_clicked 1]
3341 foreach path [lrange $file_lists($w) \
3342 [expr {$begin - 1}] \
3343 [expr {$end - 1}]] {
3344 set selected_paths($path) 1
3346 $w tag add in_sel $begin.0 [expr {$end + 1}].0
3349 ######################################################################
3353 set cursor_ptr arrow
3354 font create font_diff -family Courier -size 10
3358 eval font configure font_ui [font actual [.dummy cget -font]]
3362 font create font_uibold
3363 font create font_diffbold
3368 } elseif {[is_MacOSX]} {
3376 proc apply_config {} {
3377 global repo_config font_descs
3379 foreach option $font_descs {
3380 set name [lindex $option 0]
3381 set font [lindex $option 1]
3383 foreach {cn cv} $repo_config(gui.$name) {
3384 font configure $font $cn $cv
3387 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
3389 foreach {cn cv} [font configure $font] {
3390 font configure ${font}bold $cn $cv
3392 font configure ${font}bold -weight bold
3396 set default_config(gui.trustmtime) false
3397 set default_config(gui.pullsummary) true
3398 set default_config(gui.diffcontext) 5
3399 set default_config(gui.newbranchtemplate) {}
3400 set default_config(gui.fontui) [font configure font_ui]
3401 set default_config(gui.fontdiff) [font configure font_diff]
3403 {fontui font_ui {Main Font}}
3404 {fontdiff font_diff {Diff/Console Font}}
3409 ######################################################################
3415 menu .mbar -tearoff 0
3416 .mbar add cascade -label Repository -menu .mbar.repository
3417 .mbar add cascade -label Edit -menu .mbar.edit
3418 if {!$single_commit} {
3419 .mbar add cascade -label Branch -menu .mbar.branch
3421 .mbar add cascade -label Commit -menu .mbar.commit
3422 if {!$single_commit} {
3423 .mbar add cascade -label Fetch -menu .mbar.fetch
3424 .mbar add cascade -label Pull -menu .mbar.pull
3425 .mbar add cascade -label Push -menu .mbar.push
3427 . configure -menu .mbar
3429 # -- Repository Menu
3431 menu .mbar.repository
3432 .mbar.repository add command \
3433 -label {Visualize Current Branch} \
3434 -command {do_gitk {}} \
3437 .mbar.repository add command \
3438 -label {Visualize All Branches} \
3439 -command {do_gitk {--all}} \
3442 .mbar.repository add separator
3444 if {!$single_commit} {
3445 .mbar.repository add command -label {Compress Database} \
3449 .mbar.repository add command -label {Verify Database} \
3450 -command do_fsck_objects \
3453 .mbar.repository add separator
3456 .mbar.repository add command \
3457 -label {Create Desktop Icon} \
3458 -command do_windows_shortcut \
3460 } elseif {[is_MacOSX]} {
3461 .mbar.repository add command \
3462 -label {Create Desktop Icon} \
3463 -command do_macosx_app \
3468 .mbar.repository add command -label Quit \
3470 -accelerator $M1T-Q \
3476 .mbar.edit add command -label Undo \
3477 -command {catch {[focus] edit undo}} \
3478 -accelerator $M1T-Z \
3480 .mbar.edit add command -label Redo \
3481 -command {catch {[focus] edit redo}} \
3482 -accelerator $M1T-Y \
3484 .mbar.edit add separator
3485 .mbar.edit add command -label Cut \
3486 -command {catch {tk_textCut [focus]}} \
3487 -accelerator $M1T-X \
3489 .mbar.edit add command -label Copy \
3490 -command {catch {tk_textCopy [focus]}} \
3491 -accelerator $M1T-C \
3493 .mbar.edit add command -label Paste \
3494 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3495 -accelerator $M1T-V \
3497 .mbar.edit add command -label Delete \
3498 -command {catch {[focus] delete sel.first sel.last}} \
3501 .mbar.edit add separator
3502 .mbar.edit add command -label {Select All} \
3503 -command {catch {[focus] tag add sel 0.0 end}} \
3504 -accelerator $M1T-A \
3509 if {!$single_commit} {
3512 .mbar.branch add command -label {Create...} \
3513 -command do_create_branch \
3514 -accelerator $M1T-N \
3516 lappend disable_on_lock [list .mbar.branch entryconf \
3517 [.mbar.branch index last] -state]
3519 .mbar.branch add command -label {Delete...} \
3520 -command do_delete_branch \
3522 lappend disable_on_lock [list .mbar.branch entryconf \
3523 [.mbar.branch index last] -state]
3530 .mbar.commit add radiobutton \
3531 -label {New Commit} \
3532 -command do_select_commit_type \
3533 -variable selected_commit_type \
3536 lappend disable_on_lock \
3537 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3539 .mbar.commit add radiobutton \
3540 -label {Amend Last Commit} \
3541 -command do_select_commit_type \
3542 -variable selected_commit_type \
3545 lappend disable_on_lock \
3546 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3548 .mbar.commit add separator
3550 .mbar.commit add command -label Rescan \
3551 -command do_rescan \
3554 lappend disable_on_lock \
3555 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3557 .mbar.commit add command -label {Add To Commit} \
3558 -command do_add_selection \
3560 lappend disable_on_lock \
3561 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3563 .mbar.commit add command -label {Add All To Commit} \
3564 -command do_add_all \
3565 -accelerator $M1T-I \
3567 lappend disable_on_lock \
3568 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3570 .mbar.commit add command -label {Unstage From Commit} \
3571 -command do_unstage_selection \
3573 lappend disable_on_lock \
3574 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3576 .mbar.commit add command -label {Revert Changes} \
3577 -command do_revert_selection \
3579 lappend disable_on_lock \
3580 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3582 .mbar.commit add separator
3584 .mbar.commit add command -label {Sign Off} \
3585 -command do_signoff \
3586 -accelerator $M1T-S \
3589 .mbar.commit add command -label Commit \
3590 -command do_commit \
3591 -accelerator $M1T-Return \
3593 lappend disable_on_lock \
3594 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3596 # -- Transport menus
3598 if {!$single_commit} {
3605 # -- Apple Menu (Mac OS X only)
3607 .mbar add cascade -label Apple -menu .mbar.apple
3610 .mbar.apple add command -label "About
[appname
]" \
3613 .mbar.apple add command -label "[appname
] Options...
" \
3614 -command do_options \
3619 .mbar.edit add separator
3620 .mbar.edit add command -label {Options...} \
3621 -command do_options \
3626 if {[file exists /usr/local/miga/lib/gui-miga]
3627 && [file exists .pvcsrc]} {
3629 global ui_status_value
3630 if {![lock_index update]} return
3631 set cmd [list sh --login -c "/usr
/local
/miga
/lib
/gui-miga
\"[pwd]\""]
3632 set miga_fd [open "|
$cmd" r]
3633 fconfigure $miga_fd -blocking 0
3634 fileevent $miga_fd readable [list miga_done $miga_fd]
3635 set ui_status_value {Running miga...}
3637 proc miga_done {fd} {
3642 rescan [list set ui_status_value {Ready.}]
3645 .mbar add cascade -label Tools -menu .mbar.tools
3647 .mbar.tools add command -label "Migrate
" \
3650 lappend disable_on_lock \
3651 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3656 .mbar add cascade -label Help -menu .mbar.help
3659 .mbar.help add command -label "About
[appname
]" \
3671 -text {Current Branch:} \
3676 -textvariable current_branch \
3680 pack .branch.l1 -side left
3681 pack .branch.cb -side left -fill x
3682 pack .branch -side top -fill x
3684 # -- Main Window Layout
3686 panedwindow .vpane -orient vertical
3687 panedwindow .vpane.files -orient horizontal
3688 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3689 pack .vpane -anchor n -side top -fill both -expand 1
3691 # -- Index File List
3693 frame .vpane.files.index -height 100 -width 400
3694 label .vpane.files.index.title -text {Changes To Be Committed} \
3697 text $ui_index -background white -borderwidth 0 \
3698 -width 40 -height 10 \
3701 -cursor $cursor_ptr \
3702 -xscrollcommand {.vpane.files.index.sx set} \
3703 -yscrollcommand {.vpane.files.index.sy set} \
3705 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3706 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3707 pack .vpane.files.index.title -side top -fill x
3708 pack .vpane.files.index.sx -side bottom -fill x
3709 pack .vpane.files.index.sy -side right -fill y
3710 pack $ui_index -side left -fill both -expand 1
3711 .vpane.files add .vpane.files.index -sticky nsew
3713 # -- Working Directory File List
3715 frame .vpane.files.workdir -height 100 -width 100
3716 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3719 text $ui_workdir -background white -borderwidth 0 \
3720 -width 40 -height 10 \
3723 -cursor $cursor_ptr \
3724 -xscrollcommand {.vpane.files.workdir.sx set} \
3725 -yscrollcommand {.vpane.files.workdir.sy set} \
3727 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3728 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3729 pack .vpane.files.workdir.title -side top -fill x
3730 pack .vpane.files.workdir.sx -side bottom -fill x
3731 pack .vpane.files.workdir.sy -side right -fill y
3732 pack $ui_workdir -side left -fill both -expand 1
3733 .vpane.files add .vpane.files.workdir -sticky nsew
3735 foreach i [list $ui_index $ui_workdir] {
3736 $i tag conf in_diff -font font_uibold
3737 $i tag conf in_sel \
3738 -background [$i cget -foreground] \
3739 -foreground [$i cget -background]
3743 # -- Diff and Commit Area
3745 frame .vpane.lower -height 300 -width 400
3746 frame .vpane.lower.commarea
3747 frame .vpane.lower.diff -relief sunken -borderwidth 1
3748 pack .vpane.lower.commarea -side top -fill x
3749 pack .vpane.lower.diff -side bottom -fill both -expand 1
3750 .vpane add .vpane.lower -stick nsew
3752 # -- Commit Area Buttons
3754 frame .vpane.lower.commarea.buttons
3755 label .vpane.lower.commarea.buttons.l -text {} \
3759 pack .vpane.lower.commarea.buttons.l -side top -fill x
3760 pack .vpane.lower.commarea.buttons -side left -fill y
3762 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3763 -command do_rescan \
3765 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3766 lappend disable_on_lock \
3767 {.vpane.lower.commarea.buttons.rescan conf -state}
3769 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3770 -command do_add_all \
3772 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3773 lappend disable_on_lock \
3774 {.vpane.lower.commarea.buttons.incall conf -state}
3776 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3777 -command do_signoff \
3779 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3781 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3782 -command do_commit \
3784 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3785 lappend disable_on_lock \
3786 {.vpane.lower.commarea.buttons.commit conf -state}
3788 # -- Commit Message Buffer
3790 frame .vpane.lower.commarea.buffer
3791 frame .vpane.lower.commarea.buffer.header
3792 set ui_comm .vpane.lower.commarea.buffer.t
3793 set ui_coml .vpane.lower.commarea.buffer.header.l
3794 radiobutton .vpane.lower.commarea.buffer.header.new \
3795 -text {New Commit} \
3796 -command do_select_commit_type \
3797 -variable selected_commit_type \
3800 lappend disable_on_lock \
3801 [list .vpane.lower.commarea.buffer.header.new conf -state]
3802 radiobutton .vpane.lower.commarea.buffer.header.amend \
3803 -text {Amend Last Commit} \
3804 -command do_select_commit_type \
3805 -variable selected_commit_type \
3808 lappend disable_on_lock \
3809 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3814 proc trace_commit_type {varname args} {
3815 global ui_coml commit_type
3816 switch -glob -- $commit_type {
3817 initial {set txt {Initial Commit Message:}}
3818 amend {set txt {Amended Commit Message:}}
3819 amend-initial {set txt {Amended Initial Commit Message:}}
3820 amend-merge {set txt {Amended Merge Commit Message:}}
3821 merge {set txt {Merge Commit Message:}}
3822 * {set txt {Commit Message:}}
3824 $ui_coml conf -text $txt
3826 trace add variable commit_type write trace_commit_type
3827 pack $ui_coml -side left -fill x
3828 pack .vpane.lower.commarea.buffer.header.amend -side right
3829 pack .vpane.lower.commarea.buffer.header.new -side right
3831 text $ui_comm -background white -borderwidth 1 \
3834 -autoseparators true \
3836 -width 75 -height 9 -wrap none \
3838 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3839 scrollbar .vpane.lower.commarea.buffer.sby \
3840 -command [list $ui_comm yview]
3841 pack .vpane.lower.commarea.buffer.header -side top -fill x
3842 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3843 pack $ui_comm -side left -fill y
3844 pack .vpane.lower.commarea.buffer -side left -fill y
3846 # -- Commit Message Buffer Context Menu
3848 set ctxm .vpane.lower.commarea.buffer.ctxm
3849 menu $ctxm -tearoff 0
3853 -command {tk_textCut $ui_comm}
3857 -command {tk_textCopy $ui_comm}
3861 -command {tk_textPaste $ui_comm}
3865 -command {$ui_comm delete sel.first sel.last}
3868 -label {Select All} \
3870 -command {$ui_comm tag add sel 0.0 end}
3875 $ui_comm tag add sel 0.0 end
3876 tk_textCopy $ui_comm
3877 $ui_comm tag remove sel 0.0 end
3884 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
3888 set current_diff_path {}
3889 set diff_actions [list]
3890 proc trace_current_diff_path {varname args} {
3891 global current_diff_path diff_actions file_states
3892 if {$current_diff_path eq {}} {
3898 set p $current_diff_path
3899 set s [mapdesc [lindex $file_states($p) 0] $p]
3901 set p [escape_path $p]
3905 .vpane.lower.diff.header.status configure -text $s
3906 .vpane.lower.diff.header.file configure -text $f
3907 .vpane.lower.diff.header.path configure -text $p
3908 foreach w $diff_actions {
3912 trace add variable current_diff_path write trace_current_diff_path
3914 frame .vpane.lower.diff.header -background orange
3915 label .vpane.lower.diff.header.status \
3916 -background orange \
3917 -width $max_status_desc \
3921 label .vpane.lower.diff.header.file \
3922 -background orange \
3926 label .vpane.lower.diff.header.path \
3927 -background orange \
3931 pack .vpane.lower.diff.header.status -side left
3932 pack .vpane.lower.diff.header.file -side left
3933 pack .vpane.lower.diff.header.path -fill x
3934 set ctxm .vpane.lower.diff.header.ctxm
3935 menu $ctxm -tearoff 0
3944 -- $current_diff_path
3946 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3947 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
3951 frame .vpane.lower.diff.body
3952 set ui_diff .vpane.lower.diff.body.t
3953 text $ui_diff -background white -borderwidth 0 \
3954 -width 80 -height 15 -wrap none \
3956 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3957 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3959 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3960 -command [list $ui_diff xview]
3961 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3962 -command [list $ui_diff yview]
3963 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3964 pack .vpane.lower.diff.body.sby -side right -fill y
3965 pack $ui_diff -side left -fill both -expand 1
3966 pack .vpane.lower.diff.header -side top -fill x
3967 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3969 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
3970 $ui_diff tag conf d_+ -foreground {#00a000}
3971 $ui_diff tag conf d_- -foreground red
3973 $ui_diff tag conf d_++ -foreground {#00a000}
3974 $ui_diff tag conf d_-- -foreground red
3975 $ui_diff tag conf d_+s \
3976 -foreground {#00a000} \
3977 -background {#e2effa}
3978 $ui_diff tag conf d_-s \
3980 -background {#e2effa}
3981 $ui_diff tag conf d_s+ \
3982 -foreground {#00a000} \
3984 $ui_diff tag conf d_s- \
3988 $ui_diff tag conf d<<<<<<< \
3989 -foreground orange \
3991 $ui_diff tag conf d======= \
3992 -foreground orange \
3994 $ui_diff tag conf d>>>>>>> \
3995 -foreground orange \
3998 $ui_diff tag raise sel
4000 # -- Diff Body Context Menu
4002 set ctxm .vpane.lower.diff.body.ctxm
4003 menu $ctxm -tearoff 0
4007 -command reshow_diff
4011 -command {tk_textCopy $ui_diff}
4012 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4014 -label {Select All} \
4016 -command {$ui_diff tag add sel 0.0 end}
4017 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4022 $ui_diff tag add sel 0.0 end
4023 tk_textCopy $ui_diff
4024 $ui_diff tag remove sel 0.0 end
4026 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4029 -label {Decrease Font Size} \
4031 -command {incr_font_size font_diff -1}
4032 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4034 -label {Increase Font Size} \
4036 -command {incr_font_size font_diff 1}
4037 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4040 -label {Show Less Context} \
4042 -command {if {$repo_config(gui.diffcontext) >= 2} {
4043 incr repo_config(gui.diffcontext) -1
4046 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4048 -label {Show More Context} \
4051 incr repo_config(gui.diffcontext)
4054 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4056 $ctxm add command -label {Options...} \
4059 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
4063 set ui_status_value {Initializing...}
4064 label .status -textvariable ui_status_value \
4070 pack .status -anchor w -side bottom -fill x
4075 set gm $repo_config(gui.geometry)
4076 wm geometry . [lindex $gm 0]
4077 .vpane sash place 0 \
4078 [lindex [.vpane sash coord 0] 0] \
4080 .vpane.files sash place 0 \
4082 [lindex [.vpane.files sash coord 0] 1]
4088 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
4089 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
4090 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
4091 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
4092 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
4093 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
4094 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
4095 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
4096 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
4097 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4098 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4100 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
4101 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
4102 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
4103 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
4104 bind $ui_diff <$M1B-Key-v> {break}
4105 bind $ui_diff <$M1B-Key-V> {break}
4106 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4107 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4108 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
4109 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
4110 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
4111 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
4113 if {!$single_commit} {
4114 bind . <$M1B-Key-n> do_create_branch
4115 bind . <$M1B-Key-N> do_create_branch
4118 bind . <Destroy> do_quit
4119 bind all <Key-F5> do_rescan
4120 bind all <$M1B-Key-r> do_rescan
4121 bind all <$M1B-Key-R> do_rescan
4122 bind . <$M1B-Key-s> do_signoff
4123 bind . <$M1B-Key-S> do_signoff
4124 bind . <$M1B-Key-i> do_add_all
4125 bind . <$M1B-Key-I> do_add_all
4126 bind . <$M1B-Key-Return> do_commit
4127 bind all <$M1B-Key-q> do_quit
4128 bind all <$M1B-Key-Q> do_quit
4129 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
4130 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
4131 foreach i [list $ui_index $ui_workdir] {
4132 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
4133 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
4134 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
4138 set file_lists($ui_index) [list]
4139 set file_lists($ui_workdir) [list]
4143 set MERGE_HEAD [list]
4146 set current_branch {}
4147 set current_diff_path {}
4148 set selected_commit_type new
4150 wm title . "[appname
] ([file normalize
[file dirname [gitdir
]]])"
4151 focus -force $ui_comm
4153 # -- Warn the user about environmental problems. Cygwin's Tcl
4154 # does *not* pass its env array onto any processes it spawns.
4155 # This means that git processes get none of our environment.
4160 set msg "Possible environment issues exist.
4162 The following environment variables are probably
4163 going to be ignored by any Git subprocess run
4167 foreach name [array names env] {
4168 switch -regexp -- $name {
4169 {^GIT_INDEX_FILE$} -
4170 {^GIT_OBJECT_DIRECTORY$} -
4171 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4173 {^GIT_EXTERNAL_DIFF$} -
4177 {^GIT_CONFIG_LOCAL$} -
4178 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4179 append msg " - $name\n"
4182 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4183 append msg " - $name\n"
4185 set suggest_user $name
4189 if {$ignored_env > 0} {
4191 This is due to a known issue with the
4192 Tcl binary distributed by Cygwin.
"
4194 if {$suggest_user ne {}} {
4197 A good replacement
for $suggest_user
4198 is placing values
for the user.name and
4199 user.email settings into your personal
4205 unset ignored_env msg suggest_user name
4208 # -- Only initialize complex UI if we are going to stay running.
4210 if {!$single_commit} {
4214 populate_branch_menu
4215 populate_fetch_menu .mbar.fetch
4216 populate_pull_menu .mbar.pull
4217 populate_push_menu .mbar.push
4220 # -- Only suggest a gc run if we are going to stay running.
4222 if {!$single_commit} {
4223 set object_limit 2000
4224 if {[is_Windows]} {set object_limit 200}
4225 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4226 if {$objects_current >= $object_limit} {
4228 "This repository currently has
$objects_current loose objects.
4230 To maintain optimal performance it is strongly
4231 recommended that you
compress the database
4232 when
more than
$object_limit loose objects exist.
4234 Compress the database now?
"] eq yes} {
4238 unset object_limit _junk objects_current
4241 lock_index begin-read