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 ui_index ui_workdir
548 $ui_diff conf
-state normal
549 $ui_diff delete
0.0 end
550 $ui_diff conf
-state disabled
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 current_diff ui_status_value file_states
561 if {$current_diff eq
{}
562 ||
[catch
{set s
$file_states($current_diff)}]} {
565 show_diff
$current_diff
569 proc handle_empty_diff
{} {
570 global current_diff file_states file_lists
572 set path
$current_diff
573 set s
$file_states($path)
574 if {[lindex
$s 0] ne
{_M
}} return
576 info_popup
"No differences detected.
578 [short_path $path] has no changes.
580 The modification date of this file was updated
581 by another application and you currently have
582 the Trust File Modification Timestamps option
583 enabled, so Git did not automatically detect
584 that there are no content differences in this
587 This file will now be removed from the modified
588 files list, to prevent possible confusion.
590 if {[catch
{exec git update-index
-- $path} err
]} {
591 error_popup
"Failed to refresh index:\n\n$err"
595 display_file
$path __
598 proc show_diff
{path
{w
{}} {lno
{}}} {
599 global file_states file_lists
600 global is_3way_diff diff_active repo_config
601 global ui_diff current_diff ui_status_value
603 if {$diff_active ||
![lock_index
read]} return
606 if {$w eq
{} ||
$lno == {}} {
607 foreach w
[array names file_lists
] {
608 set lno
[lsearch
-sorted $file_lists($w) $path]
615 if {$w ne
{} && $lno >= 1} {
616 $w tag add in_diff
$lno.0 [expr {$lno + 1}].0
619 set s
$file_states($path)
623 set current_diff
$path
624 set ui_status_value
"Loading diff of [escape_path $path]..."
626 set cmd
[list | git diff-index
]
627 lappend cmd
--no-color
628 if {$repo_config(gui.diffcontext
) > 0} {
629 lappend cmd
"-U$repo_config(gui.diffcontext)"
639 set fd
[open
$path r
]
640 set content
[read $fd]
645 set ui_status_value
"Unable to display [escape_path $path]"
646 error_popup
"Error loading file:\n\n$err"
649 $ui_diff conf
-state normal
650 $ui_diff insert end
$content
651 $ui_diff conf
-state disabled
654 set ui_status_value
{Ready.
}
663 if {[catch
{set fd
[open
$cmd r
]} err
]} {
666 set ui_status_value
"Unable to display [escape_path $path]"
667 error_popup
"Error loading diff:\n\n$err"
671 fconfigure
$fd -blocking 0 -translation auto
672 fileevent
$fd readable
[list read_diff
$fd]
675 proc read_diff
{fd
} {
676 global ui_diff ui_status_value is_3way_diff diff_active
679 $ui_diff conf
-state normal
680 while {[gets
$fd line
] >= 0} {
681 # -- Cleanup uninteresting diff header lines.
683 if {[string match
{diff --git *} $line]} continue
684 if {[string match
{diff --combined *} $line]} continue
685 if {[string match
{--- *} $line]} continue
686 if {[string match
{+++ *} $line]} continue
687 if {$line eq
{deleted
file mode
120000}} {
688 set line
"deleted symlink"
691 # -- Automatically detect if this is a 3 way diff.
693 if {[string match
{@@@
*} $line]} {set is_3way_diff
1}
695 # -- Reformat a 3 way diff, 'cause its too weird.
698 set op
[string range
$line 0 1]
701 {++} {set tags d_
+ ; set op
{ +}}
702 {--} {set tags d_-
; set op
{ -}}
703 { +} {set tags d_
++; set op
{++}}
704 { -} {set tags d_--
; set op
{--}}
705 {+ } {set tags d_-
+; set op
{-+}}
706 {- } {set tags d_
+-; set op
{+-}}
707 default
{set tags
{}}
709 set line
[string replace
$line 0 1 $op]
711 switch
-- [string index
$line 0] {
715 default
{set tags
{}}
718 $ui_diff insert end
$line $tags
719 $ui_diff insert end
"\n" $tags
721 $ui_diff conf
-state disabled
727 set ui_status_value
{Ready.
}
729 if {$repo_config(gui.trustmtime
) eq
{true
}
730 && [$ui_diff index end
] eq
{2.0}} {
736 ######################################################################
740 proc load_last_commit
{} {
741 global HEAD PARENT MERGE_HEAD commit_type ui_comm
743 if {[llength
$PARENT] == 0} {
744 error_popup
{There is nothing to amend.
746 You are about to create the initial commit.
747 There is no commit before this to amend.
752 repository_state curType curHEAD curMERGE_HEAD
753 if {$curType eq
{merge
}} {
754 error_popup
{Cannot amend
while merging.
756 You are currently
in the middle of a merge that
757 has not been fully completed. You cannot amend
758 the prior commit unless you first abort the
759 current merge activity.
767 set fd
[open
"| git cat-file commit $curHEAD" r
]
768 while {[gets
$fd line
] > 0} {
769 if {[string match
{parent
*} $line]} {
770 lappend parents
[string range
$line 7 end
]
773 set msg
[string trim
[read $fd]]
776 error_popup
"Error loading commit data for amend:\n\n$err"
782 set MERGE_HEAD
[list
]
783 switch
-- [llength
$parents] {
784 0 {set commit_type amend-initial
}
785 1 {set commit_type amend
}
786 default
{set commit_type amend-merge
}
789 $ui_comm delete
0.0 end
790 $ui_comm insert end
$msg
792 $ui_comm edit modified false
793 rescan
{set ui_status_value
{Ready.
}}
796 proc create_new_commit
{} {
797 global commit_type ui_comm
799 set commit_type normal
800 $ui_comm delete
0.0 end
802 $ui_comm edit modified false
803 rescan
{set ui_status_value
{Ready.
}}
806 set GIT_COMMITTER_IDENT
{}
808 proc committer_ident
{} {
809 global GIT_COMMITTER_IDENT
811 if {$GIT_COMMITTER_IDENT eq
{}} {
812 if {[catch
{set me
[exec git var GIT_COMMITTER_IDENT
]} err
]} {
813 error_popup
"Unable to obtain your identity:\n\n$err"
816 if {![regexp
{^
(.
*) [0-9]+ [-+0-9]+$
} \
817 $me me GIT_COMMITTER_IDENT
]} {
818 error_popup
"Invalid GIT_COMMITTER_IDENT:\n\n$me"
823 return $GIT_COMMITTER_IDENT
826 proc commit_tree
{} {
827 global HEAD commit_type file_states ui_comm repo_config
829 if {![lock_index update
]} return
830 if {[committer_ident
] eq
{}} return
832 # -- Our in memory state should match the repository.
834 repository_state curType curHEAD curMERGE_HEAD
835 if {[string match amend
* $commit_type]
836 && $curType eq
{normal
}
837 && $curHEAD eq
$HEAD} {
838 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
839 info_popup
{Last scanned state does not match repository state.
841 Another Git program has modified this repository
842 since the last scan. A rescan must be performed
843 before another commit can be created.
845 The rescan will be automatically started now.
848 rescan
{set ui_status_value
{Ready.
}}
852 # -- At least one file should differ in the index.
855 foreach path
[array names file_states
] {
856 switch
-glob -- [lindex
$file_states($path) 0] {
860 M?
{set files_ready
1; break}
862 error_popup
"Unmerged files cannot be committed.
864 File [short_path $path] has merge conflicts.
865 You must resolve them and include the file before committing.
871 error_popup
"Unknown file state [lindex $s 0] detected.
873 File [short_path $path] cannot be committed by this program.
879 error_popup
{No included files to commit.
881 You must include
at least
1 file before you can commit.
887 # -- A message is required.
889 set msg
[string trim
[$ui_comm get
1.0 end
]]
891 error_popup
{Please supply a commit message.
893 A good commit message has the following format
:
895 - First line
: Describe
in one sentance what you did.
897 - Remaining lines
: Describe why this change is good.
903 commit_prehook
$curHEAD $msg
906 proc commit_prehook
{curHEAD msg
} {
907 global ui_status_value pch_error
909 set pchook
[gitdir hooks pre-commit
]
911 # On Cygwin [file executable] might lie so we need to ask
912 # the shell if the hook is executable. Yes that's annoying.
914 if {[is_Windows
] && [file isfile
$pchook]} {
915 set pchook
[list sh
-c [concat \
916 "if test -x \"$pchook\";" \
917 "then exec \"$pchook\" 2>&1;" \
919 } elseif
{[file executable
$pchook]} {
920 set pchook
[list
$pchook |
& cat]
922 commit_writetree
$curHEAD $msg
926 set ui_status_value
{Calling pre-commit hook...
}
928 set fd_ph
[open
"| $pchook" r
]
929 fconfigure
$fd_ph -blocking 0 -translation binary
930 fileevent
$fd_ph readable \
931 [list commit_prehook_wait
$fd_ph $curHEAD $msg]
934 proc commit_prehook_wait
{fd_ph curHEAD msg
} {
935 global pch_error ui_status_value
937 append pch_error
[read $fd_ph]
938 fconfigure
$fd_ph -blocking 1
940 if {[catch
{close
$fd_ph}]} {
941 set ui_status_value
{Commit declined by pre-commit hook.
}
942 hook_failed_popup pre-commit
$pch_error
945 commit_writetree
$curHEAD $msg
950 fconfigure
$fd_ph -blocking 0
953 proc commit_writetree
{curHEAD msg
} {
954 global ui_status_value
956 set ui_status_value
{Committing changes...
}
957 set fd_wt
[open
"| git write-tree" r
]
958 fileevent
$fd_wt readable \
959 [list commit_committree
$fd_wt $curHEAD $msg]
962 proc commit_committree
{fd_wt curHEAD msg
} {
963 global HEAD PARENT MERGE_HEAD commit_type
965 global ui_status_value ui_comm selected_commit_type
966 global file_states selected_paths rescan_active
969 if {$tree_id eq
{} ||
[catch
{close
$fd_wt} err
]} {
970 error_popup
"write-tree failed:\n\n$err"
971 set ui_status_value
{Commit failed.
}
976 # -- Create the commit.
978 set cmd
[list git commit-tree
$tree_id]
979 set parents
[concat
$PARENT $MERGE_HEAD]
980 if {[llength
$parents] > 0} {
985 # git commit-tree writes to stderr during initial commit.
986 lappend cmd
2>/dev
/null
989 if {[catch
{set cmt_id
[eval exec $cmd]} err
]} {
990 error_popup
"commit-tree failed:\n\n$err"
991 set ui_status_value
{Commit failed.
}
996 # -- Update the HEAD ref.
999 if {$commit_type ne
{normal
}} {
1000 append reflogm
" ($commit_type)"
1002 set i
[string first
"\n" $msg]
1004 append reflogm
{: } [string range
$msg 0 [expr {$i - 1}]]
1006 append reflogm
{: } $msg
1008 set cmd
[list git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD]
1009 if {[catch
{eval exec $cmd} err
]} {
1010 error_popup
"update-ref failed:\n\n$err"
1011 set ui_status_value
{Commit failed.
}
1016 # -- Cleanup after ourselves.
1018 catch
{file delete
[gitdir MERGE_HEAD
]}
1019 catch
{file delete
[gitdir MERGE_MSG
]}
1020 catch
{file delete
[gitdir SQUASH_MSG
]}
1021 catch
{file delete
[gitdir GITGUI_MSG
]}
1023 # -- Let rerere do its thing.
1025 if {[file isdirectory
[gitdir rr-cache
]]} {
1026 catch
{exec git rerere
}
1029 # -- Run the post-commit hook.
1031 set pchook
[gitdir hooks post-commit
]
1032 if {[is_Windows
] && [file isfile
$pchook]} {
1033 set pchook
[list sh
-c [concat \
1034 "if test -x \"$pchook\";" \
1035 "then exec \"$pchook\";" \
1037 } elseif
{![file executable
$pchook]} {
1040 if {$pchook ne
{}} {
1041 catch
{exec $pchook &}
1044 $ui_comm delete
0.0 end
1046 $ui_comm edit modified false
1048 if {$single_commit} do_quit
1050 # -- Update in memory status
1052 set selected_commit_type new
1053 set commit_type normal
1056 set MERGE_HEAD
[list
]
1058 foreach path
[array names file_states
] {
1059 set s
$file_states($path)
1061 switch
-glob -- $m {
1069 unset file_states
($path)
1070 catch
{unset selected_paths
($path)}
1073 set file_states
($path) [list _O
[lindex
$s 1] {} {}]
1079 set file_states
($path) [list \
1080 _
[string index
$m 1] \
1091 set ui_status_value \
1092 "Changes committed as [string range $cmt_id 0 7]."
1095 ######################################################################
1099 proc fetch_from
{remote
} {
1100 set w
[new_console
"fetch $remote" \
1101 "Fetching new changes from $remote"]
1102 set cmd
[list git fetch
]
1104 console_exec
$w $cmd
1107 proc pull_remote
{remote branch
} {
1108 global HEAD commit_type file_states repo_config
1110 if {![lock_index update
]} return
1112 # -- Our in memory state should match the repository.
1114 repository_state curType curHEAD curMERGE_HEAD
1115 if {$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1116 info_popup
{Last scanned state does not match repository state.
1118 Another Git program has modified this repository
1119 since the last scan. A rescan must be performed
1120 before a pull operation can be started.
1122 The rescan will be automatically started now.
1125 rescan
{set ui_status_value
{Ready.
}}
1129 # -- No differences should exist before a pull.
1131 if {[array size file_states
] != 0} {
1132 error_popup
{Uncommitted but modified files are present.
1134 You should not perform a pull with unmodified
1135 files
in your working directory as Git will be
1136 unable to recover from an incorrect merge.
1138 You should commit or revert all changes before
1139 starting a pull operation.
1145 set w
[new_console
"pull $remote $branch" \
1146 "Pulling new changes from branch $branch in $remote"]
1147 set cmd
[list git pull
]
1148 if {$repo_config(gui.pullsummary
) eq
{false
}} {
1149 lappend cmd
--no-summary
1153 console_exec
$w $cmd [list post_pull_remote
$remote $branch]
1156 proc post_pull_remote
{remote branch success
} {
1157 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1158 global ui_status_value
1162 repository_state commit_type HEAD MERGE_HEAD
1164 set selected_commit_type new
1165 set ui_status_value
"Pulling $branch from $remote complete."
1167 rescan
[list
set ui_status_value \
1168 "Conflicts detected while pulling $branch from $remote."]
1172 proc push_to
{remote
} {
1173 set w
[new_console
"push $remote" \
1174 "Pushing changes to $remote"]
1175 set cmd
[list git push
]
1177 console_exec
$w $cmd
1180 ######################################################################
1184 proc mapicon
{w state path
} {
1187 if {[catch
{set r
$all_icons($state$w)}]} {
1188 puts
"error: no icon for $w state={$state} $path"
1194 proc mapdesc
{state path
} {
1197 if {[catch
{set r
$all_descs($state)}]} {
1198 puts
"error: no desc for state={$state} $path"
1204 proc escape_path
{path
} {
1205 regsub
-all "\n" $path "\\n" path
1209 proc short_path
{path
} {
1210 return [escape_path
[lindex
[file split $path] end
]]
1214 set null_sha1
[string repeat
0 40]
1216 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1217 global file_states next_icon_id null_sha1
1219 set s0
[string index
$new_state 0]
1220 set s1
[string index
$new_state 1]
1222 if {[catch
{set info
$file_states($path)}]} {
1224 set icon n
[incr next_icon_id
]
1226 set state
[lindex
$info 0]
1227 set icon
[lindex
$info 1]
1228 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1229 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1232 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1233 elseif
{$s0 eq
{_
}} {set s0 _
}
1235 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1236 elseif
{$s1 eq
{_
}} {set s1 _
}
1238 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1239 set head_info
[list
0 $null_sha1]
1240 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1241 && $head_info eq
{}} {
1242 set head_info
$index_info
1245 set file_states
($path) [list
$s0$s1 $icon \
1246 $head_info $index_info \
1251 proc display_file_helper
{w path icon_name old_m new_m
} {
1254 if {$new_m eq
{_
}} {
1255 set lno
[lsearch
-sorted $file_lists($w) $path]
1257 set file_lists
($w) [lreplace
$file_lists($w) $lno $lno]
1259 $w conf
-state normal
1260 $w delete
$lno.0 [expr {$lno + 1}].0
1261 $w conf
-state disabled
1263 } elseif
{$old_m eq
{_
} && $new_m ne
{_
}} {
1264 lappend file_lists
($w) $path
1265 set file_lists
($w) [lsort
-unique $file_lists($w)]
1266 set lno
[lsearch
-sorted $file_lists($w) $path]
1268 $w conf
-state normal
1269 $w image create
$lno.0 \
1270 -align center
-padx 5 -pady 1 \
1272 -image [mapicon
$w $new_m $path]
1273 $w insert
$lno.1 "[escape_path $path]\n"
1274 $w conf
-state disabled
1275 } elseif
{$old_m ne
$new_m} {
1276 $w conf
-state normal
1277 $w image conf
$icon_name -image [mapicon
$w $new_m $path]
1278 $w conf
-state disabled
1282 proc display_file
{path state
} {
1283 global file_states selected_paths
1284 global ui_index ui_workdir
1286 set old_m
[merge_state
$path $state]
1287 set s
$file_states($path)
1288 set new_m
[lindex
$s 0]
1289 set icon_name
[lindex
$s 1]
1291 display_file_helper
$ui_index $path $icon_name \
1292 [string index
$old_m 0] \
1293 [string index
$new_m 0]
1294 display_file_helper
$ui_workdir $path $icon_name \
1295 [string index
$old_m 1] \
1296 [string index
$new_m 1]
1298 if {$new_m eq
{__
}} {
1299 unset file_states
($path)
1300 catch
{unset selected_paths
($path)}
1304 proc display_all_files_helper
{w path icon_name m
} {
1307 lappend file_lists
($w) $path
1308 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1309 $w image create end \
1310 -align center
-padx 5 -pady 1 \
1312 -image [mapicon
$w $m $path]
1313 $w insert end
"[escape_path $path]\n"
1316 proc display_all_files
{} {
1317 global ui_index ui_workdir
1318 global file_states file_lists
1321 $ui_index conf
-state normal
1322 $ui_workdir conf
-state normal
1324 $ui_index delete
0.0 end
1325 $ui_workdir delete
0.0 end
1328 set file_lists
($ui_index) [list
]
1329 set file_lists
($ui_workdir) [list
]
1331 foreach path
[lsort
[array names file_states
]] {
1332 set s
$file_states($path)
1334 set icon_name
[lindex
$s 1]
1336 if {[string index
$m 0] ne
{_
}} {
1337 display_all_files_helper
$ui_index $path \
1338 $icon_name [string index
$m 0]
1340 if {[string index
$m 1] ne
{_
}} {
1341 display_all_files_helper
$ui_workdir $path \
1342 $icon_name [string index
$m 1]
1346 $ui_index conf
-state disabled
1347 $ui_workdir conf
-state disabled
1350 proc update_indexinfo
{msg pathList after
} {
1351 global update_index_cp ui_status_value
1353 if {![lock_index update
]} return
1355 set update_index_cp
0
1356 set pathList
[lsort
$pathList]
1357 set totalCnt
[llength
$pathList]
1358 set batch [expr {int
($totalCnt * .01) + 1}]
1359 if {$batch > 25} {set batch 25}
1361 set ui_status_value
[format \
1362 "$msg... %i/%i files (%.2f%%)" \
1366 set fd
[open
"| git update-index -z --index-info" w
]
1372 fileevent
$fd writable
[list \
1373 write_update_indexinfo \
1383 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1384 global update_index_cp ui_status_value
1385 global file_states current_diff
1387 if {$update_index_cp >= $totalCnt} {
1394 for {set i
$batch} \
1395 {$update_index_cp < $totalCnt && $i > 0} \
1397 set path
[lindex
$pathList $update_index_cp]
1398 incr update_index_cp
1400 set s
$file_states($path)
1401 switch
-glob -- [lindex
$s 0] {
1408 set info
[lindex
$s 2]
1409 if {$info eq
{}} continue
1411 puts
-nonewline $fd "$info\t$path\0"
1412 display_file
$path $new
1415 set ui_status_value
[format \
1416 "$msg... %i/%i files (%.2f%%)" \
1419 [expr {100.0 * $update_index_cp / $totalCnt}]]
1422 proc update_index
{msg pathList after
} {
1423 global update_index_cp ui_status_value
1425 if {![lock_index update
]} return
1427 set update_index_cp
0
1428 set pathList
[lsort
$pathList]
1429 set totalCnt
[llength
$pathList]
1430 set batch [expr {int
($totalCnt * .01) + 1}]
1431 if {$batch > 25} {set batch 25}
1433 set ui_status_value
[format \
1434 "$msg... %i/%i files (%.2f%%)" \
1438 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1444 fileevent
$fd writable
[list \
1445 write_update_index \
1455 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1456 global update_index_cp ui_status_value
1457 global file_states current_diff
1459 if {$update_index_cp >= $totalCnt} {
1466 for {set i
$batch} \
1467 {$update_index_cp < $totalCnt && $i > 0} \
1469 set path
[lindex
$pathList $update_index_cp]
1470 incr update_index_cp
1472 switch
-glob -- [lindex
$file_states($path) 0] {
1481 puts
-nonewline $fd "$path\0"
1482 display_file
$path $new
1485 set ui_status_value
[format \
1486 "$msg... %i/%i files (%.2f%%)" \
1489 [expr {100.0 * $update_index_cp / $totalCnt}]]
1492 proc checkout_index
{msg pathList after
} {
1493 global update_index_cp ui_status_value
1495 if {![lock_index update
]} return
1497 set update_index_cp
0
1498 set pathList
[lsort
$pathList]
1499 set totalCnt
[llength
$pathList]
1500 set batch [expr {int
($totalCnt * .01) + 1}]
1501 if {$batch > 25} {set batch 25}
1503 set ui_status_value
[format \
1504 "$msg... %i/%i files (%.2f%%)" \
1508 set cmd
[list git checkout-index
]
1514 set fd
[open
"| $cmd " w
]
1520 fileevent
$fd writable
[list \
1521 write_checkout_index \
1531 proc write_checkout_index
{fd pathList totalCnt
batch msg after
} {
1532 global update_index_cp ui_status_value
1533 global file_states current_diff
1535 if {$update_index_cp >= $totalCnt} {
1542 for {set i
$batch} \
1543 {$update_index_cp < $totalCnt && $i > 0} \
1545 set path
[lindex
$pathList $update_index_cp]
1546 incr update_index_cp
1547 switch
-glob -- [lindex
$file_states($path) 0] {
1551 puts
-nonewline $fd "$path\0"
1552 display_file
$path ?_
1557 set ui_status_value
[format \
1558 "$msg... %i/%i files (%.2f%%)" \
1561 [expr {100.0 * $update_index_cp / $totalCnt}]]
1564 ######################################################################
1566 ## branch management
1568 proc load_all_heads
{} {
1569 global all_heads tracking_branches
1571 set all_heads
[list
]
1572 set cmd
[list git for-each-ref
]
1573 lappend cmd
--format=%(refname
)
1574 lappend cmd refs
/heads
1575 set fd
[open
"| $cmd" r
]
1576 while {[gets
$fd line
] > 0} {
1577 if {![catch
{set info
$tracking_branches($line)}]} continue
1578 if {![regsub ^refs
/heads
/ $line {} name
]} continue
1579 lappend all_heads
$name
1583 set all_heads
[lsort
$all_heads]
1586 proc populate_branch_menu
{} {
1587 global all_heads disable_on_lock
1590 set last
[$m index last
]
1591 for {set i
0} {$i <= $last} {incr i
} {
1592 if {[$m type $i] eq
{separator
}} {
1595 foreach a
$disable_on_lock {
1596 if {[lindex
$a 0] ne
$m ||
[lindex
$a 2] < $i} {
1600 set disable_on_lock
$new_dol
1606 foreach b
$all_heads {
1607 $m add radiobutton \
1609 -command [list switch_branch
$b] \
1610 -variable current_branch \
1613 lappend disable_on_lock \
1614 [list
$m entryconf
[$m index last
] -state]
1618 proc do_create_branch_action
{w
} {
1619 global all_heads null_sha1
1620 global create_branch_checkout create_branch_revtype
1621 global create_branch_head create_branch_trackinghead
1623 set newbranch
[string trim
[$w.name.t get
0.0 end
]]
1624 if {![catch
{exec git show-ref
--verify -- "refs/heads/$newbranch"}]} {
1628 -title [wm title
$w] \
1630 -message "Branch '$newbranch' already exists."
1634 if {[catch
{exec git check-ref-format
"heads/$newbranch"}]} {
1638 -title [wm title
$w] \
1640 -message "We do not like '$newbranch' as a branch name."
1646 switch
-- $create_branch_revtype {
1647 head {set rev $create_branch_head}
1648 tracking
{set rev $create_branch_trackinghead}
1649 expression
{set rev [string trim
[$w.from.exp.t get
0.0 end
]]}
1651 if {[catch
{set cmt
[exec git rev-parse
--verify "${rev}^0"]}]} {
1655 -title [wm title
$w] \
1657 -message "Invalid starting revision: $rev"
1660 set cmd
[list git update-ref
]
1662 lappend cmd
"branch: Created from $rev"
1663 lappend cmd
"refs/heads/$newbranch"
1665 lappend cmd
$null_sha1
1666 if {[catch
{eval exec $cmd} err
]} {
1670 -title [wm title
$w] \
1672 -message "Failed to create '$newbranch'.\n\n$err"
1676 lappend all_heads
$newbranch
1677 set all_heads
[lsort
$all_heads]
1678 populate_branch_menu
1682 proc do_create_branch
{} {
1683 global all_heads current_branch tracking_branches
1684 global create_branch_checkout create_branch_revtype
1685 global create_branch_head create_branch_trackinghead
1687 set create_branch_checkout true
1688 set create_branch_revtype
head
1689 set create_branch_head
$current_branch
1690 set create_branch_trackinghead
{}
1692 set w .branch_editor
1694 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
1696 label
$w.header
-text {Create New Branch
} \
1698 pack
$w.header
-side top
-fill x
1701 button
$w.buttons.create
-text Create \
1704 -command [list do_create_branch_action
$w]
1705 pack
$w.buttons.create
-side right
1706 button
$w.buttons.cancel
-text {Cancel
} \
1708 -command [list destroy
$w]
1709 pack
$w.buttons.cancel
-side right
-padx 5
1710 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
1712 labelframe
$w.name \
1713 -text {Branch Description
} \
1715 label
$w.name.l
-text {Name
:} -font font_ui
1722 bind $w.name.t
<Shift-Key-Tab
> "focus $w.postActions.checkout;break"
1723 bind $w.name.t
<Key-Tab
> "focus $w.from.exp.t;break"
1724 bind $w.name.t
<Key-Return
> "do_create_branch_action $w;break"
1725 bind $w.name.t
<Key
> {
1726 if {{%K
} ne
{BackSpace
}
1729 && {%K
} ne
{Return
}} {
1731 if {[string first
%A
{~^
:?
*[}] >= 0} break
1734 pack
$w.name.l
-side left
-padx 5
1735 pack
$w.name.t
-side left
-fill x
-expand 1
1736 pack
$w.name
-anchor nw
-fill x
-pady 5 -padx 5
1738 set all_trackings
[list
]
1739 foreach b
[array names tracking_branches
] {
1740 regsub ^refs
/(heads|remotes
)/ $b {} b
1741 lappend all_trackings
$b
1743 set all_trackings
[lsort
-unique $all_trackings]
1744 if {$all_trackings ne
{}} {
1745 set create_branch_trackinghead
[lindex
$all_trackings 0]
1748 labelframe
$w.from \
1749 -text {Starting Revision
} \
1752 radiobutton
$w.from.
head.r \
1753 -text {Local Branch
:} \
1755 -variable create_branch_revtype \
1757 eval tk_optionMenu
$w.from.
head.m create_branch_head
$all_heads
1758 pack
$w.from.
head.r
-side left
1759 pack
$w.from.
head.m
-side left
1760 frame
$w.from.tracking
1761 radiobutton
$w.from.tracking.r \
1762 -text {Tracking Branch
:} \
1764 -variable create_branch_revtype \
1766 eval tk_optionMenu
$w.from.tracking.m \
1767 create_branch_trackinghead \
1769 pack
$w.from.tracking.r
-side left
1770 pack
$w.from.tracking.m
-side left
1772 radiobutton
$w.from.exp.r \
1773 -text {Revision Expression
:} \
1775 -variable create_branch_revtype \
1777 text
$w.from.exp.t \
1783 bind $w.from.exp.t
<Shift-Key-Tab
> "focus $w.name.t;break"
1784 bind $w.from.exp.t
<Key-Tab
> "focus $w.postActions.checkout;break"
1785 bind $w.from.exp.t
<Key-Return
> "do_create_branch_action $w;break"
1786 pack
$w.from.exp.r
-side left
1787 pack
$w.from.exp.t
-side left
-fill x
-expand 1
1788 pack
$w.from.
head -padx 5 -fill x
-expand 1
1789 pack
$w.from.tracking
-padx 5 -fill x
-expand 1
1790 pack
$w.from.exp
-padx 5 -fill x
-expand 1
1791 pack
$w.from
-anchor nw
-fill x
-pady 5 -padx 5
1793 labelframe
$w.postActions \
1794 -text {Post Creation Actions
} \
1796 checkbutton
$w.postActions.checkout \
1797 -text {Checkout after creation
} \
1800 -variable create_branch_checkout \
1802 pack
$w.postActions.checkout
-anchor nw
1803 pack
$w.postActions
-anchor nw
-fill x
-pady 5 -padx 5
1805 bind $w <Visibility
> "grab $w; focus $w.name.t"
1806 bind $w <Key-Escape
> "destroy $w"
1807 bind $w <Key-Return
> "do_create_branch_action $w;break"
1808 wm title
$w "[appname] ([reponame]): Create Branch"
1812 proc do_delete_branch_action
{w
} {
1814 global delete_branch_checkhead delete_branch_head
1816 set to_delete
[list
]
1817 set msg
{Are you sure you want to delete the following branches?
1820 foreach i
[$w.list.l curselection
] {
1821 set b
[$w.list.l get
$i]
1822 if {[catch
{set o
[exec git rev-parse
--verify $b]}]} continue
1823 if {$delete_branch_checkhead} {
1824 if {[catch
{set m
[exec git merge-base
$o $delete_branch_head]}]} continue
1825 if {$o ne
$m} continue
1827 lappend to_delete
[list
$b $o]
1828 append msg
" - $b\n"
1830 if {$to_delete eq
{}} {
1834 -title [wm title
$w] \
1836 -message {No branches are able to be deleted.
1838 This is likely because you did not
select any branches
,
1839 or all selected branches are not completely merged.
1844 It can be difficult to recover deleted branches.
1846 Delete the above branches?
}
1847 if {[tk_messageBox \
1850 -title [wm title
$w] \
1852 -message $msg] ne
yes} {
1857 foreach i
$to_delete {
1860 if {[catch
{exec git update-ref
-d "refs/heads/$b" $o} err
]} {
1861 append failed
" - $b: $err\n"
1863 set x
[lsearch
-sorted $all_heads $b]
1865 set all_heads
[lreplace
$all_heads $x $x]
1870 if {$failed ne
{}} {
1874 -title [wm title
$w] \
1876 -message "Failed to delete branches:\n$failed"
1879 set all_heads
[lsort
$all_heads]
1880 populate_branch_menu
1884 proc do_delete_branch
{} {
1885 global all_heads tracking_branches current_branch
1886 global delete_branch_checkhead delete_branch_head
1888 set delete_branch_checkhead
1
1889 set delete_branch_head
$current_branch
1891 set w .branch_editor
1893 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
1895 label
$w.header
-text {Delete Local Branch
} \
1897 pack
$w.header
-side top
-fill x
1900 button
$w.buttons.create
-text Delete \
1902 -command [list do_delete_branch_action
$w]
1903 pack
$w.buttons.create
-side right
1904 button
$w.buttons.cancel
-text {Cancel
} \
1906 -command [list destroy
$w]
1907 pack
$w.buttons.cancel
-side right
-padx 5
1908 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
1910 labelframe
$w.list \
1911 -text {Local Branches
} \
1916 -selectmode extended \
1918 foreach h
$all_heads {
1919 if {$h ne
$current_branch} {
1920 $w.list.l insert end
$h
1923 pack
$w.list.l
-fill both
-pady 5 -padx 5
1924 pack
$w.list
-fill both
-pady 5 -padx 5
1926 set all_trackings
[list
]
1927 foreach b
[array names tracking_branches
] {
1928 regsub ^refs
/(heads|remotes
)/ $b {} b
1929 lappend all_trackings
$b
1932 labelframe
$w.validate \
1933 -text {Only Delete If
} \
1935 frame
$w.validate.
head
1936 checkbutton
$w.validate.
head.r \
1937 -text {Already Merged Into
:} \
1938 -variable delete_branch_checkhead \
1940 eval tk_optionMenu
$w.validate.
head.m delete_branch_head \
1942 [lsort
-unique $all_trackings]
1943 pack
$w.validate.
head.r
-side left
1944 pack
$w.validate.
head.m
-side left
1945 pack
$w.validate.
head -padx 5 -fill x
-expand 1
1946 pack
$w.validate
-anchor nw
-fill x
-pady 5 -padx 5
1948 bind $w <Visibility
> "grab $w; focus $w"
1949 bind $w <Key-Escape
> "destroy $w"
1950 wm title
$w "[appname] ([reponame]): Delete Branch"
1954 proc switch_branch
{b
} {
1955 global HEAD commit_type file_states current_branch
1956 global selected_commit_type ui_comm
1958 if {![lock_index switch
]} return
1960 # -- Backup the selected branch (repository_state resets it)
1962 set new_branch
$current_branch
1964 # -- Our in memory state should match the repository.
1966 repository_state curType curHEAD curMERGE_HEAD
1967 if {[string match amend
* $commit_type]
1968 && $curType eq
{normal
}
1969 && $curHEAD eq
$HEAD} {
1970 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
1971 info_popup
{Last scanned state does not match repository state.
1973 Another Git program has modified this repository
1974 since the last scan. A rescan must be performed
1975 before the current branch can be changed.
1977 The rescan will be automatically started now.
1980 rescan
{set ui_status_value
{Ready.
}}
1984 # -- Toss the message buffer if we are in amend mode.
1986 if {[string match amend
* $curType]} {
1987 $ui_comm delete
0.0 end
1989 $ui_comm edit modified false
1992 set selected_commit_type new
1993 set current_branch
$new_branch
1996 error
"NOT FINISHED"
1999 ######################################################################
2001 ## remote management
2003 proc load_all_remotes
{} {
2005 global all_remotes tracking_branches
2007 set all_remotes
[list
]
2008 array
unset tracking_branches
2010 set rm_dir
[gitdir remotes
]
2011 if {[file isdirectory
$rm_dir]} {
2012 set all_remotes
[glob \
2016 -directory $rm_dir *]
2018 foreach name
$all_remotes {
2020 set fd
[open
[file join $rm_dir $name] r
]
2021 while {[gets
$fd line
] >= 0} {
2022 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
2023 $line line src dst
]} continue
2024 if {![regexp ^refs
/ $dst]} {
2025 set dst
"refs/heads/$dst"
2027 set tracking_branches
($dst) [list
$name $src]
2034 foreach line
[array names repo_config remote.
*.url
] {
2035 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
2036 lappend all_remotes
$name
2038 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
2042 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
2043 if {![regexp ^refs
/ $dst]} {
2044 set dst
"refs/heads/$dst"
2046 set tracking_branches
($dst) [list
$name $src]
2050 set all_remotes
[lsort
-unique $all_remotes]
2053 proc populate_fetch_menu
{m
} {
2054 global all_remotes repo_config
2056 foreach r
$all_remotes {
2058 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2059 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
2064 set fd
[open
[gitdir remotes
$r] r
]
2065 while {[gets
$fd n
] >= 0} {
2066 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
2077 -label "Fetch from $r..." \
2078 -command [list fetch_from
$r] \
2084 proc populate_push_menu
{m
} {
2085 global all_remotes repo_config
2087 foreach r
$all_remotes {
2089 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2090 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
2095 set fd
[open
[gitdir remotes
$r] r
]
2096 while {[gets
$fd n
] >= 0} {
2097 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
2108 -label "Push to $r..." \
2109 -command [list push_to
$r] \
2115 proc populate_pull_menu
{m
} {
2116 global repo_config all_remotes disable_on_lock
2118 foreach remote
$all_remotes {
2120 if {[array get repo_config remote.
$remote.url
] ne
{}} {
2121 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
2122 foreach line
$repo_config(remote.
$remote.fetch
) {
2123 if {[regexp
{^
([^
:]+):} $line line rb
]} {
2130 set fd
[open
[gitdir remotes
$remote] r
]
2131 while {[gets
$fd line
] >= 0} {
2132 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
2140 foreach rb
$rb_list {
2141 regsub ^refs
/heads
/ $rb {} rb_short
2143 -label "Branch $rb_short from $remote..." \
2144 -command [list pull_remote
$remote $rb] \
2146 lappend disable_on_lock \
2147 [list
$m entryconf
[$m index last
] -state]
2152 ######################################################################
2157 #define mask_width 14
2158 #define mask_height 15
2159 static unsigned char mask_bits
[] = {
2160 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2161 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2162 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2165 image create bitmap file_plain
-background white
-foreground black
-data {
2166 #define plain_width 14
2167 #define plain_height 15
2168 static unsigned char plain_bits
[] = {
2169 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2170 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2171 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2172 } -maskdata $filemask
2174 image create bitmap file_mod
-background white
-foreground blue
-data {
2175 #define mod_width 14
2176 #define mod_height 15
2177 static unsigned char mod_bits
[] = {
2178 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2179 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2180 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2181 } -maskdata $filemask
2183 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
2184 #define file_fulltick_width 14
2185 #define file_fulltick_height 15
2186 static unsigned char file_fulltick_bits
[] = {
2187 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2188 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2189 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2190 } -maskdata $filemask
2192 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
2193 #define parttick_width 14
2194 #define parttick_height 15
2195 static unsigned char parttick_bits
[] = {
2196 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2197 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2198 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2199 } -maskdata $filemask
2201 image create bitmap file_question
-background white
-foreground black
-data {
2202 #define file_question_width 14
2203 #define file_question_height 15
2204 static unsigned char file_question_bits
[] = {
2205 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2206 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2207 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2208 } -maskdata $filemask
2210 image create bitmap file_removed
-background white
-foreground red
-data {
2211 #define file_removed_width 14
2212 #define file_removed_height 15
2213 static unsigned char file_removed_bits
[] = {
2214 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2215 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2216 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2217 } -maskdata $filemask
2219 image create bitmap file_merge
-background white
-foreground blue
-data {
2220 #define file_merge_width 14
2221 #define file_merge_height 15
2222 static unsigned char file_merge_bits
[] = {
2223 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2224 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2225 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2226 } -maskdata $filemask
2228 set ui_index .vpane.files.index.list
2229 set ui_workdir .vpane.files.workdir.list
2231 set all_icons
(_
$ui_index) file_plain
2232 set all_icons
(A
$ui_index) file_fulltick
2233 set all_icons
(M
$ui_index) file_fulltick
2234 set all_icons
(D
$ui_index) file_removed
2235 set all_icons
(U
$ui_index) file_merge
2237 set all_icons
(_
$ui_workdir) file_plain
2238 set all_icons
(M
$ui_workdir) file_mod
2239 set all_icons
(D
$ui_workdir) file_question
2240 set all_icons
(O
$ui_workdir) file_plain
2242 set max_status_desc
0
2246 {_M
"Modified, not staged"}
2247 {M_
"Staged for commit"}
2248 {MM
"Portions staged for commit"}
2249 {MD
"Staged for commit, missing"}
2251 {_O
"Untracked, not staged"}
2252 {A_
"Staged for commit"}
2253 {AM
"Portions staged for commit"}
2254 {AD
"Staged for commit, missing"}
2257 {D_
"Staged for removal"}
2258 {DO
"Staged for removal, still present"}
2260 {U_
"Requires merge resolution"}
2261 {UM
"Requires merge resolution"}
2262 {UD
"Requires merge resolution"}
2264 if {$max_status_desc < [string length
[lindex
$i 1]]} {
2265 set max_status_desc
[string length
[lindex
$i 1]]
2267 set all_descs
([lindex
$i 0]) [lindex
$i 1]
2271 ######################################################################
2276 global tcl_platform tk_library
2277 if {[tk windowingsystem
] eq
{aqua
}} {
2283 proc is_Windows
{} {
2285 if {$tcl_platform(platform
) eq
{windows
}} {
2291 proc bind_button3
{w cmd
} {
2292 bind $w <Any-Button-3
> $cmd
2294 bind $w <Control-Button-1
> $cmd
2298 proc incr_font_size
{font
{amt
1}} {
2299 set sz
[font configure
$font -size]
2301 font configure
$font -size $sz
2302 font configure
${font}bold
-size $sz
2305 proc hook_failed_popup
{hook msg
} {
2310 label
$w.m.l1
-text "$hook hook failed:" \
2315 -background white
-borderwidth 1 \
2317 -width 80 -height 10 \
2319 -yscrollcommand [list
$w.m.sby
set]
2321 -text {You must correct the above errors before committing.
} \
2325 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2326 pack
$w.m.l1
-side top
-fill x
2327 pack
$w.m.l2
-side bottom
-fill x
2328 pack
$w.m.sby
-side right
-fill y
2329 pack
$w.m.t
-side left
-fill both
-expand 1
2330 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2332 $w.m.t insert
1.0 $msg
2333 $w.m.t conf
-state disabled
2335 button
$w.ok
-text OK \
2338 -command "destroy $w"
2339 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2341 bind $w <Visibility
> "grab $w; focus $w"
2342 bind $w <Key-Return
> "destroy $w"
2343 wm title
$w "[appname] ([reponame]): error"
2347 set next_console_id
0
2349 proc new_console
{short_title long_title
} {
2350 global next_console_id console_data
2351 set w .console
[incr next_console_id
]
2352 set console_data
($w) [list
$short_title $long_title]
2353 return [console_init
$w]
2356 proc console_init
{w
} {
2357 global console_cr console_data M1B
2359 set console_cr
($w) 1.0
2362 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
2367 -background white
-borderwidth 1 \
2369 -width 80 -height 10 \
2372 -yscrollcommand [list
$w.m.sby
set]
2373 label
$w.m.s
-text {Working... please
wait...
} \
2377 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2378 pack
$w.m.l1
-side top
-fill x
2379 pack
$w.m.s
-side bottom
-fill x
2380 pack
$w.m.sby
-side right
-fill y
2381 pack
$w.m.t
-side left
-fill both
-expand 1
2382 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2384 menu
$w.ctxm
-tearoff 0
2385 $w.ctxm add
command -label "Copy" \
2387 -command "tk_textCopy $w.m.t"
2388 $w.ctxm add
command -label "Select All" \
2390 -command "$w.m.t tag add sel 0.0 end"
2391 $w.ctxm add
command -label "Copy All" \
2394 $w.m.t tag add sel 0.0 end
2396 $w.m.t tag remove sel 0.0 end
2399 button
$w.ok
-text {Close
} \
2402 -command "destroy $w"
2403 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2405 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
2406 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2407 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2408 bind $w <Visibility
> "focus $w"
2409 wm title
$w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2413 proc console_exec
{w cmd
{after
{}}} {
2414 # -- Windows tosses the enviroment when we exec our child.
2415 # But most users need that so we have to relogin. :-(
2418 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
2421 # -- Tcl won't let us redirect both stdout and stderr to
2422 # the same pipe. So pass it through cat...
2424 set cmd
[concat |
$cmd |
& cat]
2426 set fd_f
[open
$cmd r
]
2427 fconfigure
$fd_f -blocking 0 -translation binary
2428 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
2431 proc console_read
{w fd after
} {
2432 global console_cr console_data
2436 if {![winfo exists
$w]} {console_init
$w}
2437 $w.m.t conf
-state normal
2439 set n
[string length
$buf]
2441 set cr
[string first
"\r" $buf $c]
2442 set lf
[string first
"\n" $buf $c]
2443 if {$cr < 0} {set cr
[expr {$n + 1}]}
2444 if {$lf < 0} {set lf
[expr {$n + 1}]}
2447 $w.m.t insert end
[string range
$buf $c $lf]
2448 set console_cr
($w) [$w.m.t index
{end
-1c}]
2452 $w.m.t delete
$console_cr($w) end
2453 $w.m.t insert end
"\n"
2454 $w.m.t insert end
[string range
$buf $c $cr]
2459 $w.m.t conf
-state disabled
2463 fconfigure
$fd -blocking 1
2465 if {[catch
{close
$fd}]} {
2466 if {![winfo exists
$w]} {console_init
$w}
2467 $w.m.s conf
-background red
-text {Error
: Command Failed
}
2468 $w.ok conf
-state normal
2470 } elseif
{[winfo exists
$w]} {
2471 $w.m.s conf
-background green
-text {Success
}
2472 $w.ok conf
-state normal
2475 array
unset console_cr
$w
2476 array
unset console_data
$w
2478 uplevel
#0 $after $ok
2482 fconfigure
$fd -blocking 0
2485 ######################################################################
2489 set starting_gitk_msg
{Starting gitk... please
wait...
}
2491 proc do_gitk
{revs
} {
2492 global ui_status_value starting_gitk_msg
2500 set cmd
"sh -c \"exec $cmd\""
2504 if {[catch
{eval exec $cmd} err
]} {
2505 error_popup
"Failed to start gitk:\n\n$err"
2507 set ui_status_value
$starting_gitk_msg
2509 if {$ui_status_value eq
$starting_gitk_msg} {
2510 set ui_status_value
{Ready.
}
2517 set w
[new_console
{gc
} {Compressing the object database
}]
2518 console_exec
$w {git gc
}
2521 proc do_fsck_objects
{} {
2522 set w
[new_console
{fsck-objects
} \
2523 {Verifying the object database with fsck-objects
}]
2524 set cmd
[list git fsck-objects
]
2527 lappend cmd
--strict
2528 console_exec
$w $cmd
2534 global ui_comm is_quitting repo_config commit_type
2536 if {$is_quitting} return
2539 # -- Stash our current commit buffer.
2541 set save
[gitdir GITGUI_MSG
]
2542 set msg
[string trim
[$ui_comm get
0.0 end
]]
2543 if {![string match amend
* $commit_type]
2544 && [$ui_comm edit modified
]
2547 set fd
[open
$save w
]
2548 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
2552 catch
{file delete
$save}
2555 # -- Stash our current window geometry into this repository.
2557 set cfg_geometry
[list
]
2558 lappend cfg_geometry
[wm geometry .
]
2559 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
2560 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
2561 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2564 if {$cfg_geometry ne
$rc_geometry} {
2565 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2572 rescan
{set ui_status_value
{Ready.
}}
2575 proc unstage_helper
{txt paths
} {
2576 global file_states current_diff
2578 if {![lock_index begin-update
]} return
2582 foreach path
$paths {
2583 switch
-glob -- [lindex
$file_states($path) 0] {
2587 lappend pathList
$path
2588 if {$path eq
$current_diff} {
2589 set after
{reshow_diff
;}
2594 if {$pathList eq
{}} {
2600 [concat
$after {set ui_status_value
{Ready.
}}]
2604 proc do_unstage_selection
{} {
2605 global current_diff selected_paths
2607 if {[array size selected_paths
] > 0} {
2609 {Unstaging selected files from commit
} \
2610 [array names selected_paths
]
2611 } elseif
{$current_diff ne
{}} {
2613 "Unstaging [short_path $current_diff] from commit" \
2614 [list
$current_diff]
2618 proc add_helper
{txt paths
} {
2619 global file_states current_diff
2621 if {![lock_index begin-update
]} return
2625 foreach path
$paths {
2626 switch
-glob -- [lindex
$file_states($path) 0] {
2631 lappend pathList
$path
2632 if {$path eq
$current_diff} {
2633 set after
{reshow_diff
;}
2638 if {$pathList eq
{}} {
2644 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2648 proc do_add_selection
{} {
2649 global current_diff selected_paths
2651 if {[array size selected_paths
] > 0} {
2653 {Adding selected files
} \
2654 [array names selected_paths
]
2655 } elseif
{$current_diff ne
{}} {
2657 "Adding [short_path $current_diff]" \
2658 [list
$current_diff]
2662 proc do_add_all
{} {
2666 foreach path
[array names file_states
] {
2667 switch
-glob -- [lindex
$file_states($path) 0] {
2670 ?D
{lappend paths
$path}
2673 add_helper
{Adding all changed files
} $paths
2676 proc revert_helper
{txt paths
} {
2677 global file_states current_diff
2679 if {![lock_index begin-update
]} return
2683 foreach path
$paths {
2684 switch
-glob -- [lindex
$file_states($path) 0] {
2688 lappend pathList
$path
2689 if {$path eq
$current_diff} {
2690 set after
{reshow_diff
;}
2696 set n
[llength
$pathList]
2700 } elseif
{$n == 1} {
2701 set s
"[short_path [lindex $pathList]]"
2703 set s
"these $n files"
2706 set reply
[tk_dialog \
2708 "[appname] ([reponame])" \
2709 "Revert changes in $s?
2711 Any unadded changes will be permanently lost by the revert." \
2721 [concat
$after {set ui_status_value
{Ready.
}}]
2727 proc do_revert_selection
{} {
2728 global current_diff selected_paths
2730 if {[array size selected_paths
] > 0} {
2732 {Reverting selected files
} \
2733 [array names selected_paths
]
2734 } elseif
{$current_diff ne
{}} {
2736 "Reverting [short_path $current_diff]" \
2737 [list
$current_diff]
2741 proc do_signoff
{} {
2744 set me
[committer_ident
]
2745 if {$me eq
{}} return
2747 set sob
"Signed-off-by: $me"
2748 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2749 if {$last ne
$sob} {
2750 $ui_comm edit separator
2752 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2753 $ui_comm insert end
"\n"
2755 $ui_comm insert end
"\n$sob"
2756 $ui_comm edit separator
2761 proc do_select_commit_type
{} {
2762 global commit_type selected_commit_type
2764 if {$selected_commit_type eq
{new
}
2765 && [string match amend
* $commit_type]} {
2767 } elseif
{$selected_commit_type eq
{amend
}
2768 && ![string match amend
* $commit_type]} {
2771 # The amend request was rejected...
2773 if {![string match amend
* $commit_type]} {
2774 set selected_commit_type new
2784 global appvers copyright
2785 global tcl_patchLevel tk_patchLevel
2789 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2791 label
$w.header
-text "About [appname]" \
2793 pack
$w.header
-side top
-fill x
2796 button
$w.buttons.close
-text {Close
} \
2798 -command [list destroy
$w]
2799 pack
$w.buttons.close
-side right
2800 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2803 -text "[appname] - a commit creation tool for Git.
2811 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
2814 append v
"[appname] version $appvers\n"
2815 append v
"[exec git version]\n"
2817 if {$tcl_patchLevel eq
$tk_patchLevel} {
2818 append v
"Tcl/Tk version $tcl_patchLevel"
2820 append v
"Tcl version $tcl_patchLevel"
2821 append v
", Tk version $tk_patchLevel"
2832 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
2834 menu
$w.ctxm
-tearoff 0
2835 $w.ctxm add
command \
2840 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2843 bind $w <Visibility
> "grab $w; focus $w"
2844 bind $w <Key-Escape
> "destroy $w"
2845 bind_button3
$w.vers
"tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2846 wm title
$w "About [appname]"
2850 proc do_options
{} {
2851 global repo_config global_config font_descs
2852 global repo_config_new global_config_new
2854 array
unset repo_config_new
2855 array
unset global_config_new
2856 foreach name
[array names repo_config
] {
2857 set repo_config_new
($name) $repo_config($name)
2860 foreach name
[array names repo_config
] {
2862 gui.diffcontext
{continue}
2864 set repo_config_new
($name) $repo_config($name)
2866 foreach name
[array names global_config
] {
2867 set global_config_new
($name) $global_config($name)
2870 set w .options_editor
2872 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2874 label
$w.header
-text "[appname] Options" \
2876 pack
$w.header
-side top
-fill x
2879 button
$w.buttons.restore
-text {Restore Defaults
} \
2881 -command do_restore_defaults
2882 pack
$w.buttons.restore
-side left
2883 button
$w.buttons.save
-text Save \
2885 -command [list do_save_config
$w]
2886 pack
$w.buttons.save
-side right
2887 button
$w.buttons.cancel
-text {Cancel
} \
2889 -command [list destroy
$w]
2890 pack
$w.buttons.cancel
-side right
-padx 5
2891 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2893 labelframe
$w.repo
-text "[reponame] Repository" \
2895 -relief raised
-borderwidth 2
2896 labelframe
$w.global
-text {Global
(All Repositories
)} \
2898 -relief raised
-borderwidth 2
2899 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
2900 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
2903 {b pullsummary
{Show Pull Summary
}}
2904 {b trustmtime
{Trust File Modification Timestamps
}}
2905 {i diffcontext
{Number of Diff Context Lines
}}
2907 set type [lindex
$option 0]
2908 set name
[lindex
$option 1]
2909 set text
[lindex
$option 2]
2910 foreach f
{repo global
} {
2913 checkbutton
$w.
$f.
$name -text $text \
2914 -variable ${f}_config_new
(gui.
$name) \
2918 pack
$w.
$f.
$name -side top
-anchor w
2922 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
2923 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
2924 spinbox
$w.
$f.
$name.v \
2925 -textvariable ${f}_config_new
(gui.
$name) \
2926 -from 1 -to 99 -increment 1 \
2929 pack
$w.
$f.
$name.v
-side right
-anchor e
2930 pack
$w.
$f.
$name -side top
-anchor w
-fill x
2936 set all_fonts
[lsort
[font families
]]
2937 foreach option
$font_descs {
2938 set name
[lindex
$option 0]
2939 set font
[lindex
$option 1]
2940 set text
[lindex
$option 2]
2942 set global_config_new
(gui.
$font^^family
) \
2943 [font configure
$font -family]
2944 set global_config_new
(gui.
$font^^size
) \
2945 [font configure
$font -size]
2947 frame
$w.global.
$name
2948 label
$w.global.
$name.l
-text "$text:" -font font_ui
2949 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
2950 eval tk_optionMenu
$w.global.
$name.family \
2951 global_config_new
(gui.
$font^^family
) \
2953 spinbox
$w.global.
$name.size \
2954 -textvariable global_config_new
(gui.
$font^^size
) \
2955 -from 2 -to 80 -increment 1 \
2958 pack
$w.global.
$name.size
-side right
-anchor e
2959 pack
$w.global.
$name.family
-side right
-anchor e
2960 pack
$w.global.
$name -side top
-anchor w
-fill x
2963 bind $w <Visibility
> "grab $w; focus $w"
2964 bind $w <Key-Escape
> "destroy $w"
2965 wm title
$w "[appname] ([reponame]): Options"
2969 proc do_restore_defaults
{} {
2970 global font_descs default_config repo_config
2971 global repo_config_new global_config_new
2973 foreach name
[array names default_config
] {
2974 set repo_config_new
($name) $default_config($name)
2975 set global_config_new
($name) $default_config($name)
2978 foreach option
$font_descs {
2979 set name
[lindex
$option 0]
2980 set repo_config
(gui.
$name) $default_config(gui.
$name)
2984 foreach option
$font_descs {
2985 set name
[lindex
$option 0]
2986 set font
[lindex
$option 1]
2987 set global_config_new
(gui.
$font^^family
) \
2988 [font configure
$font -family]
2989 set global_config_new
(gui.
$font^^size
) \
2990 [font configure
$font -size]
2994 proc do_save_config
{w
} {
2995 if {[catch
{save_config
} err
]} {
2996 error_popup
"Failed to completely save options:\n\n$err"
3002 proc do_windows_shortcut
{} {
3006 set desktop
[exec cygpath \
3014 set fn
[tk_getSaveFile \
3016 -title "[appname] ([reponame]): Create Desktop Icon" \
3017 -initialdir $desktop \
3018 -initialfile "Git [reponame].bat"]
3022 set sh
[exec cygpath \
3026 set me
[exec cygpath \
3030 set gd
[exec cygpath \
3034 set gw
[exec cygpath \
3037 [file dirname [gitdir
]]]
3038 regsub
-all ' $me "'\\''" me
3039 regsub -all ' $gd "'\\''" gd
3040 puts $fd "@ECHO Entering $gw"
3041 puts $fd "@ECHO Starting git-gui... please wait..."
3042 puts -nonewline $fd "@\"$sh\" --login -c \""
3043 puts -nonewline $fd "GIT_DIR='$gd'"
3044 puts -nonewline $fd " '$me'"
3048 error_popup "Cannot write script:\n\n$err"
3053 proc do_macosx_app {} {
3056 set fn [tk_getSaveFile \
3058 -title "[appname] ([reponame]): Create Desktop Icon" \
3059 -initialdir [file join $env(HOME) Desktop] \
3060 -initialfile "Git [reponame].app"]
3063 set Contents [file join $fn Contents]
3064 set MacOS [file join $Contents MacOS]
3065 set exe [file join $MacOS git-gui]
3069 set fd [open [file join $Contents Info.plist] w]
3070 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3071 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3072 <plist version="1.0">
3074 <key>CFBundleDevelopmentRegion</key>
3075 <string>English</string>
3076 <key>CFBundleExecutable</key>
3077 <string>git-gui</string>
3078 <key>CFBundleIdentifier</key>
3079 <string>org.spearce.git-gui</string>
3080 <key>CFBundleInfoDictionaryVersion</key>
3081 <string>6.0</string>
3082 <key>CFBundlePackageType</key>
3083 <string>APPL</string>
3084 <key>CFBundleSignature</key>
3085 <string>????</string>
3086 <key>CFBundleVersion</key>
3087 <string>1.0</string>
3088 <key>NSPrincipalClass</key>
3089 <string>NSApplication</string>
3094 set fd [open $exe w]
3095 set gd [file normalize [gitdir]]
3096 set ep [file normalize [exec git --exec-path]]
3097 regsub -all ' $gd "'\\''" gd
3098 regsub
-all ' $ep "'\\''" ep
3099 puts $fd "#!/bin/sh"
3100 foreach name
[array names env
] {
3101 if {[string match GIT_
* $name]} {
3102 regsub
-all ' $env($name) "'\\''" v
3103 puts $fd "export $name='$v'"
3106 puts $fd "export PATH
='$ep':\
$PATH"
3107 puts $fd "export GIT_DIR
='$gd'"
3108 puts $fd "exec [file normalize
$argv0]"
3111 file attributes $exe -permissions u+x,g+x,o+x
3113 error_popup "Cannot
write icon
:\n\n$err"
3118 proc toggle_or_diff {w x y} {
3119 global file_states file_lists current_diff ui_index ui_workdir
3120 global last_clicked selected_paths
3122 set pos [split [$w index @$x,$y] .]
3123 set lno [lindex $pos 0]
3124 set col [lindex $pos 1]
3125 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3131 set last_clicked [list $w $lno]
3132 array unset selected_paths
3133 $ui_index tag remove in_sel 0.0 end
3134 $ui_workdir tag remove in_sel 0.0 end
3137 if {$current_diff eq $path} {
3138 set after {reshow_diff;}
3142 if {$w eq $ui_index} {
3144 "Unstaging
[short_path
$path] from commit
" \
3146 [concat $after {set ui_status_value {Ready.}}]
3147 } elseif {$w eq $ui_workdir} {
3149 "Adding
[short_path
$path]" \
3151 [concat $after {set ui_status_value {Ready.}}]
3154 show_diff $path $w $lno
3158 proc add_one_to_selection {w x y} {
3159 global file_lists last_clicked selected_paths
3161 set lno [lindex [split [$w index @$x,$y] .] 0]
3162 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3168 if {$last_clicked ne {}
3169 && [lindex $last_clicked 0] ne $w} {
3170 array unset selected_paths
3171 [lindex $last_clicked 0] tag remove in_sel 0.0 end
3174 set last_clicked [list $w $lno]
3175 if {[catch {set in_sel $selected_paths($path)}]} {
3179 unset selected_paths($path)
3180 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3182 set selected_paths($path) 1
3183 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3187 proc add_range_to_selection {w x y} {
3188 global file_lists last_clicked selected_paths
3190 if {[lindex $last_clicked 0] ne $w} {
3191 toggle_or_diff $w $x $y
3195 set lno [lindex [split [$w index @$x,$y] .] 0]
3196 set lc [lindex $last_clicked 1]
3205 foreach path [lrange $file_lists($w) \
3206 [expr {$begin - 1}] \
3207 [expr {$end - 1}]] {
3208 set selected_paths($path) 1
3210 $w tag add in_sel $begin.0 [expr {$end + 1}].0
3213 ######################################################################
3217 set cursor_ptr arrow
3218 font create font_diff -family Courier -size 10
3222 eval font configure font_ui [font actual [.dummy cget -font]]
3226 font create font_uibold
3227 font create font_diffbold
3232 } elseif {[is_MacOSX]} {
3240 proc apply_config {} {
3241 global repo_config font_descs
3243 foreach option $font_descs {
3244 set name [lindex $option 0]
3245 set font [lindex $option 1]
3247 foreach {cn cv} $repo_config(gui.$name) {
3248 font configure $font $cn $cv
3251 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
3253 foreach {cn cv} [font configure $font] {
3254 font configure ${font}bold $cn $cv
3256 font configure ${font}bold -weight bold
3260 set default_config(gui.trustmtime) false
3261 set default_config(gui.pullsummary) true
3262 set default_config(gui.diffcontext) 5
3263 set default_config(gui.fontui) [font configure font_ui]
3264 set default_config(gui.fontdiff) [font configure font_diff]
3266 {fontui font_ui {Main Font}}
3267 {fontdiff font_diff {Diff/Console Font}}
3272 ######################################################################
3278 menu .mbar -tearoff 0
3279 .mbar add cascade -label Repository -menu .mbar.repository
3280 .mbar add cascade -label Edit -menu .mbar.edit
3281 if {!$single_commit} {
3282 .mbar add cascade -label Branch -menu .mbar.branch
3284 .mbar add cascade -label Commit -menu .mbar.commit
3285 if {!$single_commit} {
3286 .mbar add cascade -label Fetch -menu .mbar.fetch
3287 .mbar add cascade -label Pull -menu .mbar.pull
3288 .mbar add cascade -label Push -menu .mbar.push
3290 . configure -menu .mbar
3292 # -- Repository Menu
3294 menu .mbar.repository
3295 .mbar.repository add command \
3296 -label {Visualize Current Branch} \
3297 -command {do_gitk {}} \
3300 .mbar.repository add command \
3301 -label {Visualize All Branches} \
3302 -command {do_gitk {--all}} \
3305 .mbar.repository add separator
3307 if {!$single_commit} {
3308 .mbar.repository add command -label {Compress Database} \
3312 .mbar.repository add command -label {Verify Database} \
3313 -command do_fsck_objects \
3316 .mbar.repository add separator
3319 .mbar.repository add command \
3320 -label {Create Desktop Icon} \
3321 -command do_windows_shortcut \
3323 } elseif {[is_MacOSX]} {
3324 .mbar.repository add command \
3325 -label {Create Desktop Icon} \
3326 -command do_macosx_app \
3331 .mbar.repository add command -label Quit \
3333 -accelerator $M1T-Q \
3339 .mbar.edit add command -label Undo \
3340 -command {catch {[focus] edit undo}} \
3341 -accelerator $M1T-Z \
3343 .mbar.edit add command -label Redo \
3344 -command {catch {[focus] edit redo}} \
3345 -accelerator $M1T-Y \
3347 .mbar.edit add separator
3348 .mbar.edit add command -label Cut \
3349 -command {catch {tk_textCut [focus]}} \
3350 -accelerator $M1T-X \
3352 .mbar.edit add command -label Copy \
3353 -command {catch {tk_textCopy [focus]}} \
3354 -accelerator $M1T-C \
3356 .mbar.edit add command -label Paste \
3357 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3358 -accelerator $M1T-V \
3360 .mbar.edit add command -label Delete \
3361 -command {catch {[focus] delete sel.first sel.last}} \
3364 .mbar.edit add separator
3365 .mbar.edit add command -label {Select All} \
3366 -command {catch {[focus] tag add sel 0.0 end}} \
3367 -accelerator $M1T-A \
3372 if {!$single_commit} {
3375 .mbar.branch add command -label {Create...} \
3376 -command do_create_branch \
3377 -accelerator $M1T-N \
3379 lappend disable_on_lock [list .mbar.branch entryconf \
3380 [.mbar.branch index last] -state]
3382 .mbar.branch add command -label {Delete...} \
3383 -command do_delete_branch \
3385 lappend disable_on_lock [list .mbar.branch entryconf \
3386 [.mbar.branch index last] -state]
3393 .mbar.commit add radiobutton \
3394 -label {New Commit} \
3395 -command do_select_commit_type \
3396 -variable selected_commit_type \
3399 lappend disable_on_lock \
3400 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3402 .mbar.commit add radiobutton \
3403 -label {Amend Last Commit} \
3404 -command do_select_commit_type \
3405 -variable selected_commit_type \
3408 lappend disable_on_lock \
3409 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3411 .mbar.commit add separator
3413 .mbar.commit add command -label Rescan \
3414 -command do_rescan \
3417 lappend disable_on_lock \
3418 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3420 .mbar.commit add command -label {Add To Commit} \
3421 -command do_add_selection \
3423 lappend disable_on_lock \
3424 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3426 .mbar.commit add command -label {Add All To Commit} \
3427 -command do_add_all \
3428 -accelerator $M1T-I \
3430 lappend disable_on_lock \
3431 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3433 .mbar.commit add command -label {Unstage From Commit} \
3434 -command do_unstage_selection \
3436 lappend disable_on_lock \
3437 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3439 .mbar.commit add command -label {Revert Changes} \
3440 -command do_revert_selection \
3442 lappend disable_on_lock \
3443 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3445 .mbar.commit add separator
3447 .mbar.commit add command -label {Sign Off} \
3448 -command do_signoff \
3449 -accelerator $M1T-S \
3452 .mbar.commit add command -label Commit \
3453 -command do_commit \
3454 -accelerator $M1T-Return \
3456 lappend disable_on_lock \
3457 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3459 # -- Transport menus
3461 if {!$single_commit} {
3468 # -- Apple Menu (Mac OS X only)
3470 .mbar add cascade -label Apple -menu .mbar.apple
3473 .mbar.apple add command -label "About
[appname
]" \
3476 .mbar.apple add command -label "[appname
] Options...
" \
3477 -command do_options \
3482 .mbar.edit add separator
3483 .mbar.edit add command -label {Options...} \
3484 -command do_options \
3489 if {[file exists /usr/local/miga/lib/gui-miga]
3490 && [file exists .pvcsrc]} {
3492 global ui_status_value
3493 if {![lock_index update]} return
3494 set cmd [list sh --login -c "/usr
/local
/miga
/lib
/gui-miga
\"[pwd]\""]
3495 set miga_fd [open "|
$cmd" r]
3496 fconfigure $miga_fd -blocking 0
3497 fileevent $miga_fd readable [list miga_done $miga_fd]
3498 set ui_status_value {Running miga...}
3500 proc miga_done {fd} {
3505 rescan [list set ui_status_value {Ready.}]
3508 .mbar add cascade -label Tools -menu .mbar.tools
3510 .mbar.tools add command -label "Migrate
" \
3513 lappend disable_on_lock \
3514 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3519 .mbar add cascade -label Help -menu .mbar.help
3522 .mbar.help add command -label "About
[appname
]" \
3534 -text {Current Branch:} \
3539 -textvariable current_branch \
3543 pack .branch.l1 -side left
3544 pack .branch.cb -side left -fill x
3545 pack .branch -side top -fill x
3547 # -- Main Window Layout
3549 panedwindow .vpane -orient vertical
3550 panedwindow .vpane.files -orient horizontal
3551 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3552 pack .vpane -anchor n -side top -fill both -expand 1
3554 # -- Index File List
3556 frame .vpane.files.index -height 100 -width 400
3557 label .vpane.files.index.title -text {Changes To Be Committed} \
3560 text $ui_index -background white -borderwidth 0 \
3561 -width 40 -height 10 \
3563 -cursor $cursor_ptr \
3564 -yscrollcommand {.vpane.files.index.sb set} \
3566 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3567 pack .vpane.files.index.title -side top -fill x
3568 pack .vpane.files.index.sb -side right -fill y
3569 pack $ui_index -side left -fill both -expand 1
3570 .vpane.files add .vpane.files.index -sticky nsew
3572 # -- Working Directory File List
3574 frame .vpane.files.workdir -height 100 -width 100
3575 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3578 text $ui_workdir -background white -borderwidth 0 \
3579 -width 40 -height 10 \
3581 -cursor $cursor_ptr \
3582 -yscrollcommand {.vpane.files.workdir.sb set} \
3584 scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
3585 pack .vpane.files.workdir.title -side top -fill x
3586 pack .vpane.files.workdir.sb -side right -fill y
3587 pack $ui_workdir -side left -fill both -expand 1
3588 .vpane.files add .vpane.files.workdir -sticky nsew
3590 foreach i [list $ui_index $ui_workdir] {
3591 $i tag conf in_diff -font font_uibold
3592 $i tag conf in_sel \
3593 -background [$i cget -foreground] \
3594 -foreground [$i cget -background]
3598 # -- Diff and Commit Area
3600 frame .vpane.lower -height 300 -width 400
3601 frame .vpane.lower.commarea
3602 frame .vpane.lower.diff -relief sunken -borderwidth 1
3603 pack .vpane.lower.commarea -side top -fill x
3604 pack .vpane.lower.diff -side bottom -fill both -expand 1
3605 .vpane add .vpane.lower -stick nsew
3607 # -- Commit Area Buttons
3609 frame .vpane.lower.commarea.buttons
3610 label .vpane.lower.commarea.buttons.l -text {} \
3614 pack .vpane.lower.commarea.buttons.l -side top -fill x
3615 pack .vpane.lower.commarea.buttons -side left -fill y
3617 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3618 -command do_rescan \
3620 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3621 lappend disable_on_lock \
3622 {.vpane.lower.commarea.buttons.rescan conf -state}
3624 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3625 -command do_add_all \
3627 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3628 lappend disable_on_lock \
3629 {.vpane.lower.commarea.buttons.incall conf -state}
3631 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3632 -command do_signoff \
3634 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3636 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3637 -command do_commit \
3639 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3640 lappend disable_on_lock \
3641 {.vpane.lower.commarea.buttons.commit conf -state}
3643 # -- Commit Message Buffer
3645 frame .vpane.lower.commarea.buffer
3646 frame .vpane.lower.commarea.buffer.header
3647 set ui_comm .vpane.lower.commarea.buffer.t
3648 set ui_coml .vpane.lower.commarea.buffer.header.l
3649 radiobutton .vpane.lower.commarea.buffer.header.new \
3650 -text {New Commit} \
3651 -command do_select_commit_type \
3652 -variable selected_commit_type \
3655 lappend disable_on_lock \
3656 [list .vpane.lower.commarea.buffer.header.new conf -state]
3657 radiobutton .vpane.lower.commarea.buffer.header.amend \
3658 -text {Amend Last Commit} \
3659 -command do_select_commit_type \
3660 -variable selected_commit_type \
3663 lappend disable_on_lock \
3664 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3669 proc trace_commit_type {varname args} {
3670 global ui_coml commit_type
3671 switch -glob -- $commit_type {
3672 initial {set txt {Initial Commit Message:}}
3673 amend {set txt {Amended Commit Message:}}
3674 amend-initial {set txt {Amended Initial Commit Message:}}
3675 amend-merge {set txt {Amended Merge Commit Message:}}
3676 merge {set txt {Merge Commit Message:}}
3677 * {set txt {Commit Message:}}
3679 $ui_coml conf -text $txt
3681 trace add variable commit_type write trace_commit_type
3682 pack $ui_coml -side left -fill x
3683 pack .vpane.lower.commarea.buffer.header.amend -side right
3684 pack .vpane.lower.commarea.buffer.header.new -side right
3686 text $ui_comm -background white -borderwidth 1 \
3689 -autoseparators true \
3691 -width 75 -height 9 -wrap none \
3693 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3694 scrollbar .vpane.lower.commarea.buffer.sby \
3695 -command [list $ui_comm yview]
3696 pack .vpane.lower.commarea.buffer.header -side top -fill x
3697 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3698 pack $ui_comm -side left -fill y
3699 pack .vpane.lower.commarea.buffer -side left -fill y
3701 # -- Commit Message Buffer Context Menu
3703 set ctxm .vpane.lower.commarea.buffer.ctxm
3704 menu $ctxm -tearoff 0
3708 -command {tk_textCut $ui_comm}
3712 -command {tk_textCopy $ui_comm}
3716 -command {tk_textPaste $ui_comm}
3720 -command {$ui_comm delete sel.first sel.last}
3723 -label {Select All} \
3725 -command {$ui_comm tag add sel 0.0 end}
3730 $ui_comm tag add sel 0.0 end
3731 tk_textCopy $ui_comm
3732 $ui_comm tag remove sel 0.0 end
3739 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
3744 set diff_actions [list]
3745 proc trace_current_diff {varname args} {
3746 global current_diff diff_actions file_states
3747 if {$current_diff eq {}} {
3754 set s [mapdesc [lindex $file_states($p) 0] $p]
3756 set p [escape_path $p]
3760 .vpane.lower.diff.header.status configure -text $s
3761 .vpane.lower.diff.header.file configure -text $f
3762 .vpane.lower.diff.header.path configure -text $p
3763 foreach w $diff_actions {
3767 trace add variable current_diff write trace_current_diff
3769 frame .vpane.lower.diff.header -background orange
3770 label .vpane.lower.diff.header.status \
3771 -background orange \
3772 -width $max_status_desc \
3776 label .vpane.lower.diff.header.file \
3777 -background orange \
3781 label .vpane.lower.diff.header.path \
3782 -background orange \
3786 pack .vpane.lower.diff.header.status -side left
3787 pack .vpane.lower.diff.header.file -side left
3788 pack .vpane.lower.diff.header.path -fill x
3789 set ctxm .vpane.lower.diff.header.ctxm
3790 menu $ctxm -tearoff 0
3801 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3802 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
3806 frame .vpane.lower.diff.body
3807 set ui_diff .vpane.lower.diff.body.t
3808 text $ui_diff -background white -borderwidth 0 \
3809 -width 80 -height 15 -wrap none \
3811 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3812 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3814 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3815 -command [list $ui_diff xview]
3816 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3817 -command [list $ui_diff yview]
3818 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3819 pack .vpane.lower.diff.body.sby -side right -fill y
3820 pack $ui_diff -side left -fill both -expand 1
3821 pack .vpane.lower.diff.header -side top -fill x
3822 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3824 $ui_diff tag conf d_@ -font font_diffbold
3825 $ui_diff tag conf d_+ -foreground blue
3826 $ui_diff tag conf d_- -foreground red
3827 $ui_diff tag conf d_++ -foreground {#00a000}
3828 $ui_diff tag conf d_-- -foreground {#a000a0}
3829 $ui_diff tag conf d_+- \
3831 -background {light goldenrod yellow}
3832 $ui_diff tag conf d_-+ \
3836 # -- Diff Body Context Menu
3838 set ctxm .vpane.lower.diff.body.ctxm
3839 menu $ctxm -tearoff 0
3843 -command {tk_textCopy $ui_diff}
3844 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3846 -label {Select All} \
3848 -command {$ui_diff tag add sel 0.0 end}
3849 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3854 $ui_diff tag add sel 0.0 end
3855 tk_textCopy $ui_diff
3856 $ui_diff tag remove sel 0.0 end
3858 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3861 -label {Decrease Font Size} \
3863 -command {incr_font_size font_diff -1}
3864 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3866 -label {Increase Font Size} \
3868 -command {incr_font_size font_diff 1}
3869 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3872 -label {Show Less Context} \
3874 -command {if {$repo_config(gui.diffcontext) >= 2} {
3875 incr repo_config(gui.diffcontext) -1
3878 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3880 -label {Show More Context} \
3883 incr repo_config(gui.diffcontext)
3886 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3888 $ctxm add command -label {Options...} \
3891 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
3895 set ui_status_value {Initializing...}
3896 label .status -textvariable ui_status_value \
3902 pack .status -anchor w -side bottom -fill x
3907 set gm $repo_config(gui.geometry)
3908 wm geometry . [lindex $gm 0]
3909 .vpane sash place 0 \
3910 [lindex [.vpane sash coord 0] 0] \
3912 .vpane.files sash place 0 \
3914 [lindex [.vpane.files sash coord 0] 1]
3920 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3921 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3922 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3923 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3924 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3925 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3926 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3927 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3928 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3929 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3930 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3932 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3933 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3934 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3935 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3936 bind $ui_diff <$M1B-Key-v> {break}
3937 bind $ui_diff <$M1B-Key-V> {break}
3938 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3939 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3940 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3941 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3942 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3943 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3945 if {!$single_commit} {
3946 bind . <$M1B-Key-n> do_create_branch
3947 bind . <$M1B-Key-N> do_create_branch
3950 bind . <Destroy> do_quit
3951 bind all <Key-F5> do_rescan
3952 bind all <$M1B-Key-r> do_rescan
3953 bind all <$M1B-Key-R> do_rescan
3954 bind . <$M1B-Key-s> do_signoff
3955 bind . <$M1B-Key-S> do_signoff
3956 bind . <$M1B-Key-i> do_add_all
3957 bind . <$M1B-Key-I> do_add_all
3958 bind . <$M1B-Key-Return> do_commit
3959 bind all <$M1B-Key-q> do_quit
3960 bind all <$M1B-Key-Q> do_quit
3961 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3962 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3963 foreach i [list $ui_index $ui_workdir] {
3964 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
3965 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
3966 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
3970 set file_lists($ui_index) [list]
3971 set file_lists($ui_workdir) [list]
3975 set MERGE_HEAD [list]
3978 set current_branch {}
3980 set selected_commit_type new
3982 wm title . "[appname
] ([file normalize
[file dirname [gitdir
]]])"
3983 focus -force $ui_comm
3985 # -- Warn the user about environmental problems. Cygwin's Tcl
3986 # does *not* pass its env array onto any processes it spawns.
3987 # This means that git processes get none of our environment.
3992 set msg "Possible environment issues exist.
3994 The following environment variables are probably
3995 going to be ignored by any Git subprocess run
3999 foreach name [array names env] {
4000 switch -regexp -- $name {
4001 {^GIT_INDEX_FILE$} -
4002 {^GIT_OBJECT_DIRECTORY$} -
4003 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4005 {^GIT_EXTERNAL_DIFF$} -
4009 {^GIT_CONFIG_LOCAL$} -
4010 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4011 append msg " - $name\n"
4014 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4015 append msg " - $name\n"
4017 set suggest_user $name
4021 if {$ignored_env > 0} {
4023 This is due to a known issue with the
4024 Tcl binary distributed by Cygwin.
"
4026 if {$suggest_user ne {}} {
4029 A good replacement
for $suggest_user
4030 is placing values
for the user.name and
4031 user.email settings into your personal
4037 unset ignored_env msg suggest_user name
4040 # -- Only initialize complex UI if we are going to stay running.
4042 if {!$single_commit} {
4046 populate_branch_menu
4047 populate_fetch_menu .mbar.fetch
4048 populate_pull_menu .mbar.pull
4049 populate_push_menu .mbar.push
4052 # -- Only suggest a gc run if we are going to stay running.
4054 if {!$single_commit} {
4055 set object_limit 2000
4056 if {[is_Windows]} {set object_limit 200}
4057 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4058 if {$objects_current >= $object_limit} {
4060 "This repository currently has
$objects_current loose objects.
4062 To maintain optimal performance it is strongly
4063 recommended that you
compress the database
4064 when
more than
$object_limit loose objects exist.
4066 Compress the database now?
"] eq yes} {
4070 unset object_limit _junk objects_current
4073 lock_index begin-read