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