2 # Tcl ignores the next line -*- tcl -*- \
5 # Copyright (C) 2006 Shawn Pearce, Paul Mackerras. All rights reserved.
6 # This program is free software; it may be used, copied, modified
7 # and distributed under the terms of the GNU General Public Licence,
8 # either version 2, or (at your option) any later version.
10 set appname
[lindex
[file split $argv0] end
]
13 ######################################################################
17 proc is_many_config
{name
} {
18 switch
-glob -- $name {
27 proc load_config
{include_global
} {
28 global repo_config global_config default_config
30 array
unset global_config
31 if {$include_global} {
33 set fd_rc
[open
"| git repo-config --global --list" r
]
34 while {[gets
$fd_rc line
] >= 0} {
35 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
36 if {[is_many_config
$name]} {
37 lappend global_config
($name) $value
39 set global_config
($name) $value
47 array
unset repo_config
49 set fd_rc
[open
"| git repo-config --list" r
]
50 while {[gets
$fd_rc line
] >= 0} {
51 if {[regexp
{^
([^
=]+)=(.
*)$
} $line line name value
]} {
52 if {[is_many_config
$name]} {
53 lappend repo_config
($name) $value
55 set repo_config
($name) $value
62 foreach name
[array names default_config
] {
63 if {[catch
{set v
$global_config($name)}]} {
64 set global_config
($name) $default_config($name)
66 if {[catch
{set v
$repo_config($name)}]} {
67 set repo_config
($name) $default_config($name)
73 global default_config font_descs
74 global repo_config global_config
75 global repo_config_new global_config_new
77 foreach option
$font_descs {
78 set name
[lindex
$option 0]
79 set font
[lindex
$option 1]
80 font configure
$font \
81 -family $global_config_new(gui.
$font^^family
) \
82 -size $global_config_new(gui.
$font^^size
)
83 font configure
${font}bold \
84 -family $global_config_new(gui.
$font^^family
) \
85 -size $global_config_new(gui.
$font^^size
)
86 set global_config_new
(gui.
$name) [font configure
$font]
87 unset global_config_new
(gui.
$font^^family
)
88 unset global_config_new
(gui.
$font^^size
)
91 foreach name
[array names default_config
] {
92 set value
$global_config_new($name)
93 if {$value ne
$global_config($name)} {
94 if {$value eq
$default_config($name)} {
95 catch
{exec git repo-config
--global --unset $name}
97 regsub
-all "\[{}\]" $value {"} value
98 exec git repo-config --global $name $value
100 set global_config($name) $value
101 if {$value eq $repo_config($name)} {
102 catch {exec git repo-config --unset $name}
103 set repo_config($name) $value
108 foreach name [array names default_config] {
109 set value $repo_config_new($name)
110 if {$value ne $repo_config($name)} {
111 if {$value eq $global_config($name)} {
112 catch {exec git repo-config --unset $name}
114 regsub -all "\
[{}\
]" $value {"} value
115 exec git repo-config
$name $value
117 set repo_config
($name) $value
122 proc error_popup
{msg
} {
123 global gitdir appname
128 append title
[lindex \
129 [file split [file normalize
[file dirname $gitdir]]] \
133 set cmd
[list tk_messageBox \
136 -title "$title: error" \
138 if {[winfo ismapped .
]} {
139 lappend cmd
-parent .
144 proc info_popup
{msg
} {
145 global gitdir appname
150 append title
[lindex \
151 [file split [file normalize
[file dirname $gitdir]]] \
163 ######################################################################
167 if { [catch
{set gitdir
$env(GIT_DIR
)}]
168 && [catch
{set gitdir
[exec git rev-parse
--git-dir]} err
]} {
169 catch
{wm withdraw .
}
170 error_popup
"Cannot find the git directory:\n\n$err"
173 if {![file isdirectory
$gitdir]} {
174 catch
{wm withdraw .
}
175 error_popup
"Git directory not found:\n\n$gitdir"
178 if {[lindex
[file split $gitdir] end
] ne
{.git
}} {
179 catch
{wm withdraw .
}
180 error_popup
"Cannot use funny .git directory:\n\n$gitdir"
183 if {[catch
{cd [file dirname $gitdir]} err
]} {
184 catch
{wm withdraw .
}
185 error_popup
"No working directory [file dirname $gitdir]:\n\n$err"
190 if {$appname eq
{git-citool
}} {
194 ######################################################################
202 set disable_on_lock
[list
]
203 set index_lock_type none
205 proc lock_index
{type} {
206 global index_lock_type disable_on_lock
208 if {$index_lock_type eq
{none
}} {
209 set index_lock_type
$type
210 foreach w
$disable_on_lock {
211 uplevel
#0 $w disabled
214 } elseif
{$index_lock_type eq
"begin-$type"} {
215 set index_lock_type
$type
221 proc unlock_index
{} {
222 global index_lock_type disable_on_lock
224 set index_lock_type none
225 foreach w
$disable_on_lock {
230 ######################################################################
234 proc repository_state
{hdvar ctvar
} {
236 upvar
$hdvar hd
$ctvar ct
238 if {[catch
{set hd
[exec git rev-parse
--verify HEAD
]}]} {
241 } elseif
{[file exists
[file join $gitdir MERGE_HEAD
]]} {
249 global PARENT empty_tree
254 if {$empty_tree eq
{}} {
255 set empty_tree
[exec git mktree
<< {}]
260 proc rescan
{after
} {
261 global HEAD PARENT commit_type
262 global ui_index ui_other ui_status_value ui_comm
263 global rescan_active file_states
266 if {$rescan_active > 0 ||
![lock_index
read]} return
268 repository_state new_HEAD new_type
269 if {[string match amend
* $commit_type]
270 && $new_type eq
{normal
}
271 && $new_HEAD eq
$HEAD} {
275 set commit_type
$new_type
278 array
unset file_states
280 if {![$ui_comm edit modified
]
281 ||
[string trim
[$ui_comm get
0.0 end
]] eq
{}} {
282 if {[load_message GITGUI_MSG
]} {
283 } elseif
{[load_message MERGE_MSG
]} {
284 } elseif
{[load_message SQUASH_MSG
]} {
286 $ui_comm edit modified false
290 if {$repo_config(gui.trustmtime
) eq
{true
}} {
291 rescan_stage2
{} $after
294 set ui_status_value
{Refreshing
file status...
}
295 set cmd
[list git update-index
]
297 lappend cmd
--unmerged
298 lappend cmd
--ignore-missing
299 lappend cmd
--refresh
300 set fd_rf
[open
"| $cmd" r
]
301 fconfigure
$fd_rf -blocking 0 -translation binary
302 fileevent
$fd_rf readable \
303 [list rescan_stage2
$fd_rf $after]
307 proc rescan_stage2
{fd after
} {
308 global gitdir ui_status_value
309 global rescan_active buf_rdi buf_rdf buf_rlo
313 if {![eof
$fd]} return
317 set ls_others
[list | git ls-files
--others -z \
318 --exclude-per-directory=.gitignore
]
319 set info_exclude
[file join $gitdir info exclude
]
320 if {[file readable
$info_exclude]} {
321 lappend ls_others
"--exclude-from=$info_exclude"
329 set ui_status_value
{Scanning
for modified files ...
}
330 set fd_di
[open
"| git diff-index --cached -z [PARENT]" r
]
331 set fd_df
[open
"| git diff-files -z" r
]
332 set fd_lo
[open
$ls_others r
]
334 fconfigure
$fd_di -blocking 0 -translation binary
335 fconfigure
$fd_df -blocking 0 -translation binary
336 fconfigure
$fd_lo -blocking 0 -translation binary
337 fileevent
$fd_di readable
[list read_diff_index
$fd_di $after]
338 fileevent
$fd_df readable
[list read_diff_files
$fd_df $after]
339 fileevent
$fd_lo readable
[list read_ls_others
$fd_lo $after]
342 proc load_message
{file} {
343 global gitdir ui_comm
345 set f
[file join $gitdir $file]
346 if {[file isfile
$f]} {
347 if {[catch
{set fd
[open
$f r
]}]} {
350 set content
[string trim
[read $fd]]
352 $ui_comm delete
0.0 end
353 $ui_comm insert end
$content
359 proc read_diff_index
{fd after
} {
362 append buf_rdi
[read $fd]
364 set n
[string length
$buf_rdi]
366 set z1
[string first
"\0" $buf_rdi $c]
369 set z2
[string first
"\0" $buf_rdi $z1]
373 set i
[split [string range
$buf_rdi $c [expr {$z1 - 2}]] { }]
375 [string range
$buf_rdi $z1 [expr {$z2 - 1}]] \
377 [list
[lindex
$i 0] [lindex
$i 2]] \
383 set buf_rdi
[string range
$buf_rdi $c end
]
388 rescan_done
$fd buf_rdi
$after
391 proc read_diff_files
{fd after
} {
394 append buf_rdf
[read $fd]
396 set n
[string length
$buf_rdf]
398 set z1
[string first
"\0" $buf_rdf $c]
401 set z2
[string first
"\0" $buf_rdf $z1]
405 set i
[split [string range
$buf_rdf $c [expr {$z1 - 2}]] { }]
407 [string range
$buf_rdf $z1 [expr {$z2 - 1}]] \
410 [list
[lindex
$i 0] [lindex
$i 2]]
415 set buf_rdf
[string range
$buf_rdf $c end
]
420 rescan_done
$fd buf_rdf
$after
423 proc read_ls_others
{fd after
} {
426 append buf_rlo
[read $fd]
427 set pck
[split $buf_rlo "\0"]
428 set buf_rlo
[lindex
$pck end
]
429 foreach p
[lrange
$pck 0 end-1
] {
432 rescan_done
$fd buf_rlo
$after
435 proc rescan_done
{fd buf after
} {
437 global file_states repo_config
440 if {![eof
$fd]} return
443 if {[incr rescan_active
-1] > 0} return
449 if {$repo_config(gui.partialinclude
) ne
{true
}} {
451 foreach path
[array names file_states
] {
452 switch
-- [lindex
$file_states($path) 0] {
454 MM
{lappend pathList
$path}
457 if {$pathList ne
{}} {
459 "Updating included files" \
461 [concat
{reshow_diff
;} $after]
470 proc prune_selection
{} {
471 global file_states selected_paths
473 foreach path
[array names selected_paths
] {
474 if {[catch
{set still_here
$file_states($path)}]} {
475 unset selected_paths
($path)
480 ######################################################################
485 global ui_diff current_diff ui_index ui_other
487 $ui_diff conf
-state normal
488 $ui_diff delete
0.0 end
489 $ui_diff conf
-state disabled
493 $ui_index tag remove in_diff
0.0 end
494 $ui_other tag remove in_diff
0.0 end
497 proc reshow_diff
{} {
498 global current_diff ui_status_value file_states
500 if {$current_diff eq
{}
501 ||
[catch
{set s
$file_states($current_diff)}]} {
504 show_diff
$current_diff
508 proc handle_empty_diff
{} {
509 global current_diff file_states file_lists
511 set path
$current_diff
512 set s
$file_states($path)
513 if {[lindex
$s 0] ne
{_M
}} return
515 info_popup
"No differences detected.
517 [short_path $path] has no changes.
519 The modification date of this file was updated
520 by another application and you currently have
521 the Trust File Modification Timestamps option
522 enabled, so Git did not automatically detect
523 that there are no content differences in this
526 This file will now be removed from the modified
527 files list, to prevent possible confusion.
529 if {[catch
{exec git update-index
-- $path} err
]} {
530 error_popup
"Failed to refresh index:\n\n$err"
534 set old_w
[mapcol
[lindex
$file_states($path) 0] $path]
535 set lno
[lsearch
-sorted $file_lists($old_w) $path]
537 set file_lists
($old_w) \
538 [lreplace
$file_lists($old_w) $lno $lno]
540 $old_w conf
-state normal
541 $old_w delete
$lno.0 [expr {$lno + 1}].0
542 $old_w conf
-state disabled
546 proc show_diff
{path
{w
{}} {lno
{}}} {
547 global file_states file_lists
548 global is_3way_diff diff_active repo_config
549 global ui_diff current_diff ui_status_value
551 if {$diff_active ||
![lock_index
read]} return
554 if {$w eq
{} ||
$lno == {}} {
555 foreach w
[array names file_lists
] {
556 set lno
[lsearch
-sorted $file_lists($w) $path]
563 if {$w ne
{} && $lno >= 1} {
564 $w tag add in_diff
$lno.0 [expr {$lno + 1}].0
567 set s
$file_states($path)
571 set current_diff
$path
572 set ui_status_value
"Loading diff of [escape_path $path]..."
574 set cmd
[list | git diff-index
]
575 lappend cmd
--no-color
576 if {$repo_config(gui.diffcontext
) > 0} {
577 lappend cmd
"-U$repo_config(gui.diffcontext)"
587 set fd
[open
$path r
]
588 set content
[read $fd]
593 set ui_status_value
"Unable to display [escape_path $path]"
594 error_popup
"Error loading file:\n\n$err"
597 $ui_diff conf
-state normal
598 $ui_diff insert end
$content
599 $ui_diff conf
-state disabled
602 set ui_status_value
{Ready.
}
611 if {[catch
{set fd
[open
$cmd r
]} err
]} {
614 set ui_status_value
"Unable to display [escape_path $path]"
615 error_popup
"Error loading diff:\n\n$err"
619 fconfigure
$fd -blocking 0 -translation auto
620 fileevent
$fd readable
[list read_diff
$fd]
623 proc read_diff
{fd
} {
624 global ui_diff ui_status_value is_3way_diff diff_active
627 $ui_diff conf
-state normal
628 while {[gets
$fd line
] >= 0} {
629 # -- Cleanup uninteresting diff header lines.
631 if {[string match
{diff --git *} $line]} continue
632 if {[string match
{diff --combined *} $line]} continue
633 if {[string match
{--- *} $line]} continue
634 if {[string match
{+++ *} $line]} continue
635 if {$line eq
{deleted
file mode
120000}} {
636 set line
"deleted symlink"
639 # -- Automatically detect if this is a 3 way diff.
641 if {[string match
{@@@
*} $line]} {set is_3way_diff
1}
643 # -- Reformat a 3 way diff, 'cause its too weird.
646 set op
[string range
$line 0 1]
649 {++} {set tags d_
+ ; set op
{ +}}
650 {--} {set tags d_-
; set op
{ -}}
651 { +} {set tags d_
++; set op
{++}}
652 { -} {set tags d_--
; set op
{--}}
653 {+ } {set tags d_-
+; set op
{-+}}
654 {- } {set tags d_
+-; set op
{+-}}
655 default
{set tags
{}}
657 set line
[string replace
$line 0 1 $op]
659 switch
-- [string index
$line 0] {
663 default
{set tags
{}}
666 $ui_diff insert end
$line $tags
667 $ui_diff insert end
"\n" $tags
669 $ui_diff conf
-state disabled
675 set ui_status_value
{Ready.
}
677 if {$repo_config(gui.trustmtime
) eq
{true
}
678 && [$ui_diff index end
] eq
{2.0}} {
684 ######################################################################
688 proc load_last_commit
{} {
689 global HEAD PARENT commit_type ui_comm
691 if {[string match amend
* $commit_type]} return
692 if {$commit_type ne
{normal
}} {
693 error_popup
"Can't amend a $commit_type commit."
701 set fd
[open
"| git cat-file commit $HEAD" r
]
702 while {[gets
$fd line
] > 0} {
703 if {[string match
{parent
*} $line]} {
704 set parent
[string range
$line 7 end
]
708 set msg
[string trim
[read $fd]]
711 error_popup
"Error loading commit data for amend:\n\n$err"
715 if {$parent_count > 1} {
716 error_popup
{Can
't amend a merge commit.}
720 if {$parent_count == 0} {
721 set commit_type amend-initial
723 } elseif {$parent_count == 1} {
724 set commit_type amend
728 $ui_comm delete 0.0 end
729 $ui_comm insert end $msg
730 $ui_comm edit modified false
732 rescan {set ui_status_value {Ready.}}
735 proc create_new_commit {} {
736 global commit_type ui_comm
738 set commit_type normal
739 $ui_comm delete 0.0 end
740 $ui_comm edit modified false
742 rescan {set ui_status_value {Ready.}}
745 set GIT_COMMITTER_IDENT {}
747 proc committer_ident {} {
748 global GIT_COMMITTER_IDENT
750 if {$GIT_COMMITTER_IDENT eq {}} {
751 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
752 error_popup "Unable to obtain your identity:\n\n$err"
755 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
756 $me me GIT_COMMITTER_IDENT]} {
757 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
762 return $GIT_COMMITTER_IDENT
765 proc commit_tree {} {
766 global HEAD commit_type file_states ui_comm repo_config
768 if {![lock_index update]} return
769 if {[committer_ident] eq {}} return
771 # -- Our in memory state should match the repository.
773 repository_state curHEAD cur_type
774 if {[string match amend* $commit_type]
775 && $cur_type eq {normal}
776 && $curHEAD eq $HEAD} {
777 } elseif {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
778 info_popup {Last scanned state does not match repository state.
780 Another Git program has modified this repository
781 since the last scan. A rescan must be performed
782 before another commit can be created.
784 The rescan will be automatically started now.
787 rescan {set ui_status_value {Ready.}}
791 # -- At least one file should differ in the index.
794 foreach path [array names file_states] {
795 switch -glob -- [lindex $file_states($path) 0] {
799 M? {set files_ready 1; break}
801 error_popup "Unmerged files cannot be committed.
803 File [short_path $path] has merge conflicts.
804 You must resolve them and include the file before committing.
810 error_popup "Unknown file state [lindex $s 0] detected.
812 File [short_path $path] cannot be committed by this program.
818 error_popup {No included files to commit.
820 You must include at least 1 file before you can commit.
826 # -- A message is required.
828 set msg [string trim [$ui_comm get 1.0 end]]
830 error_popup {Please supply a commit message.
832 A good commit message has the following format:
834 - First line: Describe in one sentance what you did.
836 - Remaining lines: Describe why this change is good.
842 # -- Update included files if partialincludes are off.
844 if {$repo_config(gui.partialinclude) ne {true}} {
846 foreach path [array names file_states] {
847 switch -glob -- [lindex $file_states($path) 0] {
849 M? {lappend pathList $path}
852 if {$pathList ne {}} {
855 "Updating included files" \
857 [concat {lock_index update;} \
858 [list commit_prehook $curHEAD $msg]]
863 commit_prehook $curHEAD $msg
866 proc commit_prehook {curHEAD msg} {
867 global tcl_platform gitdir ui_status_value pch_error
869 # On Cygwin [file executable] might lie so we need to ask
870 # the shell if the hook is executable. Yes that's annoying.
872 set pchook
[file join $gitdir hooks pre-commit
]
873 if {$tcl_platform(platform
) eq
{windows
}
874 && [file isfile
$pchook]} {
875 set pchook
[list sh
-c [concat \
876 "if test -x \"$pchook\";" \
877 "then exec \"$pchook\" 2>&1;" \
879 } elseif
{[file executable
$pchook]} {
880 set pchook
[list
$pchook |
& cat]
882 commit_writetree
$curHEAD $msg
886 set ui_status_value
{Calling pre-commit hook...
}
888 set fd_ph
[open
"| $pchook" r
]
889 fconfigure
$fd_ph -blocking 0 -translation binary
890 fileevent
$fd_ph readable \
891 [list commit_prehook_wait
$fd_ph $curHEAD $msg]
894 proc commit_prehook_wait
{fd_ph curHEAD msg
} {
895 global pch_error ui_status_value
897 append pch_error
[read $fd_ph]
898 fconfigure
$fd_ph -blocking 1
900 if {[catch
{close
$fd_ph}]} {
901 set ui_status_value
{Commit declined by pre-commit hook.
}
902 hook_failed_popup pre-commit
$pch_error
905 commit_writetree
$curHEAD $msg
910 fconfigure
$fd_ph -blocking 0
913 proc commit_writetree
{curHEAD msg
} {
914 global ui_status_value
916 set ui_status_value
{Committing changes...
}
917 set fd_wt
[open
"| git write-tree" r
]
918 fileevent
$fd_wt readable \
919 [list commit_committree
$fd_wt $curHEAD $msg]
922 proc commit_committree
{fd_wt curHEAD msg
} {
923 global single_commit gitdir HEAD PARENT commit_type tcl_platform
924 global ui_status_value ui_comm selected_commit_type
925 global file_states selected_paths
928 if {$tree_id eq
{} ||
[catch
{close
$fd_wt} err
]} {
929 error_popup
"write-tree failed:\n\n$err"
930 set ui_status_value
{Commit failed.
}
935 # -- Create the commit.
937 set cmd
[list git commit-tree
$tree_id]
939 lappend cmd
-p $PARENT
941 if {$commit_type eq
{merge
}} {
943 set fd_mh
[open
[file join $gitdir MERGE_HEAD
] r
]
944 while {[gets
$fd_mh merge_head
] >= 0} {
945 lappend cmd
-p $merge_head
949 error_popup
"Loading MERGE_HEAD failed:\n\n$err"
950 set ui_status_value
{Commit failed.
}
956 # git commit-tree writes to stderr during initial commit.
957 lappend cmd
2>/dev
/null
960 if {[catch
{set cmt_id
[eval exec $cmd]} err
]} {
961 error_popup
"commit-tree failed:\n\n$err"
962 set ui_status_value
{Commit failed.
}
967 # -- Update the HEAD ref.
970 if {$commit_type ne
{normal
}} {
971 append reflogm
" ($commit_type)"
973 set i
[string first
"\n" $msg]
975 append reflogm
{: } [string range
$msg 0 [expr {$i - 1}]]
977 append reflogm
{: } $msg
979 set cmd
[list git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD]
980 if {[catch
{eval exec $cmd} err
]} {
981 error_popup
"update-ref failed:\n\n$err"
982 set ui_status_value
{Commit failed.
}
987 # -- Cleanup after ourselves.
989 catch
{file delete
[file join $gitdir MERGE_HEAD
]}
990 catch
{file delete
[file join $gitdir MERGE_MSG
]}
991 catch
{file delete
[file join $gitdir SQUASH_MSG
]}
992 catch
{file delete
[file join $gitdir GITGUI_MSG
]}
994 # -- Let rerere do its thing.
996 if {[file isdirectory
[file join $gitdir rr-cache
]]} {
997 catch
{exec git rerere
}
1000 # -- Run the post-commit hook.
1002 set pchook
[file join $gitdir hooks post-commit
]
1003 if {$tcl_platform(platform
) eq
{windows
} && [file isfile
$pchook]} {
1004 set pchook
[list sh
-c [concat \
1005 "if test -x \"$pchook\";" \
1006 "then exec \"$pchook\";" \
1008 } elseif
{![file executable
$pchook]} {
1011 if {$pchook ne
{}} {
1012 catch
{exec $pchook &}
1015 $ui_comm delete
0.0 end
1016 $ui_comm edit modified false
1019 if {$single_commit} do_quit
1021 # -- Update status without invoking any git commands.
1023 set commit_type normal
1024 set selected_commit_type new
1028 foreach path
[array names file_states
] {
1029 set s
$file_states($path)
1031 switch
-glob -- $m {
1036 D?
{set m _
[string index
$m 1]}
1040 unset file_states
($path)
1041 catch
{unset selected_paths
($path)}
1043 lset file_states
($path) 0 $m
1050 set ui_status_value \
1051 "Changes committed as [string range $cmt_id 0 7]."
1054 ######################################################################
1058 proc fetch_from
{remote
} {
1059 set w
[new_console
"fetch $remote" \
1060 "Fetching new changes from $remote"]
1061 set cmd
[list git fetch
]
1063 console_exec
$w $cmd
1066 proc pull_remote
{remote branch
} {
1067 global HEAD commit_type file_states repo_config
1069 if {![lock_index update
]} return
1071 # -- Our in memory state should match the repository.
1073 repository_state curHEAD cur_type
1074 if {$commit_type ne
$cur_type ||
$HEAD ne
$curHEAD} {
1075 error_popup
{Last scanned state does not match repository state.
1077 Its highly likely that another Git program modified the
1078 repository since our last scan. A rescan is required
1079 before a pull can be started.
1082 rescan
{set ui_status_value
{Ready.
}}
1086 # -- No differences should exist before a pull.
1088 if {[array size file_states
] != 0} {
1089 error_popup
{Uncommitted but modified files are present.
1091 You should not perform a pull with unmodified files
in your working
1092 directory as Git would be unable to recover from an incorrect merge.
1094 Commit or throw away all changes before starting a pull operation.
1100 set w
[new_console
"pull $remote $branch" \
1101 "Pulling new changes from branch $branch in $remote"]
1102 set cmd
[list git pull
]
1103 if {$repo_config(gui.pullsummary
) eq
{false
}} {
1104 lappend cmd
--no-summary
1108 console_exec
$w $cmd [list post_pull_remote
$remote $branch]
1111 proc post_pull_remote
{remote branch success
} {
1112 global HEAD PARENT commit_type selected_commit_type
1113 global ui_status_value
1117 repository_state HEAD commit_type
1119 set selected_commit_type new
1120 set $ui_status_value "Pulling $branch from $remote complete."
1122 set m
"Conflicts detected while pulling $branch from $remote."
1123 rescan
"set ui_status_value {$m}"
1127 proc push_to
{remote
} {
1128 set w
[new_console
"push $remote" \
1129 "Pushing changes to $remote"]
1130 set cmd
[list git push
]
1132 console_exec
$w $cmd
1135 ######################################################################
1139 proc mapcol
{state path
} {
1140 global all_cols ui_other
1142 if {[catch
{set r
$all_cols($state)}]} {
1143 puts
"error: no column for state={$state} $path"
1149 proc mapicon
{state path
} {
1152 if {[catch
{set r
$all_icons($state)}]} {
1153 puts
"error: no icon for state={$state} $path"
1159 proc mapdesc
{state path
} {
1162 if {[catch
{set r
$all_descs($state)}]} {
1163 puts
"error: no desc for state={$state} $path"
1169 proc escape_path
{path
} {
1170 regsub
-all "\n" $path "\\n" path
1174 proc short_path
{path
} {
1175 return [escape_path
[lindex
[file split $path] end
]]
1179 set null_sha1
[string repeat
0 40]
1181 proc merge_state
{path new_state
{head_info
{}} {index_info
{}}} {
1182 global file_states next_icon_id null_sha1
1184 set s0
[string index
$new_state 0]
1185 set s1
[string index
$new_state 1]
1187 if {[catch
{set info
$file_states($path)}]} {
1189 set icon n
[incr next_icon_id
]
1191 set state
[lindex
$info 0]
1192 set icon
[lindex
$info 1]
1193 if {$head_info eq
{}} {set head_info
[lindex
$info 2]}
1194 if {$index_info eq
{}} {set index_info
[lindex
$info 3]}
1197 if {$s0 eq
{?
}} {set s0
[string index
$state 0]} \
1198 elseif
{$s0 eq
{_
}} {set s0 _
}
1200 if {$s1 eq
{?
}} {set s1
[string index
$state 1]} \
1201 elseif
{$s1 eq
{_
}} {set s1 _
}
1203 if {$s0 eq
{A
} && $s1 eq
{_
} && $head_info eq
{}} {
1204 set head_info
[list
0 $null_sha1]
1205 } elseif
{$s0 ne
{_
} && [string index
$state 0] eq
{_
}
1206 && $head_info eq
{}} {
1207 set head_info
$index_info
1210 set file_states
($path) [list
$s0$s1 $icon \
1211 $head_info $index_info \
1216 proc display_file
{path state
} {
1217 global file_states file_lists selected_paths
1219 set old_m
[merge_state
$path $state]
1220 set s
$file_states($path)
1221 set new_m
[lindex
$s 0]
1222 set new_w
[mapcol
$new_m $path]
1223 set old_w
[mapcol
$old_m $path]
1224 set new_icon
[mapicon
$new_m $path]
1226 if {$new_w ne
$old_w} {
1227 set lno
[lsearch
-sorted $file_lists($old_w) $path]
1230 $old_w conf
-state normal
1231 $old_w delete
$lno.0 [expr {$lno + 1}].0
1232 $old_w conf
-state disabled
1235 lappend file_lists
($new_w) $path
1236 set file_lists
($new_w) [lsort
$file_lists($new_w)]
1237 set lno
[lsearch
-sorted $file_lists($new_w) $path]
1239 $new_w conf
-state normal
1240 $new_w image create
$lno.0 \
1241 -align center
-padx 5 -pady 1 \
1242 -name [lindex
$s 1] \
1244 $new_w insert
$lno.1 "[escape_path $path]\n"
1245 if {[catch
{set in_sel
$selected_paths($path)}]} {
1249 $new_w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1251 $new_w conf
-state disabled
1252 } elseif
{$new_icon ne
[mapicon
$old_m $path]} {
1253 $new_w conf
-state normal
1254 $new_w image conf
[lindex
$s 1] -image $new_icon
1255 $new_w conf
-state disabled
1259 proc display_all_files
{} {
1260 global ui_index ui_other
1261 global file_states file_lists
1262 global last_clicked selected_paths
1264 $ui_index conf
-state normal
1265 $ui_other conf
-state normal
1267 $ui_index delete
0.0 end
1268 $ui_other delete
0.0 end
1271 set file_lists
($ui_index) [list
]
1272 set file_lists
($ui_other) [list
]
1274 foreach path
[lsort
[array names file_states
]] {
1275 set s
$file_states($path)
1277 set w
[mapcol
$m $path]
1278 lappend file_lists
($w) $path
1279 set lno
[expr {[lindex
[split [$w index end
] .
] 0] - 1}]
1280 $w image create end \
1281 -align center
-padx 5 -pady 1 \
1282 -name [lindex
$s 1] \
1283 -image [mapicon
$m $path]
1284 $w insert end
"[escape_path $path]\n"
1285 if {[catch
{set in_sel
$selected_paths($path)}]} {
1289 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1293 $ui_index conf
-state disabled
1294 $ui_other conf
-state disabled
1297 proc update_indexinfo
{msg pathList after
} {
1298 global update_index_cp ui_status_value
1300 if {![lock_index update
]} return
1302 set update_index_cp
0
1303 set pathList
[lsort
$pathList]
1304 set totalCnt
[llength
$pathList]
1305 set batch [expr {int
($totalCnt * .01) + 1}]
1306 if {$batch > 25} {set batch 25}
1308 set ui_status_value
[format \
1309 "$msg... %i/%i files (%.2f%%)" \
1313 set fd
[open
"| git update-index -z --index-info" w
]
1319 fileevent
$fd writable
[list \
1320 write_update_indexinfo \
1330 proc write_update_indexinfo
{fd pathList totalCnt
batch msg after
} {
1331 global update_index_cp ui_status_value
1332 global file_states current_diff
1334 if {$update_index_cp >= $totalCnt} {
1341 for {set i
$batch} \
1342 {$update_index_cp < $totalCnt && $i > 0} \
1344 set path
[lindex
$pathList $update_index_cp]
1345 incr update_index_cp
1347 set s
$file_states($path)
1348 switch
-glob -- [lindex
$s 0] {
1354 set info
[lindex
$s 2]
1355 if {$info eq
{}} continue
1357 puts
-nonewline $fd $info
1358 puts
-nonewline $fd "\t"
1359 puts
-nonewline $fd $path
1360 puts
-nonewline $fd "\0"
1361 display_file
$path $new
1364 set ui_status_value
[format \
1365 "$msg... %i/%i files (%.2f%%)" \
1368 [expr {100.0 * $update_index_cp / $totalCnt}]]
1371 proc update_index
{msg pathList after
} {
1372 global update_index_cp ui_status_value
1374 if {![lock_index update
]} return
1376 set update_index_cp
0
1377 set pathList
[lsort
$pathList]
1378 set totalCnt
[llength
$pathList]
1379 set batch [expr {int
($totalCnt * .01) + 1}]
1380 if {$batch > 25} {set batch 25}
1382 set ui_status_value
[format \
1383 "$msg... %i/%i files (%.2f%%)" \
1387 set fd
[open
"| git update-index --add --remove -z --stdin" w
]
1393 fileevent
$fd writable
[list \
1394 write_update_index \
1404 proc write_update_index
{fd pathList totalCnt
batch msg after
} {
1405 global update_index_cp ui_status_value
1406 global file_states current_diff
1408 if {$update_index_cp >= $totalCnt} {
1415 for {set i
$batch} \
1416 {$update_index_cp < $totalCnt && $i > 0} \
1418 set path
[lindex
$pathList $update_index_cp]
1419 incr update_index_cp
1421 switch
-glob -- [lindex
$file_states($path) 0] {
1437 puts
-nonewline $fd $path
1438 puts
-nonewline $fd "\0"
1439 display_file
$path $new
1442 set ui_status_value
[format \
1443 "$msg... %i/%i files (%.2f%%)" \
1446 [expr {100.0 * $update_index_cp / $totalCnt}]]
1449 ######################################################################
1451 ## remote management
1453 proc load_all_remotes
{} {
1454 global gitdir all_remotes repo_config
1456 set all_remotes
[list
]
1457 set rm_dir
[file join $gitdir remotes
]
1458 if {[file isdirectory
$rm_dir]} {
1459 set all_remotes
[concat
$all_remotes [glob \
1463 -directory $rm_dir *]]
1466 foreach line
[array names repo_config remote.
*.url
] {
1467 if {[regexp ^remote\.
(.
*)\.url\$
$line line name
]} {
1468 lappend all_remotes
$name
1472 set all_remotes
[lsort
-unique $all_remotes]
1475 proc populate_fetch_menu
{m
} {
1476 global gitdir all_remotes repo_config
1478 foreach r
$all_remotes {
1480 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1481 if {![catch
{set a
$repo_config(remote.
$r.fetch
)}]} {
1486 set fd
[open
[file join $gitdir remotes
$r] r
]
1487 while {[gets
$fd n
] >= 0} {
1488 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $n]} {
1499 -label "Fetch from $r..." \
1500 -command [list fetch_from
$r] \
1506 proc populate_push_menu
{m
} {
1507 global gitdir all_remotes repo_config
1509 foreach r
$all_remotes {
1511 if {![catch
{set a
$repo_config(remote.
$r.url
)}]} {
1512 if {![catch
{set a
$repo_config(remote.
$r.push
)}]} {
1517 set fd
[open
[file join $gitdir remotes
$r] r
]
1518 while {[gets
$fd n
] >= 0} {
1519 if {[regexp
{^Push
:[ \t]*([^
:]+):} $n]} {
1530 -label "Push to $r..." \
1531 -command [list push_to
$r] \
1537 proc populate_pull_menu
{m
} {
1538 global gitdir repo_config all_remotes disable_on_lock
1540 foreach remote
$all_remotes {
1542 if {[array get repo_config remote.
$remote.url
] ne
{}} {
1543 if {[array get repo_config remote.
$remote.fetch
] ne
{}} {
1544 regexp
{^
([^
:]+):} \
1545 [lindex
$repo_config(remote.
$remote.fetch
) 0] \
1550 set fd
[open
[file join $gitdir remotes
$remote] r
]
1551 while {[gets
$fd line
] >= 0} {
1552 if {[regexp
{^Pull
:[ \t]*([^
:]+):} $line line rb
]} {
1561 regsub ^refs
/heads
/ $rb {} rb_short
1562 if {$rb_short ne
{}} {
1564 -label "Branch $rb_short from $remote..." \
1565 -command [list pull_remote
$remote $rb] \
1567 lappend disable_on_lock \
1568 [list
$m entryconf
[$m index last
] -state]
1573 ######################################################################
1578 #define mask_width 14
1579 #define mask_height 15
1580 static unsigned char mask_bits
[] = {
1581 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1582 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1583 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1586 image create bitmap file_plain
-background white
-foreground black
-data {
1587 #define plain_width 14
1588 #define plain_height 15
1589 static unsigned char plain_bits
[] = {
1590 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1591 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1592 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1593 } -maskdata $filemask
1595 image create bitmap file_mod
-background white
-foreground blue
-data {
1596 #define mod_width 14
1597 #define mod_height 15
1598 static unsigned char mod_bits
[] = {
1599 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1600 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1601 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1602 } -maskdata $filemask
1604 image create bitmap file_fulltick
-background white
-foreground "#007000" -data {
1605 #define file_fulltick_width 14
1606 #define file_fulltick_height 15
1607 static unsigned char file_fulltick_bits
[] = {
1608 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1609 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1610 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1611 } -maskdata $filemask
1613 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1614 #define parttick_width 14
1615 #define parttick_height 15
1616 static unsigned char parttick_bits
[] = {
1617 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1618 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1619 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1620 } -maskdata $filemask
1622 image create bitmap file_question
-background white
-foreground black
-data {
1623 #define file_question_width 14
1624 #define file_question_height 15
1625 static unsigned char file_question_bits
[] = {
1626 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1627 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1628 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1629 } -maskdata $filemask
1631 image create bitmap file_removed
-background white
-foreground red
-data {
1632 #define file_removed_width 14
1633 #define file_removed_height 15
1634 static unsigned char file_removed_bits
[] = {
1635 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1636 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1637 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1638 } -maskdata $filemask
1640 image create bitmap file_merge
-background white
-foreground blue
-data {
1641 #define file_merge_width 14
1642 #define file_merge_height 15
1643 static unsigned char file_merge_bits
[] = {
1644 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1645 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1646 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1647 } -maskdata $filemask
1649 set ui_index .vpane.files.index.list
1650 set ui_other .vpane.files.other.list
1651 set max_status_desc
0
1653 {__ i plain
"Unmodified"}
1654 {_M i mod
"Modified"}
1655 {M_ i fulltick
"Included in commit"}
1656 {MM i parttick
"Partially included"}
1658 {_O o plain
"Untracked"}
1659 {A_ o fulltick
"Added by commit"}
1660 {AM o parttick
"Partially added"}
1661 {AD o question
"Added (but now gone)"}
1663 {_D i question
"Missing"}
1664 {D_ i removed
"Removed by commit"}
1665 {DD i removed
"Removed by commit"}
1666 {DO i removed
"Removed (still exists)"}
1668 {UM i merge
"Merge conflicts"}
1669 {U_ i merge
"Merge conflicts"}
1671 if {$max_status_desc < [string length
[lindex
$i 3]]} {
1672 set max_status_desc
[string length
[lindex
$i 3]]
1674 if {[lindex
$i 1] eq
{i
}} {
1675 set all_cols
([lindex
$i 0]) $ui_index
1677 set all_cols
([lindex
$i 0]) $ui_other
1679 set all_icons
([lindex
$i 0]) file_
[lindex
$i 2]
1680 set all_descs
([lindex
$i 0]) [lindex
$i 3]
1684 ######################################################################
1689 global tcl_platform tk_library
1690 if {$tcl_platform(platform
) eq
{unix
}
1691 && $tcl_platform(os
) eq
{Darwin
}
1692 && [string match
/Library
/Frameworks
/* $tk_library]} {
1698 proc bind_button3
{w cmd
} {
1699 bind $w <Any-Button-3
> $cmd
1701 bind $w <Control-Button-1
> $cmd
1705 proc incr_font_size
{font
{amt
1}} {
1706 set sz
[font configure
$font -size]
1708 font configure
$font -size $sz
1709 font configure
${font}bold
-size $sz
1712 proc hook_failed_popup
{hook msg
} {
1713 global gitdir appname
1719 label
$w.m.l1
-text "$hook hook failed:" \
1724 -background white
-borderwidth 1 \
1726 -width 80 -height 10 \
1728 -yscrollcommand [list
$w.m.sby
set]
1730 -text {You must correct the above errors before committing.
} \
1734 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
1735 pack
$w.m.l1
-side top
-fill x
1736 pack
$w.m.l2
-side bottom
-fill x
1737 pack
$w.m.sby
-side right
-fill y
1738 pack
$w.m.t
-side left
-fill both
-expand 1
1739 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
1741 $w.m.t insert
1.0 $msg
1742 $w.m.t conf
-state disabled
1744 button
$w.ok
-text OK \
1747 -command "destroy $w"
1748 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
1750 bind $w <Visibility
> "grab $w; focus $w"
1751 bind $w <Key-Return
> "destroy $w"
1752 wm title
$w "$appname ([lindex [file split \
1753 [file normalize [file dirname $gitdir]]] \
1758 set next_console_id
0
1760 proc new_console
{short_title long_title
} {
1761 global next_console_id console_data
1762 set w .console
[incr next_console_id
]
1763 set console_data
($w) [list
$short_title $long_title]
1764 return [console_init
$w]
1767 proc console_init
{w
} {
1768 global console_cr console_data
1769 global gitdir appname M1B
1771 set console_cr
($w) 1.0
1774 label
$w.m.l1
-text "[lindex $console_data($w) 1]:" \
1779 -background white
-borderwidth 1 \
1781 -width 80 -height 10 \
1784 -yscrollcommand [list
$w.m.sby
set]
1785 label
$w.m.s
-text {Working... please
wait...
} \
1789 scrollbar
$w.m.sby
-command [list
$w.m.t yview
]
1790 pack
$w.m.l1
-side top
-fill x
1791 pack
$w.m.s
-side bottom
-fill x
1792 pack
$w.m.sby
-side right
-fill y
1793 pack
$w.m.t
-side left
-fill both
-expand 1
1794 pack
$w.m
-side top
-fill both
-expand 1 -padx 5 -pady 10
1796 menu
$w.ctxm
-tearoff 0
1797 $w.ctxm add
command -label "Copy" \
1799 -command "tk_textCopy $w.m.t"
1800 $w.ctxm add
command -label "Select All" \
1802 -command "$w.m.t tag add sel 0.0 end"
1803 $w.ctxm add
command -label "Copy All" \
1806 $w.m.t tag add sel 0.0 end
1808 $w.m.t tag remove sel 0.0 end
1811 button
$w.ok
-text {Close
} \
1814 -command "destroy $w"
1815 pack
$w.ok
-side bottom
-anchor e
-pady 10 -padx 10
1817 bind_button3
$w.m.t
"tk_popup $w.ctxm %X %Y"
1818 bind $w.m.t
<$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
1819 bind $w.m.t
<$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
1820 bind $w <Visibility
> "focus $w"
1821 wm title
$w "$appname ([lindex [file split \
1822 [file normalize [file dirname $gitdir]]] \
1823 end]): [lindex $console_data($w) 0]"
1827 proc console_exec
{w cmd
{after
{}}} {
1830 # -- Windows tosses the enviroment when we exec our child.
1831 # But most users need that so we have to relogin. :-(
1833 if {$tcl_platform(platform
) eq
{windows
}} {
1834 set cmd
[list sh
--login -c "cd \"[pwd]\" && [join $cmd { }]"]
1837 # -- Tcl won't let us redirect both stdout and stderr to
1838 # the same pipe. So pass it through cat...
1840 set cmd
[concat |
$cmd |
& cat]
1842 set fd_f
[open
$cmd r
]
1843 fconfigure
$fd_f -blocking 0 -translation binary
1844 fileevent
$fd_f readable
[list console_read
$w $fd_f $after]
1847 proc console_read
{w fd after
} {
1848 global console_cr console_data
1852 if {![winfo exists
$w]} {console_init
$w}
1853 $w.m.t conf
-state normal
1855 set n
[string length
$buf]
1857 set cr
[string first
"\r" $buf $c]
1858 set lf
[string first
"\n" $buf $c]
1859 if {$cr < 0} {set cr
[expr {$n + 1}]}
1860 if {$lf < 0} {set lf
[expr {$n + 1}]}
1863 $w.m.t insert end
[string range
$buf $c $lf]
1864 set console_cr
($w) [$w.m.t index
{end
-1c}]
1868 $w.m.t delete
$console_cr($w) end
1869 $w.m.t insert end
"\n"
1870 $w.m.t insert end
[string range
$buf $c $cr]
1875 $w.m.t conf
-state disabled
1879 fconfigure
$fd -blocking 1
1881 if {[catch
{close
$fd}]} {
1882 if {![winfo exists
$w]} {console_init
$w}
1883 $w.m.s conf
-background red
-text {Error
: Command Failed
}
1884 $w.ok conf
-state normal
1886 } elseif
{[winfo exists
$w]} {
1887 $w.m.s conf
-background green
-text {Success
}
1888 $w.ok conf
-state normal
1891 array
unset console_cr
$w
1892 array
unset console_data
$w
1894 uplevel
#0 $after $ok
1898 fconfigure
$fd -blocking 0
1901 ######################################################################
1905 set starting_gitk_msg
{Please
wait... Starting gitk...
}
1908 global tcl_platform ui_status_value starting_gitk_msg
1910 set ui_status_value
$starting_gitk_msg
1912 if {$ui_status_value eq
$starting_gitk_msg} {
1913 set ui_status_value
{Ready.
}
1917 if {$tcl_platform(platform
) eq
{windows
}} {
1925 set w
[new_console
"repack" "Repacking the object database"]
1926 set cmd
[list git repack
]
1929 console_exec
$w $cmd
1935 global gitdir ui_comm is_quitting repo_config
1937 if {$is_quitting} return
1940 # -- Stash our current commit buffer.
1942 set save
[file join $gitdir GITGUI_MSG
]
1943 set msg
[string trim
[$ui_comm get
0.0 end
]]
1944 if {[$ui_comm edit modified
] && $msg ne
{}} {
1946 set fd
[open
$save w
]
1947 puts
$fd [string trim
[$ui_comm get
0.0 end
]]
1950 } elseif
{$msg eq
{} && [file exists
$save]} {
1954 # -- Stash our current window geometry into this repository.
1956 set cfg_geometry
[list
]
1957 lappend cfg_geometry
[wm geometry .
]
1958 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 1]
1959 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 0]
1960 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1963 if {$cfg_geometry ne
$rc_geometry} {
1964 catch
{exec git repo-config gui.geometry
$cfg_geometry}
1971 rescan
{set ui_status_value
{Ready.
}}
1974 proc remove_helper
{txt paths
} {
1975 global file_states current_diff
1977 if {![lock_index begin-update
]} return
1981 foreach path
$paths {
1982 switch
-glob -- [lindex
$file_states($path) 0] {
1986 lappend pathList
$path
1987 if {$path eq
$current_diff} {
1988 set after
{reshow_diff
;}
1993 if {$pathList eq
{}} {
1999 [concat
$after {set ui_status_value
{Ready.
}}]
2003 proc do_remove_selection
{} {
2004 global current_diff selected_paths
2006 if {[array size selected_paths
] > 0} {
2008 {Removing selected files from commit
} \
2009 [array names selected_paths
]
2010 } elseif
{$current_diff ne
{}} {
2012 "Removing [short_path $current_diff] from commit" \
2013 [list
$current_diff]
2017 proc include_helper
{txt paths
} {
2018 global file_states current_diff
2020 if {![lock_index begin-update
]} return
2024 foreach path
$paths {
2025 switch
-- [lindex
$file_states($path) 0] {
2034 lappend pathList
$path
2035 if {$path eq
$current_diff} {
2036 set after
{reshow_diff
;}
2041 if {$pathList eq
{}} {
2047 [concat
$after {set ui_status_value
{Ready to commit.
}}]
2051 proc do_include_selection
{} {
2052 global current_diff selected_paths
2054 if {[array size selected_paths
] > 0} {
2056 {Including selected files
} \
2057 [array names selected_paths
]
2058 } elseif
{$current_diff ne
{}} {
2060 "Including [short_path $current_diff]" \
2061 [list
$current_diff]
2065 proc do_include_all
{} {
2069 foreach path
[array names file_states
] {
2070 switch
-- [lindex
$file_states($path) 0] {
2075 _D
{lappend paths
$path}
2079 {Including all modified files
} \
2083 proc do_signoff
{} {
2086 set me
[committer_ident
]
2087 if {$me eq
{}} return
2089 set sob
"Signed-off-by: $me"
2090 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
2091 if {$last ne
$sob} {
2092 $ui_comm edit separator
2094 && ![regexp
{^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
2095 $ui_comm insert end
"\n"
2097 $ui_comm insert end
"\n$sob"
2098 $ui_comm edit separator
2103 proc do_select_commit_type
{} {
2104 global commit_type selected_commit_type
2106 if {$selected_commit_type eq
{new
}
2107 && [string match amend
* $commit_type]} {
2109 } elseif
{$selected_commit_type eq
{amend
}
2110 && ![string match amend
* $commit_type]} {
2113 # The amend request was rejected...
2115 if {![string match amend
* $commit_type]} {
2116 set selected_commit_type new
2125 proc do_options
{} {
2126 global appname gitdir font_descs
2127 global repo_config global_config
2128 global repo_config_new global_config_new
2130 array
unset repo_config_new
2131 array
unset global_config_new
2132 foreach name
[array names repo_config
] {
2133 set repo_config_new
($name) $repo_config($name)
2136 foreach name
[array names repo_config
] {
2138 gui.diffcontext
{continue}
2140 set repo_config_new
($name) $repo_config($name)
2142 foreach name
[array names global_config
] {
2143 set global_config_new
($name) $global_config($name)
2145 set reponame
[lindex
[file split \
2146 [file normalize
[file dirname $gitdir]]] \
2149 set w .options_editor
2151 wm geometry
$w "+[winfo rootx .]+[winfo rooty .]"
2153 label
$w.header
-text "$appname Options" \
2155 pack
$w.header
-side top
-fill x
2158 button
$w.buttons.restore
-text {Restore Defaults
} \
2160 -command do_restore_defaults
2161 pack
$w.buttons.restore
-side left
2162 button
$w.buttons.save
-text Save \
2164 -command [list do_save_config
$w]
2165 pack
$w.buttons.save
-side right
2166 button
$w.buttons.cancel
-text {Cancel
} \
2168 -command [list destroy
$w]
2169 pack
$w.buttons.cancel
-side right
2170 pack
$w.buttons
-side bottom
-fill x
-pady 10 -padx 10
2172 labelframe
$w.repo
-text "$reponame Repository" \
2174 -relief raised
-borderwidth 2
2175 labelframe
$w.global
-text {Global
(All Repositories
)} \
2177 -relief raised
-borderwidth 2
2178 pack
$w.repo
-side left
-fill both
-expand 1 -pady 5 -padx 5
2179 pack
$w.global
-side right
-fill both
-expand 1 -pady 5 -padx 5
2182 {b partialinclude
{Allow Partially Included Files
}}
2183 {b pullsummary
{Show Pull Summary
}}
2184 {b trustmtime
{Trust File Modification Timestamps
}}
2185 {i diffcontext
{Number of Diff Context Lines
}}
2187 set type [lindex
$option 0]
2188 set name
[lindex
$option 1]
2189 set text
[lindex
$option 2]
2190 foreach f
{repo global
} {
2193 checkbutton
$w.
$f.
$name -text $text \
2194 -variable ${f}_config_new
(gui.
$name) \
2198 pack
$w.
$f.
$name -side top
-anchor w
2202 label
$w.
$f.
$name.l
-text "$text:" -font font_ui
2203 pack
$w.
$f.
$name.l
-side left
-anchor w
-fill x
2204 spinbox
$w.
$f.
$name.v \
2205 -textvariable ${f}_config_new
(gui.
$name) \
2206 -from 1 -to 99 -increment 1 \
2209 pack
$w.
$f.
$name.v
-side right
-anchor e
2210 pack
$w.
$f.
$name -side top
-anchor w
-fill x
2216 set all_fonts
[lsort
[font families
]]
2217 foreach option
$font_descs {
2218 set name
[lindex
$option 0]
2219 set font
[lindex
$option 1]
2220 set text
[lindex
$option 2]
2222 set global_config_new
(gui.
$font^^family
) \
2223 [font configure
$font -family]
2224 set global_config_new
(gui.
$font^^size
) \
2225 [font configure
$font -size]
2227 frame
$w.global.
$name
2228 label
$w.global.
$name.l
-text "$text:" -font font_ui
2229 pack
$w.global.
$name.l
-side left
-anchor w
-fill x
2230 eval tk_optionMenu
$w.global.
$name.family \
2231 global_config_new
(gui.
$font^^family
) \
2233 spinbox
$w.global.
$name.size \
2234 -textvariable global_config_new
(gui.
$font^^size
) \
2235 -from 2 -to 80 -increment 1 \
2238 pack
$w.global.
$name.size
-side right
-anchor e
2239 pack
$w.global.
$name.family
-side right
-anchor e
2240 pack
$w.global.
$name -side top
-anchor w
-fill x
2243 bind $w <Visibility
> "grab $w; focus $w"
2244 bind $w <Key-Escape
> "destroy $w"
2245 wm title
$w "$appname ($reponame): Options"
2249 proc do_restore_defaults
{} {
2250 global font_descs default_config repo_config
2251 global repo_config_new global_config_new
2253 foreach name
[array names default_config
] {
2254 set repo_config_new
($name) $default_config($name)
2255 set global_config_new
($name) $default_config($name)
2258 foreach option
$font_descs {
2259 set name
[lindex
$option 0]
2260 set repo_config
(gui.
$name) $default_config(gui.
$name)
2264 foreach option
$font_descs {
2265 set name
[lindex
$option 0]
2266 set font
[lindex
$option 1]
2267 set global_config_new
(gui.
$font^^family
) \
2268 [font configure
$font -family]
2269 set global_config_new
(gui.
$font^^size
) \
2270 [font configure
$font -size]
2274 proc do_save_config
{w
} {
2275 if {[catch
{save_config
} err
]} {
2276 error_popup
"Failed to completely save options:\n\n$err"
2282 proc do_windows_shortcut
{} {
2283 global gitdir appname argv0
2285 set reponame
[lindex
[file split \
2286 [file normalize
[file dirname $gitdir]]] \
2290 set desktop
[exec cygpath \
2298 set fn
[tk_getSaveFile \
2300 -title "$appname ($reponame): Create Desktop Icon" \
2301 -initialdir $desktop \
2302 -initialfile "Git $reponame.bat"]
2306 set sh
[exec cygpath \
2311 set me
[exec cygpath \
2315 set gd
[exec cygpath \
2319 regsub
-all ' $me "'\\''" me
2320 regsub -all ' $gd "'\\''" gd
2321 puts -nonewline $fd "\"$sh\" --login -c \""
2322 puts -nonewline $fd "GIT_DIR='$gd'"
2323 puts -nonewline $fd " '$me'"
2327 error_popup "Cannot write script:\n\n$err"
2332 proc do_macosx_app {} {
2333 global gitdir appname argv0 env
2335 set reponame [lindex [file split \
2336 [file normalize [file dirname $gitdir]]] \
2339 set fn [tk_getSaveFile \
2341 -title "$appname ($reponame): Create Desktop Icon" \
2342 -initialdir [file join $env(HOME) Desktop] \
2343 -initialfile "Git $reponame.app"]
2346 set Contents [file join $fn Contents]
2347 set MacOS [file join $Contents MacOS]
2348 set exe [file join $MacOS git-gui]
2352 set fd [open [file join $Contents Info.plist] w]
2353 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2354 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2355 <plist version="1.0">
2357 <key>CFBundleDevelopmentRegion</key>
2358 <string>English</string>
2359 <key>CFBundleExecutable</key>
2360 <string>git-gui</string>
2361 <key>CFBundleIdentifier</key>
2362 <string>org.spearce.git-gui</string>
2363 <key>CFBundleInfoDictionaryVersion</key>
2364 <string>6.0</string>
2365 <key>CFBundlePackageType</key>
2366 <string>APPL</string>
2367 <key>CFBundleSignature</key>
2368 <string>????</string>
2369 <key>CFBundleVersion</key>
2370 <string>1.0</string>
2371 <key>NSPrincipalClass</key>
2372 <string>NSApplication</string>
2377 set fd [open $exe w]
2378 set gd [file normalize $gitdir]
2379 set ep [file normalize [exec git --exec-path]]
2380 regsub -all ' $gd "'\\''" gd
2381 regsub
-all ' $ep "'\\''" ep
2382 puts $fd "#!/bin/sh"
2383 foreach name
[array names env
] {
2384 if {[string match GIT_
* $name]} {
2385 regsub
-all ' $env($name) "'\\''" v
2386 puts $fd "export $name='$v'"
2389 puts $fd "export PATH
='$ep':\
$PATH"
2390 puts $fd "export GIT_DIR
='$gd'"
2391 puts $fd "exec [file normalize
$argv0]"
2394 file attributes $exe -permissions u+x,g+x,o+x
2396 error_popup "Cannot
write icon
:\n\n$err"
2401 proc toggle_or_diff {w x y} {
2402 global file_states file_lists current_diff ui_index ui_other
2403 global last_clicked selected_paths
2405 set pos [split [$w index @$x,$y] .]
2406 set lno [lindex $pos 0]
2407 set col [lindex $pos 1]
2408 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2414 set last_clicked [list $w $lno]
2415 array unset selected_paths
2416 $ui_index tag remove in_sel 0.0 end
2417 $ui_other tag remove in_sel 0.0 end
2420 if {$current_diff eq $path} {
2421 set after {reshow_diff;}
2425 switch -glob -- [lindex $file_states($path) 0] {
2432 "Removing
[short_path
$path] from commit
" \
2434 [concat $after {set ui_status_value {Ready.}}]
2438 "Including
[short_path
$path]" \
2440 [concat $after {set ui_status_value {Ready.}}]
2444 show_diff $path $w $lno
2448 proc add_one_to_selection {w x y} {
2450 global last_clicked selected_paths
2452 set pos [split [$w index @$x,$y] .]
2453 set lno [lindex $pos 0]
2454 set col [lindex $pos 1]
2455 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2461 set last_clicked [list $w $lno]
2462 if {[catch {set in_sel $selected_paths($path)}]} {
2466 unset selected_paths($path)
2467 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2469 set selected_paths($path) 1
2470 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2474 proc add_range_to_selection {w x y} {
2476 global last_clicked selected_paths
2478 if {[lindex $last_clicked 0] ne $w} {
2479 toggle_or_diff $w $x $y
2483 set pos [split [$w index @$x,$y] .]
2484 set lno [lindex $pos 0]
2485 set lc [lindex $last_clicked 1]
2494 foreach path [lrange $file_lists($w) \
2495 [expr {$begin - 1}] \
2496 [expr {$end - 1}]] {
2497 set selected_paths($path) 1
2499 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2502 ######################################################################
2506 set cursor_ptr arrow
2507 font create font_diff -family Courier -size 10
2511 eval font configure font_ui [font actual [.dummy cget -font]]
2515 font create font_uibold
2516 font create font_diffbold
2520 if {$tcl_platform(platform) eq {windows}} {
2523 } elseif {[is_MacOSX]} {
2528 proc apply_config {} {
2529 global repo_config font_descs
2531 foreach option $font_descs {
2532 set name [lindex $option 0]
2533 set font [lindex $option 1]
2535 foreach {cn cv} $repo_config(gui.$name) {
2536 font configure $font $cn $cv
2539 error_popup "Invalid font specified
in gui.
$name:\n\n$err"
2541 foreach {cn cv} [font configure $font] {
2542 font configure ${font}bold $cn $cv
2544 font configure ${font}bold -weight bold
2548 set default_config(gui.trustmtime) false
2549 set default_config(gui.pullsummary) true
2550 set default_config(gui.partialinclude) false
2551 set default_config(gui.diffcontext) 5
2552 set default_config(gui.fontui) [font configure font_ui]
2553 set default_config(gui.fontdiff) [font configure font_diff]
2555 {fontui font_ui {Main Font}}
2556 {fontdiff font_diff {Diff/Console Font}}
2561 ######################################################################
2567 menu .mbar -tearoff 0
2568 .mbar add cascade -label Project -menu .mbar.project
2569 .mbar add cascade -label Edit -menu .mbar.edit
2570 .mbar add cascade -label Commit -menu .mbar.commit
2571 if {!$single_commit} {
2572 .mbar add cascade -label Fetch -menu .mbar.fetch
2573 .mbar add cascade -label Pull -menu .mbar.pull
2574 .mbar add cascade -label Push -menu .mbar.push
2576 . configure -menu .mbar
2581 .mbar.project add command -label Visualize \
2584 if {!$single_commit} {
2585 .mbar.project add command -label {Repack Database} \
2586 -command do_repack \
2589 if {$tcl_platform(platform) eq {windows}} {
2590 .mbar.project add command \
2591 -label {Create Desktop Icon} \
2592 -command do_windows_shortcut \
2594 } elseif {[is_MacOSX]} {
2595 .mbar.project add command \
2596 -label {Create Desktop Icon} \
2597 -command do_macosx_app \
2601 .mbar.project add command -label Quit \
2603 -accelerator $M1T-Q \
2609 .mbar.edit add command -label Undo \
2610 -command {catch {[focus] edit undo}} \
2611 -accelerator $M1T-Z \
2613 .mbar.edit add command -label Redo \
2614 -command {catch {[focus] edit redo}} \
2615 -accelerator $M1T-Y \
2617 .mbar.edit add separator
2618 .mbar.edit add command -label Cut \
2619 -command {catch {tk_textCut [focus]}} \
2620 -accelerator $M1T-X \
2622 .mbar.edit add command -label Copy \
2623 -command {catch {tk_textCopy [focus]}} \
2624 -accelerator $M1T-C \
2626 .mbar.edit add command -label Paste \
2627 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2628 -accelerator $M1T-V \
2630 .mbar.edit add command -label Delete \
2631 -command {catch {[focus] delete sel.first sel.last}} \
2634 .mbar.edit add separator
2635 .mbar.edit add command -label {Select All} \
2636 -command {catch {[focus] tag add sel 0.0 end}} \
2637 -accelerator $M1T-A \
2639 .mbar.edit add separator
2640 .mbar.edit add command -label {Options...} \
2641 -command do_options \
2648 .mbar.commit add radiobutton \
2649 -label {New Commit} \
2650 -command do_select_commit_type \
2651 -variable selected_commit_type \
2654 lappend disable_on_lock \
2655 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2657 .mbar.commit add radiobutton \
2658 -label {Amend Last Commit} \
2659 -command do_select_commit_type \
2660 -variable selected_commit_type \
2663 lappend disable_on_lock \
2664 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2666 .mbar.commit add separator
2668 .mbar.commit add command -label Rescan \
2669 -command do_rescan \
2672 lappend disable_on_lock \
2673 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2675 .mbar.commit add command -label {Remove From Commit} \
2676 -command do_remove_selection \
2678 lappend disable_on_lock \
2679 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2681 .mbar.commit add command -label {Include In Commit} \
2682 -command do_include_selection \
2684 lappend disable_on_lock \
2685 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2687 .mbar.commit add command -label {Include All} \
2688 -command do_include_all \
2689 -accelerator $M1T-I \
2691 lappend disable_on_lock \
2692 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2694 .mbar.commit add separator
2696 .mbar.commit add command -label {Sign Off} \
2697 -command do_signoff \
2698 -accelerator $M1T-S \
2701 .mbar.commit add command -label Commit \
2702 -command do_commit \
2703 -accelerator $M1T-Return \
2705 lappend disable_on_lock \
2706 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2708 # -- Transport menus
2710 if {!$single_commit} {
2716 # -- Main Window Layout
2718 panedwindow .vpane -orient vertical
2719 panedwindow .vpane.files -orient horizontal
2720 .vpane add .vpane.files -sticky nsew -height 100 -width 400
2721 pack .vpane -anchor n -side top -fill both -expand 1
2723 # -- Index File List
2725 frame .vpane.files.index -height 100 -width 400
2726 label .vpane.files.index.title -text {Modified Files} \
2729 text $ui_index -background white -borderwidth 0 \
2730 -width 40 -height 10 \
2732 -cursor $cursor_ptr \
2733 -yscrollcommand {.vpane.files.index.sb set} \
2735 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
2736 pack .vpane.files.index.title -side top -fill x
2737 pack .vpane.files.index.sb -side right -fill y
2738 pack $ui_index -side left -fill both -expand 1
2739 .vpane.files add .vpane.files.index -sticky nsew
2741 # -- Other (Add) File List
2743 frame .vpane.files.other -height 100 -width 100
2744 label .vpane.files.other.title -text {Untracked Files} \
2747 text $ui_other -background white -borderwidth 0 \
2748 -width 40 -height 10 \
2750 -cursor $cursor_ptr \
2751 -yscrollcommand {.vpane.files.other.sb set} \
2753 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
2754 pack .vpane.files.other.title -side top -fill x
2755 pack .vpane.files.other.sb -side right -fill y
2756 pack $ui_other -side left -fill both -expand 1
2757 .vpane.files add .vpane.files.other -sticky nsew
2759 foreach i [list $ui_index $ui_other] {
2760 $i tag conf in_diff -font font_uibold
2761 $i tag conf in_sel \
2762 -background [$i cget -foreground] \
2763 -foreground [$i cget -background]
2767 # -- Diff and Commit Area
2769 frame .vpane.lower -height 300 -width 400
2770 frame .vpane.lower.commarea
2771 frame .vpane.lower.diff -relief sunken -borderwidth 1
2772 pack .vpane.lower.commarea -side top -fill x
2773 pack .vpane.lower.diff -side bottom -fill both -expand 1
2774 .vpane add .vpane.lower -stick nsew
2776 # -- Commit Area Buttons
2778 frame .vpane.lower.commarea.buttons
2779 label .vpane.lower.commarea.buttons.l -text {} \
2783 pack .vpane.lower.commarea.buttons.l -side top -fill x
2784 pack .vpane.lower.commarea.buttons -side left -fill y
2786 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2787 -command do_rescan \
2789 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2790 lappend disable_on_lock \
2791 {.vpane.lower.commarea.buttons.rescan conf -state}
2793 button .vpane.lower.commarea.buttons.incall -text {Include All} \
2794 -command do_include_all \
2796 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2797 lappend disable_on_lock \
2798 {.vpane.lower.commarea.buttons.incall conf -state}
2800 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2801 -command do_signoff \
2803 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2805 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2806 -command do_commit \
2808 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2809 lappend disable_on_lock \
2810 {.vpane.lower.commarea.buttons.commit conf -state}
2812 # -- Commit Message Buffer
2814 frame .vpane.lower.commarea.buffer
2815 frame .vpane.lower.commarea.buffer.header
2816 set ui_comm .vpane.lower.commarea.buffer.t
2817 set ui_coml .vpane.lower.commarea.buffer.header.l
2818 radiobutton .vpane.lower.commarea.buffer.header.new \
2819 -text {New Commit} \
2820 -command do_select_commit_type \
2821 -variable selected_commit_type \
2824 lappend disable_on_lock \
2825 [list .vpane.lower.commarea.buffer.header.new conf -state]
2826 radiobutton .vpane.lower.commarea.buffer.header.amend \
2827 -text {Amend Last Commit} \
2828 -command do_select_commit_type \
2829 -variable selected_commit_type \
2832 lappend disable_on_lock \
2833 [list .vpane.lower.commarea.buffer.header.amend conf -state]
2838 proc trace_commit_type {varname args} {
2839 global ui_coml commit_type
2840 switch -glob -- $commit_type {
2841 initial {set txt {Initial Commit Message:}}
2842 amend {set txt {Amended Commit Message:}}
2843 amend-initial {set txt {Amended Initial Commit Message:}}
2844 merge {set txt {Merge Commit Message:}}
2845 * {set txt {Commit Message:}}
2847 $ui_coml conf -text $txt
2849 trace add variable commit_type write trace_commit_type
2850 pack $ui_coml -side left -fill x
2851 pack .vpane.lower.commarea.buffer.header.amend -side right
2852 pack .vpane.lower.commarea.buffer.header.new -side right
2854 text $ui_comm -background white -borderwidth 1 \
2857 -autoseparators true \
2859 -width 75 -height 9 -wrap none \
2861 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2862 scrollbar .vpane.lower.commarea.buffer.sby \
2863 -command [list $ui_comm yview]
2864 pack .vpane.lower.commarea.buffer.header -side top -fill x
2865 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2866 pack $ui_comm -side left -fill y
2867 pack .vpane.lower.commarea.buffer -side left -fill y
2869 # -- Commit Message Buffer Context Menu
2871 set ctxm .vpane.lower.commarea.buffer.ctxm
2872 menu $ctxm -tearoff 0
2876 -command {tk_textCut $ui_comm}
2880 -command {tk_textCopy $ui_comm}
2884 -command {tk_textPaste $ui_comm}
2888 -command {$ui_comm delete sel.first sel.last}
2891 -label {Select All} \
2893 -command {$ui_comm tag add sel 0.0 end}
2898 $ui_comm tag add sel 0.0 end
2899 tk_textCopy $ui_comm
2900 $ui_comm tag remove sel 0.0 end
2907 bind_button3 $ui_comm "tk_popup
$ctxm %X
%Y
"
2912 set diff_actions [list]
2913 proc trace_current_diff {varname args} {
2914 global current_diff diff_actions file_states
2915 if {$current_diff eq {}} {
2922 set s [mapdesc [lindex $file_states($p) 0] $p]
2924 set p [escape_path $p]
2928 .vpane.lower.diff.header.status configure -text $s
2929 .vpane.lower.diff.header.file configure -text $f
2930 .vpane.lower.diff.header.path configure -text $p
2931 foreach w $diff_actions {
2935 trace add variable current_diff write trace_current_diff
2937 frame .vpane.lower.diff.header -background orange
2938 label .vpane.lower.diff.header.status \
2939 -background orange \
2940 -width $max_status_desc \
2944 label .vpane.lower.diff.header.file \
2945 -background orange \
2949 label .vpane.lower.diff.header.path \
2950 -background orange \
2954 pack .vpane.lower.diff.header.status -side left
2955 pack .vpane.lower.diff.header.file -side left
2956 pack .vpane.lower.diff.header.path -fill x
2957 set ctxm .vpane.lower.diff.header.ctxm
2958 menu $ctxm -tearoff 0
2969 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2970 bind_button3 .vpane.lower.diff.header.path "tk_popup
$ctxm %X
%Y
"
2974 frame .vpane.lower.diff.body
2975 set ui_diff .vpane.lower.diff.body.t
2976 text $ui_diff -background white -borderwidth 0 \
2977 -width 80 -height 15 -wrap none \
2979 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2980 -yscrollcommand {.vpane.lower.diff.body.sby set} \
2982 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2983 -command [list $ui_diff xview]
2984 scrollbar .vpane.lower.diff.body.sby -orient vertical \
2985 -command [list $ui_diff yview]
2986 pack .vpane.lower.diff.body.sbx -side bottom -fill x
2987 pack .vpane.lower.diff.body.sby -side right -fill y
2988 pack $ui_diff -side left -fill both -expand 1
2989 pack .vpane.lower.diff.header -side top -fill x
2990 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2992 $ui_diff tag conf d_@ -font font_diffbold
2993 $ui_diff tag conf d_+ -foreground blue
2994 $ui_diff tag conf d_- -foreground red
2995 $ui_diff tag conf d_++ -foreground {#00a000}
2996 $ui_diff tag conf d_-- -foreground {#a000a0}
2997 $ui_diff tag conf d_+- \
2999 -background {light goldenrod yellow}
3000 $ui_diff tag conf d_-+ \
3004 # -- Diff Body Context Menu
3006 set ctxm .vpane.lower.diff.body.ctxm
3007 menu $ctxm -tearoff 0
3011 -command {tk_textCopy $ui_diff}
3012 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3014 -label {Select All} \
3016 -command {$ui_diff tag add sel 0.0 end}
3017 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3022 $ui_diff tag add sel 0.0 end
3023 tk_textCopy $ui_diff
3024 $ui_diff tag remove sel 0.0 end
3026 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3029 -label {Decrease Font Size} \
3031 -command {incr_font_size font_diff -1}
3032 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3034 -label {Increase Font Size} \
3036 -command {incr_font_size font_diff 1}
3037 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3040 -label {Show Less Context} \
3042 -command {if {$repo_config(gui.diffcontext) >= 2} {
3043 incr repo_config(gui.diffcontext) -1
3046 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3048 -label {Show More Context} \
3051 incr repo_config(gui.diffcontext)
3054 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3056 $ctxm add command -label {Options...} \
3059 bind_button3 $ui_diff "tk_popup
$ctxm %X
%Y
"
3063 set ui_status_value {Initializing...}
3064 label .status -textvariable ui_status_value \
3070 pack .status -anchor w -side bottom -fill x
3075 set gm $repo_config(gui.geometry)
3076 wm geometry . [lindex $gm 0]
3077 .vpane sash place 0 \
3078 [lindex [.vpane sash coord 0] 0] \
3080 .vpane.files sash place 0 \
3082 [lindex [.vpane.files sash coord 0] 1]
3088 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3089 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3090 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3091 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3092 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3093 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3094 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3095 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3096 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3097 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3098 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3100 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3101 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3102 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3103 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3104 bind $ui_diff <$M1B-Key-v> {break}
3105 bind $ui_diff <$M1B-Key-V> {break}
3106 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3107 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3108 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3109 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3110 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3111 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3113 bind . <Destroy> do_quit
3114 bind all <Key-F5> do_rescan
3115 bind all <$M1B-Key-r> do_rescan
3116 bind all <$M1B-Key-R> do_rescan
3117 bind . <$M1B-Key-s> do_signoff
3118 bind . <$M1B-Key-S> do_signoff
3119 bind . <$M1B-Key-i> do_include_all
3120 bind . <$M1B-Key-I> do_include_all
3121 bind . <$M1B-Key-Return> do_commit
3122 bind all <$M1B-Key-q> do_quit
3123 bind all <$M1B-Key-Q> do_quit
3124 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3125 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3126 foreach i [list $ui_index $ui_other] {
3127 bind $i <Button-1> "toggle_or_diff
$i %x
%y
; break"
3128 bind $i <$M1B-Button-1> "add_one_to_selection
$i %x
%y
; break"
3129 bind $i <Shift-Button-1> "add_range_to_selection
$i %x
%y
; break"
3133 set file_lists($ui_index) [list]
3134 set file_lists($ui_other) [list]
3141 set selected_commit_type new
3143 wm title . "$appname ([file normalize
[file dirname $gitdir]])"
3144 focus -force $ui_comm
3145 if {!$single_commit} {
3147 populate_fetch_menu .mbar.fetch
3148 populate_pull_menu .mbar.pull
3149 populate_push_menu .mbar.push
3151 lock_index begin-read