Shawn O. Pearce | bd11b82 | 2006-11-19 02:57:58 -0500 | [diff] [blame] | 1 | #!/bin/sh |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2 | # Tcl ignores the next line -*- tcl -*- \ |
Shawn O. Pearce | 4e817d1 | 2007-06-22 01:10:12 -0400 | [diff] [blame] | 3 | if test "z$*" = zversion \ |
| 4 | || test "z$*" = z--version; \ |
| 5 | then \ |
| 6 | echo 'git-gui version @@GITGUI_VERSION@@'; \ |
| 7 | exit; \ |
| 8 | fi; \ |
Shawn O. Pearce | 2f7c9a7 | 2007-09-20 21:25:34 -0400 | [diff] [blame] | 9 | argv0=$0; \ |
| 10 | exec wish "$argv0" -- "$@" |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 11 | |
Shawn O. Pearce | 7e81d4e | 2007-02-12 16:12:04 -0500 | [diff] [blame] | 12 | set appvers {@@GITGUI_VERSION@@} |
Shawn O. Pearce | d6db1ad | 2007-10-12 12:18:02 -0400 | [diff] [blame] | 13 | set copyright [encoding convertfrom utf-8 { |
Harri Ilari Tapio Liusvaara | a9813cb | 2007-09-12 23:02:35 +0300 | [diff] [blame] | 14 | Copyright © 2006, 2007 Shawn Pearce, et. al. |
Shawn O. Pearce | bdc9ea2 | 2006-11-21 02:36:55 -0500 | [diff] [blame] | 15 | |
Shawn O. Pearce | 0499b24 | 2007-01-20 20:08:20 -0500 | [diff] [blame] | 16 | This program is free software; you can redistribute it and/or modify |
| 17 | it under the terms of the GNU General Public License as published by |
| 18 | the Free Software Foundation; either version 2 of the License, or |
| 19 | (at your option) any later version. |
Shawn O. Pearce | bdc9ea2 | 2006-11-21 02:36:55 -0500 | [diff] [blame] | 20 | |
Shawn O. Pearce | 0499b24 | 2007-01-20 20:08:20 -0500 | [diff] [blame] | 21 | This program is distributed in the hope that it will be useful, |
| 22 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 23 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 24 | GNU General Public License for more details. |
| 25 | |
| 26 | You should have received a copy of the GNU General Public License |
| 27 | along with this program; if not, write to the Free Software |
Shawn O. Pearce | d6db1ad | 2007-10-12 12:18:02 -0400 | [diff] [blame] | 28 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}] |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 29 | |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 30 | ###################################################################### |
| 31 | ## |
Shawn O. Pearce | cfb07cc | 2007-06-02 16:11:26 -0400 | [diff] [blame] | 32 | ## Tcl/Tk sanity check |
| 33 | |
| 34 | if {[catch {package require Tcl 8.4} err] |
| 35 | || [catch {package require Tk 8.4} err] |
| 36 | } { |
| 37 | catch {wm withdraw .} |
| 38 | tk_messageBox \ |
| 39 | -icon error \ |
| 40 | -type ok \ |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 41 | -title [mc "git-gui: fatal error"] \ |
Shawn O. Pearce | cfb07cc | 2007-06-02 16:11:26 -0400 | [diff] [blame] | 42 | -message $err |
| 43 | exit 1 |
| 44 | } |
| 45 | |
Shawn O. Pearce | 63c4024f | 2007-09-11 13:37:45 -0400 | [diff] [blame] | 46 | catch {rename send {}} ; # What an evil concept... |
Shawn O. Pearce | cff9339 | 2007-09-08 23:47:00 -0400 | [diff] [blame] | 47 | |
Shawn O. Pearce | cfb07cc | 2007-06-02 16:11:26 -0400 | [diff] [blame] | 48 | ###################################################################### |
| 49 | ## |
Shawn O. Pearce | fc703c2 | 2007-09-01 21:58:29 -0400 | [diff] [blame] | 50 | ## locate our library |
| 51 | |
| 52 | set oguilib {@@GITGUI_LIBDIR@@} |
| 53 | set oguirel {@@GITGUI_RELATIVE@@} |
| 54 | if {$oguirel eq {1}} { |
| 55 | set oguilib [file dirname [file dirname [file normalize $argv0]]] |
| 56 | set oguilib [file join $oguilib share git-gui lib] |
Shawn O. Pearce | d4b0ccd | 2007-09-01 22:22:42 -0400 | [diff] [blame] | 57 | set oguimsg [file join $oguilib msgs] |
Shawn O. Pearce | fc703c2 | 2007-09-01 21:58:29 -0400 | [diff] [blame] | 58 | } elseif {[string match @@* $oguirel]} { |
| 59 | set oguilib [file join [file dirname [file normalize $argv0]] lib] |
Shawn O. Pearce | d4b0ccd | 2007-09-01 22:22:42 -0400 | [diff] [blame] | 60 | set oguimsg [file join [file dirname [file normalize $argv0]] po] |
| 61 | } else { |
| 62 | set oguimsg [file join $oguilib msgs] |
Shawn O. Pearce | fc703c2 | 2007-09-01 21:58:29 -0400 | [diff] [blame] | 63 | } |
| 64 | unset oguirel |
| 65 | |
| 66 | ###################################################################### |
| 67 | ## |
Shawn O. Pearce | cd12901 | 2007-05-28 11:22:13 -0400 | [diff] [blame] | 68 | ## enable verbose loading? |
| 69 | |
| 70 | if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} { |
| 71 | unset _verbose |
| 72 | rename auto_load real__auto_load |
| 73 | proc auto_load {name args} { |
| 74 | puts stderr "auto_load $name" |
| 75 | return [uplevel 1 real__auto_load $name $args] |
| 76 | } |
| 77 | rename source real__source |
| 78 | proc source {name} { |
| 79 | puts stderr "source $name" |
| 80 | uplevel 1 real__source $name |
| 81 | } |
| 82 | } |
| 83 | |
| 84 | ###################################################################### |
| 85 | ## |
Shawn O. Pearce | d4b0ccd | 2007-09-01 22:22:42 -0400 | [diff] [blame] | 86 | ## Internationalization (i18n) through msgcat and gettext. See |
| 87 | ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html |
| 88 | |
| 89 | package require msgcat |
Shawn O. Pearce | 146d73a | 2007-09-12 16:47:06 -0400 | [diff] [blame] | 90 | |
Shawn O. Pearce | ab0d33c | 2007-10-23 18:44:55 -0400 | [diff] [blame] | 91 | proc _mc_trim {fmt} { |
Shawn O. Pearce | 146d73a | 2007-09-12 16:47:06 -0400 | [diff] [blame] | 92 | set cmk [string first @@ $fmt] |
| 93 | if {$cmk > 0} { |
Shawn O. Pearce | ab0d33c | 2007-10-23 18:44:55 -0400 | [diff] [blame] | 94 | return [string range $fmt 0 [expr {$cmk - 1}]] |
Shawn O. Pearce | 146d73a | 2007-09-12 16:47:06 -0400 | [diff] [blame] | 95 | } |
Shawn O. Pearce | ab0d33c | 2007-10-23 18:44:55 -0400 | [diff] [blame] | 96 | return $fmt |
| 97 | } |
| 98 | |
| 99 | proc mc {en_fmt args} { |
| 100 | set fmt [_mc_trim [::msgcat::mc $en_fmt]] |
| 101 | if {[catch {set msg [eval [list format $fmt] $args]} err]} { |
| 102 | set msg [eval [list format [_mc_trim $en_fmt]] $args] |
| 103 | } |
| 104 | return $msg |
Shawn O. Pearce | 146d73a | 2007-09-12 16:47:06 -0400 | [diff] [blame] | 105 | } |
| 106 | |
Shawn O. Pearce | 31bb1d1 | 2007-09-14 01:50:09 -0400 | [diff] [blame] | 107 | proc strcat {args} { |
| 108 | return [join $args {}] |
| 109 | } |
| 110 | |
Shawn O. Pearce | d4b0ccd | 2007-09-01 22:22:42 -0400 | [diff] [blame] | 111 | ::msgcat::mcload $oguimsg |
| 112 | unset oguimsg |
| 113 | |
| 114 | ###################################################################### |
| 115 | ## |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 116 | ## read only globals |
| 117 | |
Shawn O. Pearce | 0b2bc46 | 2007-09-27 02:15:29 -0400 | [diff] [blame] | 118 | set _appname {Git Gui} |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 119 | set _gitdir {} |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 120 | set _gitexec {} |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 121 | set _reponame {} |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 122 | set _iscygwin {} |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 123 | set _search_path {} |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 124 | |
| 125 | proc appname {} { |
| 126 | global _appname |
| 127 | return $_appname |
| 128 | } |
| 129 | |
Shawn O. Pearce | c2758a1 | 2007-01-20 21:55:05 -0500 | [diff] [blame] | 130 | proc gitdir {args} { |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 131 | global _gitdir |
Shawn O. Pearce | c2758a1 | 2007-01-20 21:55:05 -0500 | [diff] [blame] | 132 | if {$args eq {}} { |
| 133 | return $_gitdir |
| 134 | } |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 135 | return [eval [list file join $_gitdir] $args] |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 136 | } |
| 137 | |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 138 | proc gitexec {args} { |
| 139 | global _gitexec |
| 140 | if {$_gitexec eq {}} { |
Shawn O. Pearce | 8134722 | 2007-02-12 22:48:56 -0500 | [diff] [blame] | 141 | if {[catch {set _gitexec [git --exec-path]} err]} { |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 142 | error "Git not installed?\n\n$err" |
| 143 | } |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 144 | if {[is_Cygwin]} { |
| 145 | set _gitexec [exec cygpath \ |
| 146 | --windows \ |
| 147 | --absolute \ |
| 148 | $_gitexec] |
| 149 | } else { |
| 150 | set _gitexec [file normalize $_gitexec] |
| 151 | } |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 152 | } |
| 153 | if {$args eq {}} { |
| 154 | return $_gitexec |
| 155 | } |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 156 | return [eval [list file join $_gitexec] $args] |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 157 | } |
| 158 | |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 159 | proc reponame {} { |
Shawn O. Pearce | d36cd96 | 2007-07-19 00:43:16 -0400 | [diff] [blame] | 160 | return $::_reponame |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 161 | } |
Shawn O. Pearce | da5239d | 2006-11-11 19:03:06 -0500 | [diff] [blame] | 162 | |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 163 | proc is_MacOSX {} { |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 164 | if {[tk windowingsystem] eq {aqua}} { |
| 165 | return 1 |
| 166 | } |
| 167 | return 0 |
| 168 | } |
| 169 | |
| 170 | proc is_Windows {} { |
Shawn O. Pearce | d36cd96 | 2007-07-19 00:43:16 -0400 | [diff] [blame] | 171 | if {$::tcl_platform(platform) eq {windows}} { |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 172 | return 1 |
| 173 | } |
| 174 | return 0 |
| 175 | } |
| 176 | |
| 177 | proc is_Cygwin {} { |
Shawn O. Pearce | d36cd96 | 2007-07-19 00:43:16 -0400 | [diff] [blame] | 178 | global _iscygwin |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 179 | if {$_iscygwin eq {}} { |
Shawn O. Pearce | d36cd96 | 2007-07-19 00:43:16 -0400 | [diff] [blame] | 180 | if {$::tcl_platform(platform) eq {windows}} { |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 181 | if {[catch {set p [exec cygpath --windir]} err]} { |
| 182 | set _iscygwin 0 |
| 183 | } else { |
| 184 | set _iscygwin 1 |
| 185 | } |
| 186 | } else { |
| 187 | set _iscygwin 0 |
| 188 | } |
| 189 | } |
| 190 | return $_iscygwin |
| 191 | } |
| 192 | |
Shawn O. Pearce | cf25ddc | 2007-02-08 18:03:41 -0500 | [diff] [blame] | 193 | proc is_enabled {option} { |
| 194 | global enabled_options |
| 195 | if {[catch {set on $enabled_options($option)}]} {return 0} |
| 196 | return $on |
| 197 | } |
| 198 | |
| 199 | proc enable_option {option} { |
| 200 | global enabled_options |
| 201 | set enabled_options($option) 1 |
| 202 | } |
| 203 | |
| 204 | proc disable_option {option} { |
| 205 | global enabled_options |
| 206 | set enabled_options($option) 0 |
| 207 | } |
| 208 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 209 | ###################################################################### |
| 210 | ## |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 211 | ## config |
| 212 | |
Shawn O. Pearce | 51f4d16 | 2006-11-12 03:47:00 -0500 | [diff] [blame] | 213 | proc is_many_config {name} { |
| 214 | switch -glob -- $name { |
Steffen Prohaska | 24f7c64 | 2007-10-08 08:25:47 +0200 | [diff] [blame] | 215 | gui.recentrepo - |
Shawn O. Pearce | 51f4d16 | 2006-11-12 03:47:00 -0500 | [diff] [blame] | 216 | remote.*.fetch - |
| 217 | remote.*.push |
| 218 | {return 1} |
| 219 | * |
| 220 | {return 0} |
| 221 | } |
| 222 | } |
| 223 | |
Shawn O. Pearce | c539449 | 2007-01-26 04:43:43 -0500 | [diff] [blame] | 224 | proc is_config_true {name} { |
| 225 | global repo_config |
| 226 | if {[catch {set v $repo_config($name)}]} { |
| 227 | return 0 |
| 228 | } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} { |
| 229 | return 1 |
| 230 | } else { |
| 231 | return 0 |
| 232 | } |
| 233 | } |
| 234 | |
Shawn O. Pearce | 61f82ce | 2007-05-28 12:52:57 -0400 | [diff] [blame] | 235 | proc get_config {name} { |
| 236 | global repo_config |
| 237 | if {[catch {set v $repo_config($name)}]} { |
| 238 | return {} |
| 239 | } else { |
| 240 | return $v |
| 241 | } |
| 242 | } |
| 243 | |
Shawn O. Pearce | 8134722 | 2007-02-12 22:48:56 -0500 | [diff] [blame] | 244 | ###################################################################### |
| 245 | ## |
| 246 | ## handy utils |
| 247 | |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 248 | proc _git_cmd {name} { |
| 249 | global _git_cmd_path |
| 250 | |
| 251 | if {[catch {set v $_git_cmd_path($name)}]} { |
| 252 | switch -- $name { |
Shawn O. Pearce | 70a7595 | 2007-07-09 02:30:24 -0400 | [diff] [blame] | 253 | version - |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 254 | --version - |
| 255 | --exec-path { return [list $::_git $name] } |
| 256 | } |
| 257 | |
| 258 | set p [gitexec git-$name$::_search_exe] |
| 259 | if {[file exists $p]} { |
| 260 | set v [list $p] |
Shawn O. Pearce | c136f2b | 2007-07-09 02:47:33 -0400 | [diff] [blame] | 261 | } elseif {[is_Windows] && [file exists [gitexec git-$name]]} { |
| 262 | # Try to determine what sort of magic will make |
| 263 | # git-$name go and do its thing, because native |
| 264 | # Tcl on Windows doesn't know it. |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 265 | # |
Shawn O. Pearce | c136f2b | 2007-07-09 02:47:33 -0400 | [diff] [blame] | 266 | set p [gitexec git-$name] |
| 267 | set f [open $p r] |
| 268 | set s [gets $f] |
| 269 | close $f |
| 270 | |
Shawn O. Pearce | 6e4ba05 | 2007-09-02 15:19:07 -0400 | [diff] [blame] | 271 | switch -glob -- [lindex $s 0] { |
Shawn O. Pearce | c136f2b | 2007-07-09 02:47:33 -0400 | [diff] [blame] | 272 | #!*sh { set i sh } |
| 273 | #!*perl { set i perl } |
| 274 | #!*python { set i python } |
| 275 | default { error "git-$name is not supported: $s" } |
| 276 | } |
| 277 | |
| 278 | upvar #0 _$i interp |
| 279 | if {![info exists interp]} { |
| 280 | set interp [_which $i] |
| 281 | } |
| 282 | if {$interp eq {}} { |
| 283 | error "git-$name requires $i (not in PATH)" |
| 284 | } |
Shawn O. Pearce | 6e4ba05 | 2007-09-02 15:19:07 -0400 | [diff] [blame] | 285 | set v [concat [list $interp] [lrange $s 1 end] [list $p]] |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 286 | } else { |
Shawn O. Pearce | c672989 | 2007-07-09 02:13:00 -0400 | [diff] [blame] | 287 | # Assume it is builtin to git somehow and we |
| 288 | # aren't actually able to see a file for it. |
| 289 | # |
| 290 | set v [list $::_git $name] |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 291 | } |
| 292 | set _git_cmd_path($name) $v |
| 293 | } |
| 294 | return $v |
| 295 | } |
| 296 | |
| 297 | proc _which {what} { |
| 298 | global env _search_exe _search_path |
| 299 | |
| 300 | if {$_search_path eq {}} { |
Shawn O. Pearce | 299077f | 2007-09-21 11:08:50 -0400 | [diff] [blame] | 301 | if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} { |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 302 | set _search_path [split [exec cygpath \ |
| 303 | --windows \ |
| 304 | --path \ |
| 305 | --absolute \ |
| 306 | $env(PATH)] {;}] |
| 307 | set _search_exe .exe |
| 308 | } elseif {[is_Windows]} { |
Steffen Prohaska | be700fe | 2007-10-06 11:29:02 +0200 | [diff] [blame] | 309 | set gitguidir [file dirname [info script]] |
| 310 | regsub -all ";" $gitguidir "\\;" gitguidir |
| 311 | set env(PATH) "$gitguidir;$env(PATH)" |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 312 | set _search_path [split $env(PATH) {;}] |
| 313 | set _search_exe .exe |
| 314 | } else { |
| 315 | set _search_path [split $env(PATH) :] |
| 316 | set _search_exe {} |
| 317 | } |
| 318 | } |
| 319 | |
| 320 | foreach p $_search_path { |
| 321 | set p [file join $p $what$_search_exe] |
| 322 | if {[file exists $p]} { |
| 323 | return [file normalize $p] |
| 324 | } |
| 325 | } |
| 326 | return {} |
| 327 | } |
| 328 | |
Shawn O. Pearce | 6f62b4f | 2007-07-17 22:31:16 -0400 | [diff] [blame] | 329 | proc _lappend_nice {cmd_var} { |
| 330 | global _nice |
| 331 | upvar $cmd_var cmd |
| 332 | |
| 333 | if {![info exists _nice]} { |
| 334 | set _nice [_which nice] |
| 335 | } |
| 336 | if {$_nice ne {}} { |
| 337 | lappend cmd $_nice |
| 338 | } |
| 339 | } |
| 340 | |
Shawn O. Pearce | 8134722 | 2007-02-12 22:48:56 -0500 | [diff] [blame] | 341 | proc git {args} { |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 342 | set opt [list exec] |
| 343 | |
| 344 | while {1} { |
| 345 | switch -- [lindex $args 0] { |
| 346 | --nice { |
Shawn O. Pearce | 6f62b4f | 2007-07-17 22:31:16 -0400 | [diff] [blame] | 347 | _lappend_nice opt |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 348 | } |
| 349 | |
| 350 | default { |
| 351 | break |
| 352 | } |
| 353 | |
| 354 | } |
| 355 | |
| 356 | set args [lrange $args 1 end] |
| 357 | } |
| 358 | |
| 359 | set cmdp [_git_cmd [lindex $args 0]] |
| 360 | set args [lrange $args 1 end] |
| 361 | |
| 362 | return [eval $opt $cmdp $args] |
| 363 | } |
| 364 | |
Shawn O. Pearce | 74c4763 | 2007-07-09 03:07:05 -0400 | [diff] [blame] | 365 | proc _open_stdout_stderr {cmd} { |
| 366 | if {[catch { |
| 367 | set fd [open $cmd r] |
| 368 | } err]} { |
| 369 | if { [lindex $cmd end] eq {2>@1} |
| 370 | && $err eq {can not find channel named "1"} |
| 371 | } { |
| 372 | # Older versions of Tcl 8.4 don't have this 2>@1 IO |
| 373 | # redirect operator. Fallback to |& cat for those. |
| 374 | # The command was not actually started, so its safe |
| 375 | # to try to start it a second time. |
| 376 | # |
| 377 | set fd [open [concat \ |
| 378 | [lrange $cmd 0 end-1] \ |
| 379 | [list |& cat] \ |
| 380 | ] r] |
| 381 | } else { |
| 382 | error $err |
| 383 | } |
| 384 | } |
Shawn O. Pearce | 6eb420e | 2007-07-17 01:50:10 -0400 | [diff] [blame] | 385 | fconfigure $fd -eofchar {} |
Shawn O. Pearce | 74c4763 | 2007-07-09 03:07:05 -0400 | [diff] [blame] | 386 | return $fd |
| 387 | } |
| 388 | |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 389 | proc git_read {args} { |
| 390 | set opt [list |] |
| 391 | |
| 392 | while {1} { |
| 393 | switch -- [lindex $args 0] { |
| 394 | --nice { |
Shawn O. Pearce | 6f62b4f | 2007-07-17 22:31:16 -0400 | [diff] [blame] | 395 | _lappend_nice opt |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 396 | } |
| 397 | |
| 398 | --stderr { |
| 399 | lappend args 2>@1 |
| 400 | } |
| 401 | |
| 402 | default { |
| 403 | break |
| 404 | } |
| 405 | |
| 406 | } |
| 407 | |
| 408 | set args [lrange $args 1 end] |
| 409 | } |
| 410 | |
| 411 | set cmdp [_git_cmd [lindex $args 0]] |
| 412 | set args [lrange $args 1 end] |
| 413 | |
Shawn O. Pearce | 74c4763 | 2007-07-09 03:07:05 -0400 | [diff] [blame] | 414 | return [_open_stdout_stderr [concat $opt $cmdp $args]] |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 415 | } |
| 416 | |
| 417 | proc git_write {args} { |
| 418 | set opt [list |] |
| 419 | |
| 420 | while {1} { |
| 421 | switch -- [lindex $args 0] { |
| 422 | --nice { |
Shawn O. Pearce | 6f62b4f | 2007-07-17 22:31:16 -0400 | [diff] [blame] | 423 | _lappend_nice opt |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 424 | } |
| 425 | |
| 426 | default { |
| 427 | break |
| 428 | } |
| 429 | |
| 430 | } |
| 431 | |
| 432 | set args [lrange $args 1 end] |
| 433 | } |
| 434 | |
| 435 | set cmdp [_git_cmd [lindex $args 0]] |
| 436 | set args [lrange $args 1 end] |
| 437 | |
| 438 | return [open [concat $opt $cmdp $args] w] |
Shawn O. Pearce | 8134722 | 2007-02-12 22:48:56 -0500 | [diff] [blame] | 439 | } |
| 440 | |
Shawn O. Pearce | ed76cb7 | 2008-01-20 14:46:59 -0500 | [diff] [blame] | 441 | proc githook_read {hook_name args} { |
| 442 | set pchook [gitdir hooks $hook_name] |
| 443 | lappend args 2>@1 |
| 444 | |
| 445 | # On Cygwin [file executable] might lie so we need to ask |
| 446 | # the shell if the hook is executable. Yes that's annoying. |
| 447 | # |
| 448 | if {[is_Cygwin]} { |
| 449 | upvar #0 _sh interp |
| 450 | if {![info exists interp]} { |
| 451 | set interp [_which sh] |
| 452 | } |
| 453 | if {$interp eq {}} { |
| 454 | error "hook execution requires sh (not in PATH)" |
| 455 | } |
| 456 | |
| 457 | set scr {if test -x "$1";then exec "$@";fi} |
| 458 | set sh_c [list | $interp -c $scr $interp $pchook] |
| 459 | return [_open_stdout_stderr [concat $sh_c $args]] |
| 460 | } |
| 461 | |
| 462 | if {[file executable $pchook]} { |
| 463 | return [_open_stdout_stderr [concat [list | $pchook] $args]] |
| 464 | } |
| 465 | |
| 466 | return {} |
| 467 | } |
| 468 | |
Shawn O. Pearce | 7eafa2f | 2007-07-09 03:28:41 -0400 | [diff] [blame] | 469 | proc sq {value} { |
| 470 | regsub -all ' $value "'\\''" value |
| 471 | return "'$value'" |
| 472 | } |
| 473 | |
Shawn O. Pearce | d41b43e | 2007-07-08 18:40:56 -0400 | [diff] [blame] | 474 | proc load_current_branch {} { |
| 475 | global current_branch is_detached |
| 476 | |
Shawn O. Pearce | fc4e8da | 2007-05-30 20:39:46 -0400 | [diff] [blame] | 477 | set fd [open [gitdir HEAD] r] |
Shawn O. Pearce | 311e02a | 2007-07-05 19:19:37 -0400 | [diff] [blame] | 478 | if {[gets $fd ref] < 1} { |
Shawn O. Pearce | fc4e8da | 2007-05-30 20:39:46 -0400 | [diff] [blame] | 479 | set ref {} |
| 480 | } |
| 481 | close $fd |
Shawn O. Pearce | 311e02a | 2007-07-05 19:19:37 -0400 | [diff] [blame] | 482 | |
| 483 | set pfx {ref: refs/heads/} |
| 484 | set len [string length $pfx] |
| 485 | if {[string equal -length $len $pfx $ref]} { |
| 486 | # We're on a branch. It might not exist. But |
| 487 | # HEAD looks good enough to be a branch. |
| 488 | # |
Shawn O. Pearce | d41b43e | 2007-07-08 18:40:56 -0400 | [diff] [blame] | 489 | set current_branch [string range $ref $len end] |
| 490 | set is_detached 0 |
Shawn O. Pearce | 311e02a | 2007-07-05 19:19:37 -0400 | [diff] [blame] | 491 | } else { |
| 492 | # Assume this is a detached head. |
| 493 | # |
Shawn O. Pearce | d41b43e | 2007-07-08 18:40:56 -0400 | [diff] [blame] | 494 | set current_branch HEAD |
| 495 | set is_detached 1 |
Shawn O. Pearce | 311e02a | 2007-07-05 19:19:37 -0400 | [diff] [blame] | 496 | } |
Shawn O. Pearce | fc4e8da | 2007-05-30 20:39:46 -0400 | [diff] [blame] | 497 | } |
| 498 | |
Shawn O. Pearce | 2739291 | 2007-04-28 22:00:02 -0400 | [diff] [blame] | 499 | auto_load tk_optionMenu |
| 500 | rename tk_optionMenu real__tkOptionMenu |
| 501 | proc tk_optionMenu {w varName args} { |
| 502 | set m [eval real__tkOptionMenu $w $varName $args] |
| 503 | $m configure -font font_ui |
| 504 | $w configure -font font_ui |
| 505 | return $m |
| 506 | } |
| 507 | |
Shawn O. Pearce | 3849bfb | 2007-09-16 23:12:19 -0400 | [diff] [blame] | 508 | proc rmsel_tag {text} { |
| 509 | $text tag conf sel \ |
| 510 | -background [$text cget -background] \ |
| 511 | -foreground [$text cget -foreground] \ |
| 512 | -borderwidth 0 |
| 513 | $text tag conf in_sel -background lightgray |
| 514 | bind $text <Motion> break |
| 515 | return $text |
| 516 | } |
| 517 | |
Shawn O. Pearce | a4bee59 | 2007-09-21 03:41:51 -0400 | [diff] [blame] | 518 | set root_exists 0 |
| 519 | bind . <Visibility> { |
| 520 | bind . <Visibility> {} |
| 521 | set root_exists 1 |
| 522 | } |
| 523 | |
Shawn O. Pearce | 1bdd8a1 | 2007-09-27 00:18:29 -0400 | [diff] [blame] | 524 | if {[is_Windows]} { |
| 525 | wm iconbitmap . -default $oguilib/git-gui.ico |
| 526 | } |
| 527 | |
Shawn O. Pearce | a4bee59 | 2007-09-21 03:41:51 -0400 | [diff] [blame] | 528 | ###################################################################### |
| 529 | ## |
| 530 | ## config defaults |
| 531 | |
| 532 | set cursor_ptr arrow |
| 533 | font create font_diff -family Courier -size 10 |
| 534 | font create font_ui |
| 535 | catch { |
| 536 | label .dummy |
| 537 | eval font configure font_ui [font actual [.dummy cget -font]] |
| 538 | destroy .dummy |
| 539 | } |
| 540 | |
| 541 | font create font_uiitalic |
| 542 | font create font_uibold |
| 543 | font create font_diffbold |
| 544 | font create font_diffitalic |
| 545 | |
| 546 | foreach class {Button Checkbutton Entry Label |
| 547 | Labelframe Listbox Menu Message |
| 548 | Radiobutton Spinbox Text} { |
| 549 | option add *$class.font font_ui |
| 550 | } |
| 551 | unset class |
| 552 | |
| 553 | if {[is_Windows] || [is_MacOSX]} { |
| 554 | option add *Menu.tearOff 0 |
| 555 | } |
| 556 | |
| 557 | if {[is_MacOSX]} { |
| 558 | set M1B M1 |
| 559 | set M1T Cmd |
| 560 | } else { |
| 561 | set M1B Control |
| 562 | set M1T Ctrl |
| 563 | } |
| 564 | |
| 565 | proc bind_button3 {w cmd} { |
| 566 | bind $w <Any-Button-3> $cmd |
| 567 | if {[is_MacOSX]} { |
| 568 | # Mac OS X sends Button-2 on right click through three-button mouse, |
| 569 | # or through trackpad right-clicking (two-finger touch + click). |
| 570 | bind $w <Any-Button-2> $cmd |
| 571 | bind $w <Control-Button-1> $cmd |
| 572 | } |
| 573 | } |
| 574 | |
| 575 | proc apply_config {} { |
| 576 | global repo_config font_descs |
| 577 | |
| 578 | foreach option $font_descs { |
| 579 | set name [lindex $option 0] |
| 580 | set font [lindex $option 1] |
| 581 | if {[catch { |
Shawn O. Pearce | 48b8d2b | 2007-11-01 00:31:36 -0400 | [diff] [blame] | 582 | set need_weight 1 |
Shawn O. Pearce | a4bee59 | 2007-09-21 03:41:51 -0400 | [diff] [blame] | 583 | foreach {cn cv} $repo_config(gui.$name) { |
Shawn O. Pearce | 48b8d2b | 2007-11-01 00:31:36 -0400 | [diff] [blame] | 584 | if {$cn eq {-weight}} { |
| 585 | set need_weight 0 |
| 586 | } |
| 587 | font configure $font $cn $cv |
| 588 | } |
| 589 | if {$need_weight} { |
| 590 | font configure $font -weight normal |
Shawn O. Pearce | a4bee59 | 2007-09-21 03:41:51 -0400 | [diff] [blame] | 591 | } |
| 592 | } err]} { |
| 593 | error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"] |
| 594 | } |
| 595 | foreach {cn cv} [font configure $font] { |
| 596 | font configure ${font}bold $cn $cv |
| 597 | font configure ${font}italic $cn $cv |
| 598 | } |
| 599 | font configure ${font}bold -weight bold |
| 600 | font configure ${font}italic -slant italic |
| 601 | } |
| 602 | } |
| 603 | |
| 604 | set default_config(merge.diffstat) true |
| 605 | set default_config(merge.summary) false |
| 606 | set default_config(merge.verbosity) 2 |
| 607 | set default_config(user.name) {} |
| 608 | set default_config(user.email) {} |
| 609 | |
| 610 | set default_config(gui.matchtrackingbranch) false |
| 611 | set default_config(gui.pruneduringfetch) false |
| 612 | set default_config(gui.trustmtime) false |
| 613 | set default_config(gui.diffcontext) 5 |
Adam Piątyszek | 11027d5 | 2008-03-06 20:38:40 +0100 | [diff] [blame] | 614 | set default_config(gui.commitmsgwidth) 75 |
Shawn O. Pearce | a4bee59 | 2007-09-21 03:41:51 -0400 | [diff] [blame] | 615 | set default_config(gui.newbranchtemplate) {} |
Shawn O. Pearce | 95b002e | 2008-02-07 02:35:25 -0500 | [diff] [blame] | 616 | set default_config(gui.spellingdictionary) {} |
Shawn O. Pearce | a4bee59 | 2007-09-21 03:41:51 -0400 | [diff] [blame] | 617 | set default_config(gui.fontui) [font configure font_ui] |
| 618 | set default_config(gui.fontdiff) [font configure font_diff] |
| 619 | set font_descs { |
| 620 | {fontui font_ui {mc "Main Font"}} |
| 621 | {fontdiff font_diff {mc "Diff/Console Font"}} |
| 622 | } |
| 623 | |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 624 | ###################################################################### |
| 625 | ## |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 626 | ## find git |
| 627 | |
| 628 | set _git [_which git] |
| 629 | if {$_git eq {}} { |
| 630 | catch {wm withdraw .} |
Shawn O. Pearce | 183a1d1 | 2007-09-21 10:58:02 -0400 | [diff] [blame] | 631 | tk_messageBox \ |
| 632 | -icon error \ |
| 633 | -type ok \ |
| 634 | -title [mc "git-gui: fatal error"] \ |
| 635 | -message [mc "Cannot find git in PATH."] |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 636 | exit 1 |
| 637 | } |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 638 | |
| 639 | ###################################################################### |
| 640 | ## |
Shawn O. Pearce | 54acdd9 | 2007-02-13 23:15:25 -0500 | [diff] [blame] | 641 | ## version check |
| 642 | |
Shawn O. Pearce | d696702 | 2007-07-08 18:48:08 -0400 | [diff] [blame] | 643 | if {[catch {set _git_version [git --version]} err]} { |
Shawn O. Pearce | 54acdd9 | 2007-02-13 23:15:25 -0500 | [diff] [blame] | 644 | catch {wm withdraw .} |
Shawn O. Pearce | 875b7c9 | 2007-08-22 02:41:00 -0400 | [diff] [blame] | 645 | tk_messageBox \ |
| 646 | -icon error \ |
| 647 | -type ok \ |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 648 | -title [mc "git-gui: fatal error"] \ |
Shawn O. Pearce | 875b7c9 | 2007-08-22 02:41:00 -0400 | [diff] [blame] | 649 | -message "Cannot determine Git version: |
Shawn O. Pearce | 54acdd9 | 2007-02-13 23:15:25 -0500 | [diff] [blame] | 650 | |
| 651 | $err |
| 652 | |
Shawn O. Pearce | d696702 | 2007-07-08 18:48:08 -0400 | [diff] [blame] | 653 | [appname] requires Git 1.5.0 or later." |
Shawn O. Pearce | 54acdd9 | 2007-02-13 23:15:25 -0500 | [diff] [blame] | 654 | exit 1 |
| 655 | } |
Shawn O. Pearce | d696702 | 2007-07-08 18:48:08 -0400 | [diff] [blame] | 656 | if {![regsub {^git version } $_git_version {} _git_version]} { |
Shawn O. Pearce | 54acdd9 | 2007-02-13 23:15:25 -0500 | [diff] [blame] | 657 | catch {wm withdraw .} |
Shawn O. Pearce | 875b7c9 | 2007-08-22 02:41:00 -0400 | [diff] [blame] | 658 | tk_messageBox \ |
| 659 | -icon error \ |
| 660 | -type ok \ |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 661 | -title [mc "git-gui: fatal error"] \ |
Shawn O. Pearce | 31bb1d1 | 2007-09-14 01:50:09 -0400 | [diff] [blame] | 662 | -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"] |
Shawn O. Pearce | 54acdd9 | 2007-02-13 23:15:25 -0500 | [diff] [blame] | 663 | exit 1 |
| 664 | } |
Shawn O. Pearce | 301dfaa | 2007-07-17 23:09:31 -0400 | [diff] [blame] | 665 | |
| 666 | set _real_git_version $_git_version |
Wincent Colaiuta | 2c2a378 | 2008-02-18 09:36:33 +0100 | [diff] [blame] | 667 | regsub -- {[\-\.]dirty$} $_git_version {} _git_version |
Shawn O. Pearce | d696702 | 2007-07-08 18:48:08 -0400 | [diff] [blame] | 668 | regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version |
| 669 | regsub {\.rc[0-9]+$} $_git_version {} _git_version |
Julian Phillips | 91464df | 2007-07-17 22:14:06 +0100 | [diff] [blame] | 670 | regsub {\.GIT$} $_git_version {} _git_version |
Steffen Prohaska | 96f1195 | 2007-10-06 15:27:22 +0200 | [diff] [blame] | 671 | regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version |
Shawn O. Pearce | d696702 | 2007-07-08 18:48:08 -0400 | [diff] [blame] | 672 | |
Shawn O. Pearce | 301dfaa | 2007-07-17 23:09:31 -0400 | [diff] [blame] | 673 | if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { |
| 674 | catch {wm withdraw .} |
| 675 | if {[tk_messageBox \ |
| 676 | -icon warning \ |
| 677 | -type yesno \ |
| 678 | -default no \ |
| 679 | -title "[appname]: warning" \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 680 | -message [mc "Git version cannot be determined. |
Shawn O. Pearce | 301dfaa | 2007-07-17 23:09:31 -0400 | [diff] [blame] | 681 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 682 | %s claims it is version '%s'. |
Shawn O. Pearce | 301dfaa | 2007-07-17 23:09:31 -0400 | [diff] [blame] | 683 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 684 | %s requires at least Git 1.5.0 or later. |
Shawn O. Pearce | 301dfaa | 2007-07-17 23:09:31 -0400 | [diff] [blame] | 685 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 686 | Assume '%s' is version 1.5.0? |
| 687 | " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} { |
Shawn O. Pearce | 301dfaa | 2007-07-17 23:09:31 -0400 | [diff] [blame] | 688 | set _git_version 1.5.0 |
| 689 | } else { |
| 690 | exit 1 |
| 691 | } |
| 692 | } |
| 693 | unset _real_git_version |
| 694 | |
Shawn O. Pearce | d696702 | 2007-07-08 18:48:08 -0400 | [diff] [blame] | 695 | proc git-version {args} { |
| 696 | global _git_version |
| 697 | |
| 698 | switch [llength $args] { |
| 699 | 0 { |
| 700 | return $_git_version |
| 701 | } |
| 702 | |
| 703 | 2 { |
| 704 | set op [lindex $args 0] |
| 705 | set vr [lindex $args 1] |
| 706 | set cm [package vcompare $_git_version $vr] |
| 707 | return [expr $cm $op 0] |
| 708 | } |
| 709 | |
| 710 | 4 { |
| 711 | set type [lindex $args 0] |
| 712 | set name [lindex $args 1] |
| 713 | set parm [lindex $args 2] |
| 714 | set body [lindex $args 3] |
| 715 | |
| 716 | if {($type ne {proc} && $type ne {method})} { |
| 717 | error "Invalid arguments to git-version" |
| 718 | } |
| 719 | if {[llength $body] < 2 || [lindex $body end-1] ne {default}} { |
| 720 | error "Last arm of $type $name must be default" |
| 721 | } |
| 722 | |
| 723 | foreach {op vr cb} [lrange $body 0 end-2] { |
| 724 | if {[git-version $op $vr]} { |
| 725 | return [uplevel [list $type $name $parm $cb]] |
| 726 | } |
| 727 | } |
| 728 | |
| 729 | return [uplevel [list $type $name $parm [lindex $body end]]] |
| 730 | } |
| 731 | |
| 732 | default { |
| 733 | error "git-version >= x" |
| 734 | } |
| 735 | |
| 736 | } |
| 737 | } |
| 738 | |
| 739 | if {[git-version < 1.5]} { |
| 740 | catch {wm withdraw .} |
Shawn O. Pearce | 875b7c9 | 2007-08-22 02:41:00 -0400 | [diff] [blame] | 741 | tk_messageBox \ |
| 742 | -icon error \ |
| 743 | -type ok \ |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 744 | -title [mc "git-gui: fatal error"] \ |
Shawn O. Pearce | 875b7c9 | 2007-08-22 02:41:00 -0400 | [diff] [blame] | 745 | -message "[appname] requires Git 1.5.0 or later. |
Shawn O. Pearce | d696702 | 2007-07-08 18:48:08 -0400 | [diff] [blame] | 746 | |
| 747 | You are using [git-version]: |
| 748 | |
| 749 | [git --version]" |
| 750 | exit 1 |
| 751 | } |
Shawn O. Pearce | 54acdd9 | 2007-02-13 23:15:25 -0500 | [diff] [blame] | 752 | |
| 753 | ###################################################################### |
| 754 | ## |
Shawn O. Pearce | 875b7c9 | 2007-08-22 02:41:00 -0400 | [diff] [blame] | 755 | ## configure our library |
| 756 | |
Shawn O. Pearce | 875b7c9 | 2007-08-22 02:41:00 -0400 | [diff] [blame] | 757 | set idx [file join $oguilib tclIndex] |
| 758 | if {[catch {set fd [open $idx r]} err]} { |
| 759 | catch {wm withdraw .} |
| 760 | tk_messageBox \ |
| 761 | -icon error \ |
| 762 | -type ok \ |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 763 | -title [mc "git-gui: fatal error"] \ |
Shawn O. Pearce | 875b7c9 | 2007-08-22 02:41:00 -0400 | [diff] [blame] | 764 | -message $err |
| 765 | exit 1 |
| 766 | } |
| 767 | if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} { |
| 768 | set idx [list] |
| 769 | while {[gets $fd n] >= 0} { |
| 770 | if {$n ne {} && ![string match #* $n]} { |
| 771 | lappend idx $n |
| 772 | } |
| 773 | } |
| 774 | } else { |
| 775 | set idx {} |
| 776 | } |
| 777 | close $fd |
| 778 | |
| 779 | if {$idx ne {}} { |
| 780 | set loaded [list] |
| 781 | foreach p $idx { |
| 782 | if {[lsearch -exact $loaded $p] >= 0} continue |
| 783 | source [file join $oguilib $p] |
| 784 | lappend loaded $p |
| 785 | } |
| 786 | unset loaded p |
| 787 | } else { |
| 788 | set auto_path [concat [list $oguilib] $auto_path] |
| 789 | } |
Shawn O. Pearce | fc703c2 | 2007-09-01 21:58:29 -0400 | [diff] [blame] | 790 | unset -nocomplain idx fd |
Shawn O. Pearce | 875b7c9 | 2007-08-22 02:41:00 -0400 | [diff] [blame] | 791 | |
| 792 | ###################################################################### |
| 793 | ## |
Shawn O. Pearce | 69f85ff | 2007-10-12 00:34:04 -0400 | [diff] [blame] | 794 | ## config file parsing |
| 795 | |
Shawn O. Pearce | f00d504 | 2007-10-12 00:42:17 -0400 | [diff] [blame] | 796 | git-version proc _parse_config {arr_name args} { |
Shawn O. Pearce | 85f7a94 | 2007-10-12 00:54:15 -0400 | [diff] [blame] | 797 | >= 1.5.3 { |
| 798 | upvar $arr_name arr |
| 799 | array unset arr |
| 800 | set buf {} |
| 801 | catch { |
Shawn O. Pearce | a5bb31f | 2007-10-16 12:55:34 -0400 | [diff] [blame] | 802 | set fd_rc [eval \ |
| 803 | [list git_read config] \ |
| 804 | $args \ |
| 805 | [list --null --list]] |
Shawn O. Pearce | 85f7a94 | 2007-10-12 00:54:15 -0400 | [diff] [blame] | 806 | fconfigure $fd_rc -translation binary |
| 807 | set buf [read $fd_rc] |
| 808 | close $fd_rc |
| 809 | } |
| 810 | foreach line [split $buf "\0"] { |
| 811 | if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} { |
| 812 | if {[is_many_config $name]} { |
| 813 | lappend arr($name) $value |
| 814 | } else { |
| 815 | set arr($name) $value |
| 816 | } |
| 817 | } |
| 818 | } |
| 819 | } |
Shawn O. Pearce | f00d504 | 2007-10-12 00:42:17 -0400 | [diff] [blame] | 820 | default { |
| 821 | upvar $arr_name arr |
| 822 | array unset arr |
Shawn O. Pearce | 69f85ff | 2007-10-12 00:34:04 -0400 | [diff] [blame] | 823 | catch { |
Shawn O. Pearce | f00d504 | 2007-10-12 00:42:17 -0400 | [diff] [blame] | 824 | set fd_rc [eval [list git_read config --list] $args] |
Shawn O. Pearce | 69f85ff | 2007-10-12 00:34:04 -0400 | [diff] [blame] | 825 | while {[gets $fd_rc line] >= 0} { |
| 826 | if {[regexp {^([^=]+)=(.*)$} $line line name value]} { |
| 827 | if {[is_many_config $name]} { |
Shawn O. Pearce | f00d504 | 2007-10-12 00:42:17 -0400 | [diff] [blame] | 828 | lappend arr($name) $value |
Shawn O. Pearce | 69f85ff | 2007-10-12 00:34:04 -0400 | [diff] [blame] | 829 | } else { |
Shawn O. Pearce | f00d504 | 2007-10-12 00:42:17 -0400 | [diff] [blame] | 830 | set arr($name) $value |
Shawn O. Pearce | 69f85ff | 2007-10-12 00:34:04 -0400 | [diff] [blame] | 831 | } |
| 832 | } |
| 833 | } |
| 834 | close $fd_rc |
| 835 | } |
| 836 | } |
Shawn O. Pearce | f00d504 | 2007-10-12 00:42:17 -0400 | [diff] [blame] | 837 | } |
Shawn O. Pearce | 69f85ff | 2007-10-12 00:34:04 -0400 | [diff] [blame] | 838 | |
Shawn O. Pearce | f00d504 | 2007-10-12 00:42:17 -0400 | [diff] [blame] | 839 | proc load_config {include_global} { |
| 840 | global repo_config global_config default_config |
| 841 | |
| 842 | if {$include_global} { |
| 843 | _parse_config global_config --global |
Shawn O. Pearce | 69f85ff | 2007-10-12 00:34:04 -0400 | [diff] [blame] | 844 | } |
Shawn O. Pearce | f00d504 | 2007-10-12 00:42:17 -0400 | [diff] [blame] | 845 | _parse_config repo_config |
Shawn O. Pearce | 69f85ff | 2007-10-12 00:34:04 -0400 | [diff] [blame] | 846 | |
| 847 | foreach name [array names default_config] { |
| 848 | if {[catch {set v $global_config($name)}]} { |
| 849 | set global_config($name) $default_config($name) |
| 850 | } |
| 851 | if {[catch {set v $repo_config($name)}]} { |
| 852 | set repo_config($name) $default_config($name) |
| 853 | } |
| 854 | } |
| 855 | } |
| 856 | |
| 857 | ###################################################################### |
| 858 | ## |
Shawn O. Pearce | ba7cc66 | 2007-07-17 23:23:56 -0400 | [diff] [blame] | 859 | ## feature option selection |
| 860 | |
Shawn O. Pearce | 0b2bc46 | 2007-09-27 02:15:29 -0400 | [diff] [blame] | 861 | if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} { |
Shawn O. Pearce | ba7cc66 | 2007-07-17 23:23:56 -0400 | [diff] [blame] | 862 | unset _junk |
| 863 | } else { |
| 864 | set subcommand gui |
| 865 | } |
| 866 | if {$subcommand eq {gui.sh}} { |
| 867 | set subcommand gui |
| 868 | } |
| 869 | if {$subcommand eq {gui} && [llength $argv] > 0} { |
| 870 | set subcommand [lindex $argv 0] |
| 871 | set argv [lrange $argv 1 end] |
| 872 | } |
| 873 | |
| 874 | enable_option multicommit |
| 875 | enable_option branch |
| 876 | enable_option transport |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 877 | disable_option bare |
Shawn O. Pearce | ba7cc66 | 2007-07-17 23:23:56 -0400 | [diff] [blame] | 878 | |
| 879 | switch -- $subcommand { |
| 880 | browser - |
| 881 | blame { |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 882 | enable_option bare |
| 883 | |
Shawn O. Pearce | ba7cc66 | 2007-07-17 23:23:56 -0400 | [diff] [blame] | 884 | disable_option multicommit |
| 885 | disable_option branch |
| 886 | disable_option transport |
| 887 | } |
| 888 | citool { |
| 889 | enable_option singlecommit |
| 890 | |
| 891 | disable_option multicommit |
| 892 | disable_option branch |
| 893 | disable_option transport |
| 894 | } |
| 895 | } |
| 896 | |
| 897 | ###################################################################### |
| 898 | ## |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 899 | ## repository setup |
| 900 | |
Shawn O. Pearce | c612785 | 2007-05-08 21:58:25 -0400 | [diff] [blame] | 901 | if {[catch { |
| 902 | set _gitdir $env(GIT_DIR) |
| 903 | set _prefix {} |
| 904 | }] |
| 905 | && [catch { |
| 906 | set _gitdir [git rev-parse --git-dir] |
| 907 | set _prefix [git rev-parse --show-prefix] |
| 908 | } err]} { |
Shawn O. Pearce | ab08b36 | 2007-09-22 03:47:43 -0400 | [diff] [blame] | 909 | load_config 1 |
| 910 | apply_config |
| 911 | choose_repository::pick |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 912 | } |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 913 | if {![file isdirectory $_gitdir] && [is_Cygwin]} { |
Shawn O. Pearce | 2f7c9a7 | 2007-09-20 21:25:34 -0400 | [diff] [blame] | 914 | catch {set _gitdir [exec cygpath --windows $_gitdir]} |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 915 | } |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 916 | if {![file isdirectory $_gitdir]} { |
Shawn O. Pearce | dbccbbd | 2006-11-15 22:45:33 -0500 | [diff] [blame] | 917 | catch {wm withdraw .} |
Shawn O. Pearce | 31bb1d1 | 2007-09-14 01:50:09 -0400 | [diff] [blame] | 918 | error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"] |
Shawn O. Pearce | dbccbbd | 2006-11-15 22:45:33 -0500 | [diff] [blame] | 919 | exit 1 |
| 920 | } |
Shawn O. Pearce | c80d25d | 2007-08-24 23:15:50 -0400 | [diff] [blame] | 921 | if {$_prefix ne {}} { |
| 922 | regsub -all {[^/]+/} $_prefix ../ cdup |
| 923 | if {[catch {cd $cdup} err]} { |
| 924 | catch {wm withdraw .} |
Shawn O. Pearce | 31bb1d1 | 2007-09-14 01:50:09 -0400 | [diff] [blame] | 925 | error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"] |
Shawn O. Pearce | c80d25d | 2007-08-24 23:15:50 -0400 | [diff] [blame] | 926 | exit 1 |
| 927 | } |
| 928 | unset cdup |
| 929 | } elseif {![is_enabled bare]} { |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 930 | if {[lindex [file split $_gitdir] end] ne {.git}} { |
| 931 | catch {wm withdraw .} |
Shawn O. Pearce | 31bb1d1 | 2007-09-14 01:50:09 -0400 | [diff] [blame] | 932 | error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"] |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 933 | exit 1 |
| 934 | } |
| 935 | if {[catch {cd [file dirname $_gitdir]} err]} { |
| 936 | catch {wm withdraw .} |
Shawn O. Pearce | 31bb1d1 | 2007-09-14 01:50:09 -0400 | [diff] [blame] | 937 | error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"] |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 938 | exit 1 |
| 939 | } |
Shawn O. Pearce | dbccbbd | 2006-11-15 22:45:33 -0500 | [diff] [blame] | 940 | } |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 941 | set _reponame [file split [file normalize $_gitdir]] |
| 942 | if {[lindex $_reponame end] eq {.git}} { |
| 943 | set _reponame [lindex $_reponame end-1] |
| 944 | } else { |
| 945 | set _reponame [lindex $_reponame end] |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 946 | } |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 947 | |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 948 | ###################################################################### |
| 949 | ## |
Shawn O. Pearce | 372ef95 | 2007-02-18 02:12:32 -0500 | [diff] [blame] | 950 | ## global init |
| 951 | |
| 952 | set current_diff_path {} |
| 953 | set current_diff_side {} |
| 954 | set diff_actions [list] |
Shawn O. Pearce | 372ef95 | 2007-02-18 02:12:32 -0500 | [diff] [blame] | 955 | |
| 956 | set HEAD {} |
| 957 | set PARENT {} |
| 958 | set MERGE_HEAD [list] |
| 959 | set commit_type {} |
| 960 | set empty_tree {} |
| 961 | set current_branch {} |
Shawn O. Pearce | d41b43e | 2007-07-08 18:40:56 -0400 | [diff] [blame] | 962 | set is_detached 0 |
Shawn O. Pearce | 372ef95 | 2007-02-18 02:12:32 -0500 | [diff] [blame] | 963 | set current_diff_path {} |
Shawn O. Pearce | 9c9f5fa | 2007-08-23 02:44:13 -0400 | [diff] [blame] | 964 | set is_3way_diff 0 |
Shawn O. Pearce | 372ef95 | 2007-02-18 02:12:32 -0500 | [diff] [blame] | 965 | set selected_commit_type new |
| 966 | |
| 967 | ###################################################################### |
| 968 | ## |
Shawn O. Pearce | e210e67 | 2006-11-06 19:12:58 -0500 | [diff] [blame] | 969 | ## task management |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 970 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 971 | set rescan_active 0 |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 972 | set diff_active 0 |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 973 | set last_clicked {} |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 974 | |
Shawn O. Pearce | e210e67 | 2006-11-06 19:12:58 -0500 | [diff] [blame] | 975 | set disable_on_lock [list] |
| 976 | set index_lock_type none |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 977 | |
Shawn O. Pearce | e210e67 | 2006-11-06 19:12:58 -0500 | [diff] [blame] | 978 | proc lock_index {type} { |
| 979 | global index_lock_type disable_on_lock |
| 980 | |
Shawn O. Pearce | 043f701 | 2006-11-12 18:16:45 -0500 | [diff] [blame] | 981 | if {$index_lock_type eq {none}} { |
Shawn O. Pearce | e210e67 | 2006-11-06 19:12:58 -0500 | [diff] [blame] | 982 | set index_lock_type $type |
| 983 | foreach w $disable_on_lock { |
| 984 | uplevel #0 $w disabled |
| 985 | } |
| 986 | return 1 |
Shawn O. Pearce | 53716a7 | 2006-11-18 03:31:25 -0500 | [diff] [blame] | 987 | } elseif {$index_lock_type eq "begin-$type"} { |
Shawn O. Pearce | e210e67 | 2006-11-06 19:12:58 -0500 | [diff] [blame] | 988 | set index_lock_type $type |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 989 | return 1 |
| 990 | } |
| 991 | return 0 |
| 992 | } |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 993 | |
Shawn O. Pearce | e210e67 | 2006-11-06 19:12:58 -0500 | [diff] [blame] | 994 | proc unlock_index {} { |
| 995 | global index_lock_type disable_on_lock |
| 996 | |
| 997 | set index_lock_type none |
| 998 | foreach w $disable_on_lock { |
| 999 | uplevel #0 $w normal |
| 1000 | } |
| 1001 | } |
| 1002 | |
| 1003 | ###################################################################### |
| 1004 | ## |
| 1005 | ## status |
| 1006 | |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1007 | proc repository_state {ctvar hdvar mhvar} { |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 1008 | global current_branch |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1009 | upvar $ctvar ct $hdvar hd $mhvar mh |
| 1010 | |
| 1011 | set mh [list] |
Shawn O. Pearce | ec6b424 | 2006-11-06 20:50:59 -0500 | [diff] [blame] | 1012 | |
Shawn O. Pearce | d41b43e | 2007-07-08 18:40:56 -0400 | [diff] [blame] | 1013 | load_current_branch |
Shawn O. Pearce | 8134722 | 2007-02-12 22:48:56 -0500 | [diff] [blame] | 1014 | if {[catch {set hd [git rev-parse --verify HEAD]}]} { |
Shawn O. Pearce | 4539eac | 2006-11-18 02:50:58 -0500 | [diff] [blame] | 1015 | set hd {} |
Shawn O. Pearce | ec6b424 | 2006-11-06 20:50:59 -0500 | [diff] [blame] | 1016 | set ct initial |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1017 | return |
Shawn O. Pearce | ec6b424 | 2006-11-06 20:50:59 -0500 | [diff] [blame] | 1018 | } |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1019 | |
Shawn O. Pearce | c2758a1 | 2007-01-20 21:55:05 -0500 | [diff] [blame] | 1020 | set merge_head [gitdir MERGE_HEAD] |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1021 | if {[file exists $merge_head]} { |
| 1022 | set ct merge |
| 1023 | set fd_mh [open $merge_head r] |
| 1024 | while {[gets $fd_mh line] >= 0} { |
| 1025 | lappend mh $line |
| 1026 | } |
| 1027 | close $fd_mh |
| 1028 | return |
| 1029 | } |
| 1030 | |
| 1031 | set ct normal |
Shawn O. Pearce | ec6b424 | 2006-11-06 20:50:59 -0500 | [diff] [blame] | 1032 | } |
| 1033 | |
Shawn O. Pearce | 4539eac | 2006-11-18 02:50:58 -0500 | [diff] [blame] | 1034 | proc PARENT {} { |
| 1035 | global PARENT empty_tree |
| 1036 | |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1037 | set p [lindex $PARENT 0] |
| 1038 | if {$p ne {}} { |
| 1039 | return $p |
Shawn O. Pearce | 4539eac | 2006-11-18 02:50:58 -0500 | [diff] [blame] | 1040 | } |
| 1041 | if {$empty_tree eq {}} { |
Shawn O. Pearce | 8134722 | 2007-02-12 22:48:56 -0500 | [diff] [blame] | 1042 | set empty_tree [git mktree << {}] |
Shawn O. Pearce | 4539eac | 2006-11-18 02:50:58 -0500 | [diff] [blame] | 1043 | } |
| 1044 | return $empty_tree |
| 1045 | } |
| 1046 | |
Shawn O. Pearce | 46aaf90 | 2007-01-22 17:10:38 -0500 | [diff] [blame] | 1047 | proc rescan {after {honor_trustmtime 1}} { |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1048 | global HEAD PARENT MERGE_HEAD commit_type |
Shawn O. Pearce | 699d560 | 2007-07-05 23:16:13 -0400 | [diff] [blame] | 1049 | global ui_index ui_workdir ui_comm |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1050 | global rescan_active file_states |
Shawn O. Pearce | cf25ddc | 2007-02-08 18:03:41 -0500 | [diff] [blame] | 1051 | global repo_config |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1052 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1053 | if {$rescan_active > 0 || ![lock_index read]} return |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1054 | |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1055 | repository_state newType newHEAD newMERGE_HEAD |
Shawn O. Pearce | 4539eac | 2006-11-18 02:50:58 -0500 | [diff] [blame] | 1056 | if {[string match amend* $commit_type] |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1057 | && $newType eq {normal} |
| 1058 | && $newHEAD eq $HEAD} { |
Shawn O. Pearce | e57ca85 | 2006-11-06 21:34:10 -0500 | [diff] [blame] | 1059 | } else { |
Shawn O. Pearce | f18e40a | 2006-11-20 21:27:22 -0500 | [diff] [blame] | 1060 | set HEAD $newHEAD |
| 1061 | set PARENT $newHEAD |
| 1062 | set MERGE_HEAD $newMERGE_HEAD |
| 1063 | set commit_type $newType |
Shawn O. Pearce | e57ca85 | 2006-11-06 21:34:10 -0500 | [diff] [blame] | 1064 | } |
| 1065 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1066 | array unset file_states |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1067 | |
Shawn O. Pearce | 1e0a92f | 2007-07-27 02:30:15 -0400 | [diff] [blame] | 1068 | if {!$::GITGUI_BCK_exists && |
| 1069 | (![$ui_comm edit modified] |
| 1070 | || [string trim [$ui_comm get 0.0 end]] eq {})} { |
Shawn O. Pearce | b2f3bb1 | 2007-06-11 19:39:55 -0400 | [diff] [blame] | 1071 | if {[string match amend* $commit_type]} { |
| 1072 | } elseif {[load_message GITGUI_MSG]} { |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1073 | } elseif {[load_message MERGE_MSG]} { |
| 1074 | } elseif {[load_message SQUASH_MSG]} { |
| 1075 | } |
Shawn O. Pearce | b2c6fcf | 2006-11-11 16:16:25 -0500 | [diff] [blame] | 1076 | $ui_comm edit reset |
Shawn O. Pearce | 21d7744 | 2006-11-20 21:59:19 -0500 | [diff] [blame] | 1077 | $ui_comm edit modified false |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1078 | } |
| 1079 | |
Shawn O. Pearce | 46aaf90 | 2007-01-22 17:10:38 -0500 | [diff] [blame] | 1080 | if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} { |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1081 | rescan_stage2 {} $after |
Shawn O. Pearce | e534f3a | 2006-11-07 21:27:29 -0500 | [diff] [blame] | 1082 | } else { |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1083 | set rescan_active 1 |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1084 | ui_status [mc "Refreshing file status..."] |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 1085 | set fd_rf [git_read update-index \ |
| 1086 | -q \ |
| 1087 | --unmerged \ |
| 1088 | --ignore-missing \ |
| 1089 | --refresh \ |
| 1090 | ] |
Shawn O. Pearce | e534f3a | 2006-11-07 21:27:29 -0500 | [diff] [blame] | 1091 | fconfigure $fd_rf -blocking 0 -translation binary |
Shawn O. Pearce | 390adae | 2006-11-11 19:40:33 -0500 | [diff] [blame] | 1092 | fileevent $fd_rf readable \ |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1093 | [list rescan_stage2 $fd_rf $after] |
Shawn O. Pearce | e534f3a | 2006-11-07 21:27:29 -0500 | [diff] [blame] | 1094 | } |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1095 | } |
| 1096 | |
Shawn O. Pearce | 2fe167b | 2007-09-21 11:44:23 -0400 | [diff] [blame] | 1097 | if {[is_Cygwin]} { |
| 1098 | set is_git_info_link {} |
| 1099 | set is_git_info_exclude {} |
| 1100 | proc have_info_exclude {} { |
| 1101 | global is_git_info_link is_git_info_exclude |
| 1102 | |
| 1103 | if {$is_git_info_link eq {}} { |
| 1104 | set is_git_info_link [file isfile [gitdir info.lnk]] |
| 1105 | } |
| 1106 | |
| 1107 | if {$is_git_info_link} { |
| 1108 | if {$is_git_info_exclude eq {}} { |
| 1109 | if {[catch {exec test -f [gitdir info exclude]}]} { |
| 1110 | set is_git_info_exclude 0 |
| 1111 | } else { |
| 1112 | set is_git_info_exclude 1 |
| 1113 | } |
| 1114 | } |
| 1115 | return $is_git_info_exclude |
| 1116 | } else { |
| 1117 | return [file readable [gitdir info exclude]] |
| 1118 | } |
| 1119 | } |
| 1120 | } else { |
| 1121 | proc have_info_exclude {} { |
| 1122 | return [file readable [gitdir info exclude]] |
| 1123 | } |
| 1124 | } |
| 1125 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1126 | proc rescan_stage2 {fd after} { |
Shawn O. Pearce | 4539eac | 2006-11-18 02:50:58 -0500 | [diff] [blame] | 1127 | global rescan_active buf_rdi buf_rdf buf_rlo |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1128 | |
Shawn O. Pearce | 043f701 | 2006-11-12 18:16:45 -0500 | [diff] [blame] | 1129 | if {$fd ne {}} { |
Shawn O. Pearce | e534f3a | 2006-11-07 21:27:29 -0500 | [diff] [blame] | 1130 | read $fd |
| 1131 | if {![eof $fd]} return |
| 1132 | close $fd |
| 1133 | } |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1134 | |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 1135 | set ls_others [list --exclude-per-directory=.gitignore] |
Shawn O. Pearce | 2fe167b | 2007-09-21 11:44:23 -0400 | [diff] [blame] | 1136 | if {[have_info_exclude]} { |
| 1137 | lappend ls_others "--exclude-from=[gitdir info exclude]" |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1138 | } |
Shawn O. Pearce | 94a4dd9 | 2007-07-29 03:22:27 -0400 | [diff] [blame] | 1139 | set user_exclude [get_config core.excludesfile] |
| 1140 | if {$user_exclude ne {} && [file readable $user_exclude]} { |
| 1141 | lappend ls_others "--exclude-from=$user_exclude" |
| 1142 | } |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1143 | |
Shawn O. Pearce | 868c875 | 2006-11-07 18:34:09 -0500 | [diff] [blame] | 1144 | set buf_rdi {} |
| 1145 | set buf_rdf {} |
| 1146 | set buf_rlo {} |
| 1147 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1148 | set rescan_active 3 |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1149 | ui_status [mc "Scanning for modified files ..."] |
Shawn O. Pearce | 0b81261 | 2007-07-09 01:17:09 -0400 | [diff] [blame] | 1150 | set fd_di [git_read diff-index --cached -z [PARENT]] |
| 1151 | set fd_df [git_read diff-files -z] |
| 1152 | set fd_lo [eval git_read ls-files --others -z $ls_others] |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1153 | |
Shawn O. Pearce | 51a989b | 2007-01-23 04:07:18 -0500 | [diff] [blame] | 1154 | fconfigure $fd_di -blocking 0 -translation binary -encoding binary |
| 1155 | fconfigure $fd_df -blocking 0 -translation binary -encoding binary |
| 1156 | fconfigure $fd_lo -blocking 0 -translation binary -encoding binary |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1157 | fileevent $fd_di readable [list read_diff_index $fd_di $after] |
| 1158 | fileevent $fd_df readable [list read_diff_files $fd_df $after] |
| 1159 | fileevent $fd_lo readable [list read_ls_others $fd_lo $after] |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1160 | } |
| 1161 | |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1162 | proc load_message {file} { |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 1163 | global ui_comm |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1164 | |
Shawn O. Pearce | c2758a1 | 2007-01-20 21:55:05 -0500 | [diff] [blame] | 1165 | set f [gitdir $file] |
Shawn O. Pearce | e57ca85 | 2006-11-06 21:34:10 -0500 | [diff] [blame] | 1166 | if {[file isfile $f]} { |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1167 | if {[catch {set fd [open $f r]}]} { |
| 1168 | return 0 |
| 1169 | } |
Shawn O. Pearce | 6eb420e | 2007-07-17 01:50:10 -0400 | [diff] [blame] | 1170 | fconfigure $fd -eofchar {} |
Shawn O. Pearce | e57ca85 | 2006-11-06 21:34:10 -0500 | [diff] [blame] | 1171 | set content [string trim [read $fd]] |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1172 | close $fd |
Shawn O. Pearce | 4e55d19 | 2007-01-25 12:54:59 -0500 | [diff] [blame] | 1173 | regsub -all -line {[ \r\t]+$} $content {} content |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1174 | $ui_comm delete 0.0 end |
| 1175 | $ui_comm insert end $content |
| 1176 | return 1 |
| 1177 | } |
| 1178 | return 0 |
| 1179 | } |
| 1180 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1181 | proc read_diff_index {fd after} { |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1182 | global buf_rdi |
| 1183 | |
| 1184 | append buf_rdi [read $fd] |
Shawn O. Pearce | 868c875 | 2006-11-07 18:34:09 -0500 | [diff] [blame] | 1185 | set c 0 |
| 1186 | set n [string length $buf_rdi] |
| 1187 | while {$c < $n} { |
| 1188 | set z1 [string first "\0" $buf_rdi $c] |
| 1189 | if {$z1 == -1} break |
| 1190 | incr z1 |
| 1191 | set z2 [string first "\0" $buf_rdi $z1] |
| 1192 | if {$z2 == -1} break |
| 1193 | |
Shawn O. Pearce | 868c875 | 2006-11-07 18:34:09 -0500 | [diff] [blame] | 1194 | incr c |
Shawn O. Pearce | 8629155 | 2006-11-19 01:00:48 -0500 | [diff] [blame] | 1195 | set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }] |
Shawn O. Pearce | 51a989b | 2007-01-23 04:07:18 -0500 | [diff] [blame] | 1196 | set p [string range $buf_rdi $z1 [expr {$z2 - 1}]] |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1197 | merge_state \ |
Shawn O. Pearce | 51a989b | 2007-01-23 04:07:18 -0500 | [diff] [blame] | 1198 | [encoding convertfrom $p] \ |
Shawn O. Pearce | 8629155 | 2006-11-19 01:00:48 -0500 | [diff] [blame] | 1199 | [lindex $i 4]? \ |
| 1200 | [list [lindex $i 0] [lindex $i 2]] \ |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1201 | [list] |
| 1202 | set c $z2 |
Shawn O. Pearce | 8629155 | 2006-11-19 01:00:48 -0500 | [diff] [blame] | 1203 | incr c |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1204 | } |
Shawn O. Pearce | 868c875 | 2006-11-07 18:34:09 -0500 | [diff] [blame] | 1205 | if {$c < $n} { |
| 1206 | set buf_rdi [string range $buf_rdi $c end] |
| 1207 | } else { |
| 1208 | set buf_rdi {} |
| 1209 | } |
| 1210 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1211 | rescan_done $fd buf_rdi $after |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1212 | } |
| 1213 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1214 | proc read_diff_files {fd after} { |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1215 | global buf_rdf |
| 1216 | |
| 1217 | append buf_rdf [read $fd] |
Shawn O. Pearce | 868c875 | 2006-11-07 18:34:09 -0500 | [diff] [blame] | 1218 | set c 0 |
| 1219 | set n [string length $buf_rdf] |
| 1220 | while {$c < $n} { |
| 1221 | set z1 [string first "\0" $buf_rdf $c] |
| 1222 | if {$z1 == -1} break |
| 1223 | incr z1 |
| 1224 | set z2 [string first "\0" $buf_rdf $z1] |
| 1225 | if {$z2 == -1} break |
| 1226 | |
Shawn O. Pearce | 868c875 | 2006-11-07 18:34:09 -0500 | [diff] [blame] | 1227 | incr c |
Shawn O. Pearce | 8629155 | 2006-11-19 01:00:48 -0500 | [diff] [blame] | 1228 | set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }] |
Shawn O. Pearce | 51a989b | 2007-01-23 04:07:18 -0500 | [diff] [blame] | 1229 | set p [string range $buf_rdf $z1 [expr {$z2 - 1}]] |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1230 | merge_state \ |
Shawn O. Pearce | 51a989b | 2007-01-23 04:07:18 -0500 | [diff] [blame] | 1231 | [encoding convertfrom $p] \ |
Shawn O. Pearce | 8629155 | 2006-11-19 01:00:48 -0500 | [diff] [blame] | 1232 | ?[lindex $i 4] \ |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1233 | [list] \ |
Shawn O. Pearce | 8629155 | 2006-11-19 01:00:48 -0500 | [diff] [blame] | 1234 | [list [lindex $i 0] [lindex $i 2]] |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1235 | set c $z2 |
Shawn O. Pearce | 8629155 | 2006-11-19 01:00:48 -0500 | [diff] [blame] | 1236 | incr c |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1237 | } |
Shawn O. Pearce | 868c875 | 2006-11-07 18:34:09 -0500 | [diff] [blame] | 1238 | if {$c < $n} { |
| 1239 | set buf_rdf [string range $buf_rdf $c end] |
| 1240 | } else { |
| 1241 | set buf_rdf {} |
| 1242 | } |
| 1243 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1244 | rescan_done $fd buf_rdf $after |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1245 | } |
| 1246 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1247 | proc read_ls_others {fd after} { |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1248 | global buf_rlo |
| 1249 | |
| 1250 | append buf_rlo [read $fd] |
| 1251 | set pck [split $buf_rlo "\0"] |
| 1252 | set buf_rlo [lindex $pck end] |
| 1253 | foreach p [lrange $pck 0 end-1] { |
Shawn O. Pearce | 8938410 | 2007-09-09 20:38:05 -0400 | [diff] [blame] | 1254 | set p [encoding convertfrom $p] |
| 1255 | if {[string index $p end] eq {/}} { |
| 1256 | set p [string range $p 0 end-1] |
| 1257 | } |
| 1258 | merge_state $p ?O |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1259 | } |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1260 | rescan_done $fd buf_rlo $after |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1261 | } |
| 1262 | |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1263 | proc rescan_done {fd buf after} { |
Shawn O. Pearce | f522c9b | 2007-05-07 23:35:48 -0400 | [diff] [blame] | 1264 | global rescan_active current_diff_path |
Shawn O. Pearce | f7f8d32 | 2006-11-13 04:22:42 -0500 | [diff] [blame] | 1265 | global file_states repo_config |
Shawn O. Pearce | 7f1df79 | 2006-11-11 18:38:00 -0500 | [diff] [blame] | 1266 | upvar $buf to_clear |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1267 | |
Shawn O. Pearce | f7f8d32 | 2006-11-13 04:22:42 -0500 | [diff] [blame] | 1268 | if {![eof $fd]} return |
| 1269 | set to_clear {} |
| 1270 | close $fd |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1271 | if {[incr rescan_active -1] > 0} return |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1272 | |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1273 | prune_selection |
Shawn O. Pearce | f7f8d32 | 2006-11-13 04:22:42 -0500 | [diff] [blame] | 1274 | unlock_index |
| 1275 | display_all_files |
Shawn O. Pearce | f522c9b | 2007-05-07 23:35:48 -0400 | [diff] [blame] | 1276 | if {$current_diff_path ne {}} reshow_diff |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 1277 | uplevel #0 $after |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1278 | } |
| 1279 | |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1280 | proc prune_selection {} { |
| 1281 | global file_states selected_paths |
| 1282 | |
| 1283 | foreach path [array names selected_paths] { |
| 1284 | if {[catch {set still_here $file_states($path)}]} { |
| 1285 | unset selected_paths($path) |
| 1286 | } |
| 1287 | } |
| 1288 | } |
| 1289 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1290 | ###################################################################### |
| 1291 | ## |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1292 | ## ui helpers |
| 1293 | |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1294 | proc mapicon {w state path} { |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1295 | global all_icons |
| 1296 | |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1297 | if {[catch {set r $all_icons($state$w)}]} { |
| 1298 | puts "error: no icon for $w state={$state} $path" |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1299 | return file_plain |
| 1300 | } |
| 1301 | return $r |
| 1302 | } |
| 1303 | |
| 1304 | proc mapdesc {state path} { |
| 1305 | global all_descs |
| 1306 | |
| 1307 | if {[catch {set r $all_descs($state)}]} { |
| 1308 | puts "error: no desc for state={$state} $path" |
| 1309 | return $state |
| 1310 | } |
| 1311 | return $r |
| 1312 | } |
| 1313 | |
Shawn O. Pearce | 699d560 | 2007-07-05 23:16:13 -0400 | [diff] [blame] | 1314 | proc ui_status {msg} { |
Shawn O. Pearce | 906ab7f | 2007-10-02 12:27:32 -0400 | [diff] [blame] | 1315 | global main_status |
| 1316 | if {[info exists main_status]} { |
| 1317 | $main_status show $msg |
| 1318 | } |
Shawn O. Pearce | 699d560 | 2007-07-05 23:16:13 -0400 | [diff] [blame] | 1319 | } |
| 1320 | |
| 1321 | proc ui_ready {{test {}}} { |
Shawn O. Pearce | 906ab7f | 2007-10-02 12:27:32 -0400 | [diff] [blame] | 1322 | global main_status |
| 1323 | if {[info exists main_status]} { |
| 1324 | $main_status show [mc "Ready."] $test |
| 1325 | } |
Shawn O. Pearce | 699d560 | 2007-07-05 23:16:13 -0400 | [diff] [blame] | 1326 | } |
| 1327 | |
Shawn O. Pearce | 68e009d | 2006-11-11 17:59:34 -0500 | [diff] [blame] | 1328 | proc escape_path {path} { |
Shawn O. Pearce | 42b922f | 2007-02-08 17:13:51 -0500 | [diff] [blame] | 1329 | regsub -all {\\} $path "\\\\" path |
Shawn O. Pearce | 68e009d | 2006-11-11 17:59:34 -0500 | [diff] [blame] | 1330 | regsub -all "\n" $path "\\n" path |
| 1331 | return $path |
| 1332 | } |
| 1333 | |
Shawn O. Pearce | 16403d0 | 2006-11-11 21:52:06 -0500 | [diff] [blame] | 1334 | proc short_path {path} { |
| 1335 | return [escape_path [lindex [file split $path] end]] |
| 1336 | } |
| 1337 | |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1338 | set next_icon_id 0 |
Shawn O. Pearce | 51cc47f | 2006-11-19 01:20:42 -0500 | [diff] [blame] | 1339 | set null_sha1 [string repeat 0 40] |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1340 | |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1341 | proc merge_state {path new_state {head_info {}} {index_info {}}} { |
Shawn O. Pearce | 51cc47f | 2006-11-19 01:20:42 -0500 | [diff] [blame] | 1342 | global file_states next_icon_id null_sha1 |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1343 | |
Shawn O. Pearce | 6b29267 | 2006-11-07 19:58:37 -0500 | [diff] [blame] | 1344 | set s0 [string index $new_state 0] |
| 1345 | set s1 [string index $new_state 1] |
| 1346 | |
| 1347 | if {[catch {set info $file_states($path)}]} { |
| 1348 | set state __ |
| 1349 | set icon n[incr next_icon_id] |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1350 | } else { |
Shawn O. Pearce | 6b29267 | 2006-11-07 19:58:37 -0500 | [diff] [blame] | 1351 | set state [lindex $info 0] |
| 1352 | set icon [lindex $info 1] |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1353 | if {$head_info eq {}} {set head_info [lindex $info 2]} |
| 1354 | if {$index_info eq {}} {set index_info [lindex $info 3]} |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1355 | } |
| 1356 | |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1357 | if {$s0 eq {?}} {set s0 [string index $state 0]} \ |
| 1358 | elseif {$s0 eq {_}} {set s0 _} |
| 1359 | |
| 1360 | if {$s1 eq {?}} {set s1 [string index $state 1]} \ |
| 1361 | elseif {$s1 eq {_}} {set s1 _} |
| 1362 | |
Shawn O. Pearce | 51cc47f | 2006-11-19 01:20:42 -0500 | [diff] [blame] | 1363 | if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} { |
| 1364 | set head_info [list 0 $null_sha1] |
| 1365 | } elseif {$s0 ne {_} && [string index $state 0] eq {_} |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1366 | && $head_info eq {}} { |
| 1367 | set head_info $index_info |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1368 | } |
| 1369 | |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 1370 | set file_states($path) [list $s0$s1 $icon \ |
| 1371 | $head_info $index_info \ |
| 1372 | ] |
Shawn O. Pearce | 6b29267 | 2006-11-07 19:58:37 -0500 | [diff] [blame] | 1373 | return $state |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1374 | } |
| 1375 | |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1376 | proc display_file_helper {w path icon_name old_m new_m} { |
| 1377 | global file_lists |
| 1378 | |
| 1379 | if {$new_m eq {_}} { |
Shawn O. Pearce | 156b292 | 2007-01-25 22:38:59 -0500 | [diff] [blame] | 1380 | set lno [lsearch -sorted -exact $file_lists($w) $path] |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1381 | if {$lno >= 0} { |
| 1382 | set file_lists($w) [lreplace $file_lists($w) $lno $lno] |
| 1383 | incr lno |
| 1384 | $w conf -state normal |
| 1385 | $w delete $lno.0 [expr {$lno + 1}].0 |
| 1386 | $w conf -state disabled |
| 1387 | } |
| 1388 | } elseif {$old_m eq {_} && $new_m ne {_}} { |
| 1389 | lappend file_lists($w) $path |
| 1390 | set file_lists($w) [lsort -unique $file_lists($w)] |
Shawn O. Pearce | 156b292 | 2007-01-25 22:38:59 -0500 | [diff] [blame] | 1391 | set lno [lsearch -sorted -exact $file_lists($w) $path] |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1392 | incr lno |
| 1393 | $w conf -state normal |
| 1394 | $w image create $lno.0 \ |
| 1395 | -align center -padx 5 -pady 1 \ |
| 1396 | -name $icon_name \ |
| 1397 | -image [mapicon $w $new_m $path] |
| 1398 | $w insert $lno.1 "[escape_path $path]\n" |
| 1399 | $w conf -state disabled |
| 1400 | } elseif {$old_m ne $new_m} { |
| 1401 | $w conf -state normal |
| 1402 | $w image conf $icon_name -image [mapicon $w $new_m $path] |
| 1403 | $w conf -state disabled |
| 1404 | } |
| 1405 | } |
| 1406 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1407 | proc display_file {path state} { |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1408 | global file_states selected_paths |
| 1409 | global ui_index ui_workdir |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1410 | |
| 1411 | set old_m [merge_state $path $state] |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1412 | set s $file_states($path) |
| 1413 | set new_m [lindex $s 0] |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1414 | set icon_name [lindex $s 1] |
| 1415 | |
Shawn O. Pearce | 079d0d5 | 2007-01-21 13:18:11 -0500 | [diff] [blame] | 1416 | set o [string index $old_m 0] |
| 1417 | set n [string index $new_m 0] |
| 1418 | if {$o eq {U}} { |
| 1419 | set o _ |
Shawn O. Pearce | 3b4db3c | 2007-01-21 12:30:51 -0500 | [diff] [blame] | 1420 | } |
Shawn O. Pearce | 079d0d5 | 2007-01-21 13:18:11 -0500 | [diff] [blame] | 1421 | if {$n eq {U}} { |
| 1422 | set n _ |
| 1423 | } |
| 1424 | display_file_helper $ui_index $path $icon_name $o $n |
Shawn O. Pearce | 3b4db3c | 2007-01-21 12:30:51 -0500 | [diff] [blame] | 1425 | |
Shawn O. Pearce | 079d0d5 | 2007-01-21 13:18:11 -0500 | [diff] [blame] | 1426 | if {[string index $old_m 0] eq {U}} { |
| 1427 | set o U |
Shawn O. Pearce | 3b4db3c | 2007-01-21 12:30:51 -0500 | [diff] [blame] | 1428 | } else { |
Shawn O. Pearce | a4b1786 | 2007-01-21 13:25:06 -0500 | [diff] [blame] | 1429 | set o [string index $old_m 1] |
Shawn O. Pearce | 3b4db3c | 2007-01-21 12:30:51 -0500 | [diff] [blame] | 1430 | } |
Shawn O. Pearce | 079d0d5 | 2007-01-21 13:18:11 -0500 | [diff] [blame] | 1431 | if {[string index $new_m 0] eq {U}} { |
| 1432 | set n U |
| 1433 | } else { |
| 1434 | set n [string index $new_m 1] |
| 1435 | } |
| 1436 | display_file_helper $ui_workdir $path $icon_name $o $n |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1437 | |
Shawn O. Pearce | e734817 | 2006-11-23 21:40:45 -0500 | [diff] [blame] | 1438 | if {$new_m eq {__}} { |
Shawn O. Pearce | e734817 | 2006-11-23 21:40:45 -0500 | [diff] [blame] | 1439 | unset file_states($path) |
| 1440 | catch {unset selected_paths($path)} |
Shawn O. Pearce | e734817 | 2006-11-23 21:40:45 -0500 | [diff] [blame] | 1441 | } |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1442 | } |
Shawn O. Pearce | e734817 | 2006-11-23 21:40:45 -0500 | [diff] [blame] | 1443 | |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1444 | proc display_all_files_helper {w path icon_name m} { |
| 1445 | global file_lists |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1446 | |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1447 | lappend file_lists($w) $path |
| 1448 | set lno [expr {[lindex [split [$w index end] .] 0] - 1}] |
| 1449 | $w image create end \ |
| 1450 | -align center -padx 5 -pady 1 \ |
| 1451 | -name $icon_name \ |
| 1452 | -image [mapicon $w $m $path] |
| 1453 | $w insert end "[escape_path $path]\n" |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1454 | } |
| 1455 | |
| 1456 | proc display_all_files {} { |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 1457 | global ui_index ui_workdir |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1458 | global file_states file_lists |
Shawn O. Pearce | 833eda7 | 2007-01-20 23:46:53 -0500 | [diff] [blame] | 1459 | global last_clicked |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1460 | |
| 1461 | $ui_index conf -state normal |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 1462 | $ui_workdir conf -state normal |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1463 | |
Shawn O. Pearce | 7f1df79 | 2006-11-11 18:38:00 -0500 | [diff] [blame] | 1464 | $ui_index delete 0.0 end |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 1465 | $ui_workdir delete 0.0 end |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1466 | set last_clicked {} |
Shawn O. Pearce | 7f1df79 | 2006-11-11 18:38:00 -0500 | [diff] [blame] | 1467 | |
Shawn O. Pearce | 62aac80 | 2006-11-11 20:00:35 -0500 | [diff] [blame] | 1468 | set file_lists($ui_index) [list] |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 1469 | set file_lists($ui_workdir) [list] |
Shawn O. Pearce | 62aac80 | 2006-11-11 20:00:35 -0500 | [diff] [blame] | 1470 | |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1471 | foreach path [lsort [array names file_states]] { |
| 1472 | set s $file_states($path) |
| 1473 | set m [lindex $s 0] |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1474 | set icon_name [lindex $s 1] |
| 1475 | |
Shawn O. Pearce | 3b4db3c | 2007-01-21 12:30:51 -0500 | [diff] [blame] | 1476 | set s [string index $m 0] |
| 1477 | if {$s ne {U} && $s ne {_}} { |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1478 | display_all_files_helper $ui_index $path \ |
Shawn O. Pearce | 3b4db3c | 2007-01-21 12:30:51 -0500 | [diff] [blame] | 1479 | $icon_name $s |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1480 | } |
Shawn O. Pearce | 3b4db3c | 2007-01-21 12:30:51 -0500 | [diff] [blame] | 1481 | |
| 1482 | if {[string index $m 0] eq {U}} { |
| 1483 | set s U |
| 1484 | } else { |
| 1485 | set s [string index $m 1] |
| 1486 | } |
| 1487 | if {$s ne {_}} { |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1488 | display_all_files_helper $ui_workdir $path \ |
Shawn O. Pearce | 3b4db3c | 2007-01-21 12:30:51 -0500 | [diff] [blame] | 1489 | $icon_name $s |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1490 | } |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1491 | } |
| 1492 | |
Shawn O. Pearce | 93f654d | 2006-11-07 19:30:54 -0500 | [diff] [blame] | 1493 | $ui_index conf -state disabled |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 1494 | $ui_workdir conf -state disabled |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1495 | } |
| 1496 | |
Shawn O. Pearce | 35874c1 | 2007-01-29 00:50:41 -0500 | [diff] [blame] | 1497 | ###################################################################### |
| 1498 | ## |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1499 | ## icons |
| 1500 | |
| 1501 | set filemask { |
| 1502 | #define mask_width 14 |
| 1503 | #define mask_height 15 |
| 1504 | static unsigned char mask_bits[] = { |
| 1505 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, |
| 1506 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, |
| 1507 | 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f}; |
| 1508 | } |
| 1509 | |
| 1510 | image create bitmap file_plain -background white -foreground black -data { |
| 1511 | #define plain_width 14 |
| 1512 | #define plain_height 15 |
| 1513 | static unsigned char plain_bits[] = { |
| 1514 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, |
| 1515 | 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, |
| 1516 | 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; |
| 1517 | } -maskdata $filemask |
| 1518 | |
| 1519 | image create bitmap file_mod -background white -foreground blue -data { |
| 1520 | #define mod_width 14 |
| 1521 | #define mod_height 15 |
| 1522 | static unsigned char mod_bits[] = { |
| 1523 | 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, |
| 1524 | 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, |
| 1525 | 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; |
| 1526 | } -maskdata $filemask |
| 1527 | |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1528 | image create bitmap file_fulltick -background white -foreground "#007000" -data { |
| 1529 | #define file_fulltick_width 14 |
| 1530 | #define file_fulltick_height 15 |
| 1531 | static unsigned char file_fulltick_bits[] = { |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1532 | 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16, |
| 1533 | 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10, |
| 1534 | 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; |
| 1535 | } -maskdata $filemask |
| 1536 | |
| 1537 | image create bitmap file_parttick -background white -foreground "#005050" -data { |
| 1538 | #define parttick_width 14 |
| 1539 | #define parttick_height 15 |
| 1540 | static unsigned char parttick_bits[] = { |
| 1541 | 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, |
| 1542 | 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10, |
| 1543 | 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f}; |
| 1544 | } -maskdata $filemask |
| 1545 | |
| 1546 | image create bitmap file_question -background white -foreground black -data { |
| 1547 | #define file_question_width 14 |
| 1548 | #define file_question_height 15 |
| 1549 | static unsigned char file_question_bits[] = { |
| 1550 | 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13, |
| 1551 | 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10, |
| 1552 | 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; |
| 1553 | } -maskdata $filemask |
| 1554 | |
| 1555 | image create bitmap file_removed -background white -foreground red -data { |
| 1556 | #define file_removed_width 14 |
| 1557 | #define file_removed_height 15 |
| 1558 | static unsigned char file_removed_bits[] = { |
| 1559 | 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, |
| 1560 | 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13, |
| 1561 | 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f}; |
| 1562 | } -maskdata $filemask |
| 1563 | |
| 1564 | image create bitmap file_merge -background white -foreground blue -data { |
| 1565 | #define file_merge_width 14 |
| 1566 | #define file_merge_height 15 |
| 1567 | static unsigned char file_merge_bits[] = { |
| 1568 | 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10, |
| 1569 | 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, |
| 1570 | 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; |
| 1571 | } -maskdata $filemask |
| 1572 | |
Shawn O. Pearce | 6b29267 | 2006-11-07 19:58:37 -0500 | [diff] [blame] | 1573 | set ui_index .vpane.files.index.list |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 1574 | set ui_workdir .vpane.files.workdir.list |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1575 | |
| 1576 | set all_icons(_$ui_index) file_plain |
| 1577 | set all_icons(A$ui_index) file_fulltick |
| 1578 | set all_icons(M$ui_index) file_fulltick |
| 1579 | set all_icons(D$ui_index) file_removed |
| 1580 | set all_icons(U$ui_index) file_merge |
| 1581 | |
| 1582 | set all_icons(_$ui_workdir) file_plain |
| 1583 | set all_icons(M$ui_workdir) file_mod |
| 1584 | set all_icons(D$ui_workdir) file_question |
Shawn O. Pearce | 3b4db3c | 2007-01-21 12:30:51 -0500 | [diff] [blame] | 1585 | set all_icons(U$ui_workdir) file_merge |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1586 | set all_icons(O$ui_workdir) file_plain |
| 1587 | |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1588 | set max_status_desc 0 |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1589 | foreach i { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1590 | {__ {mc "Unmodified"}} |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1591 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1592 | {_M {mc "Modified, not staged"}} |
| 1593 | {M_ {mc "Staged for commit"}} |
| 1594 | {MM {mc "Portions staged for commit"}} |
| 1595 | {MD {mc "Staged for commit, missing"}} |
Shawn O. Pearce | ac39160 | 2007-01-20 23:00:28 -0500 | [diff] [blame] | 1596 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1597 | {_O {mc "Untracked, not staged"}} |
| 1598 | {A_ {mc "Staged for commit"}} |
| 1599 | {AM {mc "Portions staged for commit"}} |
| 1600 | {AD {mc "Staged for commit, missing"}} |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1601 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1602 | {_D {mc "Missing"}} |
| 1603 | {D_ {mc "Staged for removal"}} |
| 1604 | {DO {mc "Staged for removal, still present"}} |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1605 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1606 | {U_ {mc "Requires merge resolution"}} |
| 1607 | {UU {mc "Requires merge resolution"}} |
| 1608 | {UM {mc "Requires merge resolution"}} |
| 1609 | {UD {mc "Requires merge resolution"}} |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1610 | } { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1611 | set text [eval [lindex $i 1]] |
| 1612 | if {$max_status_desc < [string length $text]} { |
| 1613 | set max_status_desc [string length $text] |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1614 | } |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1615 | set all_descs([lindex $i 0]) $text |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1616 | } |
Shawn O. Pearce | 21e409a | 2007-01-20 22:45:19 -0500 | [diff] [blame] | 1617 | unset i |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1618 | |
| 1619 | ###################################################################### |
| 1620 | ## |
| 1621 | ## util |
| 1622 | |
Shawn O. Pearce | 35874c1 | 2007-01-29 00:50:41 -0500 | [diff] [blame] | 1623 | proc scrollbar2many {list mode args} { |
| 1624 | foreach w $list {eval $w $mode $args} |
| 1625 | } |
| 1626 | |
| 1627 | proc many2scrollbar {list mode sb top bottom} { |
| 1628 | $sb set $top $bottom |
| 1629 | foreach w $list {$w $mode moveto $top} |
| 1630 | } |
| 1631 | |
Shawn O. Pearce | b494693 | 2006-11-12 00:40:38 -0500 | [diff] [blame] | 1632 | proc incr_font_size {font {amt 1}} { |
| 1633 | set sz [font configure $font -size] |
| 1634 | incr sz $amt |
| 1635 | font configure $font -size $sz |
| 1636 | font configure ${font}bold -size $sz |
Shawn O. Pearce | debcd0f | 2007-06-02 17:15:56 -0400 | [diff] [blame] | 1637 | font configure ${font}italic -size $sz |
Shawn O. Pearce | b494693 | 2006-11-12 00:40:38 -0500 | [diff] [blame] | 1638 | } |
| 1639 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1640 | ###################################################################### |
| 1641 | ## |
| 1642 | ## ui commands |
| 1643 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1644 | set starting_gitk_msg [mc "Starting gitk... please wait..."] |
Shawn O. Pearce | cc4b1c0 | 2006-11-06 23:47:05 -0500 | [diff] [blame] | 1645 | |
Shawn O. Pearce | d075242 | 2006-11-21 20:33:09 -0500 | [diff] [blame] | 1646 | proc do_gitk {revs} { |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 1647 | # -- Always start gitk through whatever we were loaded with. This |
| 1648 | # lets us bypass using shell process on Windows systems. |
| 1649 | # |
Shawn O. Pearce | 02efd48 | 2007-07-09 02:10:39 -0400 | [diff] [blame] | 1650 | set exe [file join [file dirname $::_git] gitk] |
| 1651 | set cmd [list [info nameofexecutable] $exe] |
Gerrit Pape | 7aecb12 | 2007-06-29 11:32:29 +0000 | [diff] [blame] | 1652 | if {! [file exists $exe]} { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1653 | error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe] |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1654 | } else { |
Shawn O. Pearce | 501e4c6 | 2007-10-02 12:24:44 -0400 | [diff] [blame] | 1655 | global env |
| 1656 | |
| 1657 | if {[info exists env(GIT_DIR)]} { |
| 1658 | set old_GIT_DIR $env(GIT_DIR) |
| 1659 | } else { |
| 1660 | set old_GIT_DIR {} |
| 1661 | } |
| 1662 | |
| 1663 | set pwd [pwd] |
| 1664 | cd [file dirname [gitdir]] |
| 1665 | set env(GIT_DIR) [file tail [gitdir]] |
| 1666 | |
Shawn O. Pearce | 02efd48 | 2007-07-09 02:10:39 -0400 | [diff] [blame] | 1667 | eval exec $cmd $revs & |
Shawn O. Pearce | 501e4c6 | 2007-10-02 12:24:44 -0400 | [diff] [blame] | 1668 | |
| 1669 | if {$old_GIT_DIR eq {}} { |
| 1670 | unset env(GIT_DIR) |
| 1671 | } else { |
| 1672 | set env(GIT_DIR) $old_GIT_DIR |
| 1673 | } |
| 1674 | cd $pwd |
| 1675 | |
Shawn O. Pearce | 02efd48 | 2007-07-09 02:10:39 -0400 | [diff] [blame] | 1676 | ui_status $::starting_gitk_msg |
Shawn O. Pearce | d075242 | 2006-11-21 20:33:09 -0500 | [diff] [blame] | 1677 | after 10000 { |
Shawn O. Pearce | 699d560 | 2007-07-05 23:16:13 -0400 | [diff] [blame] | 1678 | ui_ready $starting_gitk_msg |
Shawn O. Pearce | d075242 | 2006-11-21 20:33:09 -0500 | [diff] [blame] | 1679 | } |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1680 | } |
| 1681 | } |
| 1682 | |
Shawn O. Pearce | b5834d7 | 2006-11-12 02:27:28 -0500 | [diff] [blame] | 1683 | set is_quitting 0 |
Shawn O. Pearce | c4fe772 | 2006-11-11 19:32:24 -0500 | [diff] [blame] | 1684 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1685 | proc do_quit {} { |
Shawn O. Pearce | c950c66 | 2007-01-20 21:48:56 -0500 | [diff] [blame] | 1686 | global ui_comm is_quitting repo_config commit_type |
Shawn O. Pearce | 4578c5c | 2007-07-21 04:57:57 -0400 | [diff] [blame] | 1687 | global GITGUI_BCK_exists GITGUI_BCK_i |
Shawn O. Pearce | 95b002e | 2008-02-07 02:35:25 -0500 | [diff] [blame] | 1688 | global ui_comm_spell |
Shawn O. Pearce | c4fe772 | 2006-11-11 19:32:24 -0500 | [diff] [blame] | 1689 | |
Shawn O. Pearce | b5834d7 | 2006-11-12 02:27:28 -0500 | [diff] [blame] | 1690 | if {$is_quitting} return |
| 1691 | set is_quitting 1 |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1692 | |
Shawn O. Pearce | db7f34d | 2007-02-08 17:47:17 -0500 | [diff] [blame] | 1693 | if {[winfo exists $ui_comm]} { |
| 1694 | # -- Stash our current commit buffer. |
| 1695 | # |
| 1696 | set save [gitdir GITGUI_MSG] |
Shawn O. Pearce | 4578c5c | 2007-07-21 04:57:57 -0400 | [diff] [blame] | 1697 | if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { |
| 1698 | file rename -force [gitdir GITGUI_BCK] $save |
| 1699 | set GITGUI_BCK_exists 0 |
Shawn O. Pearce | db7f34d | 2007-02-08 17:47:17 -0500 | [diff] [blame] | 1700 | } else { |
Shawn O. Pearce | 4578c5c | 2007-07-21 04:57:57 -0400 | [diff] [blame] | 1701 | set msg [string trim [$ui_comm get 0.0 end]] |
| 1702 | regsub -all -line {[ \r\t]+$} $msg {} msg |
| 1703 | if {(![string match amend* $commit_type] |
| 1704 | || [$ui_comm edit modified]) |
| 1705 | && $msg ne {}} { |
| 1706 | catch { |
| 1707 | set fd [open $save w] |
| 1708 | puts -nonewline $fd $msg |
| 1709 | close $fd |
| 1710 | } |
| 1711 | } else { |
| 1712 | catch {file delete $save} |
| 1713 | } |
| 1714 | } |
| 1715 | |
Shawn O. Pearce | 95b002e | 2008-02-07 02:35:25 -0500 | [diff] [blame] | 1716 | # -- Cancel our spellchecker if its running. |
| 1717 | # |
| 1718 | if {[info exists ui_comm_spell]} { |
| 1719 | $ui_comm_spell stop |
| 1720 | } |
| 1721 | |
Shawn O. Pearce | 4578c5c | 2007-07-21 04:57:57 -0400 | [diff] [blame] | 1722 | # -- Remove our editor backup, its not needed. |
| 1723 | # |
| 1724 | after cancel $GITGUI_BCK_i |
| 1725 | if {$GITGUI_BCK_exists} { |
| 1726 | catch {file delete [gitdir GITGUI_BCK]} |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1727 | } |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1728 | |
Shawn O. Pearce | db7f34d | 2007-02-08 17:47:17 -0500 | [diff] [blame] | 1729 | # -- Stash our current window geometry into this repository. |
| 1730 | # |
| 1731 | set cfg_geometry [list] |
| 1732 | lappend cfg_geometry [wm geometry .] |
Johannes Sixt | a0592d3 | 2007-10-10 20:50:40 -0400 | [diff] [blame] | 1733 | lappend cfg_geometry [lindex [.vpane sash coord 0] 0] |
| 1734 | lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1] |
Shawn O. Pearce | db7f34d | 2007-02-08 17:47:17 -0500 | [diff] [blame] | 1735 | if {[catch {set rc_geometry $repo_config(gui.geometry)}]} { |
| 1736 | set rc_geometry {} |
| 1737 | } |
| 1738 | if {$cfg_geometry ne $rc_geometry} { |
Shawn O. Pearce | 8134722 | 2007-02-12 22:48:56 -0500 | [diff] [blame] | 1739 | catch {git config gui.geometry $cfg_geometry} |
Shawn O. Pearce | db7f34d | 2007-02-08 17:47:17 -0500 | [diff] [blame] | 1740 | } |
Shawn O. Pearce | 51f4d16 | 2006-11-12 03:47:00 -0500 | [diff] [blame] | 1741 | } |
| 1742 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1743 | destroy . |
| 1744 | } |
| 1745 | |
| 1746 | proc do_rescan {} { |
Shawn O. Pearce | 699d560 | 2007-07-05 23:16:13 -0400 | [diff] [blame] | 1747 | rescan ui_ready |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1748 | } |
| 1749 | |
Shawn O. Pearce | 6e27d82 | 2006-11-06 20:03:36 -0500 | [diff] [blame] | 1750 | proc do_commit {} { |
Shawn O. Pearce | ec6b424 | 2006-11-06 20:50:59 -0500 | [diff] [blame] | 1751 | commit_tree |
Shawn O. Pearce | 6e27d82 | 2006-11-06 20:03:36 -0500 | [diff] [blame] | 1752 | } |
| 1753 | |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1754 | proc toggle_or_diff {w x y} { |
Shawn O. Pearce | 20a53c0 | 2007-01-21 11:37:58 -0500 | [diff] [blame] | 1755 | global file_states file_lists current_diff_path ui_index ui_workdir |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1756 | global last_clicked selected_paths |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 1757 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1758 | set pos [split [$w index @$x,$y] .] |
| 1759 | set lno [lindex $pos 0] |
| 1760 | set col [lindex $pos 1] |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1761 | set path [lindex $file_lists($w) [expr {$lno - 1}]] |
| 1762 | if {$path eq {}} { |
| 1763 | set last_clicked {} |
| 1764 | return |
| 1765 | } |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1766 | |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1767 | set last_clicked [list $w $lno] |
| 1768 | array unset selected_paths |
| 1769 | $ui_index tag remove in_sel 0.0 end |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 1770 | $ui_workdir tag remove in_sel 0.0 end |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1771 | |
| 1772 | if {$col == 0} { |
Shawn O. Pearce | 20a53c0 | 2007-01-21 11:37:58 -0500 | [diff] [blame] | 1773 | if {$current_diff_path eq $path} { |
Shawn O. Pearce | 32e0bca | 2006-11-18 03:03:16 -0500 | [diff] [blame] | 1774 | set after {reshow_diff;} |
| 1775 | } else { |
| 1776 | set after {} |
| 1777 | } |
Shawn O. Pearce | de5f6d5 | 2007-01-20 23:10:30 -0500 | [diff] [blame] | 1778 | if {$w eq $ui_index} { |
Shawn O. Pearce | 74d18d2 | 2006-11-19 00:37:49 -0500 | [diff] [blame] | 1779 | update_indexinfo \ |
Shawn O. Pearce | 93e912c | 2007-01-20 23:07:04 -0500 | [diff] [blame] | 1780 | "Unstaging [short_path $path] from commit" \ |
Shawn O. Pearce | 74d18d2 | 2006-11-19 00:37:49 -0500 | [diff] [blame] | 1781 | [list $path] \ |
Shawn O. Pearce | 699d560 | 2007-07-05 23:16:13 -0400 | [diff] [blame] | 1782 | [concat $after [list ui_ready]] |
Shawn O. Pearce | de5f6d5 | 2007-01-20 23:10:30 -0500 | [diff] [blame] | 1783 | } elseif {$w eq $ui_workdir} { |
Shawn O. Pearce | 74d18d2 | 2006-11-19 00:37:49 -0500 | [diff] [blame] | 1784 | update_index \ |
Shawn O. Pearce | 4d583c8 | 2007-01-20 19:07:46 -0500 | [diff] [blame] | 1785 | "Adding [short_path $path]" \ |
Shawn O. Pearce | 74d18d2 | 2006-11-19 00:37:49 -0500 | [diff] [blame] | 1786 | [list $path] \ |
Shawn O. Pearce | 699d560 | 2007-07-05 23:16:13 -0400 | [diff] [blame] | 1787 | [concat $after [list ui_ready]] |
Shawn O. Pearce | 74d18d2 | 2006-11-19 00:37:49 -0500 | [diff] [blame] | 1788 | } |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1789 | } else { |
Shawn O. Pearce | 03e4ec5 | 2006-11-11 17:52:16 -0500 | [diff] [blame] | 1790 | show_diff $path $w $lno |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1791 | } |
| 1792 | } |
| 1793 | |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1794 | proc add_one_to_selection {w x y} { |
Shawn O. Pearce | 833eda7 | 2007-01-20 23:46:53 -0500 | [diff] [blame] | 1795 | global file_lists last_clicked selected_paths |
Shawn O. Pearce | 7f1df79 | 2006-11-11 18:38:00 -0500 | [diff] [blame] | 1796 | |
Shawn O. Pearce | 833eda7 | 2007-01-20 23:46:53 -0500 | [diff] [blame] | 1797 | set lno [lindex [split [$w index @$x,$y] .] 0] |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1798 | set path [lindex $file_lists($w) [expr {$lno - 1}]] |
| 1799 | if {$path eq {}} { |
| 1800 | set last_clicked {} |
| 1801 | return |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1802 | } |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1803 | |
Shawn O. Pearce | 833eda7 | 2007-01-20 23:46:53 -0500 | [diff] [blame] | 1804 | if {$last_clicked ne {} |
| 1805 | && [lindex $last_clicked 0] ne $w} { |
| 1806 | array unset selected_paths |
| 1807 | [lindex $last_clicked 0] tag remove in_sel 0.0 end |
| 1808 | } |
| 1809 | |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1810 | set last_clicked [list $w $lno] |
| 1811 | if {[catch {set in_sel $selected_paths($path)}]} { |
| 1812 | set in_sel 0 |
| 1813 | } |
| 1814 | if {$in_sel} { |
| 1815 | unset selected_paths($path) |
| 1816 | $w tag remove in_sel $lno.0 [expr {$lno + 1}].0 |
| 1817 | } else { |
| 1818 | set selected_paths($path) 1 |
| 1819 | $w tag add in_sel $lno.0 [expr {$lno + 1}].0 |
| 1820 | } |
| 1821 | } |
| 1822 | |
| 1823 | proc add_range_to_selection {w x y} { |
Shawn O. Pearce | 833eda7 | 2007-01-20 23:46:53 -0500 | [diff] [blame] | 1824 | global file_lists last_clicked selected_paths |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1825 | |
| 1826 | if {[lindex $last_clicked 0] ne $w} { |
| 1827 | toggle_or_diff $w $x $y |
| 1828 | return |
| 1829 | } |
| 1830 | |
Shawn O. Pearce | 833eda7 | 2007-01-20 23:46:53 -0500 | [diff] [blame] | 1831 | set lno [lindex [split [$w index @$x,$y] .] 0] |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 1832 | set lc [lindex $last_clicked 1] |
| 1833 | if {$lc < $lno} { |
| 1834 | set begin $lc |
| 1835 | set end $lno |
| 1836 | } else { |
| 1837 | set begin $lno |
| 1838 | set end $lc |
| 1839 | } |
| 1840 | |
| 1841 | foreach path [lrange $file_lists($w) \ |
| 1842 | [expr {$begin - 1}] \ |
| 1843 | [expr {$end - 1}]] { |
| 1844 | set selected_paths($path) 1 |
| 1845 | } |
| 1846 | $w tag add in_sel $begin.0 [expr {$end + 1}].0 |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1847 | } |
| 1848 | |
Jonathan del Strother | c91ee2b | 2008-04-01 11:54:03 +0100 | [diff] [blame] | 1849 | proc show_more_context {} { |
| 1850 | global repo_config |
| 1851 | if {$repo_config(gui.diffcontext) < 99} { |
| 1852 | incr repo_config(gui.diffcontext) |
| 1853 | reshow_diff |
| 1854 | } |
| 1855 | } |
| 1856 | |
| 1857 | proc show_less_context {} { |
| 1858 | global repo_config |
| 1859 | if {$repo_config(gui.diffcontext) >= 1} { |
| 1860 | incr repo_config(gui.diffcontext) -1 |
| 1861 | reshow_diff |
| 1862 | } |
| 1863 | } |
| 1864 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1865 | ###################################################################### |
| 1866 | ## |
Shawn O. Pearce | 92148d8 | 2006-11-12 05:27:00 -0500 | [diff] [blame] | 1867 | ## ui construction |
| 1868 | |
Shawn O. Pearce | a4bee59 | 2007-09-21 03:41:51 -0400 | [diff] [blame] | 1869 | load_config 0 |
| 1870 | apply_config |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 1871 | set ui_comm {} |
| 1872 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1873 | # -- Menu Bar |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 1874 | # |
Shawn O. Pearce | b494693 | 2006-11-12 00:40:38 -0500 | [diff] [blame] | 1875 | menu .mbar -tearoff 0 |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1876 | .mbar add cascade -label [mc Repository] -menu .mbar.repository |
| 1877 | .mbar add cascade -label [mc Edit] -menu .mbar.edit |
Shawn O. Pearce | 64a906f | 2007-02-08 18:10:05 -0500 | [diff] [blame] | 1878 | if {[is_enabled branch]} { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1879 | .mbar add cascade -label [mc Branch] -menu .mbar.branch |
Shawn O. Pearce | 700a65c | 2006-11-24 17:30:12 -0500 | [diff] [blame] | 1880 | } |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 1881 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
Harri Ilari Tapio Liusvaara | a9813cb | 2007-09-12 23:02:35 +0300 | [diff] [blame] | 1882 | .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 1883 | } |
Shawn O. Pearce | 64a906f | 2007-02-08 18:10:05 -0500 | [diff] [blame] | 1884 | if {[is_enabled transport]} { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1885 | .mbar add cascade -label [mc Merge] -menu .mbar.merge |
Shawn O. Pearce | 6bdf5e5 | 2007-10-07 22:23:54 -0700 | [diff] [blame] | 1886 | .mbar add cascade -label [mc Remote] -menu .mbar.remote |
Shawn O. Pearce | 4ccdab0 | 2006-11-12 16:20:36 -0500 | [diff] [blame] | 1887 | } |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1888 | . configure -menu .mbar |
| 1889 | |
Shawn O. Pearce | a4abfa6 | 2006-11-20 23:01:47 -0500 | [diff] [blame] | 1890 | # -- Repository Menu |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 1891 | # |
Shawn O. Pearce | a4abfa6 | 2006-11-20 23:01:47 -0500 | [diff] [blame] | 1892 | menu .mbar.repository |
Shawn O. Pearce | 35874c1 | 2007-01-29 00:50:41 -0500 | [diff] [blame] | 1893 | |
| 1894 | .mbar.repository add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1895 | -label [mc "Browse Current Branch's Files"] \ |
Shawn O. Pearce | c74b6c6 | 2007-05-08 20:33:47 -0400 | [diff] [blame] | 1896 | -command {browser::new $current_branch} |
Shawn O. Pearce | a813988 | 2007-07-23 01:11:08 -0400 | [diff] [blame] | 1897 | set ui_browse_current [.mbar.repository index last] |
Shawn O. Pearce | 8e891fa | 2007-07-18 01:39:27 -0400 | [diff] [blame] | 1898 | .mbar.repository add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1899 | -label [mc "Browse Branch Files..."] \ |
Shawn O. Pearce | 8e891fa | 2007-07-18 01:39:27 -0400 | [diff] [blame] | 1900 | -command browser_open::dialog |
Shawn O. Pearce | 35874c1 | 2007-01-29 00:50:41 -0500 | [diff] [blame] | 1901 | .mbar.repository add separator |
| 1902 | |
Shawn O. Pearce | d075242 | 2006-11-21 20:33:09 -0500 | [diff] [blame] | 1903 | .mbar.repository add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1904 | -label [mc "Visualize Current Branch's History"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1905 | -command {do_gitk $current_branch} |
Shawn O. Pearce | a813988 | 2007-07-23 01:11:08 -0400 | [diff] [blame] | 1906 | set ui_visualize_current [.mbar.repository index last] |
Shawn O. Pearce | 5753ef1 | 2007-01-25 13:01:16 -0500 | [diff] [blame] | 1907 | .mbar.repository add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1908 | -label [mc "Visualize All Branch History"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1909 | -command {do_gitk --all} |
Shawn O. Pearce | d075242 | 2006-11-21 20:33:09 -0500 | [diff] [blame] | 1910 | .mbar.repository add separator |
Shawn O. Pearce | 75e355d | 2006-11-20 22:22:10 -0500 | [diff] [blame] | 1911 | |
Shawn O. Pearce | a813988 | 2007-07-23 01:11:08 -0400 | [diff] [blame] | 1912 | proc current_branch_write {args} { |
| 1913 | global current_branch |
| 1914 | .mbar.repository entryconf $::ui_browse_current \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1915 | -label [mc "Browse %s's Files" $current_branch] |
Shawn O. Pearce | a813988 | 2007-07-23 01:11:08 -0400 | [diff] [blame] | 1916 | .mbar.repository entryconf $::ui_visualize_current \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1917 | -label [mc "Visualize %s's History" $current_branch] |
Shawn O. Pearce | a813988 | 2007-07-23 01:11:08 -0400 | [diff] [blame] | 1918 | } |
| 1919 | trace add variable current_branch write current_branch_write |
| 1920 | |
Shawn O. Pearce | cf25ddc | 2007-02-08 18:03:41 -0500 | [diff] [blame] | 1921 | if {[is_enabled multicommit]} { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1922 | .mbar.repository add command -label [mc "Database Statistics"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1923 | -command do_stats |
Shawn O. Pearce | 0fd49d0 | 2007-01-24 15:21:01 -0500 | [diff] [blame] | 1924 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1925 | .mbar.repository add command -label [mc "Compress Database"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1926 | -command do_gc |
Shawn O. Pearce | 4aca740 | 2006-11-15 22:35:26 -0500 | [diff] [blame] | 1927 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1928 | .mbar.repository add command -label [mc "Verify Database"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1929 | -command do_fsck_objects |
Shawn O. Pearce | 444f92d | 2006-11-20 21:43:41 -0500 | [diff] [blame] | 1930 | |
Shawn O. Pearce | a4abfa6 | 2006-11-20 23:01:47 -0500 | [diff] [blame] | 1931 | .mbar.repository add separator |
Shawn O. Pearce | 75e355d | 2006-11-20 22:22:10 -0500 | [diff] [blame] | 1932 | |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 1933 | if {[is_Cygwin]} { |
| 1934 | .mbar.repository add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1935 | -label [mc "Create Desktop Icon"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1936 | -command do_cygwin_shortcut |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 1937 | } elseif {[is_Windows]} { |
Shawn O. Pearce | a4abfa6 | 2006-11-20 23:01:47 -0500 | [diff] [blame] | 1938 | .mbar.repository add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1939 | -label [mc "Create Desktop Icon"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1940 | -command do_windows_shortcut |
Shawn O. Pearce | 06c3111 | 2006-11-18 00:31:00 -0500 | [diff] [blame] | 1941 | } elseif {[is_MacOSX]} { |
Shawn O. Pearce | a4abfa6 | 2006-11-20 23:01:47 -0500 | [diff] [blame] | 1942 | .mbar.repository add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1943 | -label [mc "Create Desktop Icon"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1944 | -command do_macosx_app |
Shawn O. Pearce | 4aca740 | 2006-11-15 22:35:26 -0500 | [diff] [blame] | 1945 | } |
Shawn O. Pearce | 4ccdab0 | 2006-11-12 16:20:36 -0500 | [diff] [blame] | 1946 | } |
Shawn O. Pearce | 85ab313 | 2006-11-25 03:38:39 -0500 | [diff] [blame] | 1947 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1948 | .mbar.repository add command -label [mc Quit] \ |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1949 | -command do_quit \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1950 | -accelerator $M1T-Q |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 1951 | |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1952 | # -- Edit Menu |
| 1953 | # |
| 1954 | menu .mbar.edit |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1955 | .mbar.edit add command -label [mc Undo] \ |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1956 | -command {catch {[focus] edit undo}} \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1957 | -accelerator $M1T-Z |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1958 | .mbar.edit add command -label [mc Redo] \ |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1959 | -command {catch {[focus] edit redo}} \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1960 | -accelerator $M1T-Y |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1961 | .mbar.edit add separator |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1962 | .mbar.edit add command -label [mc Cut] \ |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1963 | -command {catch {tk_textCut [focus]}} \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1964 | -accelerator $M1T-X |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1965 | .mbar.edit add command -label [mc Copy] \ |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1966 | -command {catch {tk_textCopy [focus]}} \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1967 | -accelerator $M1T-C |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1968 | .mbar.edit add command -label [mc Paste] \ |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1969 | -command {catch {tk_textPaste [focus]; [focus] see insert}} \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1970 | -accelerator $M1T-V |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1971 | .mbar.edit add command -label [mc Delete] \ |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1972 | -command {catch {[focus] delete sel.first sel.last}} \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1973 | -accelerator Del |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1974 | .mbar.edit add separator |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1975 | .mbar.edit add command -label [mc "Select All"] \ |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1976 | -command {catch {[focus] tag add sel 0.0 end}} \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1977 | -accelerator $M1T-A |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 1978 | |
Shawn O. Pearce | 85ab313 | 2006-11-25 03:38:39 -0500 | [diff] [blame] | 1979 | # -- Branch Menu |
| 1980 | # |
Shawn O. Pearce | 64a906f | 2007-02-08 18:10:05 -0500 | [diff] [blame] | 1981 | if {[is_enabled branch]} { |
Shawn O. Pearce | 700a65c | 2006-11-24 17:30:12 -0500 | [diff] [blame] | 1982 | menu .mbar.branch |
| 1983 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1984 | .mbar.branch add command -label [mc "Create..."] \ |
Shawn O. Pearce | b1fa2bf | 2007-07-03 22:57:18 -0400 | [diff] [blame] | 1985 | -command branch_create::dialog \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 1986 | -accelerator $M1T-N |
Shawn O. Pearce | 700a65c | 2006-11-24 17:30:12 -0500 | [diff] [blame] | 1987 | lappend disable_on_lock [list .mbar.branch entryconf \ |
| 1988 | [.mbar.branch index last] -state] |
| 1989 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1990 | .mbar.branch add command -label [mc "Checkout..."] \ |
Shawn O. Pearce | d41b43e | 2007-07-08 18:40:56 -0400 | [diff] [blame] | 1991 | -command branch_checkout::dialog \ |
| 1992 | -accelerator $M1T-O |
| 1993 | lappend disable_on_lock [list .mbar.branch entryconf \ |
| 1994 | [.mbar.branch index last] -state] |
| 1995 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 1996 | .mbar.branch add command -label [mc "Rename..."] \ |
Shawn O. Pearce | 61f82ce | 2007-05-28 12:52:57 -0400 | [diff] [blame] | 1997 | -command branch_rename::dialog |
| 1998 | lappend disable_on_lock [list .mbar.branch entryconf \ |
| 1999 | [.mbar.branch index last] -state] |
| 2000 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2001 | .mbar.branch add command -label [mc "Delete..."] \ |
Shawn O. Pearce | 3206c63 | 2007-07-03 23:33:59 -0400 | [diff] [blame] | 2002 | -command branch_delete::dialog |
Shawn O. Pearce | 700a65c | 2006-11-24 17:30:12 -0500 | [diff] [blame] | 2003 | lappend disable_on_lock [list .mbar.branch entryconf \ |
| 2004 | [.mbar.branch index last] -state] |
Shawn O. Pearce | fd234df | 2007-02-26 11:22:10 -0500 | [diff] [blame] | 2005 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2006 | .mbar.branch add command -label [mc "Reset..."] \ |
Shawn O. Pearce | a6c9b08 | 2007-05-02 13:56:27 -0400 | [diff] [blame] | 2007 | -command merge::reset_hard |
Shawn O. Pearce | fd234df | 2007-02-26 11:22:10 -0500 | [diff] [blame] | 2008 | lappend disable_on_lock [list .mbar.branch entryconf \ |
| 2009 | [.mbar.branch index last] -state] |
Shawn O. Pearce | 700a65c | 2006-11-24 17:30:12 -0500 | [diff] [blame] | 2010 | } |
| 2011 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2012 | # -- Commit Menu |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2013 | # |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2014 | if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
| 2015 | menu .mbar.commit |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2016 | |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2017 | .mbar.commit add radiobutton \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2018 | -label [mc "New Commit"] \ |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2019 | -command do_select_commit_type \ |
| 2020 | -variable selected_commit_type \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2021 | -value new |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2022 | lappend disable_on_lock \ |
| 2023 | [list .mbar.commit entryconf [.mbar.commit index last] -state] |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2024 | |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2025 | .mbar.commit add radiobutton \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2026 | -label [mc "Amend Last Commit"] \ |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2027 | -command do_select_commit_type \ |
| 2028 | -variable selected_commit_type \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2029 | -value amend |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2030 | lappend disable_on_lock \ |
| 2031 | [list .mbar.commit entryconf [.mbar.commit index last] -state] |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2032 | |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2033 | .mbar.commit add separator |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2034 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2035 | .mbar.commit add command -label [mc Rescan] \ |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2036 | -command do_rescan \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2037 | -accelerator F5 |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2038 | lappend disable_on_lock \ |
| 2039 | [list .mbar.commit entryconf [.mbar.commit index last] -state] |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2040 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2041 | .mbar.commit add command -label [mc "Stage To Commit"] \ |
Shawn O. Pearce | cd16a6c | 2007-11-08 02:22:21 -0500 | [diff] [blame] | 2042 | -command do_add_selection \ |
| 2043 | -accelerator $M1T-T |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2044 | lappend disable_on_lock \ |
| 2045 | [list .mbar.commit entryconf [.mbar.commit index last] -state] |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2046 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2047 | .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \ |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2048 | -command do_add_all \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2049 | -accelerator $M1T-I |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2050 | lappend disable_on_lock \ |
| 2051 | [list .mbar.commit entryconf [.mbar.commit index last] -state] |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2052 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2053 | .mbar.commit add command -label [mc "Unstage From Commit"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2054 | -command do_unstage_selection |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2055 | lappend disable_on_lock \ |
| 2056 | [list .mbar.commit entryconf [.mbar.commit index last] -state] |
Shawn O. Pearce | e734817 | 2006-11-23 21:40:45 -0500 | [diff] [blame] | 2057 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2058 | .mbar.commit add command -label [mc "Revert Changes"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2059 | -command do_revert_selection |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2060 | lappend disable_on_lock \ |
| 2061 | [list .mbar.commit entryconf [.mbar.commit index last] -state] |
Shawn O. Pearce | e734817 | 2006-11-23 21:40:45 -0500 | [diff] [blame] | 2062 | |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2063 | .mbar.commit add separator |
Shawn O. Pearce | 1461c5f | 2006-11-19 00:29:55 -0500 | [diff] [blame] | 2064 | |
Jonathan del Strother | c91ee2b | 2008-04-01 11:54:03 +0100 | [diff] [blame] | 2065 | .mbar.commit add command -label [mc "Show Less Context"] \ |
| 2066 | -command show_less_context \ |
Michele Ballabio | 729ffa5 | 2008-04-04 23:04:42 +0200 | [diff] [blame] | 2067 | -accelerator $M1T-\- |
Jonathan del Strother | c91ee2b | 2008-04-01 11:54:03 +0100 | [diff] [blame] | 2068 | |
| 2069 | .mbar.commit add command -label [mc "Show More Context"] \ |
| 2070 | -command show_more_context \ |
Michele Ballabio | 729ffa5 | 2008-04-04 23:04:42 +0200 | [diff] [blame] | 2071 | -accelerator $M1T-= |
Jonathan del Strother | c91ee2b | 2008-04-01 11:54:03 +0100 | [diff] [blame] | 2072 | |
| 2073 | .mbar.commit add separator |
| 2074 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2075 | .mbar.commit add command -label [mc "Sign Off"] \ |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2076 | -command do_signoff \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2077 | -accelerator $M1T-S |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2078 | |
Harri Ilari Tapio Liusvaara | a9813cb | 2007-09-12 23:02:35 +0300 | [diff] [blame] | 2079 | .mbar.commit add command -label [mc Commit@@verb] \ |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2080 | -command do_commit \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2081 | -accelerator $M1T-Return |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2082 | lappend disable_on_lock \ |
| 2083 | [list .mbar.commit entryconf [.mbar.commit index last] -state] |
| 2084 | } |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2085 | |
Shawn O. Pearce | 9b28a8b | 2007-02-26 11:17:11 -0500 | [diff] [blame] | 2086 | # -- Merge Menu |
| 2087 | # |
| 2088 | if {[is_enabled branch]} { |
| 2089 | menu .mbar.merge |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2090 | .mbar.merge add command -label [mc "Local Merge..."] \ |
Shawn O. Pearce | a870ddc | 2007-07-19 00:39:23 -0400 | [diff] [blame] | 2091 | -command merge::dialog \ |
| 2092 | -accelerator $M1T-M |
Shawn O. Pearce | 9b28a8b | 2007-02-26 11:17:11 -0500 | [diff] [blame] | 2093 | lappend disable_on_lock \ |
| 2094 | [list .mbar.merge entryconf [.mbar.merge index last] -state] |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2095 | .mbar.merge add command -label [mc "Abort Merge..."] \ |
Shawn O. Pearce | a6c9b08 | 2007-05-02 13:56:27 -0400 | [diff] [blame] | 2096 | -command merge::reset_hard |
Shawn O. Pearce | 9b28a8b | 2007-02-26 11:17:11 -0500 | [diff] [blame] | 2097 | lappend disable_on_lock \ |
| 2098 | [list .mbar.merge entryconf [.mbar.merge index last] -state] |
Shawn O. Pearce | 9b28a8b | 2007-02-26 11:17:11 -0500 | [diff] [blame] | 2099 | } |
| 2100 | |
| 2101 | # -- Transport Menu |
| 2102 | # |
| 2103 | if {[is_enabled transport]} { |
Shawn O. Pearce | 6bdf5e5 | 2007-10-07 22:23:54 -0700 | [diff] [blame] | 2104 | menu .mbar.remote |
Shawn O. Pearce | 9b28a8b | 2007-02-26 11:17:11 -0500 | [diff] [blame] | 2105 | |
Shawn O. Pearce | 6bdf5e5 | 2007-10-07 22:23:54 -0700 | [diff] [blame] | 2106 | .mbar.remote add command \ |
| 2107 | -label [mc "Push..."] \ |
Shawn O. Pearce | 840bcfa | 2007-07-05 22:15:00 -0400 | [diff] [blame] | 2108 | -command do_push_anywhere \ |
| 2109 | -accelerator $M1T-P |
Shawn O. Pearce | 6bdf5e5 | 2007-10-07 22:23:54 -0700 | [diff] [blame] | 2110 | .mbar.remote add command \ |
| 2111 | -label [mc "Delete..."] \ |
Shawn O. Pearce | aa252f1 | 2007-05-28 15:23:32 -0400 | [diff] [blame] | 2112 | -command remote_branch_delete::dialog |
Shawn O. Pearce | 9b28a8b | 2007-02-26 11:17:11 -0500 | [diff] [blame] | 2113 | } |
| 2114 | |
Shawn O. Pearce | 0c8d783 | 2006-11-21 02:33:56 -0500 | [diff] [blame] | 2115 | if {[is_MacOSX]} { |
| 2116 | # -- Apple Menu (Mac OS X only) |
| 2117 | # |
Shawn O. Pearce | 442b3ca | 2008-03-15 01:11:08 -0400 | [diff] [blame] | 2118 | .mbar add cascade -label Apple -menu .mbar.apple |
Shawn O. Pearce | 0c8d783 | 2006-11-21 02:33:56 -0500 | [diff] [blame] | 2119 | menu .mbar.apple |
Shawn O. Pearce | 82aa235 | 2006-11-20 23:55:51 -0500 | [diff] [blame] | 2120 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2121 | .mbar.apple add command -label [mc "About %s" [appname]] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2122 | -command do_about |
Shawn O. Pearce | 13824e2 | 2007-10-07 22:39:08 -0700 | [diff] [blame] | 2123 | .mbar.apple add separator |
| 2124 | .mbar.apple add command \ |
| 2125 | -label [mc "Preferences..."] \ |
| 2126 | -command do_options \ |
| 2127 | -accelerator $M1T-, |
| 2128 | bind . <$M1B-,> do_options |
Shawn O. Pearce | 0c8d783 | 2006-11-21 02:33:56 -0500 | [diff] [blame] | 2129 | } else { |
| 2130 | # -- Edit Menu |
| 2131 | # |
| 2132 | .mbar.edit add separator |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2133 | .mbar.edit add command -label [mc "Options..."] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2134 | -command do_options |
Shawn O. Pearce | 273984f | 2007-01-28 20:00:36 -0500 | [diff] [blame] | 2135 | } |
Shawn O. Pearce | 557afe8 | 2006-12-07 22:07:38 -0500 | [diff] [blame] | 2136 | |
Shawn O. Pearce | 273984f | 2007-01-28 20:00:36 -0500 | [diff] [blame] | 2137 | # -- Help Menu |
| 2138 | # |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2139 | .mbar add cascade -label [mc Help] -menu .mbar.help |
Shawn O. Pearce | 273984f | 2007-01-28 20:00:36 -0500 | [diff] [blame] | 2140 | menu .mbar.help |
Shawn O. Pearce | 0c8d783 | 2006-11-21 02:33:56 -0500 | [diff] [blame] | 2141 | |
Shawn O. Pearce | 273984f | 2007-01-28 20:00:36 -0500 | [diff] [blame] | 2142 | if {![is_MacOSX]} { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2143 | .mbar.help add command -label [mc "About %s" [appname]] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2144 | -command do_about |
Shawn O. Pearce | 0c8d783 | 2006-11-21 02:33:56 -0500 | [diff] [blame] | 2145 | } |
| 2146 | |
Shawn O. Pearce | 273984f | 2007-01-28 20:00:36 -0500 | [diff] [blame] | 2147 | set browser {} |
| 2148 | catch {set browser $repo_config(instaweb.browser)} |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 2149 | set doc_path [file dirname [gitexec]] |
Shawn O. Pearce | 273984f | 2007-01-28 20:00:36 -0500 | [diff] [blame] | 2150 | set doc_path [file join $doc_path Documentation index.html] |
| 2151 | |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 2152 | if {[is_Cygwin]} { |
Shawn O. Pearce | ee40599 | 2007-02-18 19:06:09 -0500 | [diff] [blame] | 2153 | set doc_path [exec cygpath --mixed $doc_path] |
Shawn O. Pearce | 273984f | 2007-01-28 20:00:36 -0500 | [diff] [blame] | 2154 | } |
| 2155 | |
| 2156 | if {$browser eq {}} { |
| 2157 | if {[is_MacOSX]} { |
| 2158 | set browser open |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 2159 | } elseif {[is_Cygwin]} { |
Shawn O. Pearce | 273984f | 2007-01-28 20:00:36 -0500 | [diff] [blame] | 2160 | set program_files [file dirname [exec cygpath --windir]] |
| 2161 | set program_files [file join $program_files {Program Files}] |
| 2162 | set firefox [file join $program_files {Mozilla Firefox} firefox.exe] |
| 2163 | set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE] |
| 2164 | if {[file exists $firefox]} { |
| 2165 | set browser $firefox |
| 2166 | } elseif {[file exists $ie]} { |
| 2167 | set browser $ie |
| 2168 | } |
| 2169 | unset program_files firefox ie |
| 2170 | } |
| 2171 | } |
| 2172 | |
| 2173 | if {[file isfile $doc_path]} { |
| 2174 | set doc_url "file:$doc_path" |
| 2175 | } else { |
| 2176 | set doc_url {http://www.kernel.org/pub/software/scm/git/docs/} |
| 2177 | } |
| 2178 | |
| 2179 | if {$browser ne {}} { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2180 | .mbar.help add command -label [mc "Online Documentation"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2181 | -command [list exec $browser $doc_url &] |
Shawn O. Pearce | 273984f | 2007-01-28 20:00:36 -0500 | [diff] [blame] | 2182 | } |
| 2183 | unset browser doc_path doc_url |
Shawn O. Pearce | 82aa235 | 2006-11-20 23:55:51 -0500 | [diff] [blame] | 2184 | |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2185 | # -- Standard bindings |
| 2186 | # |
Shawn O. Pearce | 39fa2a9 | 2007-06-11 23:52:43 -0400 | [diff] [blame] | 2187 | wm protocol . WM_DELETE_WINDOW do_quit |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2188 | bind all <$M1B-Key-q> do_quit |
| 2189 | bind all <$M1B-Key-Q> do_quit |
| 2190 | bind all <$M1B-Key-w> {destroy [winfo toplevel %W]} |
| 2191 | bind all <$M1B-Key-W> {destroy [winfo toplevel %W]} |
| 2192 | |
Shawn O. Pearce | 3e45ee1 | 2007-05-08 22:36:01 -0400 | [diff] [blame] | 2193 | set subcommand_args {} |
| 2194 | proc usage {} { |
| 2195 | puts stderr "usage: $::argv0 $::subcommand $::subcommand_args" |
| 2196 | exit 1 |
| 2197 | } |
| 2198 | |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2199 | # -- Not a normal commit type invocation? Do that instead! |
| 2200 | # |
Shawn O. Pearce | 258871d | 2007-02-08 19:41:32 -0500 | [diff] [blame] | 2201 | switch -- $subcommand { |
Shawn O. Pearce | 85d2d59 | 2007-07-18 00:53:14 -0400 | [diff] [blame] | 2202 | browser - |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2203 | blame { |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 2204 | set subcommand_args {rev? path} |
| 2205 | if {$argv eq {}} usage |
Shawn O. Pearce | a0db0d6 | 2007-05-08 22:48:47 -0400 | [diff] [blame] | 2206 | set head {} |
Shawn O. Pearce | 3e45ee1 | 2007-05-08 22:36:01 -0400 | [diff] [blame] | 2207 | set path {} |
| 2208 | set is_path 0 |
| 2209 | foreach a $argv { |
| 2210 | if {$is_path || [file exists $_prefix$a]} { |
| 2211 | if {$path ne {}} usage |
Shawn O. Pearce | 6b3d8b9 | 2007-05-09 18:35:04 -0400 | [diff] [blame] | 2212 | set path $_prefix$a |
Shawn O. Pearce | 3e45ee1 | 2007-05-08 22:36:01 -0400 | [diff] [blame] | 2213 | break |
| 2214 | } elseif {$a eq {--}} { |
| 2215 | if {$path ne {}} { |
Shawn O. Pearce | a0db0d6 | 2007-05-08 22:48:47 -0400 | [diff] [blame] | 2216 | if {$head ne {}} usage |
| 2217 | set head $path |
Shawn O. Pearce | 3e45ee1 | 2007-05-08 22:36:01 -0400 | [diff] [blame] | 2218 | set path {} |
| 2219 | } |
| 2220 | set is_path 1 |
Shawn O. Pearce | a0db0d6 | 2007-05-08 22:48:47 -0400 | [diff] [blame] | 2221 | } elseif {$head eq {}} { |
| 2222 | if {$head ne {}} usage |
| 2223 | set head $a |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 2224 | set is_path 1 |
Shawn O. Pearce | 3e45ee1 | 2007-05-08 22:36:01 -0400 | [diff] [blame] | 2225 | } else { |
| 2226 | usage |
| 2227 | } |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2228 | } |
Shawn O. Pearce | 3e45ee1 | 2007-05-08 22:36:01 -0400 | [diff] [blame] | 2229 | unset is_path |
| 2230 | |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 2231 | if {$head ne {} && $path eq {}} { |
| 2232 | set path $_prefix$head |
| 2233 | set head {} |
| 2234 | } |
| 2235 | |
Shawn O. Pearce | a0db0d6 | 2007-05-08 22:48:47 -0400 | [diff] [blame] | 2236 | if {$head eq {}} { |
Shawn O. Pearce | d41b43e | 2007-07-08 18:40:56 -0400 | [diff] [blame] | 2237 | load_current_branch |
Shawn O. Pearce | a0db0d6 | 2007-05-08 22:48:47 -0400 | [diff] [blame] | 2238 | } else { |
Shawn O. Pearce | 02087ab | 2007-07-08 21:19:59 -0400 | [diff] [blame] | 2239 | if {[regexp {^[0-9a-f]{1,39}$} $head]} { |
| 2240 | if {[catch { |
| 2241 | set head [git rev-parse --verify $head] |
| 2242 | } err]} { |
| 2243 | puts stderr $err |
| 2244 | exit 1 |
| 2245 | } |
| 2246 | } |
Shawn O. Pearce | a0db0d6 | 2007-05-08 22:48:47 -0400 | [diff] [blame] | 2247 | set current_branch $head |
Shawn O. Pearce | 3e45ee1 | 2007-05-08 22:36:01 -0400 | [diff] [blame] | 2248 | } |
Shawn O. Pearce | a0db0d6 | 2007-05-08 22:48:47 -0400 | [diff] [blame] | 2249 | |
Shawn O. Pearce | 85d2d59 | 2007-07-18 00:53:14 -0400 | [diff] [blame] | 2250 | switch -- $subcommand { |
| 2251 | browser { |
| 2252 | if {$head eq {}} { |
| 2253 | if {$path ne {} && [file isdirectory $path]} { |
| 2254 | set head $current_branch |
| 2255 | } else { |
| 2256 | set head $path |
| 2257 | set path {} |
| 2258 | } |
| 2259 | } |
| 2260 | browser::new $head $path |
Shawn O. Pearce | c52c945 | 2007-07-17 23:58:56 -0400 | [diff] [blame] | 2261 | } |
Shawn O. Pearce | 85d2d59 | 2007-07-18 00:53:14 -0400 | [diff] [blame] | 2262 | blame { |
| 2263 | if {$head eq {} && ![file exists $path]} { |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 2264 | puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path] |
Shawn O. Pearce | 85d2d59 | 2007-07-18 00:53:14 -0400 | [diff] [blame] | 2265 | exit 1 |
| 2266 | } |
| 2267 | blame::new $head $path |
| 2268 | } |
| 2269 | } |
Shawn O. Pearce | 258871d | 2007-02-08 19:41:32 -0500 | [diff] [blame] | 2270 | return |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2271 | } |
Shawn O. Pearce | 258871d | 2007-02-08 19:41:32 -0500 | [diff] [blame] | 2272 | citool - |
| 2273 | gui { |
| 2274 | if {[llength $argv] != 0} { |
| 2275 | puts -nonewline stderr "usage: $argv0" |
Shawn O. Pearce | 0b2bc46 | 2007-09-27 02:15:29 -0400 | [diff] [blame] | 2276 | if {$subcommand ne {gui} |
| 2277 | && [file tail $argv0] ne "git-$subcommand"} { |
Shawn O. Pearce | 258871d | 2007-02-08 19:41:32 -0500 | [diff] [blame] | 2278 | puts -nonewline stderr " $subcommand" |
| 2279 | } |
| 2280 | puts stderr {} |
| 2281 | exit 1 |
| 2282 | } |
| 2283 | # fall through to setup UI for commits |
| 2284 | } |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2285 | default { |
Shawn O. Pearce | c0f7a6c | 2007-02-21 01:24:57 -0500 | [diff] [blame] | 2286 | puts stderr "usage: $argv0 \[{blame|browser|citool}\]" |
Shawn O. Pearce | 2ebba52 | 2007-02-08 19:10:52 -0500 | [diff] [blame] | 2287 | exit 1 |
| 2288 | } |
| 2289 | } |
| 2290 | |
Shawn O. Pearce | 8553b77 | 2006-11-24 15:38:18 -0500 | [diff] [blame] | 2291 | # -- Branch Control |
| 2292 | # |
| 2293 | frame .branch \ |
| 2294 | -borderwidth 1 \ |
| 2295 | -relief sunken |
| 2296 | label .branch.l1 \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2297 | -text [mc "Current Branch:"] \ |
Shawn O. Pearce | 8553b77 | 2006-11-24 15:38:18 -0500 | [diff] [blame] | 2298 | -anchor w \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2299 | -justify left |
Shawn O. Pearce | 8553b77 | 2006-11-24 15:38:18 -0500 | [diff] [blame] | 2300 | label .branch.cb \ |
| 2301 | -textvariable current_branch \ |
| 2302 | -anchor w \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2303 | -justify left |
Shawn O. Pearce | 8553b77 | 2006-11-24 15:38:18 -0500 | [diff] [blame] | 2304 | pack .branch.l1 -side left |
| 2305 | pack .branch.cb -side left -fill x |
| 2306 | pack .branch -side top -fill x |
| 2307 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2308 | # -- Main Window Layout |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2309 | # |
Johannes Sixt | a0592d3 | 2007-10-10 20:50:40 -0400 | [diff] [blame] | 2310 | panedwindow .vpane -orient horizontal |
| 2311 | panedwindow .vpane.files -orient vertical |
Shawn O. Pearce | c5a1eb8 | 2007-01-21 17:50:42 -0500 | [diff] [blame] | 2312 | .vpane add .vpane.files -sticky nsew -height 100 -width 200 |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2313 | pack .vpane -anchor n -side top -fill both -expand 1 |
| 2314 | |
| 2315 | # -- Index File List |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2316 | # |
Shawn O. Pearce | c5a1eb8 | 2007-01-21 17:50:42 -0500 | [diff] [blame] | 2317 | frame .vpane.files.index -height 100 -width 200 |
Shawn O. Pearce | c73ce76 | 2007-10-05 08:47:23 -0400 | [diff] [blame] | 2318 | label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \ |
Philipp A. Hartmann | c382fdd | 2008-03-05 17:54:22 +0100 | [diff] [blame] | 2319 | -background lightgreen -foreground black |
| 2320 | text $ui_index -background white -foreground black \ |
| 2321 | -borderwidth 0 \ |
Shawn O. Pearce | c5a1eb8 | 2007-01-21 17:50:42 -0500 | [diff] [blame] | 2322 | -width 20 -height 10 \ |
Shawn O. Pearce | 3c23697 | 2007-01-21 14:58:01 -0500 | [diff] [blame] | 2323 | -wrap none \ |
Shawn O. Pearce | 6c6dd01 | 2006-11-11 20:33:30 -0500 | [diff] [blame] | 2324 | -cursor $cursor_ptr \ |
Shawn O. Pearce | 3c23697 | 2007-01-21 14:58:01 -0500 | [diff] [blame] | 2325 | -xscrollcommand {.vpane.files.index.sx set} \ |
| 2326 | -yscrollcommand {.vpane.files.index.sy set} \ |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2327 | -state disabled |
Shawn O. Pearce | 3c23697 | 2007-01-21 14:58:01 -0500 | [diff] [blame] | 2328 | scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview] |
| 2329 | scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview] |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2330 | pack .vpane.files.index.title -side top -fill x |
Shawn O. Pearce | 3c23697 | 2007-01-21 14:58:01 -0500 | [diff] [blame] | 2331 | pack .vpane.files.index.sx -side bottom -fill x |
| 2332 | pack .vpane.files.index.sy -side right -fill y |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2333 | pack $ui_index -side left -fill both -expand 1 |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2334 | |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 2335 | # -- Working Directory File List |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2336 | # |
Shawn O. Pearce | c5a1eb8 | 2007-01-21 17:50:42 -0500 | [diff] [blame] | 2337 | frame .vpane.files.workdir -height 100 -width 200 |
Shawn O. Pearce | c73ce76 | 2007-10-05 08:47:23 -0400 | [diff] [blame] | 2338 | label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \ |
Philipp A. Hartmann | c382fdd | 2008-03-05 17:54:22 +0100 | [diff] [blame] | 2339 | -background lightsalmon -foreground black |
| 2340 | text $ui_workdir -background white -foreground black \ |
| 2341 | -borderwidth 0 \ |
Shawn O. Pearce | c5a1eb8 | 2007-01-21 17:50:42 -0500 | [diff] [blame] | 2342 | -width 20 -height 10 \ |
Shawn O. Pearce | 3c23697 | 2007-01-21 14:58:01 -0500 | [diff] [blame] | 2343 | -wrap none \ |
Shawn O. Pearce | 6c6dd01 | 2006-11-11 20:33:30 -0500 | [diff] [blame] | 2344 | -cursor $cursor_ptr \ |
Shawn O. Pearce | 3c23697 | 2007-01-21 14:58:01 -0500 | [diff] [blame] | 2345 | -xscrollcommand {.vpane.files.workdir.sx set} \ |
| 2346 | -yscrollcommand {.vpane.files.workdir.sy set} \ |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2347 | -state disabled |
Shawn O. Pearce | 3c23697 | 2007-01-21 14:58:01 -0500 | [diff] [blame] | 2348 | scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview] |
| 2349 | scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview] |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 2350 | pack .vpane.files.workdir.title -side top -fill x |
Shawn O. Pearce | 3c23697 | 2007-01-21 14:58:01 -0500 | [diff] [blame] | 2351 | pack .vpane.files.workdir.sx -side bottom -fill x |
| 2352 | pack .vpane.files.workdir.sy -side right -fill y |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 2353 | pack $ui_workdir -side left -fill both -expand 1 |
Johannes Sixt | a0592d3 | 2007-10-10 20:50:40 -0400 | [diff] [blame] | 2354 | |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 2355 | .vpane.files add .vpane.files.workdir -sticky nsew |
Johannes Sixt | a0592d3 | 2007-10-10 20:50:40 -0400 | [diff] [blame] | 2356 | .vpane.files add .vpane.files.index -sticky nsew |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2357 | |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 2358 | foreach i [list $ui_index $ui_workdir] { |
Shawn O. Pearce | 3849bfb | 2007-09-16 23:12:19 -0400 | [diff] [blame] | 2359 | rmsel_tag $i |
| 2360 | $i tag conf in_diff -background [$i tag cget in_sel -background] |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 2361 | } |
| 2362 | unset i |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 2363 | |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2364 | # -- Diff and Commit Area |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2365 | # |
Shawn O. Pearce | 8009dcd | 2006-11-12 06:53:56 -0500 | [diff] [blame] | 2366 | frame .vpane.lower -height 300 -width 400 |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2367 | frame .vpane.lower.commarea |
| 2368 | frame .vpane.lower.diff -relief sunken -borderwidth 1 |
Johannes Sixt | a0592d3 | 2007-10-10 20:50:40 -0400 | [diff] [blame] | 2369 | pack .vpane.lower.diff -fill both -expand 1 |
| 2370 | pack .vpane.lower.commarea -side bottom -fill x |
Shawn O. Pearce | 0fd49d0 | 2007-01-24 15:21:01 -0500 | [diff] [blame] | 2371 | .vpane add .vpane.lower -sticky nsew |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2372 | |
| 2373 | # -- Commit Area Buttons |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2374 | # |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2375 | frame .vpane.lower.commarea.buttons |
| 2376 | label .vpane.lower.commarea.buttons.l -text {} \ |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2377 | -anchor w \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2378 | -justify left |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2379 | pack .vpane.lower.commarea.buttons.l -side top -fill x |
| 2380 | pack .vpane.lower.commarea.buttons -side left -fill y |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 2381 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2382 | button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2383 | -command do_rescan |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2384 | pack .vpane.lower.commarea.buttons.rescan -side top -fill x |
Shawn O. Pearce | 390adae | 2006-11-11 19:40:33 -0500 | [diff] [blame] | 2385 | lappend disable_on_lock \ |
| 2386 | {.vpane.lower.commarea.buttons.rescan conf -state} |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 2387 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2388 | button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2389 | -command do_add_all |
Shawn O. Pearce | 7fe7e73 | 2006-11-08 22:48:34 -0500 | [diff] [blame] | 2390 | pack .vpane.lower.commarea.buttons.incall -side top -fill x |
Shawn O. Pearce | 390adae | 2006-11-11 19:40:33 -0500 | [diff] [blame] | 2391 | lappend disable_on_lock \ |
| 2392 | {.vpane.lower.commarea.buttons.incall conf -state} |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 2393 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2394 | button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2395 | -command do_signoff |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2396 | pack .vpane.lower.commarea.buttons.signoff -side top -fill x |
Shawn O. Pearce | 131f503 | 2006-11-06 16:07:32 -0500 | [diff] [blame] | 2397 | |
Harri Ilari Tapio Liusvaara | a9813cb | 2007-09-12 23:02:35 +0300 | [diff] [blame] | 2398 | button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2399 | -command do_commit |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2400 | pack .vpane.lower.commarea.buttons.commit -side top -fill x |
Shawn O. Pearce | 390adae | 2006-11-11 19:40:33 -0500 | [diff] [blame] | 2401 | lappend disable_on_lock \ |
| 2402 | {.vpane.lower.commarea.buttons.commit conf -state} |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2403 | |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2404 | button .vpane.lower.commarea.buttons.push -text [mc Push] \ |
Shawn O. Pearce | 87b49a5 | 2007-07-05 22:19:33 -0400 | [diff] [blame] | 2405 | -command do_push_anywhere |
| 2406 | pack .vpane.lower.commarea.buttons.push -side top -fill x |
| 2407 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2408 | # -- Commit Message Buffer |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2409 | # |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2410 | frame .vpane.lower.commarea.buffer |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2411 | frame .vpane.lower.commarea.buffer.header |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2412 | set ui_comm .vpane.lower.commarea.buffer.t |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2413 | set ui_coml .vpane.lower.commarea.buffer.header.l |
| 2414 | radiobutton .vpane.lower.commarea.buffer.header.new \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2415 | -text [mc "New Commit"] \ |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2416 | -command do_select_commit_type \ |
| 2417 | -variable selected_commit_type \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2418 | -value new |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2419 | lappend disable_on_lock \ |
| 2420 | [list .vpane.lower.commarea.buffer.header.new conf -state] |
| 2421 | radiobutton .vpane.lower.commarea.buffer.header.amend \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2422 | -text [mc "Amend Last Commit"] \ |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2423 | -command do_select_commit_type \ |
| 2424 | -variable selected_commit_type \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2425 | -value amend |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2426 | lappend disable_on_lock \ |
| 2427 | [list .vpane.lower.commarea.buffer.header.amend conf -state] |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2428 | label $ui_coml \ |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2429 | -anchor w \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2430 | -justify left |
Shawn O. Pearce | 4539eac | 2006-11-18 02:50:58 -0500 | [diff] [blame] | 2431 | proc trace_commit_type {varname args} { |
| 2432 | global ui_coml commit_type |
| 2433 | switch -glob -- $commit_type { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2434 | initial {set txt [mc "Initial Commit Message:"]} |
| 2435 | amend {set txt [mc "Amended Commit Message:"]} |
| 2436 | amend-initial {set txt [mc "Amended Initial Commit Message:"]} |
| 2437 | amend-merge {set txt [mc "Amended Merge Commit Message:"]} |
| 2438 | merge {set txt [mc "Merge Commit Message:"]} |
| 2439 | * {set txt [mc "Commit Message:"]} |
Shawn O. Pearce | 4539eac | 2006-11-18 02:50:58 -0500 | [diff] [blame] | 2440 | } |
| 2441 | $ui_coml conf -text $txt |
| 2442 | } |
| 2443 | trace add variable commit_type write trace_commit_type |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2444 | pack $ui_coml -side left -fill x |
| 2445 | pack .vpane.lower.commarea.buffer.header.amend -side right |
| 2446 | pack .vpane.lower.commarea.buffer.header.new -side right |
| 2447 | |
Philipp A. Hartmann | c382fdd | 2008-03-05 17:54:22 +0100 | [diff] [blame] | 2448 | text $ui_comm -background white -foreground black \ |
| 2449 | -borderwidth 1 \ |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 2450 | -undo true \ |
Shawn O. Pearce | b2c6fcf | 2006-11-11 16:16:25 -0500 | [diff] [blame] | 2451 | -maxundo 20 \ |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 2452 | -autoseparators true \ |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2453 | -relief sunken \ |
Adam Piątyszek | 11027d5 | 2008-03-06 20:38:40 +0100 | [diff] [blame] | 2454 | -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \ |
Shawn O. Pearce | b494693 | 2006-11-12 00:40:38 -0500 | [diff] [blame] | 2455 | -font font_diff \ |
Shawn O. Pearce | 6c6dd01 | 2006-11-11 20:33:30 -0500 | [diff] [blame] | 2456 | -yscrollcommand {.vpane.lower.commarea.buffer.sby set} |
Shawn O. Pearce | 390adae | 2006-11-11 19:40:33 -0500 | [diff] [blame] | 2457 | scrollbar .vpane.lower.commarea.buffer.sby \ |
| 2458 | -command [list $ui_comm yview] |
Shawn O. Pearce | 24ac9b7 | 2006-11-18 20:59:49 -0500 | [diff] [blame] | 2459 | pack .vpane.lower.commarea.buffer.header -side top -fill x |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2460 | pack .vpane.lower.commarea.buffer.sby -side right -fill y |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2461 | pack $ui_comm -side left -fill y |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2462 | pack .vpane.lower.commarea.buffer -side left -fill y |
| 2463 | |
Shawn O. Pearce | 0e79431 | 2006-11-11 20:24:23 -0500 | [diff] [blame] | 2464 | # -- Commit Message Buffer Context Menu |
| 2465 | # |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2466 | set ctxm .vpane.lower.commarea.buffer.ctxm |
| 2467 | menu $ctxm -tearoff 0 |
| 2468 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2469 | -label [mc Cut] \ |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2470 | -command {tk_textCut $ui_comm} |
| 2471 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2472 | -label [mc Copy] \ |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2473 | -command {tk_textCopy $ui_comm} |
| 2474 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2475 | -label [mc Paste] \ |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2476 | -command {tk_textPaste $ui_comm} |
| 2477 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2478 | -label [mc Delete] \ |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2479 | -command {$ui_comm delete sel.first sel.last} |
| 2480 | $ctxm add separator |
| 2481 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2482 | -label [mc "Select All"] \ |
Shawn O. Pearce | 75e78c8 | 2007-01-22 18:31:12 -0500 | [diff] [blame] | 2483 | -command {focus $ui_comm;$ui_comm tag add sel 0.0 end} |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2484 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2485 | -label [mc "Copy All"] \ |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2486 | -command { |
Shawn O. Pearce | 0e79431 | 2006-11-11 20:24:23 -0500 | [diff] [blame] | 2487 | $ui_comm tag add sel 0.0 end |
| 2488 | tk_textCopy $ui_comm |
| 2489 | $ui_comm tag remove sel 0.0 end |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2490 | } |
| 2491 | $ctxm add separator |
| 2492 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2493 | -label [mc "Sign Off"] \ |
Shawn O. Pearce | 0e79431 | 2006-11-11 20:24:23 -0500 | [diff] [blame] | 2494 | -command do_signoff |
Shawn O. Pearce | 95b002e | 2008-02-07 02:35:25 -0500 | [diff] [blame] | 2495 | set ui_comm_ctxm $ctxm |
Shawn O. Pearce | 0e79431 | 2006-11-11 20:24:23 -0500 | [diff] [blame] | 2496 | |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2497 | # -- Diff Header |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2498 | # |
Shawn O. Pearce | 20a53c0 | 2007-01-21 11:37:58 -0500 | [diff] [blame] | 2499 | proc trace_current_diff_path {varname args} { |
| 2500 | global current_diff_path diff_actions file_states |
| 2501 | if {$current_diff_path eq {}} { |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2502 | set s {} |
| 2503 | set f {} |
| 2504 | set p {} |
| 2505 | set o disabled |
| 2506 | } else { |
Shawn O. Pearce | 20a53c0 | 2007-01-21 11:37:58 -0500 | [diff] [blame] | 2507 | set p $current_diff_path |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2508 | set s [mapdesc [lindex $file_states($p) 0] $p] |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2509 | set f [mc "File:"] |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2510 | set p [escape_path $p] |
| 2511 | set o normal |
| 2512 | } |
| 2513 | |
| 2514 | .vpane.lower.diff.header.status configure -text $s |
| 2515 | .vpane.lower.diff.header.file configure -text $f |
| 2516 | .vpane.lower.diff.header.path configure -text $p |
| 2517 | foreach w $diff_actions { |
| 2518 | uplevel #0 $w $o |
| 2519 | } |
| 2520 | } |
Shawn O. Pearce | 20a53c0 | 2007-01-21 11:37:58 -0500 | [diff] [blame] | 2521 | trace add variable current_diff_path write trace_current_diff_path |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2522 | |
Matthijs Melchior | 9adccb0 | 2007-06-05 23:50:02 +0200 | [diff] [blame] | 2523 | frame .vpane.lower.diff.header -background gold |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2524 | label .vpane.lower.diff.header.status \ |
Matthijs Melchior | 9adccb0 | 2007-06-05 23:50:02 +0200 | [diff] [blame] | 2525 | -background gold \ |
Philipp A. Hartmann | c382fdd | 2008-03-05 17:54:22 +0100 | [diff] [blame] | 2526 | -foreground black \ |
Shawn O. Pearce | 3e7b0e1 | 2006-11-12 22:06:37 -0500 | [diff] [blame] | 2527 | -width $max_status_desc \ |
| 2528 | -anchor w \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2529 | -justify left |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2530 | label .vpane.lower.diff.header.file \ |
Matthijs Melchior | 9adccb0 | 2007-06-05 23:50:02 +0200 | [diff] [blame] | 2531 | -background gold \ |
Philipp A. Hartmann | c382fdd | 2008-03-05 17:54:22 +0100 | [diff] [blame] | 2532 | -foreground black \ |
Shawn O. Pearce | fce89e4 | 2006-11-13 00:48:44 -0500 | [diff] [blame] | 2533 | -anchor w \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2534 | -justify left |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2535 | label .vpane.lower.diff.header.path \ |
Matthijs Melchior | 9adccb0 | 2007-06-05 23:50:02 +0200 | [diff] [blame] | 2536 | -background gold \ |
Philipp A. Hartmann | c382fdd | 2008-03-05 17:54:22 +0100 | [diff] [blame] | 2537 | -foreground black \ |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2538 | -anchor w \ |
Shawn O. Pearce | 7416bbc | 2007-04-28 23:14:08 -0400 | [diff] [blame] | 2539 | -justify left |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2540 | pack .vpane.lower.diff.header.status -side left |
| 2541 | pack .vpane.lower.diff.header.file -side left |
| 2542 | pack .vpane.lower.diff.header.path -fill x |
| 2543 | set ctxm .vpane.lower.diff.header.ctxm |
| 2544 | menu $ctxm -tearoff 0 |
| 2545 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2546 | -label [mc Copy] \ |
Shawn O. Pearce | fce89e4 | 2006-11-13 00:48:44 -0500 | [diff] [blame] | 2547 | -command { |
| 2548 | clipboard clear |
| 2549 | clipboard append \ |
| 2550 | -format STRING \ |
| 2551 | -type STRING \ |
Shawn O. Pearce | 20a53c0 | 2007-01-21 11:37:58 -0500 | [diff] [blame] | 2552 | -- $current_diff_path |
Shawn O. Pearce | fce89e4 | 2006-11-13 00:48:44 -0500 | [diff] [blame] | 2553 | } |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2554 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
| 2555 | bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y" |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2556 | |
| 2557 | # -- Diff Body |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2558 | # |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2559 | frame .vpane.lower.diff.body |
| 2560 | set ui_diff .vpane.lower.diff.body.t |
Philipp A. Hartmann | c382fdd | 2008-03-05 17:54:22 +0100 | [diff] [blame] | 2561 | text $ui_diff -background white -foreground black \ |
| 2562 | -borderwidth 0 \ |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2563 | -width 80 -height 15 -wrap none \ |
Shawn O. Pearce | b494693 | 2006-11-12 00:40:38 -0500 | [diff] [blame] | 2564 | -font font_diff \ |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2565 | -xscrollcommand {.vpane.lower.diff.body.sbx set} \ |
| 2566 | -yscrollcommand {.vpane.lower.diff.body.sby set} \ |
Shawn O. Pearce | 0fb8f9c | 2006-11-07 20:27:46 -0500 | [diff] [blame] | 2567 | -state disabled |
| 2568 | scrollbar .vpane.lower.diff.body.sbx -orient horizontal \ |
| 2569 | -command [list $ui_diff xview] |
| 2570 | scrollbar .vpane.lower.diff.body.sby -orient vertical \ |
| 2571 | -command [list $ui_diff yview] |
| 2572 | pack .vpane.lower.diff.body.sbx -side bottom -fill x |
| 2573 | pack .vpane.lower.diff.body.sby -side right -fill y |
| 2574 | pack $ui_diff -side left -fill both -expand 1 |
| 2575 | pack .vpane.lower.diff.header -side top -fill x |
| 2576 | pack .vpane.lower.diff.body -side bottom -fill both -expand 1 |
| 2577 | |
Shawn O. Pearce | 30b14ed | 2007-01-24 21:30:23 -0500 | [diff] [blame] | 2578 | $ui_diff tag conf d_cr -elide true |
Shawn O. Pearce | ca52156 | 2007-01-21 14:49:45 -0500 | [diff] [blame] | 2579 | $ui_diff tag conf d_@ -foreground blue -font font_diffbold |
| 2580 | $ui_diff tag conf d_+ -foreground {#00a000} |
Shawn O. Pearce | fec4a78 | 2007-01-21 13:12:02 -0500 | [diff] [blame] | 2581 | $ui_diff tag conf d_- -foreground red |
| 2582 | |
Shawn O. Pearce | ca52156 | 2007-01-21 14:49:45 -0500 | [diff] [blame] | 2583 | $ui_diff tag conf d_++ -foreground {#00a000} |
Shawn O. Pearce | fec4a78 | 2007-01-21 13:12:02 -0500 | [diff] [blame] | 2584 | $ui_diff tag conf d_-- -foreground red |
| 2585 | $ui_diff tag conf d_+s \ |
Shawn O. Pearce | ca52156 | 2007-01-21 14:49:45 -0500 | [diff] [blame] | 2586 | -foreground {#00a000} \ |
| 2587 | -background {#e2effa} |
Shawn O. Pearce | fec4a78 | 2007-01-21 13:12:02 -0500 | [diff] [blame] | 2588 | $ui_diff tag conf d_-s \ |
| 2589 | -foreground red \ |
Shawn O. Pearce | ca52156 | 2007-01-21 14:49:45 -0500 | [diff] [blame] | 2590 | -background {#e2effa} |
Shawn O. Pearce | fec4a78 | 2007-01-21 13:12:02 -0500 | [diff] [blame] | 2591 | $ui_diff tag conf d_s+ \ |
Shawn O. Pearce | ca52156 | 2007-01-21 14:49:45 -0500 | [diff] [blame] | 2592 | -foreground {#00a000} \ |
| 2593 | -background ivory1 |
Shawn O. Pearce | fec4a78 | 2007-01-21 13:12:02 -0500 | [diff] [blame] | 2594 | $ui_diff tag conf d_s- \ |
| 2595 | -foreground red \ |
Shawn O. Pearce | ca52156 | 2007-01-21 14:49:45 -0500 | [diff] [blame] | 2596 | -background ivory1 |
Shawn O. Pearce | fec4a78 | 2007-01-21 13:12:02 -0500 | [diff] [blame] | 2597 | |
| 2598 | $ui_diff tag conf d<<<<<<< \ |
| 2599 | -foreground orange \ |
| 2600 | -font font_diffbold |
| 2601 | $ui_diff tag conf d======= \ |
| 2602 | -foreground orange \ |
| 2603 | -font font_diffbold |
| 2604 | $ui_diff tag conf d>>>>>>> \ |
| 2605 | -foreground orange \ |
| 2606 | -font font_diffbold |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2607 | |
Shawn O. Pearce | ca52156 | 2007-01-21 14:49:45 -0500 | [diff] [blame] | 2608 | $ui_diff tag raise sel |
| 2609 | |
Shawn O. Pearce | 0e79431 | 2006-11-11 20:24:23 -0500 | [diff] [blame] | 2610 | # -- Diff Body Context Menu |
| 2611 | # |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2612 | set ctxm .vpane.lower.diff.body.ctxm |
| 2613 | menu $ctxm -tearoff 0 |
| 2614 | $ctxm add command \ |
Johannes Sixt | fba6072 | 2007-12-13 15:39:21 +0100 | [diff] [blame] | 2615 | -label [mc "Apply/Reverse Hunk"] \ |
| 2616 | -command {apply_hunk $cursorX $cursorY} |
| 2617 | set ui_diff_applyhunk [$ctxm index last] |
| 2618 | lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] |
| 2619 | $ctxm add separator |
| 2620 | $ctxm add command \ |
| 2621 | -label [mc "Show Less Context"] \ |
Jonathan del Strother | c91ee2b | 2008-04-01 11:54:03 +0100 | [diff] [blame] | 2622 | -command show_less_context |
Johannes Sixt | fba6072 | 2007-12-13 15:39:21 +0100 | [diff] [blame] | 2623 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
| 2624 | $ctxm add command \ |
| 2625 | -label [mc "Show More Context"] \ |
Jonathan del Strother | c91ee2b | 2008-04-01 11:54:03 +0100 | [diff] [blame] | 2626 | -command show_more_context |
Johannes Sixt | fba6072 | 2007-12-13 15:39:21 +0100 | [diff] [blame] | 2627 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
| 2628 | $ctxm add separator |
| 2629 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2630 | -label [mc Refresh] \ |
Shawn O. Pearce | 68c30b4 | 2007-01-21 13:27:43 -0500 | [diff] [blame] | 2631 | -command reshow_diff |
Shawn O. Pearce | 86773d9 | 2007-01-24 20:39:30 -0500 | [diff] [blame] | 2632 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
Shawn O. Pearce | 68c30b4 | 2007-01-21 13:27:43 -0500 | [diff] [blame] | 2633 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2634 | -label [mc Copy] \ |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2635 | -command {tk_textCopy $ui_diff} |
| 2636 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
| 2637 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2638 | -label [mc "Select All"] \ |
Shawn O. Pearce | 75e78c8 | 2007-01-22 18:31:12 -0500 | [diff] [blame] | 2639 | -command {focus $ui_diff;$ui_diff tag add sel 0.0 end} |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2640 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
| 2641 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2642 | -label [mc "Copy All"] \ |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2643 | -command { |
Shawn O. Pearce | 0e79431 | 2006-11-11 20:24:23 -0500 | [diff] [blame] | 2644 | $ui_diff tag add sel 0.0 end |
| 2645 | tk_textCopy $ui_diff |
| 2646 | $ui_diff tag remove sel 0.0 end |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2647 | } |
| 2648 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
| 2649 | $ctxm add separator |
| 2650 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2651 | -label [mc "Decrease Font Size"] \ |
Shawn O. Pearce | b494693 | 2006-11-12 00:40:38 -0500 | [diff] [blame] | 2652 | -command {incr_font_size font_diff -1} |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2653 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
| 2654 | $ctxm add command \ |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2655 | -label [mc "Increase Font Size"] \ |
Shawn O. Pearce | b494693 | 2006-11-12 00:40:38 -0500 | [diff] [blame] | 2656 | -command {incr_font_size font_diff 1} |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2657 | lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
| 2658 | $ctxm add separator |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2659 | $ctxm add command -label [mc "Options..."] \ |
Shawn O. Pearce | 8009dcd | 2006-11-12 06:53:56 -0500 | [diff] [blame] | 2660 | -command do_options |
Shawn O. Pearce | 83751fc | 2007-07-23 00:36:39 -0400 | [diff] [blame] | 2661 | proc popup_diff_menu {ctxm x y X Y} { |
Shawn O. Pearce | ce015c2 | 2007-08-21 02:22:53 -0400 | [diff] [blame] | 2662 | global current_diff_path file_states |
Shawn O. Pearce | 83751fc | 2007-07-23 00:36:39 -0400 | [diff] [blame] | 2663 | set ::cursorX $x |
| 2664 | set ::cursorY $y |
| 2665 | if {$::ui_index eq $::current_diff_side} { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2666 | set l [mc "Unstage Hunk From Commit"] |
Shawn O. Pearce | a25c518 | 2007-01-24 21:20:57 -0500 | [diff] [blame] | 2667 | } else { |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2668 | set l [mc "Stage Hunk For Commit"] |
Shawn O. Pearce | a25c518 | 2007-01-24 21:20:57 -0500 | [diff] [blame] | 2669 | } |
Shawn O. Pearce | 047d94d | 2007-09-02 15:38:04 -0400 | [diff] [blame] | 2670 | if {$::is_3way_diff |
| 2671 | || $current_diff_path eq {} |
| 2672 | || ![info exists file_states($current_diff_path)] |
| 2673 | || {_O} eq [lindex $file_states($current_diff_path) 0]} { |
Shawn O. Pearce | 9c9f5fa | 2007-08-23 02:44:13 -0400 | [diff] [blame] | 2674 | set s disabled |
Shawn O. Pearce | 047d94d | 2007-09-02 15:38:04 -0400 | [diff] [blame] | 2675 | } else { |
| 2676 | set s normal |
Shawn O. Pearce | 9c9f5fa | 2007-08-23 02:44:13 -0400 | [diff] [blame] | 2677 | } |
Shawn O. Pearce | 9f4119e | 2007-08-23 02:39:45 -0400 | [diff] [blame] | 2678 | $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l |
Shawn O. Pearce | 83751fc | 2007-07-23 00:36:39 -0400 | [diff] [blame] | 2679 | tk_popup $ctxm $X $Y |
| 2680 | } |
| 2681 | bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y] |
Shawn O. Pearce | 0e79431 | 2006-11-11 20:24:23 -0500 | [diff] [blame] | 2682 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2683 | # -- Status Bar |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2684 | # |
Shawn O. Pearce | 51530d1 | 2007-07-08 22:06:33 -0400 | [diff] [blame] | 2685 | set main_status [::status_bar::new .status] |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2686 | pack .status -anchor w -side bottom -fill x |
Christian Stimming | 1ac1795 | 2007-07-21 14:21:34 +0200 | [diff] [blame] | 2687 | $main_status show [mc "Initializing..."] |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2688 | |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 2689 | # -- Load geometry |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2690 | # |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 2691 | catch { |
Shawn O. Pearce | 51f4d16 | 2006-11-12 03:47:00 -0500 | [diff] [blame] | 2692 | set gm $repo_config(gui.geometry) |
Shawn O. Pearce | c4fe772 | 2006-11-11 19:32:24 -0500 | [diff] [blame] | 2693 | wm geometry . [lindex $gm 0] |
| 2694 | .vpane sash place 0 \ |
Johannes Sixt | a0592d3 | 2007-10-10 20:50:40 -0400 | [diff] [blame] | 2695 | [lindex $gm 1] \ |
| 2696 | [lindex [.vpane sash coord 0] 1] |
Shawn O. Pearce | c4fe772 | 2006-11-11 19:32:24 -0500 | [diff] [blame] | 2697 | .vpane.files sash place 0 \ |
Johannes Sixt | a0592d3 | 2007-10-10 20:50:40 -0400 | [diff] [blame] | 2698 | [lindex [.vpane.files sash coord 0] 0] \ |
| 2699 | [lindex $gm 2] |
Shawn O. Pearce | c4fe772 | 2006-11-11 19:32:24 -0500 | [diff] [blame] | 2700 | unset gm |
Shawn O. Pearce | 390adae | 2006-11-11 19:40:33 -0500 | [diff] [blame] | 2701 | } |
Shawn O. Pearce | 2d19516 | 2006-11-08 23:42:51 -0500 | [diff] [blame] | 2702 | |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2703 | # -- Key Bindings |
Shawn O. Pearce | e8ab644 | 2006-11-15 18:55:05 -0500 | [diff] [blame] | 2704 | # |
Shawn O. Pearce | ec6b424 | 2006-11-06 20:50:59 -0500 | [diff] [blame] | 2705 | bind $ui_comm <$M1B-Key-Return> {do_commit;break} |
Shawn O. Pearce | cd16a6c | 2007-11-08 02:22:21 -0500 | [diff] [blame] | 2706 | bind $ui_comm <$M1B-Key-t> {do_add_selection;break} |
| 2707 | bind $ui_comm <$M1B-Key-T> {do_add_selection;break} |
Shawn O. Pearce | 93e912c | 2007-01-20 23:07:04 -0500 | [diff] [blame] | 2708 | bind $ui_comm <$M1B-Key-i> {do_add_all;break} |
| 2709 | bind $ui_comm <$M1B-Key-I> {do_add_all;break} |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 2710 | bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break} |
| 2711 | bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break} |
| 2712 | bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break} |
| 2713 | bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break} |
| 2714 | bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break} |
| 2715 | bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break} |
| 2716 | bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break} |
| 2717 | bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break} |
Michele Ballabio | 729ffa5 | 2008-04-04 23:04:42 +0200 | [diff] [blame] | 2718 | bind $ui_comm <$M1B-Key-minus> {show_less_context;break} |
| 2719 | bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} |
| 2720 | bind $ui_comm <$M1B-Key-equal> {show_more_context;break} |
| 2721 | bind $ui_comm <$M1B-Key-plus> {show_more_context;break} |
| 2722 | bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break} |
Shawn O. Pearce | 9861671 | 2006-11-11 15:51:41 -0500 | [diff] [blame] | 2723 | |
| 2724 | bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} |
| 2725 | bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} |
| 2726 | bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break} |
| 2727 | bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break} |
| 2728 | bind $ui_diff <$M1B-Key-v> {break} |
| 2729 | bind $ui_diff <$M1B-Key-V> {break} |
| 2730 | bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break} |
| 2731 | bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break} |
Shawn O. Pearce | b2c6fcf | 2006-11-11 16:16:25 -0500 | [diff] [blame] | 2732 | bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break} |
| 2733 | bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break} |
| 2734 | bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break} |
| 2735 | bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break} |
Shawn O. Pearce | 60aa065 | 2007-05-01 15:51:09 -0400 | [diff] [blame] | 2736 | bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break} |
| 2737 | bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break} |
| 2738 | bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break} |
| 2739 | bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break} |
| 2740 | bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break} |
| 2741 | bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break} |
Shawn O. Pearce | 23effa7 | 2007-01-25 12:57:57 -0500 | [diff] [blame] | 2742 | bind $ui_diff <Button-1> {focus %W} |
Shawn O. Pearce | 49b86f0 | 2006-11-11 15:16:01 -0500 | [diff] [blame] | 2743 | |
Shawn O. Pearce | 64a906f | 2007-02-08 18:10:05 -0500 | [diff] [blame] | 2744 | if {[is_enabled branch]} { |
Shawn O. Pearce | b1fa2bf | 2007-07-03 22:57:18 -0400 | [diff] [blame] | 2745 | bind . <$M1B-Key-n> branch_create::dialog |
| 2746 | bind . <$M1B-Key-N> branch_create::dialog |
Shawn O. Pearce | d41b43e | 2007-07-08 18:40:56 -0400 | [diff] [blame] | 2747 | bind . <$M1B-Key-o> branch_checkout::dialog |
| 2748 | bind . <$M1B-Key-O> branch_checkout::dialog |
Shawn O. Pearce | a870ddc | 2007-07-19 00:39:23 -0400 | [diff] [blame] | 2749 | bind . <$M1B-Key-m> merge::dialog |
| 2750 | bind . <$M1B-Key-M> merge::dialog |
Shawn O. Pearce | bd29ebc | 2007-01-21 01:34:55 -0500 | [diff] [blame] | 2751 | } |
Shawn O. Pearce | 840bcfa | 2007-07-05 22:15:00 -0400 | [diff] [blame] | 2752 | if {[is_enabled transport]} { |
| 2753 | bind . <$M1B-Key-p> do_push_anywhere |
| 2754 | bind . <$M1B-Key-P> do_push_anywhere |
| 2755 | } |
Shawn O. Pearce | bd29ebc | 2007-01-21 01:34:55 -0500 | [diff] [blame] | 2756 | |
Shawn O. Pearce | f1e031b | 2007-07-05 22:16:38 -0400 | [diff] [blame] | 2757 | bind . <Key-F5> do_rescan |
| 2758 | bind . <$M1B-Key-r> do_rescan |
| 2759 | bind . <$M1B-Key-R> do_rescan |
Shawn O. Pearce | 07123f4 | 2006-11-07 02:57:46 -0500 | [diff] [blame] | 2760 | bind . <$M1B-Key-s> do_signoff |
| 2761 | bind . <$M1B-Key-S> do_signoff |
Shawn O. Pearce | cd16a6c | 2007-11-08 02:22:21 -0500 | [diff] [blame] | 2762 | bind . <$M1B-Key-t> do_add_selection |
| 2763 | bind . <$M1B-Key-T> do_add_selection |
Shawn O. Pearce | 93e912c | 2007-01-20 23:07:04 -0500 | [diff] [blame] | 2764 | bind . <$M1B-Key-i> do_add_all |
| 2765 | bind . <$M1B-Key-I> do_add_all |
Michele Ballabio | 729ffa5 | 2008-04-04 23:04:42 +0200 | [diff] [blame] | 2766 | bind . <$M1B-Key-minus> {show_less_context;break} |
| 2767 | bind . <$M1B-Key-KP_Subtract> {show_less_context;break} |
| 2768 | bind . <$M1B-Key-equal> {show_more_context;break} |
| 2769 | bind . <$M1B-Key-plus> {show_more_context;break} |
| 2770 | bind . <$M1B-Key-KP_Add> {show_more_context;break} |
Shawn O. Pearce | 07123f4 | 2006-11-07 02:57:46 -0500 | [diff] [blame] | 2771 | bind . <$M1B-Key-Return> do_commit |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 2772 | foreach i [list $ui_index $ui_workdir] { |
Shawn O. Pearce | 24263b7 | 2006-11-13 16:06:38 -0500 | [diff] [blame] | 2773 | bind $i <Button-1> "toggle_or_diff $i %x %y; break" |
| 2774 | bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break" |
| 2775 | bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break" |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2776 | } |
Shawn O. Pearce | 62aac80 | 2006-11-11 20:00:35 -0500 | [diff] [blame] | 2777 | unset i |
| 2778 | |
| 2779 | set file_lists($ui_index) [list] |
Shawn O. Pearce | 0812665 | 2007-01-20 22:06:51 -0500 | [diff] [blame] | 2780 | set file_lists($ui_workdir) [list] |
Shawn O. Pearce | a49c67d | 2006-11-18 03:27:23 -0500 | [diff] [blame] | 2781 | |
Shawn O. Pearce | 19c8214 | 2007-04-14 15:10:48 -0400 | [diff] [blame] | 2782 | wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]" |
Shawn O. Pearce | cb07fc2 | 2006-11-06 14:20:27 -0500 | [diff] [blame] | 2783 | focus -force $ui_comm |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2784 | |
Shawn O. Pearce | 85ab313 | 2006-11-25 03:38:39 -0500 | [diff] [blame] | 2785 | # -- Warn the user about environmental problems. Cygwin's Tcl |
| 2786 | # does *not* pass its env array onto any processes it spawns. |
| 2787 | # This means that git processes get none of our environment. |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2788 | # |
Shawn O. Pearce | 20ddfca | 2007-01-28 20:58:47 -0500 | [diff] [blame] | 2789 | if {[is_Cygwin]} { |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2790 | set ignored_env 0 |
| 2791 | set suggest_user {} |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 2792 | set msg [mc "Possible environment issues exist. |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2793 | |
| 2794 | The following environment variables are probably |
| 2795 | going to be ignored by any Git subprocess run |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 2796 | by %s: |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2797 | |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 2798 | " [appname]] |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2799 | foreach name [array names env] { |
| 2800 | switch -regexp -- $name { |
| 2801 | {^GIT_INDEX_FILE$} - |
| 2802 | {^GIT_OBJECT_DIRECTORY$} - |
| 2803 | {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} - |
| 2804 | {^GIT_DIFF_OPTS$} - |
| 2805 | {^GIT_EXTERNAL_DIFF$} - |
| 2806 | {^GIT_PAGER$} - |
| 2807 | {^GIT_TRACE$} - |
| 2808 | {^GIT_CONFIG$} - |
| 2809 | {^GIT_CONFIG_LOCAL$} - |
| 2810 | {^GIT_(AUTHOR|COMMITTER)_DATE$} { |
| 2811 | append msg " - $name\n" |
| 2812 | incr ignored_env |
| 2813 | } |
| 2814 | {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} { |
| 2815 | append msg " - $name\n" |
| 2816 | incr ignored_env |
| 2817 | set suggest_user $name |
| 2818 | } |
| 2819 | } |
| 2820 | } |
| 2821 | if {$ignored_env > 0} { |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 2822 | append msg [mc " |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2823 | This is due to a known issue with the |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 2824 | Tcl binary distributed by Cygwin."] |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2825 | |
| 2826 | if {$suggest_user ne {}} { |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 2827 | append msg [mc " |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2828 | |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 2829 | A good replacement for %s |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2830 | is placing values for the user.name and |
| 2831 | user.email settings into your personal |
| 2832 | ~/.gitconfig file. |
Michele Ballabio | c8c4854 | 2007-09-13 15:19:05 +0200 | [diff] [blame] | 2833 | " $suggest_user] |
Shawn O. Pearce | 1d8b3cb | 2006-11-21 15:28:14 -0500 | [diff] [blame] | 2834 | } |
| 2835 | warn_popup $msg |
| 2836 | } |
| 2837 | unset ignored_env msg suggest_user name |
| 2838 | } |
| 2839 | |
Shawn O. Pearce | 85ab313 | 2006-11-25 03:38:39 -0500 | [diff] [blame] | 2840 | # -- Only initialize complex UI if we are going to stay running. |
| 2841 | # |
Shawn O. Pearce | 64a906f | 2007-02-08 18:10:05 -0500 | [diff] [blame] | 2842 | if {[is_enabled transport]} { |
Shawn O. Pearce | 4ccdab0 | 2006-11-12 16:20:36 -0500 | [diff] [blame] | 2843 | load_all_remotes |
Shawn O. Pearce | 85ab313 | 2006-11-25 03:38:39 -0500 | [diff] [blame] | 2844 | |
Shawn O. Pearce | 6bdf5e5 | 2007-10-07 22:23:54 -0700 | [diff] [blame] | 2845 | set n [.mbar.remote index end] |
Shawn O. Pearce | 3f7fd92 | 2007-01-25 17:16:22 -0500 | [diff] [blame] | 2846 | populate_push_menu |
Shawn O. Pearce | 6bdf5e5 | 2007-10-07 22:23:54 -0700 | [diff] [blame] | 2847 | populate_fetch_menu |
| 2848 | set n [expr {[.mbar.remote index end] - $n}] |
| 2849 | if {$n > 0} { |
| 2850 | .mbar.remote insert $n separator |
| 2851 | } |
| 2852 | unset n |
Shawn O. Pearce | 4ccdab0 | 2006-11-12 16:20:36 -0500 | [diff] [blame] | 2853 | } |
Shawn O. Pearce | 85ab313 | 2006-11-25 03:38:39 -0500 | [diff] [blame] | 2854 | |
Shawn O. Pearce | 4578c5c | 2007-07-21 04:57:57 -0400 | [diff] [blame] | 2855 | if {[winfo exists $ui_comm]} { |
| 2856 | set GITGUI_BCK_exists [load_message GITGUI_BCK] |
| 2857 | |
| 2858 | # -- If both our backup and message files exist use the |
| 2859 | # newer of the two files to initialize the buffer. |
| 2860 | # |
| 2861 | if {$GITGUI_BCK_exists} { |
| 2862 | set m [gitdir GITGUI_MSG] |
| 2863 | if {[file isfile $m]} { |
| 2864 | if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} { |
| 2865 | catch {file delete [gitdir GITGUI_MSG]} |
| 2866 | } else { |
| 2867 | $ui_comm delete 0.0 end |
| 2868 | $ui_comm edit reset |
| 2869 | $ui_comm edit modified false |
| 2870 | catch {file delete [gitdir GITGUI_BCK]} |
| 2871 | set GITGUI_BCK_exists 0 |
| 2872 | } |
| 2873 | } |
| 2874 | unset m |
| 2875 | } |
| 2876 | |
| 2877 | proc backup_commit_buffer {} { |
| 2878 | global ui_comm GITGUI_BCK_exists |
| 2879 | |
| 2880 | set m [$ui_comm edit modified] |
| 2881 | if {$m || $GITGUI_BCK_exists} { |
| 2882 | set msg [string trim [$ui_comm get 0.0 end]] |
| 2883 | regsub -all -line {[ \r\t]+$} $msg {} msg |
| 2884 | |
| 2885 | if {$msg eq {}} { |
| 2886 | if {$GITGUI_BCK_exists} { |
| 2887 | catch {file delete [gitdir GITGUI_BCK]} |
| 2888 | set GITGUI_BCK_exists 0 |
| 2889 | } |
| 2890 | } elseif {$m} { |
| 2891 | catch { |
| 2892 | set fd [open [gitdir GITGUI_BCK] w] |
| 2893 | puts -nonewline $fd $msg |
| 2894 | close $fd |
| 2895 | set GITGUI_BCK_exists 1 |
| 2896 | } |
| 2897 | } |
| 2898 | |
| 2899 | $ui_comm edit modified false |
| 2900 | } |
| 2901 | |
| 2902 | set ::GITGUI_BCK_i [after 2000 backup_commit_buffer] |
| 2903 | } |
| 2904 | |
| 2905 | backup_commit_buffer |
Shawn O. Pearce | 95b002e | 2008-02-07 02:35:25 -0500 | [diff] [blame] | 2906 | |
| 2907 | # -- If the user has aspell available we can drive it |
| 2908 | # in pipe mode to spellcheck the commit message. |
| 2909 | # |
| 2910 | set spell_cmd [list |] |
| 2911 | set spell_dict [get_config gui.spellingdictionary] |
| 2912 | lappend spell_cmd aspell |
| 2913 | if {$spell_dict ne {}} { |
| 2914 | lappend spell_cmd --master=$spell_dict |
| 2915 | } |
| 2916 | lappend spell_cmd --mode=none |
| 2917 | lappend spell_cmd --encoding=utf-8 |
| 2918 | lappend spell_cmd pipe |
| 2919 | if {$spell_dict eq {none} |
| 2920 | || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} { |
| 2921 | bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y] |
| 2922 | } else { |
| 2923 | set ui_comm_spell [spellcheck::init \ |
| 2924 | $spell_fd \ |
| 2925 | $ui_comm \ |
| 2926 | $ui_comm_ctxm \ |
| 2927 | ] |
| 2928 | } |
| 2929 | unset -nocomplain spell_cmd spell_fd spell_err spell_dict |
Shawn O. Pearce | 4578c5c | 2007-07-21 04:57:57 -0400 | [diff] [blame] | 2930 | } |
| 2931 | |
Shawn O. Pearce | 53716a7 | 2006-11-18 03:31:25 -0500 | [diff] [blame] | 2932 | lock_index begin-read |
Shawn O. Pearce | 301dfaa | 2007-07-17 23:09:31 -0400 | [diff] [blame] | 2933 | if {![winfo ismapped .]} { |
| 2934 | wm deiconify . |
| 2935 | } |
Shawn O. Pearce | 8f52548 | 2006-11-14 01:29:32 -0500 | [diff] [blame] | 2936 | after 1 do_rescan |
Shawn O. Pearce | 3972b98 | 2007-07-17 23:20:56 -0400 | [diff] [blame] | 2937 | if {[is_enabled multicommit]} { |
| 2938 | after 1000 hint_gc |
| 2939 | } |