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
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 {![catch
{exec git show-ref
--verify -- "refs/heads/$newbranch"}]} {
1703 -title [wm title
$w] \
1705 -message "Branch '$newbranch' already exists."
1706 focus
$w.desc.name_t
1709 if {[catch
{exec git check-ref-format
"heads/$newbranch"}]} {
1713 -title [wm title
$w] \
1715 -message "We do not like '$newbranch' as a branch name."
1716 focus
$w.desc.name_t
1721 switch
-- $create_branch_revtype {
1722 head {set rev $create_branch_head}
1723 tracking
{set rev $create_branch_trackinghead}
1724 expression
{set rev [string trim
[$w.from.exp_t get
0.0 end
]]}
1726 if {[catch
{set cmt
[exec git rev-parse
--verify "${rev}^0"]}]} {
1730 -title [wm title
$w] \
1732 -message "Invalid starting revision: $rev"
1735 set cmd
[list git update-ref
]
1737 lappend cmd
"branch: Created from $rev"
1738 lappend cmd
"refs/heads/$newbranch"
1740 lappend cmd
$null_sha1
1741 if {[catch
{eval exec $cmd} err
]} {
1745 -title [wm title
$w] \
1747 -message "Failed to create '$newbranch'.\n\n$err"
1751 lappend all_heads
$newbranch
1752 set all_heads
[lsort
$all_heads]
1753 populate_branch_menu
1755 if {$create_branch_checkout} {
1756 switch_branch
$newbranch
1760 proc do_create_branch
{} {
1761 global all_heads current_branch
1762 global create_branch_checkout create_branch_revtype
1763 global create_branch_head create_branch_trackinghead
1765 set create_branch_checkout
1
1766 set create_branch_revtype
head
1767 set create_branch_head
$current_branch
1768 set create_branch_trackinghead
{}
1770 set w .branch_editor
1772 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
1774 label
$w.header
-text {Create New Branch
} \
1776 pack
$w.header
-side top
-fill x
1779 button
$w.buttons.create
-text Create \
1782 -command [list do_create_branch_action
$w]
1783 pack
$w.buttons.create
-side right
1784 button
$w.buttons.cancel
-text {Cancel
} \
1786 -command [list destroy
$w]
1787 pack
$w.buttons.cancel
-side right
-padx 5
1788 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
1790 labelframe
$w.desc \
1791 -text {Branch Description
} \
1793 label
$w.desc.name_l
-text {Name
:} -font font_ui
1794 text
$w.desc.name_t \
1800 grid
$w.desc.name_l
$w.desc.name_t
-stick we
-padx {0 5}
1801 bind $w.desc.name_t
<Shift-Key-Tab
> "focus $w.postActions.checkout;break"
1802 bind $w.desc.name_t
<Key-Tab
> "focus $w.from.exp_t;break"
1803 bind $w.desc.name_t
<Key-Return
> "do_create_branch_action $w;break"
1804 bind $w.desc.name_t
<Key
> {
1805 if {{%K
} ne
{BackSpace
}
1808 && {%K
} ne
{Return
}} {
1810 if {[string first
%A
{~^
:?
*[}] >= 0} break
1813 grid columnconfigure
$w.desc
1 -weight 1
1814 pack
$w.desc
-anchor nw
-fill x
-pady 5 -padx 5
1816 labelframe
$w.from \
1817 -text {Starting Revision
} \
1819 radiobutton
$w.from.head_r \
1820 -text {Local Branch
:} \
1822 -variable create_branch_revtype \
1824 eval tk_optionMenu
$w.from.head_m create_branch_head
$all_heads
1825 grid
$w.from.head_r
$w.from.head_m
-sticky w
1826 set all_trackings
[all_tracking_branches
]
1827 if {$all_trackings ne
{}} {
1828 set create_branch_trackinghead
[lindex
$all_trackings 0]
1829 radiobutton
$w.from.tracking_r \
1830 -text {Tracking Branch
:} \
1832 -variable create_branch_revtype \
1834 eval tk_optionMenu
$w.from.tracking_m \
1835 create_branch_trackinghead \
1837 grid
$w.from.tracking_r
$w.from.tracking_m
-sticky w
1839 radiobutton
$w.from.exp_r \
1840 -text {Revision Expression
:} \
1842 -variable create_branch_revtype \
1844 text
$w.from.exp_t \
1850 grid
$w.from.exp_r
$w.from.exp_t
-stick we
-padx {0 5}
1851 bind $w.from.exp_t
<Shift-Key-Tab
> "focus $w.desc.name_t;break"
1852 bind $w.from.exp_t
<Key-Tab
> "focus $w.postActions.checkout;break"
1853 bind $w.from.exp_t
<Key-Return
> "do_create_branch_action $w;break"
1854 grid columnconfigure
$w.from
1 -weight 1
1855 pack
$w.from
-anchor nw
-fill x
-pady 5 -padx 5
1857 labelframe
$w.postActions \
1858 -text {Post Creation Actions
} \
1860 checkbutton
$w.postActions.checkout \
1861 -text {Checkout after creation
} \
1862 -variable create_branch_checkout \
1864 pack
$w.postActions.checkout
-anchor nw
1865 pack
$w.postActions
-anchor nw
-fill x
-pady 5 -padx 5
1867 bind $w <Visibility
> "grab $w; focus $w.desc.name_t"
1868 bind $w <Key-Escape
> "destroy $w"
1869 bind $w <Key-Return
> "do_create_branch_action $w;break"
1870 wm title
$w "[appname] ([reponame]): Create Branch"
1874 proc do_delete_branch_action
{w
} {
1876 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
1879 switch
-- $delete_branch_checktype {
1880 head {set check_rev
$delete_branch_head}
1881 tracking
{set check_rev
$delete_branch_trackinghead}
1882 always
{set check_rev
{:none
}}
1884 if {$check_rev eq
{:none
}} {
1886 } elseif
{[catch
{set check_cmt
[exec git rev-parse
--verify "${check_rev}^0"]}]} {
1890 -title [wm title
$w] \
1892 -message "Invalid check revision: $check_rev"
1896 set to_delete
[list
]
1897 set not_merged
[list
]
1898 foreach i
[$w.list.l curselection
] {
1899 set b
[$w.list.l get
$i]
1900 if {[catch
{set o
[exec git rev-parse
--verify $b]}]} continue
1901 if {$check_cmt ne
{}} {
1902 if {$b eq
$check_rev} continue
1903 if {[catch
{set m
[exec git merge-base
$o $check_cmt]}]} continue
1905 lappend not_merged
$b
1909 lappend to_delete
[list
$b $o]
1911 if {$not_merged ne
{}} {
1912 set msg
"The following branches are not completely merged into $check_rev:
1914 - [join $not_merged "\n - "]"
1918 -title [wm title
$w] \
1922 if {$to_delete eq
{}} return
1923 if {$delete_branch_checktype eq
{always
}} {
1924 set msg
{Recovering deleted branches is difficult.
1926 Delete the selected branches?
}
1927 if {[tk_messageBox \
1930 -title [wm title
$w] \
1932 -message $msg] ne
yes} {
1938 foreach i
$to_delete {
1941 if {[catch
{exec git update-ref
-d "refs/heads/$b" $o} err
]} {
1942 append failed
" - $b: $err\n"
1944 set x
[lsearch
-sorted $all_heads $b]
1946 set all_heads
[lreplace
$all_heads $x $x]
1951 if {$failed ne
{}} {
1955 -title [wm title
$w] \
1957 -message "Failed to delete branches:\n$failed"
1960 set all_heads
[lsort
$all_heads]
1961 populate_branch_menu
1965 proc do_delete_branch
{} {
1966 global all_heads tracking_branches current_branch
1967 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
1969 set delete_branch_checktype
head
1970 set delete_branch_head
$current_branch
1971 set delete_branch_trackinghead
{}
1973 set w .branch_editor
1975 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
1977 label
$w.header
-text {Delete Local Branch
} \
1979 pack
$w.header
-side top
-fill x
1982 button
$w.buttons.create
-text Delete \
1984 -command [list do_delete_branch_action
$w]
1985 pack
$w.buttons.create
-side right
1986 button
$w.buttons.cancel
-text {Cancel
} \
1988 -command [list destroy
$w]
1989 pack
$w.buttons.cancel
-side right
-padx 5
1990 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
1992 labelframe
$w.list \
1993 -text {Local Branches
} \
1998 -selectmode extended \
2000 foreach h
$all_heads {
2001 if {$h ne
$current_branch} {
2002 $w.list.l insert end
$h
2005 pack
$w.list.l
-fill both
-pady 5 -padx 5
2006 pack
$w.list
-fill both
-pady 5 -padx 5
2008 labelframe
$w.validate \
2009 -text {Delete Only If
} \
2011 radiobutton
$w.validate.head_r \
2012 -text {Merged Into Local Branch
:} \
2014 -variable delete_branch_checktype \
2016 eval tk_optionMenu
$w.validate.head_m delete_branch_head
$all_heads
2017 grid
$w.validate.head_r
$w.validate.head_m
-sticky w
2018 set all_trackings
[all_tracking_branches
]
2019 if {$all_trackings ne
{}} {
2020 set delete_branch_trackinghead
[lindex
$all_trackings 0]
2021 radiobutton
$w.validate.tracking_r \
2022 -text {Merged Into Tracking Branch
:} \
2024 -variable delete_branch_checktype \
2026 eval tk_optionMenu
$w.validate.tracking_m \
2027 delete_branch_trackinghead \
2029 grid
$w.validate.tracking_r
$w.validate.tracking_m
-sticky w
2031 radiobutton
$w.validate.always_r \
2032 -text {Always
(Do not perform merge checks
)} \
2034 -variable delete_branch_checktype \
2036 grid
$w.validate.always_r
-columnspan 2 -sticky w
2037 grid columnconfigure
$w.validate
1 -weight 1
2038 pack
$w.validate
-anchor nw
-fill x
-pady 5 -padx 5
2040 bind $w <Visibility
> "grab $w; focus $w"
2041 bind $w <Key-Escape
> "destroy $w"
2042 wm title
$w "[appname] ([reponame]): Delete Branch"
2046 proc switch_branch
{b
} {
2047 global HEAD commit_type file_states current_branch
2048 global selected_commit_type ui_comm
2050 if {![lock_index switch
]} return
2052 # -- Backup the selected branch (repository_state resets it)
2054 set new_branch
$current_branch
2056 # -- Our in memory state should match the repository.
2058 repository_state curType curHEAD curMERGE_HEAD
2059 if {[string match amend
* $commit_type]
2060 && $curType eq
{normal
}
2061 && $curHEAD eq
$HEAD} {
2062 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
2063 info_popup
{Last scanned state does not match repository state.
2065 Another Git program has modified this repository
2066 since the last scan. A rescan must be performed
2067 before the current branch can be changed.
2069 The rescan will be automatically started now.
2072 rescan
{set ui_status_value
{Ready.
}}
2076 # -- Toss the message buffer if we are in amend mode.
2078 if {[string match amend
* $curType]} {
2079 $ui_comm delete
0.0 end
2081 $ui_comm edit modified false
2084 set selected_commit_type new
2085 set current_branch
$new_branch
2088 error
"NOT FINISHED"
2091 ######################################################################
2093 ## remote management
2095 proc load_all_remotes
{} {
2097 global all_remotes tracking_branches
2099 set all_remotes
[list
]
2100 array
unset tracking_branches
2102 set rm_dir
[gitdir remotes
]
2103 if {[file isdirectory
$rm_dir]} {
2104 set all_remotes
[glob \
2108 -directory $rm_dir *]
2110 foreach name
$all_remotes {
2112 set fd
[open
[file join $rm_dir $name] r
]
2113 while {[gets
$fd line
] >= 0} {
2114 if {![regexp
{^Pull
:[ ]*([^
:]+):(.
+)$
} \
2115 $line line src dst
]} continue
2116 if {![regexp ^refs
/ $dst]} {
2117 set dst
"refs/heads/$dst"
2119 set tracking_branches
($dst) [list
$name $src]
2126 foreach line
[array names repo_config remote.
*.url
] {
2127 if {![regexp ^remote\.
(.
*)\.url\$
$line line name
]} continue
2128 lappend all_remotes
$name
2130 if {[catch
{set fl
$repo_config(remote.
$name.fetch
)}]} {
2134 if {![regexp
{^
([^
:]+):(.
+)$
} $line line src dst
]} continue
2135 if {![regexp ^refs
/ $dst]} {
2136 set dst
"refs/heads/$dst"
2138 set tracking_branches
($dst) [list
$name $src]
2142 set all_remotes
[lsort
-unique $all_remotes]
2145 proc populate_fetch_menu
{m
} {
2146 global all_remotes repo_config
2148 foreach r
$all_remotes {
2150 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2151 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
2156 set fd
[open
[gitdir remotes
$r] r
]
2157 while {[gets
$fd n
] >= 0} {
2158 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
2169 -label "Fetch from $r..." \
2170 -command [list fetch_from
$r] \
2176 proc populate_push_menu
{m
} {
2177 global all_remotes repo_config
2179 foreach r
$all_remotes {
2181 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
2182 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
2187 set fd
[open
[gitdir remotes
$r] r
]
2188 while {[gets
$fd n
] >= 0} {
2189 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
2200 -label "Push to $r..." \
2201 -command [list push_to
$r] \
2207 proc populate_pull_menu
{m
} {
2208 global repo_config all_remotes disable_on_lock
2210 foreach remote
$all_remotes {
2212 if {[array get repo_config remote.
$remote.url
] ne
{}} {
2213 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
2214 foreach line
$repo_config(remote.
$remote.fetch
) {
2215 if {[regexp
{^
([^
:]+):} $line line rb
]} {
2222 set fd
[open
[gitdir remotes
$remote] r
]
2223 while {[gets
$fd line
] >= 0} {
2224 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
2232 foreach rb
$rb_list {
2233 regsub ^refs
/heads
/ $rb {} rb_short
2235 -label "Branch $rb_short from $remote..." \
2236 -command [list pull_remote
$remote $rb] \
2238 lappend disable_on_lock \
2239 [list
$m entryconf
[$m index last
] -state]
2244 ######################################################################
2249 #define mask_width 14
2250 #define mask_height 15
2251 static unsigned char mask_bits
[] = {
2252 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2253 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2254 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2257 image create bitmap file_plain
-background white
-foreground black
-data {
2258 #define plain_width 14
2259 #define plain_height 15
2260 static unsigned char plain_bits
[] = {
2261 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2262 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2263 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2264 } -maskdata $filemask
2266 image create bitmap file_mod
-background white
-foreground blue
-data {
2267 #define mod_width 14
2268 #define mod_height 15
2269 static unsigned char mod_bits
[] = {
2270 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2271 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2272 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2273 } -maskdata $filemask
2275 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
2276 #define file_fulltick_width 14
2277 #define file_fulltick_height 15
2278 static unsigned char file_fulltick_bits
[] = {
2279 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2280 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2281 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2282 } -maskdata $filemask
2284 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
2285 #define parttick_width 14
2286 #define parttick_height 15
2287 static unsigned char parttick_bits
[] = {
2288 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2289 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2290 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2291 } -maskdata $filemask
2293 image create bitmap file_question
-background white
-foreground black
-data {
2294 #define file_question_width 14
2295 #define file_question_height 15
2296 static unsigned char file_question_bits
[] = {
2297 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2298 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2299 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2300 } -maskdata $filemask
2302 image create bitmap file_removed
-background white
-foreground red
-data {
2303 #define file_removed_width 14
2304 #define file_removed_height 15
2305 static unsigned char file_removed_bits
[] = {
2306 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2307 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2308 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2309 } -maskdata $filemask
2311 image create bitmap file_merge
-background white
-foreground blue
-data {
2312 #define file_merge_width 14
2313 #define file_merge_height 15
2314 static unsigned char file_merge_bits
[] = {
2315 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2316 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2317 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2318 } -maskdata $filemask
2320 set ui_index .vpane.files.index.list
2321 set ui_workdir .vpane.files.workdir.list
2323 set all_icons
(_
$ui_index) file_plain
2324 set all_icons
(A
$ui_index) file_fulltick
2325 set all_icons
(M
$ui_index) file_fulltick
2326 set all_icons
(D
$ui_index) file_removed
2327 set all_icons
(U
$ui_index) file_merge
2329 set all_icons
(_
$ui_workdir) file_plain
2330 set all_icons
(M
$ui_workdir) file_mod
2331 set all_icons
(D
$ui_workdir) file_question
2332 set all_icons
(U
$ui_workdir) file_merge
2333 set all_icons
(O
$ui_workdir) file_plain
2335 set max_status_desc
0
2339 {_M
"Modified, not staged"}
2340 {M_
"Staged for commit"}
2341 {MM
"Portions staged for commit"}
2342 {MD
"Staged for commit, missing"}
2344 {_O
"Untracked, not staged"}
2345 {A_
"Staged for commit"}
2346 {AM
"Portions staged for commit"}
2347 {AD
"Staged for commit, missing"}
2350 {D_
"Staged for removal"}
2351 {DO
"Staged for removal, still present"}
2353 {U_
"Requires merge resolution"}
2354 {UU
"Requires merge resolution"}
2355 {UM
"Requires merge resolution"}
2356 {UD
"Requires merge resolution"}
2358 if {$max_status_desc < [string length
[lindex
$i 1]]} {
2359 set max_status_desc
[string length
[lindex
$i 1]]
2361 set all_descs
([lindex
$i 0]) [lindex
$i 1]
2365 ######################################################################
2370 global tcl_platform tk_library
2371 if {[tk windowingsystem
] eq
{aqua
}} {
2377 proc is_Windows
{} {
2379 if {$tcl_platform(platform
) eq
{windows
}} {
2385 proc bind_button3
{w cmd
} {
2386 bind $w <Any-Button-3
> $cmd
2388 bind $w <Control-Button-1
> $cmd
2392 proc incr_font_size
{font
{amt
1}} {
2393 set sz
[font configure
$font -size]
2395 font configure
$font -size $sz
2396 font configure
${font}bold
-size $sz
2399 proc hook_failed_popup
{hook msg
} {
2404 label
$w.m.l1
-text "$hook hook failed:" \
2409 -background white
-borderwidth 1 \
2411 -width 80 -height 10 \
2413 -yscrollcommand [list
$w.m.sby
set]
2415 -text {You must correct the above errors before committing.
} \
2419 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2420 pack
$w.m.l1
-side top
-fill x
2421 pack
$w.m.l2
-side bottom
-fill x
2422 pack
$w.m.sby
-side right
-fill y
2423 pack
$w.m.t
-side left
-fill both
-expand 1
2424 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2426 $w.m.t insert
1.0 $msg
2427 $w.m.t conf
-state disabled
2429 button
$w.ok
-text OK \
2432 -command "destroy $w"
2433 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2435 bind $w <Visibility
> "grab $w; focus $w"
2436 bind $w <Key-Return
> "destroy $w"
2437 wm title
$w "[appname] ([reponame]): error"
2441 set next_console_id
0
2443 proc new_console
{short_title long_title
} {
2444 global next_console_id console_data
2445 set w .console
[incr next_console_id
]
2446 set console_data
($w) [list
$short_title $long_title]
2447 return [console_init
$w]
2450 proc console_init
{w
} {
2451 global console_cr console_data M1B
2453 set console_cr
($w) 1.0
2456 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
2461 -background white
-borderwidth 1 \
2463 -width 80 -height 10 \
2466 -yscrollcommand [list
$w.m.sby
set]
2467 label
$w.m.s
-text {Working... please
wait...
} \
2471 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
2472 pack
$w.m.l1
-side top
-fill x
2473 pack
$w.m.s
-side bottom
-fill x
2474 pack
$w.m.sby
-side right
-fill y
2475 pack
$w.m.t
-side left
-fill both
-expand 1
2476 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
2478 menu
$w.ctxm
-tearoff 0
2479 $w.ctxm add
command -label "Copy" \
2481 -command "tk_textCopy $w.m.t"
2482 $w.ctxm add
command -label "Select All" \
2484 -command "$w.m.t tag add sel 0.0 end"
2485 $w.ctxm add
command -label "Copy All" \
2488 $w.m.t tag add sel 0.0 end
2490 $w.m.t tag remove sel 0.0 end
2493 button
$w.ok
-text {Close
} \
2496 -command "destroy $w"
2497 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
2499 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
2500 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2501 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2502 bind $w <Visibility
> "focus $w"
2503 wm title
$w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2507 proc console_exec
{w cmd
{after
{}}} {
2508 # -- Windows tosses the enviroment when we exec our child.
2509 # But most users need that so we have to relogin. :-(
2512 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
2515 # -- Tcl won't let us redirect both stdout and stderr to
2516 # the same pipe. So pass it through cat...
2518 set cmd
[concat |
$cmd |
& cat]
2520 set fd_f
[open
$cmd r
]
2521 fconfigure
$fd_f -blocking 0 -translation binary
2522 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
2525 proc console_read
{w fd after
} {
2526 global console_cr console_data
2530 if {![winfo exists
$w]} {console_init
$w}
2531 $w.m.t conf
-state normal
2533 set n
[string length
$buf]
2535 set cr
[string first
"\r" $buf $c]
2536 set lf
[string first
"\n" $buf $c]
2537 if {$cr < 0} {set cr
[expr {$n + 1}]}
2538 if {$lf < 0} {set lf
[expr {$n + 1}]}
2541 $w.m.t insert end
[string range
$buf $c $lf]
2542 set console_cr
($w) [$w.m.t index
{end
-1c}]
2546 $w.m.t delete
$console_cr($w) end
2547 $w.m.t insert end
"\n"
2548 $w.m.t insert end
[string range
$buf $c $cr]
2553 $w.m.t conf
-state disabled
2557 fconfigure
$fd -blocking 1
2559 if {[catch
{close
$fd}]} {
2560 if {![winfo exists
$w]} {console_init
$w}
2561 $w.m.s conf
-background red
-text {Error
: Command Failed
}
2562 $w.ok conf
-state normal
2564 } elseif
{[winfo exists
$w]} {
2565 $w.m.s conf
-background green
-text {Success
}
2566 $w.ok conf
-state normal
2569 array
unset console_cr
$w
2570 array
unset console_data
$w
2572 uplevel
#0 $after $ok
2576 fconfigure
$fd -blocking 0
2579 ######################################################################
2583 set starting_gitk_msg
{Starting gitk... please
wait...
}
2585 proc do_gitk
{revs
} {
2586 global ui_status_value starting_gitk_msg
2594 set cmd
"sh -c \"exec $cmd\""
2598 if {[catch
{eval exec $cmd} err
]} {
2599 error_popup
"Failed to start gitk:\n\n$err"
2601 set ui_status_value
$starting_gitk_msg
2603 if {$ui_status_value eq
$starting_gitk_msg} {
2604 set ui_status_value
{Ready.
}
2611 set w
[new_console
{gc
} {Compressing the object database
}]
2612 console_exec
$w {git gc
}
2615 proc do_fsck_objects
{} {
2616 set w
[new_console
{fsck-objects
} \
2617 {Verifying the object database with fsck-objects
}]
2618 set cmd
[list git fsck-objects
]
2621 lappend cmd
--strict
2622 console_exec
$w $cmd
2628 global ui_comm is_quitting repo_config commit_type
2630 if {$is_quitting} return
2633 # -- Stash our current commit buffer.
2635 set save
[gitdir GITGUI_MSG
]
2636 set msg
[string trim
[$ui_comm get
0.0 end
]]
2637 if {![string match amend
* $commit_type]
2638 && [$ui_comm edit modified
]
2641 set fd
[open
$save w
]
2642 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
2646 catch
{file delete
$save}
2649 # -- Stash our current window geometry into this repository.
2651 set cfg_geometry
[list
]
2652 lappend cfg_geometry
[wm geometry .
]
2653 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
2654 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
2655 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2658 if {$cfg_geometry ne
$rc_geometry} {
2659 catch
{exec git repo-config gui.geometry
$cfg_geometry}
2666 rescan
{set ui_status_value
{Ready.
}}
2669 proc unstage_helper
{txt paths
} {
2670 global file_states current_diff_path
2672 if {![lock_index begin-update
]} return
2676 foreach path
$paths {
2677 switch
-glob -- [lindex
$file_states($path) 0] {
2681 lappend pathList
$path
2682 if {$path eq
$current_diff_path} {
2683 set after
{reshow_diff
;}
2688 if {$pathList eq
{}} {
2694 [concat
$after {set ui_status_value
{Ready.
}}]
2698 proc do_unstage_selection
{} {
2699 global current_diff_path selected_paths
2701 if {[array size selected_paths
] > 0} {
2703 {Unstaging selected files from commit
} \
2704 [array names selected_paths
]
2705 } elseif
{$current_diff_path ne
{}} {
2707 "Unstaging [short_path $current_diff_path] from commit" \
2708 [list
$current_diff_path]
2712 proc add_helper
{txt paths
} {
2713 global file_states current_diff_path
2715 if {![lock_index begin-update
]} return
2719 foreach path
$paths {
2720 switch
-glob -- [lindex
$file_states($path) 0] {
2725 lappend pathList
$path
2726 if {$path eq
$current_diff_path} {
2727 set after
{reshow_diff
;}
2732 if {$pathList eq
{}} {
2738 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2742 proc do_add_selection
{} {
2743 global current_diff_path selected_paths
2745 if {[array size selected_paths
] > 0} {
2747 {Adding selected files
} \
2748 [array names selected_paths
]
2749 } elseif
{$current_diff_path ne
{}} {
2751 "Adding [short_path $current_diff_path]" \
2752 [list
$current_diff_path]
2756 proc do_add_all
{} {
2760 foreach path
[array names file_states
] {
2761 switch
-glob -- [lindex
$file_states($path) 0] {
2764 ?D
{lappend paths
$path}
2767 add_helper
{Adding all changed files
} $paths
2770 proc revert_helper
{txt paths
} {
2771 global file_states current_diff_path
2773 if {![lock_index begin-update
]} return
2777 foreach path
$paths {
2778 switch
-glob -- [lindex
$file_states($path) 0] {
2782 lappend pathList
$path
2783 if {$path eq
$current_diff_path} {
2784 set after
{reshow_diff
;}
2790 set n
[llength
$pathList]
2794 } elseif
{$n == 1} {
2795 set s
"[short_path [lindex $pathList]]"
2797 set s
"these $n files"
2800 set reply
[tk_dialog \
2802 "[appname] ([reponame])" \
2803 "Revert changes in $s?
2805 Any unadded changes will be permanently lost by the revert." \
2815 [concat
$after {set ui_status_value
{Ready.
}}]
2821 proc do_revert_selection
{} {
2822 global current_diff_path selected_paths
2824 if {[array size selected_paths
] > 0} {
2826 {Reverting selected files
} \
2827 [array names selected_paths
]
2828 } elseif
{$current_diff_path ne
{}} {
2830 "Reverting [short_path $current_diff_path]" \
2831 [list
$current_diff_path]
2835 proc do_signoff
{} {
2838 set me
[committer_ident
]
2839 if {$me eq
{}} return
2841 set sob
"Signed-off-by: $me"
2842 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2843 if {$last ne
$sob} {
2844 $ui_comm edit separator
2846 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2847 $ui_comm insert end
"\n"
2849 $ui_comm insert end
"\n$sob"
2850 $ui_comm edit separator
2855 proc do_select_commit_type
{} {
2856 global commit_type selected_commit_type
2858 if {$selected_commit_type eq
{new
}
2859 && [string match amend
* $commit_type]} {
2861 } elseif
{$selected_commit_type eq
{amend
}
2862 && ![string match amend
* $commit_type]} {
2865 # The amend request was rejected...
2867 if {![string match amend
* $commit_type]} {
2868 set selected_commit_type new
2878 global appvers copyright
2879 global tcl_patchLevel tk_patchLevel
2883 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2885 label
$w.header
-text "About [appname]" \
2887 pack
$w.header
-side top
-fill x
2890 button
$w.buttons.close
-text {Close
} \
2892 -command [list destroy
$w]
2893 pack
$w.buttons.close
-side right
2894 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2897 -text "[appname] - a commit creation tool for Git.
2905 pack
$w.desc
-side top
-fill x
-padx 5 -pady 5
2908 append v
"[appname] version $appvers\n"
2909 append v
"[exec git version]\n"
2911 if {$tcl_patchLevel eq
$tk_patchLevel} {
2912 append v
"Tcl/Tk version $tcl_patchLevel"
2914 append v
"Tcl version $tcl_patchLevel"
2915 append v
", Tk version $tk_patchLevel"
2926 pack
$w.vers
-side top
-fill x
-padx 5 -pady 5
2928 menu
$w.ctxm
-tearoff 0
2929 $w.ctxm add
command \
2934 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2937 bind $w <Visibility
> "grab $w; focus $w"
2938 bind $w <Key-Escape
> "destroy $w"
2939 bind_button3
$w.vers
"tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2940 wm title
$w "About [appname]"
2944 proc do_options
{} {
2945 global repo_config global_config font_descs
2946 global repo_config_new global_config_new
2948 array
unset repo_config_new
2949 array
unset global_config_new
2950 foreach name
[array names repo_config
] {
2951 set repo_config_new
($name) $repo_config($name)
2954 foreach name
[array names repo_config
] {
2956 gui.diffcontext
{continue}
2958 set repo_config_new
($name) $repo_config($name)
2960 foreach name
[array names global_config
] {
2961 set global_config_new
($name) $global_config($name)
2964 set w .options_editor
2966 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2968 label
$w.header
-text "[appname] Options" \
2970 pack
$w.header
-side top
-fill x
2973 button
$w.buttons.restore
-text {Restore Defaults
} \
2975 -command do_restore_defaults
2976 pack
$w.buttons.restore
-side left
2977 button
$w.buttons.save
-text Save \
2979 -command [list do_save_config
$w]
2980 pack
$w.buttons.save
-side right
2981 button
$w.buttons.cancel
-text {Cancel
} \
2983 -command [list destroy
$w]
2984 pack
$w.buttons.cancel
-side right
-padx 5
2985 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2987 labelframe
$w.repo
-text "[reponame] Repository" \
2989 -relief raised
-borderwidth 2
2990 labelframe
$w.global
-text {Global
(All Repositories
)} \
2992 -relief raised
-borderwidth 2
2993 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
2994 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
2997 {b pullsummary
{Show Pull Summary
}}
2998 {b trustmtime
{Trust File Modification Timestamps
}}
2999 {i diffcontext
{Number of Diff Context Lines
}}
3001 set type [lindex
$option 0]
3002 set name
[lindex
$option 1]
3003 set text
[lindex
$option 2]
3004 foreach f
{repo global
} {
3007 checkbutton
$w.
$f.
$name -text $text \
3008 -variable ${f}_config_new
(gui.
$name) \
3012 pack
$w.
$f.
$name -side top
-anchor w
3016 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
3017 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
3018 spinbox
$w.
$f.
$name.v \
3019 -textvariable ${f}_config_new
(gui.
$name) \
3020 -from 1 -to 99 -increment 1 \
3023 pack
$w.
$f.
$name.v
-side right
-anchor e
3024 pack
$w.
$f.
$name -side top
-anchor w
-fill x
3030 set all_fonts
[lsort
[font families
]]
3031 foreach option
$font_descs {
3032 set name
[lindex
$option 0]
3033 set font
[lindex
$option 1]
3034 set text
[lindex
$option 2]
3036 set global_config_new
(gui.
$font^^family
) \
3037 [font configure
$font -family]
3038 set global_config_new
(gui.
$font^^size
) \
3039 [font configure
$font -size]
3041 frame
$w.global.
$name
3042 label
$w.global.
$name.l
-text "$text:" -font font_ui
3043 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
3044 eval tk_optionMenu
$w.global.
$name.family \
3045 global_config_new
(gui.
$font^^family
) \
3047 spinbox
$w.global.
$name.size \
3048 -textvariable global_config_new
(gui.
$font^^size
) \
3049 -from 2 -to 80 -increment 1 \
3052 pack
$w.global.
$name.size
-side right
-anchor e
3053 pack
$w.global.
$name.family
-side right
-anchor e
3054 pack
$w.global.
$name -side top
-anchor w
-fill x
3057 bind $w <Visibility
> "grab $w; focus $w"
3058 bind $w <Key-Escape
> "destroy $w"
3059 wm title
$w "[appname] ([reponame]): Options"
3063 proc do_restore_defaults
{} {
3064 global font_descs default_config repo_config
3065 global repo_config_new global_config_new
3067 foreach name
[array names default_config
] {
3068 set repo_config_new
($name) $default_config($name)
3069 set global_config_new
($name) $default_config($name)
3072 foreach option
$font_descs {
3073 set name
[lindex
$option 0]
3074 set repo_config
(gui.
$name) $default_config(gui.
$name)
3078 foreach option
$font_descs {
3079 set name
[lindex
$option 0]
3080 set font
[lindex
$option 1]
3081 set global_config_new
(gui.
$font^^family
) \
3082 [font configure
$font -family]
3083 set global_config_new
(gui.
$font^^size
) \
3084 [font configure
$font -size]
3088 proc do_save_config
{w
} {
3089 if {[catch
{save_config
} err
]} {
3090 error_popup
"Failed to completely save options:\n\n$err"
3096 proc do_windows_shortcut
{} {
3100 set desktop
[exec cygpath \
3108 set fn
[tk_getSaveFile \
3110 -title "[appname] ([reponame]): Create Desktop Icon" \
3111 -initialdir $desktop \
3112 -initialfile "Git [reponame].bat"]
3116 set sh
[exec cygpath \
3120 set me
[exec cygpath \
3124 set gd
[exec cygpath \
3128 set gw
[exec cygpath \
3131 [file dirname [gitdir
]]]
3132 regsub
-all ' $me "'\\''" me
3133 regsub -all ' $gd "'\\''" gd
3134 puts $fd "@ECHO Entering $gw"
3135 puts $fd "@ECHO Starting git-gui... please wait..."
3136 puts -nonewline $fd "@\"$sh\" --login -c \""
3137 puts -nonewline $fd "GIT_DIR='$gd'"
3138 puts -nonewline $fd " '$me'"
3142 error_popup "Cannot write script:\n\n$err"
3147 proc do_macosx_app {} {
3150 set fn [tk_getSaveFile \
3152 -title "[appname] ([reponame]): Create Desktop Icon" \
3153 -initialdir [file join $env(HOME) Desktop] \
3154 -initialfile "Git [reponame].app"]
3157 set Contents [file join $fn Contents]
3158 set MacOS [file join $Contents MacOS]
3159 set exe [file join $MacOS git-gui]
3163 set fd [open [file join $Contents Info.plist] w]
3164 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3165 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3166 <plist version="1.0">
3168 <key>CFBundleDevelopmentRegion</key>
3169 <string>English</string>
3170 <key>CFBundleExecutable</key>
3171 <string>git-gui</string>
3172 <key>CFBundleIdentifier</key>
3173 <string>org.spearce.git-gui</string>
3174 <key>CFBundleInfoDictionaryVersion</key>
3175 <string>6.0</string>
3176 <key>CFBundlePackageType</key>
3177 <string>APPL</string>
3178 <key>CFBundleSignature</key>
3179 <string>????</string>
3180 <key>CFBundleVersion</key>
3181 <string>1.0</string>
3182 <key>NSPrincipalClass</key>
3183 <string>NSApplication</string>
3188 set fd [open $exe w]
3189 set gd [file normalize [gitdir]]
3190 set ep [file normalize [exec git --exec-path]]
3191 regsub -all ' $gd "'\\''" gd
3192 regsub
-all ' $ep "'\\''" ep
3193 puts $fd "#!/bin/sh"
3194 foreach name
[array names env
] {
3195 if {[string match GIT_
* $name]} {
3196 regsub
-all ' $env($name) "'\\''" v
3197 puts $fd "export $name='$v'"
3200 puts $fd "export PATH
='$ep':\
$PATH"
3201 puts $fd "export GIT_DIR
='$gd'"
3202 puts $fd "exec [file normalize
$argv0]"
3205 file attributes $exe -permissions u+x,g+x,o+x
3207 error_popup "Cannot
write icon
:\n\n$err"
3212 proc toggle_or_diff {w x y} {
3213 global file_states file_lists current_diff_path ui_index ui_workdir
3214 global last_clicked selected_paths
3216 set pos [split [$w index @$x,$y] .]
3217 set lno [lindex $pos 0]
3218 set col [lindex $pos 1]
3219 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3225 set last_clicked [list $w $lno]
3226 array unset selected_paths
3227 $ui_index tag remove in_sel 0.0 end
3228 $ui_workdir tag remove in_sel 0.0 end
3231 if {$current_diff_path eq $path} {
3232 set after {reshow_diff;}
3236 if {$w eq $ui_index} {
3238 "Unstaging
[short_path
$path] from commit
" \
3240 [concat $after {set ui_status_value {Ready.}}]
3241 } elseif {$w eq $ui_workdir} {
3243 "Adding
[short_path
$path]" \
3245 [concat $after {set ui_status_value {Ready.}}]
3248 show_diff $path $w $lno
3252 proc add_one_to_selection {w x y} {
3253 global file_lists last_clicked selected_paths
3255 set lno [lindex [split [$w index @$x,$y] .] 0]
3256 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3262 if {$last_clicked ne {}
3263 && [lindex $last_clicked 0] ne $w} {
3264 array unset selected_paths
3265 [lindex $last_clicked 0] tag remove in_sel 0.0 end
3268 set last_clicked [list $w $lno]
3269 if {[catch {set in_sel $selected_paths($path)}]} {
3273 unset selected_paths($path)
3274 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3276 set selected_paths($path) 1
3277 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3281 proc add_range_to_selection {w x y} {
3282 global file_lists last_clicked selected_paths
3284 if {[lindex $last_clicked 0] ne $w} {
3285 toggle_or_diff $w $x $y
3289 set lno [lindex [split [$w index @$x,$y] .] 0]
3290 set lc [lindex $last_clicked 1]
3299 foreach path [lrange $file_lists($w) \
3300 [expr {$begin - 1}] \
3301 [expr {$end - 1}]] {
3302 set selected_paths($path) 1
3304 $w tag add in_sel $begin.0 [expr {$end + 1}].0
3307 ######################################################################
3311 set cursor_ptr arrow
3312 font create font_diff -family Courier -size 10
3316 eval font configure font_ui [font actual [.dummy cget -font]]
3320 font create font_uibold
3321 font create font_diffbold
3326 } elseif {[is_MacOSX]} {
3334 proc apply_config {} {
3335 global repo_config font_descs
3337 foreach option $font_descs {
3338 set name [lindex $option 0]
3339 set font [lindex $option 1]
3341 foreach {cn cv} $repo_config(gui.$name) {
3342 font configure $font $cn $cv
3345 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
3347 foreach {cn cv} [font configure $font] {
3348 font configure ${font}bold $cn $cv
3350 font configure ${font}bold -weight bold
3354 set default_config(gui.trustmtime) false
3355 set default_config(gui.pullsummary) true
3356 set default_config(gui.diffcontext) 5
3357 set default_config(gui.fontui) [font configure font_ui]
3358 set default_config(gui.fontdiff) [font configure font_diff]
3360 {fontui font_ui {Main Font}}
3361 {fontdiff font_diff {Diff/Console Font}}
3366 ######################################################################
3372 menu .mbar -tearoff 0
3373 .mbar add cascade -label Repository -menu .mbar.repository
3374 .mbar add cascade -label Edit -menu .mbar.edit
3375 if {!$single_commit} {
3376 .mbar add cascade -label Branch -menu .mbar.branch
3378 .mbar add cascade -label Commit -menu .mbar.commit
3379 if {!$single_commit} {
3380 .mbar add cascade -label Fetch -menu .mbar.fetch
3381 .mbar add cascade -label Pull -menu .mbar.pull
3382 .mbar add cascade -label Push -menu .mbar.push
3384 . configure -menu .mbar
3386 # -- Repository Menu
3388 menu .mbar.repository
3389 .mbar.repository add command \
3390 -label {Visualize Current Branch} \
3391 -command {do_gitk {}} \
3394 .mbar.repository add command \
3395 -label {Visualize All Branches} \
3396 -command {do_gitk {--all}} \
3399 .mbar.repository add separator
3401 if {!$single_commit} {
3402 .mbar.repository add command -label {Compress Database} \
3406 .mbar.repository add command -label {Verify Database} \
3407 -command do_fsck_objects \
3410 .mbar.repository add separator
3413 .mbar.repository add command \
3414 -label {Create Desktop Icon} \
3415 -command do_windows_shortcut \
3417 } elseif {[is_MacOSX]} {
3418 .mbar.repository add command \
3419 -label {Create Desktop Icon} \
3420 -command do_macosx_app \
3425 .mbar.repository add command -label Quit \
3427 -accelerator $M1T-Q \
3433 .mbar.edit add command -label Undo \
3434 -command {catch {[focus] edit undo}} \
3435 -accelerator $M1T-Z \
3437 .mbar.edit add command -label Redo \
3438 -command {catch {[focus] edit redo}} \
3439 -accelerator $M1T-Y \
3441 .mbar.edit add separator
3442 .mbar.edit add command -label Cut \
3443 -command {catch {tk_textCut [focus]}} \
3444 -accelerator $M1T-X \
3446 .mbar.edit add command -label Copy \
3447 -command {catch {tk_textCopy [focus]}} \
3448 -accelerator $M1T-C \
3450 .mbar.edit add command -label Paste \
3451 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3452 -accelerator $M1T-V \
3454 .mbar.edit add command -label Delete \
3455 -command {catch {[focus] delete sel.first sel.last}} \
3458 .mbar.edit add separator
3459 .mbar.edit add command -label {Select All} \
3460 -command {catch {[focus] tag add sel 0.0 end}} \
3461 -accelerator $M1T-A \
3466 if {!$single_commit} {
3469 .mbar.branch add command -label {Create...} \
3470 -command do_create_branch \
3471 -accelerator $M1T-N \
3473 lappend disable_on_lock [list .mbar.branch entryconf \
3474 [.mbar.branch index last] -state]
3476 .mbar.branch add command -label {Delete...} \
3477 -command do_delete_branch \
3479 lappend disable_on_lock [list .mbar.branch entryconf \
3480 [.mbar.branch index last] -state]
3487 .mbar.commit add radiobutton \
3488 -label {New Commit} \
3489 -command do_select_commit_type \
3490 -variable selected_commit_type \
3493 lappend disable_on_lock \
3494 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3496 .mbar.commit add radiobutton \
3497 -label {Amend Last Commit} \
3498 -command do_select_commit_type \
3499 -variable selected_commit_type \
3502 lappend disable_on_lock \
3503 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3505 .mbar.commit add separator
3507 .mbar.commit add command -label Rescan \
3508 -command do_rescan \
3511 lappend disable_on_lock \
3512 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3514 .mbar.commit add command -label {Add To Commit} \
3515 -command do_add_selection \
3517 lappend disable_on_lock \
3518 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3520 .mbar.commit add command -label {Add All To Commit} \
3521 -command do_add_all \
3522 -accelerator $M1T-I \
3524 lappend disable_on_lock \
3525 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3527 .mbar.commit add command -label {Unstage From Commit} \
3528 -command do_unstage_selection \
3530 lappend disable_on_lock \
3531 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3533 .mbar.commit add command -label {Revert Changes} \
3534 -command do_revert_selection \
3536 lappend disable_on_lock \
3537 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3539 .mbar.commit add separator
3541 .mbar.commit add command -label {Sign Off} \
3542 -command do_signoff \
3543 -accelerator $M1T-S \
3546 .mbar.commit add command -label Commit \
3547 -command do_commit \
3548 -accelerator $M1T-Return \
3550 lappend disable_on_lock \
3551 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3553 # -- Transport menus
3555 if {!$single_commit} {
3562 # -- Apple Menu (Mac OS X only)
3564 .mbar add cascade -label Apple -menu .mbar.apple
3567 .mbar.apple add command -label "About
[appname
]" \
3570 .mbar.apple add command -label "[appname
] Options...
" \
3571 -command do_options \
3576 .mbar.edit add separator
3577 .mbar.edit add command -label {Options...} \
3578 -command do_options \
3583 if {[file exists /usr/local/miga/lib/gui-miga]
3584 && [file exists .pvcsrc]} {
3586 global ui_status_value
3587 if {![lock_index update]} return
3588 set cmd [list sh --login -c "/usr
/local
/miga
/lib
/gui-miga
\"[pwd]\""]
3589 set miga_fd [open "|
$cmd" r]
3590 fconfigure $miga_fd -blocking 0
3591 fileevent $miga_fd readable [list miga_done $miga_fd]
3592 set ui_status_value {Running miga...}
3594 proc miga_done {fd} {
3599 rescan [list set ui_status_value {Ready.}]
3602 .mbar add cascade -label Tools -menu .mbar.tools
3604 .mbar.tools add command -label "Migrate
" \
3607 lappend disable_on_lock \
3608 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3613 .mbar add cascade -label Help -menu .mbar.help
3616 .mbar.help add command -label "About
[appname
]" \
3628 -text {Current Branch:} \
3633 -textvariable current_branch \
3637 pack .branch.l1 -side left
3638 pack .branch.cb -side left -fill x
3639 pack .branch -side top -fill x
3641 # -- Main Window Layout
3643 panedwindow .vpane -orient vertical
3644 panedwindow .vpane.files -orient horizontal
3645 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3646 pack .vpane -anchor n -side top -fill both -expand 1
3648 # -- Index File List
3650 frame .vpane.files.index -height 100 -width 400
3651 label .vpane.files.index.title -text {Changes To Be Committed} \
3654 text $ui_index -background white -borderwidth 0 \
3655 -width 40 -height 10 \
3658 -cursor $cursor_ptr \
3659 -xscrollcommand {.vpane.files.index.sx set} \
3660 -yscrollcommand {.vpane.files.index.sy set} \
3662 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3663 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3664 pack .vpane.files.index.title -side top -fill x
3665 pack .vpane.files.index.sx -side bottom -fill x
3666 pack .vpane.files.index.sy -side right -fill y
3667 pack $ui_index -side left -fill both -expand 1
3668 .vpane.files add .vpane.files.index -sticky nsew
3670 # -- Working Directory File List
3672 frame .vpane.files.workdir -height 100 -width 100
3673 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3676 text $ui_workdir -background white -borderwidth 0 \
3677 -width 40 -height 10 \
3680 -cursor $cursor_ptr \
3681 -xscrollcommand {.vpane.files.workdir.sx set} \
3682 -yscrollcommand {.vpane.files.workdir.sy set} \
3684 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3685 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3686 pack .vpane.files.workdir.title -side top -fill x
3687 pack .vpane.files.workdir.sx -side bottom -fill x
3688 pack .vpane.files.workdir.sy -side right -fill y
3689 pack $ui_workdir -side left -fill both -expand 1
3690 .vpane.files add .vpane.files.workdir -sticky nsew
3692 foreach i [list $ui_index $ui_workdir] {
3693 $i tag conf in_diff -font font_uibold
3694 $i tag conf in_sel \
3695 -background [$i cget -foreground] \
3696 -foreground [$i cget -background]
3700 # -- Diff and Commit Area
3702 frame .vpane.lower -height 300 -width 400
3703 frame .vpane.lower.commarea
3704 frame .vpane.lower.diff -relief sunken -borderwidth 1
3705 pack .vpane.lower.commarea -side top -fill x
3706 pack .vpane.lower.diff -side bottom -fill both -expand 1
3707 .vpane add .vpane.lower -stick nsew
3709 # -- Commit Area Buttons
3711 frame .vpane.lower.commarea.buttons
3712 label .vpane.lower.commarea.buttons.l -text {} \
3716 pack .vpane.lower.commarea.buttons.l -side top -fill x
3717 pack .vpane.lower.commarea.buttons -side left -fill y
3719 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3720 -command do_rescan \
3722 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3723 lappend disable_on_lock \
3724 {.vpane.lower.commarea.buttons.rescan conf -state}
3726 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3727 -command do_add_all \
3729 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3730 lappend disable_on_lock \
3731 {.vpane.lower.commarea.buttons.incall conf -state}
3733 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3734 -command do_signoff \
3736 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3738 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3739 -command do_commit \
3741 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3742 lappend disable_on_lock \
3743 {.vpane.lower.commarea.buttons.commit conf -state}
3745 # -- Commit Message Buffer
3747 frame .vpane.lower.commarea.buffer
3748 frame .vpane.lower.commarea.buffer.header
3749 set ui_comm .vpane.lower.commarea.buffer.t
3750 set ui_coml .vpane.lower.commarea.buffer.header.l
3751 radiobutton .vpane.lower.commarea.buffer.header.new \
3752 -text {New Commit} \
3753 -command do_select_commit_type \
3754 -variable selected_commit_type \
3757 lappend disable_on_lock \
3758 [list .vpane.lower.commarea.buffer.header.new conf -state]
3759 radiobutton .vpane.lower.commarea.buffer.header.amend \
3760 -text {Amend Last Commit} \
3761 -command do_select_commit_type \
3762 -variable selected_commit_type \
3765 lappend disable_on_lock \
3766 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3771 proc trace_commit_type {varname args} {
3772 global ui_coml commit_type
3773 switch -glob -- $commit_type {
3774 initial {set txt {Initial Commit Message:}}
3775 amend {set txt {Amended Commit Message:}}
3776 amend-initial {set txt {Amended Initial Commit Message:}}
3777 amend-merge {set txt {Amended Merge Commit Message:}}
3778 merge {set txt {Merge Commit Message:}}
3779 * {set txt {Commit Message:}}
3781 $ui_coml conf -text $txt
3783 trace add variable commit_type write trace_commit_type
3784 pack $ui_coml -side left -fill x
3785 pack .vpane.lower.commarea.buffer.header.amend -side right
3786 pack .vpane.lower.commarea.buffer.header.new -side right
3788 text $ui_comm -background white -borderwidth 1 \
3791 -autoseparators true \
3793 -width 75 -height 9 -wrap none \
3795 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3796 scrollbar .vpane.lower.commarea.buffer.sby \
3797 -command [list $ui_comm yview]
3798 pack .vpane.lower.commarea.buffer.header -side top -fill x
3799 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3800 pack $ui_comm -side left -fill y
3801 pack .vpane.lower.commarea.buffer -side left -fill y
3803 # -- Commit Message Buffer Context Menu
3805 set ctxm .vpane.lower.commarea.buffer.ctxm
3806 menu $ctxm -tearoff 0
3810 -command {tk_textCut $ui_comm}
3814 -command {tk_textCopy $ui_comm}
3818 -command {tk_textPaste $ui_comm}
3822 -command {$ui_comm delete sel.first sel.last}
3825 -label {Select All} \
3827 -command {$ui_comm tag add sel 0.0 end}
3832 $ui_comm tag add sel 0.0 end
3833 tk_textCopy $ui_comm
3834 $ui_comm tag remove sel 0.0 end
3841 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
3845 set current_diff_path {}
3846 set diff_actions [list]
3847 proc trace_current_diff_path {varname args} {
3848 global current_diff_path diff_actions file_states
3849 if {$current_diff_path eq {}} {
3855 set p $current_diff_path
3856 set s [mapdesc [lindex $file_states($p) 0] $p]
3858 set p [escape_path $p]
3862 .vpane.lower.diff.header.status configure -text $s
3863 .vpane.lower.diff.header.file configure -text $f
3864 .vpane.lower.diff.header.path configure -text $p
3865 foreach w $diff_actions {
3869 trace add variable current_diff_path write trace_current_diff_path
3871 frame .vpane.lower.diff.header -background orange
3872 label .vpane.lower.diff.header.status \
3873 -background orange \
3874 -width $max_status_desc \
3878 label .vpane.lower.diff.header.file \
3879 -background orange \
3883 label .vpane.lower.diff.header.path \
3884 -background orange \
3888 pack .vpane.lower.diff.header.status -side left
3889 pack .vpane.lower.diff.header.file -side left
3890 pack .vpane.lower.diff.header.path -fill x
3891 set ctxm .vpane.lower.diff.header.ctxm
3892 menu $ctxm -tearoff 0
3901 -- $current_diff_path
3903 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3904 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
3908 frame .vpane.lower.diff.body
3909 set ui_diff .vpane.lower.diff.body.t
3910 text $ui_diff -background white -borderwidth 0 \
3911 -width 80 -height 15 -wrap none \
3913 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3914 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3916 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3917 -command [list $ui_diff xview]
3918 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3919 -command [list $ui_diff yview]
3920 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3921 pack .vpane.lower.diff.body.sby -side right -fill y
3922 pack $ui_diff -side left -fill both -expand 1
3923 pack .vpane.lower.diff.header -side top -fill x
3924 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3926 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
3927 $ui_diff tag conf d_+ -foreground {#00a000}
3928 $ui_diff tag conf d_- -foreground red
3930 $ui_diff tag conf d_++ -foreground {#00a000}
3931 $ui_diff tag conf d_-- -foreground red
3932 $ui_diff tag conf d_+s \
3933 -foreground {#00a000} \
3934 -background {#e2effa}
3935 $ui_diff tag conf d_-s \
3937 -background {#e2effa}
3938 $ui_diff tag conf d_s+ \
3939 -foreground {#00a000} \
3941 $ui_diff tag conf d_s- \
3945 $ui_diff tag conf d<<<<<<< \
3946 -foreground orange \
3948 $ui_diff tag conf d======= \
3949 -foreground orange \
3951 $ui_diff tag conf d>>>>>>> \
3952 -foreground orange \
3955 $ui_diff tag raise sel
3957 # -- Diff Body Context Menu
3959 set ctxm .vpane.lower.diff.body.ctxm
3960 menu $ctxm -tearoff 0
3964 -command reshow_diff
3968 -command {tk_textCopy $ui_diff}
3969 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3971 -label {Select All} \
3973 -command {$ui_diff tag add sel 0.0 end}
3974 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3979 $ui_diff tag add sel 0.0 end
3980 tk_textCopy $ui_diff
3981 $ui_diff tag remove sel 0.0 end
3983 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3986 -label {Decrease Font Size} \
3988 -command {incr_font_size font_diff -1}
3989 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3991 -label {Increase Font Size} \
3993 -command {incr_font_size font_diff 1}
3994 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3997 -label {Show Less Context} \
3999 -command {if {$repo_config(gui.diffcontext) >= 2} {
4000 incr repo_config(gui.diffcontext) -1
4003 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4005 -label {Show More Context} \
4008 incr repo_config(gui.diffcontext)
4011 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4013 $ctxm add command -label {Options...} \
4016 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
4020 set ui_status_value {Initializing...}
4021 label .status -textvariable ui_status_value \
4027 pack .status -anchor w -side bottom -fill x
4032 set gm $repo_config(gui.geometry)
4033 wm geometry . [lindex $gm 0]
4034 .vpane sash place 0 \
4035 [lindex [.vpane sash coord 0] 0] \
4037 .vpane.files sash place 0 \
4039 [lindex [.vpane.files sash coord 0] 1]
4045 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
4046 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
4047 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
4048 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
4049 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
4050 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
4051 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
4052 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
4053 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
4054 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4055 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4057 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
4058 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
4059 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
4060 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
4061 bind $ui_diff <$M1B-Key-v> {break}
4062 bind $ui_diff <$M1B-Key-V> {break}
4063 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4064 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4065 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
4066 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
4067 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
4068 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
4070 if {!$single_commit} {
4071 bind . <$M1B-Key-n> do_create_branch
4072 bind . <$M1B-Key-N> do_create_branch
4075 bind . <Destroy> do_quit
4076 bind all <Key-F5> do_rescan
4077 bind all <$M1B-Key-r> do_rescan
4078 bind all <$M1B-Key-R> do_rescan
4079 bind . <$M1B-Key-s> do_signoff
4080 bind . <$M1B-Key-S> do_signoff
4081 bind . <$M1B-Key-i> do_add_all
4082 bind . <$M1B-Key-I> do_add_all
4083 bind . <$M1B-Key-Return> do_commit
4084 bind all <$M1B-Key-q> do_quit
4085 bind all <$M1B-Key-Q> do_quit
4086 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
4087 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
4088 foreach i [list $ui_index $ui_workdir] {
4089 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
4090 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
4091 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
4095 set file_lists($ui_index) [list]
4096 set file_lists($ui_workdir) [list]
4100 set MERGE_HEAD [list]
4103 set current_branch {}
4104 set current_diff_path {}
4105 set selected_commit_type new
4107 wm title . "[appname
] ([file normalize
[file dirname [gitdir
]]])"
4108 focus -force $ui_comm
4110 # -- Warn the user about environmental problems. Cygwin's Tcl
4111 # does *not* pass its env array onto any processes it spawns.
4112 # This means that git processes get none of our environment.
4117 set msg "Possible environment issues exist.
4119 The following environment variables are probably
4120 going to be ignored by any Git subprocess run
4124 foreach name [array names env] {
4125 switch -regexp -- $name {
4126 {^GIT_INDEX_FILE$} -
4127 {^GIT_OBJECT_DIRECTORY$} -
4128 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4130 {^GIT_EXTERNAL_DIFF$} -
4134 {^GIT_CONFIG_LOCAL$} -
4135 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4136 append msg " - $name\n"
4139 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4140 append msg " - $name\n"
4142 set suggest_user $name
4146 if {$ignored_env > 0} {
4148 This is due to a known issue with the
4149 Tcl binary distributed by Cygwin.
"
4151 if {$suggest_user ne {}} {
4154 A good replacement
for $suggest_user
4155 is placing values
for the user.name and
4156 user.email settings into your personal
4162 unset ignored_env msg suggest_user name
4165 # -- Only initialize complex UI if we are going to stay running.
4167 if {!$single_commit} {
4171 populate_branch_menu
4172 populate_fetch_menu .mbar.fetch
4173 populate_pull_menu .mbar.pull
4174 populate_push_menu .mbar.push
4177 # -- Only suggest a gc run if we are going to stay running.
4179 if {!$single_commit} {
4180 set object_limit 2000
4181 if {[is_Windows]} {set object_limit 200}
4182 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4183 if {$objects_current >= $object_limit} {
4185 "This repository currently has
$objects_current loose objects.
4187 To maintain optimal performance it is strongly
4188 recommended that you
compress the database
4189 when
more than
$object_limit loose objects exist.
4191 Compress the database now?
"] eq yes} {
4195 unset object_limit _junk objects_current
4198 lock_index begin-read