projects / git / blame
| Commit | Line | Data |
|---|---|---|
| 1db95b00 PM |
1 | #!/bin/sh |
| 2 | # Tcl ignores the next line -*- tcl -*- \ | |
| 9e026d39 | 3 | exec wish "$0" -- "$@" |
| 1db95b00 | 4 | |
| bb3e86a1 | 5 | # Copyright © 2005-2011 Paul Mackerras. All rights reserved. |
| 1db95b00 PM |
6 | # This program is free software; it may be used, copied, modified |
| 7 | # and distributed under the terms of the GNU General Public Licence, | |
| 8 | # either version 2, or (at your option) any later version. | |
| 9 | ||
| d93f1713 PT |
10 | package require Tk |
| 11 | ||
| 74cb884f MZ |
12 | proc hasworktree {} { |
| 13 | return [expr {[exec git rev-parse --is-bare-repository] == "false" && | |
| 14 | [exec git rev-parse --is-inside-git-dir] == "false"}] | |
| 15 | } | |
| 16 | ||
| 3878e636 ZJS |
17 | proc reponame {} { |
| 18 | global gitdir | |
| 19 | set n [file normalize $gitdir] | |
| 20 | if {[string match "*/.git" $n]} { | |
| 21 | set n [string range $n 0 end-5] | |
| 22 | } | |
| 23 | return [file tail $n] | |
| 24 | } | |
| 25 | ||
| 65bb0bda PT |
26 | proc gitworktree {} { |
| 27 | variable _gitworktree | |
| 28 | if {[info exists _gitworktree]} { | |
| 29 | return $_gitworktree | |
| 30 | } | |
| 31 | # v1.7.0 introduced --show-toplevel to return the canonical work-tree | |
| 32 | if {[catch {set _gitworktree [exec git rev-parse --show-toplevel]}]} { | |
| 33 | # try to set work tree from environment, core.worktree or use | |
| 34 | # cdup to obtain a relative path to the top of the worktree. If | |
| 35 | # run from the top, the ./ prefix ensures normalize expands pwd. | |
| 36 | if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} { | |
| 37 | catch {set _gitworktree [exec git config --get core.worktree]} | |
| 38 | if {$_gitworktree eq ""} { | |
| 39 | set _gitworktree [file normalize ./[exec git rev-parse --show-cdup]] | |
| 40 | } | |
| 41 | } | |
| 42 | } | |
| 43 | return $_gitworktree | |
| 44 | } | |
| 45 | ||
| 7eb3cb9c PM |
46 | # A simple scheduler for compute-intensive stuff. |
| 47 | # The aim is to make sure that event handlers for GUI actions can | |
| 48 | # run at least every 50-100 ms. Unfortunately fileevent handlers are | |
| 49 | # run before X event handlers, so reading from a fast source can | |
| 50 | # make the GUI completely unresponsive. | |
| 51 | proc run args { | |
| df75e86d | 52 | global isonrunq runq currunq |
| 7eb3cb9c PM |
53 | |
| 54 | set script $args | |
| 55 | if {[info exists isonrunq($script)]} return | |
| df75e86d | 56 | if {$runq eq {} && ![info exists currunq]} { |
| 7eb3cb9c PM |
57 | after idle dorunq |
| 58 | } | |
| 59 | lappend runq [list {} $script] | |
| 60 | set isonrunq($script) 1 | |
| 61 | } | |
| 62 | ||
| 63 | proc filerun {fd script} { | |
| 64 | fileevent $fd readable [list filereadable $fd $script] | |
| 65 | } | |
| 66 | ||
| 67 | proc filereadable {fd script} { | |
| df75e86d | 68 | global runq currunq |
| 7eb3cb9c PM |
69 | |
| 70 | fileevent $fd readable {} | |
| df75e86d | 71 | if {$runq eq {} && ![info exists currunq]} { |
| 7eb3cb9c PM |
72 | after idle dorunq |
| 73 | } | |
| 74 | lappend runq [list $fd $script] | |
| 75 | } | |
| 76 | ||
| 7fcc92bf PM |
77 | proc nukefile {fd} { |
| 78 | global runq | |
| 79 | ||
| 80 | for {set i 0} {$i < [llength $runq]} {} { | |
| 81 | if {[lindex $runq $i 0] eq $fd} { | |
| 82 | set runq [lreplace $runq $i $i] | |
| 83 | } else { | |
| 84 | incr i | |
| 85 | } | |
| 86 | } | |
| 87 | } | |
| 88 | ||
| 7eb3cb9c | 89 | proc dorunq {} { |
| df75e86d | 90 | global isonrunq runq currunq |
| 7eb3cb9c PM |
91 | |
| 92 | set tstart [clock clicks -milliseconds] | |
| 93 | set t0 $tstart | |
| 7fcc92bf | 94 | while {[llength $runq] > 0} { |
| 7eb3cb9c PM |
95 | set fd [lindex $runq 0 0] |
| 96 | set script [lindex $runq 0 1] | |
| df75e86d AG |
97 | set currunq [lindex $runq 0] |
| 98 | set runq [lrange $runq 1 end] | |
| 7eb3cb9c | 99 | set repeat [eval $script] |
| df75e86d | 100 | unset currunq |
| 7eb3cb9c PM |
101 | set t1 [clock clicks -milliseconds] |
| 102 | set t [expr {$t1 - $t0}] | |
| 7eb3cb9c PM |
103 | if {$repeat ne {} && $repeat} { |
| 104 | if {$fd eq {} || $repeat == 2} { | |
| 105 | # script returns 1 if it wants to be readded | |
| 106 | # file readers return 2 if they could do more straight away | |
| 107 | lappend runq [list $fd $script] | |
| 108 | } else { | |
| 109 | fileevent $fd readable [list filereadable $fd $script] | |
| 110 | } | |
| 111 | } elseif {$fd eq {}} { | |
| 112 | unset isonrunq($script) | |
| 113 | } | |
| 114 | set t0 $t1 | |
| 115 | if {$t1 - $tstart >= 80} break | |
| 116 | } | |
| 117 | if {$runq ne {}} { | |
| 118 | after idle dorunq | |
| 119 | } | |
| 120 | } | |
| 121 | ||
| e439e092 AG |
122 | proc reg_instance {fd} { |
| 123 | global commfd leftover loginstance | |
| 124 | ||
| 125 | set i [incr loginstance] | |
| 126 | set commfd($i) $fd | |
| 127 | set leftover($i) {} | |
| 128 | return $i | |
| 129 | } | |
| 130 | ||
| 3ed31a81 PM |
131 | proc unmerged_files {files} { |
| 132 | global nr_unmerged | |
| 133 | ||
| 134 | # find the list of unmerged files | |
| 135 | set mlist {} | |
| 136 | set nr_unmerged 0 | |
| 137 | if {[catch { | |
| 138 | set fd [open "| git ls-files -u" r] | |
| 139 | } err]} { | |
| 140 | show_error {} . "[mc "Couldn't get list of unmerged files:"] $err" | |
| 141 | exit 1 | |
| 142 | } | |
| 143 | while {[gets $fd line] >= 0} { | |
| 144 | set i [string first "\t" $line] | |
| 145 | if {$i < 0} continue | |
| 146 | set fname [string range $line [expr {$i+1}] end] | |
| 147 | if {[lsearch -exact $mlist $fname] >= 0} continue | |
| 148 | incr nr_unmerged | |
| 149 | if {$files eq {} || [path_filter $files $fname]} { | |
| 150 | lappend mlist $fname | |
| 151 | } | |
| 152 | } | |
| 153 | catch {close $fd} | |
| 154 | return $mlist | |
| 155 | } | |
| 156 | ||
| 157 | proc parseviewargs {n arglist} { | |
| c2f2dab9 | 158 | global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env |
| ae4e3ff9 | 159 | global worddiff git_version |
| 3ed31a81 PM |
160 | |
| 161 | set vdatemode($n) 0 | |
| 162 | set vmergeonly($n) 0 | |
| ee66e089 PM |
163 | set glflags {} |
| 164 | set diffargs {} | |
| 165 | set nextisval 0 | |
| 166 | set revargs {} | |
| 167 | set origargs $arglist | |
| 168 | set allknown 1 | |
| 169 | set filtered 0 | |
| 170 | set i -1 | |
| 171 | foreach arg $arglist { | |
| 172 | incr i | |
| 173 | if {$nextisval} { | |
| 174 | lappend glflags $arg | |
| 175 | set nextisval 0 | |
| 176 | continue | |
| 177 | } | |
| 3ed31a81 PM |
178 | switch -glob -- $arg { |
| 179 | "-d" - | |
| 180 | "--date-order" { | |
| 181 | set vdatemode($n) 1 | |
| ee66e089 PM |
182 | # remove from origargs in case we hit an unknown option |
| 183 | set origargs [lreplace $origargs $i $i] | |
| 184 | incr i -1 | |
| 185 | } | |
| ee66e089 PM |
186 | "-[puabwcrRBMC]" - |
| 187 | "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" - | |
| 188 | "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" - | |
| 189 | "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" - | |
| 190 | "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" - | |
| 191 | "--ignore-space-change" - "-U*" - "--unified=*" { | |
| 29582284 PM |
192 | # These request or affect diff output, which we don't want. |
| 193 | # Some could be used to set our defaults for diff display. | |
| ee66e089 PM |
194 | lappend diffargs $arg |
| 195 | } | |
| ee66e089 | 196 | "--raw" - "--patch-with-raw" - "--patch-with-stat" - |
| ae4e3ff9 | 197 | "--name-only" - "--name-status" - "--color" - |
| ee66e089 PM |
198 | "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" - |
| 199 | "--cc" - "-z" - "--header" - "--parents" - "--boundary" - | |
| 200 | "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" - | |
| 201 | "--timestamp" - "relative-date" - "--date=*" - "--stdin" - | |
| 202 | "--objects" - "--objects-edge" - "--reverse" { | |
| 29582284 PM |
203 | # These cause our parsing of git log's output to fail, or else |
| 204 | # they're options we want to set ourselves, so ignore them. | |
| ee66e089 | 205 | } |
| ae4e3ff9 TR |
206 | "--color-words*" - "--word-diff=color" { |
| 207 | # These trigger a word diff in the console interface, | |
| 208 | # so help the user by enabling our own support | |
| 209 | if {[package vcompare $git_version "1.7.2"] >= 0} { | |
| 210 | set worddiff [mc "Color words"] | |
| 211 | } | |
| 212 | } | |
| 213 | "--word-diff*" { | |
| 214 | if {[package vcompare $git_version "1.7.2"] >= 0} { | |
| 215 | set worddiff [mc "Markup words"] | |
| 216 | } | |
| 217 | } | |
| ee66e089 PM |
218 | "--stat=*" - "--numstat" - "--shortstat" - "--summary" - |
| 219 | "--check" - "--exit-code" - "--quiet" - "--topo-order" - | |
| 220 | "--full-history" - "--dense" - "--sparse" - | |
| 221 | "--follow" - "--left-right" - "--encoding=*" { | |
| 29582284 | 222 | # These are harmless, and some are even useful |
| ee66e089 PM |
223 | lappend glflags $arg |
| 224 | } | |
| ee66e089 PM |
225 | "--diff-filter=*" - "--no-merges" - "--unpacked" - |
| 226 | "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" - | |
| 227 | "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" - | |
| 228 | "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" - | |
| 229 | "--remove-empty" - "--first-parent" - "--cherry-pick" - | |
| f687aaa8 DS |
230 | "-S*" - "--pickaxe-all" - "--pickaxe-regex" - |
| 231 | "--simplify-by-decoration" { | |
| 29582284 | 232 | # These mean that we get a subset of the commits |
| ee66e089 PM |
233 | set filtered 1 |
| 234 | lappend glflags $arg | |
| 235 | } | |
| ee66e089 | 236 | "-n" { |
| 29582284 PM |
237 | # This appears to be the only one that has a value as a |
| 238 | # separate word following it | |
| ee66e089 PM |
239 | set filtered 1 |
| 240 | set nextisval 1 | |
| 241 | lappend glflags $arg | |
| 242 | } | |
| 6e7e87c7 | 243 | "--not" - "--all" { |
| ee66e089 | 244 | lappend revargs $arg |
| 3ed31a81 PM |
245 | } |
| 246 | "--merge" { | |
| 247 | set vmergeonly($n) 1 | |
| ee66e089 PM |
248 | # git rev-parse doesn't understand --merge |
| 249 | lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD | |
| 250 | } | |
| c2f2dab9 CC |
251 | "--no-replace-objects" { |
| 252 | set env(GIT_NO_REPLACE_OBJECTS) "1" | |
| 253 | } | |
| ee66e089 | 254 | "-*" { |
| 29582284 | 255 | # Other flag arguments including -<n> |
| ee66e089 PM |
256 | if {[string is digit -strict [string range $arg 1 end]]} { |
| 257 | set filtered 1 | |
| 258 | } else { | |
| 259 | # a flag argument that we don't recognize; | |
| 260 | # that means we can't optimize | |
| 261 | set allknown 0 | |
| 262 | } | |
| 263 | lappend glflags $arg | |
| 3ed31a81 PM |
264 | } |
| 265 | default { | |
| 29582284 | 266 | # Non-flag arguments specify commits or ranges of commits |
| ee66e089 PM |
267 | if {[string match "*...*" $arg]} { |
| 268 | lappend revargs --gitk-symmetric-diff-marker | |
| 269 | } | |
| 270 | lappend revargs $arg | |
| 271 | } | |
| 272 | } | |
| 273 | } | |
| 274 | set vdflags($n) $diffargs | |
| 275 | set vflags($n) $glflags | |
| 276 | set vrevs($n) $revargs | |
| 277 | set vfiltered($n) $filtered | |
| 278 | set vorigargs($n) $origargs | |
| 279 | return $allknown | |
| 280 | } | |
| 281 | ||
| 282 | proc parseviewrevs {view revs} { | |
| 283 | global vposids vnegids | |
| 284 | ||
| 285 | if {$revs eq {}} { | |
| 286 | set revs HEAD | |
| 287 | } | |
| 288 | if {[catch {set ids [eval exec git rev-parse $revs]} err]} { | |
| 289 | # we get stdout followed by stderr in $err | |
| 290 | # for an unknown rev, git rev-parse echoes it and then errors out | |
| 291 | set errlines [split $err "\n"] | |
| 292 | set badrev {} | |
| 293 | for {set l 0} {$l < [llength $errlines]} {incr l} { | |
| 294 | set line [lindex $errlines $l] | |
| 295 | if {!([string length $line] == 40 && [string is xdigit $line])} { | |
| 296 | if {[string match "fatal:*" $line]} { | |
| 297 | if {[string match "fatal: ambiguous argument*" $line] | |
| 298 | && $badrev ne {}} { | |
| 299 | if {[llength $badrev] == 1} { | |
| 300 | set err "unknown revision $badrev" | |
| 301 | } else { | |
| 302 | set err "unknown revisions: [join $badrev ", "]" | |
| 303 | } | |
| 304 | } else { | |
| 305 | set err [join [lrange $errlines $l end] "\n"] | |
| 306 | } | |
| 307 | break | |
| 308 | } | |
| 309 | lappend badrev $line | |
| 310 | } | |
| d93f1713 | 311 | } |
| 3945d2c0 | 312 | error_popup "[mc "Error parsing revisions:"] $err" |
| ee66e089 PM |
313 | return {} |
| 314 | } | |
| 315 | set ret {} | |
| 316 | set pos {} | |
| 317 | set neg {} | |
| 318 | set sdm 0 | |
| 319 | foreach id [split $ids "\n"] { | |
| 320 | if {$id eq "--gitk-symmetric-diff-marker"} { | |
| 321 | set sdm 4 | |
| 322 | } elseif {[string match "^*" $id]} { | |
| 323 | if {$sdm != 1} { | |
| 324 | lappend ret $id | |
| 325 | if {$sdm == 3} { | |
| 326 | set sdm 0 | |
| 327 | } | |
| 328 | } | |
| 329 | lappend neg [string range $id 1 end] | |
| 330 | } else { | |
| 331 | if {$sdm != 2} { | |
| 332 | lappend ret $id | |
| 333 | } else { | |
| 2b1fbf90 | 334 | lset ret end $id...[lindex $ret end] |
| 3ed31a81 | 335 | } |
| ee66e089 | 336 | lappend pos $id |
| 3ed31a81 | 337 | } |
| ee66e089 | 338 | incr sdm -1 |
| 3ed31a81 | 339 | } |
| ee66e089 PM |
340 | set vposids($view) $pos |
| 341 | set vnegids($view) $neg | |
| 342 | return $ret | |
| 3ed31a81 PM |
343 | } |
| 344 | ||
| f9e0b6fb | 345 | # Start off a git log process and arrange to read its output |
| da7c24dd | 346 | proc start_rev_list {view} { |
| 6df7403a | 347 | global startmsecs commitidx viewcomplete curview |
| e439e092 | 348 | global tclencoding |
| ee66e089 | 349 | global viewargs viewargscmd viewfiles vfilelimit |
| d375ef9b | 350 | global showlocalchanges |
| e439e092 | 351 | global viewactive viewinstances vmergeonly |
| cdc8429c | 352 | global mainheadid viewmainheadid viewmainheadid_orig |
| ee66e089 | 353 | global vcanopt vflags vrevs vorigargs |
| 7defefb1 | 354 | global show_notes |
| 9ccbdfbf | 355 | |
| 9ccbdfbf | 356 | set startmsecs [clock clicks -milliseconds] |
| da7c24dd | 357 | set commitidx($view) 0 |
| 3ed31a81 PM |
358 | # these are set this way for the error exits |
| 359 | set viewcomplete($view) 1 | |
| 360 | set viewactive($view) 0 | |
| 7fcc92bf PM |
361 | varcinit $view |
| 362 | ||
| 2d480856 YD |
363 | set args $viewargs($view) |
| 364 | if {$viewargscmd($view) ne {}} { | |
| 365 | if {[catch { | |
| 366 | set str [exec sh -c $viewargscmd($view)] | |
| 367 | } err]} { | |
| 3945d2c0 | 368 | error_popup "[mc "Error executing --argscmd command:"] $err" |
| 3ed31a81 | 369 | return 0 |
| 2d480856 YD |
370 | } |
| 371 | set args [concat $args [split $str "\n"]] | |
| 372 | } | |
| ee66e089 | 373 | set vcanopt($view) [parseviewargs $view $args] |
| 3ed31a81 PM |
374 | |
| 375 | set files $viewfiles($view) | |
| 376 | if {$vmergeonly($view)} { | |
| 377 | set files [unmerged_files $files] | |
| 378 | if {$files eq {}} { | |
| 379 | global nr_unmerged | |
| 380 | if {$nr_unmerged == 0} { | |
| 381 | error_popup [mc "No files selected: --merge specified but\ | |
| 382 | no files are unmerged."] | |
| 383 | } else { | |
| 384 | error_popup [mc "No files selected: --merge specified but\ | |
| 385 | no unmerged files are within file limit."] | |
| 386 | } | |
| 387 | return 0 | |
| 388 | } | |
| 389 | } | |
| 390 | set vfilelimit($view) $files | |
| 391 | ||
| ee66e089 PM |
392 | if {$vcanopt($view)} { |
| 393 | set revs [parseviewrevs $view $vrevs($view)] | |
| 394 | if {$revs eq {}} { | |
| 395 | return 0 | |
| 396 | } | |
| 397 | set args [concat $vflags($view) $revs] | |
| 398 | } else { | |
| 399 | set args $vorigargs($view) | |
| 400 | } | |
| 401 | ||
| 418c4c7b | 402 | if {[catch { |
| 7defefb1 KS |
403 | set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ |
| 404 | --parents --boundary $args "--" $files] r] | |
| 418c4c7b | 405 | } err]} { |
| 00abadb9 | 406 | error_popup "[mc "Error executing git log:"] $err" |
| 3ed31a81 | 407 | return 0 |
| 1d10f36d | 408 | } |
| e439e092 | 409 | set i [reg_instance $fd] |
| 7fcc92bf | 410 | set viewinstances($view) [list $i] |
| cdc8429c PM |
411 | set viewmainheadid($view) $mainheadid |
| 412 | set viewmainheadid_orig($view) $mainheadid | |
| 413 | if {$files ne {} && $mainheadid ne {}} { | |
| 414 | get_viewmainhead $view | |
| 415 | } | |
| 416 | if {$showlocalchanges && $viewmainheadid($view) ne {}} { | |
| 417 | interestedin $viewmainheadid($view) dodiffindex | |
| 3e6b893f | 418 | } |
| 86da5b6c | 419 | fconfigure $fd -blocking 0 -translation lf -eofchar {} |
| fd8ccbec | 420 | if {$tclencoding != {}} { |
| da7c24dd | 421 | fconfigure $fd -encoding $tclencoding |
| fd8ccbec | 422 | } |
| f806f0fb | 423 | filerun $fd [list getcommitlines $fd $i $view 0] |
| d990cedf | 424 | nowbusy $view [mc "Reading"] |
| 3ed31a81 PM |
425 | set viewcomplete($view) 0 |
| 426 | set viewactive($view) 1 | |
| 427 | return 1 | |
| 38ad0910 PM |
428 | } |
| 429 | ||
| e2f90ee4 AG |
430 | proc stop_instance {inst} { |
| 431 | global commfd leftover | |
| 432 | ||
| 433 | set fd $commfd($inst) | |
| 434 | catch { | |
| 435 | set pid [pid $fd] | |
| b6326e92 AG |
436 | |
| 437 | if {$::tcl_platform(platform) eq {windows}} { | |
| 438 | exec kill -f $pid | |
| 439 | } else { | |
| 440 | exec kill $pid | |
| 441 | } | |
| e2f90ee4 AG |
442 | } |
| 443 | catch {close $fd} | |
| 444 | nukefile $fd | |
| 445 | unset commfd($inst) | |
| 446 | unset leftover($inst) | |
| 447 | } | |
| 448 | ||
| 449 | proc stop_backends {} { | |
| 450 | global commfd | |
| 451 | ||
| 452 | foreach inst [array names commfd] { | |
| 453 | stop_instance $inst | |
| 454 | } | |
| 455 | } | |
| 456 | ||
| 7fcc92bf | 457 | proc stop_rev_list {view} { |
| e2f90ee4 | 458 | global viewinstances |
| 22626ef4 | 459 | |
| 7fcc92bf | 460 | foreach inst $viewinstances($view) { |
| e2f90ee4 | 461 | stop_instance $inst |
| 22626ef4 | 462 | } |
| 7fcc92bf | 463 | set viewinstances($view) {} |
| 22626ef4 PM |
464 | } |
| 465 | ||
| 567c34e0 | 466 | proc reset_pending_select {selid} { |
| 39816d60 | 467 | global pending_select mainheadid selectheadid |
| 567c34e0 AG |
468 | |
| 469 | if {$selid ne {}} { | |
| 470 | set pending_select $selid | |
| 39816d60 AG |
471 | } elseif {$selectheadid ne {}} { |
| 472 | set pending_select $selectheadid | |
| 567c34e0 AG |
473 | } else { |
| 474 | set pending_select $mainheadid | |
| 475 | } | |
| 476 | } | |
| 477 | ||
| 478 | proc getcommits {selid} { | |
| 3ed31a81 | 479 | global canv curview need_redisplay viewactive |
| 38ad0910 | 480 | |
| da7c24dd | 481 | initlayout |
| 3ed31a81 | 482 | if {[start_rev_list $curview]} { |
| 567c34e0 | 483 | reset_pending_select $selid |
| 3ed31a81 PM |
484 | show_status [mc "Reading commits..."] |
| 485 | set need_redisplay 1 | |
| 486 | } else { | |
| 487 | show_status [mc "No commits selected"] | |
| 488 | } | |
| 1d10f36d PM |
489 | } |
| 490 | ||
| 7fcc92bf | 491 | proc updatecommits {} { |
| ee66e089 | 492 | global curview vcanopt vorigargs vfilelimit viewinstances |
| e439e092 AG |
493 | global viewactive viewcomplete tclencoding |
| 494 | global startmsecs showneartags showlocalchanges | |
| cdc8429c | 495 | global mainheadid viewmainheadid viewmainheadid_orig pending_select |
| 74cb884f | 496 | global hasworktree |
| ee66e089 | 497 | global varcid vposids vnegids vflags vrevs |
| 7defefb1 | 498 | global show_notes |
| 7fcc92bf | 499 | |
| 74cb884f | 500 | set hasworktree [hasworktree] |
| fc2a256f | 501 | rereadrefs |
| cdc8429c PM |
502 | set view $curview |
| 503 | if {$mainheadid ne $viewmainheadid_orig($view)} { | |
| 504 | if {$showlocalchanges} { | |
| eb5f8c9c PM |
505 | dohidelocalchanges |
| 506 | } | |
| cdc8429c PM |
507 | set viewmainheadid($view) $mainheadid |
| 508 | set viewmainheadid_orig($view) $mainheadid | |
| 509 | if {$vfilelimit($view) ne {}} { | |
| 510 | get_viewmainhead $view | |
| eb5f8c9c PM |
511 | } |
| 512 | } | |
| cdc8429c PM |
513 | if {$showlocalchanges} { |
| 514 | doshowlocalchanges | |
| 515 | } | |
| ee66e089 PM |
516 | if {$vcanopt($view)} { |
| 517 | set oldpos $vposids($view) | |
| 518 | set oldneg $vnegids($view) | |
| 519 | set revs [parseviewrevs $view $vrevs($view)] | |
| 520 | if {$revs eq {}} { | |
| 521 | return | |
| 522 | } | |
| 523 | # note: getting the delta when negative refs change is hard, | |
| 524 | # and could require multiple git log invocations, so in that | |
| 525 | # case we ask git log for all the commits (not just the delta) | |
| 526 | if {$oldneg eq $vnegids($view)} { | |
| 527 | set newrevs {} | |
| 528 | set npos 0 | |
| 529 | # take out positive refs that we asked for before or | |
| 530 | # that we have already seen | |
| 531 | foreach rev $revs { | |
| 532 | if {[string length $rev] == 40} { | |
| 533 | if {[lsearch -exact $oldpos $rev] < 0 | |
| 534 | && ![info exists varcid($view,$rev)]} { | |
| 535 | lappend newrevs $rev | |
| 536 | incr npos | |
| 537 | } | |
| 538 | } else { | |
| 539 | lappend $newrevs $rev | |
| 540 | } | |
| 541 | } | |
| 542 | if {$npos == 0} return | |
| 543 | set revs $newrevs | |
| 544 | set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]] | |
| 545 | } | |
| 546 | set args [concat $vflags($view) $revs --not $oldpos] | |
| 547 | } else { | |
| 548 | set args $vorigargs($view) | |
| 549 | } | |
| 7fcc92bf | 550 | if {[catch { |
| 7defefb1 KS |
551 | set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \ |
| 552 | --parents --boundary $args "--" $vfilelimit($view)] r] | |
| 7fcc92bf | 553 | } err]} { |
| 3945d2c0 | 554 | error_popup "[mc "Error executing git log:"] $err" |
| ee66e089 | 555 | return |
| 7fcc92bf PM |
556 | } |
| 557 | if {$viewactive($view) == 0} { | |
| 558 | set startmsecs [clock clicks -milliseconds] | |
| 559 | } | |
| e439e092 | 560 | set i [reg_instance $fd] |
| 7fcc92bf | 561 | lappend viewinstances($view) $i |
| 7fcc92bf PM |
562 | fconfigure $fd -blocking 0 -translation lf -eofchar {} |
| 563 | if {$tclencoding != {}} { | |
| 564 | fconfigure $fd -encoding $tclencoding | |
| 565 | } | |
| f806f0fb | 566 | filerun $fd [list getcommitlines $fd $i $view 1] |
| 7fcc92bf PM |
567 | incr viewactive($view) |
| 568 | set viewcomplete($view) 0 | |
| 567c34e0 | 569 | reset_pending_select {} |
| b56e0a9a | 570 | nowbusy $view [mc "Reading"] |
| 7fcc92bf PM |
571 | if {$showneartags} { |
| 572 | getallcommits | |
| 573 | } | |
| 574 | } | |
| 575 | ||
| 576 | proc reloadcommits {} { | |
| 577 | global curview viewcomplete selectedline currentid thickerline | |
| 578 | global showneartags treediffs commitinterest cached_commitrow | |
| 6df7403a | 579 | global targetid |
| 7fcc92bf | 580 | |
| 567c34e0 AG |
581 | set selid {} |
| 582 | if {$selectedline ne {}} { | |
| 583 | set selid $currentid | |
| 584 | } | |
| 585 | ||
| 7fcc92bf PM |
586 | if {!$viewcomplete($curview)} { |
| 587 | stop_rev_list $curview | |
| 7fcc92bf PM |
588 | } |
| 589 | resetvarcs $curview | |
| 94b4a69f | 590 | set selectedline {} |
| 7fcc92bf PM |
591 | catch {unset currentid} |
| 592 | catch {unset thickerline} | |
| 593 | catch {unset treediffs} | |
| 594 | readrefs | |
| 595 | changedrefs | |
| 596 | if {$showneartags} { | |
| 597 | getallcommits | |
| 598 | } | |
| 599 | clear_display | |
| 600 | catch {unset commitinterest} | |
| 601 | catch {unset cached_commitrow} | |
| 42a671fc | 602 | catch {unset targetid} |
| 7fcc92bf | 603 | setcanvscroll |
| 567c34e0 | 604 | getcommits $selid |
| e7297a1c | 605 | return 0 |
| 7fcc92bf PM |
606 | } |
| 607 | ||
| 6e8c8707 PM |
608 | # This makes a string representation of a positive integer which |
| 609 | # sorts as a string in numerical order | |
| 610 | proc strrep {n} { | |
| 611 | if {$n < 16} { | |
| 612 | return [format "%x" $n] | |
| 613 | } elseif {$n < 256} { | |
| 614 | return [format "x%.2x" $n] | |
| 615 | } elseif {$n < 65536} { | |
| 616 | return [format "y%.4x" $n] | |
| 617 | } | |
| 618 | return [format "z%.8x" $n] | |
| 619 | } | |
| 620 | ||
| 7fcc92bf PM |
621 | # Procedures used in reordering commits from git log (without |
| 622 | # --topo-order) into the order for display. | |
| 623 | ||
| 624 | proc varcinit {view} { | |
| f3ea5ede PM |
625 | global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow |
| 626 | global vtokmod varcmod vrowmod varcix vlastins | |
| 7fcc92bf | 627 | |
| 7fcc92bf PM |
628 | set varcstart($view) {{}} |
| 629 | set vupptr($view) {0} | |
| 630 | set vdownptr($view) {0} | |
| 631 | set vleftptr($view) {0} | |
| f3ea5ede | 632 | set vbackptr($view) {0} |
| 7fcc92bf PM |
633 | set varctok($view) {{}} |
| 634 | set varcrow($view) {{}} | |
| 635 | set vtokmod($view) {} | |
| 636 | set varcmod($view) 0 | |
| e5b37ac1 | 637 | set vrowmod($view) 0 |
| 7fcc92bf | 638 | set varcix($view) {{}} |
| f3ea5ede | 639 | set vlastins($view) {0} |
| 7fcc92bf PM |
640 | } |
| 641 | ||
| 642 | proc resetvarcs {view} { | |
| 643 | global varcid varccommits parents children vseedcount ordertok | |
| 22387f23 | 644 | global vshortids |
| 7fcc92bf PM |
645 | |
| 646 | foreach vid [array names varcid $view,*] { | |
| 647 | unset varcid($vid) | |
| 648 | unset children($vid) | |
| 649 | unset parents($vid) | |
| 650 | } | |
| 22387f23 PM |
651 | foreach vid [array names vshortids $view,*] { |
| 652 | unset vshortids($vid) | |
| 653 | } | |
| 7fcc92bf PM |
654 | # some commits might have children but haven't been seen yet |
| 655 | foreach vid [array names children $view,*] { | |
| 656 | unset children($vid) | |
| 657 | } | |
| 658 | foreach va [array names varccommits $view,*] { | |
| 659 | unset varccommits($va) | |
| 660 | } | |
| 661 | foreach vd [array names vseedcount $view,*] { | |
| 662 | unset vseedcount($vd) | |
| 663 | } | |
| 9257d8f7 | 664 | catch {unset ordertok} |
| 7fcc92bf PM |
665 | } |
| 666 | ||
| 468bcaed PM |
667 | # returns a list of the commits with no children |
| 668 | proc seeds {v} { | |
| 669 | global vdownptr vleftptr varcstart | |
| 670 | ||
| 671 | set ret {} | |
| 672 | set a [lindex $vdownptr($v) 0] | |
| 673 | while {$a != 0} { | |
| 674 | lappend ret [lindex $varcstart($v) $a] | |
| 675 | set a [lindex $vleftptr($v) $a] | |
| 676 | } | |
| 677 | return $ret | |
| 678 | } | |
| 679 | ||
| 7fcc92bf | 680 | proc newvarc {view id} { |
| 3ed31a81 | 681 | global varcid varctok parents children vdatemode |
| f3ea5ede PM |
682 | global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart |
| 683 | global commitdata commitinfo vseedcount varccommits vlastins | |
| 7fcc92bf PM |
684 | |
| 685 | set a [llength $varctok($view)] | |
| 686 | set vid $view,$id | |
| 3ed31a81 | 687 | if {[llength $children($vid)] == 0 || $vdatemode($view)} { |
| 7fcc92bf PM |
688 | if {![info exists commitinfo($id)]} { |
| 689 | parsecommit $id $commitdata($id) 1 | |
| 690 | } | |
| f5974d97 | 691 | set cdate [lindex [lindex $commitinfo($id) 4] 0] |
| 7fcc92bf PM |
692 | if {![string is integer -strict $cdate]} { |
| 693 | set cdate 0 | |
| 694 | } | |
| 695 | if {![info exists vseedcount($view,$cdate)]} { | |
| 696 | set vseedcount($view,$cdate) -1 | |
| 697 | } | |
| 698 | set c [incr vseedcount($view,$cdate)] | |
| 699 | set cdate [expr {$cdate ^ 0xffffffff}] | |
| 700 | set tok "s[strrep $cdate][strrep $c]" | |
| 7fcc92bf PM |
701 | } else { |
| 702 | set tok {} | |
| f3ea5ede PM |
703 | } |
| 704 | set ka 0 | |
| 705 | if {[llength $children($vid)] > 0} { | |
| 706 | set kid [lindex $children($vid) end] | |
| 707 | set k $varcid($view,$kid) | |
| 708 | if {[string compare [lindex $varctok($view) $k] $tok] > 0} { | |
| 709 | set ki $kid | |
| 710 | set ka $k | |
| 711 | set tok [lindex $varctok($view) $k] | |
| 7fcc92bf | 712 | } |
| f3ea5ede PM |
713 | } |
| 714 | if {$ka != 0} { | |
| 7fcc92bf PM |
715 | set i [lsearch -exact $parents($view,$ki) $id] |
| 716 | set j [expr {[llength $parents($view,$ki)] - 1 - $i}] | |
| 7fcc92bf PM |
717 | append tok [strrep $j] |
| 718 | } | |
| f3ea5ede PM |
719 | set c [lindex $vlastins($view) $ka] |
| 720 | if {$c == 0 || [string compare $tok [lindex $varctok($view) $c]] < 0} { | |
| 721 | set c $ka | |
| 722 | set b [lindex $vdownptr($view) $ka] | |
| 723 | } else { | |
| 724 | set b [lindex $vleftptr($view) $c] | |
| 725 | } | |
| 726 | while {$b != 0 && [string compare $tok [lindex $varctok($view) $b]] >= 0} { | |
| 727 | set c $b | |
| 728 | set b [lindex $vleftptr($view) $c] | |
| 729 | } | |
| 730 | if {$c == $ka} { | |
| 731 | lset vdownptr($view) $ka $a | |
| 732 | lappend vbackptr($view) 0 | |
| 733 | } else { | |
| 734 | lset vleftptr($view) $c $a | |
| 735 | lappend vbackptr($view) $c | |
| 736 | } | |
| 737 | lset vlastins($view) $ka $a | |
| 738 | lappend vupptr($view) $ka | |
| 739 | lappend vleftptr($view) $b | |
| 740 | if {$b != 0} { | |
| 741 | lset vbackptr($view) $b $a | |
| 742 | } | |
| 7fcc92bf PM |
743 | lappend varctok($view) $tok |
| 744 | lappend varcstart($view) $id | |
| 745 | lappend vdownptr($view) 0 | |
| 746 | lappend varcrow($view) {} | |
| 747 | lappend varcix($view) {} | |
| e5b37ac1 | 748 | set varccommits($view,$a) {} |
| f3ea5ede | 749 | lappend vlastins($view) 0 |
| 7fcc92bf PM |
750 | return $a |
| 751 | } | |
| 752 | ||
| 753 | proc splitvarc {p v} { | |
| 52b8ea93 | 754 | global varcid varcstart varccommits varctok vtokmod |
| f3ea5ede | 755 | global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins |
| 7fcc92bf PM |
756 | |
| 757 | set oa $varcid($v,$p) | |
| 52b8ea93 | 758 | set otok [lindex $varctok($v) $oa] |
| 7fcc92bf PM |
759 | set ac $varccommits($v,$oa) |
| 760 | set i [lsearch -exact $varccommits($v,$oa) $p] | |
| 761 | if {$i <= 0} return | |
| 762 | set na [llength $varctok($v)] | |
| 763 | # "%" sorts before "0"... | |
| 52b8ea93 | 764 | set tok "$otok%[strrep $i]" |
| 7fcc92bf PM |
765 | lappend varctok($v) $tok |
| 766 | lappend varcrow($v) {} | |
| 767 | lappend varcix($v) {} | |
| 768 | set varccommits($v,$oa) [lrange $ac 0 [expr {$i - 1}]] | |
| 769 | set varccommits($v,$na) [lrange $ac $i end] | |
| 770 | lappend varcstart($v) $p | |
| 771 | foreach id $varccommits($v,$na) { | |
| 772 | set varcid($v,$id) $na | |
| 773 | } | |
| 774 | lappend vdownptr($v) [lindex $vdownptr($v) $oa] | |
| 841ea824 | 775 | lappend vlastins($v) [lindex $vlastins($v) $oa] |
| 7fcc92bf | 776 | lset vdownptr($v) $oa $na |
| 841ea824 | 777 | lset vlastins($v) $oa 0 |
| 7fcc92bf PM |
778 | lappend vupptr($v) $oa |
| 779 | lappend vleftptr($v) 0 | |
| f3ea5ede | 780 | lappend vbackptr($v) 0 |
| 7fcc92bf PM |
781 | for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} { |
| 782 | lset vupptr($v) $b $na | |
| 783 | } | |
| 52b8ea93 PM |
784 | if {[string compare $otok $vtokmod($v)] <= 0} { |
| 785 | modify_arc $v $oa | |
| 786 | } | |
| 7fcc92bf PM |
787 | } |
| 788 | ||
| 789 | proc renumbervarc {a v} { | |
| 790 | global parents children varctok varcstart varccommits | |
| 3ed31a81 | 791 | global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode |
| 7fcc92bf PM |
792 | |
| 793 | set t1 [clock clicks -milliseconds] | |
| 794 | set todo {} | |
| 795 | set isrelated($a) 1 | |
| f3ea5ede | 796 | set kidchanged($a) 1 |
| 7fcc92bf PM |
797 | set ntot 0 |
| 798 | while {$a != 0} { | |
| 799 | if {[info exists isrelated($a)]} { | |
| 800 | lappend todo $a | |
| 801 | set id [lindex $varccommits($v,$a) end] | |
| 802 | foreach p $parents($v,$id) { | |
| 803 | if {[info exists varcid($v,$p)]} { | |
| 804 | set isrelated($varcid($v,$p)) 1 | |
| 805 | } | |
| 806 | } | |
| 807 | } | |
| 808 | incr ntot | |
| 809 | set b [lindex $vdownptr($v) $a] | |
| 810 | if {$b == 0} { | |
| 811 | while {$a != 0} { | |
| 812 | set b [lindex $vleftptr($v) $a] | |
| 813 | if {$b != 0} break | |
| 814 | set a [lindex $vupptr($v) $a] | |
| 815 | } | |
| 816 | } | |
| 817 | set a $b | |
| 818 | } | |
| 819 | foreach a $todo { | |
| f3ea5ede | 820 | if {![info exists kidchanged($a)]} continue |
| 7fcc92bf | 821 | set id [lindex $varcstart($v) $a] |
| f3ea5ede PM |
822 | if {[llength $children($v,$id)] > 1} { |
| 823 | set children($v,$id) [lsort -command [list vtokcmp $v] \ | |
| 824 | $children($v,$id)] | |
| 825 | } | |
| 826 | set oldtok [lindex $varctok($v) $a] | |
| 3ed31a81 | 827 | if {!$vdatemode($v)} { |
| f3ea5ede PM |
828 | set tok {} |
| 829 | } else { | |
| 830 | set tok $oldtok | |
| 831 | } | |
| 832 | set ka 0 | |
| c8c9f3d9 PM |
833 | set kid [last_real_child $v,$id] |
| 834 | if {$kid ne {}} { | |
| f3ea5ede PM |
835 | set k $varcid($v,$kid) |
| 836 | if {[string compare [lindex $varctok($v) $k] $tok] > 0} { | |
| 837 | set ki $kid | |
| 838 | set ka $k | |
| 839 | set tok [lindex $varctok($v) $k] | |
| 7fcc92bf PM |
840 | } |
| 841 | } | |
| f3ea5ede | 842 | if {$ka != 0} { |
| 7fcc92bf PM |
843 | set i [lsearch -exact $parents($v,$ki) $id] |
| 844 | set j [expr {[llength $parents($v,$ki)] - 1 - $i}] | |
| 845 | append tok [strrep $j] | |
| 7fcc92bf | 846 | } |
| f3ea5ede PM |
847 | if {$tok eq $oldtok} { |
| 848 | continue | |
| 849 | } | |
| 850 | set id [lindex $varccommits($v,$a) end] | |
| 851 | foreach p $parents($v,$id) { | |
| 852 | if {[info exists varcid($v,$p)]} { | |
| 853 | set kidchanged($varcid($v,$p)) 1 | |
| 854 | } else { | |
| 855 | set sortkids($p) 1 | |
| 856 | } | |
| 857 | } | |
| 858 | lset varctok($v) $a $tok | |
| 7fcc92bf PM |
859 | set b [lindex $vupptr($v) $a] |
| 860 | if {$b != $ka} { | |
| 9257d8f7 PM |
861 | if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} { |
| 862 | modify_arc $v $ka | |
| 38dfe939 | 863 | } |
| 9257d8f7 PM |
864 | if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} { |
| 865 | modify_arc $v $b | |
| 38dfe939 | 866 | } |
| f3ea5ede PM |
867 | set c [lindex $vbackptr($v) $a] |
| 868 | set d [lindex $vleftptr($v) $a] | |
| 869 | if {$c == 0} { | |
| 870 | lset vdownptr($v) $b $d | |
| 7fcc92bf | 871 | } else { |
| f3ea5ede PM |
872 | lset vleftptr($v) $c $d |
| 873 | } | |
| 874 | if {$d != 0} { | |
| 875 | lset vbackptr($v) $d $c | |
| 7fcc92bf | 876 | } |
| 841ea824 PM |
877 | if {[lindex $vlastins($v) $b] == $a} { |
| 878 | lset vlastins($v) $b $c | |
| 879 | } | |
| 7fcc92bf | 880 | lset vupptr($v) $a $ka |
| f3ea5ede PM |
881 | set c [lindex $vlastins($v) $ka] |
| 882 | if {$c == 0 || \ | |
| 883 | [string compare $tok [lindex $varctok($v) $c]] < 0} { | |
| 884 | set c $ka | |
| 885 | set b [lindex $vdownptr($v) $ka] | |
| 886 | } else { | |
| 887 | set b [lindex $vleftptr($v) $c] | |
| 888 | } | |
| 889 | while {$b != 0 && \ | |
| 890 | [string compare $tok [lindex $varctok($v) $b]] >= 0} { | |
| 891 | set c $b | |
| 892 | set b [lindex $vleftptr($v) $c] | |
| 7fcc92bf | 893 | } |
| f3ea5ede PM |
894 | if {$c == $ka} { |
| 895 | lset vdownptr($v) $ka $a | |
| 896 | lset vbackptr($v) $a 0 | |
| 897 | } else { | |
| 898 | lset vleftptr($v) $c $a | |
| 899 | lset vbackptr($v) $a $c | |
| 7fcc92bf | 900 | } |
| f3ea5ede PM |
901 | lset vleftptr($v) $a $b |
| 902 | if {$b != 0} { | |
| 903 | lset vbackptr($v) $b $a | |
| 904 | } | |
| 905 | lset vlastins($v) $ka $a | |
| 906 | } | |
| 907 | } | |
| 908 | foreach id [array names sortkids] { | |
| 909 | if {[llength $children($v,$id)] > 1} { | |
| 910 | set children($v,$id) [lsort -command [list vtokcmp $v] \ | |
| 911 | $children($v,$id)] | |
| 7fcc92bf PM |
912 | } |
| 913 | } | |
| 914 | set t2 [clock clicks -milliseconds] | |
| 915 | #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms" | |
| 916 | } | |
| 917 | ||
| f806f0fb PM |
918 | # Fix up the graph after we have found out that in view $v, |
| 919 | # $p (a commit that we have already seen) is actually the parent | |
| 920 | # of the last commit in arc $a. | |
| 7fcc92bf | 921 | proc fix_reversal {p a v} { |
| 24f7a667 | 922 | global varcid varcstart varctok vupptr |
| 7fcc92bf PM |
923 | |
| 924 | set pa $varcid($v,$p) | |
| 925 | if {$p ne [lindex $varcstart($v) $pa]} { | |
| 926 | splitvarc $p $v | |
| 927 | set pa $varcid($v,$p) | |
| 928 | } | |
| 24f7a667 PM |
929 | # seeds always need to be renumbered |
| 930 | if {[lindex $vupptr($v) $pa] == 0 || | |
| 931 | [string compare [lindex $varctok($v) $a] \ | |
| 932 | [lindex $varctok($v) $pa]] > 0} { | |
| 7fcc92bf PM |
933 | renumbervarc $pa $v |
| 934 | } | |
| 935 | } | |
| 936 | ||
| 937 | proc insertrow {id p v} { | |
| b8a938cf PM |
938 | global cmitlisted children parents varcid varctok vtokmod |
| 939 | global varccommits ordertok commitidx numcommits curview | |
| 22387f23 | 940 | global targetid targetrow vshortids |
| b8a938cf PM |
941 | |
| 942 | readcommit $id | |
| 943 | set vid $v,$id | |
| 944 | set cmitlisted($vid) 1 | |
| 945 | set children($vid) {} | |
| 946 | set parents($vid) [list $p] | |
| 947 | set a [newvarc $v $id] | |
| 948 | set varcid($vid) $a | |
| 22387f23 | 949 | lappend vshortids($v,[string range $id 0 3]) $id |
| b8a938cf PM |
950 | if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] < 0} { |
| 951 | modify_arc $v $a | |
| 952 | } | |
| 953 | lappend varccommits($v,$a) $id | |
| 954 | set vp $v,$p | |
| 955 | if {[llength [lappend children($vp) $id]] > 1} { | |
| 956 | set children($vp) [lsort -command [list vtokcmp $v] $children($vp)] | |
| 957 | catch {unset ordertok} | |
| 958 | } | |
| 959 | fix_reversal $p $a $v | |
| 960 | incr commitidx($v) | |
| 961 | if {$v == $curview} { | |
| 962 | set numcommits $commitidx($v) | |
| 963 | setcanvscroll | |
| 964 | if {[info exists targetid]} { | |
| 965 | if {![comes_before $targetid $p]} { | |
| 966 | incr targetrow | |
| 967 | } | |
| 968 | } | |
| 969 | } | |
| 970 | } | |
| 971 | ||
| 972 | proc insertfakerow {id p} { | |
| 9257d8f7 | 973 | global varcid varccommits parents children cmitlisted |
| b8a938cf | 974 | global commitidx varctok vtokmod targetid targetrow curview numcommits |
| 7fcc92bf | 975 | |
| b8a938cf | 976 | set v $curview |
| 7fcc92bf PM |
977 | set a $varcid($v,$p) |
| 978 | set i [lsearch -exact $varccommits($v,$a) $p] | |
| 979 | if {$i < 0} { | |
| b8a938cf | 980 | puts "oops: insertfakerow can't find [shortids $p] on arc $a" |
| 7fcc92bf PM |
981 | return |
| 982 | } | |
| 983 | set children($v,$id) {} | |
| 984 | set parents($v,$id) [list $p] | |
| 985 | set varcid($v,$id) $a | |
| 9257d8f7 | 986 | lappend children($v,$p) $id |
| 7fcc92bf | 987 | set cmitlisted($v,$id) 1 |
| b8a938cf | 988 | set numcommits [incr commitidx($v)] |
| 7fcc92bf PM |
989 | # note we deliberately don't update varcstart($v) even if $i == 0 |
| 990 | set varccommits($v,$a) [linsert $varccommits($v,$a) $i $id] | |
| c9cfdc96 | 991 | modify_arc $v $a $i |
| 42a671fc PM |
992 | if {[info exists targetid]} { |
| 993 | if {![comes_before $targetid $p]} { | |
| 994 | incr targetrow | |
| 995 | } | |
| 996 | } | |
| b8a938cf | 997 | setcanvscroll |
| 9257d8f7 | 998 | drawvisible |
| 7fcc92bf PM |
999 | } |
| 1000 | ||
| b8a938cf | 1001 | proc removefakerow {id} { |
| 9257d8f7 | 1002 | global varcid varccommits parents children commitidx |
| fc2a256f | 1003 | global varctok vtokmod cmitlisted currentid selectedline |
| b8a938cf | 1004 | global targetid curview numcommits |
| 7fcc92bf | 1005 | |
| b8a938cf | 1006 | set v $curview |
| 7fcc92bf | 1007 | if {[llength $parents($v,$id)] != 1} { |
| b8a938cf | 1008 | puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents" |
| 7fcc92bf PM |
1009 | return |
| 1010 | } | |
| 1011 | set p [lindex $parents($v,$id) 0] | |
| 1012 | set a $varcid($v,$id) | |
| 1013 | set i [lsearch -exact $varccommits($v,$a) $id] | |
| 1014 | if {$i < 0} { | |
| b8a938cf | 1015 | puts "oops: removefakerow can't find [shortids $id] on arc $a" |
| 7fcc92bf PM |
1016 | return |
| 1017 | } | |
| 1018 | unset varcid($v,$id) | |
| 1019 | set varccommits($v,$a) [lreplace $varccommits($v,$a) $i $i] | |
| 1020 | unset parents($v,$id) | |
| 1021 | unset children($v,$id) | |
| 1022 | unset cmitlisted($v,$id) | |
| b8a938cf | 1023 | set numcommits [incr commitidx($v) -1] |
| 7fcc92bf PM |
1024 | set j [lsearch -exact $children($v,$p) $id] |
| 1025 | if {$j >= 0} { | |
| 1026 | set children($v,$p) [lreplace $children($v,$p) $j $j] | |
| 1027 | } | |
| c9cfdc96 | 1028 | modify_arc $v $a $i |
| fc2a256f PM |
1029 | if {[info exist currentid] && $id eq $currentid} { |
| 1030 | unset currentid | |
| 94b4a69f | 1031 | set selectedline {} |
| fc2a256f | 1032 | } |
| 42a671fc PM |
1033 | if {[info exists targetid] && $targetid eq $id} { |
| 1034 | set targetid $p | |
| 1035 | } | |
| b8a938cf | 1036 | setcanvscroll |
| 9257d8f7 | 1037 | drawvisible |
| 7fcc92bf PM |
1038 | } |
| 1039 | ||
| aa43561a PM |
1040 | proc real_children {vp} { |
| 1041 | global children nullid nullid2 | |
| 1042 | ||
| 1043 | set kids {} | |
| 1044 | foreach id $children($vp) { | |
| 1045 | if {$id ne $nullid && $id ne $nullid2} { | |
| 1046 | lappend kids $id | |
| 1047 | } | |
| 1048 | } | |
| 1049 | return $kids | |
| 1050 | } | |
| 1051 | ||
| c8c9f3d9 PM |
1052 | proc first_real_child {vp} { |
| 1053 | global children nullid nullid2 | |
| 1054 | ||
| 1055 | foreach id $children($vp) { | |
| 1056 | if {$id ne $nullid && $id ne $nullid2} { | |
| 1057 | return $id | |
| 1058 | } | |
| 1059 | } | |
| 1060 | return {} | |
| 1061 | } | |
| 1062 | ||
| 1063 | proc last_real_child {vp} { | |
| 1064 | global children nullid nullid2 | |
| 1065 | ||
| 1066 | set kids $children($vp) | |
| 1067 | for {set i [llength $kids]} {[incr i -1] >= 0} {} { | |
| 1068 | set id [lindex $kids $i] | |
| 1069 | if {$id ne $nullid && $id ne $nullid2} { | |
| 1070 | return $id | |
| 1071 | } | |
| 1072 | } | |
| 1073 | return {} | |
| 1074 | } | |
| 1075 | ||
| 7fcc92bf PM |
1076 | proc vtokcmp {v a b} { |
| 1077 | global varctok varcid | |
| 1078 | ||
| 1079 | return [string compare [lindex $varctok($v) $varcid($v,$a)] \ | |
| 1080 | [lindex $varctok($v) $varcid($v,$b)]] | |
| 1081 | } | |
| 1082 | ||
| c9cfdc96 PM |
1083 | # This assumes that if lim is not given, the caller has checked that |
| 1084 | # arc a's token is less than $vtokmod($v) | |
| e5b37ac1 PM |
1085 | proc modify_arc {v a {lim {}}} { |
| 1086 | global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits | |
| 9257d8f7 | 1087 | |
| c9cfdc96 PM |
1088 | if {$lim ne {}} { |
| 1089 | set c [string compare [lindex $varctok($v) $a] $vtokmod($v)] | |
| 1090 | if {$c > 0} return | |
| 1091 | if {$c == 0} { | |
| 1092 | set r [lindex $varcrow($v) $a] | |
| 1093 | if {$r ne {} && $vrowmod($v) <= $r + $lim} return | |
| 1094 | } | |
| 1095 | } | |
| 9257d8f7 PM |
1096 | set vtokmod($v) [lindex $varctok($v) $a] |
| 1097 | set varcmod($v) $a | |
| 1098 | if {$v == $curview} { | |
| 1099 | while {$a != 0 && [lindex $varcrow($v) $a] eq {}} { | |
| 1100 | set a [lindex $vupptr($v) $a] | |
| e5b37ac1 | 1101 | set lim {} |
| 9257d8f7 | 1102 | } |
| e5b37ac1 PM |
1103 | set r 0 |
| 1104 | if {$a != 0} { | |
| 1105 | if {$lim eq {}} { | |
| 1106 | set lim [llength $varccommits($v,$a)] | |
| 1107 | } | |
| 1108 | set r [expr {[lindex $varcrow($v) $a] + $lim}] | |
| 1109 | } | |
| 1110 | set vrowmod($v) $r | |
| 0c27886e | 1111 | undolayout $r |
| 9257d8f7 PM |
1112 | } |
| 1113 | } | |
| 1114 | ||
| 7fcc92bf | 1115 | proc update_arcrows {v} { |
| e5b37ac1 | 1116 | global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline |
| 24f7a667 | 1117 | global varcid vrownum varcorder varcix varccommits |
| 7fcc92bf | 1118 | global vupptr vdownptr vleftptr varctok |
| 24f7a667 | 1119 | global displayorder parentlist curview cached_commitrow |
| 7fcc92bf | 1120 | |
| c9cfdc96 PM |
1121 | if {$vrowmod($v) == $commitidx($v)} return |
| 1122 | if {$v == $curview} { | |
| 1123 | if {[llength $displayorder] > $vrowmod($v)} { | |
| 1124 | set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]] | |
| 1125 | set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]] | |
| 1126 | } | |
| 1127 | catch {unset cached_commitrow} | |
| 1128 | } | |
| 7fcc92bf PM |
1129 | set narctot [expr {[llength $varctok($v)] - 1}] |
| 1130 | set a $varcmod($v) | |
| 1131 | while {$a != 0 && [lindex $varcix($v) $a] eq {}} { | |
| 1132 | # go up the tree until we find something that has a row number, | |
| 1133 | # or we get to a seed | |
| 1134 | set a [lindex $vupptr($v) $a] | |
| 1135 | } | |
| 1136 | if {$a == 0} { | |
| 1137 | set a [lindex $vdownptr($v) 0] | |
| 1138 | if {$a == 0} return | |
| 1139 | set vrownum($v) {0} | |
| 1140 | set varcorder($v) [list $a] | |
| 1141 | lset varcix($v) $a 0 | |
| 1142 | lset varcrow($v) $a 0 | |
| 1143 | set arcn 0 | |
| 1144 | set row 0 | |
| 1145 | } else { | |
| 1146 | set arcn [lindex $varcix($v) $a] | |
| 7fcc92bf PM |
1147 | if {[llength $vrownum($v)] > $arcn + 1} { |
| 1148 | set vrownum($v) [lrange $vrownum($v) 0 $arcn] | |
| 1149 | set varcorder($v) [lrange $varcorder($v) 0 $arcn] | |
| 1150 | } | |
| 1151 | set row [lindex $varcrow($v) $a] | |
| 1152 | } | |
| 7fcc92bf PM |
1153 | while {1} { |
| 1154 | set p $a | |
| 1155 | incr row [llength $varccommits($v,$a)] | |
| 1156 | # go down if possible | |
| 1157 | set b [lindex $vdownptr($v) $a] | |
| 1158 | if {$b == 0} { | |
| 1159 | # if not, go left, or go up until we can go left | |
| 1160 | while {$a != 0} { | |
| 1161 | set b [lindex $vleftptr($v) $a] | |
| 1162 | if {$b != 0} break | |
| 1163 | set a [lindex $vupptr($v) $a] | |
| 1164 | } | |
| 1165 | if {$a == 0} break | |
| 1166 | } | |
| 1167 | set a $b | |
| 1168 | incr arcn | |
| 1169 | lappend vrownum($v) $row | |
| 1170 | lappend varcorder($v) $a | |
| 1171 | lset varcix($v) $a $arcn | |
| 1172 | lset varcrow($v) $a $row | |
| 1173 | } | |
| e5b37ac1 PM |
1174 | set vtokmod($v) [lindex $varctok($v) $p] |
| 1175 | set varcmod($v) $p | |
| 1176 | set vrowmod($v) $row | |
| 7fcc92bf PM |
1177 | if {[info exists currentid]} { |
| 1178 | set selectedline [rowofcommit $currentid] | |
| 1179 | } | |
| 7fcc92bf PM |
1180 | } |
| 1181 | ||
| 1182 | # Test whether view $v contains commit $id | |
| 1183 | proc commitinview {id v} { | |
| 1184 | global varcid | |
| 1185 | ||
| 1186 | return [info exists varcid($v,$id)] | |
| 1187 | } | |
| 1188 | ||
| 1189 | # Return the row number for commit $id in the current view | |
| 1190 | proc rowofcommit {id} { | |
| 1191 | global varcid varccommits varcrow curview cached_commitrow | |
| 9257d8f7 | 1192 | global varctok vtokmod |
| 7fcc92bf | 1193 | |
| 7fcc92bf PM |
1194 | set v $curview |
| 1195 | if {![info exists varcid($v,$id)]} { | |
| 1196 | puts "oops rowofcommit no arc for [shortids $id]" | |
| 1197 | return {} | |
| 1198 | } | |
| 1199 | set a $varcid($v,$id) | |
| fc2a256f | 1200 | if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} { |
| 9257d8f7 PM |
1201 | update_arcrows $v |
| 1202 | } | |
| 31c0eaa8 PM |
1203 | if {[info exists cached_commitrow($id)]} { |
| 1204 | return $cached_commitrow($id) | |
| 1205 | } | |
| 7fcc92bf PM |
1206 | set i [lsearch -exact $varccommits($v,$a) $id] |
| 1207 | if {$i < 0} { | |
| 1208 | puts "oops didn't find commit [shortids $id] in arc $a" | |
| 1209 | return {} | |
| 1210 | } | |
| 1211 | incr i [lindex $varcrow($v) $a] | |
| 1212 | set cached_commitrow($id) $i | |
| 1213 | return $i | |
| 1214 | } | |
| 1215 | ||
| 42a671fc PM |
1216 | # Returns 1 if a is on an earlier row than b, otherwise 0 |
| 1217 | proc comes_before {a b} { | |
| 1218 | global varcid varctok curview | |
| 1219 | ||
| 1220 | set v $curview | |
| 1221 | if {$a eq $b || ![info exists varcid($v,$a)] || \ | |
| 1222 | ![info exists varcid($v,$b)]} { | |
| 1223 | return 0 | |
| 1224 | } | |
| 1225 | if {$varcid($v,$a) != $varcid($v,$b)} { | |
| 1226 | return [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \ | |
| 1227 | [lindex $varctok($v) $varcid($v,$b)]] < 0}] | |
| 1228 | } | |
| 1229 | return [expr {[rowofcommit $a] < [rowofcommit $b]}] | |
| 1230 | } | |
| 1231 | ||
| 7fcc92bf PM |
1232 | proc bsearch {l elt} { |
| 1233 | if {[llength $l] == 0 || $elt <= [lindex $l 0]} { | |
| 1234 | return 0 | |
| 1235 | } | |
| 1236 | set lo 0 | |
| 1237 | set hi [llength $l] | |
| 1238 | while {$hi - $lo > 1} { | |
| 1239 | set mid [expr {int(($lo + $hi) / 2)}] | |
| 1240 | set t [lindex $l $mid] | |
| 1241 | if {$elt < $t} { | |
| 1242 | set hi $mid | |
| 1243 | } elseif {$elt > $t} { | |
| 1244 | set lo $mid | |
| 1245 | } else { | |
| 1246 | return $mid | |
| 1247 | } | |
| 1248 | } | |
| 1249 | return $lo | |
| 1250 | } | |
| 1251 | ||
| 1252 | # Make sure rows $start..$end-1 are valid in displayorder and parentlist | |
| 1253 | proc make_disporder {start end} { | |
| 1254 | global vrownum curview commitidx displayorder parentlist | |
| e5b37ac1 | 1255 | global varccommits varcorder parents vrowmod varcrow |
| 7fcc92bf PM |
1256 | global d_valid_start d_valid_end |
| 1257 | ||
| e5b37ac1 | 1258 | if {$end > $vrowmod($curview)} { |
| 9257d8f7 PM |
1259 | update_arcrows $curview |
| 1260 | } | |
| 7fcc92bf PM |
1261 | set ai [bsearch $vrownum($curview) $start] |
| 1262 | set start [lindex $vrownum($curview) $ai] | |
| 1263 | set narc [llength $vrownum($curview)] | |
| 1264 | for {set r $start} {$ai < $narc && $r < $end} {incr ai} { | |
| 1265 | set a [lindex $varcorder($curview) $ai] | |
| 1266 | set l [llength $displayorder] | |
| 1267 | set al [llength $varccommits($curview,$a)] | |
| 1268 | if {$l < $r + $al} { | |
| 1269 | if {$l < $r} { | |
| 1270 | set pad [ntimes [expr {$r - $l}] {}] | |
| 1271 | set displayorder [concat $displayorder $pad] | |
| 1272 | set parentlist [concat $parentlist $pad] | |
| 1273 | } elseif {$l > $r} { | |
| 1274 | set displayorder [lrange $displayorder 0 [expr {$r - 1}]] | |
| 1275 | set parentlist [lrange $parentlist 0 [expr {$r - 1}]] | |
| 1276 | } | |
| 1277 | foreach id $varccommits($curview,$a) { | |
| 1278 | lappend displayorder $id | |
| 1279 | lappend parentlist $parents($curview,$id) | |
| 1280 | } | |
| 17529cf9 | 1281 | } elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} { |
| 7fcc92bf PM |
1282 | set i $r |
| 1283 | foreach id $varccommits($curview,$a) { | |
| 1284 | lset displayorder $i $id | |
| 1285 | lset parentlist $i $parents($curview,$id) | |
| 1286 | incr i | |
| 1287 | } | |
| 1288 | } | |
| 1289 | incr r $al | |
| 1290 | } | |
| 1291 | } | |
| 1292 | ||
| 1293 | proc commitonrow {row} { | |
| 1294 | global displayorder | |
| 1295 | ||
| 1296 | set id [lindex $displayorder $row] | |
| 1297 | if {$id eq {}} { | |
| 1298 | make_disporder $row [expr {$row + 1}] | |
| 1299 | set id [lindex $displayorder $row] | |
| 1300 | } | |
| 1301 | return $id | |
| 1302 | } | |
| 1303 | ||
| 1304 | proc closevarcs {v} { | |
| 1305 | global varctok varccommits varcid parents children | |
| d375ef9b | 1306 | global cmitlisted commitidx vtokmod |
| 7fcc92bf PM |
1307 | |
| 1308 | set missing_parents 0 | |
| 1309 | set scripts {} | |
| 1310 | set narcs [llength $varctok($v)] | |
| 1311 | for {set a 1} {$a < $narcs} {incr a} { | |
| 1312 | set id [lindex $varccommits($v,$a) end] | |
| 1313 | foreach p $parents($v,$id) { | |
| 1314 | if {[info exists varcid($v,$p)]} continue | |
| 1315 | # add p as a new commit | |
| 1316 | incr missing_parents | |
| 1317 | set cmitlisted($v,$p) 0 | |
| 1318 | set parents($v,$p) {} | |
| 1319 | if {[llength $children($v,$p)] == 1 && | |
| 1320 | [llength $parents($v,$id)] == 1} { | |
| 1321 | set b $a | |
| 1322 | } else { | |
| 1323 | set b [newvarc $v $p] | |
| 1324 | } | |
| 1325 | set varcid($v,$p) $b | |
| 9257d8f7 PM |
1326 | if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} { |
| 1327 | modify_arc $v $b | |
| 7fcc92bf | 1328 | } |
| e5b37ac1 | 1329 | lappend varccommits($v,$b) $p |
| 7fcc92bf | 1330 | incr commitidx($v) |
| d375ef9b | 1331 | set scripts [check_interest $p $scripts] |
| 7fcc92bf PM |
1332 | } |
| 1333 | } | |
| 1334 | if {$missing_parents > 0} { | |
| 7fcc92bf PM |
1335 | foreach s $scripts { |
| 1336 | eval $s | |
| 1337 | } | |
| 1338 | } | |
| 1339 | } | |
| 1340 | ||
| f806f0fb PM |
1341 | # Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid |
| 1342 | # Assumes we already have an arc for $rwid. | |
| 1343 | proc rewrite_commit {v id rwid} { | |
| 1344 | global children parents varcid varctok vtokmod varccommits | |
| 1345 | ||
| 1346 | foreach ch $children($v,$id) { | |
| 1347 | # make $rwid be $ch's parent in place of $id | |
| 1348 | set i [lsearch -exact $parents($v,$ch) $id] | |
| 1349 | if {$i < 0} { | |
| 1350 | puts "oops rewrite_commit didn't find $id in parent list for $ch" | |
| 1351 | } | |
| 1352 | set parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid] | |
| 1353 | # add $ch to $rwid's children and sort the list if necessary | |
| 1354 | if {[llength [lappend children($v,$rwid) $ch]] > 1} { | |
| 1355 | set children($v,$rwid) [lsort -command [list vtokcmp $v] \ | |
| 1356 | $children($v,$rwid)] | |
| 1357 | } | |
| 1358 | # fix the graph after joining $id to $rwid | |
| 1359 | set a $varcid($v,$ch) | |
| 1360 | fix_reversal $rwid $a $v | |
| c9cfdc96 PM |
1361 | # parentlist is wrong for the last element of arc $a |
| 1362 | # even if displayorder is right, hence the 3rd arg here | |
| 1363 | modify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}] | |
| f806f0fb PM |
1364 | } |
| 1365 | } | |
| 1366 | ||
| d375ef9b PM |
1367 | # Mechanism for registering a command to be executed when we come |
| 1368 | # across a particular commit. To handle the case when only the | |
| 1369 | # prefix of the commit is known, the commitinterest array is now | |
| 1370 | # indexed by the first 4 characters of the ID. Each element is a | |
| 1371 | # list of id, cmd pairs. | |
| 1372 | proc interestedin {id cmd} { | |
| 1373 | global commitinterest | |
| 1374 | ||
| 1375 | lappend commitinterest([string range $id 0 3]) $id $cmd | |
| 1376 | } | |
| 1377 | ||
| 1378 | proc check_interest {id scripts} { | |
| 1379 | global commitinterest | |
| 1380 | ||
| 1381 | set prefix [string range $id 0 3] | |
| 1382 | if {[info exists commitinterest($prefix)]} { | |
| 1383 | set newlist {} | |
| 1384 | foreach {i script} $commitinterest($prefix) { | |
| 1385 | if {[string match "$i*" $id]} { | |
| 1386 | lappend scripts [string map [list "%I" $id "%P" $i] $script] | |
| 1387 | } else { | |
| 1388 | lappend newlist $i $script | |
| 1389 | } | |
| 1390 | } | |
| 1391 | if {$newlist ne {}} { | |
| 1392 | set commitinterest($prefix) $newlist | |
| 1393 | } else { | |
| 1394 | unset commitinterest($prefix) | |
| 1395 | } | |
| 1396 | } | |
| 1397 | return $scripts | |
| 1398 | } | |
| 1399 | ||
| f806f0fb | 1400 | proc getcommitlines {fd inst view updating} { |
| d375ef9b | 1401 | global cmitlisted leftover |
| 3ed31a81 | 1402 | global commitidx commitdata vdatemode |
| 7fcc92bf | 1403 | global parents children curview hlview |
| 468bcaed | 1404 | global idpending ordertok |
| 22387f23 | 1405 | global varccommits varcid varctok vtokmod vfilelimit vshortids |
| 9ccbdfbf | 1406 | |
| d1e46756 | 1407 | set stuff [read $fd 500000] |
| 005a2f4e | 1408 | # git log doesn't terminate the last commit with a null... |
| 7fcc92bf | 1409 | if {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} { |
| 005a2f4e PM |
1410 | set stuff "\0" |
| 1411 | } | |
| b490a991 | 1412 | if {$stuff == {}} { |
| 7eb3cb9c PM |
1413 | if {![eof $fd]} { |
| 1414 | return 1 | |
| 1415 | } | |
| 6df7403a | 1416 | global commfd viewcomplete viewactive viewname |
| 7fcc92bf PM |
1417 | global viewinstances |
| 1418 | unset commfd($inst) | |
| 1419 | set i [lsearch -exact $viewinstances($view) $inst] | |
| 1420 | if {$i >= 0} { | |
| 1421 | set viewinstances($view) [lreplace $viewinstances($view) $i $i] | |
| b0cdca99 | 1422 | } |
| f0654861 | 1423 | # set it blocking so we wait for the process to terminate |
| da7c24dd | 1424 | fconfigure $fd -blocking 1 |
| 098dd8a3 PM |
1425 | if {[catch {close $fd} err]} { |
| 1426 | set fv {} | |
| 1427 | if {$view != $curview} { | |
| 1428 | set fv " for the \"$viewname($view)\" view" | |
| da7c24dd | 1429 | } |
| 098dd8a3 PM |
1430 | if {[string range $err 0 4] == "usage"} { |
| 1431 | set err "Gitk: error reading commits$fv:\ | |
| f9e0b6fb | 1432 | bad arguments to git log." |
| 098dd8a3 PM |
1433 | if {$viewname($view) eq "Command line"} { |
| 1434 | append err \ | |
| f9e0b6fb | 1435 | " (Note: arguments to gitk are passed to git log\ |
| 098dd8a3 PM |
1436 | to allow selection of commits to be displayed.)" |
| 1437 | } | |
| 1438 | } else { | |
| 1439 | set err "Error reading commits$fv: $err" | |
| 1440 | } | |
| 1441 | error_popup $err | |
| 1d10f36d | 1442 | } |
| 7fcc92bf PM |
1443 | if {[incr viewactive($view) -1] <= 0} { |
| 1444 | set viewcomplete($view) 1 | |
| 1445 | # Check if we have seen any ids listed as parents that haven't | |
| 1446 | # appeared in the list | |
| 1447 | closevarcs $view | |
| 1448 | notbusy $view | |
| 7fcc92bf | 1449 | } |
| 098dd8a3 | 1450 | if {$view == $curview} { |
| ac1276ab | 1451 | run chewcommits |
| 9a40c50c | 1452 | } |
| 7eb3cb9c | 1453 | return 0 |
| 9a40c50c | 1454 | } |
| b490a991 | 1455 | set start 0 |
| 8f7d0cec | 1456 | set gotsome 0 |
| 7fcc92bf | 1457 | set scripts {} |
| b490a991 PM |
1458 | while 1 { |
| 1459 | set i [string first "\0" $stuff $start] | |
| 1460 | if {$i < 0} { | |
| 7fcc92bf | 1461 | append leftover($inst) [string range $stuff $start end] |
| 9f1afe05 | 1462 | break |
| 9ccbdfbf | 1463 | } |
| b490a991 | 1464 | if {$start == 0} { |
| 7fcc92bf | 1465 | set cmit $leftover($inst) |
| 8f7d0cec | 1466 | append cmit [string range $stuff 0 [expr {$i - 1}]] |
| 7fcc92bf | 1467 | set leftover($inst) {} |
| 8f7d0cec PM |
1468 | } else { |
| 1469 | set cmit [string range $stuff $start [expr {$i - 1}]] | |
| b490a991 PM |
1470 | } |
| 1471 | set start [expr {$i + 1}] | |
| e5ea701b PM |
1472 | set j [string first "\n" $cmit] |
| 1473 | set ok 0 | |
| 16c1ff96 | 1474 | set listed 1 |
| c961b228 PM |
1475 | if {$j >= 0 && [string match "commit *" $cmit]} { |
| 1476 | set ids [string range $cmit 7 [expr {$j - 1}]] | |
| 1407ade9 | 1477 | if {[string match {[-^<>]*} $ids]} { |
| c961b228 PM |
1478 | switch -- [string index $ids 0] { |
| 1479 | "-" {set listed 0} | |
| 1407ade9 LT |
1480 | "^" {set listed 2} |
| 1481 | "<" {set listed 3} | |
| 1482 | ">" {set listed 4} | |
| c961b228 | 1483 | } |
| 16c1ff96 PM |
1484 | set ids [string range $ids 1 end] |
| 1485 | } | |
| e5ea701b PM |
1486 | set ok 1 |
| 1487 | foreach id $ids { | |
| 8f7d0cec | 1488 | if {[string length $id] != 40} { |
| e5ea701b PM |
1489 | set ok 0 |
| 1490 | break | |
| 1491 | } | |
| 1492 | } | |
| 1493 | } | |
| 1494 | if {!$ok} { | |
| 7e952e79 PM |
1495 | set shortcmit $cmit |
| 1496 | if {[string length $shortcmit] > 80} { | |
| 1497 | set shortcmit "[string range $shortcmit 0 80]..." | |
| 1498 | } | |
| d990cedf | 1499 | error_popup "[mc "Can't parse git log output:"] {$shortcmit}" |
| b490a991 PM |
1500 | exit 1 |
| 1501 | } | |
| e5ea701b | 1502 | set id [lindex $ids 0] |
| 7fcc92bf | 1503 | set vid $view,$id |
| f806f0fb | 1504 | |
| 22387f23 PM |
1505 | lappend vshortids($view,[string range $id 0 3]) $id |
| 1506 | ||
| f806f0fb | 1507 | if {!$listed && $updating && ![info exists varcid($vid)] && |
| 3ed31a81 | 1508 | $vfilelimit($view) ne {}} { |
| f806f0fb PM |
1509 | # git log doesn't rewrite parents for unlisted commits |
| 1510 | # when doing path limiting, so work around that here | |
| 1511 | # by working out the rewritten parent with git rev-list | |
| 1512 | # and if we already know about it, using the rewritten | |
| 1513 | # parent as a substitute parent for $id's children. | |
| 1514 | if {![catch { | |
| 1515 | set rwid [exec git rev-list --first-parent --max-count=1 \ | |
| 3ed31a81 | 1516 | $id -- $vfilelimit($view)] |
| f806f0fb PM |
1517 | }]} { |
| 1518 | if {$rwid ne {} && [info exists varcid($view,$rwid)]} { | |
| 1519 | # use $rwid in place of $id | |
| 1520 | rewrite_commit $view $id $rwid | |
| 1521 | continue | |
| 1522 | } | |
| 1523 | } | |
| 1524 | } | |
| 1525 | ||
| f1bf4ee6 PM |
1526 | set a 0 |
| 1527 | if {[info exists varcid($vid)]} { | |
| 1528 | if {$cmitlisted($vid) || !$listed} continue | |
| 1529 | set a $varcid($vid) | |
| 1530 | } | |
| 16c1ff96 PM |
1531 | if {$listed} { |
| 1532 | set olds [lrange $ids 1 end] | |
| 16c1ff96 PM |
1533 | } else { |
| 1534 | set olds {} | |
| 1535 | } | |
| f7a3e8d2 | 1536 | set commitdata($id) [string range $cmit [expr {$j + 1}] end] |
| 7fcc92bf PM |
1537 | set cmitlisted($vid) $listed |
| 1538 | set parents($vid) $olds | |
| 7fcc92bf PM |
1539 | if {![info exists children($vid)]} { |
| 1540 | set children($vid) {} | |
| f1bf4ee6 | 1541 | } elseif {$a == 0 && [llength $children($vid)] == 1} { |
| f3ea5ede PM |
1542 | set k [lindex $children($vid) 0] |
| 1543 | if {[llength $parents($view,$k)] == 1 && | |
| 3ed31a81 | 1544 | (!$vdatemode($view) || |
| f3ea5ede PM |
1545 | $varcid($view,$k) == [llength $varctok($view)] - 1)} { |
| 1546 | set a $varcid($view,$k) | |
| 7fcc92bf | 1547 | } |
| da7c24dd | 1548 | } |
| 7fcc92bf PM |
1549 | if {$a == 0} { |
| 1550 | # new arc | |
| 1551 | set a [newvarc $view $id] | |
| 1552 | } | |
| e5b37ac1 PM |
1553 | if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} { |
| 1554 | modify_arc $view $a | |
| 1555 | } | |
| f1bf4ee6 PM |
1556 | if {![info exists varcid($vid)]} { |
| 1557 | set varcid($vid) $a | |
| 1558 | lappend varccommits($view,$a) $id | |
| 1559 | incr commitidx($view) | |
| 1560 | } | |
| e5b37ac1 | 1561 | |
| 7fcc92bf PM |
1562 | set i 0 |
| 1563 | foreach p $olds { | |
| 1564 | if {$i == 0 || [lsearch -exact $olds $p] >= $i} { | |
| 1565 | set vp $view,$p | |
| 1566 | if {[llength [lappend children($vp) $id]] > 1 && | |
| 1567 | [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} { | |
| 1568 | set children($vp) [lsort -command [list vtokcmp $view] \ | |
| 1569 | $children($vp)] | |
| 9257d8f7 | 1570 | catch {unset ordertok} |
| 7fcc92bf | 1571 | } |
| f3ea5ede PM |
1572 | if {[info exists varcid($view,$p)]} { |
| 1573 | fix_reversal $p $a $view | |
| 1574 | } | |
| 7fcc92bf PM |
1575 | } |
| 1576 | incr i | |
| 1577 | } | |
| 7fcc92bf | 1578 | |
| d375ef9b | 1579 | set scripts [check_interest $id $scripts] |
| 8f7d0cec PM |
1580 | set gotsome 1 |
| 1581 | } | |
| 1582 | if {$gotsome} { | |
| ac1276ab PM |
1583 | global numcommits hlview |
| 1584 | ||
| 1585 | if {$view == $curview} { | |
| 1586 | set numcommits $commitidx($view) | |
| 1587 | run chewcommits | |
| 1588 | } | |
| 1589 | if {[info exists hlview] && $view == $hlview} { | |
| 1590 | # we never actually get here... | |
| 1591 | run vhighlightmore | |
| 1592 | } | |
| 7fcc92bf PM |
1593 | foreach s $scripts { |
| 1594 | eval $s | |
| 1595 | } | |
| 9ccbdfbf | 1596 | } |
| 7eb3cb9c | 1597 | return 2 |
| 9ccbdfbf PM |
1598 | } |
| 1599 | ||
| ac1276ab | 1600 | proc chewcommits {} { |
| f5f3c2e2 | 1601 | global curview hlview viewcomplete |
| 7fcc92bf | 1602 | global pending_select |
| 7eb3cb9c | 1603 | |
| ac1276ab PM |
1604 | layoutmore |
| 1605 | if {$viewcomplete($curview)} { | |
| 1606 | global commitidx varctok | |
| 1607 | global numcommits startmsecs | |
| ac1276ab PM |
1608 | |
| 1609 | if {[info exists pending_select]} { | |
| 835e62ae AG |
1610 | update |
| 1611 | reset_pending_select {} | |
| 1612 | ||
| 1613 | if {[commitinview $pending_select $curview]} { | |
| 1614 | selectline [rowofcommit $pending_select] 1 | |
| 1615 | } else { | |
| 1616 | set row [first_real_row] | |
| 1617 | selectline $row 1 | |
| 1618 | } | |
| 7eb3cb9c | 1619 | } |
| ac1276ab PM |
1620 | if {$commitidx($curview) > 0} { |
| 1621 | #set ms [expr {[clock clicks -milliseconds] - $startmsecs}] | |
| 1622 | #puts "overall $ms ms for $numcommits commits" | |
| 1623 | #puts "[llength $varctok($view)] arcs, $commitidx($view) commits" | |
| 1624 | } else { | |
| 1625 | show_status [mc "No commits selected"] | |
| 1626 | } | |
| 1627 | notbusy layout | |
| b664550c | 1628 | } |
| f5f3c2e2 | 1629 | return 0 |
| 1db95b00 PM |
1630 | } |
| 1631 | ||
| 590915da AG |
1632 | proc do_readcommit {id} { |
| 1633 | global tclencoding | |
| 1634 | ||
| 1635 | # Invoke git-log to handle automatic encoding conversion | |
| 1636 | set fd [open [concat | git log --no-color --pretty=raw -1 $id] r] | |
| 1637 | # Read the results using i18n.logoutputencoding | |
| 1638 | fconfigure $fd -translation lf -eofchar {} | |
| 1639 | if {$tclencoding != {}} { | |
| 1640 | fconfigure $fd -encoding $tclencoding | |
| 1641 | } | |
| 1642 | set contents [read $fd] | |
| 1643 | close $fd | |
| 1644 | # Remove the heading line | |
| 1645 | regsub {^commit [0-9a-f]+\n} $contents {} contents | |
| 1646 | ||
| 1647 | return $contents | |
| 1648 | } | |
| 1649 | ||
| 1db95b00 | 1650 | proc readcommit {id} { |
| 590915da AG |
1651 | if {[catch {set contents [do_readcommit $id]}]} return |
| 1652 | parsecommit $id $contents 1 | |
| b490a991 PM |
1653 | } |
| 1654 | ||
| 8f7d0cec | 1655 | proc parsecommit {id contents listed} { |
| ef73896b | 1656 | global commitinfo |
| b5c2f306 SV |
1657 | |
| 1658 | set inhdr 1 | |
| 1659 | set comment {} | |
| 1660 | set headline {} | |
| 1661 | set auname {} | |
| 1662 | set audate {} | |
| 1663 | set comname {} | |
| 1664 | set comdate {} | |
| 232475d3 PM |
1665 | set hdrend [string first "\n\n" $contents] |
| 1666 | if {$hdrend < 0} { | |
| 1667 | # should never happen... | |
| 1668 | set hdrend [string length $contents] | |
| 1669 | } | |
| 1670 | set header [string range $contents 0 [expr {$hdrend - 1}]] | |
| 1671 | set comment [string range $contents [expr {$hdrend + 2}] end] | |
| 1672 | foreach line [split $header "\n"] { | |
| 61f57cb0 | 1673 | set line [split $line " "] |
| 232475d3 PM |
1674 | set tag [lindex $line 0] |
| 1675 | if {$tag == "author"} { | |
| f5974d97 | 1676 | set audate [lrange $line end-1 end] |
| 61f57cb0 | 1677 | set auname [join [lrange $line 1 end-2] " "] |
| 232475d3 | 1678 | } elseif {$tag == "committer"} { |
| f5974d97 | 1679 | set comdate [lrange $line end-1 end] |
| 61f57cb0 | 1680 | set comname [join [lrange $line 1 end-2] " "] |
| 1db95b00 PM |
1681 | } |
| 1682 | } | |
| 232475d3 | 1683 | set headline {} |
| 43c25074 PM |
1684 | # take the first non-blank line of the comment as the headline |
| 1685 | set headline [string trimleft $comment] | |
| 1686 | set i [string first "\n" $headline] | |
| 232475d3 | 1687 | if {$i >= 0} { |
| 43c25074 PM |
1688 | set headline [string range $headline 0 $i] |
| 1689 | } | |
| 1690 | set headline [string trimright $headline] | |
| 1691 | set i [string first "\r" $headline] | |
| 1692 | if {$i >= 0} { | |
| 1693 | set headline [string trimright [string range $headline 0 $i]] | |
| 232475d3 PM |
1694 | } |
| 1695 | if {!$listed} { | |
| f9e0b6fb | 1696 | # git log indents the comment by 4 spaces; |
| 8974c6f9 | 1697 | # if we got this via git cat-file, add the indentation |
| 232475d3 PM |
1698 | set newcomment {} |
| 1699 | foreach line [split $comment "\n"] { | |
| 1700 | append newcomment " " | |
| 1701 | append newcomment $line | |
| f6e2869f | 1702 | append newcomment "\n" |
| 232475d3 PM |
1703 | } |
| 1704 | set comment $newcomment | |
| 1db95b00 | 1705 | } |
| 36242490 | 1706 | set hasnote [string first "\nNotes:\n" $contents] |
| e5c2d856 | 1707 | set commitinfo($id) [list $headline $auname $audate \ |
| 36242490 | 1708 | $comname $comdate $comment $hasnote] |
| 1db95b00 PM |
1709 | } |
| 1710 | ||
| f7a3e8d2 | 1711 | proc getcommit {id} { |
| 79b2c75e | 1712 | global commitdata commitinfo |
| 8ed16484 | 1713 | |
| f7a3e8d2 PM |
1714 | if {[info exists commitdata($id)]} { |
| 1715 | parsecommit $id $commitdata($id) 1 | |
| 8ed16484 PM |
1716 | } else { |
| 1717 | readcommit $id | |
| 1718 | if {![info exists commitinfo($id)]} { | |
| d990cedf | 1719 | set commitinfo($id) [list [mc "No commit information available"]] |
| 8ed16484 PM |
1720 | } |
| 1721 | } | |
| 1722 | return 1 | |
| 1723 | } | |
| 1724 | ||
| d375ef9b PM |
1725 | # Expand an abbreviated commit ID to a list of full 40-char IDs that match |
| 1726 | # and are present in the current view. | |
| 1727 | # This is fairly slow... | |
| 1728 | proc longid {prefix} { | |
| 22387f23 | 1729 | global varcid curview vshortids |
| d375ef9b PM |
1730 | |
| 1731 | set ids {} | |
| 22387f23 PM |
1732 | if {[string length $prefix] >= 4} { |
| 1733 | set vshortid $curview,[string range $prefix 0 3] | |
| 1734 | if {[info exists vshortids($vshortid)]} { | |
| 1735 | foreach id $vshortids($vshortid) { | |
| 1736 | if {[string match "$prefix*" $id]} { | |
| 1737 | if {[lsearch -exact $ids $id] < 0} { | |
| 1738 | lappend ids $id | |
| 1739 | if {[llength $ids] >= 2} break | |
| 1740 | } | |
| 1741 | } | |
| 1742 | } | |
| 1743 | } | |
| 1744 | } else { | |
| 1745 | foreach match [array names varcid "$curview,$prefix*"] { | |
| 1746 | lappend ids [lindex [split $match ","] 1] | |
| 1747 | if {[llength $ids] >= 2} break | |
| 1748 | } | |
| d375ef9b PM |
1749 | } |
| 1750 | return $ids | |
| 1751 | } | |
| 1752 | ||
| 887fe3c4 | 1753 | proc readrefs {} { |
| 62d3ea65 | 1754 | global tagids idtags headids idheads tagobjid |
| 219ea3a9 | 1755 | global otherrefids idotherrefs mainhead mainheadid |
| 39816d60 | 1756 | global selecthead selectheadid |
| ffe15297 | 1757 | global hideremotes |
| 106288cb | 1758 | |
| b5c2f306 SV |
1759 | foreach v {tagids idtags headids idheads otherrefids idotherrefs} { |
| 1760 | catch {unset $v} | |
| 1761 | } | |
| 62d3ea65 PM |
1762 | set refd [open [list | git show-ref -d] r] |
| 1763 | while {[gets $refd line] >= 0} { | |
| 1764 | if {[string index $line 40] ne " "} continue | |
| 1765 | set id [string range $line 0 39] | |
| 1766 | set ref [string range $line 41 end] | |
| 1767 | if {![string match "refs/*" $ref]} continue | |
| 1768 | set name [string range $ref 5 end] | |
| 1769 | if {[string match "remotes/*" $name]} { | |
| ffe15297 | 1770 | if {![string match "*/HEAD" $name] && !$hideremotes} { |
| 62d3ea65 PM |
1771 | set headids($name) $id |
| 1772 | lappend idheads($id) $name | |
| f1d83ba3 | 1773 | } |
| 62d3ea65 PM |
1774 | } elseif {[string match "heads/*" $name]} { |
| 1775 | set name [string range $name 6 end] | |
| 36a7cad6 JH |
1776 | set headids($name) $id |
| 1777 | lappend idheads($id) $name | |
| 62d3ea65 PM |
1778 | } elseif {[string match "tags/*" $name]} { |
| 1779 | # this lets refs/tags/foo^{} overwrite refs/tags/foo, | |
| 1780 | # which is what we want since the former is the commit ID | |
| 1781 | set name [string range $name 5 end] | |
| 1782 | if {[string match "*^{}" $name]} { | |
| 1783 | set name [string range $name 0 end-3] | |
| 1784 | } else { | |
| 1785 | set tagobjid($name) $id | |
| 1786 | } | |
| 1787 | set tagids($name) $id | |
| 1788 | lappend idtags($id) $name | |
| 36a7cad6 JH |
1789 | } else { |
| 1790 | set otherrefids($name) $id | |
| 1791 | lappend idotherrefs($id) $name | |
| f1d83ba3 PM |
1792 | } |
| 1793 | } | |
| 062d671f | 1794 | catch {close $refd} |
| 8a48571c | 1795 | set mainhead {} |
| 219ea3a9 | 1796 | set mainheadid {} |
| 8a48571c | 1797 | catch { |
| c11ff120 | 1798 | set mainheadid [exec git rev-parse HEAD] |
| 8a48571c PM |
1799 | set thehead [exec git symbolic-ref HEAD] |
| 1800 | if {[string match "refs/heads/*" $thehead]} { | |
| 1801 | set mainhead [string range $thehead 11 end] | |
| 1802 | } | |
| 1803 | } | |
| 39816d60 AG |
1804 | set selectheadid {} |
| 1805 | if {$selecthead ne {}} { | |
| 1806 | catch { | |
| 1807 | set selectheadid [exec git rev-parse --verify $selecthead] | |
| 1808 | } | |
| 1809 | } | |
| 887fe3c4 PM |
1810 | } |
| 1811 | ||
| 8f489363 PM |
1812 | # skip over fake commits |
| 1813 | proc first_real_row {} { | |
| 7fcc92bf | 1814 | global nullid nullid2 numcommits |
| 8f489363 PM |
1815 | |
| 1816 | for {set row 0} {$row < $numcommits} {incr row} { | |
| 7fcc92bf | 1817 | set id [commitonrow $row] |
| 8f489363 PM |
1818 | if {$id ne $nullid && $id ne $nullid2} { |
| 1819 | break | |
| 1820 | } | |
| 1821 | } | |
| 1822 | return $row | |
| 1823 | } | |
| 1824 | ||
| e11f1233 PM |
1825 | # update things for a head moved to a child of its previous location |
| 1826 | proc movehead {id name} { | |
| 1827 | global headids idheads | |
| 1828 | ||
| 1829 | removehead $headids($name) $name | |
| 1830 | set headids($name) $id | |
| 1831 | lappend idheads($id) $name | |
| 1832 | } | |
| 1833 | ||
| 1834 | # update things when a head has been removed | |
| 1835 | proc removehead {id name} { | |
| 1836 | global headids idheads | |
| 1837 | ||
| 1838 | if {$idheads($id) eq $name} { | |
| 1839 | unset idheads($id) | |
| 1840 | } else { | |
| 1841 | set i [lsearch -exact $idheads($id) $name] | |
| 1842 | if {$i >= 0} { | |
| 1843 | set idheads($id) [lreplace $idheads($id) $i $i] | |
| 1844 | } | |
| 1845 | } | |
| 1846 | unset headids($name) | |
| 1847 | } | |
| 1848 | ||
| d93f1713 PT |
1849 | proc ttk_toplevel {w args} { |
| 1850 | global use_ttk | |
| 1851 | eval [linsert $args 0 ::toplevel $w] | |
| 1852 | if {$use_ttk} { | |
| 1853 | place [ttk::frame $w._toplevel_background] -x 0 -y 0 -relwidth 1 -relheight 1 | |
| 1854 | } | |
| 1855 | return $w | |
| 1856 | } | |
| 1857 | ||
| e7d64008 AG |
1858 | proc make_transient {window origin} { |
| 1859 | global have_tk85 | |
| 1860 | ||
| 1861 | # In MacOS Tk 8.4 transient appears to work by setting | |
| 1862 | # overrideredirect, which is utterly useless, since the | |
| 1863 | # windows get no border, and are not even kept above | |
| 1864 | # the parent. | |
| 1865 | if {!$have_tk85 && [tk windowingsystem] eq {aqua}} return | |
| 1866 | ||
| 1867 | wm transient $window $origin | |
| 1868 | ||
| 1869 | # Windows fails to place transient windows normally, so | |
| 1870 | # schedule a callback to center them on the parent. | |
| 1871 | if {[tk windowingsystem] eq {win32}} { | |
| 1872 | after idle [list tk::PlaceWindow $window widget $origin] | |
| 1873 | } | |
| 1874 | } | |
| 1875 | ||
| 8d849957 | 1876 | proc show_error {w top msg {mc mc}} { |
| d93f1713 | 1877 | global NS |
| 3cb1f9c9 | 1878 | if {![info exists NS]} {set NS ""} |
| d93f1713 | 1879 | if {[wm state $top] eq "withdrawn"} { wm deiconify $top } |
| df3d83b1 PM |
1880 | message $w.m -text $msg -justify center -aspect 400 |
| 1881 | pack $w.m -side top -fill x -padx 20 -pady 20 | |
| 7a0ebbf8 | 1882 | ${NS}::button $w.ok -default active -text [$mc OK] -command "destroy $top" |
| df3d83b1 | 1883 | pack $w.ok -side bottom -fill x |
| e54be9e3 PM |
1884 | bind $top <Visibility> "grab $top; focus $top" |
| 1885 | bind $top <Key-Return> "destroy $top" | |
| 76f15947 AG |
1886 | bind $top <Key-space> "destroy $top" |
| 1887 | bind $top <Key-Escape> "destroy $top" | |
| e54be9e3 | 1888 | tkwait window $top |
| df3d83b1 PM |
1889 | } |
| 1890 | ||
| 84a76f18 | 1891 | proc error_popup {msg {owner .}} { |
| d93f1713 PT |
1892 | if {[tk windowingsystem] eq "win32"} { |
| 1893 | tk_messageBox -icon error -type ok -title [wm title .] \ | |
| 1894 | -parent $owner -message $msg | |
| 1895 | } else { | |
| 1896 | set w .error | |
| 1897 | ttk_toplevel $w | |
| 1898 | make_transient $w $owner | |
| 1899 | show_error $w $w $msg | |
| 1900 | } | |
| 098dd8a3 PM |
1901 | } |
| 1902 | ||
| 84a76f18 | 1903 | proc confirm_popup {msg {owner .}} { |
| d93f1713 | 1904 | global confirm_ok NS |
| 10299152 PM |
1905 | set confirm_ok 0 |
| 1906 | set w .confirm | |
| d93f1713 | 1907 | ttk_toplevel $w |
| e7d64008 | 1908 | make_transient $w $owner |
| 10299152 PM |
1909 | message $w.m -text $msg -justify center -aspect 400 |
| 1910 | pack $w.m -side top -fill x -padx 20 -pady 20 | |
| d93f1713 | 1911 | ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w" |
| 10299152 | 1912 | pack $w.ok -side left -fill x |
| d93f1713 | 1913 | ${NS}::button $w.cancel -text [mc Cancel] -command "destroy $w" |
| 10299152 PM |
1914 | pack $w.cancel -side right -fill x |
| 1915 | bind $w <Visibility> "grab $w; focus $w" | |
| 76f15947 AG |
1916 | bind $w <Key-Return> "set confirm_ok 1; destroy $w" |
| 1917 | bind $w <Key-space> "set confirm_ok 1; destroy $w" | |
| 1918 | bind $w <Key-Escape> "destroy $w" | |
| d93f1713 | 1919 | tk::PlaceWindow $w widget $owner |
| 10299152 PM |
1920 | tkwait window $w |
| 1921 | return $confirm_ok | |
| 1922 | } | |
| 1923 | ||
| b039f0a6 | 1924 | proc setoptions {} { |
| d93f1713 PT |
1925 | if {[tk windowingsystem] ne "win32"} { |
| 1926 | option add *Panedwindow.showHandle 1 startupFile | |
| 1927 | option add *Panedwindow.sashRelief raised startupFile | |
| 1928 | if {[tk windowingsystem] ne "aqua"} { | |
| 1929 | option add *Menu.font uifont startupFile | |
| 1930 | } | |
| 1931 | } else { | |
| 1932 | option add *Menu.TearOff 0 startupFile | |
| 1933 | } | |
| b039f0a6 PM |
1934 | option add *Button.font uifont startupFile |
| 1935 | option add *Checkbutton.font uifont startupFile | |
| 1936 | option add *Radiobutton.font uifont startupFile | |
| b039f0a6 PM |
1937 | option add *Menubutton.font uifont startupFile |
| 1938 | option add *Label.font uifont startupFile | |
| 1939 | option add *Message.font uifont startupFile | |
| b9b142ff MH |
1940 | option add *Entry.font textfont startupFile |
| 1941 | option add *Text.font textfont startupFile | |
| d93f1713 | 1942 | option add *Labelframe.font uifont startupFile |
| 0933b04e | 1943 | option add *Spinbox.font textfont startupFile |
| 207ad7b8 | 1944 | option add *Listbox.font mainfont startupFile |
| b039f0a6 PM |
1945 | } |
| 1946 | ||
| 79056034 PM |
1947 | # Make a menu and submenus. |
| 1948 | # m is the window name for the menu, items is the list of menu items to add. | |
| 1949 | # Each item is a list {mc label type description options...} | |
| 1950 | # mc is ignored; it's so we can put mc there to alert xgettext | |
| 1951 | # label is the string that appears in the menu | |
| 1952 | # type is cascade, command or radiobutton (should add checkbutton) | |
| 1953 | # description depends on type; it's the sublist for cascade, the | |
| 1954 | # command to invoke for command, or {variable value} for radiobutton | |
| f2d0bbbd PM |
1955 | proc makemenu {m items} { |
| 1956 | menu $m | |
| cea07cf8 AG |
1957 | if {[tk windowingsystem] eq {aqua}} { |
| 1958 | set Meta1 Cmd | |
| 1959 | } else { | |
| 1960 | set Meta1 Ctrl | |
| 1961 | } | |
| f2d0bbbd | 1962 | foreach i $items { |
| 79056034 PM |
1963 | set name [mc [lindex $i 1]] |
| 1964 | set type [lindex $i 2] | |
| 1965 | set thing [lindex $i 3] | |
| f2d0bbbd PM |
1966 | set params [list $type] |
| 1967 | if {$name ne {}} { | |
| 1968 | set u [string first "&" [string map {&& x} $name]] | |
| 1969 | lappend params -label [string map {&& & & {}} $name] | |
| 1970 | if {$u >= 0} { | |
| 1971 | lappend params -underline $u | |
| 1972 | } | |
| 1973 | } | |
| 1974 | switch -- $type { | |
| 1975 | "cascade" { | |
| 79056034 | 1976 | set submenu [string tolower [string map {& ""} [lindex $i 1]]] |
| f2d0bbbd PM |
1977 | lappend params -menu $m.$submenu |
| 1978 | } | |
| 1979 | "command" { | |
| 1980 | lappend params -command $thing | |
| 1981 | } | |
| 1982 | "radiobutton" { | |
| 1983 | lappend params -variable [lindex $thing 0] \ | |
| 1984 | -value [lindex $thing 1] | |
| 1985 | } | |
| 1986 | } | |
| cea07cf8 AG |
1987 | set tail [lrange $i 4 end] |
| 1988 | regsub -all {\yMeta1\y} $tail $Meta1 tail | |
| 1989 | eval $m add $params $tail | |
| f2d0bbbd PM |
1990 | if {$type eq "cascade"} { |
| 1991 | makemenu $m.$submenu $thing | |
| 1992 | } | |
| 1993 | } | |
| 1994 | } | |
| 1995 | ||
| 1996 | # translate string and remove ampersands | |
| 1997 | proc mca {str} { | |
| 1998 | return [string map {&& & & {}} [mc $str]] | |
| 1999 | } | |
| 2000 | ||
| 39c12691 PM |
2001 | proc cleardropsel {w} { |
| 2002 | $w selection clear | |
| 2003 | } | |
| d93f1713 PT |
2004 | proc makedroplist {w varname args} { |
| 2005 | global use_ttk | |
| 2006 | if {$use_ttk} { | |
| 3cb1f9c9 PT |
2007 | set width 0 |
| 2008 | foreach label $args { | |
| 2009 | set cx [string length $label] | |
| 2010 | if {$cx > $width} {set width $cx} | |
| 2011 | } | |
| 2012 | set gm [ttk::combobox $w -width $width -state readonly\ | |
| 39c12691 PM |
2013 | -textvariable $varname -values $args \ |
| 2014 | -exportselection false] | |
| 2015 | bind $gm <<ComboboxSelected>> [list $gm selection clear] | |
| d93f1713 PT |
2016 | } else { |
| 2017 | set gm [eval [linsert $args 0 tk_optionMenu $w $varname]] | |
| 2018 | } | |
| 2019 | return $gm | |
| 2020 | } | |
| 2021 | ||
| d94f8cd6 | 2022 | proc makewindow {} { |
| 31c0eaa8 | 2023 | global canv canv2 canv3 linespc charspc ctext cflist cscroll |
| 9c311b32 | 2024 | global tabstop |
| b74fd579 | 2025 | global findtype findtypemenu findloc findstring fstring geometry |
| 887fe3c4 | 2026 | global entries sha1entry sha1string sha1but |
| 890fae70 | 2027 | global diffcontextstring diffcontext |
| b9b86007 | 2028 | global ignorespace |
| 94a2eede | 2029 | global maincursor textcursor curtextcursor |
| 219ea3a9 | 2030 | global rowctxmenu fakerowmenu mergemax wrapcomment |
| 60f7a7dc | 2031 | global highlight_files gdttype |
| 3ea06f9f | 2032 | global searchstring sstring |
| 60378c0c | 2033 | global bgcolor fgcolor bglist fglist diffcolors selectbgcolor |
| 252c52df GÖ |
2034 | global uifgcolor uifgdisabledcolor |
| 2035 | global filesepbgcolor filesepfgcolor | |
| 2036 | global mergecolors foundbgcolor currentsearchhitbgcolor | |
| bb3edc8b PM |
2037 | global headctxmenu progresscanv progressitem progresscoords statusw |
| 2038 | global fprogitem fprogcoord lastprogupdate progupdatepending | |
| 6df7403a | 2039 | global rprogitem rprogcoord rownumsel numcommits |
| d93f1713 | 2040 | global have_tk85 use_ttk NS |
| ae4e3ff9 TR |
2041 | global git_version |
| 2042 | global worddiff | |
| 9a40c50c | 2043 | |
| 79056034 PM |
2044 | # The "mc" arguments here are purely so that xgettext |
| 2045 | # sees the following string as needing to be translated | |
| 5fdcbb13 DS |
2046 | set file { |
| 2047 | mc "File" cascade { | |
| 79056034 | 2048 | {mc "Update" command updatecommits -accelerator F5} |
| a135f214 | 2049 | {mc "Reload" command reloadcommits -accelerator Shift-F5} |
| 79056034 | 2050 | {mc "Reread references" command rereadrefs} |
| cea07cf8 | 2051 | {mc "List references" command showrefs -accelerator F2} |
| 7fb0abb1 AG |
2052 | {xx "" separator} |
| 2053 | {mc "Start git gui" command {exec git gui &}} | |
| 2054 | {xx "" separator} | |
| cea07cf8 | 2055 | {mc "Quit" command doquit -accelerator Meta1-Q} |
| f2d0bbbd | 2056 | }} |
| 5fdcbb13 DS |
2057 | set edit { |
| 2058 | mc "Edit" cascade { | |
| 79056034 | 2059 | {mc "Preferences" command doprefs} |
| f2d0bbbd | 2060 | }} |
| 5fdcbb13 DS |
2061 | set view { |
| 2062 | mc "View" cascade { | |
| cea07cf8 AG |
2063 | {mc "New view..." command {newview 0} -accelerator Shift-F4} |
| 2064 | {mc "Edit view..." command editview -state disabled -accelerator F4} | |
| 79056034 PM |
2065 | {mc "Delete view" command delview -state disabled} |
| 2066 | {xx "" separator} | |
| 2067 | {mc "All files" radiobutton {selectedview 0} -command {showview 0}} | |
| f2d0bbbd | 2068 | }} |
| 5fdcbb13 DS |
2069 | if {[tk windowingsystem] ne "aqua"} { |
| 2070 | set help { | |
| 2071 | mc "Help" cascade { | |
| 2072 | {mc "About gitk" command about} | |
| 2073 | {mc "Key bindings" command keys} | |
| 2074 | }} | |
| 2075 | set bar [list $file $edit $view $help] | |
| 2076 | } else { | |
| 2077 | proc ::tk::mac::ShowPreferences {} {doprefs} | |
| 2078 | proc ::tk::mac::Quit {} {doquit} | |
| 2079 | lset file end [lreplace [lindex $file end] end-1 end] | |
| 2080 | set apple { | |
| 2081 | xx "Apple" cascade { | |
| 79056034 | 2082 | {mc "About gitk" command about} |
| 5fdcbb13 DS |
2083 | {xx "" separator} |
| 2084 | }} | |
| 2085 | set help { | |
| 2086 | mc "Help" cascade { | |
| 79056034 | 2087 | {mc "Key bindings" command keys} |
| f2d0bbbd | 2088 | }} |
| 5fdcbb13 | 2089 | set bar [list $apple $file $view $help] |
| f2d0bbbd | 2090 | } |
| 5fdcbb13 | 2091 | makemenu .bar $bar |
| 9a40c50c PM |
2092 | . configure -menu .bar |
| 2093 | ||
| d93f1713 PT |
2094 | if {$use_ttk} { |
| 2095 | # cover the non-themed toplevel with a themed frame. | |
| 2096 | place [ttk::frame ._main_background] -x 0 -y 0 -relwidth 1 -relheight 1 | |
| 2097 | } | |
| 2098 | ||
| e9937d2a | 2099 | # the gui has upper and lower half, parts of a paned window. |
| d93f1713 | 2100 | ${NS}::panedwindow .ctop -orient vertical |
| e9937d2a JH |
2101 | |
| 2102 | # possibly use assumed geometry | |
| 9ca72f4f | 2103 | if {![info exists geometry(pwsash0)]} { |
| e9937d2a JH |
2104 | set geometry(topheight) [expr {15 * $linespc}] |
| 2105 | set geometry(topwidth) [expr {80 * $charspc}] | |
| 2106 | set geometry(botheight) [expr {15 * $linespc}] | |
| 2107 | set geometry(botwidth) [expr {50 * $charspc}] | |
| d93f1713 PT |
2108 | set geometry(pwsash0) [list [expr {40 * $charspc}] 2] |
| 2109 | set geometry(pwsash1) [list [expr {60 * $charspc}] 2] | |
| e9937d2a JH |
2110 | } |
| 2111 | ||
| 2112 | # the upper half will have a paned window, a scroll bar to the right, and some stuff below | |
| d93f1713 PT |
2113 | ${NS}::frame .tf -height $geometry(topheight) -width $geometry(topwidth) |
| 2114 | ${NS}::frame .tf.histframe | |
| 2115 | ${NS}::panedwindow .tf.histframe.pwclist -orient horizontal | |
| 2116 | if {!$use_ttk} { | |
| 2117 | .tf.histframe.pwclist configure -sashpad 0 -handlesize 4 | |
| 2118 | } | |
| e9937d2a JH |
2119 | |
| 2120 | # create three canvases | |
| 2121 | set cscroll .tf.histframe.csb | |
| 2122 | set canv .tf.histframe.pwclist.canv | |
| 9ca72f4f | 2123 | canvas $canv \ |
| 60378c0c | 2124 | -selectbackground $selectbgcolor \ |
| f8a2c0d1 | 2125 | -background $bgcolor -bd 0 \ |
| 9f1afe05 | 2126 | -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll" |
| e9937d2a JH |
2127 | .tf.histframe.pwclist add $canv |
| 2128 | set canv2 .tf.histframe.pwclist.canv2 | |
| 9ca72f4f | 2129 | canvas $canv2 \ |
| 60378c0c | 2130 | -selectbackground $selectbgcolor \ |
| f8a2c0d1 | 2131 | -background $bgcolor -bd 0 -yscrollincr $linespc |
| e9937d2a JH |
2132 | .tf.histframe.pwclist add $canv2 |
| 2133 | set canv3 .tf.histframe.pwclist.canv3 | |
| 9ca72f4f | 2134 | canvas $canv3 \ |
| 60378c0c | 2135 | -selectbackground $selectbgcolor \ |
| f8a2c0d1 | 2136 | -background $bgcolor -bd 0 -yscrollincr $linespc |
| e9937d2a | 2137 | .tf.histframe.pwclist add $canv3 |
| d93f1713 PT |
2138 | if {$use_ttk} { |
| 2139 | bind .tf.histframe.pwclist <Map> { | |
| 2140 | bind %W <Map> {} | |
| 2141 | .tf.histframe.pwclist sashpos 1 [lindex $::geometry(pwsash1) 0] | |
| 2142 | .tf.histframe.pwclist sashpos 0 [lindex $::geometry(pwsash0) 0] | |
| 2143 | } | |
| 2144 | } else { | |
| 2145 | eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0) | |
| 2146 | eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1) | |
| 2147 | } | |
| e9937d2a JH |
2148 | |
| 2149 | # a scroll bar to rule them | |
| d93f1713 PT |
2150 | ${NS}::scrollbar $cscroll -command {allcanvs yview} |
| 2151 | if {!$use_ttk} {$cscroll configure -highlightthickness 0} | |
| e9937d2a JH |
2152 | pack $cscroll -side right -fill y |
| 2153 | bind .tf.histframe.pwclist <Configure> {resizeclistpanes %W %w} | |
| f8a2c0d1 | 2154 | lappend bglist $canv $canv2 $canv3 |
| e9937d2a | 2155 | pack .tf.histframe.pwclist -fill both -expand 1 -side left |
| 98f350e5 | 2156 | |
| e9937d2a | 2157 | # we have two button bars at bottom of top frame. Bar 1 |
| d93f1713 PT |
2158 | ${NS}::frame .tf.bar |
| 2159 | ${NS}::frame .tf.lbar -height 15 | |
| e9937d2a JH |
2160 | |
| 2161 | set sha1entry .tf.bar.sha1 | |
| 887fe3c4 | 2162 | set entries $sha1entry |
| e9937d2a | 2163 | set sha1but .tf.bar.sha1label |
| 0359ba72 | 2164 | button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \ |
| b039f0a6 | 2165 | -command gotocommit -width 8 |
| 887fe3c4 | 2166 | $sha1but conf -disabledforeground [$sha1but cget -foreground] |
| e9937d2a | 2167 | pack .tf.bar.sha1label -side left |
| d93f1713 | 2168 | ${NS}::entry $sha1entry -width 40 -font textfont -textvariable sha1string |
| 887fe3c4 | 2169 | trace add variable sha1string write sha1change |
| 98f350e5 | 2170 | pack $sha1entry -side left -pady 2 |
| d698206c | 2171 | |
| f062e50f | 2172 | set bm_left_data { |
| d698206c PM |
2173 | #define left_width 16 |
| 2174 | #define left_height 16 | |
| 2175 | static unsigned char left_bits[] = { | |
| 2176 | 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00, | |
| 2177 | 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00, | |
| 2178 | 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01}; | |
| 2179 | } | |
| f062e50f | 2180 | set bm_right_data { |
| d698206c PM |
2181 | #define right_width 16 |
| 2182 | #define right_height 16 | |
| 2183 | static unsigned char right_bits[] = { | |
| 2184 | 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c, | |
| 2185 | 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c, | |
| 2186 | 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01}; | |
| 2187 | } | |
| 252c52df GÖ |
2188 | image create bitmap bm-left -data $bm_left_data -foreground $uifgcolor |
| 2189 | image create bitmap bm-left-gray -data $bm_left_data -foreground $uifgdisabledcolor | |
| 2190 | image create bitmap bm-right -data $bm_right_data -foreground $uifgcolor | |
| 2191 | image create bitmap bm-right-gray -data $bm_right_data -foreground $uifgdisabledcolor | |
| f062e50f | 2192 | |
| 62e9ac5e MK |
2193 | ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26 |
| 2194 | if {$use_ttk} { | |
| 2195 | .tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray] | |
| 2196 | } else { | |
| 2197 | .tf.bar.leftbut configure -image bm-left | |
| 2198 | } | |
| e9937d2a | 2199 | pack .tf.bar.leftbut -side left -fill y |
| 62e9ac5e MK |
2200 | ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26 |
| 2201 | if {$use_ttk} { | |
| 2202 | .tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray] | |
| 2203 | } else { | |
| 2204 | .tf.bar.rightbut configure -image bm-right | |
| 2205 | } | |
| e9937d2a | 2206 | pack .tf.bar.rightbut -side left -fill y |
| d698206c | 2207 | |
| d93f1713 | 2208 | ${NS}::label .tf.bar.rowlabel -text [mc "Row"] |
| 6df7403a | 2209 | set rownumsel {} |
| d93f1713 | 2210 | ${NS}::label .tf.bar.rownum -width 7 -textvariable rownumsel \ |
| 6df7403a | 2211 | -relief sunken -anchor e |
| d93f1713 PT |
2212 | ${NS}::label .tf.bar.rowlabel2 -text "/" |
| 2213 | ${NS}::label .tf.bar.numcommits -width 7 -textvariable numcommits \ | |
| 6df7403a PM |
2214 | -relief sunken -anchor e |
| 2215 | pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \ | |
| 2216 | -side left | |
| d93f1713 PT |
2217 | if {!$use_ttk} { |
| 2218 | foreach w {rownum numcommits} {.tf.bar.$w configure -font textfont} | |
| 2219 | } | |
| 6df7403a | 2220 | global selectedline |
| 94b4a69f | 2221 | trace add variable selectedline write selectedline_change |
| 6df7403a | 2222 | |
| bb3edc8b PM |
2223 | # Status label and progress bar |
| 2224 | set statusw .tf.bar.status | |
| d93f1713 | 2225 | ${NS}::label $statusw -width 15 -relief sunken |
| bb3edc8b | 2226 | pack $statusw -side left -padx 5 |
| d93f1713 PT |
2227 | if {$use_ttk} { |
| 2228 | set progresscanv [ttk::progressbar .tf.bar.progress] | |
| 2229 | } else { | |
| 2230 | set h [expr {[font metrics uifont -linespace] + 2}] | |
| 2231 | set progresscanv .tf.bar.progress | |
| 2232 | canvas $progresscanv -relief sunken -height $h -borderwidth 2 | |
| 2233 | set progressitem [$progresscanv create rect -1 0 0 $h -fill green] | |
| 2234 | set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow] | |
| 2235 | set rprogitem [$progresscanv create rect -1 0 0 $h -fill red] | |
| 2236 | } | |
| 2237 | pack $progresscanv -side right -expand 1 -fill x -padx {0 2} | |
| bb3edc8b PM |
2238 | set progresscoords {0 0} |
| 2239 | set fprogcoord 0 | |
| a137a90f | 2240 | set rprogcoord 0 |
| bb3edc8b PM |
2241 | bind $progresscanv <Configure> adjustprogress |
| 2242 | set lastprogupdate [clock clicks -milliseconds] | |
| 2243 | set progupdatepending 0 | |
| 2244 | ||
| 687c8765 | 2245 | # build up the bottom bar of upper window |
| d93f1713 PT |
2246 | ${NS}::label .tf.lbar.flabel -text "[mc "Find"] " |
| 2247 | ${NS}::button .tf.lbar.fnext -text [mc "next"] -command {dofind 1 1} | |
| 2248 | ${NS}::button .tf.lbar.fprev -text [mc "prev"] -command {dofind -1 1} | |
| 2249 | ${NS}::label .tf.lbar.flab2 -text " [mc "commit"] " | |
| 687c8765 PM |
2250 | pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \ |
| 2251 | -side left -fill y | |
| b007ee20 | 2252 | set gdttype [mc "containing:"] |
| 3cb1f9c9 | 2253 | set gm [makedroplist .tf.lbar.gdttype gdttype \ |
| b007ee20 CS |
2254 | [mc "containing:"] \ |
| 2255 | [mc "touching paths:"] \ | |
| c33cb908 ML |
2256 | [mc "adding/removing string:"] \ |
| 2257 | [mc "changing lines matching:"]] | |
| 687c8765 | 2258 | trace add variable gdttype write gdttype_change |
| 687c8765 PM |
2259 | pack .tf.lbar.gdttype -side left -fill y |
| 2260 | ||
| 98f350e5 | 2261 | set findstring {} |
| 687c8765 | 2262 | set fstring .tf.lbar.findstring |
| 887fe3c4 | 2263 | lappend entries $fstring |
| b9b142ff | 2264 | ${NS}::entry $fstring -width 30 -textvariable findstring |
| 60f7a7dc | 2265 | trace add variable findstring write find_change |
| b007ee20 | 2266 | set findtype [mc "Exact"] |
| d93f1713 PT |
2267 | set findtypemenu [makedroplist .tf.lbar.findtype \ |
| 2268 | findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]] | |
| 687c8765 | 2269 | trace add variable findtype write findcom_change |
| b007ee20 | 2270 | set findloc [mc "All fields"] |
| d93f1713 | 2271 | makedroplist .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \ |
| b007ee20 | 2272 | [mc "Comments"] [mc "Author"] [mc "Committer"] |
| 60f7a7dc | 2273 | trace add variable findloc write find_change |
| 687c8765 PM |
2274 | pack .tf.lbar.findloc -side right |
| 2275 | pack .tf.lbar.findtype -side right | |
| 2276 | pack $fstring -side left -expand 1 -fill x | |
| e9937d2a JH |
2277 | |
| 2278 | # Finish putting the upper half of the viewer together | |
| 2279 | pack .tf.lbar -in .tf -side bottom -fill x | |
| 2280 | pack .tf.bar -in .tf -side bottom -fill x | |
| 2281 | pack .tf.histframe -fill both -side top -expand 1 | |
| 2282 | .ctop add .tf | |
| d93f1713 PT |
2283 | if {!$use_ttk} { |
| 2284 | .ctop paneconfigure .tf -height $geometry(topheight) | |
| 2285 | .ctop paneconfigure .tf -width $geometry(topwidth) | |
| 2286 | } | |
| e9937d2a JH |
2287 | |
| 2288 | # now build up the bottom | |
| d93f1713 | 2289 | ${NS}::panedwindow .pwbottom -orient horizontal |
| e9937d2a JH |
2290 | |
| 2291 | # lower left, a text box over search bar, scroll bar to the right | |
| 2292 | # if we know window height, then that will set the lower text height, otherwise | |
| 2293 | # we set lower text height which will drive window height | |
| 2294 | if {[info exists geometry(main)]} { | |
| d93f1713 | 2295 | ${NS}::frame .bleft -width $geometry(botwidth) |
| e9937d2a | 2296 | } else { |
| d93f1713 | 2297 | ${NS}::frame .bleft -width $geometry(botwidth) -height $geometry(botheight) |
| e9937d2a | 2298 | } |
| d93f1713 PT |
2299 | ${NS}::frame .bleft.top |
| 2300 | ${NS}::frame .bleft.mid | |
| 2301 | ${NS}::frame .bleft.bottom | |
| e9937d2a | 2302 | |
| d93f1713 | 2303 | ${NS}::button .bleft.top.search -text [mc "Search"] -command dosearch |
| e9937d2a JH |
2304 | pack .bleft.top.search -side left -padx 5 |
| 2305 | set sstring .bleft.top.sstring | |
| d93f1713 | 2306 | set searchstring "" |
| b9b142ff | 2307 | ${NS}::entry $sstring -width 20 -textvariable searchstring |
| 3ea06f9f PM |
2308 | lappend entries $sstring |
| 2309 | trace add variable searchstring write incrsearch | |
| 2310 | pack $sstring -side left -expand 1 -fill x | |
| d93f1713 | 2311 | ${NS}::radiobutton .bleft.mid.diff -text [mc "Diff"] \ |
| a8d610a2 | 2312 | -command changediffdisp -variable diffelide -value {0 0} |
| d93f1713 | 2313 | ${NS}::radiobutton .bleft.mid.old -text [mc "Old version"] \ |
| a8d610a2 | 2314 | -command changediffdisp -variable diffelide -value {0 1} |
| d93f1713 | 2315 | ${NS}::radiobutton .bleft.mid.new -text [mc "New version"] \ |
| a8d610a2 | 2316 | -command changediffdisp -variable diffelide -value {1 0} |
| d93f1713 | 2317 | ${NS}::label .bleft.mid.labeldiffcontext -text " [mc "Lines of context"]: " |
| a8d610a2 | 2318 | pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left |
| 0933b04e | 2319 | spinbox .bleft.mid.diffcontext -width 5 \ |
| a41ddbb6 | 2320 | -from 0 -increment 1 -to 10000000 \ |
| 890fae70 SP |
2321 | -validate all -validatecommand "diffcontextvalidate %P" \ |
| 2322 | -textvariable diffcontextstring | |
| 2323 | .bleft.mid.diffcontext set $diffcontext | |
| 2324 | trace add variable diffcontextstring write diffcontextchange | |
| 2325 | lappend entries .bleft.mid.diffcontext | |
| 2326 | pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left | |
| d93f1713 | 2327 | ${NS}::checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \ |
| b9b86007 SP |
2328 | -command changeignorespace -variable ignorespace |
| 2329 | pack .bleft.mid.ignspace -side left -padx 5 | |
| ae4e3ff9 TR |
2330 | |
| 2331 | set worddiff [mc "Line diff"] | |
| 2332 | if {[package vcompare $git_version "1.7.2"] >= 0} { | |
| 2333 | makedroplist .bleft.mid.worddiff worddiff [mc "Line diff"] \ | |
| 2334 | [mc "Markup words"] [mc "Color words"] | |
| 2335 | trace add variable worddiff write changeworddiff | |
| 2336 | pack .bleft.mid.worddiff -side left -padx 5 | |
| 2337 | } | |
| 2338 | ||
| 8809d691 | 2339 | set ctext .bleft.bottom.ctext |
| f8a2c0d1 | 2340 | text $ctext -background $bgcolor -foreground $fgcolor \ |
| 9c311b32 | 2341 | -state disabled -font textfont \ |
| 8809d691 PK |
2342 | -yscrollcommand scrolltext -wrap none \ |
| 2343 | -xscrollcommand ".bleft.bottom.sbhorizontal set" | |
| 32f1b3e4 PM |
2344 | if {$have_tk85} { |
| 2345 | $ctext conf -tabstyle wordprocessor | |
| 2346 | } | |
| d93f1713 PT |
2347 | ${NS}::scrollbar .bleft.bottom.sb -command "$ctext yview" |
| 2348 | ${NS}::scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h | |
| e9937d2a | 2349 | pack .bleft.top -side top -fill x |
| a8d610a2 | 2350 | pack .bleft.mid -side top -fill x |
| 8809d691 PK |
2351 | grid $ctext .bleft.bottom.sb -sticky nsew |
| 2352 | grid .bleft.bottom.sbhorizontal -sticky ew | |
| 2353 | grid columnconfigure .bleft.bottom 0 -weight 1 | |
| 2354 | grid rowconfigure .bleft.bottom 0 -weight 1 | |
| 2355 | grid rowconfigure .bleft.bottom 1 -weight 0 | |
| 2356 | pack .bleft.bottom -side top -fill both -expand 1 | |
| f8a2c0d1 PM |
2357 | lappend bglist $ctext |
| 2358 | lappend fglist $ctext | |
| d2610d11 | 2359 | |
| f1b86294 | 2360 | $ctext tag conf comment -wrap $wrapcomment |
| 252c52df | 2361 | $ctext tag conf filesep -font textfontbold -fore $filesepfgcolor -back $filesepbgcolor |
| f8a2c0d1 PM |
2362 | $ctext tag conf hunksep -fore [lindex $diffcolors 2] |
| 2363 | $ctext tag conf d0 -fore [lindex $diffcolors 0] | |
| 8b07dca1 | 2364 | $ctext tag conf dresult -fore [lindex $diffcolors 1] |
| 252c52df GÖ |
2365 | $ctext tag conf m0 -fore [lindex $mergecolors 0] |
| 2366 | $ctext tag conf m1 -fore [lindex $mergecolors 1] | |
| 2367 | $ctext tag conf m2 -fore [lindex $mergecolors 2] | |
| 2368 | $ctext tag conf m3 -fore [lindex $mergecolors 3] | |
| 2369 | $ctext tag conf m4 -fore [lindex $mergecolors 4] | |
| 2370 | $ctext tag conf m5 -fore [lindex $mergecolors 5] | |
| 2371 | $ctext tag conf m6 -fore [lindex $mergecolors 6] | |
| 2372 | $ctext tag conf m7 -fore [lindex $mergecolors 7] | |
| 2373 | $ctext tag conf m8 -fore [lindex $mergecolors 8] | |
| 2374 | $ctext tag conf m9 -fore [lindex $mergecolors 9] | |
| 2375 | $ctext tag conf m10 -fore [lindex $mergecolors 10] | |
| 2376 | $ctext tag conf m11 -fore [lindex $mergecolors 11] | |
| 2377 | $ctext tag conf m12 -fore [lindex $mergecolors 12] | |
| 2378 | $ctext tag conf m13 -fore [lindex $mergecolors 13] | |
| 2379 | $ctext tag conf m14 -fore [lindex $mergecolors 14] | |
| 2380 | $ctext tag conf m15 -fore [lindex $mergecolors 15] | |
| 712fcc08 | 2381 | $ctext tag conf mmax -fore darkgrey |
| b77b0278 | 2382 | set mergemax 16 |
| 9c311b32 PM |
2383 | $ctext tag conf mresult -font textfontbold |
| 2384 | $ctext tag conf msep -font textfontbold | |
| 252c52df GÖ |
2385 | $ctext tag conf found -back $foundbgcolor |
| 2386 | $ctext tag conf currentsearchhit -back $currentsearchhitbgcolor | |
| d34835c9 | 2387 | $ctext tag conf wwrap -wrap word |
| 4399fe33 | 2388 | $ctext tag conf bold -font textfontbold |
| e5c2d856 | 2389 | |
| e9937d2a | 2390 | .pwbottom add .bleft |
| d93f1713 PT |
2391 | if {!$use_ttk} { |
| 2392 | .pwbottom paneconfigure .bleft -width $geometry(botwidth) | |
| 2393 | } | |
| e9937d2a JH |
2394 | |
| 2395 | # lower right | |
| d93f1713 PT |
2396 | ${NS}::frame .bright |
| 2397 | ${NS}::frame .bright.mode | |
| 2398 | ${NS}::radiobutton .bright.mode.patch -text [mc "Patch"] \ | |
| f8b28a40 | 2399 | -command reselectline -variable cmitmode -value "patch" |
| d93f1713 | 2400 | ${NS}::radiobutton .bright.mode.tree -text [mc "Tree"] \ |
| f8b28a40 | 2401 | -command reselectline -variable cmitmode -value "tree" |
| e9937d2a JH |
2402 | grid .bright.mode.patch .bright.mode.tree -sticky ew |
| 2403 | pack .bright.mode -side top -fill x | |
| 2404 | set cflist .bright.cfiles | |
| 9c311b32 | 2405 | set indent [font measure mainfont "nn"] |
| e9937d2a | 2406 | text $cflist \ |
| 60378c0c | 2407 | -selectbackground $selectbgcolor \ |
| f8a2c0d1 | 2408 | -background $bgcolor -foreground $fgcolor \ |
| 9c311b32 | 2409 | -font mainfont \ |
| 7fcceed7 | 2410 | -tabs [list $indent [expr {2 * $indent}]] \ |
| e9937d2a | 2411 | -yscrollcommand ".bright.sb set" \ |
| 7fcceed7 PM |
2412 | -cursor [. cget -cursor] \ |
| 2413 | -spacing1 1 -spacing3 1 | |
| f8a2c0d1 PM |
2414 | lappend bglist $cflist |
| 2415 | lappend fglist $cflist | |
| d93f1713 | 2416 | ${NS}::scrollbar .bright.sb -command "$cflist yview" |
| e9937d2a | 2417 | pack .bright.sb -side right -fill y |
| d2610d11 | 2418 | pack $cflist -side left -fill both -expand 1 |
| 89b11d3b PM |
2419 | $cflist tag configure highlight \ |
| 2420 | -background [$cflist cget -selectbackground] | |
| 9c311b32 | 2421 | $cflist tag configure bold -font mainfontbold |
| d2610d11 | 2422 | |
| e9937d2a JH |
2423 | .pwbottom add .bright |
| 2424 | .ctop add .pwbottom | |
| 1db95b00 | 2425 | |
| b9bee115 | 2426 | # restore window width & height if known |
| e9937d2a | 2427 | if {[info exists geometry(main)]} { |
| b9bee115 PM |
2428 | if {[scan $geometry(main) "%dx%d" w h] >= 2} { |
| 2429 | if {$w > [winfo screenwidth .]} { | |
| 2430 | set w [winfo screenwidth .] | |
| 2431 | } | |
| 2432 | if {$h > [winfo screenheight .]} { | |
| 2433 | set h [winfo screenheight .] | |
| 2434 | } | |
| 2435 | wm geometry . "${w}x$h" | |
| 2436 | } | |
| e9937d2a JH |
2437 | } |
| 2438 | ||
| c876dbad PT |
2439 | if {[info exists geometry(state)] && $geometry(state) eq "zoomed"} { |
| 2440 | wm state . $geometry(state) | |
| 2441 | } | |
| 2442 | ||
| d23d98d3 SP |
2443 | if {[tk windowingsystem] eq {aqua}} { |
| 2444 | set M1B M1 | |
| 5fdcbb13 | 2445 | set ::BM "3" |
| d23d98d3 SP |
2446 | } else { |
| 2447 | set M1B Control | |
| 5fdcbb13 | 2448 | set ::BM "2" |
| d23d98d3 SP |
2449 | } |
| 2450 | ||
| d93f1713 PT |
2451 | if {$use_ttk} { |
| 2452 | bind .ctop <Map> { | |
| 2453 | bind %W <Map> {} | |
| 2454 | %W sashpos 0 $::geometry(topheight) | |
| 2455 | } | |
| 2456 | bind .pwbottom <Map> { | |
| 2457 | bind %W <Map> {} | |
| 2458 | %W sashpos 0 $::geometry(botwidth) | |
| 2459 | } | |
| 2460 | } | |
| 2461 | ||
| e9937d2a JH |
2462 | bind .pwbottom <Configure> {resizecdetpanes %W %w} |
| 2463 | pack .ctop -fill both -expand 1 | |
| c8dfbcf9 PM |
2464 | bindall <1> {selcanvline %W %x %y} |
| 2465 | #bindall <B1-Motion> {selcanvline %W %x %y} | |
| 314c3093 ML |
2466 | if {[tk windowingsystem] == "win32"} { |
| 2467 | bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D } | |
| 2468 | bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break } | |
| 2469 | } else { | |
| 2470 | bindall <ButtonRelease-4> "allcanvs yview scroll -5 units" | |
| 2471 | bindall <ButtonRelease-5> "allcanvs yview scroll 5 units" | |
| 5dd57d51 JS |
2472 | if {[tk windowingsystem] eq "aqua"} { |
| 2473 | bindall <MouseWheel> { | |
| 2474 | set delta [expr {- (%D)}] | |
| 2475 | allcanvs yview scroll $delta units | |
| 2476 | } | |
| 5fdcbb13 DS |
2477 | bindall <Shift-MouseWheel> { |
| 2478 | set delta [expr {- (%D)}] | |
| 2479 | $canv xview scroll $delta units | |
| 2480 | } | |
| 5dd57d51 | 2481 | } |
| 314c3093 | 2482 | } |
| 5fdcbb13 DS |
2483 | bindall <$::BM> "canvscan mark %W %x %y" |
| 2484 | bindall <B$::BM-Motion> "canvscan dragto %W %x %y" | |
| decd0a1e JL |
2485 | bind all <$M1B-Key-w> {destroy [winfo toplevel %W]} |
| 2486 | bind . <$M1B-Key-w> doquit | |
| 6e5f7203 RN |
2487 | bindkey <Home> selfirstline |
| 2488 | bindkey <End> sellastline | |
| 17386066 PM |
2489 | bind . <Key-Up> "selnextline -1" |
| 2490 | bind . <Key-Down> "selnextline 1" | |
| cca5d946 PM |
2491 | bind . <Shift-Key-Up> "dofind -1 0" |
| 2492 | bind . <Shift-Key-Down> "dofind 1 0" | |
| 6e5f7203 RN |
2493 | bindkey <Key-Right> "goforw" |
| 2494 | bindkey <Key-Left> "goback" | |
| 2495 | bind . <Key-Prior> "selnextpage -1" | |
| 2496 | bind . <Key-Next> "selnextpage 1" | |
| d23d98d3 SP |
2497 | bind . <$M1B-Home> "allcanvs yview moveto 0.0" |
| 2498 | bind . <$M1B-End> "allcanvs yview moveto 1.0" | |
| 2499 | bind . <$M1B-Key-Up> "allcanvs yview scroll -1 units" | |
| 2500 | bind . <$M1B-Key-Down> "allcanvs yview scroll 1 units" | |
| 2501 | bind . <$M1B-Key-Prior> "allcanvs yview scroll -1 pages" | |
| 2502 | bind . <$M1B-Key-Next> "allcanvs yview scroll 1 pages" | |
| cfb4563c PM |
2503 | bindkey <Key-Delete> "$ctext yview scroll -1 pages" |
| 2504 | bindkey <Key-BackSpace> "$ctext yview scroll -1 pages" | |
| 2505 | bindkey <Key-space> "$ctext yview scroll 1 pages" | |
| df3d83b1 PM |
2506 | bindkey p "selnextline -1" |
| 2507 | bindkey n "selnextline 1" | |
| 6e2dda35 RS |
2508 | bindkey z "goback" |
| 2509 | bindkey x "goforw" | |
| 811c70fc JN |
2510 | bindkey k "selnextline -1" |
| 2511 | bindkey j "selnextline 1" | |
| 2512 | bindkey h "goback" | |
| 6e2dda35 | 2513 | bindkey l "goforw" |
| f4c54b3c | 2514 | bindkey b prevfile |
| cfb4563c PM |
2515 | bindkey d "$ctext yview scroll 18 units" |
| 2516 | bindkey u "$ctext yview scroll -18 units" | |
| 97bed034 | 2517 | bindkey / {focus $fstring} |
| b6e192db | 2518 | bindkey <Key-KP_Divide> {focus $fstring} |
| cca5d946 PM |
2519 | bindkey <Key-Return> {dofind 1 1} |
| 2520 | bindkey ? {dofind -1 1} | |
| 39ad8570 | 2521 | bindkey f nextfile |
| cea07cf8 | 2522 | bind . <F5> updatecommits |
| ebb91db8 | 2523 | bindmodfunctionkey Shift 5 reloadcommits |
| cea07cf8 | 2524 | bind . <F2> showrefs |
| 69ecfcd6 | 2525 | bindmodfunctionkey Shift 4 {newview 0} |
| cea07cf8 | 2526 | bind . <F4> edit_or_newview |
| d23d98d3 | 2527 | bind . <$M1B-q> doquit |
| cca5d946 PM |
2528 | bind . <$M1B-f> {dofind 1 1} |
| 2529 | bind . <$M1B-g> {dofind 1 0} | |
| d23d98d3 SP |
2530 | bind . <$M1B-r> dosearchback |
| 2531 | bind . <$M1B-s> dosearch | |
| 2532 | bind . <$M1B-equal> {incrfont 1} | |
| 646f3a14 | 2533 | bind . <$M1B-plus> {incrfont 1} |
| d23d98d3 SP |
2534 | bind . <$M1B-KP_Add> {incrfont 1} |
| 2535 | bind . <$M1B-minus> {incrfont -1} | |
| 2536 | bind . <$M1B-KP_Subtract> {incrfont -1} | |
| b6047c5a | 2537 | wm protocol . WM_DELETE_WINDOW doquit |
| e2f90ee4 | 2538 | bind . <Destroy> {stop_backends} |
| df3d83b1 | 2539 | bind . <Button-1> "click %W" |
| cca5d946 | 2540 | bind $fstring <Key-Return> {dofind 1 1} |
| 968ce45c | 2541 | bind $sha1entry <Key-Return> {gotocommit; break} |
| ee3dc72e | 2542 | bind $sha1entry <<PasteSelection>> clearsha1 |
| 7fcceed7 PM |
2543 | bind $cflist <1> {sel_flist %W %x %y; break} |
| 2544 | bind $cflist <B1-Motion> {sel_flist %W %x %y; break} | |
| f8b28a40 | 2545 | bind $cflist <ButtonRelease-1> {treeclick %W %x %y} |
| d277e89f PM |
2546 | global ctxbut |
| 2547 | bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y} | |
| 7cdc3556 | 2548 | bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y} |
| 4adcbea0 | 2549 | bind $ctext <Button-1> {focus %W} |
| c4614994 | 2550 | bind $ctext <<Selection>> rehighlight_search_results |
| ea13cba1 PM |
2551 | |
| 2552 | set maincursor [. cget -cursor] | |
| 2553 | set textcursor [$ctext cget -cursor] | |
| 94a2eede | 2554 | set curtextcursor $textcursor |
| 84ba7345 | 2555 | |
| c8dfbcf9 | 2556 | set rowctxmenu .rowctxmenu |
| f2d0bbbd | 2557 | makemenu $rowctxmenu { |
| 79056034 PM |
2558 | {mc "Diff this -> selected" command {diffvssel 0}} |
| 2559 | {mc "Diff selected -> this" command {diffvssel 1}} | |
| 2560 | {mc "Make patch" command mkpatch} | |
| 2561 | {mc "Create tag" command mktag} | |
| 2562 | {mc "Write commit to file" command writecommit} | |
| 2563 | {mc "Create new branch" command mkbranch} | |
| 2564 | {mc "Cherry-pick this commit" command cherrypick} | |
| 2565 | {mc "Reset HEAD branch to here" command resethead} | |
| b9fdba7f PM |
2566 | {mc "Mark this commit" command markhere} |
| 2567 | {mc "Return to mark" command gotomark} | |
| 2568 | {mc "Find descendant of this and mark" command find_common_desc} | |
| 010509f2 | 2569 | {mc "Compare with marked commit" command compare_commits} |
| 6febdede PM |
2570 | {mc "Diff this -> marked commit" command {diffvsmark 0}} |
| 2571 | {mc "Diff marked commit -> this" command {diffvsmark 1}} | |
| 8f3ff933 | 2572 | {mc "Revert this commit" command revert} |
| f2d0bbbd PM |
2573 | } |
| 2574 | $rowctxmenu configure -tearoff 0 | |
| 10299152 | 2575 | |
| 219ea3a9 | 2576 | set fakerowmenu .fakerowmenu |
| f2d0bbbd | 2577 | makemenu $fakerowmenu { |
| 79056034 PM |
2578 | {mc "Diff this -> selected" command {diffvssel 0}} |
| 2579 | {mc "Diff selected -> this" command {diffvssel 1}} | |
| 2580 | {mc "Make patch" command mkpatch} | |
| 6febdede PM |
2581 | {mc "Diff this -> marked commit" command {diffvsmark 0}} |
| 2582 | {mc "Diff marked commit -> this" command {diffvsmark 1}} | |
| f2d0bbbd PM |
2583 | } |
| 2584 | $fakerowmenu configure -tearoff 0 | |
| 219ea3a9 | 2585 | |
| 10299152 | 2586 | set headctxmenu .headctxmenu |
| f2d0bbbd | 2587 | makemenu $headctxmenu { |
| 79056034 PM |
2588 | {mc "Check out this branch" command cobranch} |
| 2589 | {mc "Remove this branch" command rmbranch} | |
| f2d0bbbd PM |
2590 | } |
| 2591 | $headctxmenu configure -tearoff 0 | |
| 3244729a PM |
2592 | |
| 2593 | global flist_menu | |
| 2594 | set flist_menu .flistctxmenu | |
| f2d0bbbd | 2595 | makemenu $flist_menu { |
| 79056034 PM |
2596 | {mc "Highlight this too" command {flist_hl 0}} |
| 2597 | {mc "Highlight this only" command {flist_hl 1}} | |
| 2598 | {mc "External diff" command {external_diff}} | |
| 2599 | {mc "Blame parent commit" command {external_blame 1}} | |
| f2d0bbbd PM |
2600 | } |
| 2601 | $flist_menu configure -tearoff 0 | |
| 7cdc3556 AG |
2602 | |
| 2603 | global diff_menu | |
| 2604 | set diff_menu .diffctxmenu | |
| 2605 | makemenu $diff_menu { | |
| 8a897742 | 2606 | {mc "Show origin of this line" command show_line_source} |
| 7cdc3556 AG |
2607 | {mc "Run git gui blame on this line" command {external_blame_diff}} |
| 2608 | } | |
| 2609 | $diff_menu configure -tearoff 0 | |
| df3d83b1 PM |
2610 | } |
| 2611 | ||
| 314c3093 ML |
2612 | # Windows sends all mouse wheel events to the current focused window, not |
| 2613 | # the one where the mouse hovers, so bind those events here and redirect | |
| 2614 | # to the correct window | |
| 2615 | proc windows_mousewheel_redirector {W X Y D} { | |
| 2616 | global canv canv2 canv3 | |
| 2617 | set w [winfo containing -displayof $W $X $Y] | |
| 2618 | if {$w ne ""} { | |
| 2619 | set u [expr {$D < 0 ? 5 : -5}] | |
| 2620 | if {$w == $canv || $w == $canv2 || $w == $canv3} { | |
| 2621 | allcanvs yview scroll $u units | |
| 2622 | } else { | |
| 2623 | catch { | |
| 2624 | $w yview scroll $u units | |
| 2625 | } | |
| 2626 | } | |
| 2627 | } | |
| 2628 | } | |
| 2629 | ||
| 6df7403a PM |
2630 | # Update row number label when selectedline changes |
| 2631 | proc selectedline_change {n1 n2 op} { | |
| 2632 | global selectedline rownumsel | |
| 2633 | ||
| 94b4a69f | 2634 | if {$selectedline eq {}} { |
| 6df7403a PM |
2635 | set rownumsel {} |
| 2636 | } else { | |
| 2637 | set rownumsel [expr {$selectedline + 1}] | |
| 2638 | } | |
| 2639 | } | |
| 2640 | ||
| be0cd098 PM |
2641 | # mouse-2 makes all windows scan vertically, but only the one |
| 2642 | # the cursor is in scans horizontally | |
| 2643 | proc canvscan {op w x y} { | |
| 2644 | global canv canv2 canv3 | |
| 2645 | foreach c [list $canv $canv2 $canv3] { | |
| 2646 | if {$c == $w} { | |
| 2647 | $c scan $op $x $y | |
| 2648 | } else { | |
| 2649 | $c scan $op 0 $y | |
| 2650 | } | |
| 2651 | } | |
| 2652 | } | |
| 2653 | ||
| 9f1afe05 PM |
2654 | proc scrollcanv {cscroll f0 f1} { |
| 2655 | $cscroll set $f0 $f1 | |
| 31c0eaa8 | 2656 | drawvisible |
| 908c3585 | 2657 | flushhighlights |
| 9f1afe05 PM |
2658 | } |
| 2659 | ||
| df3d83b1 PM |
2660 | # when we make a key binding for the toplevel, make sure |
| 2661 | # it doesn't get triggered when that key is pressed in the | |
| 2662 | # find string entry widget. | |
| 2663 | proc bindkey {ev script} { | |
| 887fe3c4 | 2664 | global entries |
| df3d83b1 PM |
2665 | bind . $ev $script |
| 2666 | set escript [bind Entry $ev] | |
| 2667 | if {$escript == {}} { | |
| 2668 | set escript [bind Entry <Key>] | |
| 2669 | } | |
| 887fe3c4 PM |
2670 | foreach e $entries { |
| 2671 | bind $e $ev "$escript; break" | |
| 2672 | } | |
| df3d83b1 PM |
2673 | } |
| 2674 | ||
| 69ecfcd6 AW |
2675 | proc bindmodfunctionkey {mod n script} { |
| 2676 | bind . <$mod-F$n> $script | |
| 2677 | catch { bind . <$mod-XF86_Switch_VT_$n> $script } | |
| 2678 | } | |
| 2679 | ||
| df3d83b1 | 2680 | # set the focus back to the toplevel for any click outside |
| 887fe3c4 | 2681 | # the entry widgets |
| df3d83b1 | 2682 | proc click {w} { |
| bd441de4 ML |
2683 | global ctext entries |
| 2684 | foreach e [concat $entries $ctext] { | |
| 887fe3c4 | 2685 | if {$w == $e} return |
| df3d83b1 | 2686 | } |
| 887fe3c4 | 2687 | focus . |
| 0fba86b3 PM |
2688 | } |
| 2689 | ||
| bb3edc8b PM |
2690 | # Adjust the progress bar for a change in requested extent or canvas size |
| 2691 | proc adjustprogress {} { | |
| 2692 | global progresscanv progressitem progresscoords | |
| 2693 | global fprogitem fprogcoord lastprogupdate progupdatepending | |
| d93f1713 PT |
2694 | global rprogitem rprogcoord use_ttk |
| 2695 | ||
| 2696 | if {$use_ttk} { | |
| 2697 | $progresscanv configure -value [expr {int($fprogcoord * 100)}] | |
| 2698 | return | |
| 2699 | } | |
| bb3edc8b PM |
2700 | |
| 2701 | set w [expr {[winfo width $progresscanv] - 4}] | |
| 2702 | set x0 [expr {$w * [lindex $progresscoords 0]}] | |
| 2703 | set x1 [expr {$w * [lindex $progresscoords 1]}] | |
| 2704 | set h [winfo height $progresscanv] | |
| 2705 | $progresscanv coords $progressitem $x0 0 $x1 $h | |
| 2706 | $progresscanv coords $fprogitem 0 0 [expr {$w * $fprogcoord}] $h | |
| a137a90f | 2707 | $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h |
| bb3edc8b PM |
2708 | set now [clock clicks -milliseconds] |
| 2709 | if {$now >= $lastprogupdate + 100} { | |
| 2710 | set progupdatepending 0 | |
| 2711 | update | |
| 2712 | } elseif {!$progupdatepending} { | |
| 2713 | set progupdatepending 1 | |
| 2714 | after [expr {$lastprogupdate + 100 - $now}] doprogupdate | |
| 2715 | } | |
| 2716 | } | |
| 2717 | ||
| 2718 | proc doprogupdate {} { | |
| 2719 | global lastprogupdate progupdatepending | |
| 2720 | ||
| 2721 | if {$progupdatepending} { | |
| 2722 | set progupdatepending 0 | |
| 2723 | set lastprogupdate [clock clicks -milliseconds] | |
| 2724 | update | |
| 2725 | } | |
| 2726 | } | |
| 2727 | ||
| 0fba86b3 | 2728 | proc savestuff {w} { |
| 32f1b3e4 | 2729 | global canv canv2 canv3 mainfont textfont uifont tabstop |
| 712fcc08 | 2730 | global stuffsaved findmergefiles maxgraphpct |
| 219ea3a9 | 2731 | global maxwidth showneartags showlocalchanges |
| 2d480856 | 2732 | global viewname viewfiles viewargs viewargscmd viewperm nextviewnum |
| 7a39a17a | 2733 | global cmitmode wrapcomment datetimeformat limitdiffs |
| 5497f7a2 | 2734 | global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor |
| 252c52df GÖ |
2735 | global uifgcolor uifgdisabledcolor |
| 2736 | global headbgcolor headfgcolor headoutlinecolor remotebgcolor | |
| 2737 | global tagbgcolor tagfgcolor tagoutlinecolor | |
| 2738 | global reflinecolor filesepbgcolor filesepfgcolor | |
| 2739 | global mergecolors foundbgcolor currentsearchhitbgcolor | |
| 2740 | global linehoverbgcolor linehoverfgcolor linehoveroutlinecolor circlecolors | |
| 2741 | global mainheadcirclecolor workingfilescirclecolor indexcirclecolor | |
| 2742 | global linkfgcolor circleoutlinecolor | |
| 21ac8a8d | 2743 | global autoselect autosellen extdifftool perfile_attrs markbgcolor use_ttk |
| d34835c9 | 2744 | global hideremotes want_ttk maxrefs |
| 4ef17537 | 2745 | |
| 0fba86b3 | 2746 | if {$stuffsaved} return |
| df3d83b1 | 2747 | if {![winfo viewable .]} return |
| 0fba86b3 | 2748 | catch { |
| 9bedb0e1 | 2749 | if {[file exists ~/.gitk-new]} {file delete -force ~/.gitk-new} |
| 0fba86b3 | 2750 | set f [open "~/.gitk-new" w] |
| 9832e4f2 PM |
2751 | if {$::tcl_platform(platform) eq {windows}} { |
| 2752 | file attributes "~/.gitk-new" -hidden true | |
| 2753 | } | |
| f0654861 PM |
2754 | puts $f [list set mainfont $mainfont] |
| 2755 | puts $f [list set textfont $textfont] | |
| 4840be66 | 2756 | puts $f [list set uifont $uifont] |
| 7e12f1a6 | 2757 | puts $f [list set tabstop $tabstop] |
| f0654861 | 2758 | puts $f [list set findmergefiles $findmergefiles] |
| 8d858d1a | 2759 | puts $f [list set maxgraphpct $maxgraphpct] |
| 04c13d38 | 2760 | puts $f [list set maxwidth $maxwidth] |
| f8b28a40 | 2761 | puts $f [list set cmitmode $cmitmode] |
| f1b86294 | 2762 | puts $f [list set wrapcomment $wrapcomment] |
| 95293b58 | 2763 | puts $f [list set autoselect $autoselect] |
| 21ac8a8d | 2764 | puts $f [list set autosellen $autosellen] |
| b8ab2e17 | 2765 | puts $f [list set showneartags $showneartags] |
| d34835c9 | 2766 | puts $f [list set maxrefs $maxrefs] |
| ffe15297 | 2767 | puts $f [list set hideremotes $hideremotes] |
| 219ea3a9 | 2768 | puts $f [list set showlocalchanges $showlocalchanges] |
| e8b5f4be | 2769 | puts $f [list set datetimeformat $datetimeformat] |
| 7a39a17a | 2770 | puts $f [list set limitdiffs $limitdiffs] |
| 5497f7a2 | 2771 | puts $f [list set uicolor $uicolor] |
| 0cc08ff7 | 2772 | puts $f [list set want_ttk $want_ttk] |
| f8a2c0d1 PM |
2773 | puts $f [list set bgcolor $bgcolor] |
| 2774 | puts $f [list set fgcolor $fgcolor] | |
| 252c52df GÖ |
2775 | puts $f [list set uifgcolor $uifgcolor] |
| 2776 | puts $f [list set uifgdisabledcolor $uifgdisabledcolor] | |
| f8a2c0d1 PM |
2777 | puts $f [list set colors $colors] |
| 2778 | puts $f [list set diffcolors $diffcolors] | |
| 252c52df | 2779 | puts $f [list set mergecolors $mergecolors] |
| e3e901be | 2780 | puts $f [list set markbgcolor $markbgcolor] |
| 890fae70 | 2781 | puts $f [list set diffcontext $diffcontext] |
| 60378c0c | 2782 | puts $f [list set selectbgcolor $selectbgcolor] |
| 252c52df GÖ |
2783 | puts $f [list set foundbgcolor $foundbgcolor] |
| 2784 | puts $f [list set currentsearchhitbgcolor $currentsearchhitbgcolor] | |
| 314f5de1 | 2785 | puts $f [list set extdifftool $extdifftool] |
| 39ee47ef | 2786 | puts $f [list set perfile_attrs $perfile_attrs] |
| 252c52df GÖ |
2787 | puts $f [list set headbgcolor $headbgcolor] |
| 2788 | puts $f [list set headfgcolor $headfgcolor] | |
| 2789 | puts $f [list set headoutlinecolor $headoutlinecolor] | |
| 2790 | puts $f [list set remotebgcolor $remotebgcolor] | |
| 2791 | puts $f [list set tagbgcolor $tagbgcolor] | |
| 2792 | puts $f [list set tagfgcolor $tagfgcolor] | |
| 2793 | puts $f [list set tagoutlinecolor $tagoutlinecolor] | |
| 2794 | puts $f [list set reflinecolor $reflinecolor] | |
| 2795 | puts $f [list set filesepbgcolor $filesepbgcolor] | |
| 2796 | puts $f [list set filesepfgcolor $filesepfgcolor] | |
| 2797 | puts $f [list set linehoverbgcolor $linehoverbgcolor] | |
| 2798 | puts $f [list set linehoverfgcolor $linehoverfgcolor] | |
| 2799 | puts $f [list set linehoveroutlinecolor $linehoveroutlinecolor] | |
| 2800 | puts $f [list set mainheadcirclecolor $mainheadcirclecolor] | |
| 2801 | puts $f [list set workingfilescirclecolor $workingfilescirclecolor] | |
| 2802 | puts $f [list set indexcirclecolor $indexcirclecolor] | |
| 2803 | puts $f [list set circlecolors $circlecolors] | |
| 2804 | puts $f [list set linkfgcolor $linkfgcolor] | |
| 2805 | puts $f [list set circleoutlinecolor $circleoutlinecolor] | |
| e9937d2a | 2806 | |
| b6047c5a | 2807 | puts $f "set geometry(main) [wm geometry .]" |
| c876dbad | 2808 | puts $f "set geometry(state) [wm state .]" |
| e9937d2a JH |
2809 | puts $f "set geometry(topwidth) [winfo width .tf]" |
| 2810 | puts $f "set geometry(topheight) [winfo height .tf]" | |
| d93f1713 PT |
2811 | if {$use_ttk} { |
| 2812 | puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\"" | |
| 2813 | puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\"" | |
| 2814 | } else { | |
| 2815 | puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\"" | |
| 2816 | puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\"" | |
| 2817 | } | |
| e9937d2a JH |
2818 | puts $f "set geometry(botwidth) [winfo width .bleft]" |
| 2819 | puts $f "set geometry(botheight) [winfo height .bleft]" | |
| 2820 | ||
| a90a6d24 PM |
2821 | puts -nonewline $f "set permviews {" |
| 2822 | for {set v 0} {$v < $nextviewnum} {incr v} { | |
| 2823 | if {$viewperm($v)} { | |
| 2d480856 | 2824 | puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}" |
| a90a6d24 PM |
2825 | } |
| 2826 | } | |
| 2827 | puts $f "}" | |
| 0fba86b3 PM |
2828 | close $f |
| 2829 | file rename -force "~/.gitk-new" "~/.gitk" | |
| 2830 | } | |
| 2831 | set stuffsaved 1 | |
| 1db95b00 PM |
2832 | } |
| 2833 | ||
| 43bddeb4 | 2834 | proc resizeclistpanes {win w} { |
| d93f1713 | 2835 | global oldwidth use_ttk |
| 418c4c7b | 2836 | if {[info exists oldwidth($win)]} { |
| d93f1713 PT |
2837 | if {$use_ttk} { |
| 2838 | set s0 [$win sashpos 0] | |
| 2839 | set s1 [$win sashpos 1] | |
| 2840 | } else { | |
| 2841 | set s0 [$win sash coord 0] | |
| 2842 | set s1 [$win sash coord 1] | |
| 2843 | } | |
| 43bddeb4 PM |
2844 | if {$w < 60} { |
| 2845 | set sash0 [expr {int($w/2 - 2)}] | |
| 2846 | set sash1 [expr {int($w*5/6 - 2)}] | |
| 2847 | } else { | |
| 2848 | set factor [expr {1.0 * $w / $oldwidth($win)}] | |
| 2849 | set sash0 [expr {int($factor * [lindex $s0 0])}] | |
| 2850 | set sash1 [expr {int($factor * [lindex $s1 0])}] | |
| 2851 | if {$sash0 < 30} { | |
| 2852 | set sash0 30 | |
| 2853 | } | |
| 2854 | if {$sash1 < $sash0 + 20} { | |
| 2ed49d54 | 2855 | set sash1 [expr {$sash0 + 20}] |
| 43bddeb4 PM |
2856 | } |
| 2857 | if {$sash1 > $w - 10} { | |
| 2ed49d54 | 2858 | set sash1 [expr {$w - 10}] |
| 43bddeb4 | 2859 | if {$sash0 > $sash1 - 20} { |
| 2ed49d54 | 2860 | set sash0 [expr {$sash1 - 20}] |
| 43bddeb4 PM |
2861 | } |
| 2862 | } | |
| 2863 | } | |
| d93f1713 PT |
2864 | if {$use_ttk} { |
| 2865 | $win sashpos 0 $sash0 | |
| 2866 | $win sashpos 1 $sash1 | |
| 2867 | } else { | |
| 2868 | $win sash place 0 $sash0 [lindex $s0 1] | |
| 2869 | $win sash place 1 $sash1 [lindex $s1 1] | |
| 2870 | } | |
| 43bddeb4 PM |
2871 | } |
| 2872 | set oldwidth($win) $w | |
| 2873 | } | |
| 2874 | ||
| 2875 | proc resizecdetpanes {win w} { | |
| d93f1713 | 2876 | global oldwidth use_ttk |
| 418c4c7b | 2877 | if {[info exists oldwidth($win)]} { |
| d93f1713 PT |
2878 | if {$use_ttk} { |
| 2879 | set s0 [$win sashpos 0] | |
| 2880 | } else { | |
| 2881 | set s0 [$win sash coord 0] | |
| 2882 | } | |
| 43bddeb4 PM |
2883 | if {$w < 60} { |
| 2884 | set sash0 [expr {int($w*3/4 - 2)}] | |
| 2885 | } else { | |
| 2886 | set factor [expr {1.0 * $w / $oldwidth($win)}] | |
| 2887 | set sash0 [expr {int($factor * [lindex $s0 0])}] | |
| 2888 | if {$sash0 < 45} { | |
| 2889 | set sash0 45 | |
| 2890 | } | |
| 2891 | if {$sash0 > $w - 15} { | |
| 2ed49d54 | 2892 | set sash0 [expr {$w - 15}] |
| 43bddeb4 PM |
2893 | } |
| 2894 | } | |
| d93f1713 PT |
2895 | if {$use_ttk} { |
| 2896 | $win sashpos 0 $sash0 | |
| 2897 | } else { | |
| 2898 | $win sash place 0 $sash0 [lindex $s0 1] | |
| 2899 | } | |
| 43bddeb4 PM |
2900 | } |
| 2901 | set oldwidth($win) $w | |
| 2902 | } | |
| 2903 | ||
| b5721c72 PM |
2904 | proc allcanvs args { |
| 2905 | global canv canv2 canv3 | |
| 2906 | eval $canv $args | |
| 2907 | eval $canv2 $args | |
| 2908 | eval $canv3 $args | |
| 2909 | } | |
| 2910 | ||
| 2911 | proc bindall {event action} { | |
| 2912 | global canv canv2 canv3 | |
| 2913 | bind $canv $event $action | |
| 2914 | bind $canv2 $event $action | |
| 2915 | bind $canv3 $event $action | |
| 2916 | } | |
| 2917 | ||
| 9a40c50c | 2918 | proc about {} { |
| d93f1713 | 2919 | global uifont NS |
| 9a40c50c PM |
2920 | set w .about |
| 2921 | if {[winfo exists $w]} { | |
| 2922 | raise $w | |
| 2923 | return | |
| 2924 | } | |
| d93f1713 | 2925 | ttk_toplevel $w |
| d990cedf | 2926 | wm title $w [mc "About gitk"] |
| e7d64008 | 2927 | make_transient $w . |
| d990cedf | 2928 | message $w.m -text [mc " |
| 9f1afe05 | 2929 | Gitk - a commit viewer for git |
| 9a40c50c | 2930 | |
| bb3e86a1 | 2931 | Copyright \u00a9 2005-2011 Paul Mackerras |
| 9a40c50c | 2932 | |
| d990cedf | 2933 | Use and redistribute under the terms of the GNU General Public License"] \ |
| 3a950e9a ER |
2934 | -justify center -aspect 400 -border 2 -bg white -relief groove |
| 2935 | pack $w.m -side top -fill x -padx 2 -pady 2 | |
| d93f1713 | 2936 | ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active |
| 9a40c50c | 2937 | pack $w.ok -side bottom |
| 3a950e9a ER |
2938 | bind $w <Visibility> "focus $w.ok" |
| 2939 | bind $w <Key-Escape> "destroy $w" | |
| 2940 | bind $w <Key-Return> "destroy $w" | |
| d93f1713 | 2941 | tk::PlaceWindow $w widget . |
| 9a40c50c PM |
2942 | } |
| 2943 | ||
| 4e95e1f7 | 2944 | proc keys {} { |
| d93f1713 | 2945 | global NS |
| 4e95e1f7 PM |
2946 | set w .keys |
| 2947 | if {[winfo exists $w]} { | |
| 2948 | raise $w | |
| 2949 | return | |
| 2950 | } | |
| d23d98d3 SP |
2951 | if {[tk windowingsystem] eq {aqua}} { |
| 2952 | set M1T Cmd | |
| 2953 | } else { | |
| 2954 | set M1T Ctrl | |
| 2955 | } | |
| d93f1713 | 2956 | ttk_toplevel $w |
| d990cedf | 2957 | wm title $w [mc "Gitk key bindings"] |
| e7d64008 | 2958 | make_transient $w . |
| 3d2c998e MB |
2959 | message $w.m -text " |
| 2960 | [mc "Gitk key bindings:"] | |
| 2961 | ||
| 2962 | [mc "<%s-Q> Quit" $M1T] | |
| decd0a1e | 2963 | [mc "<%s-W> Close window" $M1T] |
| 3d2c998e MB |
2964 | [mc "<Home> Move to first commit"] |
| 2965 | [mc "<End> Move to last commit"] | |
| 811c70fc JN |
2966 | [mc "<Up>, p, k Move up one commit"] |
| 2967 | [mc "<Down>, n, j Move down one commit"] | |
| 2968 | [mc "<Left>, z, h Go back in history list"] | |
| 3d2c998e MB |
2969 | [mc "<Right>, x, l Go forward in history list"] |
| 2970 | [mc "<PageUp> Move up one page in commit list"] | |
| 2971 | [mc "<PageDown> Move down one page in commit list"] | |
| 2972 | [mc "<%s-Home> Scroll to top of commit list" $M1T] | |
| 2973 | [mc "<%s-End> Scroll to bottom of commit list" $M1T] | |
| 2974 | [mc "<%s-Up> Scroll commit list up one line" $M1T] | |
| 2975 | [mc "<%s-Down> Scroll commit list down one line" $M1T] | |
| 2976 | [mc "<%s-PageUp> Scroll commit list up one page" $M1T] | |
| 2977 | [mc "<%s-PageDown> Scroll commit list down one page" $M1T] | |
| 2978 | [mc "<Shift-Up> Find backwards (upwards, later commits)"] | |
| 2979 | [mc "<Shift-Down> Find forwards (downwards, earlier commits)"] | |
| 2980 | [mc "<Delete>, b Scroll diff view up one page"] | |
| 2981 | [mc "<Backspace> Scroll diff view up one page"] | |
| 2982 | [mc "<Space> Scroll diff view down one page"] | |
| 2983 | [mc "u Scroll diff view up 18 lines"] | |
| 2984 | [mc "d Scroll diff view down 18 lines"] | |
| 2985 | [mc "<%s-F> Find" $M1T] | |
| 2986 | [mc "<%s-G> Move to next find hit" $M1T] | |
| 2987 | [mc "<Return> Move to next find hit"] | |
| 97bed034 | 2988 | [mc "/ Focus the search box"] |
| 3d2c998e MB |
2989 | [mc "? Move to previous find hit"] |
| 2990 | [mc "f Scroll diff view to next file"] | |
| 2991 | [mc "<%s-S> Search for next hit in diff view" $M1T] | |
| 2992 | [mc "<%s-R> Search for previous hit in diff view" $M1T] | |
| 2993 | [mc "<%s-KP+> Increase font size" $M1T] | |
| 2994 | [mc "<%s-plus> Increase font size" $M1T] | |
| 2995 | [mc "<%s-KP-> Decrease font size" $M1T] | |
| 2996 | [mc "<%s-minus> Decrease font size" $M1T] | |
| 2997 | [mc "<F5> Update"] | |
| 2998 | " \ | |
| 3a950e9a ER |
2999 | -justify left -bg white -border 2 -relief groove |
| 3000 | pack $w.m -side top -fill both -padx 2 -pady 2 | |
| d93f1713 | 3001 | ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active |
| 76f15947 | 3002 | bind $w <Key-Escape> [list destroy $w] |
| 4e95e1f7 | 3003 | pack $w.ok -side bottom |
| 3a950e9a ER |
3004 | bind $w <Visibility> "focus $w.ok" |
| 3005 | bind $w <Key-Escape> "destroy $w" | |
| 3006 | bind $w <Key-Return> "destroy $w" | |
| 4e95e1f7 PM |
3007 | } |
| 3008 | ||
| 7fcceed7 PM |
3009 | # Procedures for manipulating the file list window at the |
| 3010 | # bottom right of the overall window. | |
| f8b28a40 PM |
3011 | |
| 3012 | proc treeview {w l openlevs} { | |
| 3013 | global treecontents treediropen treeheight treeparent treeindex | |
| 3014 | ||
| 3015 | set ix 0 | |
| 3016 | set treeindex() 0 | |
| 3017 | set lev 0 | |
| 3018 | set prefix {} | |
| 3019 | set prefixend -1 | |
| 3020 | set prefendstack {} | |
| 3021 | set htstack {} | |
| 3022 | set ht 0 | |
| 3023 | set treecontents() {} | |
| 3024 | $w conf -state normal | |
| 3025 | foreach f $l { | |
| 3026 | while {[string range $f 0 $prefixend] ne $prefix} { | |
| 3027 | if {$lev <= $openlevs} { | |
| 3028 | $w mark set e:$treeindex($prefix) "end -1c" | |
| 3029 | $w mark gravity e:$treeindex($prefix) left | |
| 3030 | } | |
| 3031 | set treeheight($prefix) $ht | |
| 3032 | incr ht [lindex $htstack end] | |
| 3033 | set htstack [lreplace $htstack end end] | |
| 3034 | set prefixend [lindex $prefendstack end] | |
| 3035 | set prefendstack [lreplace $prefendstack end end] | |
| 3036 | set prefix [string range $prefix 0 $prefixend] | |
| 3037 | incr lev -1 | |
| 3038 | } | |
| 3039 | set tail [string range $f [expr {$prefixend+1}] end] | |
| 3040 | while {[set slash [string first "/" $tail]] >= 0} { | |
| 3041 | lappend htstack $ht | |
| 3042 | set ht 0 | |
| 3043 | lappend prefendstack $prefixend | |
| 3044 | incr prefixend [expr {$slash + 1}] | |
| 3045 | set d [string range $tail 0 $slash] | |
| 3046 | lappend treecontents($prefix) $d | |
| 3047 | set oldprefix $prefix | |
| 3048 | append prefix $d | |
| 3049 | set treecontents($prefix) {} | |
| 3050 | set treeindex($prefix) [incr ix] | |
| 3051 | set treeparent($prefix) $oldprefix | |
| 3052 | set tail [string range $tail [expr {$slash+1}] end] | |
| 3053 | if {$lev <= $openlevs} { | |
| 3054 | set ht 1 | |
| 3055 | set treediropen($prefix) [expr {$lev < $openlevs}] | |
| 3056 | set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}] | |
| 3057 | $w mark set d:$ix "end -1c" | |
| 3058 | $w mark gravity d:$ix left | |
| 3059 | set str "\n" | |
| 3060 | for {set i 0} {$i < $lev} {incr i} {append str "\t"} | |
| 3061 | $w insert end $str | |
| 3062 | $w image create end -align center -image $bm -padx 1 \ | |
| 3063 | -name a:$ix | |
| 45a9d505 | 3064 | $w insert end $d [highlight_tag $prefix] |
| f8b28a40 PM |
3065 | $w mark set s:$ix "end -1c" |
| 3066 | $w mark gravity s:$ix left | |
| 3067 | } | |
| 3068 | incr lev | |
| 3069 | } | |
| 3070 | if {$tail ne {}} { | |
| 3071 | if {$lev <= $openlevs} { | |
| 3072 | incr ht | |
| 3073 | set str "\n" | |
| 3074 | for {set i 0} {$i < $lev} {incr i} {append str "\t"} | |
| 3075 | $w insert end $str | |
| 45a9d505 | 3076 | $w insert end $tail [highlight_tag $f] |
| f8b28a40 PM |
3077 | } |
| 3078 | lappend treecontents($prefix) $tail | |
| 3079 | } | |
| 3080 | } | |
| 3081 | while {$htstack ne {}} { | |
| 3082 | set treeheight($prefix) $ht | |
| 3083 | incr ht [lindex $htstack end] | |
| 3084 | set htstack [lreplace $htstack end end] | |
| 096e96b4 BD |
3085 | set prefixend [lindex $prefendstack end] |
| 3086 | set prefendstack [lreplace $prefendstack end end] | |
| 3087 | set prefix [string range $prefix 0 $prefixend] | |
| f8b28a40 PM |
3088 | } |
| 3089 | $w conf -state disabled | |
| 3090 | } | |
| 3091 | ||
| 3092 | proc linetoelt {l} { | |
| 3093 | global treeheight treecontents | |
| 3094 | ||
| 3095 | set y 2 | |
| 3096 | set prefix {} | |
| 3097 | while {1} { | |
| 3098 | foreach e $treecontents($prefix) { | |
| 3099 | if {$y == $l} { | |
| 3100 | return "$prefix$e" | |
| 3101 | } | |
| 3102 | set n 1 | |
| 3103 | if {[string index $e end] eq "/"} { | |
| 3104 | set n $treeheight($prefix$e) | |
| 3105 | if {$y + $n > $l} { | |
| 3106 | append prefix $e | |
| 3107 | incr y | |
| 3108 | break | |
| 3109 | } | |
| 3110 | } | |
| 3111 | incr y $n | |
| 3112 | } | |
| 3113 | } | |
| 3114 | } | |
| 3115 | ||
| 45a9d505 PM |
3116 | proc highlight_tree {y prefix} { |
| 3117 | global treeheight treecontents cflist | |
| 3118 | ||
| 3119 | foreach e $treecontents($prefix) { | |
| 3120 | set path $prefix$e | |
| 3121 | if {[highlight_tag $path] ne {}} { | |
| 3122 | $cflist tag add bold $y.0 "$y.0 lineend" | |
| 3123 | } | |
| 3124 | incr y | |
| 3125 | if {[string index $e end] eq "/" && $treeheight($path) > 1} { | |
| 3126 | set y [highlight_tree $y $path] | |
| 3127 | } | |
| 3128 | } | |
| 3129 | return $y | |
| 3130 | } | |
| 3131 | ||
| f8b28a40 PM |
3132 | proc treeclosedir {w dir} { |
| 3133 | global treediropen treeheight treeparent treeindex | |
| 3134 | ||
| 3135 | set ix $treeindex($dir) | |
| 3136 | $w conf -state normal | |
| 3137 | $w delete s:$ix e:$ix | |
| 3138 | set treediropen($dir) 0 | |
| 3139 | $w image configure a:$ix -image tri-rt | |
| 3140 | $w conf -state disabled | |
| 3141 | set n [expr {1 - $treeheight($dir)}] | |
| 3142 | while {$dir ne {}} { | |
| 3143 | incr treeheight($dir) $n | |
| 3144 | set dir $treeparent($dir) | |
| 3145 | } | |
| 3146 | } | |
| 3147 | ||
| 3148 | proc treeopendir {w dir} { | |
| 3149 | global treediropen treeheight treeparent treecontents treeindex | |
| 3150 | ||
| 3151 | set ix $treeindex($dir) | |
| 3152 | $w conf -state normal | |
| 3153 | $w image configure a:$ix -image tri-dn | |
| 3154 | $w mark set e:$ix s:$ix | |
| 3155 | $w mark gravity e:$ix right | |
| 3156 | set lev 0 | |
| 3157 | set str "\n" | |
| 3158 | set n [llength $treecontents($dir)] | |
| 3159 | for {set x $dir} {$x ne {}} {set x $treeparent($x)} { | |
| 3160 | incr lev | |
| 3161 | append str "\t" | |
| 3162 | incr treeheight($x) $n | |
| 3163 | } | |
| 3164 | foreach e $treecontents($dir) { | |
| 45a9d505 | 3165 | set de $dir$e |
| f8b28a40 | 3166 | if {[string index $e end] eq "/"} { |
| f8b28a40 PM |
3167 | set iy $treeindex($de) |
| 3168 | $w mark set d:$iy e:$ix | |
| 3169 | $w mark gravity d:$iy left | |
| 3170 | $w insert e:$ix $str | |
| 3171 | set treediropen($de) 0 | |
| 3172 | $w image create e:$ix -align center -image tri-rt -padx 1 \ | |
| 3173 | -name a:$iy | |
| 45a9d505 | 3174 | $w insert e:$ix $e [highlight_tag $de] |
| f8b28a40 PM |
3175 | $w mark set s:$iy e:$ix |
| 3176 | $w mark gravity s:$iy left | |
| 3177 | set treeheight($de) 1 | |
| 3178 | } else { | |
| 3179 | $w insert e:$ix $str | |
| 45a9d505 | 3180 | $w insert e:$ix $e [highlight_tag $de] |
| f8b28a40 PM |
3181 | } |
| 3182 | } | |
| b8a640ee | 3183 | $w mark gravity e:$ix right |
| f8b28a40 PM |
3184 | $w conf -state disabled |
| 3185 | set treediropen($dir) 1 | |
| 3186 | set top [lindex [split [$w index @0,0] .] 0] | |
| 3187 | set ht [$w cget -height] | |
| 3188 | set l [lindex [split [$w index s:$ix] .] 0] | |
| 3189 | if {$l < $top} { | |
| 3190 | $w yview $l.0 | |
| 3191 | } elseif {$l + $n + 1 > $top + $ht} { | |
| 3192 | set top [expr {$l + $n + 2 - $ht}] | |
| 3193 | if {$l < $top} { | |
| 3194 | set top $l | |
| 3195 | } | |
| 3196 | $w yview $top.0 | |
| 3197 | } | |
| 3198 | } | |
| 3199 | ||
| 3200 | proc treeclick {w x y} { | |
| 3201 | global treediropen cmitmode ctext cflist cflist_top | |
| 3202 | ||
| 3203 | if {$cmitmode ne "tree"} return | |
| 3204 | if {![info exists cflist_top]} return | |
| 3205 | set l [lindex [split [$w index "@$x,$y"] "."] 0] | |
| 3206 | $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend" | |
| 3207 | $cflist tag add highlight $l.0 "$l.0 lineend" | |
| 3208 | set cflist_top $l | |
| 3209 | if {$l == 1} { | |
| 3210 | $ctext yview 1.0 | |
| 3211 | return | |
| 3212 | } | |
| 3213 | set e [linetoelt $l] | |
| 3214 | if {[string index $e end] ne "/"} { | |
| 3215 | showfile $e | |
| 3216 | } elseif {$treediropen($e)} { | |
| 3217 | treeclosedir $w $e | |
| 3218 | } else { | |
| 3219 | treeopendir $w $e | |
| 3220 | } | |
| 3221 | } | |
| 3222 | ||
| 3223 | proc setfilelist {id} { | |
| 8a897742 | 3224 | global treefilelist cflist jump_to_here |
| f8b28a40 PM |
3225 | |
| 3226 | treeview $cflist $treefilelist($id) 0 | |
| 8a897742 PM |
3227 | if {$jump_to_here ne {}} { |
| 3228 | set f [lindex $jump_to_here 0] | |
| 3229 | if {[lsearch -exact $treefilelist($id) $f] >= 0} { | |
| 3230 | showfile $f | |
| 3231 | } | |
| 3232 | } | |
| f8b28a40 PM |
3233 | } |
| 3234 | ||
| 3235 | image create bitmap tri-rt -background black -foreground blue -data { | |
| 3236 | #define tri-rt_width 13 | |
| 3237 | #define tri-rt_height 13 | |
| 3238 | static unsigned char tri-rt_bits[] = { | |
| 3239 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00, | |
| 3240 | 0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00, | |
| 3241 | 0x00, 0x00}; | |
| 3242 | } -maskdata { | |
| 3243 | #define tri-rt-mask_width 13 | |
| 3244 | #define tri-rt-mask_height 13 | |
| 3245 | static unsigned char tri-rt-mask_bits[] = { | |
| 3246 | 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01, | |
| 3247 | 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00, | |
| 3248 | 0x08, 0x00}; | |
| 3249 | } | |
| 3250 | image create bitmap tri-dn -background black -foreground blue -data { | |
| 3251 | #define tri-dn_width 13 | |
| 3252 | #define tri-dn_height 13 | |
| 3253 | static unsigned char tri-dn_bits[] = { | |
| 3254 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03, | |
| 3255 | 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | |
| 3256 | 0x00, 0x00}; | |
| 3257 | } -maskdata { | |
| 3258 | #define tri-dn-mask_width 13 | |
| 3259 | #define tri-dn-mask_height 13 | |
| 3260 | static unsigned char tri-dn-mask_bits[] = { | |
| 3261 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07, | |
| 3262 | 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, | |
| 3263 | 0x00, 0x00}; | |
| 3264 | } | |
| 3265 | ||
| 887c996e PM |
3266 | image create bitmap reficon-T -background black -foreground yellow -data { |
| 3267 | #define tagicon_width 13 | |
| 3268 | #define tagicon_height 9 | |
| 3269 | static unsigned char tagicon_bits[] = { | |
| 3270 | 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07, | |
| 3271 | 0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00}; | |
| 3272 | } -maskdata { | |
| 3273 | #define tagicon-mask_width 13 | |
| 3274 | #define tagicon-mask_height 9 | |
| 3275 | static unsigned char tagicon-mask_bits[] = { | |
| 3276 | 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f, | |
| 3277 | 0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00}; | |
| 3278 | } | |
| 3279 | set rectdata { | |
| 3280 | #define headicon_width 13 | |
| 3281 | #define headicon_height 9 | |
| 3282 | static unsigned char headicon_bits[] = { | |
| 3283 | 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07, | |
| 3284 | 0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00}; | |
| 3285 | } | |
| 3286 | set rectmask { | |
| 3287 | #define headicon-mask_width 13 | |
| 3288 | #define headicon-mask_height 9 | |
| 3289 | static unsigned char headicon-mask_bits[] = { | |
| 3290 | 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, | |
| 3291 | 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00}; | |
| 3292 | } | |
| 3293 | image create bitmap reficon-H -background black -foreground green \ | |
| 3294 | -data $rectdata -maskdata $rectmask | |
| 3295 | image create bitmap reficon-o -background black -foreground "#ddddff" \ | |
| 3296 | -data $rectdata -maskdata $rectmask | |
| 3297 | ||
| 7fcceed7 | 3298 | proc init_flist {first} { |
| 7fcc92bf | 3299 | global cflist cflist_top difffilestart |
| 7fcceed7 PM |
3300 | |
| 3301 | $cflist conf -state normal | |
| 3302 | $cflist delete 0.0 end | |
| 3303 | if {$first ne {}} { | |
| 3304 | $cflist insert end $first | |
| 3305 | set cflist_top 1 | |
| 7fcceed7 PM |
3306 | $cflist tag add highlight 1.0 "1.0 lineend" |
| 3307 | } else { | |
| 3308 | catch {unset cflist_top} | |
| 3309 | } | |
| 3310 | $cflist conf -state disabled | |
| 3311 | set difffilestart {} | |
| 3312 | } | |
| 3313 | ||
| 63b79191 PM |
3314 | proc highlight_tag {f} { |
| 3315 | global highlight_paths | |
| 3316 | ||
| 3317 | foreach p $highlight_paths { | |
| 3318 | if {[string match $p $f]} { | |
| 3319 | return "bold" | |
| 3320 | } | |
| 3321 | } | |
| 3322 | return {} | |
| 3323 | } | |
| 3324 | ||
| 3325 | proc highlight_filelist {} { | |
| 45a9d505 | 3326 | global cmitmode cflist |
| 63b79191 | 3327 | |
| 45a9d505 PM |
3328 | $cflist conf -state normal |
| 3329 | if {$cmitmode ne "tree"} { | |
| 63b79191 PM |
3330 | set end [lindex [split [$cflist index end] .] 0] |
| 3331 | for {set l 2} {$l < $end} {incr l} { | |
| 3332 | set line [$cflist get $l.0 "$l.0 lineend"] | |
| 3333 | if {[highlight_tag $line] ne {}} { | |
| 3334 | $cflist tag add bold $l.0 "$l.0 lineend" | |
| 3335 | } | |
| 3336 | } | |
| 45a9d505 PM |
3337 | } else { |
| 3338 | highlight_tree 2 {} | |
| 63b79191 | 3339 | } |
| 45a9d505 | 3340 | $cflist conf -state disabled |
| 63b79191 PM |
3341 | } |
| 3342 | ||
| 3343 | proc unhighlight_filelist {} { | |
| 45a9d505 | 3344 | global cflist |
| 63b79191 | 3345 | |
| 45a9d505 PM |
3346 | $cflist conf -state normal |
| 3347 | $cflist tag remove bold 1.0 end | |
| 3348 | $cflist conf -state disabled | |
| 63b79191 PM |
3349 | } |
| 3350 | ||
| f8b28a40 | 3351 | proc add_flist {fl} { |
| 45a9d505 | 3352 | global cflist |
| 7fcceed7 | 3353 | |
| 45a9d505 PM |
3354 | $cflist conf -state normal |
| 3355 | foreach f $fl { | |
| 3356 | $cflist insert end "\n" | |
| 3357 | $cflist insert end $f [highlight_tag $f] | |
| 7fcceed7 | 3358 | } |
| 45a9d505 | 3359 | $cflist conf -state disabled |
| 7fcceed7 PM |
3360 | } |
| 3361 | ||
| 3362 | proc sel_flist {w x y} { | |
| 45a9d505 | 3363 | global ctext difffilestart cflist cflist_top cmitmode |
| 7fcceed7 | 3364 | |
| f8b28a40 | 3365 | if {$cmitmode eq "tree"} return |
| 7fcceed7 PM |
3366 | if {![info exists cflist_top]} return |
| 3367 | set l [lindex [split [$w index "@$x,$y"] "."] 0] | |
| 89b11d3b PM |
3368 | $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend" |
| 3369 | $cflist tag add highlight $l.0 "$l.0 lineend" | |
| 3370 | set cflist_top $l | |
| f8b28a40 PM |
3371 | if {$l == 1} { |
| 3372 | $ctext yview 1.0 | |
| 3373 | } else { | |
| 3374 | catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]} | |
| 7fcceed7 | 3375 | } |
| b967135d | 3376 | suppress_highlighting_file_for_current_scrollpos |
| 7fcceed7 PM |
3377 | } |
| 3378 | ||
| 3244729a PM |
3379 | proc pop_flist_menu {w X Y x y} { |
| 3380 | global ctext cflist cmitmode flist_menu flist_menu_file | |
| 3381 | global treediffs diffids | |
| 3382 | ||
| bb3edc8b | 3383 | stopfinding |
| 3244729a PM |
3384 | set l [lindex [split [$w index "@$x,$y"] "."] 0] |
| 3385 | if {$l <= 1} return | |
| 3386 | if {$cmitmode eq "tree"} { | |
| 3387 | set e [linetoelt $l] | |
| 3388 | if {[string index $e end] eq "/"} return | |
| 3389 | } else { | |
| 3390 | set e [lindex $treediffs($diffids) [expr {$l-2}]] | |
| 3391 | } | |
| 3392 | set flist_menu_file $e | |
| 314f5de1 TA |
3393 | set xdiffstate "normal" |
| 3394 | if {$cmitmode eq "tree"} { | |
| 3395 | set xdiffstate "disabled" | |
| 3396 | } | |
| 3397 | # Disable "External diff" item in tree mode | |
| 3398 | $flist_menu entryconf 2 -state $xdiffstate | |
| 3244729a PM |
3399 | tk_popup $flist_menu $X $Y |
| 3400 | } | |
| 3401 | ||
| 7cdc3556 AG |
3402 | proc find_ctext_fileinfo {line} { |
| 3403 | global ctext_file_names ctext_file_lines | |
| 3404 | ||
| 3405 | set ok [bsearch $ctext_file_lines $line] | |
| 3406 | set tline [lindex $ctext_file_lines $ok] | |
| 3407 | ||
| 3408 | if {$ok >= [llength $ctext_file_lines] || $line < $tline} { | |
| 3409 | return {} | |
| 3410 | } else { | |
| 3411 | return [list [lindex $ctext_file_names $ok] $tline] | |
| 3412 | } | |
| 3413 | } | |
| 3414 | ||
| 3415 | proc pop_diff_menu {w X Y x y} { | |
| 3416 | global ctext diff_menu flist_menu_file | |
| 3417 | global diff_menu_txtpos diff_menu_line | |
| 3418 | global diff_menu_filebase | |
| 3419 | ||
| 7cdc3556 AG |
3420 | set diff_menu_txtpos [split [$w index "@$x,$y"] "."] |
| 3421 | set diff_menu_line [lindex $diff_menu_txtpos 0] | |
| 190ec52c PM |
3422 | # don't pop up the menu on hunk-separator or file-separator lines |
| 3423 | if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} { | |
| 3424 | return | |
| 3425 | } | |
| 3426 | stopfinding | |
| 7cdc3556 AG |
3427 | set f [find_ctext_fileinfo $diff_menu_line] |
| 3428 | if {$f eq {}} return | |
| 3429 | set flist_menu_file [lindex $f 0] | |
| 3430 | set diff_menu_filebase [lindex $f 1] | |
| 3431 | tk_popup $diff_menu $X $Y | |
| 3432 | } | |
| 3433 | ||
| 3244729a | 3434 | proc flist_hl {only} { |
| bb3edc8b | 3435 | global flist_menu_file findstring gdttype |
| 3244729a PM |
3436 | |
| 3437 | set x [shellquote $flist_menu_file] | |
| b007ee20 | 3438 | if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} { |
| bb3edc8b | 3439 | set findstring $x |
| 3244729a | 3440 | } else { |
| bb3edc8b | 3441 | append findstring " " $x |
| 3244729a | 3442 | } |
| b007ee20 | 3443 | set gdttype [mc "touching paths:"] |
| 3244729a PM |
3444 | } |
| 3445 | ||
| c21398be PM |
3446 | proc gitknewtmpdir {} { |
| 3447 | global diffnum gitktmpdir gitdir | |
| 3448 | ||
| 3449 | if {![info exists gitktmpdir]} { | |
| 929f577e | 3450 | set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]] |
| c21398be PM |
3451 | if {[catch {file mkdir $gitktmpdir} err]} { |
| 3452 | error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err" | |
| 3453 | unset gitktmpdir | |
| 3454 | return {} | |
| 3455 | } | |
| 3456 | set diffnum 0 | |
| 3457 | } | |
| 3458 | incr diffnum | |
| 3459 | set diffdir [file join $gitktmpdir $diffnum] | |
| 3460 | if {[catch {file mkdir $diffdir} err]} { | |
| 3461 | error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err" | |
| 3462 | return {} | |
| 3463 | } | |
| 3464 | return $diffdir | |
| 3465 | } | |
| 3466 | ||
| 314f5de1 TA |
3467 | proc save_file_from_commit {filename output what} { |
| 3468 | global nullfile | |
| 3469 | ||
| 3470 | if {[catch {exec git show $filename -- > $output} err]} { | |
| 3471 | if {[string match "fatal: bad revision *" $err]} { | |
| 3472 | return $nullfile | |
| 3473 | } | |
| 3945d2c0 | 3474 | error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err" |
| 314f5de1 TA |
3475 | return {} |
| 3476 | } | |
| 3477 | return $output | |
| 3478 | } | |
| 3479 | ||
| 3480 | proc external_diff_get_one_file {diffid filename diffdir} { | |
| 3481 | global nullid nullid2 nullfile | |
| 784b7e2f | 3482 | global worktree |
| 314f5de1 TA |
3483 | |
| 3484 | if {$diffid == $nullid} { | |
| 784b7e2f | 3485 | set difffile [file join $worktree $filename] |
| 314f5de1 TA |
3486 | if {[file exists $difffile]} { |
| 3487 | return $difffile | |
| 3488 | } | |
| 3489 | return $nullfile | |
| 3490 | } | |
| 3491 | if {$diffid == $nullid2} { | |
| 3492 | set difffile [file join $diffdir "\[index\] [file tail $filename]"] | |
| 3493 | return [save_file_from_commit :$filename $difffile index] | |
| 3494 | } | |
| 3495 | set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"] | |
| 3496 | return [save_file_from_commit $diffid:$filename $difffile \ | |
| 3497 | "revision $diffid"] | |
| 3498 | } | |
| 3499 | ||
| 3500 | proc external_diff {} { | |
| c21398be | 3501 | global nullid nullid2 |
| 314f5de1 TA |
3502 | global flist_menu_file |
| 3503 | global diffids | |
| c21398be | 3504 | global extdifftool |
| 314f5de1 TA |
3505 | |
| 3506 | if {[llength $diffids] == 1} { | |
| 3507 | # no reference commit given | |
| 3508 | set diffidto [lindex $diffids 0] | |
| 3509 | if {$diffidto eq $nullid} { | |
| 3510 | # diffing working copy with index | |
| 3511 | set diffidfrom $nullid2 | |
| 3512 | } elseif {$diffidto eq $nullid2} { | |
| 3513 | # diffing index with HEAD | |
| 3514 | set diffidfrom "HEAD" | |
| 3515 | } else { | |
| 3516 | # use first parent commit | |
| 3517 | global parentlist selectedline | |
| 3518 | set diffidfrom [lindex $parentlist $selectedline 0] | |
| 3519 | } | |
| 3520 | } else { | |
| 3521 | set diffidfrom [lindex $diffids 0] | |
| 3522 | set diffidto [lindex $diffids 1] | |
| 3523 | } | |
| 3524 | ||
| 3525 | # make sure that several diffs wont collide | |
| c21398be PM |
3526 | set diffdir [gitknewtmpdir] |
| 3527 | if {$diffdir eq {}} return | |
| 314f5de1 TA |
3528 | |
| 3529 | # gather files to diff | |
| 3530 | set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir] | |
| 3531 | set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir] | |
| 3532 | ||
| 3533 | if {$difffromfile ne {} && $difftofile ne {}} { | |
| b575b2f1 PT |
3534 | set cmd [list [shellsplit $extdifftool] $difffromfile $difftofile] |
| 3535 | if {[catch {set fl [open |$cmd r]} err]} { | |
| 314f5de1 | 3536 | file delete -force $diffdir |
| 3945d2c0 | 3537 | error_popup "$extdifftool: [mc "command failed:"] $err" |
| 314f5de1 TA |
3538 | } else { |
| 3539 | fconfigure $fl -blocking 0 | |
| 3540 | filerun $fl [list delete_at_eof $fl $diffdir] | |
| 3541 | } | |
| 3542 | } | |
| 3543 | } | |
| 3544 | ||
| 7cdc3556 AG |
3545 | proc find_hunk_blamespec {base line} { |
| 3546 | global ctext | |
| 3547 | ||
| 3548 | # Find and parse the hunk header | |
| 3549 | set s_lix [$ctext search -backwards -regexp ^@@ "$line.0 lineend" $base.0] | |
| 3550 | if {$s_lix eq {}} return | |
| 3551 | ||
| 3552 | set s_line [$ctext get $s_lix "$s_lix + 1 lines"] | |
| 3553 | if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \ | |
| 3554 | s_line old_specs osz osz1 new_line nsz]} { | |
| 3555 | return | |
| 3556 | } | |
| 3557 | ||
| 3558 | # base lines for the parents | |
| 3559 | set base_lines [list $new_line] | |
| 3560 | foreach old_spec [lrange [split $old_specs " "] 1 end] { | |
| 3561 | if {![regexp -- {-(\d+)(,\d+)?} $old_spec \ | |
| 3562 | old_spec old_line osz]} { | |
| 3563 | return | |
| 3564 | } | |
| 3565 | lappend base_lines $old_line | |
| 3566 | } | |
| 3567 | ||
| 3568 | # Now scan the lines to determine offset within the hunk | |
| 7cdc3556 AG |
3569 | set max_parent [expr {[llength $base_lines]-2}] |
| 3570 | set dline 0 | |
| 3571 | set s_lno [lindex [split $s_lix "."] 0] | |
| 3572 | ||
| 190ec52c PM |
3573 | # Determine if the line is removed |
| 3574 | set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"] | |
| 3575 | if {[string match {[-+ ]*} $chunk]} { | |
| 7cdc3556 AG |
3576 | set removed_idx [string first "-" $chunk] |
| 3577 | # Choose a parent index | |
| 190ec52c PM |
3578 | if {$removed_idx >= 0} { |
| 3579 | set parent $removed_idx | |
| 3580 | } else { | |
| 3581 | set unchanged_idx [string first " " $chunk] | |
| 3582 | if {$unchanged_idx >= 0} { | |
| 3583 | set parent $unchanged_idx | |
| 7cdc3556 | 3584 | } else { |
| 190ec52c PM |
3585 | # blame the current commit |
| 3586 | set parent -1 | |
| 7cdc3556 AG |
3587 | } |
| 3588 | } | |
| 3589 | # then count other lines that belong to it | |
| 190ec52c PM |
3590 | for {set i $line} {[incr i -1] > $s_lno} {} { |
| 3591 | set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"] | |
| 3592 | # Determine if the line is removed | |
| 3593 | set removed_idx [string first "-" $chunk] | |
| 3594 | if {$parent >= 0} { | |
| 3595 | set code [string index $chunk $parent] | |
| 3596 | if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} { | |
| 3597 | incr dline | |
| 3598 | } | |
| 3599 | } else { | |
| 3600 | if {$removed_idx < 0} { | |
| 3601 | incr dline | |
| 3602 | } | |
| 7cdc3556 AG |
3603 | } |
| 3604 | } | |
| 190ec52c PM |
3605 | incr parent |
| 3606 | } else { | |
| 3607 | set parent 0 | |
| 7cdc3556 AG |
3608 | } |
| 3609 | ||
| 7cdc3556 AG |
3610 | incr dline [lindex $base_lines $parent] |
| 3611 | return [list $parent $dline] | |
| 3612 | } | |
| 3613 | ||
| 3614 | proc external_blame_diff {} { | |
| 8b07dca1 | 3615 | global currentid cmitmode |
| 7cdc3556 AG |
3616 | global diff_menu_txtpos diff_menu_line |
| 3617 | global diff_menu_filebase flist_menu_file | |
| 3618 | ||
| 3619 | if {$cmitmode eq "tree"} { | |
| 3620 | set parent_idx 0 | |
| 190ec52c | 3621 | set line [expr {$diff_menu_line - $diff_menu_filebase}] |
| 7cdc3556 AG |
3622 | } else { |
| 3623 | set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line] | |
| 3624 | if {$hinfo ne {}} { | |
| 3625 | set parent_idx [lindex $hinfo 0] | |
| 3626 | set line [lindex $hinfo 1] | |
| 3627 | } else { | |
| 3628 | set parent_idx 0 | |
| 3629 | set line 0 | |
| 3630 | } | |
| 3631 | } | |
| 3632 | ||
| 3633 | external_blame $parent_idx $line | |
| 3634 | } | |
| 3635 | ||
| fc4977e1 PM |
3636 | # Find the SHA1 ID of the blob for file $fname in the index |
| 3637 | # at stage 0 or 2 | |
| 3638 | proc index_sha1 {fname} { | |
| 3639 | set f [open [list | git ls-files -s $fname] r] | |
| 3640 | while {[gets $f line] >= 0} { | |
| 3641 | set info [lindex [split $line "\t"] 0] | |
| 3642 | set stage [lindex $info 2] | |
| 3643 | if {$stage eq "0" || $stage eq "2"} { | |
| 3644 | close $f | |
| 3645 | return [lindex $info 1] | |
| 3646 | } | |
| 3647 | } | |
| 3648 | close $f | |
| 3649 | return {} | |
| 3650 | } | |
| 3651 | ||
| 9712b81a PM |
3652 | # Turn an absolute path into one relative to the current directory |
| 3653 | proc make_relative {f} { | |
| a4390ace MH |
3654 | if {[file pathtype $f] eq "relative"} { |
| 3655 | return $f | |
| 3656 | } | |
| 9712b81a PM |
3657 | set elts [file split $f] |
| 3658 | set here [file split [pwd]] | |
| 3659 | set ei 0 | |
| 3660 | set hi 0 | |
| 3661 | set res {} | |
| 3662 | foreach d $here { | |
| 3663 | if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} { | |
| 3664 | lappend res ".." | |
| 3665 | } else { | |
| 3666 | incr ei | |
| 3667 | } | |
| 3668 | incr hi | |
| 3669 | } | |
| 3670 | set elts [concat $res [lrange $elts $ei end]] | |
| 3671 | return [eval file join $elts] | |
| 3672 | } | |
| 3673 | ||
| 7cdc3556 | 3674 | proc external_blame {parent_idx {line {}}} { |
| 0a2a9793 | 3675 | global flist_menu_file cdup |
| 77aa0ae8 AG |
3676 | global nullid nullid2 |
| 3677 | global parentlist selectedline currentid | |
| 3678 | ||
| 3679 | if {$parent_idx > 0} { | |
| 3680 | set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]] | |
| 3681 | } else { | |
| 3682 | set base_commit $currentid | |
| 3683 | } | |
| 3684 | ||
| 3685 | if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} { | |
| 3686 | error_popup [mc "No such commit"] | |
| 3687 | return | |
| 3688 | } | |
| 3689 | ||
| 7cdc3556 AG |
3690 | set cmdline [list git gui blame] |
| 3691 | if {$line ne {} && $line > 1} { | |
| 3692 | lappend cmdline "--line=$line" | |
| 3693 | } | |
| 0a2a9793 | 3694 | set f [file join $cdup $flist_menu_file] |
| 9712b81a PM |
3695 | # Unfortunately it seems git gui blame doesn't like |
| 3696 | # being given an absolute path... | |
| 3697 | set f [make_relative $f] | |
| 3698 | lappend cmdline $base_commit $f | |
| 7cdc3556 | 3699 | if {[catch {eval exec $cmdline &} err]} { |
| 3945d2c0 | 3700 | error_popup "[mc "git gui blame: command failed:"] $err" |
| 77aa0ae8 AG |
3701 | } |
| 3702 | } | |
| 3703 | ||
| 8a897742 PM |
3704 | proc show_line_source {} { |
| 3705 | global cmitmode currentid parents curview blamestuff blameinst | |
| 3706 | global diff_menu_line diff_menu_filebase flist_menu_file | |
| 9b6adf34 | 3707 | global nullid nullid2 gitdir cdup |
| 8a897742 | 3708 | |
| fc4977e1 | 3709 | set from_index {} |
| 8a897742 PM |
3710 | if {$cmitmode eq "tree"} { |
| 3711 | set id $currentid | |
| 3712 | set line [expr {$diff_menu_line - $diff_menu_filebase}] | |
| 3713 | } else { | |
| 3714 | set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line] | |
| 3715 | if {$h eq {}} return | |
| 3716 | set pi [lindex $h 0] | |
| 3717 | if {$pi == 0} { | |
| 3718 | mark_ctext_line $diff_menu_line | |
| 3719 | return | |
| 3720 | } | |
| fc4977e1 PM |
3721 | incr pi -1 |
| 3722 | if {$currentid eq $nullid} { | |
| 3723 | if {$pi > 0} { | |
| 3724 | # must be a merge in progress... | |
| 3725 | if {[catch { | |
| 3726 | # get the last line from .git/MERGE_HEAD | |
| 3727 | set f [open [file join $gitdir MERGE_HEAD] r] | |
| 3728 | set id [lindex [split [read $f] "\n"] end-1] | |
| 3729 | close $f | |
| 3730 | } err]} { | |
| 3731 | error_popup [mc "Couldn't read merge head: %s" $err] | |
| 3732 | return | |
| 3733 | } | |
| 3734 | } elseif {$parents($curview,$currentid) eq $nullid2} { | |
| 3735 | # need to do the blame from the index | |
| 3736 | if {[catch { | |
| 3737 | set from_index [index_sha1 $flist_menu_file] | |
| 3738 | } err]} { | |
| 3739 | error_popup [mc "Error reading index: %s" $err] | |
| 3740 | return | |
| 3741 | } | |
| 9712b81a PM |
3742 | } else { |
| 3743 | set id $parents($curview,$currentid) | |
| fc4977e1 PM |
3744 | } |
| 3745 | } else { | |
| 3746 | set id [lindex $parents($curview,$currentid) $pi] | |
| 3747 | } | |
| 8a897742 PM |
3748 | set line [lindex $h 1] |
| 3749 | } | |
| fc4977e1 PM |
3750 | set blameargs {} |
| 3751 | if {$from_index ne {}} { | |
| 3752 | lappend blameargs | git cat-file blob $from_index | |
| 3753 | } | |
| 3754 | lappend blameargs | git blame -p -L$line,+1 | |
| 3755 | if {$from_index ne {}} { | |
| 3756 | lappend blameargs --contents - | |
| 3757 | } else { | |
| 3758 | lappend blameargs $id | |
| 3759 | } | |
| 9b6adf34 | 3760 | lappend blameargs -- [file join $cdup $flist_menu_file] |
| 8a897742 | 3761 | if {[catch { |
| fc4977e1 | 3762 | set f [open $blameargs r] |
| 8a897742 PM |
3763 | } err]} { |
| 3764 | error_popup [mc "Couldn't start git blame: %s" $err] | |
| 3765 | return | |
| 3766 | } | |
| f3413079 | 3767 | nowbusy blaming [mc "Searching"] |
| 8a897742 PM |
3768 | fconfigure $f -blocking 0 |
| 3769 | set i [reg_instance $f] | |
| 3770 | set blamestuff($i) {} | |
| 3771 | set blameinst $i | |
| 3772 | filerun $f [list read_line_source $f $i] | |
| 3773 | } | |
| 3774 | ||
| 3775 | proc stopblaming {} { | |
| 3776 | global blameinst | |
| 3777 | ||
| 3778 | if {[info exists blameinst]} { | |
| 3779 | stop_instance $blameinst | |
| 3780 | unset blameinst | |
| f3413079 | 3781 | notbusy blaming |
| 8a897742 PM |
3782 | } |
| 3783 | } | |
| 3784 | ||
| 3785 | proc read_line_source {fd inst} { | |
| fc4977e1 | 3786 | global blamestuff curview commfd blameinst nullid nullid2 |
| 8a897742 PM |
3787 | |
| 3788 | while {[gets $fd line] >= 0} { | |
| 3789 | lappend blamestuff($inst) $line | |
| 3790 | } | |
| 3791 | if {![eof $fd]} { | |
| 3792 | return 1 | |
| 3793 | } | |
| 3794 | unset commfd($inst) | |
| 3795 | unset blameinst | |
| f3413079 | 3796 | notbusy blaming |
| 8a897742 PM |
3797 | fconfigure $fd -blocking 1 |
| 3798 | if {[catch {close $fd} err]} { | |
| 3799 | error_popup [mc "Error running git blame: %s" $err] | |
| 3800 | return 0 | |
| 3801 | } | |
| 3802 | ||
| 3803 | set fname {} | |
| 3804 | set line [split [lindex $blamestuff($inst) 0] " "] | |
| 3805 | set id [lindex $line 0] | |
| 3806 | set lnum [lindex $line 1] | |
| 3807 | if {[string length $id] == 40 && [string is xdigit $id] && | |
| 3808 | [string is digit -strict $lnum]} { | |
| 3809 | # look for "filename" line | |
| 3810 | foreach l $blamestuff($inst) { | |
| 3811 | if {[string match "filename *" $l]} { | |
| 3812 | set fname [string range $l 9 end] | |
| 3813 | break | |
| 3814 | } | |
| 3815 | } | |
| 3816 | } | |
| 3817 | if {$fname ne {}} { | |
| 3818 | # all looks good, select it | |
| fc4977e1 PM |
3819 | if {$id eq $nullid} { |
| 3820 | # blame uses all-zeroes to mean not committed, | |
| 3821 | # which would mean a change in the index | |
| 3822 | set id $nullid2 | |
| 3823 | } | |
| 8a897742 PM |
3824 | if {[commitinview $id $curview]} { |
| 3825 | selectline [rowofcommit $id] 1 [list $fname $lnum] | |
| 3826 | } else { | |
| 3827 | error_popup [mc "That line comes from commit %s, \ | |
| 3828 | which is not in this view" [shortids $id]] | |
| 3829 | } | |
| 3830 | } else { | |
| 3831 | puts "oops couldn't parse git blame output" | |
| 3832 | } | |
| 3833 | return 0 | |
| 3834 | } | |
| 3835 | ||
| 314f5de1 TA |
3836 | # delete $dir when we see eof on $f (presumably because the child has exited) |
| 3837 | proc delete_at_eof {f dir} { | |
| 3838 | while {[gets $f line] >= 0} {} | |
| 3839 | if {[eof $f]} { | |
| 3840 | if {[catch {close $f} err]} { | |
| 3945d2c0 | 3841 | error_popup "[mc "External diff viewer failed:"] $err" |
| 314f5de1 TA |
3842 | } |
| 3843 | file delete -force $dir | |
| 3844 | return 0 | |
| 3845 | } | |
| 3846 | return 1 | |
| 3847 | } | |
| 3848 | ||
| 098dd8a3 PM |
3849 | # Functions for adding and removing shell-type quoting |
| 3850 | ||
| 3851 | proc shellquote {str} { | |
| 3852 | if {![string match "*\['\"\\ \t]*" $str]} { | |
| 3853 | return $str | |
| 3854 | } | |
| 3855 | if {![string match "*\['\"\\]*" $str]} { | |
| 3856 | return "\"$str\"" | |
| 3857 | } | |
| 3858 | if {![string match "*'*" $str]} { | |
| 3859 | return "'$str'" | |
| 3860 | } | |
| 3861 | return "\"[string map {\" \\\" \\ \\\\} $str]\"" | |
| 3862 | } | |
| 3863 | ||
| 3864 | proc shellarglist {l} { | |
| 3865 | set str {} | |
| 3866 | foreach a $l { | |
| 3867 | if {$str ne {}} { | |
| 3868 | append str " " | |
| 3869 | } | |
| 3870 | append str [shellquote $a] | |
| 3871 | } | |
| 3872 | return $str | |
| 3873 | } | |
| 3874 | ||
| 3875 | proc shelldequote {str} { | |
| 3876 | set ret {} | |
| 3877 | set used -1 | |
| 3878 | while {1} { | |
| 3879 | incr used | |
| 3880 | if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} { | |
| 3881 | append ret [string range $str $used end] | |
| 3882 | set used [string length $str] | |
| 3883 | break | |
| 3884 | } | |
| 3885 | set first [lindex $first 0] | |
| 3886 | set ch [string index $str $first] | |
| 3887 | if {$first > $used} { | |
| 3888 | append ret [string range $str $used [expr {$first - 1}]] | |
| 3889 | set used $first | |
| 3890 | } | |
| 3891 | if {$ch eq " " || $ch eq "\t"} break | |
| 3892 | incr used | |
| 3893 | if {$ch eq "'"} { | |
| 3894 | set first [string first "'" $str $used] | |
| 3895 | if {$first < 0} { | |
| 3896 | error "unmatched single-quote" | |
| 3897 | } | |
| 3898 | append ret [string range $str $used [expr {$first - 1}]] | |
| 3899 | set used $first | |
| 3900 | continue | |
| 3901 | } | |
| 3902 | if {$ch eq "\\"} { | |
| 3903 | if {$used >= [string length $str]} { | |
| 3904 | error "trailing backslash" | |
| 3905 | } | |
| 3906 | append ret [string index $str $used] | |
| 3907 | continue | |
| 3908 | } | |
| 3909 | # here ch == "\"" | |
| 3910 | while {1} { | |
| 3911 | if {![regexp -start $used -indices "\[\"\\\\]" $str first]} { | |
| 3912 | error "unmatched double-quote" | |
| 3913 | } | |
| 3914 | set first [lindex $first 0] | |
| 3915 | set ch [string index $str $first] | |
| 3916 | if {$first > $used} { | |
| 3917 | append ret [string range $str $used [expr {$first - 1}]] | |
| 3918 | set used $first | |
| 3919 | } | |
| 3920 | if {$ch eq "\""} break | |
| 3921 | incr used | |
| 3922 | append ret [string index $str $used] | |
| 3923 | incr used | |
| 3924 | } | |
| 3925 | } | |
| 3926 | return [list $used $ret] | |
| 3927 | } | |
| 3928 | ||
| 3929 | proc shellsplit {str} { | |
| 3930 | set l {} | |
| 3931 | while {1} { | |
| 3932 | set str [string trimleft $str] | |
| 3933 | if {$str eq {}} break | |
| 3934 | set dq [shelldequote $str] | |
| 3935 | set n [lindex $dq 0] | |
| 3936 | set word [lindex $dq 1] | |
| 3937 | set str [string range $str $n end] | |
| 3938 | lappend l $word | |
| 3939 | } | |
| 3940 | return $l | |
| 3941 | } | |
| 3942 | ||
| 7fcceed7 PM |
3943 | # Code to implement multiple views |
| 3944 | ||
| da7c24dd | 3945 | proc newview {ishighlight} { |
| 218a900b AG |
3946 | global nextviewnum newviewname newishighlight |
| 3947 | global revtreeargs viewargscmd newviewopts curview | |
| 50b44ece | 3948 | |
| da7c24dd | 3949 | set newishighlight $ishighlight |
| 50b44ece PM |
3950 | set top .gitkview |
| 3951 | if {[winfo exists $top]} { | |
| 3952 | raise $top | |
| 3953 | return | |
| 3954 | } | |
| 5d11f794 | 3955 | decode_view_opts $nextviewnum $revtreeargs |
| a3a1f579 | 3956 | set newviewname($nextviewnum) "[mc "View"] $nextviewnum" |
| 218a900b AG |
3957 | set newviewopts($nextviewnum,perm) 0 |
| 3958 | set newviewopts($nextviewnum,cmd) $viewargscmd($curview) | |
| d990cedf | 3959 | vieweditor $top $nextviewnum [mc "Gitk view definition"] |
| d16c0812 PM |
3960 | } |
| 3961 | ||
| 218a900b | 3962 | set known_view_options { |
| 13d40b61 EN |
3963 | {perm b . {} {mc "Remember this view"}} |
| 3964 | {reflabel l + {} {mc "References (space separated list):"}} | |
| 3965 | {refs t15 .. {} {mc "Branches & tags:"}} | |
| 3966 | {allrefs b *. "--all" {mc "All refs"}} | |
| 3967 | {branches b . "--branches" {mc "All (local) branches"}} | |
| 3968 | {tags b . "--tags" {mc "All tags"}} | |
| 3969 | {remotes b . "--remotes" {mc "All remote-tracking branches"}} | |
| 3970 | {commitlbl l + {} {mc "Commit Info (regular expressions):"}} | |
| 3971 | {author t15 .. "--author=*" {mc "Author:"}} | |
| 3972 | {committer t15 . "--committer=*" {mc "Committer:"}} | |
| 3973 | {loginfo t15 .. "--grep=*" {mc "Commit Message:"}} | |
| 3974 | {allmatch b .. "--all-match" {mc "Matches all Commit Info criteria"}} | |
| 3975 | {changes_l l + {} {mc "Changes to Files:"}} | |
| 3976 | {pickaxe_s r0 . {} {mc "Fixed String"}} | |
| 3977 | {pickaxe_t r1 . "--pickaxe-regex" {mc "Regular Expression"}} | |
| 3978 | {pickaxe t15 .. "-S*" {mc "Search string:"}} | |
| 3979 | {datelabel l + {} {mc "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 15:27:38\"):"}} | |
| 3980 | {since t15 .. {"--since=*" "--after=*"} {mc "Since:"}} | |
| 3981 | {until t15 . {"--until=*" "--before=*"} {mc "Until:"}} | |
| 3982 | {limit_lbl l + {} {mc "Limit and/or skip a number of revisions (positive integer):"}} | |
| 3983 | {limit t10 *. "--max-count=*" {mc "Number to show:"}} | |
| 3984 | {skip t10 . "--skip=*" {mc "Number to skip:"}} | |
| 3985 | {misc_lbl l + {} {mc "Miscellaneous options:"}} | |
| 3986 | {dorder b *. {"--date-order" "-d"} {mc "Strictly sort by date"}} | |
| 3987 | {lright b . "--left-right" {mc "Mark branch sides"}} | |
| 3988 | {first b . "--first-parent" {mc "Limit to first parent"}} | |
| f687aaa8 | 3989 | {smplhst b . "--simplify-by-decoration" {mc "Simple history"}} |
| 13d40b61 EN |
3990 | {args t50 *. {} {mc "Additional arguments to git log:"}} |
| 3991 | {allpaths path + {} {mc "Enter files and directories to include, one per line:"}} | |
| 3992 | {cmd t50= + {} {mc "Command to generate more commits to include:"}} | |
| 218a900b AG |
3993 | } |
| 3994 | ||
| e7feb695 | 3995 | # Convert $newviewopts($n, ...) into args for git log. |
| 218a900b AG |
3996 | proc encode_view_opts {n} { |
| 3997 | global known_view_options newviewopts | |
| 3998 | ||
| 3999 | set rargs [list] | |
| 4000 | foreach opt $known_view_options { | |
| 4001 | set patterns [lindex $opt 3] | |
| 4002 | if {$patterns eq {}} continue | |
| 4003 | set pattern [lindex $patterns 0] | |
| 4004 | ||
| 218a900b | 4005 | if {[lindex $opt 1] eq "b"} { |
| 13d40b61 | 4006 | set val $newviewopts($n,[lindex $opt 0]) |
| 218a900b AG |
4007 | if {$val} { |
| 4008 | lappend rargs $pattern | |
| 4009 | } | |
| 13d40b61 EN |
4010 | } elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} { |
| 4011 | regexp {^(.*_)} [lindex $opt 0] uselessvar button_id | |
| 4012 | set val $newviewopts($n,$button_id) | |
| 4013 | if {$val eq $value} { | |
| 4014 | lappend rargs $pattern | |
| 4015 | } | |
| 218a900b | 4016 | } else { |
| 13d40b61 | 4017 | set val $newviewopts($n,[lindex $opt 0]) |
| 218a900b AG |
4018 | set val [string trim $val] |
| 4019 | if {$val ne {}} { | |
| 4020 | set pfix [string range $pattern 0 end-1] | |
| 4021 | lappend rargs $pfix$val | |
| 4022 | } | |
| 4023 | } | |
| 4024 | } | |
| 13d40b61 | 4025 | set rargs [concat $rargs [shellsplit $newviewopts($n,refs)]] |
| 218a900b AG |
4026 | return [concat $rargs [shellsplit $newviewopts($n,args)]] |
| 4027 | } | |
| 4028 | ||
| e7feb695 | 4029 | # Fill $newviewopts($n, ...) based on args for git log. |
| 218a900b AG |
4030 | proc decode_view_opts {n view_args} { |
| 4031 | global known_view_options newviewopts | |
| 4032 | ||
| 4033 | foreach opt $known_view_options { | |
| 13d40b61 | 4034 | set id [lindex $opt 0] |
| 218a900b | 4035 | if {[lindex $opt 1] eq "b"} { |
| 13d40b61 EN |
4036 | # Checkboxes |
| 4037 | set val 0 | |
| 4038 | } elseif {[regexp {^r(\d+)$} [lindex $opt 1]]} { | |
| 4039 | # Radiobuttons | |
| 4040 | regexp {^(.*_)} $id uselessvar id | |
| 218a900b AG |
4041 | set val 0 |
| 4042 | } else { | |
| 13d40b61 | 4043 | # Text fields |
| 218a900b AG |
4044 | set val {} |
| 4045 | } | |
| 13d40b61 | 4046 | set newviewopts($n,$id) $val |
| 218a900b AG |
4047 | } |
| 4048 | set oargs [list] | |
| 13d40b61 | 4049 | set refargs [list] |
| 218a900b AG |
4050 | foreach arg $view_args { |
| 4051 | if {[regexp -- {^-([0-9]+)$} $arg arg cnt] | |
| 4052 | && ![info exists found(limit)]} { | |
| 4053 | set newviewopts($n,limit) $cnt | |
| 4054 | set found(limit) 1 | |
| 4055 | continue | |
| 4056 | } | |
| 4057 | catch { unset val } | |
| 4058 | foreach opt $known_view_options { | |
| 4059 | set id [lindex $opt 0] | |
| 4060 | if {[info exists found($id)]} continue | |
| 4061 | foreach pattern [lindex $opt 3] { | |
| 4062 | if {![string match $pattern $arg]} continue | |
| 13d40b61 EN |
4063 | if {[lindex $opt 1] eq "b"} { |
| 4064 | # Check buttons | |
| 4065 | set val 1 | |
| 4066 | } elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} { | |
| 4067 | # Radio buttons | |
| 4068 | regexp {^(.*_)} $id uselessvar id | |
| 4069 | set val $num | |
| 4070 | } else { | |
| 4071 | # Text input fields | |
| 218a900b AG |
4072 | set size [string length $pattern] |
| 4073 | set val [string range $arg [expr {$size-1}] end] | |
| 218a900b AG |
4074 | } |
| 4075 | set newviewopts($n,$id) $val | |
| 4076 | set found($id) 1 | |
| 4077 | break | |
| 4078 | } | |
| 4079 | if {[info exists val]} break | |
| 4080 | } | |
| 4081 | if {[info exists val]} continue | |
| 13d40b61 EN |
4082 | if {[regexp {^-} $arg]} { |
| 4083 | lappend oargs $arg | |
| 4084 | } else { | |
| 4085 | lappend refargs $arg | |
| 4086 | } | |
| 218a900b | 4087 | } |
| 13d40b61 | 4088 | set newviewopts($n,refs) [shellarglist $refargs] |
| 218a900b AG |
4089 | set newviewopts($n,args) [shellarglist $oargs] |
| 4090 | } | |
| 4091 | ||
| cea07cf8 AG |
4092 | proc edit_or_newview {} { |
| 4093 | global curview | |
| 4094 | ||
| 4095 | if {$curview > 0} { | |
| 4096 | editview | |
| 4097 | } else { | |
| 4098 | newview 0 | |
| 4099 | } | |
| 4100 | } | |
| 4101 | ||
| d16c0812 PM |
4102 | proc editview {} { |
| 4103 | global curview | |
| 218a900b AG |
4104 | global viewname viewperm newviewname newviewopts |
| 4105 | global viewargs viewargscmd | |
| d16c0812 PM |
4106 | |
| 4107 | set top .gitkvedit-$curview | |
| 4108 | if {[winfo exists $top]} { | |
| 4109 | raise $top | |
| 4110 | return | |
| 4111 | } | |
| 5d11f794 | 4112 | decode_view_opts $curview $viewargs($curview) |
| 218a900b AG |
4113 | set newviewname($curview) $viewname($curview) |
| 4114 | set newviewopts($curview,perm) $viewperm($curview) | |
| 4115 | set newviewopts($curview,cmd) $viewargscmd($curview) | |
| b56e0a9a | 4116 | vieweditor $top $curview "[mc "Gitk: edit view"] $viewname($curview)" |
| d16c0812 PM |
4117 | } |
| 4118 | ||
| 4119 | proc vieweditor {top n title} { | |
| 218a900b | 4120 | global newviewname newviewopts viewfiles bgcolor |
| d93f1713 | 4121 | global known_view_options NS |
| d16c0812 | 4122 | |
| d93f1713 | 4123 | ttk_toplevel $top |
| e0a01995 | 4124 | wm title $top [concat $title [mc "-- criteria for selecting revisions"]] |
| e7d64008 | 4125 | make_transient $top . |
| 218a900b AG |
4126 | |
| 4127 | # View name | |
| d93f1713 | 4128 | ${NS}::frame $top.nfr |
| eae7d64a | 4129 | ${NS}::label $top.nl -text [mc "View Name"] |
| d93f1713 | 4130 | ${NS}::entry $top.name -width 20 -textvariable newviewname($n) |
| 218a900b | 4131 | pack $top.nfr -in $top -fill x -pady 5 -padx 3 |
| 13d40b61 EN |
4132 | pack $top.nl -in $top.nfr -side left -padx {0 5} |
| 4133 | pack $top.name -in $top.nfr -side left -padx {0 25} | |
| 218a900b AG |
4134 | |
| 4135 | # View options | |
| 4136 | set cframe $top.nfr | |
| 4137 | set cexpand 0 | |
| 4138 | set cnt 0 | |
| 4139 | foreach opt $known_view_options { | |
| 4140 | set id [lindex $opt 0] | |
| 4141 | set type [lindex $opt 1] | |
| 4142 | set flags [lindex $opt 2] | |
| 4143 | set title [eval [lindex $opt 4]] | |
| 4144 | set lxpad 0 | |
| 4145 | ||
| 4146 | if {$flags eq "+" || $flags eq "*"} { | |
| 4147 | set cframe $top.fr$cnt | |
| 4148 | incr cnt | |
| d93f1713 | 4149 | ${NS}::frame $cframe |
| 218a900b AG |
4150 | pack $cframe -in $top -fill x -pady 3 -padx 3 |
| 4151 | set cexpand [expr {$flags eq "*"}] | |
| 13d40b61 EN |
4152 | } elseif {$flags eq ".." || $flags eq "*."} { |
| 4153 | set cframe $top.fr$cnt | |
| 4154 | incr cnt | |
| eae7d64a | 4155 | ${NS}::frame $cframe |
| 13d40b61 EN |
4156 | pack $cframe -in $top -fill x -pady 3 -padx [list 15 3] |
| 4157 | set cexpand [expr {$flags eq "*."}] | |
| 218a900b AG |
4158 | } else { |
| 4159 | set lxpad 5 | |
| 4160 | } | |
| 4161 | ||
| 13d40b61 | 4162 | if {$type eq "l"} { |
| eae7d64a | 4163 | ${NS}::label $cframe.l_$id -text $title |
| 13d40b61 EN |
4164 | pack $cframe.l_$id -in $cframe -side left -pady [list 3 0] -anchor w |
| 4165 | } elseif {$type eq "b"} { | |
| d93f1713 | 4166 | ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id) |
| 218a900b AG |
4167 | pack $cframe.c_$id -in $cframe -side left \ |
| 4168 | -padx [list $lxpad 0] -expand $cexpand -anchor w | |
| 13d40b61 EN |
4169 | } elseif {[regexp {^r(\d+)$} $type type sz]} { |
| 4170 | regexp {^(.*_)} $id uselessvar button_id | |
| eae7d64a | 4171 | ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz |
| 13d40b61 EN |
4172 | pack $cframe.c_$id -in $cframe -side left \ |
| 4173 | -padx [list $lxpad 0] -expand $cexpand -anchor w | |
| 218a900b | 4174 | } elseif {[regexp {^t(\d+)$} $type type sz]} { |
| d93f1713 PT |
4175 | ${NS}::label $cframe.l_$id -text $title |
| 4176 | ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \ | |
| 218a900b AG |
4177 | -textvariable newviewopts($n,$id) |
| 4178 | pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0] | |
| 4179 | pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x | |
| 4180 | } elseif {[regexp {^t(\d+)=$} $type type sz]} { | |
| d93f1713 PT |
4181 | ${NS}::label $cframe.l_$id -text $title |
| 4182 | ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \ | |
| 218a900b AG |
4183 | -textvariable newviewopts($n,$id) |
| 4184 | pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w | |
| 4185 | pack $cframe.e_$id -in $cframe -side top -fill x | |
| 13d40b61 | 4186 | } elseif {$type eq "path"} { |
| eae7d64a | 4187 | ${NS}::label $top.l -text $title |
| 13d40b61 | 4188 | pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3 |
| b9b142ff | 4189 | text $top.t -width 40 -height 5 -background $bgcolor |
| 13d40b61 EN |
4190 | if {[info exists viewfiles($n)]} { |
| 4191 | foreach f $viewfiles($n) { | |
| 4192 | $top.t insert end $f | |
| 4193 | $top.t insert end "\n" | |
| 4194 | } | |
| 4195 | $top.t delete {end - 1c} end | |
| 4196 | $top.t mark set insert 0.0 | |
| 4197 | } | |
| 4198 | pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3 | |
| 218a900b AG |
4199 | } |
| 4200 | } | |
| 4201 | ||
| d93f1713 PT |
4202 | ${NS}::frame $top.buts |
| 4203 | ${NS}::button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n] | |
| 4204 | ${NS}::button $top.buts.apply -text [mc "Apply (F5)"] -command [list newviewok $top $n 1] | |
| 4205 | ${NS}::button $top.buts.can -text [mc "Cancel"] -command [list destroy $top] | |
| 218a900b AG |
4206 | bind $top <Control-Return> [list newviewok $top $n] |
| 4207 | bind $top <F5> [list newviewok $top $n 1] | |
| 76f15947 | 4208 | bind $top <Escape> [list destroy $top] |
| 218a900b | 4209 | grid $top.buts.ok $top.buts.apply $top.buts.can |
| 50b44ece PM |
4210 | grid columnconfigure $top.buts 0 -weight 1 -uniform a |
| 4211 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 218a900b AG |
4212 | grid columnconfigure $top.buts 2 -weight 1 -uniform a |
| 4213 | pack $top.buts -in $top -side top -fill x | |
| 50b44ece PM |
4214 | focus $top.t |
| 4215 | } | |
| 4216 | ||
| 908c3585 | 4217 | proc doviewmenu {m first cmd op argv} { |
| da7c24dd PM |
4218 | set nmenu [$m index end] |
| 4219 | for {set i $first} {$i <= $nmenu} {incr i} { | |
| 4220 | if {[$m entrycget $i -command] eq $cmd} { | |
| 908c3585 | 4221 | eval $m $op $i $argv |
| da7c24dd | 4222 | break |
| d16c0812 PM |
4223 | } |
| 4224 | } | |
| da7c24dd PM |
4225 | } |
| 4226 | ||
| 4227 | proc allviewmenus {n op args} { | |
| 687c8765 | 4228 | # global viewhlmenu |
| 908c3585 | 4229 | |
| 3cd204e5 | 4230 | doviewmenu .bar.view 5 [list showview $n] $op $args |
| 687c8765 | 4231 | # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args |
| d16c0812 PM |
4232 | } |
| 4233 | ||
| 218a900b | 4234 | proc newviewok {top n {apply 0}} { |
| da7c24dd | 4235 | global nextviewnum newviewperm newviewname newishighlight |
| d16c0812 | 4236 | global viewname viewfiles viewperm selectedview curview |
| 218a900b | 4237 | global viewargs viewargscmd newviewopts viewhlmenu |
| 50b44ece | 4238 | |
| 098dd8a3 | 4239 | if {[catch { |
| 218a900b | 4240 | set newargs [encode_view_opts $n] |
| 098dd8a3 | 4241 | } err]} { |
| 84a76f18 | 4242 | error_popup "[mc "Error in commit selection arguments:"] $err" $top |
| 098dd8a3 PM |
4243 | return |
| 4244 | } | |
| 50b44ece | 4245 | set files {} |
| d16c0812 | 4246 | foreach f [split [$top.t get 0.0 end] "\n"] { |
| 50b44ece PM |
4247 | set ft [string trim $f] |
| 4248 | if {$ft ne {}} { | |
| 4249 | lappend files $ft | |
| 4250 | } | |
| 4251 | } | |
| d16c0812 PM |
4252 | if {![info exists viewfiles($n)]} { |
| 4253 | # creating a new view | |
| 4254 | incr nextviewnum | |
| 4255 | set viewname($n) $newviewname($n) | |
| 218a900b | 4256 | set viewperm($n) $newviewopts($n,perm) |
| d16c0812 | 4257 | set viewfiles($n) $files |
| 098dd8a3 | 4258 | set viewargs($n) $newargs |
| 218a900b | 4259 | set viewargscmd($n) $newviewopts($n,cmd) |
| da7c24dd PM |
4260 | addviewmenu $n |
| 4261 | if {!$newishighlight} { | |
| 7eb3cb9c | 4262 | run showview $n |
| da7c24dd | 4263 | } else { |
| 7eb3cb9c | 4264 | run addvhighlight $n |
| da7c24dd | 4265 | } |
| d16c0812 PM |
4266 | } else { |
| 4267 | # editing an existing view | |
| 218a900b | 4268 | set viewperm($n) $newviewopts($n,perm) |
| d16c0812 PM |
4269 | if {$newviewname($n) ne $viewname($n)} { |
| 4270 | set viewname($n) $newviewname($n) | |
| 3cd204e5 | 4271 | doviewmenu .bar.view 5 [list showview $n] \ |
| 908c3585 | 4272 | entryconf [list -label $viewname($n)] |
| 687c8765 PM |
4273 | # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \ |
| 4274 | # entryconf [list -label $viewname($n) -value $viewname($n)] | |
| d16c0812 | 4275 | } |
| 2d480856 | 4276 | if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \ |
| 218a900b | 4277 | $newviewopts($n,cmd) ne $viewargscmd($n)} { |
| d16c0812 | 4278 | set viewfiles($n) $files |
| 098dd8a3 | 4279 | set viewargs($n) $newargs |
| 218a900b | 4280 | set viewargscmd($n) $newviewopts($n,cmd) |
| d16c0812 | 4281 | if {$curview == $n} { |
| 7fcc92bf | 4282 | run reloadcommits |
| d16c0812 PM |
4283 | } |
| 4284 | } | |
| 4285 | } | |
| 218a900b | 4286 | if {$apply} return |
| d16c0812 | 4287 | catch {destroy $top} |
| 50b44ece PM |
4288 | } |
| 4289 | ||
| 4290 | proc delview {} { | |
| 7fcc92bf | 4291 | global curview viewperm hlview selectedhlview |
| 50b44ece PM |
4292 | |
| 4293 | if {$curview == 0} return | |
| 908c3585 | 4294 | if {[info exists hlview] && $hlview == $curview} { |
| b007ee20 | 4295 | set selectedhlview [mc "None"] |
| 908c3585 PM |
4296 | unset hlview |
| 4297 | } | |
| da7c24dd | 4298 | allviewmenus $curview delete |
| a90a6d24 | 4299 | set viewperm($curview) 0 |
| 50b44ece PM |
4300 | showview 0 |
| 4301 | } | |
| 4302 | ||
| da7c24dd | 4303 | proc addviewmenu {n} { |
| 908c3585 | 4304 | global viewname viewhlmenu |
| da7c24dd PM |
4305 | |
| 4306 | .bar.view add radiobutton -label $viewname($n) \ | |
| 4307 | -command [list showview $n] -variable selectedview -value $n | |
| 687c8765 PM |
4308 | #$viewhlmenu add radiobutton -label $viewname($n) \ |
| 4309 | # -command [list addvhighlight $n] -variable selectedhlview | |
| da7c24dd PM |
4310 | } |
| 4311 | ||
| 50b44ece | 4312 | proc showview {n} { |
| 3ed31a81 | 4313 | global curview cached_commitrow ordertok |
| f5f3c2e2 | 4314 | global displayorder parentlist rowidlist rowisopt rowfinal |
| 7fcc92bf PM |
4315 | global colormap rowtextx nextcolor canvxmax |
| 4316 | global numcommits viewcomplete | |
| 50b44ece | 4317 | global selectedline currentid canv canvy0 |
| 4fb0fa19 | 4318 | global treediffs |
| 3e76608d | 4319 | global pending_select mainheadid |
| 0380081c | 4320 | global commitidx |
| 3e76608d | 4321 | global selectedview |
| 97645683 | 4322 | global hlview selectedhlview commitinterest |
| 50b44ece PM |
4323 | |
| 4324 | if {$n == $curview} return | |
| 4325 | set selid {} | |
| 7fcc92bf PM |
4326 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 4327 | set span [$canv yview] | |
| 4328 | set ytop [expr {[lindex $span 0] * $ymax}] | |
| 4329 | set ybot [expr {[lindex $span 1] * $ymax}] | |
| 4330 | set yscreen [expr {($ybot - $ytop) / 2}] | |
| 94b4a69f | 4331 | if {$selectedline ne {}} { |
| 50b44ece PM |
4332 | set selid $currentid |
| 4333 | set y [yc $selectedline] | |
| 50b44ece PM |
4334 | if {$ytop < $y && $y < $ybot} { |
| 4335 | set yscreen [expr {$y - $ytop}] | |
| 50b44ece | 4336 | } |
| e507fd48 PM |
4337 | } elseif {[info exists pending_select]} { |
| 4338 | set selid $pending_select | |
| 4339 | unset pending_select | |
| 50b44ece PM |
4340 | } |
| 4341 | unselectline | |
| fdedbcfb | 4342 | normalline |
| 50b44ece PM |
4343 | catch {unset treediffs} |
| 4344 | clear_display | |
| 908c3585 PM |
4345 | if {[info exists hlview] && $hlview == $n} { |
| 4346 | unset hlview | |
| b007ee20 | 4347 | set selectedhlview [mc "None"] |
| 908c3585 | 4348 | } |
| 97645683 | 4349 | catch {unset commitinterest} |
| 7fcc92bf | 4350 | catch {unset cached_commitrow} |
| 9257d8f7 | 4351 | catch {unset ordertok} |
| 50b44ece PM |
4352 | |
| 4353 | set curview $n | |
| a90a6d24 | 4354 | set selectedview $n |
| f2d0bbbd PM |
4355 | .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}] |
| 4356 | .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}] | |
| 50b44ece | 4357 | |
| df904497 | 4358 | run refill_reflist |
| 7fcc92bf | 4359 | if {![info exists viewcomplete($n)]} { |
| 567c34e0 | 4360 | getcommits $selid |
| 50b44ece PM |
4361 | return |
| 4362 | } | |
| 4363 | ||
| 7fcc92bf PM |
4364 | set displayorder {} |
| 4365 | set parentlist {} | |
| 4366 | set rowidlist {} | |
| 4367 | set rowisopt {} | |
| 4368 | set rowfinal {} | |
| f5f3c2e2 | 4369 | set numcommits $commitidx($n) |
| 22626ef4 | 4370 | |
| 50b44ece PM |
4371 | catch {unset colormap} |
| 4372 | catch {unset rowtextx} | |
| da7c24dd PM |
4373 | set nextcolor 0 |
| 4374 | set canvxmax [$canv cget -width] | |
| 50b44ece PM |
4375 | set curview $n |
| 4376 | set row 0 | |
| 50b44ece PM |
4377 | setcanvscroll |
| 4378 | set yf 0 | |
| e507fd48 | 4379 | set row {} |
| 7fcc92bf PM |
4380 | if {$selid ne {} && [commitinview $selid $n]} { |
| 4381 | set row [rowofcommit $selid] | |
| 50b44ece PM |
4382 | # try to get the selected row in the same position on the screen |
| 4383 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 4384 | set ytop [expr {[yc $row] - $yscreen}] | |
| 4385 | if {$ytop < 0} { | |
| 4386 | set ytop 0 | |
| 4387 | } | |
| 4388 | set yf [expr {$ytop * 1.0 / $ymax}] | |
| 4389 | } | |
| 4390 | allcanvs yview moveto $yf | |
| 4391 | drawvisible | |
| e507fd48 PM |
4392 | if {$row ne {}} { |
| 4393 | selectline $row 0 | |
| 3e76608d | 4394 | } elseif {!$viewcomplete($n)} { |
| 567c34e0 | 4395 | reset_pending_select $selid |
| e507fd48 | 4396 | } else { |
| 835e62ae AG |
4397 | reset_pending_select {} |
| 4398 | ||
| 4399 | if {[commitinview $pending_select $curview]} { | |
| 4400 | selectline [rowofcommit $pending_select] 1 | |
| 4401 | } else { | |
| 4402 | set row [first_real_row] | |
| 4403 | if {$row < $numcommits} { | |
| 4404 | selectline $row 0 | |
| 4405 | } | |
| e507fd48 PM |
4406 | } |
| 4407 | } | |
| 7fcc92bf PM |
4408 | if {!$viewcomplete($n)} { |
| 4409 | if {$numcommits == 0} { | |
| d990cedf | 4410 | show_status [mc "Reading commits..."] |
| d16c0812 | 4411 | } |
| 098dd8a3 | 4412 | } elseif {$numcommits == 0} { |
| d990cedf | 4413 | show_status [mc "No commits selected"] |
| 2516dae2 | 4414 | } |
| 50b44ece PM |
4415 | } |
| 4416 | ||
| 908c3585 PM |
4417 | # Stuff relating to the highlighting facility |
| 4418 | ||
| 476ca63d | 4419 | proc ishighlighted {id} { |
| 164ff275 | 4420 | global vhighlights fhighlights nhighlights rhighlights |
| 908c3585 | 4421 | |
| 476ca63d PM |
4422 | if {[info exists nhighlights($id)] && $nhighlights($id) > 0} { |
| 4423 | return $nhighlights($id) | |
| 908c3585 | 4424 | } |
| 476ca63d PM |
4425 | if {[info exists vhighlights($id)] && $vhighlights($id) > 0} { |
| 4426 | return $vhighlights($id) | |
| 908c3585 | 4427 | } |
| 476ca63d PM |
4428 | if {[info exists fhighlights($id)] && $fhighlights($id) > 0} { |
| 4429 | return $fhighlights($id) | |
| 908c3585 | 4430 | } |
| 476ca63d PM |
4431 | if {[info exists rhighlights($id)] && $rhighlights($id) > 0} { |
| 4432 | return $rhighlights($id) | |
| 164ff275 | 4433 | } |
| 908c3585 PM |
4434 | return 0 |
| 4435 | } | |
| 4436 | ||
| 28593d3f | 4437 | proc bolden {id font} { |
| b9fdba7f | 4438 | global canv linehtag currentid boldids need_redisplay markedid |
| 908c3585 | 4439 | |
| d98d50e2 PM |
4440 | # need_redisplay = 1 means the display is stale and about to be redrawn |
| 4441 | if {$need_redisplay} return | |
| 28593d3f PM |
4442 | lappend boldids $id |
| 4443 | $canv itemconf $linehtag($id) -font $font | |
| 4444 | if {[info exists currentid] && $id eq $currentid} { | |
| 908c3585 | 4445 | $canv delete secsel |
| 28593d3f | 4446 | set t [eval $canv create rect [$canv bbox $linehtag($id)] \ |
| 908c3585 PM |
4447 | -outline {{}} -tags secsel \ |
| 4448 | -fill [$canv cget -selectbackground]] | |
| 4449 | $canv lower $t | |
| 4450 | } | |
| b9fdba7f PM |
4451 | if {[info exists markedid] && $id eq $markedid} { |
| 4452 | make_idmark $id | |
| 4453 | } | |
| 908c3585 PM |
4454 | } |
| 4455 | ||
| 28593d3f PM |
4456 | proc bolden_name {id font} { |
| 4457 | global canv2 linentag currentid boldnameids need_redisplay | |
| 908c3585 | 4458 | |
| d98d50e2 | 4459 | if {$need_redisplay} return |
| 28593d3f PM |
4460 | lappend boldnameids $id |
| 4461 | $canv2 itemconf $linentag($id) -font $font | |
| 4462 | if {[info exists currentid] && $id eq $currentid} { | |
| 908c3585 | 4463 | $canv2 delete secsel |
| 28593d3f | 4464 | set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \ |
| 908c3585 PM |
4465 | -outline {{}} -tags secsel \ |
| 4466 | -fill [$canv2 cget -selectbackground]] | |
| 4467 | $canv2 lower $t | |
| 4468 | } | |
| 4469 | } | |
| 4470 | ||
| 4e7d6779 | 4471 | proc unbolden {} { |
| 28593d3f | 4472 | global boldids |
| 908c3585 | 4473 | |
| 4e7d6779 | 4474 | set stillbold {} |
| 28593d3f PM |
4475 | foreach id $boldids { |
| 4476 | if {![ishighlighted $id]} { | |
| 4477 | bolden $id mainfont | |
| 4e7d6779 | 4478 | } else { |
| 28593d3f | 4479 | lappend stillbold $id |
| 908c3585 PM |
4480 | } |
| 4481 | } | |
| 28593d3f | 4482 | set boldids $stillbold |
| 908c3585 PM |
4483 | } |
| 4484 | ||
| 4485 | proc addvhighlight {n} { | |
| 476ca63d | 4486 | global hlview viewcomplete curview vhl_done commitidx |
| da7c24dd PM |
4487 | |
| 4488 | if {[info exists hlview]} { | |
| 908c3585 | 4489 | delvhighlight |
| da7c24dd PM |
4490 | } |
| 4491 | set hlview $n | |
| 7fcc92bf | 4492 | if {$n != $curview && ![info exists viewcomplete($n)]} { |
| da7c24dd | 4493 | start_rev_list $n |
| 908c3585 PM |
4494 | } |
| 4495 | set vhl_done $commitidx($hlview) | |
| 4496 | if {$vhl_done > 0} { | |
| 4497 | drawvisible | |
| da7c24dd PM |
4498 | } |
| 4499 | } | |
| 4500 | ||
| 908c3585 PM |
4501 | proc delvhighlight {} { |
| 4502 | global hlview vhighlights | |
| da7c24dd PM |
4503 | |
| 4504 | if {![info exists hlview]} return | |
| 4505 | unset hlview | |
| 4e7d6779 PM |
4506 | catch {unset vhighlights} |
| 4507 | unbolden | |
| da7c24dd PM |
4508 | } |
| 4509 | ||
| 908c3585 | 4510 | proc vhighlightmore {} { |
| 7fcc92bf | 4511 | global hlview vhl_done commitidx vhighlights curview |
| da7c24dd | 4512 | |
| da7c24dd | 4513 | set max $commitidx($hlview) |
| 908c3585 PM |
4514 | set vr [visiblerows] |
| 4515 | set r0 [lindex $vr 0] | |
| 4516 | set r1 [lindex $vr 1] | |
| 4517 | for {set i $vhl_done} {$i < $max} {incr i} { | |
| 7fcc92bf PM |
4518 | set id [commitonrow $i $hlview] |
| 4519 | if {[commitinview $id $curview]} { | |
| 4520 | set row [rowofcommit $id] | |
| 908c3585 PM |
4521 | if {$r0 <= $row && $row <= $r1} { |
| 4522 | if {![highlighted $row]} { | |
| 28593d3f | 4523 | bolden $id mainfontbold |
| da7c24dd | 4524 | } |
| 476ca63d | 4525 | set vhighlights($id) 1 |
| da7c24dd PM |
4526 | } |
| 4527 | } | |
| 4528 | } | |
| 908c3585 | 4529 | set vhl_done $max |
| ac1276ab | 4530 | return 0 |
| 908c3585 PM |
4531 | } |
| 4532 | ||
| 4533 | proc askvhighlight {row id} { | |
| 7fcc92bf | 4534 | global hlview vhighlights iddrawn |
| 908c3585 | 4535 | |
| 7fcc92bf | 4536 | if {[commitinview $id $hlview]} { |
| 476ca63d | 4537 | if {[info exists iddrawn($id)] && ![ishighlighted $id]} { |
| 28593d3f | 4538 | bolden $id mainfontbold |
| 908c3585 | 4539 | } |
| 476ca63d | 4540 | set vhighlights($id) 1 |
| 908c3585 | 4541 | } else { |
| 476ca63d | 4542 | set vhighlights($id) 0 |
| 908c3585 PM |
4543 | } |
| 4544 | } | |
| 4545 | ||
| 687c8765 | 4546 | proc hfiles_change {} { |
| 908c3585 | 4547 | global highlight_files filehighlight fhighlights fh_serial |
| 8b39e04f | 4548 | global highlight_paths |
| 908c3585 PM |
4549 | |
| 4550 | if {[info exists filehighlight]} { | |
| 4551 | # delete previous highlights | |
| 4552 | catch {close $filehighlight} | |
| 4553 | unset filehighlight | |
| 4e7d6779 PM |
4554 | catch {unset fhighlights} |
| 4555 | unbolden | |
| 63b79191 | 4556 | unhighlight_filelist |
| 908c3585 | 4557 | } |
| 63b79191 | 4558 | set highlight_paths {} |
| 908c3585 PM |
4559 | after cancel do_file_hl $fh_serial |
| 4560 | incr fh_serial | |
| 4561 | if {$highlight_files ne {}} { | |
| 4562 | after 300 do_file_hl $fh_serial | |
| 4563 | } | |
| 4564 | } | |
| 4565 | ||
| 687c8765 PM |
4566 | proc gdttype_change {name ix op} { |
| 4567 | global gdttype highlight_files findstring findpattern | |
| 4568 | ||
| bb3edc8b | 4569 | stopfinding |
| 687c8765 | 4570 | if {$findstring ne {}} { |
| b007ee20 | 4571 | if {$gdttype eq [mc "containing:"]} { |
| 687c8765 PM |
4572 | if {$highlight_files ne {}} { |
| 4573 | set highlight_files {} | |
| 4574 | hfiles_change | |
| 4575 | } | |
| 4576 | findcom_change | |
| 4577 | } else { | |
| 4578 | if {$findpattern ne {}} { | |
| 4579 | set findpattern {} | |
| 4580 | findcom_change | |
| 4581 | } | |
| 4582 | set highlight_files $findstring | |
| 4583 | hfiles_change | |
| 4584 | } | |
| 4585 | drawvisible | |
| 4586 | } | |
| 4587 | # enable/disable findtype/findloc menus too | |
| 4588 | } | |
| 4589 | ||
| 4590 | proc find_change {name ix op} { | |
| 4591 | global gdttype findstring highlight_files | |
| 4592 | ||
| bb3edc8b | 4593 | stopfinding |
| b007ee20 | 4594 | if {$gdttype eq [mc "containing:"]} { |
| 687c8765 PM |
4595 | findcom_change |
| 4596 | } else { | |
| 4597 | if {$highlight_files ne $findstring} { | |
| 4598 | set highlight_files $findstring | |
| 4599 | hfiles_change | |
| 4600 | } | |
| 4601 | } | |
| 4602 | drawvisible | |
| 4603 | } | |
| 4604 | ||
| 64b5f146 | 4605 | proc findcom_change args { |
| 28593d3f | 4606 | global nhighlights boldnameids |
| 687c8765 PM |
4607 | global findpattern findtype findstring gdttype |
| 4608 | ||
| bb3edc8b | 4609 | stopfinding |
| 687c8765 | 4610 | # delete previous highlights, if any |
| 28593d3f PM |
4611 | foreach id $boldnameids { |
| 4612 | bolden_name $id mainfont | |
| 687c8765 | 4613 | } |
| 28593d3f | 4614 | set boldnameids {} |
| 687c8765 PM |
4615 | catch {unset nhighlights} |
| 4616 | unbolden | |
| 4617 | unmarkmatches | |
| b007ee20 | 4618 | if {$gdttype ne [mc "containing:"] || $findstring eq {}} { |
| 687c8765 | 4619 | set findpattern {} |
| b007ee20 | 4620 | } elseif {$findtype eq [mc "Regexp"]} { |
| 687c8765 PM |
4621 | set findpattern $findstring |
| 4622 | } else { | |
| 4623 | set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \ | |
| 4624 | $findstring] | |
| 4625 | set findpattern "*$e*" | |
| 4626 | } | |
| 4627 | } | |
| 4628 | ||
| 63b79191 PM |
4629 | proc makepatterns {l} { |
| 4630 | set ret {} | |
| 4631 | foreach e $l { | |
| 4632 | set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e] | |
| 4633 | if {[string index $ee end] eq "/"} { | |
| 4634 | lappend ret "$ee*" | |
| 4635 | } else { | |
| 4636 | lappend ret $ee | |
| 4637 | lappend ret "$ee/*" | |
| 4638 | } | |
| 4639 | } | |
| 4640 | return $ret | |
| 4641 | } | |
| 4642 | ||
| 908c3585 | 4643 | proc do_file_hl {serial} { |
| 4e7d6779 | 4644 | global highlight_files filehighlight highlight_paths gdttype fhl_list |
| de665fd3 | 4645 | global cdup findtype |
| 908c3585 | 4646 | |
| b007ee20 | 4647 | if {$gdttype eq [mc "touching paths:"]} { |
| de665fd3 YK |
4648 | # If "exact" match then convert backslashes to forward slashes. |
| 4649 | # Most useful to support Windows-flavoured file paths. | |
| 4650 | if {$findtype eq [mc "Exact"]} { | |
| 4651 | set highlight_files [string map {"\\" "/"} $highlight_files] | |
| 4652 | } | |
| 60f7a7dc PM |
4653 | if {[catch {set paths [shellsplit $highlight_files]}]} return |
| 4654 | set highlight_paths [makepatterns $paths] | |
| 4655 | highlight_filelist | |
| c332f445 MZ |
4656 | set relative_paths {} |
| 4657 | foreach path $paths { | |
| 4658 | lappend relative_paths [file join $cdup $path] | |
| 4659 | } | |
| 4660 | set gdtargs [concat -- $relative_paths] | |
| b007ee20 | 4661 | } elseif {$gdttype eq [mc "adding/removing string:"]} { |
| 60f7a7dc | 4662 | set gdtargs [list "-S$highlight_files"] |
| c33cb908 ML |
4663 | } elseif {$gdttype eq [mc "changing lines matching:"]} { |
| 4664 | set gdtargs [list "-G$highlight_files"] | |
| 687c8765 PM |
4665 | } else { |
| 4666 | # must be "containing:", i.e. we're searching commit info | |
| 4667 | return | |
| 60f7a7dc | 4668 | } |
| 1ce09dd6 | 4669 | set cmd [concat | git diff-tree -r -s --stdin $gdtargs] |
| 908c3585 PM |
4670 | set filehighlight [open $cmd r+] |
| 4671 | fconfigure $filehighlight -blocking 0 | |
| 7eb3cb9c | 4672 | filerun $filehighlight readfhighlight |
| 4e7d6779 | 4673 | set fhl_list {} |
| 908c3585 PM |
4674 | drawvisible |
| 4675 | flushhighlights | |
| 4676 | } | |
| 4677 | ||
| 4678 | proc flushhighlights {} { | |
| 4e7d6779 | 4679 | global filehighlight fhl_list |
| 908c3585 PM |
4680 | |
| 4681 | if {[info exists filehighlight]} { | |
| 4e7d6779 | 4682 | lappend fhl_list {} |
| 908c3585 PM |
4683 | puts $filehighlight "" |
| 4684 | flush $filehighlight | |
| 4685 | } | |
| 4686 | } | |
| 4687 | ||
| 4688 | proc askfilehighlight {row id} { | |
| 4e7d6779 | 4689 | global filehighlight fhighlights fhl_list |
| 908c3585 | 4690 | |
| 4e7d6779 | 4691 | lappend fhl_list $id |
| 476ca63d | 4692 | set fhighlights($id) -1 |
| 908c3585 PM |
4693 | puts $filehighlight $id |
| 4694 | } | |
| 4695 | ||
| 4696 | proc readfhighlight {} { | |
| 7fcc92bf | 4697 | global filehighlight fhighlights curview iddrawn |
| 687c8765 | 4698 | global fhl_list find_dirn |
| 4e7d6779 | 4699 | |
| 7eb3cb9c PM |
4700 | if {![info exists filehighlight]} { |
| 4701 | return 0 | |
| 4702 | } | |
| 4703 | set nr 0 | |
| 4704 | while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} { | |
| 4e7d6779 PM |
4705 | set line [string trim $line] |
| 4706 | set i [lsearch -exact $fhl_list $line] | |
| 4707 | if {$i < 0} continue | |
| 4708 | for {set j 0} {$j < $i} {incr j} { | |
| 4709 | set id [lindex $fhl_list $j] | |
| 476ca63d | 4710 | set fhighlights($id) 0 |
| 908c3585 | 4711 | } |
| 4e7d6779 PM |
4712 | set fhl_list [lrange $fhl_list [expr {$i+1}] end] |
| 4713 | if {$line eq {}} continue | |
| 7fcc92bf | 4714 | if {![commitinview $line $curview]} continue |
| 476ca63d | 4715 | if {[info exists iddrawn($line)] && ![ishighlighted $line]} { |
| 28593d3f | 4716 | bolden $line mainfontbold |
| 4e7d6779 | 4717 | } |
| 476ca63d | 4718 | set fhighlights($line) 1 |
| 908c3585 | 4719 | } |
| 4e7d6779 PM |
4720 | if {[eof $filehighlight]} { |
| 4721 | # strange... | |
| 1ce09dd6 | 4722 | puts "oops, git diff-tree died" |
| 4e7d6779 PM |
4723 | catch {close $filehighlight} |
| 4724 | unset filehighlight | |
| 7eb3cb9c | 4725 | return 0 |
| 908c3585 | 4726 | } |
| 687c8765 | 4727 | if {[info exists find_dirn]} { |
| cca5d946 | 4728 | run findmore |
| 908c3585 | 4729 | } |
| 687c8765 | 4730 | return 1 |
| 908c3585 PM |
4731 | } |
| 4732 | ||
| 4fb0fa19 | 4733 | proc doesmatch {f} { |
| 687c8765 | 4734 | global findtype findpattern |
| 4fb0fa19 | 4735 | |
| b007ee20 | 4736 | if {$findtype eq [mc "Regexp"]} { |
| 687c8765 | 4737 | return [regexp $findpattern $f] |
| b007ee20 | 4738 | } elseif {$findtype eq [mc "IgnCase"]} { |
| 4fb0fa19 PM |
4739 | return [string match -nocase $findpattern $f] |
| 4740 | } else { | |
| 4741 | return [string match $findpattern $f] | |
| 4742 | } | |
| 4743 | } | |
| 4744 | ||
| 60f7a7dc | 4745 | proc askfindhighlight {row id} { |
| 9c311b32 | 4746 | global nhighlights commitinfo iddrawn |
| 4fb0fa19 PM |
4747 | global findloc |
| 4748 | global markingmatches | |
| 908c3585 PM |
4749 | |
| 4750 | if {![info exists commitinfo($id)]} { | |
| 4751 | getcommit $id | |
| 4752 | } | |
| 60f7a7dc | 4753 | set info $commitinfo($id) |
| 908c3585 | 4754 | set isbold 0 |
| 585c27cb | 4755 | set fldtypes [list [mc Headline] [mc Author] "" [mc Committer] "" [mc Comments]] |
| 60f7a7dc | 4756 | foreach f $info ty $fldtypes { |
| 585c27cb | 4757 | if {$ty eq ""} continue |
| b007ee20 | 4758 | if {($findloc eq [mc "All fields"] || $findloc eq $ty) && |
| 4fb0fa19 | 4759 | [doesmatch $f]} { |
| b007ee20 | 4760 | if {$ty eq [mc "Author"]} { |
| 60f7a7dc | 4761 | set isbold 2 |
| 4fb0fa19 | 4762 | break |
| 60f7a7dc | 4763 | } |
| 4fb0fa19 | 4764 | set isbold 1 |
| 908c3585 PM |
4765 | } |
| 4766 | } | |
| 4fb0fa19 | 4767 | if {$isbold && [info exists iddrawn($id)]} { |
| 476ca63d | 4768 | if {![ishighlighted $id]} { |
| 28593d3f | 4769 | bolden $id mainfontbold |
| 4fb0fa19 | 4770 | if {$isbold > 1} { |
| 28593d3f | 4771 | bolden_name $id mainfontbold |
| 4fb0fa19 | 4772 | } |
| 908c3585 | 4773 | } |
| 4fb0fa19 | 4774 | if {$markingmatches} { |
| 005a2f4e | 4775 | markrowmatches $row $id |
| 908c3585 PM |
4776 | } |
| 4777 | } | |
| 476ca63d | 4778 | set nhighlights($id) $isbold |
| da7c24dd PM |
4779 | } |
| 4780 | ||
| 005a2f4e PM |
4781 | proc markrowmatches {row id} { |
| 4782 | global canv canv2 linehtag linentag commitinfo findloc | |
| 4fb0fa19 | 4783 | |
| 005a2f4e PM |
4784 | set headline [lindex $commitinfo($id) 0] |
| 4785 | set author [lindex $commitinfo($id) 1] | |
| 4fb0fa19 PM |
4786 | $canv delete match$row |
| 4787 | $canv2 delete match$row | |
| b007ee20 | 4788 | if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} { |
| 005a2f4e PM |
4789 | set m [findmatches $headline] |
| 4790 | if {$m ne {}} { | |
| 28593d3f PM |
4791 | markmatches $canv $row $headline $linehtag($id) $m \ |
| 4792 | [$canv itemcget $linehtag($id) -font] $row | |
| 005a2f4e | 4793 | } |
| 4fb0fa19 | 4794 | } |
| b007ee20 | 4795 | if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} { |
| 005a2f4e PM |
4796 | set m [findmatches $author] |
| 4797 | if {$m ne {}} { | |
| 28593d3f PM |
4798 | markmatches $canv2 $row $author $linentag($id) $m \ |
| 4799 | [$canv2 itemcget $linentag($id) -font] $row | |
| 005a2f4e | 4800 | } |
| 4fb0fa19 PM |
4801 | } |
| 4802 | } | |
| 4803 | ||
| 164ff275 PM |
4804 | proc vrel_change {name ix op} { |
| 4805 | global highlight_related | |
| 4806 | ||
| 4807 | rhighlight_none | |
| b007ee20 | 4808 | if {$highlight_related ne [mc "None"]} { |
| 7eb3cb9c | 4809 | run drawvisible |
| 164ff275 PM |
4810 | } |
| 4811 | } | |
| 4812 | ||
| 4813 | # prepare for testing whether commits are descendents or ancestors of a | |
| 4814 | proc rhighlight_sel {a} { | |
| 4815 | global descendent desc_todo ancestor anc_todo | |
| 476ca63d | 4816 | global highlight_related |
| 164ff275 PM |
4817 | |
| 4818 | catch {unset descendent} | |
| 4819 | set desc_todo [list $a] | |
| 4820 | catch {unset ancestor} | |
| 4821 | set anc_todo [list $a] | |
| b007ee20 | 4822 | if {$highlight_related ne [mc "None"]} { |
| 164ff275 | 4823 | rhighlight_none |
| 7eb3cb9c | 4824 | run drawvisible |
| 164ff275 PM |
4825 | } |
| 4826 | } | |
| 4827 | ||
| 4828 | proc rhighlight_none {} { | |
| 4829 | global rhighlights | |
| 4830 | ||
| 4e7d6779 PM |
4831 | catch {unset rhighlights} |
| 4832 | unbolden | |
| 164ff275 PM |
4833 | } |
| 4834 | ||
| 4835 | proc is_descendent {a} { | |
| 7fcc92bf | 4836 | global curview children descendent desc_todo |
| 164ff275 PM |
4837 | |
| 4838 | set v $curview | |
| 7fcc92bf | 4839 | set la [rowofcommit $a] |
| 164ff275 PM |
4840 | set todo $desc_todo |
| 4841 | set leftover {} | |
| 4842 | set done 0 | |
| 4843 | for {set i 0} {$i < [llength $todo]} {incr i} { | |
| 4844 | set do [lindex $todo $i] | |
| 7fcc92bf | 4845 | if {[rowofcommit $do] < $la} { |
| 164ff275 PM |
4846 | lappend leftover $do |
| 4847 | continue | |
| 4848 | } | |
| 4849 | foreach nk $children($v,$do) { | |
| 4850 | if {![info exists descendent($nk)]} { | |
| 4851 | set descendent($nk) 1 | |
| 4852 | lappend todo $nk | |
| 4853 | if {$nk eq $a} { | |
| 4854 | set done 1 | |
| 4855 | } | |
| 4856 | } | |
| 4857 | } | |
| 4858 | if {$done} { | |
| 4859 | set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]] | |
| 4860 | return | |
| 4861 | } | |
| 4862 | } | |
| 4863 | set descendent($a) 0 | |
| 4864 | set desc_todo $leftover | |
| 4865 | } | |
| 4866 | ||
| 4867 | proc is_ancestor {a} { | |
| 7fcc92bf | 4868 | global curview parents ancestor anc_todo |
| 164ff275 PM |
4869 | |
| 4870 | set v $curview | |
| 7fcc92bf | 4871 | set la [rowofcommit $a] |
| 164ff275 PM |
4872 | set todo $anc_todo |
| 4873 | set leftover {} | |
| 4874 | set done 0 | |
| 4875 | for {set i 0} {$i < [llength $todo]} {incr i} { | |
| 4876 | set do [lindex $todo $i] | |
| 7fcc92bf | 4877 | if {![commitinview $do $v] || [rowofcommit $do] > $la} { |
| 164ff275 PM |
4878 | lappend leftover $do |
| 4879 | continue | |
| 4880 | } | |
| 7fcc92bf | 4881 | foreach np $parents($v,$do) { |
| 164ff275 PM |
4882 | if {![info exists ancestor($np)]} { |
| 4883 | set ancestor($np) 1 | |
| 4884 | lappend todo $np | |
| 4885 | if {$np eq $a} { | |
| 4886 | set done 1 | |
| 4887 | } | |
| 4888 | } | |
| 4889 | } | |
| 4890 | if {$done} { | |
| 4891 | set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]] | |
| 4892 | return | |
| 4893 | } | |
| 4894 | } | |
| 4895 | set ancestor($a) 0 | |
| 4896 | set anc_todo $leftover | |
| 4897 | } | |
| 4898 | ||
| 4899 | proc askrelhighlight {row id} { | |
| 9c311b32 | 4900 | global descendent highlight_related iddrawn rhighlights |
| 164ff275 PM |
4901 | global selectedline ancestor |
| 4902 | ||
| 94b4a69f | 4903 | if {$selectedline eq {}} return |
| 164ff275 | 4904 | set isbold 0 |
| 55e34436 CS |
4905 | if {$highlight_related eq [mc "Descendant"] || |
| 4906 | $highlight_related eq [mc "Not descendant"]} { | |
| 164ff275 PM |
4907 | if {![info exists descendent($id)]} { |
| 4908 | is_descendent $id | |
| 4909 | } | |
| 55e34436 | 4910 | if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} { |
| 164ff275 PM |
4911 | set isbold 1 |
| 4912 | } | |
| b007ee20 CS |
4913 | } elseif {$highlight_related eq [mc "Ancestor"] || |
| 4914 | $highlight_related eq [mc "Not ancestor"]} { | |
| 164ff275 PM |
4915 | if {![info exists ancestor($id)]} { |
| 4916 | is_ancestor $id | |
| 4917 | } | |
| b007ee20 | 4918 | if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} { |
| 164ff275 PM |
4919 | set isbold 1 |
| 4920 | } | |
| 4921 | } | |
| 4922 | if {[info exists iddrawn($id)]} { | |
| 476ca63d | 4923 | if {$isbold && ![ishighlighted $id]} { |
| 28593d3f | 4924 | bolden $id mainfontbold |
| 164ff275 PM |
4925 | } |
| 4926 | } | |
| 476ca63d | 4927 | set rhighlights($id) $isbold |
| 164ff275 PM |
4928 | } |
| 4929 | ||
| da7c24dd PM |
4930 | # Graph layout functions |
| 4931 | ||
| 9f1afe05 PM |
4932 | proc shortids {ids} { |
| 4933 | set res {} | |
| 4934 | foreach id $ids { | |
| 4935 | if {[llength $id] > 1} { | |
| 4936 | lappend res [shortids $id] | |
| 4937 | } elseif {[regexp {^[0-9a-f]{40}$} $id]} { | |
| 4938 | lappend res [string range $id 0 7] | |
| 4939 | } else { | |
| 4940 | lappend res $id | |
| 4941 | } | |
| 4942 | } | |
| 4943 | return $res | |
| 4944 | } | |
| 4945 | ||
| 9f1afe05 PM |
4946 | proc ntimes {n o} { |
| 4947 | set ret {} | |
| 0380081c PM |
4948 | set o [list $o] |
| 4949 | for {set mask 1} {$mask <= $n} {incr mask $mask} { | |
| 4950 | if {($n & $mask) != 0} { | |
| 4951 | set ret [concat $ret $o] | |
| 9f1afe05 | 4952 | } |
| 0380081c | 4953 | set o [concat $o $o] |
| 9f1afe05 | 4954 | } |
| 0380081c | 4955 | return $ret |
| 9f1afe05 PM |
4956 | } |
| 4957 | ||
| 9257d8f7 PM |
4958 | proc ordertoken {id} { |
| 4959 | global ordertok curview varcid varcstart varctok curview parents children | |
| 4960 | global nullid nullid2 | |
| 4961 | ||
| 4962 | if {[info exists ordertok($id)]} { | |
| 4963 | return $ordertok($id) | |
| 4964 | } | |
| 4965 | set origid $id | |
| 4966 | set todo {} | |
| 4967 | while {1} { | |
| 4968 | if {[info exists varcid($curview,$id)]} { | |
| 4969 | set a $varcid($curview,$id) | |
| 4970 | set p [lindex $varcstart($curview) $a] | |
| 4971 | } else { | |
| 4972 | set p [lindex $children($curview,$id) 0] | |
| 4973 | } | |
| 4974 | if {[info exists ordertok($p)]} { | |
| 4975 | set tok $ordertok($p) | |
| 4976 | break | |
| 4977 | } | |
| c8c9f3d9 PM |
4978 | set id [first_real_child $curview,$p] |
| 4979 | if {$id eq {}} { | |
| 9257d8f7 | 4980 | # it's a root |
| 46308ea1 | 4981 | set tok [lindex $varctok($curview) $varcid($curview,$p)] |
| 9257d8f7 PM |
4982 | break |
| 4983 | } | |
| 9257d8f7 PM |
4984 | if {[llength $parents($curview,$id)] == 1} { |
| 4985 | lappend todo [list $p {}] | |
| 4986 | } else { | |
| 4987 | set j [lsearch -exact $parents($curview,$id) $p] | |
| 4988 | if {$j < 0} { | |
| 4989 | puts "oops didn't find [shortids $p] in parents of [shortids $id]" | |
| 4990 | } | |
| 4991 | lappend todo [list $p [strrep $j]] | |
| 4992 | } | |
| 4993 | } | |
| 4994 | for {set i [llength $todo]} {[incr i -1] >= 0} {} { | |
| 4995 | set p [lindex $todo $i 0] | |
| 4996 | append tok [lindex $todo $i 1] | |
| 4997 | set ordertok($p) $tok | |
| 4998 | } | |
| 4999 | set ordertok($origid) $tok | |
| 5000 | return $tok | |
| 5001 | } | |
| 5002 | ||
| 6e8c8707 PM |
5003 | # Work out where id should go in idlist so that order-token |
| 5004 | # values increase from left to right | |
| 5005 | proc idcol {idlist id {i 0}} { | |
| 9257d8f7 | 5006 | set t [ordertoken $id] |
| e5b37ac1 PM |
5007 | if {$i < 0} { |
| 5008 | set i 0 | |
| 5009 | } | |
| 9257d8f7 | 5010 | if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} { |
| 6e8c8707 PM |
5011 | if {$i > [llength $idlist]} { |
| 5012 | set i [llength $idlist] | |
| 9f1afe05 | 5013 | } |
| 9257d8f7 | 5014 | while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {} |
| 6e8c8707 PM |
5015 | incr i |
| 5016 | } else { | |
| 9257d8f7 | 5017 | if {$t > [ordertoken [lindex $idlist $i]]} { |
| 6e8c8707 | 5018 | while {[incr i] < [llength $idlist] && |
| 9257d8f7 | 5019 | $t >= [ordertoken [lindex $idlist $i]]} {} |
| 9f1afe05 | 5020 | } |
| 9f1afe05 | 5021 | } |
| 6e8c8707 | 5022 | return $i |
| 9f1afe05 PM |
5023 | } |
| 5024 | ||
| 5025 | proc initlayout {} { | |
| 7fcc92bf | 5026 | global rowidlist rowisopt rowfinal displayorder parentlist |
| da7c24dd | 5027 | global numcommits canvxmax canv |
| 8f7d0cec | 5028 | global nextcolor |
| da7c24dd | 5029 | global colormap rowtextx |
| 9f1afe05 | 5030 | |
| 8f7d0cec PM |
5031 | set numcommits 0 |
| 5032 | set displayorder {} | |
| 79b2c75e | 5033 | set parentlist {} |
| 8f7d0cec | 5034 | set nextcolor 0 |
| 0380081c PM |
5035 | set rowidlist {} |
| 5036 | set rowisopt {} | |
| f5f3c2e2 | 5037 | set rowfinal {} |
| be0cd098 | 5038 | set canvxmax [$canv cget -width] |
| 50b44ece PM |
5039 | catch {unset colormap} |
| 5040 | catch {unset rowtextx} | |
| ac1276ab | 5041 | setcanvscroll |
| be0cd098 PM |
5042 | } |
| 5043 | ||
| 5044 | proc setcanvscroll {} { | |
| 5045 | global canv canv2 canv3 numcommits linespc canvxmax canvy0 | |
| ac1276ab | 5046 | global lastscrollset lastscrollrows |
| be0cd098 PM |
5047 | |
| 5048 | set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}] | |
| 5049 | $canv conf -scrollregion [list 0 0 $canvxmax $ymax] | |
| 5050 | $canv2 conf -scrollregion [list 0 0 0 $ymax] | |
| 5051 | $canv3 conf -scrollregion [list 0 0 0 $ymax] | |
| ac1276ab PM |
5052 | set lastscrollset [clock clicks -milliseconds] |
| 5053 | set lastscrollrows $numcommits | |
| 9f1afe05 PM |
5054 | } |
| 5055 | ||
| 5056 | proc visiblerows {} { | |
| 5057 | global canv numcommits linespc | |
| 5058 | ||
| 5059 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 5060 | if {$ymax eq {} || $ymax == 0} return | |
| 5061 | set f [$canv yview] | |
| 5062 | set y0 [expr {int([lindex $f 0] * $ymax)}] | |
| 5063 | set r0 [expr {int(($y0 - 3) / $linespc) - 1}] | |
| 5064 | if {$r0 < 0} { | |
| 5065 | set r0 0 | |
| 5066 | } | |
| 5067 | set y1 [expr {int([lindex $f 1] * $ymax)}] | |
| 5068 | set r1 [expr {int(($y1 - 3) / $linespc) + 1}] | |
| 5069 | if {$r1 >= $numcommits} { | |
| 5070 | set r1 [expr {$numcommits - 1}] | |
| 5071 | } | |
| 5072 | return [list $r0 $r1] | |
| 5073 | } | |
| 5074 | ||
| f5f3c2e2 | 5075 | proc layoutmore {} { |
| 38dfe939 | 5076 | global commitidx viewcomplete curview |
| 94b4a69f | 5077 | global numcommits pending_select curview |
| d375ef9b | 5078 | global lastscrollset lastscrollrows |
| ac1276ab PM |
5079 | |
| 5080 | if {$lastscrollrows < 100 || $viewcomplete($curview) || | |
| 5081 | [clock clicks -milliseconds] - $lastscrollset > 500} { | |
| a2c22362 PM |
5082 | setcanvscroll |
| 5083 | } | |
| d94f8cd6 | 5084 | if {[info exists pending_select] && |
| 7fcc92bf | 5085 | [commitinview $pending_select $curview]} { |
| 567c34e0 | 5086 | update |
| 7fcc92bf | 5087 | selectline [rowofcommit $pending_select] 1 |
| d94f8cd6 | 5088 | } |
| ac1276ab | 5089 | drawvisible |
| 219ea3a9 PM |
5090 | } |
| 5091 | ||
| cdc8429c PM |
5092 | # With path limiting, we mightn't get the actual HEAD commit, |
| 5093 | # so ask git rev-list what is the first ancestor of HEAD that | |
| 5094 | # touches a file in the path limit. | |
| 5095 | proc get_viewmainhead {view} { | |
| 5096 | global viewmainheadid vfilelimit viewinstances mainheadid | |
| 5097 | ||
| 5098 | catch { | |
| 5099 | set rfd [open [concat | git rev-list -1 $mainheadid \ | |
| 5100 | -- $vfilelimit($view)] r] | |
| 5101 | set j [reg_instance $rfd] | |
| 5102 | lappend viewinstances($view) $j | |
| 5103 | fconfigure $rfd -blocking 0 | |
| 5104 | filerun $rfd [list getviewhead $rfd $j $view] | |
| 5105 | set viewmainheadid($curview) {} | |
| 5106 | } | |
| 5107 | } | |
| 5108 | ||
| 5109 | # git rev-list should give us just 1 line to use as viewmainheadid($view) | |
| 5110 | proc getviewhead {fd inst view} { | |
| 5111 | global viewmainheadid commfd curview viewinstances showlocalchanges | |
| 5112 | ||
| 5113 | set id {} | |
| 5114 | if {[gets $fd line] < 0} { | |
| 5115 | if {![eof $fd]} { | |
| 5116 | return 1 | |
| 5117 | } | |
| 5118 | } elseif {[string length $line] == 40 && [string is xdigit $line]} { | |
| 5119 | set id $line | |
| 5120 | } | |
| 5121 | set viewmainheadid($view) $id | |
| 5122 | close $fd | |
| 5123 | unset commfd($inst) | |
| 5124 | set i [lsearch -exact $viewinstances($view) $inst] | |
| 5125 | if {$i >= 0} { | |
| 5126 | set viewinstances($view) [lreplace $viewinstances($view) $i $i] | |
| 5127 | } | |
| 5128 | if {$showlocalchanges && $id ne {} && $view == $curview} { | |
| 5129 | doshowlocalchanges | |
| 5130 | } | |
| 5131 | return 0 | |
| 5132 | } | |
| 5133 | ||
| 219ea3a9 | 5134 | proc doshowlocalchanges {} { |
| cdc8429c | 5135 | global curview viewmainheadid |
| 219ea3a9 | 5136 | |
| cdc8429c PM |
5137 | if {$viewmainheadid($curview) eq {}} return |
| 5138 | if {[commitinview $viewmainheadid($curview) $curview]} { | |
| 219ea3a9 | 5139 | dodiffindex |
| 38dfe939 | 5140 | } else { |
| cdc8429c | 5141 | interestedin $viewmainheadid($curview) dodiffindex |
| 219ea3a9 PM |
5142 | } |
| 5143 | } | |
| 5144 | ||
| 5145 | proc dohidelocalchanges {} { | |
| 7fcc92bf | 5146 | global nullid nullid2 lserial curview |
| 219ea3a9 | 5147 | |
| 7fcc92bf | 5148 | if {[commitinview $nullid $curview]} { |
| b8a938cf | 5149 | removefakerow $nullid |
| 8f489363 | 5150 | } |
| 7fcc92bf | 5151 | if {[commitinview $nullid2 $curview]} { |
| b8a938cf | 5152 | removefakerow $nullid2 |
| 219ea3a9 PM |
5153 | } |
| 5154 | incr lserial | |
| 5155 | } | |
| 5156 | ||
| 8f489363 | 5157 | # spawn off a process to do git diff-index --cached HEAD |
| 219ea3a9 | 5158 | proc dodiffindex {} { |
| cdc8429c | 5159 | global lserial showlocalchanges vfilelimit curview |
| 74cb884f | 5160 | global hasworktree |
| 219ea3a9 | 5161 | |
| 74cb884f | 5162 | if {!$showlocalchanges || !$hasworktree} return |
| 219ea3a9 | 5163 | incr lserial |
| cdc8429c PM |
5164 | set cmd "|git diff-index --cached HEAD" |
| 5165 | if {$vfilelimit($curview) ne {}} { | |
| 5166 | set cmd [concat $cmd -- $vfilelimit($curview)] | |
| 5167 | } | |
| 5168 | set fd [open $cmd r] | |
| 219ea3a9 | 5169 | fconfigure $fd -blocking 0 |
| e439e092 AG |
5170 | set i [reg_instance $fd] |
| 5171 | filerun $fd [list readdiffindex $fd $lserial $i] | |
| 219ea3a9 PM |
5172 | } |
| 5173 | ||
| e439e092 | 5174 | proc readdiffindex {fd serial inst} { |
| cdc8429c PM |
5175 | global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial |
| 5176 | global vfilelimit | |
| 219ea3a9 | 5177 | |
| 8f489363 | 5178 | set isdiff 1 |
| 219ea3a9 | 5179 | if {[gets $fd line] < 0} { |
| 8f489363 PM |
5180 | if {![eof $fd]} { |
| 5181 | return 1 | |
| 219ea3a9 | 5182 | } |
| 8f489363 | 5183 | set isdiff 0 |
| 219ea3a9 PM |
5184 | } |
| 5185 | # we only need to see one line and we don't really care what it says... | |
| e439e092 | 5186 | stop_instance $inst |
| 219ea3a9 | 5187 | |
| 24f7a667 PM |
5188 | if {$serial != $lserial} { |
| 5189 | return 0 | |
| 8f489363 PM |
5190 | } |
| 5191 | ||
| 24f7a667 | 5192 | # now see if there are any local changes not checked in to the index |
| cdc8429c PM |
5193 | set cmd "|git diff-files" |
| 5194 | if {$vfilelimit($curview) ne {}} { | |
| 5195 | set cmd [concat $cmd -- $vfilelimit($curview)] | |
| 5196 | } | |
| 5197 | set fd [open $cmd r] | |
| 24f7a667 | 5198 | fconfigure $fd -blocking 0 |
| e439e092 AG |
5199 | set i [reg_instance $fd] |
| 5200 | filerun $fd [list readdifffiles $fd $serial $i] | |
| 24f7a667 PM |
5201 | |
| 5202 | if {$isdiff && ![commitinview $nullid2 $curview]} { | |
| 8f489363 | 5203 | # add the line for the changes in the index to the graph |
| d990cedf | 5204 | set hl [mc "Local changes checked in to index but not committed"] |
| 8f489363 PM |
5205 | set commitinfo($nullid2) [list $hl {} {} {} {} " $hl\n"] |
| 5206 | set commitdata($nullid2) "\n $hl\n" | |
| fc2a256f | 5207 | if {[commitinview $nullid $curview]} { |
| b8a938cf | 5208 | removefakerow $nullid |
| fc2a256f | 5209 | } |
| cdc8429c | 5210 | insertfakerow $nullid2 $viewmainheadid($curview) |
| 24f7a667 | 5211 | } elseif {!$isdiff && [commitinview $nullid2 $curview]} { |
| cdc8429c PM |
5212 | if {[commitinview $nullid $curview]} { |
| 5213 | removefakerow $nullid | |
| 5214 | } | |
| b8a938cf | 5215 | removefakerow $nullid2 |
| 8f489363 PM |
5216 | } |
| 5217 | return 0 | |
| 5218 | } | |
| 5219 | ||
| e439e092 | 5220 | proc readdifffiles {fd serial inst} { |
| cdc8429c | 5221 | global viewmainheadid nullid nullid2 curview |
| 8f489363 PM |
5222 | global commitinfo commitdata lserial |
| 5223 | ||
| 5224 | set isdiff 1 | |
| 5225 | if {[gets $fd line] < 0} { | |
| 5226 | if {![eof $fd]} { | |
| 5227 | return 1 | |
| 5228 | } | |
| 5229 | set isdiff 0 | |
| 5230 | } | |
| 5231 | # we only need to see one line and we don't really care what it says... | |
| e439e092 | 5232 | stop_instance $inst |
| 8f489363 | 5233 | |
| 24f7a667 PM |
5234 | if {$serial != $lserial} { |
| 5235 | return 0 | |
| 5236 | } | |
| 5237 | ||
| 5238 | if {$isdiff && ![commitinview $nullid $curview]} { | |
| 219ea3a9 | 5239 | # add the line for the local diff to the graph |
| d990cedf | 5240 | set hl [mc "Local uncommitted changes, not checked in to index"] |
| 219ea3a9 PM |
5241 | set commitinfo($nullid) [list $hl {} {} {} {} " $hl\n"] |
| 5242 | set commitdata($nullid) "\n $hl\n" | |
| 7fcc92bf PM |
5243 | if {[commitinview $nullid2 $curview]} { |
| 5244 | set p $nullid2 | |
| 5245 | } else { | |
| cdc8429c | 5246 | set p $viewmainheadid($curview) |
| 7fcc92bf | 5247 | } |
| b8a938cf | 5248 | insertfakerow $nullid $p |
| 24f7a667 | 5249 | } elseif {!$isdiff && [commitinview $nullid $curview]} { |
| b8a938cf | 5250 | removefakerow $nullid |
| 219ea3a9 PM |
5251 | } |
| 5252 | return 0 | |
| 9f1afe05 PM |
5253 | } |
| 5254 | ||
| 8f0bc7e9 | 5255 | proc nextuse {id row} { |
| 7fcc92bf | 5256 | global curview children |
| 9f1afe05 | 5257 | |
| 8f0bc7e9 PM |
5258 | if {[info exists children($curview,$id)]} { |
| 5259 | foreach kid $children($curview,$id) { | |
| 7fcc92bf | 5260 | if {![commitinview $kid $curview]} { |
| 0380081c PM |
5261 | return -1 |
| 5262 | } | |
| 7fcc92bf PM |
5263 | if {[rowofcommit $kid] > $row} { |
| 5264 | return [rowofcommit $kid] | |
| 9f1afe05 | 5265 | } |
| 9f1afe05 | 5266 | } |
| 8f0bc7e9 | 5267 | } |
| 7fcc92bf PM |
5268 | if {[commitinview $id $curview]} { |
| 5269 | return [rowofcommit $id] | |
| 8f0bc7e9 PM |
5270 | } |
| 5271 | return -1 | |
| 5272 | } | |
| 5273 | ||
| f5f3c2e2 | 5274 | proc prevuse {id row} { |
| 7fcc92bf | 5275 | global curview children |
| f5f3c2e2 PM |
5276 | |
| 5277 | set ret -1 | |
| 5278 | if {[info exists children($curview,$id)]} { | |
| 5279 | foreach kid $children($curview,$id) { | |
| 7fcc92bf PM |
5280 | if {![commitinview $kid $curview]} break |
| 5281 | if {[rowofcommit $kid] < $row} { | |
| 5282 | set ret [rowofcommit $kid] | |
| 7b459a1c | 5283 | } |
| 7b459a1c | 5284 | } |
| f5f3c2e2 PM |
5285 | } |
| 5286 | return $ret | |
| 5287 | } | |
| 5288 | ||
| 0380081c PM |
5289 | proc make_idlist {row} { |
| 5290 | global displayorder parentlist uparrowlen downarrowlen mingaplen | |
| 9257d8f7 | 5291 | global commitidx curview children |
| 9f1afe05 | 5292 | |
| 0380081c PM |
5293 | set r [expr {$row - $mingaplen - $downarrowlen - 1}] |
| 5294 | if {$r < 0} { | |
| 5295 | set r 0 | |
| 8f0bc7e9 | 5296 | } |
| 0380081c PM |
5297 | set ra [expr {$row - $downarrowlen}] |
| 5298 | if {$ra < 0} { | |
| 5299 | set ra 0 | |
| 5300 | } | |
| 5301 | set rb [expr {$row + $uparrowlen}] | |
| 5302 | if {$rb > $commitidx($curview)} { | |
| 5303 | set rb $commitidx($curview) | |
| 5304 | } | |
| 7fcc92bf | 5305 | make_disporder $r [expr {$rb + 1}] |
| 0380081c PM |
5306 | set ids {} |
| 5307 | for {} {$r < $ra} {incr r} { | |
| 5308 | set nextid [lindex $displayorder [expr {$r + 1}]] | |
| 5309 | foreach p [lindex $parentlist $r] { | |
| 5310 | if {$p eq $nextid} continue | |
| 5311 | set rn [nextuse $p $r] | |
| 5312 | if {$rn >= $row && | |
| 5313 | $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} { | |
| 9257d8f7 | 5314 | lappend ids [list [ordertoken $p] $p] |
| 9f1afe05 | 5315 | } |
| 9f1afe05 | 5316 | } |
| 0380081c PM |
5317 | } |
| 5318 | for {} {$r < $row} {incr r} { | |
| 5319 | set nextid [lindex $displayorder [expr {$r + 1}]] | |
| 5320 | foreach p [lindex $parentlist $r] { | |
| 5321 | if {$p eq $nextid} continue | |
| 5322 | set rn [nextuse $p $r] | |
| 5323 | if {$rn < 0 || $rn >= $row} { | |
| 9257d8f7 | 5324 | lappend ids [list [ordertoken $p] $p] |
| 9f1afe05 | 5325 | } |
| 9f1afe05 | 5326 | } |
| 0380081c PM |
5327 | } |
| 5328 | set id [lindex $displayorder $row] | |
| 9257d8f7 | 5329 | lappend ids [list [ordertoken $id] $id] |
| 0380081c PM |
5330 | while {$r < $rb} { |
| 5331 | foreach p [lindex $parentlist $r] { | |
| 5332 | set firstkid [lindex $children($curview,$p) 0] | |
| 7fcc92bf | 5333 | if {[rowofcommit $firstkid] < $row} { |
| 9257d8f7 | 5334 | lappend ids [list [ordertoken $p] $p] |
| 9f1afe05 | 5335 | } |
| 9f1afe05 | 5336 | } |
| 0380081c PM |
5337 | incr r |
| 5338 | set id [lindex $displayorder $r] | |
| 5339 | if {$id ne {}} { | |
| 5340 | set firstkid [lindex $children($curview,$id) 0] | |
| 7fcc92bf | 5341 | if {$firstkid ne {} && [rowofcommit $firstkid] < $row} { |
| 9257d8f7 | 5342 | lappend ids [list [ordertoken $id] $id] |
| 0380081c | 5343 | } |
| 9f1afe05 | 5344 | } |
| 9f1afe05 | 5345 | } |
| 0380081c PM |
5346 | set idlist {} |
| 5347 | foreach idx [lsort -unique $ids] { | |
| 5348 | lappend idlist [lindex $idx 1] | |
| 5349 | } | |
| 5350 | return $idlist | |
| 9f1afe05 PM |
5351 | } |
| 5352 | ||
| f5f3c2e2 PM |
5353 | proc rowsequal {a b} { |
| 5354 | while {[set i [lsearch -exact $a {}]] >= 0} { | |
| 5355 | set a [lreplace $a $i $i] | |
| 5356 | } | |
| 5357 | while {[set i [lsearch -exact $b {}]] >= 0} { | |
| 5358 | set b [lreplace $b $i $i] | |
| 5359 | } | |
| 5360 | return [expr {$a eq $b}] | |
| 9f1afe05 PM |
5361 | } |
| 5362 | ||
| f5f3c2e2 PM |
5363 | proc makeupline {id row rend col} { |
| 5364 | global rowidlist uparrowlen downarrowlen mingaplen | |
| 9f1afe05 | 5365 | |
| f5f3c2e2 PM |
5366 | for {set r $rend} {1} {set r $rstart} { |
| 5367 | set rstart [prevuse $id $r] | |
| 5368 | if {$rstart < 0} return | |
| 5369 | if {$rstart < $row} break | |
| 5370 | } | |
| 5371 | if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} { | |
| 5372 | set rstart [expr {$rend - $uparrowlen - 1}] | |
| 79b2c75e | 5373 | } |
| f5f3c2e2 PM |
5374 | for {set r $rstart} {[incr r] <= $row} {} { |
| 5375 | set idlist [lindex $rowidlist $r] | |
| 5376 | if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} { | |
| 5377 | set col [idcol $idlist $id $col] | |
| 5378 | lset rowidlist $r [linsert $idlist $col $id] | |
| 5379 | changedrow $r | |
| 5380 | } | |
| 9f1afe05 PM |
5381 | } |
| 5382 | } | |
| 5383 | ||
| 0380081c | 5384 | proc layoutrows {row endrow} { |
| f5f3c2e2 | 5385 | global rowidlist rowisopt rowfinal displayorder |
| 0380081c PM |
5386 | global uparrowlen downarrowlen maxwidth mingaplen |
| 5387 | global children parentlist | |
| 7fcc92bf | 5388 | global commitidx viewcomplete curview |
| 9f1afe05 | 5389 | |
| 7fcc92bf | 5390 | make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}] |
| 0380081c PM |
5391 | set idlist {} |
| 5392 | if {$row > 0} { | |
| f56782ae PM |
5393 | set rm1 [expr {$row - 1}] |
| 5394 | foreach id [lindex $rowidlist $rm1] { | |
| 0380081c PM |
5395 | if {$id ne {}} { |
| 5396 | lappend idlist $id | |
| 5397 | } | |
| 5398 | } | |
| f56782ae | 5399 | set final [lindex $rowfinal $rm1] |
| 79b2c75e | 5400 | } |
| 0380081c PM |
5401 | for {} {$row < $endrow} {incr row} { |
| 5402 | set rm1 [expr {$row - 1}] | |
| f56782ae | 5403 | if {$rm1 < 0 || $idlist eq {}} { |
| 0380081c | 5404 | set idlist [make_idlist $row] |
| f5f3c2e2 | 5405 | set final 1 |
| 0380081c PM |
5406 | } else { |
| 5407 | set id [lindex $displayorder $rm1] | |
| 5408 | set col [lsearch -exact $idlist $id] | |
| 5409 | set idlist [lreplace $idlist $col $col] | |
| 5410 | foreach p [lindex $parentlist $rm1] { | |
| 5411 | if {[lsearch -exact $idlist $p] < 0} { | |
| 5412 | set col [idcol $idlist $p $col] | |
| 5413 | set idlist [linsert $idlist $col $p] | |
| f5f3c2e2 PM |
5414 | # if not the first child, we have to insert a line going up |
| 5415 | if {$id ne [lindex $children($curview,$p) 0]} { | |
| 5416 | makeupline $p $rm1 $row $col | |
| 5417 | } | |
| 0380081c PM |
5418 | } |
| 5419 | } | |
| 5420 | set id [lindex $displayorder $row] | |
| 5421 | if {$row > $downarrowlen} { | |
| 5422 | set termrow [expr {$row - $downarrowlen - 1}] | |
| 5423 | foreach p [lindex $parentlist $termrow] { | |
| 5424 | set i [lsearch -exact $idlist $p] | |
| 5425 | if {$i < 0} continue | |
| 5426 | set nr [nextuse $p $termrow] | |
| 5427 | if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} { | |
| 5428 | set idlist [lreplace $idlist $i $i] | |
| 5429 | } | |
| 5430 | } | |
| 5431 | } | |
| 5432 | set col [lsearch -exact $idlist $id] | |
| 5433 | if {$col < 0} { | |
| 5434 | set col [idcol $idlist $id] | |
| 5435 | set idlist [linsert $idlist $col $id] | |
| f5f3c2e2 PM |
5436 | if {$children($curview,$id) ne {}} { |
| 5437 | makeupline $id $rm1 $row $col | |
| 5438 | } | |
| 0380081c PM |
5439 | } |
| 5440 | set r [expr {$row + $uparrowlen - 1}] | |
| 5441 | if {$r < $commitidx($curview)} { | |
| 5442 | set x $col | |
| 5443 | foreach p [lindex $parentlist $r] { | |
| 5444 | if {[lsearch -exact $idlist $p] >= 0} continue | |
| 5445 | set fk [lindex $children($curview,$p) 0] | |
| 7fcc92bf | 5446 | if {[rowofcommit $fk] < $row} { |
| 0380081c PM |
5447 | set x [idcol $idlist $p $x] |
| 5448 | set idlist [linsert $idlist $x $p] | |
| 5449 | } | |
| 5450 | } | |
| 5451 | if {[incr r] < $commitidx($curview)} { | |
| 5452 | set p [lindex $displayorder $r] | |
| 5453 | if {[lsearch -exact $idlist $p] < 0} { | |
| 5454 | set fk [lindex $children($curview,$p) 0] | |
| 7fcc92bf | 5455 | if {$fk ne {} && [rowofcommit $fk] < $row} { |
| 0380081c PM |
5456 | set x [idcol $idlist $p $x] |
| 5457 | set idlist [linsert $idlist $x $p] | |
| 5458 | } | |
| 5459 | } | |
| 5460 | } | |
| 5461 | } | |
| 5462 | } | |
| f5f3c2e2 PM |
5463 | if {$final && !$viewcomplete($curview) && |
| 5464 | $row + $uparrowlen + $mingaplen + $downarrowlen | |
| 5465 | >= $commitidx($curview)} { | |
| 5466 | set final 0 | |
| 5467 | } | |
| 0380081c PM |
5468 | set l [llength $rowidlist] |
| 5469 | if {$row == $l} { | |
| 5470 | lappend rowidlist $idlist | |
| 5471 | lappend rowisopt 0 | |
| f5f3c2e2 | 5472 | lappend rowfinal $final |
| 0380081c | 5473 | } elseif {$row < $l} { |
| f5f3c2e2 | 5474 | if {![rowsequal $idlist [lindex $rowidlist $row]]} { |
| 0380081c PM |
5475 | lset rowidlist $row $idlist |
| 5476 | changedrow $row | |
| 5477 | } | |
| f56782ae | 5478 | lset rowfinal $row $final |
| 0380081c | 5479 | } else { |
| f5f3c2e2 PM |
5480 | set pad [ntimes [expr {$row - $l}] {}] |
| 5481 | set rowidlist [concat $rowidlist $pad] | |
| 0380081c | 5482 | lappend rowidlist $idlist |
| f5f3c2e2 PM |
5483 | set rowfinal [concat $rowfinal $pad] |
| 5484 | lappend rowfinal $final | |
| 0380081c PM |
5485 | set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]] |
| 5486 | } | |
| 9f1afe05 | 5487 | } |
| 0380081c | 5488 | return $row |
| 9f1afe05 PM |
5489 | } |
| 5490 | ||
| 0380081c PM |
5491 | proc changedrow {row} { |
| 5492 | global displayorder iddrawn rowisopt need_redisplay | |
| 9f1afe05 | 5493 | |
| 0380081c PM |
5494 | set l [llength $rowisopt] |
| 5495 | if {$row < $l} { | |
| 5496 | lset rowisopt $row 0 | |
| 5497 | if {$row + 1 < $l} { | |
| 5498 | lset rowisopt [expr {$row + 1}] 0 | |
| 5499 | if {$row + 2 < $l} { | |
| 5500 | lset rowisopt [expr {$row + 2}] 0 | |
| 5501 | } | |
| 5502 | } | |
| 5503 | } | |
| 5504 | set id [lindex $displayorder $row] | |
| 5505 | if {[info exists iddrawn($id)]} { | |
| 5506 | set need_redisplay 1 | |
| 9f1afe05 PM |
5507 | } |
| 5508 | } | |
| 5509 | ||
| 5510 | proc insert_pad {row col npad} { | |
| 6e8c8707 | 5511 | global rowidlist |
| 9f1afe05 PM |
5512 | |
| 5513 | set pad [ntimes $npad {}] | |
| e341c06d PM |
5514 | set idlist [lindex $rowidlist $row] |
| 5515 | set bef [lrange $idlist 0 [expr {$col - 1}]] | |
| 5516 | set aft [lrange $idlist $col end] | |
| 5517 | set i [lsearch -exact $aft {}] | |
| 5518 | if {$i > 0} { | |
| 5519 | set aft [lreplace $aft $i $i] | |
| 5520 | } | |
| 5521 | lset rowidlist $row [concat $bef $pad $aft] | |
| 0380081c | 5522 | changedrow $row |
| 9f1afe05 PM |
5523 | } |
| 5524 | ||
| 5525 | proc optimize_rows {row col endrow} { | |
| 0380081c | 5526 | global rowidlist rowisopt displayorder curview children |
| 9f1afe05 | 5527 | |
| 6e8c8707 PM |
5528 | if {$row < 1} { |
| 5529 | set row 1 | |
| 5530 | } | |
| 0380081c PM |
5531 | for {} {$row < $endrow} {incr row; set col 0} { |
| 5532 | if {[lindex $rowisopt $row]} continue | |
| 9f1afe05 | 5533 | set haspad 0 |
| 6e8c8707 PM |
5534 | set y0 [expr {$row - 1}] |
| 5535 | set ym [expr {$row - 2}] | |
| 0380081c PM |
5536 | set idlist [lindex $rowidlist $row] |
| 5537 | set previdlist [lindex $rowidlist $y0] | |
| 5538 | if {$idlist eq {} || $previdlist eq {}} continue | |
| 5539 | if {$ym >= 0} { | |
| 5540 | set pprevidlist [lindex $rowidlist $ym] | |
| 5541 | if {$pprevidlist eq {}} continue | |
| 5542 | } else { | |
| 5543 | set pprevidlist {} | |
| 5544 | } | |
| 6e8c8707 PM |
5545 | set x0 -1 |
| 5546 | set xm -1 | |
| 5547 | for {} {$col < [llength $idlist]} {incr col} { | |
| 5548 | set id [lindex $idlist $col] | |
| 5549 | if {[lindex $previdlist $col] eq $id} continue | |
| 5550 | if {$id eq {}} { | |
| 9f1afe05 PM |
5551 | set haspad 1 |
| 5552 | continue | |
| 5553 | } | |
| 6e8c8707 PM |
5554 | set x0 [lsearch -exact $previdlist $id] |
| 5555 | if {$x0 < 0} continue | |
| 5556 | set z [expr {$x0 - $col}] | |
| 9f1afe05 | 5557 | set isarrow 0 |
| 6e8c8707 PM |
5558 | set z0 {} |
| 5559 | if {$ym >= 0} { | |
| 5560 | set xm [lsearch -exact $pprevidlist $id] | |
| 5561 | if {$xm >= 0} { | |
| 5562 | set z0 [expr {$xm - $x0}] | |
| 5563 | } | |
| 5564 | } | |
| 9f1afe05 | 5565 | if {$z0 eq {}} { |
| 92ed666f PM |
5566 | # if row y0 is the first child of $id then it's not an arrow |
| 5567 | if {[lindex $children($curview,$id) 0] ne | |
| 5568 | [lindex $displayorder $y0]} { | |
| 9f1afe05 PM |
5569 | set isarrow 1 |
| 5570 | } | |
| 5571 | } | |
| e341c06d PM |
5572 | if {!$isarrow && $id ne [lindex $displayorder $row] && |
| 5573 | [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} { | |
| 5574 | set isarrow 1 | |
| 5575 | } | |
| 3fc4279a PM |
5576 | # Looking at lines from this row to the previous row, |
| 5577 | # make them go straight up if they end in an arrow on | |
| 5578 | # the previous row; otherwise make them go straight up | |
| 5579 | # or at 45 degrees. | |
| 9f1afe05 | 5580 | if {$z < -1 || ($z < 0 && $isarrow)} { |
| 3fc4279a PM |
5581 | # Line currently goes left too much; |
| 5582 | # insert pads in the previous row, then optimize it | |
| 9f1afe05 | 5583 | set npad [expr {-1 - $z + $isarrow}] |
| 9f1afe05 PM |
5584 | insert_pad $y0 $x0 $npad |
| 5585 | if {$y0 > 0} { | |
| 5586 | optimize_rows $y0 $x0 $row | |
| 5587 | } | |
| 6e8c8707 PM |
5588 | set previdlist [lindex $rowidlist $y0] |
| 5589 | set x0 [lsearch -exact $previdlist $id] | |
| 5590 | set z [expr {$x0 - $col}] | |
| 5591 | if {$z0 ne {}} { | |
| 5592 | set pprevidlist [lindex $rowidlist $ym] | |
| 5593 | set xm [lsearch -exact $pprevidlist $id] | |
| 5594 | set z0 [expr {$xm - $x0}] | |
| 5595 | } | |
| 9f1afe05 | 5596 | } elseif {$z > 1 || ($z > 0 && $isarrow)} { |
| 3fc4279a | 5597 | # Line currently goes right too much; |
| 6e8c8707 | 5598 | # insert pads in this line |
| 9f1afe05 | 5599 | set npad [expr {$z - 1 + $isarrow}] |
| e341c06d PM |
5600 | insert_pad $row $col $npad |
| 5601 | set idlist [lindex $rowidlist $row] | |
| 9f1afe05 | 5602 | incr col $npad |
| 6e8c8707 | 5603 | set z [expr {$x0 - $col}] |
| 9f1afe05 PM |
5604 | set haspad 1 |
| 5605 | } | |
| 6e8c8707 | 5606 | if {$z0 eq {} && !$isarrow && $ym >= 0} { |
| eb447a12 | 5607 | # this line links to its first child on row $row-2 |
| 6e8c8707 PM |
5608 | set id [lindex $displayorder $ym] |
| 5609 | set xc [lsearch -exact $pprevidlist $id] | |
| eb447a12 PM |
5610 | if {$xc >= 0} { |
| 5611 | set z0 [expr {$xc - $x0}] | |
| 5612 | } | |
| 5613 | } | |
| 3fc4279a | 5614 | # avoid lines jigging left then immediately right |
| 9f1afe05 PM |
5615 | if {$z0 ne {} && $z < 0 && $z0 > 0} { |
| 5616 | insert_pad $y0 $x0 1 | |
| 6e8c8707 PM |
5617 | incr x0 |
| 5618 | optimize_rows $y0 $x0 $row | |
| 5619 | set previdlist [lindex $rowidlist $y0] | |
| 9f1afe05 PM |
5620 | } |
| 5621 | } | |
| 5622 | if {!$haspad} { | |
| 3fc4279a | 5623 | # Find the first column that doesn't have a line going right |
| 9f1afe05 | 5624 | for {set col [llength $idlist]} {[incr col -1] >= 0} {} { |
| 6e8c8707 PM |
5625 | set id [lindex $idlist $col] |
| 5626 | if {$id eq {}} break | |
| 5627 | set x0 [lsearch -exact $previdlist $id] | |
| 5628 | if {$x0 < 0} { | |
| eb447a12 | 5629 | # check if this is the link to the first child |
| 92ed666f PM |
5630 | set kid [lindex $displayorder $y0] |
| 5631 | if {[lindex $children($curview,$id) 0] eq $kid} { | |
| eb447a12 | 5632 | # it is, work out offset to child |
| 92ed666f | 5633 | set x0 [lsearch -exact $previdlist $kid] |
| eb447a12 PM |
5634 | } |
| 5635 | } | |
| 6e8c8707 | 5636 | if {$x0 <= $col} break |
| 9f1afe05 | 5637 | } |
| 3fc4279a | 5638 | # Insert a pad at that column as long as it has a line and |
| 6e8c8707 PM |
5639 | # isn't the last column |
| 5640 | if {$x0 >= 0 && [incr col] < [llength $idlist]} { | |
| 9f1afe05 | 5641 | set idlist [linsert $idlist $col {}] |
| 0380081c PM |
5642 | lset rowidlist $row $idlist |
| 5643 | changedrow $row | |
| 9f1afe05 PM |
5644 | } |
| 5645 | } | |
| 9f1afe05 PM |
5646 | } |
| 5647 | } | |
| 5648 | ||
| 5649 | proc xc {row col} { | |
| 5650 | global canvx0 linespc | |
| 5651 | return [expr {$canvx0 + $col * $linespc}] | |
| 5652 | } | |
| 5653 | ||
| 5654 | proc yc {row} { | |
| 5655 | global canvy0 linespc | |
| 5656 | return [expr {$canvy0 + $row * $linespc}] | |
| 5657 | } | |
| 5658 | ||
| c934a8a3 PM |
5659 | proc linewidth {id} { |
| 5660 | global thickerline lthickness | |
| 5661 | ||
| 5662 | set wid $lthickness | |
| 5663 | if {[info exists thickerline] && $id eq $thickerline} { | |
| 5664 | set wid [expr {2 * $lthickness}] | |
| 5665 | } | |
| 5666 | return $wid | |
| 5667 | } | |
| 5668 | ||
| 50b44ece | 5669 | proc rowranges {id} { |
| 7fcc92bf | 5670 | global curview children uparrowlen downarrowlen |
| 92ed666f | 5671 | global rowidlist |
| 50b44ece | 5672 | |
| 92ed666f PM |
5673 | set kids $children($curview,$id) |
| 5674 | if {$kids eq {}} { | |
| 5675 | return {} | |
| 66e46f37 | 5676 | } |
| 92ed666f PM |
5677 | set ret {} |
| 5678 | lappend kids $id | |
| 5679 | foreach child $kids { | |
| 7fcc92bf PM |
5680 | if {![commitinview $child $curview]} break |
| 5681 | set row [rowofcommit $child] | |
| 92ed666f PM |
5682 | if {![info exists prev]} { |
| 5683 | lappend ret [expr {$row + 1}] | |
| 322a8cc9 | 5684 | } else { |
| 92ed666f | 5685 | if {$row <= $prevrow} { |
| 7fcc92bf | 5686 | puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow" |
| 92ed666f PM |
5687 | } |
| 5688 | # see if the line extends the whole way from prevrow to row | |
| 5689 | if {$row > $prevrow + $uparrowlen + $downarrowlen && | |
| 5690 | [lsearch -exact [lindex $rowidlist \ | |
| 5691 | [expr {int(($row + $prevrow) / 2)}]] $id] < 0} { | |
| 5692 | # it doesn't, see where it ends | |
| 5693 | set r [expr {$prevrow + $downarrowlen}] | |
| 5694 | if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} { | |
| 5695 | while {[incr r -1] > $prevrow && | |
| 5696 | [lsearch -exact [lindex $rowidlist $r] $id] < 0} {} | |
| 5697 | } else { | |
| 5698 | while {[incr r] <= $row && | |
| 5699 | [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {} | |
| 5700 | incr r -1 | |
| 5701 | } | |
| 5702 | lappend ret $r | |
| 5703 | # see where it starts up again | |
| 5704 | set r [expr {$row - $uparrowlen}] | |
| 5705 | if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} { | |
| 5706 | while {[incr r] < $row && | |
| 5707 | [lsearch -exact [lindex $rowidlist $r] $id] < 0} {} | |
| 5708 | } else { | |
| 5709 | while {[incr r -1] >= $prevrow && | |
| 5710 | [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {} | |
| 5711 | incr r | |
| 5712 | } | |
| 5713 | lappend ret $r | |
| 5714 | } | |
| 5715 | } | |
| 5716 | if {$child eq $id} { | |
| 5717 | lappend ret $row | |
| 322a8cc9 | 5718 | } |
| 7fcc92bf | 5719 | set prev $child |
| 92ed666f | 5720 | set prevrow $row |
| 9f1afe05 | 5721 | } |
| 92ed666f | 5722 | return $ret |
| 322a8cc9 PM |
5723 | } |
| 5724 | ||
| 5725 | proc drawlineseg {id row endrow arrowlow} { | |
| 5726 | global rowidlist displayorder iddrawn linesegs | |
| e341c06d | 5727 | global canv colormap linespc curview maxlinelen parentlist |
| 322a8cc9 PM |
5728 | |
| 5729 | set cols [list [lsearch -exact [lindex $rowidlist $row] $id]] | |
| 5730 | set le [expr {$row + 1}] | |
| 5731 | set arrowhigh 1 | |
| 9f1afe05 | 5732 | while {1} { |
| 322a8cc9 PM |
5733 | set c [lsearch -exact [lindex $rowidlist $le] $id] |
| 5734 | if {$c < 0} { | |
| 5735 | incr le -1 | |
| 5736 | break | |
| 5737 | } | |
| 5738 | lappend cols $c | |
| 5739 | set x [lindex $displayorder $le] | |
| 5740 | if {$x eq $id} { | |
| 5741 | set arrowhigh 0 | |
| 5742 | break | |
| 9f1afe05 | 5743 | } |
| 322a8cc9 PM |
5744 | if {[info exists iddrawn($x)] || $le == $endrow} { |
| 5745 | set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id] | |
| 5746 | if {$c >= 0} { | |
| 5747 | lappend cols $c | |
| 5748 | set arrowhigh 0 | |
| 5749 | } | |
| 5750 | break | |
| 5751 | } | |
| 5752 | incr le | |
| 9f1afe05 | 5753 | } |
| 322a8cc9 PM |
5754 | if {$le <= $row} { |
| 5755 | return $row | |
| 5756 | } | |
| 5757 | ||
| 5758 | set lines {} | |
| 5759 | set i 0 | |
| 5760 | set joinhigh 0 | |
| 5761 | if {[info exists linesegs($id)]} { | |
| 5762 | set lines $linesegs($id) | |
| 5763 | foreach li $lines { | |
| 5764 | set r0 [lindex $li 0] | |
| 5765 | if {$r0 > $row} { | |
| 5766 | if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} { | |
| 5767 | set joinhigh 1 | |
| 5768 | } | |
| 5769 | break | |
| 5770 | } | |
| 5771 | incr i | |
| 5772 | } | |
| 5773 | } | |
| 5774 | set joinlow 0 | |
| 5775 | if {$i > 0} { | |
| 5776 | set li [lindex $lines [expr {$i-1}]] | |
| 5777 | set r1 [lindex $li 1] | |
| 5778 | if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} { | |
| 5779 | set joinlow 1 | |
| 5780 | } | |
| 5781 | } | |
| 5782 | ||
| 5783 | set x [lindex $cols [expr {$le - $row}]] | |
| 5784 | set xp [lindex $cols [expr {$le - 1 - $row}]] | |
| 5785 | set dir [expr {$xp - $x}] | |
| 5786 | if {$joinhigh} { | |
| 5787 | set ith [lindex $lines $i 2] | |
| 5788 | set coords [$canv coords $ith] | |
| 5789 | set ah [$canv itemcget $ith -arrow] | |
| 5790 | set arrowhigh [expr {$ah eq "first" || $ah eq "both"}] | |
| 5791 | set x2 [lindex $cols [expr {$le + 1 - $row}]] | |
| 5792 | if {$x2 ne {} && $x - $x2 == $dir} { | |
| 5793 | set coords [lrange $coords 0 end-2] | |
| 5794 | } | |
| 5795 | } else { | |
| 5796 | set coords [list [xc $le $x] [yc $le]] | |
| 5797 | } | |
| 5798 | if {$joinlow} { | |
| 5799 | set itl [lindex $lines [expr {$i-1}] 2] | |
| 5800 | set al [$canv itemcget $itl -arrow] | |
| 5801 | set arrowlow [expr {$al eq "last" || $al eq "both"}] | |
| e341c06d PM |
5802 | } elseif {$arrowlow} { |
| 5803 | if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 || | |
| 5804 | [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} { | |
| 5805 | set arrowlow 0 | |
| 5806 | } | |
| 322a8cc9 PM |
5807 | } |
| 5808 | set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]] | |
| 5809 | for {set y $le} {[incr y -1] > $row} {} { | |
| 5810 | set x $xp | |
| 5811 | set xp [lindex $cols [expr {$y - 1 - $row}]] | |
| 5812 | set ndir [expr {$xp - $x}] | |
| 5813 | if {$dir != $ndir || $xp < 0} { | |
| 5814 | lappend coords [xc $y $x] [yc $y] | |
| 5815 | } | |
| 5816 | set dir $ndir | |
| 5817 | } | |
| 5818 | if {!$joinlow} { | |
| 5819 | if {$xp < 0} { | |
| 5820 | # join parent line to first child | |
| 5821 | set ch [lindex $displayorder $row] | |
| 5822 | set xc [lsearch -exact [lindex $rowidlist $row] $ch] | |
| 5823 | if {$xc < 0} { | |
| 5824 | puts "oops: drawlineseg: child $ch not on row $row" | |
| e341c06d PM |
5825 | } elseif {$xc != $x} { |
| 5826 | if {($arrowhigh && $le == $row + 1) || $dir == 0} { | |
| 5827 | set d [expr {int(0.5 * $linespc)}] | |
| 5828 | set x1 [xc $row $x] | |
| 5829 | if {$xc < $x} { | |
| 5830 | set x2 [expr {$x1 - $d}] | |
| 5831 | } else { | |
| 5832 | set x2 [expr {$x1 + $d}] | |
| 5833 | } | |
| 5834 | set y2 [yc $row] | |
| 5835 | set y1 [expr {$y2 + $d}] | |
| 5836 | lappend coords $x1 $y1 $x2 $y2 | |
| 5837 | } elseif {$xc < $x - 1} { | |
| 322a8cc9 PM |
5838 | lappend coords [xc $row [expr {$x-1}]] [yc $row] |
| 5839 | } elseif {$xc > $x + 1} { | |
| 5840 | lappend coords [xc $row [expr {$x+1}]] [yc $row] | |
| 5841 | } | |
| 5842 | set x $xc | |
| eb447a12 | 5843 | } |
| 322a8cc9 PM |
5844 | lappend coords [xc $row $x] [yc $row] |
| 5845 | } else { | |
| 5846 | set xn [xc $row $xp] | |
| 5847 | set yn [yc $row] | |
| e341c06d | 5848 | lappend coords $xn $yn |
| 322a8cc9 PM |
5849 | } |
| 5850 | if {!$joinhigh} { | |
| 322a8cc9 PM |
5851 | assigncolor $id |
| 5852 | set t [$canv create line $coords -width [linewidth $id] \ | |
| 5853 | -fill $colormap($id) -tags lines.$id -arrow $arrow] | |
| 5854 | $canv lower $t | |
| 5855 | bindline $t $id | |
| 5856 | set lines [linsert $lines $i [list $row $le $t]] | |
| 5857 | } else { | |
| 5858 | $canv coords $ith $coords | |
| 5859 | if {$arrow ne $ah} { | |
| 5860 | $canv itemconf $ith -arrow $arrow | |
| 5861 | } | |
| 5862 | lset lines $i 0 $row | |
| 5863 | } | |
| 5864 | } else { | |
| 5865 | set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id] | |
| 5866 | set ndir [expr {$xo - $xp}] | |
| 5867 | set clow [$canv coords $itl] | |
| 5868 | if {$dir == $ndir} { | |
| 5869 | set clow [lrange $clow 2 end] | |
| 5870 | } | |
| 5871 | set coords [concat $coords $clow] | |
| 5872 | if {!$joinhigh} { | |
| 5873 | lset lines [expr {$i-1}] 1 $le | |
| 322a8cc9 PM |
5874 | } else { |
| 5875 | # coalesce two pieces | |
| 5876 | $canv delete $ith | |
| 5877 | set b [lindex $lines [expr {$i-1}] 0] | |
| 5878 | set e [lindex $lines $i 1] | |
| 5879 | set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]] | |
| 5880 | } | |
| 5881 | $canv coords $itl $coords | |
| 5882 | if {$arrow ne $al} { | |
| 5883 | $canv itemconf $itl -arrow $arrow | |
| 879e8b1a PM |
5884 | } |
| 5885 | } | |
| 322a8cc9 PM |
5886 | |
| 5887 | set linesegs($id) $lines | |
| 5888 | return $le | |
| 9f1afe05 PM |
5889 | } |
| 5890 | ||
| 322a8cc9 PM |
5891 | proc drawparentlinks {id row} { |
| 5892 | global rowidlist canv colormap curview parentlist | |
| 513a54dc | 5893 | global idpos linespc |
| 9f1afe05 | 5894 | |
| 322a8cc9 PM |
5895 | set rowids [lindex $rowidlist $row] |
| 5896 | set col [lsearch -exact $rowids $id] | |
| 5897 | if {$col < 0} return | |
| 5898 | set olds [lindex $parentlist $row] | |
| 9f1afe05 PM |
5899 | set row2 [expr {$row + 1}] |
| 5900 | set x [xc $row $col] | |
| 5901 | set y [yc $row] | |
| 5902 | set y2 [yc $row2] | |
| e341c06d | 5903 | set d [expr {int(0.5 * $linespc)}] |
| 513a54dc | 5904 | set ymid [expr {$y + $d}] |
| 8f7d0cec | 5905 | set ids [lindex $rowidlist $row2] |
| 9f1afe05 PM |
5906 | # rmx = right-most X coord used |
| 5907 | set rmx 0 | |
| 9f1afe05 | 5908 | foreach p $olds { |
| f3408449 PM |
5909 | set i [lsearch -exact $ids $p] |
| 5910 | if {$i < 0} { | |
| 5911 | puts "oops, parent $p of $id not in list" | |
| 5912 | continue | |
| 5913 | } | |
| 5914 | set x2 [xc $row2 $i] | |
| 5915 | if {$x2 > $rmx} { | |
| 5916 | set rmx $x2 | |
| 5917 | } | |
| 513a54dc PM |
5918 | set j [lsearch -exact $rowids $p] |
| 5919 | if {$j < 0} { | |
| eb447a12 PM |
5920 | # drawlineseg will do this one for us |
| 5921 | continue | |
| 5922 | } | |
| 9f1afe05 PM |
5923 | assigncolor $p |
| 5924 | # should handle duplicated parents here... | |
| 5925 | set coords [list $x $y] | |
| 513a54dc PM |
5926 | if {$i != $col} { |
| 5927 | # if attaching to a vertical segment, draw a smaller | |
| 5928 | # slant for visual distinctness | |
| 5929 | if {$i == $j} { | |
| 5930 | if {$i < $col} { | |
| 5931 | lappend coords [expr {$x2 + $d}] $y $x2 $ymid | |
| 5932 | } else { | |
| 5933 | lappend coords [expr {$x2 - $d}] $y $x2 $ymid | |
| 5934 | } | |
| 5935 | } elseif {$i < $col && $i < $j} { | |
| 5936 | # segment slants towards us already | |
| 5937 | lappend coords [xc $row $j] $y | |
| 5938 | } else { | |
| 5939 | if {$i < $col - 1} { | |
| 5940 | lappend coords [expr {$x2 + $linespc}] $y | |
| 5941 | } elseif {$i > $col + 1} { | |
| 5942 | lappend coords [expr {$x2 - $linespc}] $y | |
| 5943 | } | |
| 5944 | lappend coords $x2 $y2 | |
| 5945 | } | |
| 5946 | } else { | |
| 5947 | lappend coords $x2 $y2 | |
| 9f1afe05 | 5948 | } |
| c934a8a3 | 5949 | set t [$canv create line $coords -width [linewidth $p] \ |
| 9f1afe05 PM |
5950 | -fill $colormap($p) -tags lines.$p] |
| 5951 | $canv lower $t | |
| 5952 | bindline $t $p | |
| 5953 | } | |
| 322a8cc9 PM |
5954 | if {$rmx > [lindex $idpos($id) 1]} { |
| 5955 | lset idpos($id) 1 $rmx | |
| 5956 | redrawtags $id | |
| 5957 | } | |
| 9f1afe05 PM |
5958 | } |
| 5959 | ||
| c934a8a3 | 5960 | proc drawlines {id} { |
| 322a8cc9 | 5961 | global canv |
| 9f1afe05 | 5962 | |
| 322a8cc9 | 5963 | $canv itemconf lines.$id -width [linewidth $id] |
| 9f1afe05 PM |
5964 | } |
| 5965 | ||
| 322a8cc9 | 5966 | proc drawcmittext {id row col} { |
| 7fcc92bf PM |
5967 | global linespc canv canv2 canv3 fgcolor curview |
| 5968 | global cmitlisted commitinfo rowidlist parentlist | |
| 9f1afe05 | 5969 | global rowtextx idpos idtags idheads idotherrefs |
| 0380081c | 5970 | global linehtag linentag linedtag selectedline |
| b9fdba7f | 5971 | global canvxmax boldids boldnameids fgcolor markedid |
| d277e89f | 5972 | global mainheadid nullid nullid2 circleitem circlecolors ctxbut |
| 252c52df GÖ |
5973 | global mainheadcirclecolor workingfilescirclecolor indexcirclecolor |
| 5974 | global circleoutlinecolor | |
| 9f1afe05 | 5975 | |
| 1407ade9 | 5976 | # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right |
| 7fcc92bf | 5977 | set listed $cmitlisted($curview,$id) |
| 219ea3a9 | 5978 | if {$id eq $nullid} { |
| 252c52df | 5979 | set ofill $workingfilescirclecolor |
| 8f489363 | 5980 | } elseif {$id eq $nullid2} { |
| 252c52df | 5981 | set ofill $indexcirclecolor |
| c11ff120 | 5982 | } elseif {$id eq $mainheadid} { |
| 252c52df | 5983 | set ofill $mainheadcirclecolor |
| 219ea3a9 | 5984 | } else { |
| c11ff120 | 5985 | set ofill [lindex $circlecolors $listed] |
| 219ea3a9 | 5986 | } |
| 9f1afe05 PM |
5987 | set x [xc $row $col] |
| 5988 | set y [yc $row] | |
| 5989 | set orad [expr {$linespc / 3}] | |
| 1407ade9 | 5990 | if {$listed <= 2} { |
| c961b228 PM |
5991 | set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \ |
| 5992 | [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \ | |
| 252c52df | 5993 | -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle] |
| 1407ade9 | 5994 | } elseif {$listed == 3} { |
| c961b228 PM |
5995 | # triangle pointing left for left-side commits |
| 5996 | set t [$canv create polygon \ | |
| 5997 | [expr {$x - $orad}] $y \ | |
| 5998 | [expr {$x + $orad - 1}] [expr {$y - $orad}] \ | |
| 5999 | [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \ | |
| 252c52df | 6000 | -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle] |
| c961b228 PM |
6001 | } else { |
| 6002 | # triangle pointing right for right-side commits | |
| 6003 | set t [$canv create polygon \ | |
| 6004 | [expr {$x + $orad - 1}] $y \ | |
| 6005 | [expr {$x - $orad}] [expr {$y - $orad}] \ | |
| 6006 | [expr {$x - $orad}] [expr {$y + $orad - 1}] \ | |
| 252c52df | 6007 | -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle] |
| c961b228 | 6008 | } |
| c11ff120 | 6009 | set circleitem($row) $t |
| 9f1afe05 PM |
6010 | $canv raise $t |
| 6011 | $canv bind $t <1> {selcanvline {} %x %y} | |
| 322a8cc9 PM |
6012 | set rmx [llength [lindex $rowidlist $row]] |
| 6013 | set olds [lindex $parentlist $row] | |
| 6014 | if {$olds ne {}} { | |
| 6015 | set nextids [lindex $rowidlist [expr {$row + 1}]] | |
| 6016 | foreach p $olds { | |
| 6017 | set i [lsearch -exact $nextids $p] | |
| 6018 | if {$i > $rmx} { | |
| 6019 | set rmx $i | |
| 6020 | } | |
| 6021 | } | |
| 9f1afe05 | 6022 | } |
| 322a8cc9 | 6023 | set xt [xc $row $rmx] |
| 9f1afe05 PM |
6024 | set rowtextx($row) $xt |
| 6025 | set idpos($id) [list $x $xt $y] | |
| 6026 | if {[info exists idtags($id)] || [info exists idheads($id)] | |
| 6027 | || [info exists idotherrefs($id)]} { | |
| 6028 | set xt [drawtags $id $x $xt $y] | |
| 6029 | } | |
| 36242490 RZ |
6030 | if {[lindex $commitinfo($id) 6] > 0} { |
| 6031 | set xt [drawnotesign $xt $y] | |
| 6032 | } | |
| 9f1afe05 PM |
6033 | set headline [lindex $commitinfo($id) 0] |
| 6034 | set name [lindex $commitinfo($id) 1] | |
| 6035 | set date [lindex $commitinfo($id) 2] | |
| 6036 | set date [formatdate $date] | |
| 9c311b32 PM |
6037 | set font mainfont |
| 6038 | set nfont mainfont | |
| 476ca63d | 6039 | set isbold [ishighlighted $id] |
| 908c3585 | 6040 | if {$isbold > 0} { |
| 28593d3f | 6041 | lappend boldids $id |
| 9c311b32 | 6042 | set font mainfontbold |
| 908c3585 | 6043 | if {$isbold > 1} { |
| 28593d3f | 6044 | lappend boldnameids $id |
| 9c311b32 | 6045 | set nfont mainfontbold |
| 908c3585 | 6046 | } |
| da7c24dd | 6047 | } |
| 28593d3f PM |
6048 | set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \ |
| 6049 | -text $headline -font $font -tags text] | |
| 6050 | $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id" | |
| 6051 | set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \ | |
| 6052 | -text $name -font $nfont -tags text] | |
| 6053 | set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \ | |
| 6054 | -text $date -font mainfont -tags text] | |
| 94b4a69f | 6055 | if {$selectedline == $row} { |
| 28593d3f | 6056 | make_secsel $id |
| 0380081c | 6057 | } |
| b9fdba7f PM |
6058 | if {[info exists markedid] && $markedid eq $id} { |
| 6059 | make_idmark $id | |
| 6060 | } | |
| 9c311b32 | 6061 | set xr [expr {$xt + [font measure $font $headline]}] |
| be0cd098 PM |
6062 | if {$xr > $canvxmax} { |
| 6063 | set canvxmax $xr | |
| 6064 | setcanvscroll | |
| 6065 | } | |
| 9f1afe05 PM |
6066 | } |
| 6067 | ||
| 6068 | proc drawcmitrow {row} { | |
| 0380081c | 6069 | global displayorder rowidlist nrows_drawn |
| 005a2f4e | 6070 | global iddrawn markingmatches |
| 7fcc92bf | 6071 | global commitinfo numcommits |
| 687c8765 | 6072 | global filehighlight fhighlights findpattern nhighlights |
| 908c3585 | 6073 | global hlview vhighlights |
| 164ff275 | 6074 | global highlight_related rhighlights |
| 9f1afe05 | 6075 | |
| 8f7d0cec | 6076 | if {$row >= $numcommits} return |
| 9f1afe05 PM |
6077 | |
| 6078 | set id [lindex $displayorder $row] | |
| 476ca63d | 6079 | if {[info exists hlview] && ![info exists vhighlights($id)]} { |
| 908c3585 PM |
6080 | askvhighlight $row $id |
| 6081 | } | |
| 476ca63d | 6082 | if {[info exists filehighlight] && ![info exists fhighlights($id)]} { |
| 908c3585 PM |
6083 | askfilehighlight $row $id |
| 6084 | } | |
| 476ca63d | 6085 | if {$findpattern ne {} && ![info exists nhighlights($id)]} { |
| 60f7a7dc | 6086 | askfindhighlight $row $id |
| 908c3585 | 6087 | } |
| 476ca63d | 6088 | if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} { |
| 164ff275 PM |
6089 | askrelhighlight $row $id |
| 6090 | } | |
| 005a2f4e PM |
6091 | if {![info exists iddrawn($id)]} { |
| 6092 | set col [lsearch -exact [lindex $rowidlist $row] $id] | |
| 6093 | if {$col < 0} { | |
| 6094 | puts "oops, row $row id $id not in list" | |
| 6095 | return | |
| 6096 | } | |
| 6097 | if {![info exists commitinfo($id)]} { | |
| 6098 | getcommit $id | |
| 6099 | } | |
| 6100 | assigncolor $id | |
| 6101 | drawcmittext $id $row $col | |
| 6102 | set iddrawn($id) 1 | |
| 0380081c | 6103 | incr nrows_drawn |
| 9f1afe05 | 6104 | } |
| 005a2f4e PM |
6105 | if {$markingmatches} { |
| 6106 | markrowmatches $row $id | |
| 9f1afe05 | 6107 | } |
| 9f1afe05 PM |
6108 | } |
| 6109 | ||
| 322a8cc9 | 6110 | proc drawcommits {row {endrow {}}} { |
| 0380081c | 6111 | global numcommits iddrawn displayorder curview need_redisplay |
| f5f3c2e2 | 6112 | global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn |
| 9f1afe05 | 6113 | |
| 9f1afe05 PM |
6114 | if {$row < 0} { |
| 6115 | set row 0 | |
| 6116 | } | |
| 322a8cc9 PM |
6117 | if {$endrow eq {}} { |
| 6118 | set endrow $row | |
| 6119 | } | |
| 9f1afe05 PM |
6120 | if {$endrow >= $numcommits} { |
| 6121 | set endrow [expr {$numcommits - 1}] | |
| 6122 | } | |
| 322a8cc9 | 6123 | |
| 0380081c PM |
6124 | set rl1 [expr {$row - $downarrowlen - 3}] |
| 6125 | if {$rl1 < 0} { | |
| 6126 | set rl1 0 | |
| 6127 | } | |
| 6128 | set ro1 [expr {$row - 3}] | |
| 6129 | if {$ro1 < 0} { | |
| 6130 | set ro1 0 | |
| 6131 | } | |
| 6132 | set r2 [expr {$endrow + $uparrowlen + 3}] | |
| 6133 | if {$r2 > $numcommits} { | |
| 6134 | set r2 $numcommits | |
| 6135 | } | |
| 6136 | for {set r $rl1} {$r < $r2} {incr r} { | |
| f5f3c2e2 | 6137 | if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} { |
| 0380081c PM |
6138 | if {$rl1 < $r} { |
| 6139 | layoutrows $rl1 $r | |
| 6140 | } | |
| 6141 | set rl1 [expr {$r + 1}] | |
| 6142 | } | |
| 6143 | } | |
| 6144 | if {$rl1 < $r} { | |
| 6145 | layoutrows $rl1 $r | |
| 6146 | } | |
| 6147 | optimize_rows $ro1 0 $r2 | |
| 6148 | if {$need_redisplay || $nrows_drawn > 2000} { | |
| 6149 | clear_display | |
| 0380081c PM |
6150 | } |
| 6151 | ||
| 322a8cc9 PM |
6152 | # make the lines join to already-drawn rows either side |
| 6153 | set r [expr {$row - 1}] | |
| 6154 | if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} { | |
| 6155 | set r $row | |
| 6156 | } | |
| 6157 | set er [expr {$endrow + 1}] | |
| 6158 | if {$er >= $numcommits || | |
| 6159 | ![info exists iddrawn([lindex $displayorder $er])]} { | |
| 6160 | set er $endrow | |
| 6161 | } | |
| 6162 | for {} {$r <= $er} {incr r} { | |
| 6163 | set id [lindex $displayorder $r] | |
| 6164 | set wasdrawn [info exists iddrawn($id)] | |
| 4fb0fa19 | 6165 | drawcmitrow $r |
| 322a8cc9 PM |
6166 | if {$r == $er} break |
| 6167 | set nextid [lindex $displayorder [expr {$r + 1}]] | |
| e5ef6f95 | 6168 | if {$wasdrawn && [info exists iddrawn($nextid)]} continue |
| 322a8cc9 PM |
6169 | drawparentlinks $id $r |
| 6170 | ||
| 322a8cc9 PM |
6171 | set rowids [lindex $rowidlist $r] |
| 6172 | foreach lid $rowids { | |
| 6173 | if {$lid eq {}} continue | |
| e5ef6f95 | 6174 | if {[info exists lineend($lid)] && $lineend($lid) > $r} continue |
| 322a8cc9 PM |
6175 | if {$lid eq $id} { |
| 6176 | # see if this is the first child of any of its parents | |
| 6177 | foreach p [lindex $parentlist $r] { | |
| 6178 | if {[lsearch -exact $rowids $p] < 0} { | |
| 6179 | # make this line extend up to the child | |
| e5ef6f95 | 6180 | set lineend($p) [drawlineseg $p $r $er 0] |
| 322a8cc9 PM |
6181 | } |
| 6182 | } | |
| e5ef6f95 PM |
6183 | } else { |
| 6184 | set lineend($lid) [drawlineseg $lid $r $er 1] | |
| 322a8cc9 PM |
6185 | } |
| 6186 | } | |
| 9f1afe05 PM |
6187 | } |
| 6188 | } | |
| 6189 | ||
| 7fcc92bf PM |
6190 | proc undolayout {row} { |
| 6191 | global uparrowlen mingaplen downarrowlen | |
| 6192 | global rowidlist rowisopt rowfinal need_redisplay | |
| 6193 | ||
| 6194 | set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}] | |
| 6195 | if {$r < 0} { | |
| 6196 | set r 0 | |
| 6197 | } | |
| 6198 | if {[llength $rowidlist] > $r} { | |
| 6199 | incr r -1 | |
| 6200 | set rowidlist [lrange $rowidlist 0 $r] | |
| 6201 | set rowfinal [lrange $rowfinal 0 $r] | |
| 6202 | set rowisopt [lrange $rowisopt 0 $r] | |
| 6203 | set need_redisplay 1 | |
| 6204 | run drawvisible | |
| 6205 | } | |
| 6206 | } | |
| 6207 | ||
| 31c0eaa8 PM |
6208 | proc drawvisible {} { |
| 6209 | global canv linespc curview vrowmod selectedline targetrow targetid | |
| 42a671fc | 6210 | global need_redisplay cscroll numcommits |
| 322a8cc9 | 6211 | |
| 31c0eaa8 | 6212 | set fs [$canv yview] |
| 322a8cc9 | 6213 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 5a7f577d | 6214 | if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return |
| 31c0eaa8 PM |
6215 | set f0 [lindex $fs 0] |
| 6216 | set f1 [lindex $fs 1] | |
| 322a8cc9 | 6217 | set y0 [expr {int($f0 * $ymax)}] |
| 322a8cc9 | 6218 | set y1 [expr {int($f1 * $ymax)}] |
| 31c0eaa8 PM |
6219 | |
| 6220 | if {[info exists targetid]} { | |
| 42a671fc PM |
6221 | if {[commitinview $targetid $curview]} { |
| 6222 | set r [rowofcommit $targetid] | |
| 6223 | if {$r != $targetrow} { | |
| 6224 | # Fix up the scrollregion and change the scrolling position | |
| 6225 | # now that our target row has moved. | |
| 6226 | set diff [expr {($r - $targetrow) * $linespc}] | |
| 6227 | set targetrow $r | |
| 6228 | setcanvscroll | |
| 6229 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 6230 | incr y0 $diff | |
| 6231 | incr y1 $diff | |
| 6232 | set f0 [expr {$y0 / $ymax}] | |
| 6233 | set f1 [expr {$y1 / $ymax}] | |
| 6234 | allcanvs yview moveto $f0 | |
| 6235 | $cscroll set $f0 $f1 | |
| 6236 | set need_redisplay 1 | |
| 6237 | } | |
| 6238 | } else { | |
| 6239 | unset targetid | |
| 31c0eaa8 PM |
6240 | } |
| 6241 | } | |
| 6242 | ||
| 6243 | set row [expr {int(($y0 - 3) / $linespc) - 1}] | |
| 322a8cc9 | 6244 | set endrow [expr {int(($y1 - 3) / $linespc) + 1}] |
| 31c0eaa8 PM |
6245 | if {$endrow >= $vrowmod($curview)} { |
| 6246 | update_arcrows $curview | |
| 6247 | } | |
| 94b4a69f | 6248 | if {$selectedline ne {} && |
| 31c0eaa8 PM |
6249 | $row <= $selectedline && $selectedline <= $endrow} { |
| 6250 | set targetrow $selectedline | |
| ac1276ab | 6251 | } elseif {[info exists targetid]} { |
| 31c0eaa8 PM |
6252 | set targetrow [expr {int(($row + $endrow) / 2)}] |
| 6253 | } | |
| ac1276ab PM |
6254 | if {[info exists targetrow]} { |
| 6255 | if {$targetrow >= $numcommits} { | |
| 6256 | set targetrow [expr {$numcommits - 1}] | |
| 6257 | } | |
| 6258 | set targetid [commitonrow $targetrow] | |
| 42a671fc | 6259 | } |
| 322a8cc9 PM |
6260 | drawcommits $row $endrow |
| 6261 | } | |
| 6262 | ||
| 9f1afe05 | 6263 | proc clear_display {} { |
| 0380081c | 6264 | global iddrawn linesegs need_redisplay nrows_drawn |
| 164ff275 | 6265 | global vhighlights fhighlights nhighlights rhighlights |
| 28593d3f | 6266 | global linehtag linentag linedtag boldids boldnameids |
| 9f1afe05 PM |
6267 | |
| 6268 | allcanvs delete all | |
| 6269 | catch {unset iddrawn} | |
| 322a8cc9 | 6270 | catch {unset linesegs} |
| 94503a66 PM |
6271 | catch {unset linehtag} |
| 6272 | catch {unset linentag} | |
| 6273 | catch {unset linedtag} | |
| 28593d3f PM |
6274 | set boldids {} |
| 6275 | set boldnameids {} | |
| 908c3585 PM |
6276 | catch {unset vhighlights} |
| 6277 | catch {unset fhighlights} | |
| 6278 | catch {unset nhighlights} | |
| 164ff275 | 6279 | catch {unset rhighlights} |
| 0380081c PM |
6280 | set need_redisplay 0 |
| 6281 | set nrows_drawn 0 | |
| 9f1afe05 PM |
6282 | } |
| 6283 | ||
| 50b44ece | 6284 | proc findcrossings {id} { |
| 6e8c8707 | 6285 | global rowidlist parentlist numcommits displayorder |
| 50b44ece PM |
6286 | |
| 6287 | set cross {} | |
| 6288 | set ccross {} | |
| 6289 | foreach {s e} [rowranges $id] { | |
| 6290 | if {$e >= $numcommits} { | |
| 6291 | set e [expr {$numcommits - 1}] | |
| 50b44ece | 6292 | } |
| d94f8cd6 | 6293 | if {$e <= $s} continue |
| 50b44ece | 6294 | for {set row $e} {[incr row -1] >= $s} {} { |
| 6e8c8707 PM |
6295 | set x [lsearch -exact [lindex $rowidlist $row] $id] |
| 6296 | if {$x < 0} break | |
| 50b44ece PM |
6297 | set olds [lindex $parentlist $row] |
| 6298 | set kid [lindex $displayorder $row] | |
| 6299 | set kidx [lsearch -exact [lindex $rowidlist $row] $kid] | |
| 6300 | if {$kidx < 0} continue | |
| 6301 | set nextrow [lindex $rowidlist [expr {$row + 1}]] | |
| 6302 | foreach p $olds { | |
| 6303 | set px [lsearch -exact $nextrow $p] | |
| 6304 | if {$px < 0} continue | |
| 6305 | if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} { | |
| 6306 | if {[lsearch -exact $ccross $p] >= 0} continue | |
| 6307 | if {$x == $px + ($kidx < $px? -1: 1)} { | |
| 6308 | lappend ccross $p | |
| 6309 | } elseif {[lsearch -exact $cross $p] < 0} { | |
| 6310 | lappend cross $p | |
| 6311 | } | |
| 6312 | } | |
| 6313 | } | |
| 50b44ece PM |
6314 | } |
| 6315 | } | |
| 6316 | return [concat $ccross {{}} $cross] | |
| 6317 | } | |
| 6318 | ||
| e5c2d856 | 6319 | proc assigncolor {id} { |
| aa81d974 | 6320 | global colormap colors nextcolor |
| 7fcc92bf | 6321 | global parents children children curview |
| 6c20ff34 | 6322 | |
| 418c4c7b | 6323 | if {[info exists colormap($id)]} return |
| e5c2d856 | 6324 | set ncolors [llength $colors] |
| da7c24dd PM |
6325 | if {[info exists children($curview,$id)]} { |
| 6326 | set kids $children($curview,$id) | |
| 79b2c75e PM |
6327 | } else { |
| 6328 | set kids {} | |
| 6329 | } | |
| 6330 | if {[llength $kids] == 1} { | |
| 6331 | set child [lindex $kids 0] | |
| 9ccbdfbf | 6332 | if {[info exists colormap($child)] |
| 7fcc92bf | 6333 | && [llength $parents($curview,$child)] == 1} { |
| 9ccbdfbf PM |
6334 | set colormap($id) $colormap($child) |
| 6335 | return | |
| e5c2d856 | 6336 | } |
| 9ccbdfbf PM |
6337 | } |
| 6338 | set badcolors {} | |
| 50b44ece PM |
6339 | set origbad {} |
| 6340 | foreach x [findcrossings $id] { | |
| 6341 | if {$x eq {}} { | |
| 6342 | # delimiter between corner crossings and other crossings | |
| 6343 | if {[llength $badcolors] >= $ncolors - 1} break | |
| 6344 | set origbad $badcolors | |
| e5c2d856 | 6345 | } |
| 50b44ece PM |
6346 | if {[info exists colormap($x)] |
| 6347 | && [lsearch -exact $badcolors $colormap($x)] < 0} { | |
| 6348 | lappend badcolors $colormap($x) | |
| 6c20ff34 PM |
6349 | } |
| 6350 | } | |
| 50b44ece PM |
6351 | if {[llength $badcolors] >= $ncolors} { |
| 6352 | set badcolors $origbad | |
| 9ccbdfbf | 6353 | } |
| 50b44ece | 6354 | set origbad $badcolors |
| 6c20ff34 | 6355 | if {[llength $badcolors] < $ncolors - 1} { |
| 79b2c75e | 6356 | foreach child $kids { |
| 6c20ff34 PM |
6357 | if {[info exists colormap($child)] |
| 6358 | && [lsearch -exact $badcolors $colormap($child)] < 0} { | |
| 6359 | lappend badcolors $colormap($child) | |
| 6360 | } | |
| 7fcc92bf | 6361 | foreach p $parents($curview,$child) { |
| 79b2c75e PM |
6362 | if {[info exists colormap($p)] |
| 6363 | && [lsearch -exact $badcolors $colormap($p)] < 0} { | |
| 6364 | lappend badcolors $colormap($p) | |
| 6c20ff34 PM |
6365 | } |
| 6366 | } | |
| 6367 | } | |
| 6368 | if {[llength $badcolors] >= $ncolors} { | |
| 6369 | set badcolors $origbad | |
| 6370 | } | |
| 9ccbdfbf PM |
6371 | } |
| 6372 | for {set i 0} {$i <= $ncolors} {incr i} { | |
| 6373 | set c [lindex $colors $nextcolor] | |
| 6374 | if {[incr nextcolor] >= $ncolors} { | |
| 6375 | set nextcolor 0 | |
| e5c2d856 | 6376 | } |
| 9ccbdfbf | 6377 | if {[lsearch -exact $badcolors $c]} break |
| e5c2d856 | 6378 | } |
| 9ccbdfbf | 6379 | set colormap($id) $c |
| e5c2d856 PM |
6380 | } |
| 6381 | ||
| a823a911 PM |
6382 | proc bindline {t id} { |
| 6383 | global canv | |
| 6384 | ||
| a823a911 PM |
6385 | $canv bind $t <Enter> "lineenter %x %y $id" |
| 6386 | $canv bind $t <Motion> "linemotion %x %y $id" | |
| 6387 | $canv bind $t <Leave> "lineleave $id" | |
| fa4da7b3 | 6388 | $canv bind $t <Button-1> "lineclick %x %y $id 1" |
| a823a911 PM |
6389 | } |
| 6390 | ||
| 4399fe33 PM |
6391 | proc graph_pane_width {} { |
| 6392 | global use_ttk | |
| 6393 | ||
| 6394 | if {$use_ttk} { | |
| 6395 | set g [.tf.histframe.pwclist sashpos 0] | |
| 6396 | } else { | |
| 6397 | set g [.tf.histframe.pwclist sash coord 0] | |
| 6398 | } | |
| 6399 | return [lindex $g 0] | |
| 6400 | } | |
| 6401 | ||
| 6402 | proc totalwidth {l font extra} { | |
| 6403 | set tot 0 | |
| 6404 | foreach str $l { | |
| 6405 | set tot [expr {$tot + [font measure $font $str] + $extra}] | |
| 6406 | } | |
| 6407 | return $tot | |
| 6408 | } | |
| 6409 | ||
| bdbfbe3d | 6410 | proc drawtags {id x xt y1} { |
| 8a48571c | 6411 | global idtags idheads idotherrefs mainhead |
| bdbfbe3d | 6412 | global linespc lthickness |
| d277e89f | 6413 | global canv rowtextx curview fgcolor bgcolor ctxbut |
| 252c52df GÖ |
6414 | global headbgcolor headfgcolor headoutlinecolor remotebgcolor |
| 6415 | global tagbgcolor tagfgcolor tagoutlinecolor | |
| 6416 | global reflinecolor | |
| bdbfbe3d PM |
6417 | |
| 6418 | set marks {} | |
| 6419 | set ntags 0 | |
| f1d83ba3 | 6420 | set nheads 0 |
| 4399fe33 PM |
6421 | set singletag 0 |
| 6422 | set maxtags 3 | |
| 6423 | set maxtagpct 25 | |
| 6424 | set maxwidth [expr {[graph_pane_width] * $maxtagpct / 100}] | |
| 6425 | set delta [expr {int(0.5 * ($linespc - $lthickness))}] | |
| 6426 | set extra [expr {$delta + $lthickness + $linespc}] | |
| 6427 | ||
| bdbfbe3d PM |
6428 | if {[info exists idtags($id)]} { |
| 6429 | set marks $idtags($id) | |
| 6430 | set ntags [llength $marks] | |
| 4399fe33 PM |
6431 | if {$ntags > $maxtags || |
| 6432 | [totalwidth $marks mainfont $extra] > $maxwidth} { | |
| 6433 | # show just a single "n tags..." tag | |
| 6434 | set singletag 1 | |
| 6435 | if {$ntags == 1} { | |
| 6436 | set marks [list "tag..."] | |
| 6437 | } else { | |
| 6438 | set marks [list [format "%d tags..." $ntags]] | |
| 6439 | } | |
| 6440 | set ntags 1 | |
| 6441 | } | |
| bdbfbe3d PM |
6442 | } |
| 6443 | if {[info exists idheads($id)]} { | |
| 6444 | set marks [concat $marks $idheads($id)] | |
| f1d83ba3 PM |
6445 | set nheads [llength $idheads($id)] |
| 6446 | } | |
| 6447 | if {[info exists idotherrefs($id)]} { | |
| 6448 | set marks [concat $marks $idotherrefs($id)] | |
| bdbfbe3d PM |
6449 | } |
| 6450 | if {$marks eq {}} { | |
| 6451 | return $xt | |
| 6452 | } | |
| 6453 | ||
| 2ed49d54 JH |
6454 | set yt [expr {$y1 - 0.5 * $linespc}] |
| 6455 | set yb [expr {$yt + $linespc - 1}] | |
| bdbfbe3d PM |
6456 | set xvals {} |
| 6457 | set wvals {} | |
| 8a48571c | 6458 | set i -1 |
| bdbfbe3d | 6459 | foreach tag $marks { |
| 8a48571c PM |
6460 | incr i |
| 6461 | if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} { | |
| 9c311b32 | 6462 | set wid [font measure mainfontbold $tag] |
| 8a48571c | 6463 | } else { |
| 9c311b32 | 6464 | set wid [font measure mainfont $tag] |
| 8a48571c | 6465 | } |
| bdbfbe3d PM |
6466 | lappend xvals $xt |
| 6467 | lappend wvals $wid | |
| 4399fe33 | 6468 | set xt [expr {$xt + $wid + $extra}] |
| bdbfbe3d PM |
6469 | } |
| 6470 | set t [$canv create line $x $y1 [lindex $xvals end] $y1 \ | |
| 252c52df | 6471 | -width $lthickness -fill $reflinecolor -tags tag.$id] |
| bdbfbe3d PM |
6472 | $canv lower $t |
| 6473 | foreach tag $marks x $xvals wid $wvals { | |
| 8dd60f54 | 6474 | set tag_quoted [string map {% %%} $tag] |
| 2ed49d54 JH |
6475 | set xl [expr {$x + $delta}] |
| 6476 | set xr [expr {$x + $delta + $wid + $lthickness}] | |
| 9c311b32 | 6477 | set font mainfont |
| bdbfbe3d PM |
6478 | if {[incr ntags -1] >= 0} { |
| 6479 | # draw a tag | |
| 2ed49d54 JH |
6480 | set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \ |
| 6481 | $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \ | |
| 252c52df GÖ |
6482 | -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \ |
| 6483 | -tags tag.$id] | |
| 4399fe33 PM |
6484 | if {$singletag} { |
| 6485 | set tagclick [list showtags $id 1] | |
| 6486 | } else { | |
| 6487 | set tagclick [list showtag $tag_quoted 1] | |
| 6488 | } | |
| 6489 | $canv bind $t <1> $tagclick | |
| 7fcc92bf | 6490 | set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}] |
| bdbfbe3d | 6491 | } else { |
| f1d83ba3 PM |
6492 | # draw a head or other ref |
| 6493 | if {[incr nheads -1] >= 0} { | |
| 252c52df | 6494 | set col $headbgcolor |
| 8a48571c | 6495 | if {$tag eq $mainhead} { |
| 9c311b32 | 6496 | set font mainfontbold |
| 8a48571c | 6497 | } |
| f1d83ba3 PM |
6498 | } else { |
| 6499 | set col "#ddddff" | |
| 6500 | } | |
| 2ed49d54 | 6501 | set xl [expr {$xl - $delta/2}] |
| bdbfbe3d | 6502 | $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \ |
| f1d83ba3 | 6503 | -width 1 -outline black -fill $col -tags tag.$id |
| a970fcf2 | 6504 | if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} { |
| 9c311b32 | 6505 | set rwid [font measure mainfont $remoteprefix] |
| a970fcf2 JW |
6506 | set xi [expr {$x + 1}] |
| 6507 | set yti [expr {$yt + 1}] | |
| 6508 | set xri [expr {$x + $rwid}] | |
| 6509 | $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \ | |
| 252c52df | 6510 | -width 0 -fill $remotebgcolor -tags tag.$id |
| a970fcf2 | 6511 | } |
| bdbfbe3d | 6512 | } |
| 252c52df | 6513 | set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \ |
| 8a48571c | 6514 | -font $font -tags [list tag.$id text]] |
| 106288cb | 6515 | if {$ntags >= 0} { |
| 4399fe33 | 6516 | $canv bind $t <1> $tagclick |
| 10299152 | 6517 | } elseif {$nheads >= 0} { |
| 8dd60f54 | 6518 | $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted] |
| 106288cb | 6519 | } |
| bdbfbe3d PM |
6520 | } |
| 6521 | return $xt | |
| 6522 | } | |
| 6523 | ||
| 36242490 RZ |
6524 | proc drawnotesign {xt y} { |
| 6525 | global linespc canv fgcolor | |
| 6526 | ||
| 6527 | set orad [expr {$linespc / 3}] | |
| 6528 | set t [$canv create rectangle [expr {$xt - $orad}] [expr {$y - $orad}] \ | |
| 6529 | [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \ | |
| 6530 | -fill yellow -outline $fgcolor -width 1 -tags circle] | |
| 6531 | set xt [expr {$xt + $orad * 3}] | |
| 6532 | return $xt | |
| 6533 | } | |
| 6534 | ||
| 8d858d1a PM |
6535 | proc xcoord {i level ln} { |
| 6536 | global canvx0 xspc1 xspc2 | |
| 6537 | ||
| 6538 | set x [expr {$canvx0 + $i * $xspc1($ln)}] | |
| 6539 | if {$i > 0 && $i == $level} { | |
| 6540 | set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}] | |
| 6541 | } elseif {$i > $level} { | |
| 6542 | set x [expr {$x + $xspc2 - $xspc1($ln)}] | |
| 6543 | } | |
| 6544 | return $x | |
| 6545 | } | |
| 9ccbdfbf | 6546 | |
| 098dd8a3 | 6547 | proc show_status {msg} { |
| 9c311b32 | 6548 | global canv fgcolor |
| 098dd8a3 PM |
6549 | |
| 6550 | clear_display | |
| 9c311b32 | 6551 | $canv create text 3 3 -anchor nw -text $msg -font mainfont \ |
| f8a2c0d1 | 6552 | -tags text -fill $fgcolor |
| 098dd8a3 PM |
6553 | } |
| 6554 | ||
| 94a2eede PM |
6555 | # Don't change the text pane cursor if it is currently the hand cursor, |
| 6556 | # showing that we are over a sha1 ID link. | |
| 6557 | proc settextcursor {c} { | |
| 6558 | global ctext curtextcursor | |
| 6559 | ||
| 6560 | if {[$ctext cget -cursor] == $curtextcursor} { | |
| 6561 | $ctext config -cursor $c | |
| 6562 | } | |
| 6563 | set curtextcursor $c | |
| 9ccbdfbf PM |
6564 | } |
| 6565 | ||
| a137a90f PM |
6566 | proc nowbusy {what {name {}}} { |
| 6567 | global isbusy busyname statusw | |
| da7c24dd PM |
6568 | |
| 6569 | if {[array names isbusy] eq {}} { | |
| 6570 | . config -cursor watch | |
| 6571 | settextcursor watch | |
| 6572 | } | |
| 6573 | set isbusy($what) 1 | |
| a137a90f PM |
6574 | set busyname($what) $name |
| 6575 | if {$name ne {}} { | |
| 6576 | $statusw conf -text $name | |
| 6577 | } | |
| da7c24dd PM |
6578 | } |
| 6579 | ||
| 6580 | proc notbusy {what} { | |
| a137a90f | 6581 | global isbusy maincursor textcursor busyname statusw |
| da7c24dd | 6582 | |
| a137a90f PM |
6583 | catch { |
| 6584 | unset isbusy($what) | |
| 6585 | if {$busyname($what) ne {} && | |
| 6586 | [$statusw cget -text] eq $busyname($what)} { | |
| 6587 | $statusw conf -text {} | |
| 6588 | } | |
| 6589 | } | |
| da7c24dd PM |
6590 | if {[array names isbusy] eq {}} { |
| 6591 | . config -cursor $maincursor | |
| 6592 | settextcursor $textcursor | |
| 6593 | } | |
| 6594 | } | |
| 6595 | ||
| df3d83b1 | 6596 | proc findmatches {f} { |
| 4fb0fa19 | 6597 | global findtype findstring |
| b007ee20 | 6598 | if {$findtype == [mc "Regexp"]} { |
| 4fb0fa19 | 6599 | set matches [regexp -indices -all -inline $findstring $f] |
| df3d83b1 | 6600 | } else { |
| 4fb0fa19 | 6601 | set fs $findstring |
| b007ee20 | 6602 | if {$findtype == [mc "IgnCase"]} { |
| 4fb0fa19 PM |
6603 | set f [string tolower $f] |
| 6604 | set fs [string tolower $fs] | |
| df3d83b1 PM |
6605 | } |
| 6606 | set matches {} | |
| 6607 | set i 0 | |
| 4fb0fa19 PM |
6608 | set l [string length $fs] |
| 6609 | while {[set j [string first $fs $f $i]] >= 0} { | |
| 6610 | lappend matches [list $j [expr {$j+$l-1}]] | |
| 6611 | set i [expr {$j + $l}] | |
| df3d83b1 PM |
6612 | } |
| 6613 | } | |
| 6614 | return $matches | |
| 6615 | } | |
| 6616 | ||
| cca5d946 | 6617 | proc dofind {{dirn 1} {wrap 1}} { |
| 4fb0fa19 | 6618 | global findstring findstartline findcurline selectedline numcommits |
| cca5d946 | 6619 | global gdttype filehighlight fh_serial find_dirn findallowwrap |
| b74fd579 | 6620 | |
| cca5d946 PM |
6621 | if {[info exists find_dirn]} { |
| 6622 | if {$find_dirn == $dirn} return | |
| 6623 | stopfinding | |
| 6624 | } | |
| df3d83b1 | 6625 | focus . |
| 4fb0fa19 | 6626 | if {$findstring eq {} || $numcommits == 0} return |
| 94b4a69f | 6627 | if {$selectedline eq {}} { |
| cca5d946 | 6628 | set findstartline [lindex [visiblerows] [expr {$dirn < 0}]] |
| 98f350e5 | 6629 | } else { |
| 4fb0fa19 | 6630 | set findstartline $selectedline |
| 98f350e5 | 6631 | } |
| 4fb0fa19 | 6632 | set findcurline $findstartline |
| b007ee20 CS |
6633 | nowbusy finding [mc "Searching"] |
| 6634 | if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} { | |
| 687c8765 PM |
6635 | after cancel do_file_hl $fh_serial |
| 6636 | do_file_hl $fh_serial | |
| 98f350e5 | 6637 | } |
| cca5d946 PM |
6638 | set find_dirn $dirn |
| 6639 | set findallowwrap $wrap | |
| 6640 | run findmore | |
| 4fb0fa19 PM |
6641 | } |
| 6642 | ||
| bb3edc8b PM |
6643 | proc stopfinding {} { |
| 6644 | global find_dirn findcurline fprogcoord | |
| 4fb0fa19 | 6645 | |
| bb3edc8b PM |
6646 | if {[info exists find_dirn]} { |
| 6647 | unset find_dirn | |
| 6648 | unset findcurline | |
| 6649 | notbusy finding | |
| 6650 | set fprogcoord 0 | |
| 6651 | adjustprogress | |
| 4fb0fa19 | 6652 | } |
| 8a897742 | 6653 | stopblaming |
| 4fb0fa19 PM |
6654 | } |
| 6655 | ||
| 6656 | proc findmore {} { | |
| 687c8765 | 6657 | global commitdata commitinfo numcommits findpattern findloc |
| 7fcc92bf | 6658 | global findstartline findcurline findallowwrap |
| bb3edc8b | 6659 | global find_dirn gdttype fhighlights fprogcoord |
| cd2bcae7 | 6660 | global curview varcorder vrownum varccommits vrowmod |
| 4fb0fa19 | 6661 | |
| bb3edc8b | 6662 | if {![info exists find_dirn]} { |
| 4fb0fa19 PM |
6663 | return 0 |
| 6664 | } | |
| 585c27cb | 6665 | set fldtypes [list [mc "Headline"] [mc "Author"] "" [mc "Committer"] "" [mc "Comments"]] |
| 4fb0fa19 | 6666 | set l $findcurline |
| cca5d946 PM |
6667 | set moretodo 0 |
| 6668 | if {$find_dirn > 0} { | |
| 6669 | incr l | |
| 6670 | if {$l >= $numcommits} { | |
| 6671 | set l 0 | |
| 6672 | } | |
| 6673 | if {$l <= $findstartline} { | |
| 6674 | set lim [expr {$findstartline + 1}] | |
| 6675 | } else { | |
| 6676 | set lim $numcommits | |
| 6677 | set moretodo $findallowwrap | |
| 8ed16484 | 6678 | } |
| 4fb0fa19 | 6679 | } else { |
| cca5d946 PM |
6680 | if {$l == 0} { |
| 6681 | set l $numcommits | |
| 98f350e5 | 6682 | } |
| cca5d946 PM |
6683 | incr l -1 |
| 6684 | if {$l >= $findstartline} { | |
| 6685 | set lim [expr {$findstartline - 1}] | |
| bb3edc8b | 6686 | } else { |
| cca5d946 PM |
6687 | set lim -1 |
| 6688 | set moretodo $findallowwrap | |
| bb3edc8b | 6689 | } |
| 687c8765 | 6690 | } |
| cca5d946 PM |
6691 | set n [expr {($lim - $l) * $find_dirn}] |
| 6692 | if {$n > 500} { | |
| 6693 | set n 500 | |
| 6694 | set moretodo 1 | |
| 4fb0fa19 | 6695 | } |
| cd2bcae7 PM |
6696 | if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} { |
| 6697 | update_arcrows $curview | |
| 6698 | } | |
| 687c8765 PM |
6699 | set found 0 |
| 6700 | set domore 1 | |
| 7fcc92bf PM |
6701 | set ai [bsearch $vrownum($curview) $l] |
| 6702 | set a [lindex $varcorder($curview) $ai] | |
| 6703 | set arow [lindex $vrownum($curview) $ai] | |
| 6704 | set ids [lindex $varccommits($curview,$a)] | |
| 6705 | set arowend [expr {$arow + [llength $ids]}] | |
| b007ee20 | 6706 | if {$gdttype eq [mc "containing:"]} { |
| cca5d946 | 6707 | for {} {$n > 0} {incr n -1; incr l $find_dirn} { |
| 7fcc92bf PM |
6708 | if {$l < $arow || $l >= $arowend} { |
| 6709 | incr ai $find_dirn | |
| 6710 | set a [lindex $varcorder($curview) $ai] | |
| 6711 | set arow [lindex $vrownum($curview) $ai] | |
| 6712 | set ids [lindex $varccommits($curview,$a)] | |
| 6713 | set arowend [expr {$arow + [llength $ids]}] | |
| 6714 | } | |
| 6715 | set id [lindex $ids [expr {$l - $arow}]] | |
| cca5d946 | 6716 | # shouldn't happen unless git log doesn't give all the commits... |
| 7fcc92bf PM |
6717 | if {![info exists commitdata($id)] || |
| 6718 | ![doesmatch $commitdata($id)]} { | |
| 6719 | continue | |
| 6720 | } | |
| 687c8765 PM |
6721 | if {![info exists commitinfo($id)]} { |
| 6722 | getcommit $id | |
| 6723 | } | |
| 6724 | set info $commitinfo($id) | |
| 6725 | foreach f $info ty $fldtypes { | |
| 585c27cb | 6726 | if {$ty eq ""} continue |
| b007ee20 | 6727 | if {($findloc eq [mc "All fields"] || $findloc eq $ty) && |
| 687c8765 PM |
6728 | [doesmatch $f]} { |
| 6729 | set found 1 | |
| 6730 | break | |
| 6731 | } | |
| 6732 | } | |
| 6733 | if {$found} break | |
| 4fb0fa19 | 6734 | } |
| 687c8765 | 6735 | } else { |
| cca5d946 | 6736 | for {} {$n > 0} {incr n -1; incr l $find_dirn} { |
| 7fcc92bf PM |
6737 | if {$l < $arow || $l >= $arowend} { |
| 6738 | incr ai $find_dirn | |
| 6739 | set a [lindex $varcorder($curview) $ai] | |
| 6740 | set arow [lindex $vrownum($curview) $ai] | |
| 6741 | set ids [lindex $varccommits($curview,$a)] | |
| 6742 | set arowend [expr {$arow + [llength $ids]}] | |
| 6743 | } | |
| 6744 | set id [lindex $ids [expr {$l - $arow}]] | |
| 476ca63d PM |
6745 | if {![info exists fhighlights($id)]} { |
| 6746 | # this sets fhighlights($id) to -1 | |
| 687c8765 | 6747 | askfilehighlight $l $id |
| cd2bcae7 | 6748 | } |
| 476ca63d | 6749 | if {$fhighlights($id) > 0} { |
| cd2bcae7 PM |
6750 | set found $domore |
| 6751 | break | |
| 6752 | } | |
| 476ca63d | 6753 | if {$fhighlights($id) < 0} { |
| 687c8765 PM |
6754 | if {$domore} { |
| 6755 | set domore 0 | |
| cca5d946 | 6756 | set findcurline [expr {$l - $find_dirn}] |
| 687c8765 | 6757 | } |
| 98f350e5 PM |
6758 | } |
| 6759 | } | |
| 6760 | } | |
| cca5d946 | 6761 | if {$found || ($domore && !$moretodo)} { |
| 4fb0fa19 | 6762 | unset findcurline |
| 687c8765 | 6763 | unset find_dirn |
| 4fb0fa19 | 6764 | notbusy finding |
| bb3edc8b PM |
6765 | set fprogcoord 0 |
| 6766 | adjustprogress | |
| 6767 | if {$found} { | |
| 6768 | findselectline $l | |
| 6769 | } else { | |
| 6770 | bell | |
| 6771 | } | |
| 4fb0fa19 | 6772 | return 0 |
| df3d83b1 | 6773 | } |
| 687c8765 PM |
6774 | if {!$domore} { |
| 6775 | flushhighlights | |
| bb3edc8b | 6776 | } else { |
| cca5d946 | 6777 | set findcurline [expr {$l - $find_dirn}] |
| 687c8765 | 6778 | } |
| cca5d946 | 6779 | set n [expr {($findcurline - $findstartline) * $find_dirn - 1}] |
| bb3edc8b PM |
6780 | if {$n < 0} { |
| 6781 | incr n $numcommits | |
| df3d83b1 | 6782 | } |
| bb3edc8b PM |
6783 | set fprogcoord [expr {$n * 1.0 / $numcommits}] |
| 6784 | adjustprogress | |
| 6785 | return $domore | |
| df3d83b1 PM |
6786 | } |
| 6787 | ||
| 6788 | proc findselectline {l} { | |
| 687c8765 | 6789 | global findloc commentend ctext findcurline markingmatches gdttype |
| 005a2f4e | 6790 | |
| 8b39e04f | 6791 | set markingmatches [expr {$gdttype eq [mc "containing:"]}] |
| 005a2f4e | 6792 | set findcurline $l |
| d698206c | 6793 | selectline $l 1 |
| 8b39e04f PM |
6794 | if {$markingmatches && |
| 6795 | ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} { | |
| df3d83b1 PM |
6796 | # highlight the matches in the comments |
| 6797 | set f [$ctext get 1.0 $commentend] | |
| 6798 | set matches [findmatches $f] | |
| 6799 | foreach match $matches { | |
| 6800 | set start [lindex $match 0] | |
| 2ed49d54 | 6801 | set end [expr {[lindex $match 1] + 1}] |
| df3d83b1 PM |
6802 | $ctext tag add found "1.0 + $start c" "1.0 + $end c" |
| 6803 | } | |
| 98f350e5 | 6804 | } |
| 005a2f4e | 6805 | drawvisible |
| 98f350e5 PM |
6806 | } |
| 6807 | ||
| 4fb0fa19 | 6808 | # mark the bits of a headline or author that match a find string |
| 005a2f4e PM |
6809 | proc markmatches {canv l str tag matches font row} { |
| 6810 | global selectedline | |
| 6811 | ||
| 98f350e5 PM |
6812 | set bbox [$canv bbox $tag] |
| 6813 | set x0 [lindex $bbox 0] | |
| 6814 | set y0 [lindex $bbox 1] | |
| 6815 | set y1 [lindex $bbox 3] | |
| 6816 | foreach match $matches { | |
| 6817 | set start [lindex $match 0] | |
| 6818 | set end [lindex $match 1] | |
| 6819 | if {$start > $end} continue | |
| 2ed49d54 JH |
6820 | set xoff [font measure $font [string range $str 0 [expr {$start-1}]]] |
| 6821 | set xlen [font measure $font [string range $str 0 [expr {$end}]]] | |
| 6822 | set t [$canv create rect [expr {$x0+$xoff}] $y0 \ | |
| 6823 | [expr {$x0+$xlen+2}] $y1 \ | |
| 4fb0fa19 | 6824 | -outline {} -tags [list match$l matches] -fill yellow] |
| 98f350e5 | 6825 | $canv lower $t |
| 94b4a69f | 6826 | if {$row == $selectedline} { |
| 005a2f4e PM |
6827 | $canv raise $t secsel |
| 6828 | } | |
| 98f350e5 PM |
6829 | } |
| 6830 | } | |
| 6831 | ||
| 6832 | proc unmarkmatches {} { | |
| bb3edc8b | 6833 | global markingmatches |
| 4fb0fa19 | 6834 | |
| 98f350e5 | 6835 | allcanvs delete matches |
| 4fb0fa19 | 6836 | set markingmatches 0 |
| bb3edc8b | 6837 | stopfinding |
| 98f350e5 PM |
6838 | } |
| 6839 | ||
| c8dfbcf9 | 6840 | proc selcanvline {w x y} { |
| fa4da7b3 | 6841 | global canv canvy0 ctext linespc |
| 9f1afe05 | 6842 | global rowtextx |
| 1db95b00 | 6843 | set ymax [lindex [$canv cget -scrollregion] 3] |
| cfb4563c | 6844 | if {$ymax == {}} return |
| 1db95b00 PM |
6845 | set yfrac [lindex [$canv yview] 0] |
| 6846 | set y [expr {$y + $yfrac * $ymax}] | |
| 6847 | set l [expr {int(($y - $canvy0) / $linespc + 0.5)}] | |
| 6848 | if {$l < 0} { | |
| 6849 | set l 0 | |
| 6850 | } | |
| c8dfbcf9 | 6851 | if {$w eq $canv} { |
| fc2a256f PM |
6852 | set xmax [lindex [$canv cget -scrollregion] 2] |
| 6853 | set xleft [expr {[lindex [$canv xview] 0] * $xmax}] | |
| 6854 | if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return | |
| c8dfbcf9 | 6855 | } |
| 98f350e5 | 6856 | unmarkmatches |
| d698206c | 6857 | selectline $l 1 |
| 5ad588de PM |
6858 | } |
| 6859 | ||
| b1ba39e7 LT |
6860 | proc commit_descriptor {p} { |
| 6861 | global commitinfo | |
| b0934489 PM |
6862 | if {![info exists commitinfo($p)]} { |
| 6863 | getcommit $p | |
| 6864 | } | |
| b1ba39e7 | 6865 | set l "..." |
| b0934489 | 6866 | if {[llength $commitinfo($p)] > 1} { |
| b1ba39e7 LT |
6867 | set l [lindex $commitinfo($p) 0] |
| 6868 | } | |
| b8ab2e17 | 6869 | return "$p ($l)\n" |
| b1ba39e7 LT |
6870 | } |
| 6871 | ||
| 106288cb PM |
6872 | # append some text to the ctext widget, and make any SHA1 ID |
| 6873 | # that we know about be a clickable link. | |
| f1b86294 | 6874 | proc appendwithlinks {text tags} { |
| d375ef9b | 6875 | global ctext linknum curview |
| 106288cb PM |
6876 | |
| 6877 | set start [$ctext index "end - 1c"] | |
| f1b86294 | 6878 | $ctext insert end $text $tags |
| 6c9e2d18 | 6879 | set links [regexp -indices -all -inline {(?:\m|-g)[0-9a-f]{6,40}\M} $text] |
| 106288cb PM |
6880 | foreach l $links { |
| 6881 | set s [lindex $l 0] | |
| 6882 | set e [lindex $l 1] | |
| 6883 | set linkid [string range $text $s $e] | |
| 106288cb | 6884 | incr e |
| c73adce2 | 6885 | $ctext tag delete link$linknum |
| 106288cb | 6886 | $ctext tag add link$linknum "$start + $s c" "$start + $e c" |
| 97645683 | 6887 | setlink $linkid link$linknum |
| 106288cb PM |
6888 | incr linknum |
| 6889 | } | |
| 97645683 PM |
6890 | } |
| 6891 | ||
| 6892 | proc setlink {id lk} { | |
| d375ef9b | 6893 | global curview ctext pendinglinks |
| 252c52df | 6894 | global linkfgcolor |
| 97645683 | 6895 | |
| 6c9e2d18 JM |
6896 | if {[string range $id 0 1] eq "-g"} { |
| 6897 | set id [string range $id 2 end] | |
| 6898 | } | |
| 6899 | ||
| d375ef9b PM |
6900 | set known 0 |
| 6901 | if {[string length $id] < 40} { | |
| 6902 | set matches [longid $id] | |
| 6903 | if {[llength $matches] > 0} { | |
| 6904 | if {[llength $matches] > 1} return | |
| 6905 | set known 1 | |
| 6906 | set id [lindex $matches 0] | |
| 6907 | } | |
| 6908 | } else { | |
| 6909 | set known [commitinview $id $curview] | |
| 6910 | } | |
| 6911 | if {$known} { | |
| 252c52df | 6912 | $ctext tag conf $lk -foreground $linkfgcolor -underline 1 |
| d375ef9b | 6913 | $ctext tag bind $lk <1> [list selbyid $id] |
| 97645683 PM |
6914 | $ctext tag bind $lk <Enter> {linkcursor %W 1} |
| 6915 | $ctext tag bind $lk <Leave> {linkcursor %W -1} | |
| 6916 | } else { | |
| 6917 | lappend pendinglinks($id) $lk | |
| d375ef9b | 6918 | interestedin $id {makelink %P} |
| 97645683 PM |
6919 | } |
| 6920 | } | |
| 6921 | ||
| 6f63fc18 PM |
6922 | proc appendshortlink {id {pre {}} {post {}}} { |
| 6923 | global ctext linknum | |
| 6924 | ||
| 6925 | $ctext insert end $pre | |
| 6926 | $ctext tag delete link$linknum | |
| 6927 | $ctext insert end [string range $id 0 7] link$linknum | |
| 6928 | $ctext insert end $post | |
| 6929 | setlink $id link$linknum | |
| 6930 | incr linknum | |
| 6931 | } | |
| 6932 | ||
| 97645683 PM |
6933 | proc makelink {id} { |
| 6934 | global pendinglinks | |
| 6935 | ||
| 6936 | if {![info exists pendinglinks($id)]} return | |
| 6937 | foreach lk $pendinglinks($id) { | |
| 6938 | setlink $id $lk | |
| 6939 | } | |
| 6940 | unset pendinglinks($id) | |
| 6941 | } | |
| 6942 | ||
| 6943 | proc linkcursor {w inc} { | |
| 6944 | global linkentercount curtextcursor | |
| 6945 | ||
| 6946 | if {[incr linkentercount $inc] > 0} { | |
| 6947 | $w configure -cursor hand2 | |
| 6948 | } else { | |
| 6949 | $w configure -cursor $curtextcursor | |
| 6950 | if {$linkentercount < 0} { | |
| 6951 | set linkentercount 0 | |
| 6952 | } | |
| 6953 | } | |
| 106288cb PM |
6954 | } |
| 6955 | ||
| 6e5f7203 RN |
6956 | proc viewnextline {dir} { |
| 6957 | global canv linespc | |
| 6958 | ||
| 6959 | $canv delete hover | |
| 6960 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 6961 | set wnow [$canv yview] | |
| 6962 | set wtop [expr {[lindex $wnow 0] * $ymax}] | |
| 6963 | set newtop [expr {$wtop + $dir * $linespc}] | |
| 6964 | if {$newtop < 0} { | |
| 6965 | set newtop 0 | |
| 6966 | } elseif {$newtop > $ymax} { | |
| 6967 | set newtop $ymax | |
| 6968 | } | |
| 6969 | allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}] | |
| 6970 | } | |
| 6971 | ||
| ef030b85 PM |
6972 | # add a list of tag or branch names at position pos |
| 6973 | # returns the number of names inserted | |
| e11f1233 | 6974 | proc appendrefs {pos ids var} { |
| 386befb7 | 6975 | global ctext linknum curview $var maxrefs mainheadid |
| b8ab2e17 | 6976 | |
| ef030b85 PM |
6977 | if {[catch {$ctext index $pos}]} { |
| 6978 | return 0 | |
| 6979 | } | |
| e11f1233 PM |
6980 | $ctext conf -state normal |
| 6981 | $ctext delete $pos "$pos lineend" | |
| 6982 | set tags {} | |
| 6983 | foreach id $ids { | |
| 6984 | foreach tag [set $var\($id\)] { | |
| 6985 | lappend tags [list $tag $id] | |
| 6986 | } | |
| 6987 | } | |
| 386befb7 PM |
6988 | |
| 6989 | set sep {} | |
| 6990 | set tags [lsort -index 0 -decreasing $tags] | |
| 6991 | set nutags 0 | |
| 6992 | ||
| 0a4dd8b8 | 6993 | if {[llength $tags] > $maxrefs} { |
| 386befb7 PM |
6994 | # If we are displaying heads, and there are too many, |
| 6995 | # see if there are some important heads to display. | |
| 6996 | # Currently this means "master" and the current head. | |
| 6997 | set itags {} | |
| 6998 | if {$var eq "idheads"} { | |
| 6999 | set utags {} | |
| 7000 | foreach ti $tags { | |
| 7001 | set hname [lindex $ti 0] | |
| 7002 | set id [lindex $ti 1] | |
| 7003 | if {($hname eq "master" || $id eq $mainheadid) && | |
| 7004 | [llength $itags] < $maxrefs} { | |
| 7005 | lappend itags $ti | |
| 7006 | } else { | |
| 7007 | lappend utags $ti | |
| 7008 | } | |
| 7009 | } | |
| 7010 | set tags $utags | |
| b8ab2e17 | 7011 | } |
| 386befb7 PM |
7012 | if {$itags ne {}} { |
| 7013 | set str [mc "and many more"] | |
| 7014 | set sep " " | |
| 7015 | } else { | |
| 7016 | set str [mc "many"] | |
| 7017 | } | |
| 7018 | $ctext insert $pos "$str ([llength $tags])" | |
| 7019 | set nutags [llength $tags] | |
| 7020 | set tags $itags | |
| 7021 | } | |
| 7022 | ||
| 7023 | foreach ti $tags { | |
| 7024 | set id [lindex $ti 1] | |
| 7025 | set lk link$linknum | |
| 7026 | incr linknum | |
| 7027 | $ctext tag delete $lk | |
| 7028 | $ctext insert $pos $sep | |
| 7029 | $ctext insert $pos [lindex $ti 0] $lk | |
| 7030 | setlink $id $lk | |
| 7031 | set sep ", " | |
| b8ab2e17 | 7032 | } |
| d34835c9 | 7033 | $ctext tag add wwrap "$pos linestart" "$pos lineend" |
| e11f1233 | 7034 | $ctext conf -state disabled |
| 386befb7 | 7035 | return [expr {[llength $tags] + $nutags}] |
| b8ab2e17 PM |
7036 | } |
| 7037 | ||
| e11f1233 PM |
7038 | # called when we have finished computing the nearby tags |
| 7039 | proc dispneartags {delay} { | |
| 7040 | global selectedline currentid showneartags tagphase | |
| ca6d8f58 | 7041 | |
| 94b4a69f | 7042 | if {$selectedline eq {} || !$showneartags} return |
| e11f1233 PM |
7043 | after cancel dispnexttag |
| 7044 | if {$delay} { | |
| 7045 | after 200 dispnexttag | |
| 7046 | set tagphase -1 | |
| 7047 | } else { | |
| 7048 | after idle dispnexttag | |
| 7049 | set tagphase 0 | |
| ca6d8f58 | 7050 | } |
| ca6d8f58 PM |
7051 | } |
| 7052 | ||
| e11f1233 PM |
7053 | proc dispnexttag {} { |
| 7054 | global selectedline currentid showneartags tagphase ctext | |
| b8ab2e17 | 7055 | |
| 94b4a69f | 7056 | if {$selectedline eq {} || !$showneartags} return |
| e11f1233 PM |
7057 | switch -- $tagphase { |
| 7058 | 0 { | |
| 7059 | set dtags [desctags $currentid] | |
| 7060 | if {$dtags ne {}} { | |
| 7061 | appendrefs precedes $dtags idtags | |
| 7062 | } | |
| 7063 | } | |
| 7064 | 1 { | |
| 7065 | set atags [anctags $currentid] | |
| 7066 | if {$atags ne {}} { | |
| 7067 | appendrefs follows $atags idtags | |
| 7068 | } | |
| 7069 | } | |
| 7070 | 2 { | |
| 7071 | set dheads [descheads $currentid] | |
| 7072 | if {$dheads ne {}} { | |
| 7073 | if {[appendrefs branch $dheads idheads] > 1 | |
| 7074 | && [$ctext get "branch -3c"] eq "h"} { | |
| 7075 | # turn "Branch" into "Branches" | |
| 7076 | $ctext conf -state normal | |
| 7077 | $ctext insert "branch -2c" "es" | |
| 7078 | $ctext conf -state disabled | |
| 7079 | } | |
| 7080 | } | |
| ef030b85 PM |
7081 | } |
| 7082 | } | |
| e11f1233 PM |
7083 | if {[incr tagphase] <= 2} { |
| 7084 | after idle dispnexttag | |
| b8ab2e17 | 7085 | } |
| b8ab2e17 PM |
7086 | } |
| 7087 | ||
| 28593d3f | 7088 | proc make_secsel {id} { |
| 0380081c PM |
7089 | global linehtag linentag linedtag canv canv2 canv3 |
| 7090 | ||
| 28593d3f | 7091 | if {![info exists linehtag($id)]} return |
| 0380081c | 7092 | $canv delete secsel |
| 28593d3f | 7093 | set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \ |
| 0380081c PM |
7094 | -tags secsel -fill [$canv cget -selectbackground]] |
| 7095 | $canv lower $t | |
| 7096 | $canv2 delete secsel | |
| 28593d3f | 7097 | set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \ |
| 0380081c PM |
7098 | -tags secsel -fill [$canv2 cget -selectbackground]] |
| 7099 | $canv2 lower $t | |
| 7100 | $canv3 delete secsel | |
| 28593d3f | 7101 | set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \ |
| 0380081c PM |
7102 | -tags secsel -fill [$canv3 cget -selectbackground]] |
| 7103 | $canv3 lower $t | |
| 7104 | } | |
| 7105 | ||
| b9fdba7f PM |
7106 | proc make_idmark {id} { |
| 7107 | global linehtag canv fgcolor | |
| 7108 | ||
| 7109 | if {![info exists linehtag($id)]} return | |
| 7110 | $canv delete markid | |
| 7111 | set t [eval $canv create rect [$canv bbox $linehtag($id)] \ | |
| 7112 | -tags markid -outline $fgcolor] | |
| 7113 | $canv raise $t | |
| 7114 | } | |
| 7115 | ||
| 8a897742 | 7116 | proc selectline {l isnew {desired_loc {}}} { |
| 0380081c | 7117 | global canv ctext commitinfo selectedline |
| 7fcc92bf | 7118 | global canvy0 linespc parents children curview |
| 7fcceed7 | 7119 | global currentid sha1entry |
| 9f1afe05 | 7120 | global commentend idtags linknum |
| d94f8cd6 | 7121 | global mergemax numcommits pending_select |
| e11f1233 | 7122 | global cmitmode showneartags allcommits |
| c30acc77 | 7123 | global targetrow targetid lastscrollrows |
| 21ac8a8d | 7124 | global autoselect autosellen jump_to_here |
| d698206c | 7125 | |
| d94f8cd6 | 7126 | catch {unset pending_select} |
| 84ba7345 | 7127 | $canv delete hover |
| 9843c307 | 7128 | normalline |
| 887c996e | 7129 | unsel_reflist |
| bb3edc8b | 7130 | stopfinding |
| 8f7d0cec | 7131 | if {$l < 0 || $l >= $numcommits} return |
| ac1276ab PM |
7132 | set id [commitonrow $l] |
| 7133 | set targetid $id | |
| 7134 | set targetrow $l | |
| c30acc77 PM |
7135 | set selectedline $l |
| 7136 | set currentid $id | |
| 7137 | if {$lastscrollrows < $numcommits} { | |
| 7138 | setcanvscroll | |
| 7139 | } | |
| ac1276ab | 7140 | |
| 5ad588de | 7141 | set y [expr {$canvy0 + $l * $linespc}] |
| 17386066 | 7142 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 5842215e PM |
7143 | set ytop [expr {$y - $linespc - 1}] |
| 7144 | set ybot [expr {$y + $linespc + 1}] | |
| 5ad588de | 7145 | set wnow [$canv yview] |
| 2ed49d54 JH |
7146 | set wtop [expr {[lindex $wnow 0] * $ymax}] |
| 7147 | set wbot [expr {[lindex $wnow 1] * $ymax}] | |
| 5842215e PM |
7148 | set wh [expr {$wbot - $wtop}] |
| 7149 | set newtop $wtop | |
| 17386066 | 7150 | if {$ytop < $wtop} { |
| 5842215e PM |
7151 | if {$ybot < $wtop} { |
| 7152 | set newtop [expr {$y - $wh / 2.0}] | |
| 7153 | } else { | |
| 7154 | set newtop $ytop | |
| 7155 | if {$newtop > $wtop - $linespc} { | |
| 7156 | set newtop [expr {$wtop - $linespc}] | |
| 7157 | } | |
| 17386066 | 7158 | } |
| 5842215e PM |
7159 | } elseif {$ybot > $wbot} { |
| 7160 | if {$ytop > $wbot} { | |
| 7161 | set newtop [expr {$y - $wh / 2.0}] | |
| 7162 | } else { | |
| 7163 | set newtop [expr {$ybot - $wh}] | |
| 7164 | if {$newtop < $wtop + $linespc} { | |
| 7165 | set newtop [expr {$wtop + $linespc}] | |
| 7166 | } | |
| 17386066 | 7167 | } |
| 5842215e PM |
7168 | } |
| 7169 | if {$newtop != $wtop} { | |
| 7170 | if {$newtop < 0} { | |
| 7171 | set newtop 0 | |
| 7172 | } | |
| 2ed49d54 | 7173 | allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}] |
| 9f1afe05 | 7174 | drawvisible |
| 5ad588de | 7175 | } |
| d698206c | 7176 | |
| 28593d3f | 7177 | make_secsel $id |
| 9f1afe05 | 7178 | |
| fa4da7b3 | 7179 | if {$isnew} { |
| 354af6bd | 7180 | addtohistory [list selbyid $id 0] savecmitpos |
| d698206c PM |
7181 | } |
| 7182 | ||
| 98f350e5 PM |
7183 | $sha1entry delete 0 end |
| 7184 | $sha1entry insert 0 $id | |
| 95293b58 | 7185 | if {$autoselect} { |
| 21ac8a8d | 7186 | $sha1entry selection range 0 $autosellen |
| 95293b58 | 7187 | } |
| 164ff275 | 7188 | rhighlight_sel $id |
| 98f350e5 | 7189 | |
| 5ad588de | 7190 | $ctext conf -state normal |
| 3ea06f9f | 7191 | clear_ctext |
| 106288cb | 7192 | set linknum 0 |
| d76afb15 PM |
7193 | if {![info exists commitinfo($id)]} { |
| 7194 | getcommit $id | |
| 7195 | } | |
| 1db95b00 | 7196 | set info $commitinfo($id) |
| 232475d3 | 7197 | set date [formatdate [lindex $info 2]] |
| d990cedf | 7198 | $ctext insert end "[mc "Author"]: [lindex $info 1] $date\n" |
| 232475d3 | 7199 | set date [formatdate [lindex $info 4]] |
| d990cedf | 7200 | $ctext insert end "[mc "Committer"]: [lindex $info 3] $date\n" |
| 887fe3c4 | 7201 | if {[info exists idtags($id)]} { |
| d990cedf | 7202 | $ctext insert end [mc "Tags:"] |
| 887fe3c4 PM |
7203 | foreach tag $idtags($id) { |
| 7204 | $ctext insert end " $tag" | |
| 7205 | } | |
| 7206 | $ctext insert end "\n" | |
| 7207 | } | |
| 40b87ff8 | 7208 | |
| f1b86294 | 7209 | set headers {} |
| 7fcc92bf | 7210 | set olds $parents($curview,$id) |
| 79b2c75e | 7211 | if {[llength $olds] > 1} { |
| b77b0278 | 7212 | set np 0 |
| 79b2c75e | 7213 | foreach p $olds { |
| b77b0278 PM |
7214 | if {$np >= $mergemax} { |
| 7215 | set tag mmax | |
| 7216 | } else { | |
| 7217 | set tag m$np | |
| 7218 | } | |
| d990cedf | 7219 | $ctext insert end "[mc "Parent"]: " $tag |
| f1b86294 | 7220 | appendwithlinks [commit_descriptor $p] {} |
| b77b0278 PM |
7221 | incr np |
| 7222 | } | |
| 7223 | } else { | |
| 79b2c75e | 7224 | foreach p $olds { |
| d990cedf | 7225 | append headers "[mc "Parent"]: [commit_descriptor $p]" |
| b1ba39e7 LT |
7226 | } |
| 7227 | } | |
| b77b0278 | 7228 | |
| 6a90bff1 | 7229 | foreach c $children($curview,$id) { |
| d990cedf | 7230 | append headers "[mc "Child"]: [commit_descriptor $c]" |
| 8b192809 | 7231 | } |
| d698206c PM |
7232 | |
| 7233 | # make anything that looks like a SHA1 ID be a clickable link | |
| f1b86294 | 7234 | appendwithlinks $headers {} |
| b8ab2e17 PM |
7235 | if {$showneartags} { |
| 7236 | if {![info exists allcommits]} { | |
| 7237 | getallcommits | |
| 7238 | } | |
| d990cedf | 7239 | $ctext insert end "[mc "Branch"]: " |
| ef030b85 PM |
7240 | $ctext mark set branch "end -1c" |
| 7241 | $ctext mark gravity branch left | |
| d990cedf | 7242 | $ctext insert end "\n[mc "Follows"]: " |
| b8ab2e17 PM |
7243 | $ctext mark set follows "end -1c" |
| 7244 | $ctext mark gravity follows left | |
| d990cedf | 7245 | $ctext insert end "\n[mc "Precedes"]: " |
| b8ab2e17 PM |
7246 | $ctext mark set precedes "end -1c" |
| 7247 | $ctext mark gravity precedes left | |
| b8ab2e17 | 7248 | $ctext insert end "\n" |
| e11f1233 | 7249 | dispneartags 1 |
| b8ab2e17 PM |
7250 | } |
| 7251 | $ctext insert end "\n" | |
| 43c25074 PM |
7252 | set comment [lindex $info 5] |
| 7253 | if {[string first "\r" $comment] >= 0} { | |
| 7254 | set comment [string map {"\r" "\n "} $comment] | |
| 7255 | } | |
| 7256 | appendwithlinks $comment {comment} | |
| d698206c | 7257 | |
| df3d83b1 | 7258 | $ctext tag remove found 1.0 end |
| 5ad588de | 7259 | $ctext conf -state disabled |
| df3d83b1 | 7260 | set commentend [$ctext index "end - 1c"] |
| 5ad588de | 7261 | |
| 8a897742 | 7262 | set jump_to_here $desired_loc |
| b007ee20 | 7263 | init_flist [mc "Comments"] |
| f8b28a40 PM |
7264 | if {$cmitmode eq "tree"} { |
| 7265 | gettree $id | |
| 7266 | } elseif {[llength $olds] <= 1} { | |
| d327244a | 7267 | startdiff $id |
| 7b5ff7e7 | 7268 | } else { |
| 7fcc92bf | 7269 | mergediff $id |
| 3c461ffe PM |
7270 | } |
| 7271 | } | |
| 7272 | ||
| 6e5f7203 RN |
7273 | proc selfirstline {} { |
| 7274 | unmarkmatches | |
| 7275 | selectline 0 1 | |
| 7276 | } | |
| 7277 | ||
| 7278 | proc sellastline {} { | |
| 7279 | global numcommits | |
| 7280 | unmarkmatches | |
| 7281 | set l [expr {$numcommits - 1}] | |
| 7282 | selectline $l 1 | |
| 7283 | } | |
| 7284 | ||
| 3c461ffe PM |
7285 | proc selnextline {dir} { |
| 7286 | global selectedline | |
| bd441de4 | 7287 | focus . |
| 94b4a69f | 7288 | if {$selectedline eq {}} return |
| 2ed49d54 | 7289 | set l [expr {$selectedline + $dir}] |
| 3c461ffe | 7290 | unmarkmatches |
| d698206c PM |
7291 | selectline $l 1 |
| 7292 | } | |
| 7293 | ||
| 6e5f7203 RN |
7294 | proc selnextpage {dir} { |
| 7295 | global canv linespc selectedline numcommits | |
| 7296 | ||
| 7297 | set lpp [expr {([winfo height $canv] - 2) / $linespc}] | |
| 7298 | if {$lpp < 1} { | |
| 7299 | set lpp 1 | |
| 7300 | } | |
| 7301 | allcanvs yview scroll [expr {$dir * $lpp}] units | |
| e72ee5eb | 7302 | drawvisible |
| 94b4a69f | 7303 | if {$selectedline eq {}} return |
| 6e5f7203 RN |
7304 | set l [expr {$selectedline + $dir * $lpp}] |
| 7305 | if {$l < 0} { | |
| 7306 | set l 0 | |
| 7307 | } elseif {$l >= $numcommits} { | |
| 7308 | set l [expr $numcommits - 1] | |
| 7309 | } | |
| 7310 | unmarkmatches | |
| 40b87ff8 | 7311 | selectline $l 1 |
| 6e5f7203 RN |
7312 | } |
| 7313 | ||
| fa4da7b3 | 7314 | proc unselectline {} { |
| 50b44ece | 7315 | global selectedline currentid |
| fa4da7b3 | 7316 | |
| 94b4a69f | 7317 | set selectedline {} |
| 50b44ece | 7318 | catch {unset currentid} |
| fa4da7b3 | 7319 | allcanvs delete secsel |
| 164ff275 | 7320 | rhighlight_none |
| fa4da7b3 PM |
7321 | } |
| 7322 | ||
| f8b28a40 PM |
7323 | proc reselectline {} { |
| 7324 | global selectedline | |
| 7325 | ||
| 94b4a69f | 7326 | if {$selectedline ne {}} { |
| f8b28a40 PM |
7327 | selectline $selectedline 0 |
| 7328 | } | |
| 7329 | } | |
| 7330 | ||
| 354af6bd | 7331 | proc addtohistory {cmd {saveproc {}}} { |
| 2516dae2 | 7332 | global history historyindex curview |
| fa4da7b3 | 7333 | |
| 354af6bd PM |
7334 | unset_posvars |
| 7335 | save_position | |
| 7336 | set elt [list $curview $cmd $saveproc {}] | |
| fa4da7b3 | 7337 | if {$historyindex > 0 |
| 2516dae2 | 7338 | && [lindex $history [expr {$historyindex - 1}]] == $elt} { |
| fa4da7b3 PM |
7339 | return |
| 7340 | } | |
| 7341 | ||
| 7342 | if {$historyindex < [llength $history]} { | |
| 2516dae2 | 7343 | set history [lreplace $history $historyindex end $elt] |
| fa4da7b3 | 7344 | } else { |
| 2516dae2 | 7345 | lappend history $elt |
| fa4da7b3 PM |
7346 | } |
| 7347 | incr historyindex | |
| 7348 | if {$historyindex > 1} { | |
| e9937d2a | 7349 | .tf.bar.leftbut conf -state normal |
| fa4da7b3 | 7350 | } else { |
| e9937d2a | 7351 | .tf.bar.leftbut conf -state disabled |
| fa4da7b3 | 7352 | } |
| e9937d2a | 7353 | .tf.bar.rightbut conf -state disabled |
| fa4da7b3 PM |
7354 | } |
| 7355 | ||
| 354af6bd PM |
7356 | # save the scrolling position of the diff display pane |
| 7357 | proc save_position {} { | |
| 7358 | global historyindex history | |
| 7359 | ||
| 7360 | if {$historyindex < 1} return | |
| 7361 | set hi [expr {$historyindex - 1}] | |
| 7362 | set fn [lindex $history $hi 2] | |
| 7363 | if {$fn ne {}} { | |
| 7364 | lset history $hi 3 [eval $fn] | |
| 7365 | } | |
| 7366 | } | |
| 7367 | ||
| 7368 | proc unset_posvars {} { | |
| 7369 | global last_posvars | |
| 7370 | ||
| 7371 | if {[info exists last_posvars]} { | |
| 7372 | foreach {var val} $last_posvars { | |
| 7373 | global $var | |
| 7374 | catch {unset $var} | |
| 7375 | } | |
| 7376 | unset last_posvars | |
| 7377 | } | |
| 7378 | } | |
| 7379 | ||
| 2516dae2 | 7380 | proc godo {elt} { |
| 354af6bd | 7381 | global curview last_posvars |
| 2516dae2 PM |
7382 | |
| 7383 | set view [lindex $elt 0] | |
| 7384 | set cmd [lindex $elt 1] | |
| 354af6bd | 7385 | set pv [lindex $elt 3] |
| 2516dae2 PM |
7386 | if {$curview != $view} { |
| 7387 | showview $view | |
| 7388 | } | |
| 354af6bd PM |
7389 | unset_posvars |
| 7390 | foreach {var val} $pv { | |
| 7391 | global $var | |
| 7392 | set $var $val | |
| 7393 | } | |
| 7394 | set last_posvars $pv | |
| 2516dae2 PM |
7395 | eval $cmd |
| 7396 | } | |
| 7397 | ||
| d698206c PM |
7398 | proc goback {} { |
| 7399 | global history historyindex | |
| bd441de4 | 7400 | focus . |
| d698206c PM |
7401 | |
| 7402 | if {$historyindex > 1} { | |
| 354af6bd | 7403 | save_position |
| d698206c | 7404 | incr historyindex -1 |
| 2516dae2 | 7405 | godo [lindex $history [expr {$historyindex - 1}]] |
| e9937d2a | 7406 | .tf.bar.rightbut conf -state normal |
| d698206c PM |
7407 | } |
| 7408 | if {$historyindex <= 1} { | |
| e9937d2a | 7409 | .tf.bar.leftbut conf -state disabled |
| d698206c PM |
7410 | } |
| 7411 | } | |
| 7412 | ||
| 7413 | proc goforw {} { | |
| 7414 | global history historyindex | |
| bd441de4 | 7415 | focus . |
| d698206c PM |
7416 | |
| 7417 | if {$historyindex < [llength $history]} { | |
| 354af6bd | 7418 | save_position |
| fa4da7b3 | 7419 | set cmd [lindex $history $historyindex] |
| d698206c | 7420 | incr historyindex |
| 2516dae2 | 7421 | godo $cmd |
| e9937d2a | 7422 | .tf.bar.leftbut conf -state normal |
| d698206c PM |
7423 | } |
| 7424 | if {$historyindex >= [llength $history]} { | |
| e9937d2a | 7425 | .tf.bar.rightbut conf -state disabled |
| d698206c | 7426 | } |
| e2ed4324 PM |
7427 | } |
| 7428 | ||
| f8b28a40 | 7429 | proc gettree {id} { |
| 8f489363 PM |
7430 | global treefilelist treeidlist diffids diffmergeid treepending |
| 7431 | global nullid nullid2 | |
| f8b28a40 PM |
7432 | |
| 7433 | set diffids $id | |
| 7434 | catch {unset diffmergeid} | |
| 7435 | if {![info exists treefilelist($id)]} { | |
| 7436 | if {![info exists treepending]} { | |
| 8f489363 PM |
7437 | if {$id eq $nullid} { |
| 7438 | set cmd [list | git ls-files] | |
| 7439 | } elseif {$id eq $nullid2} { | |
| 7440 | set cmd [list | git ls-files --stage -t] | |
| 219ea3a9 | 7441 | } else { |
| 8f489363 | 7442 | set cmd [list | git ls-tree -r $id] |
| 219ea3a9 PM |
7443 | } |
| 7444 | if {[catch {set gtf [open $cmd r]}]} { | |
| f8b28a40 PM |
7445 | return |
| 7446 | } | |
| 7447 | set treepending $id | |
| 7448 | set treefilelist($id) {} | |
| 7449 | set treeidlist($id) {} | |
| 09c7029d | 7450 | fconfigure $gtf -blocking 0 -encoding binary |
| 7eb3cb9c | 7451 | filerun $gtf [list gettreeline $gtf $id] |
| f8b28a40 PM |
7452 | } |
| 7453 | } else { | |
| 7454 | setfilelist $id | |
| 7455 | } | |
| 7456 | } | |
| 7457 | ||
| 7458 | proc gettreeline {gtf id} { | |
| 8f489363 | 7459 | global treefilelist treeidlist treepending cmitmode diffids nullid nullid2 |
| f8b28a40 | 7460 | |
| 7eb3cb9c PM |
7461 | set nl 0 |
| 7462 | while {[incr nl] <= 1000 && [gets $gtf line] >= 0} { | |
| 8f489363 PM |
7463 | if {$diffids eq $nullid} { |
| 7464 | set fname $line | |
| 7465 | } else { | |
| 9396cd38 PM |
7466 | set i [string first "\t" $line] |
| 7467 | if {$i < 0} continue | |
| 9396cd38 | 7468 | set fname [string range $line [expr {$i+1}] end] |
| f31fa2c0 PM |
7469 | set line [string range $line 0 [expr {$i-1}]] |
| 7470 | if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue | |
| 7471 | set sha1 [lindex $line 2] | |
| 219ea3a9 | 7472 | lappend treeidlist($id) $sha1 |
| 219ea3a9 | 7473 | } |
| 09c7029d AG |
7474 | if {[string index $fname 0] eq "\""} { |
| 7475 | set fname [lindex $fname 0] | |
| 7476 | } | |
| 7477 | set fname [encoding convertfrom $fname] | |
| 7eb3cb9c PM |
7478 | lappend treefilelist($id) $fname |
| 7479 | } | |
| 7480 | if {![eof $gtf]} { | |
| 7481 | return [expr {$nl >= 1000? 2: 1}] | |
| f8b28a40 | 7482 | } |
| f8b28a40 PM |
7483 | close $gtf |
| 7484 | unset treepending | |
| 7485 | if {$cmitmode ne "tree"} { | |
| 7486 | if {![info exists diffmergeid]} { | |
| 7487 | gettreediffs $diffids | |
| 7488 | } | |
| 7489 | } elseif {$id ne $diffids} { | |
| 7490 | gettree $diffids | |
| 7491 | } else { | |
| 7492 | setfilelist $id | |
| 7493 | } | |
| 7eb3cb9c | 7494 | return 0 |
| f8b28a40 PM |
7495 | } |
| 7496 | ||
| 7497 | proc showfile {f} { | |
| 8f489363 | 7498 | global treefilelist treeidlist diffids nullid nullid2 |
| 7cdc3556 | 7499 | global ctext_file_names ctext_file_lines |
| f8b28a40 PM |
7500 | global ctext commentend |
| 7501 | ||
| 7502 | set i [lsearch -exact $treefilelist($diffids) $f] | |
| 7503 | if {$i < 0} { | |
| 7504 | puts "oops, $f not in list for id $diffids" | |
| 7505 | return | |
| 7506 | } | |
| 8f489363 PM |
7507 | if {$diffids eq $nullid} { |
| 7508 | if {[catch {set bf [open $f r]} err]} { | |
| 7509 | puts "oops, can't read $f: $err" | |
| 219ea3a9 PM |
7510 | return |
| 7511 | } | |
| 7512 | } else { | |
| 8f489363 PM |
7513 | set blob [lindex $treeidlist($diffids) $i] |
| 7514 | if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} { | |
| 7515 | puts "oops, error reading blob $blob: $err" | |
| 219ea3a9 PM |
7516 | return |
| 7517 | } | |
| f8b28a40 | 7518 | } |
| 09c7029d | 7519 | fconfigure $bf -blocking 0 -encoding [get_path_encoding $f] |
| 7eb3cb9c | 7520 | filerun $bf [list getblobline $bf $diffids] |
| f8b28a40 | 7521 | $ctext config -state normal |
| 3ea06f9f | 7522 | clear_ctext $commentend |
| 7cdc3556 AG |
7523 | lappend ctext_file_names $f |
| 7524 | lappend ctext_file_lines [lindex [split $commentend "."] 0] | |
| f8b28a40 PM |
7525 | $ctext insert end "\n" |
| 7526 | $ctext insert end "$f\n" filesep | |
| 7527 | $ctext config -state disabled | |
| 7528 | $ctext yview $commentend | |
| 32f1b3e4 | 7529 | settabs 0 |
| f8b28a40 PM |
7530 | } |
| 7531 | ||
| 7532 | proc getblobline {bf id} { | |
| 7533 | global diffids cmitmode ctext | |
| 7534 | ||
| 7535 | if {$id ne $diffids || $cmitmode ne "tree"} { | |
| 7536 | catch {close $bf} | |
| 7eb3cb9c | 7537 | return 0 |
| f8b28a40 PM |
7538 | } |
| 7539 | $ctext config -state normal | |
| 7eb3cb9c PM |
7540 | set nl 0 |
| 7541 | while {[incr nl] <= 1000 && [gets $bf line] >= 0} { | |
| f8b28a40 PM |
7542 | $ctext insert end "$line\n" |
| 7543 | } | |
| 7544 | if {[eof $bf]} { | |
| 8a897742 PM |
7545 | global jump_to_here ctext_file_names commentend |
| 7546 | ||
| f8b28a40 PM |
7547 | # delete last newline |
| 7548 | $ctext delete "end - 2c" "end - 1c" | |
| 7549 | close $bf | |
| 8a897742 PM |
7550 | if {$jump_to_here ne {} && |
| 7551 | [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} { | |
| 7552 | set lnum [expr {[lindex $jump_to_here 1] + | |
| 7553 | [lindex [split $commentend .] 0]}] | |
| 7554 | mark_ctext_line $lnum | |
| 7555 | } | |
| 120ea892 | 7556 | $ctext config -state disabled |
| 7eb3cb9c | 7557 | return 0 |
| f8b28a40 PM |
7558 | } |
| 7559 | $ctext config -state disabled | |
| 7eb3cb9c | 7560 | return [expr {$nl >= 1000? 2: 1}] |
| f8b28a40 PM |
7561 | } |
| 7562 | ||
| 8a897742 | 7563 | proc mark_ctext_line {lnum} { |
| e3e901be | 7564 | global ctext markbgcolor |
| 8a897742 PM |
7565 | |
| 7566 | $ctext tag delete omark | |
| 7567 | $ctext tag add omark $lnum.0 "$lnum.0 + 1 line" | |
| e3e901be | 7568 | $ctext tag conf omark -background $markbgcolor |
| 8a897742 PM |
7569 | $ctext see $lnum.0 |
| 7570 | } | |
| 7571 | ||
| 7fcc92bf | 7572 | proc mergediff {id} { |
| 8b07dca1 | 7573 | global diffmergeid |
| 2df6442f | 7574 | global diffids treediffs |
| 8b07dca1 | 7575 | global parents curview |
| e2ed4324 | 7576 | |
| 3c461ffe | 7577 | set diffmergeid $id |
| 7a1d9d14 | 7578 | set diffids $id |
| 2df6442f | 7579 | set treediffs($id) {} |
| 7fcc92bf | 7580 | set np [llength $parents($curview,$id)] |
| 32f1b3e4 | 7581 | settabs $np |
| 8b07dca1 | 7582 | getblobdiffs $id |
| c8a4acbf PM |
7583 | } |
| 7584 | ||
| 3c461ffe | 7585 | proc startdiff {ids} { |
| 8f489363 | 7586 | global treediffs diffids treepending diffmergeid nullid nullid2 |
| c8dfbcf9 | 7587 | |
| 32f1b3e4 | 7588 | settabs 1 |
| 4f2c2642 | 7589 | set diffids $ids |
| 3c461ffe | 7590 | catch {unset diffmergeid} |
| 8f489363 PM |
7591 | if {![info exists treediffs($ids)] || |
| 7592 | [lsearch -exact $ids $nullid] >= 0 || | |
| 7593 | [lsearch -exact $ids $nullid2] >= 0} { | |
| c8dfbcf9 | 7594 | if {![info exists treepending]} { |
| 14c9dbd6 | 7595 | gettreediffs $ids |
| c8dfbcf9 PM |
7596 | } |
| 7597 | } else { | |
| 14c9dbd6 | 7598 | addtocflist $ids |
| c8dfbcf9 PM |
7599 | } |
| 7600 | } | |
| 7601 | ||
| 65bb0bda PT |
7602 | # If the filename (name) is under any of the passed filter paths |
| 7603 | # then return true to include the file in the listing. | |
| 7a39a17a | 7604 | proc path_filter {filter name} { |
| 65bb0bda | 7605 | set worktree [gitworktree] |
| 7a39a17a | 7606 | foreach p $filter { |
| 65bb0bda PT |
7607 | set fq_p [file normalize $p] |
| 7608 | set fq_n [file normalize [file join $worktree $name]] | |
| 7609 | if {[string match [file normalize $fq_p]* $fq_n]} { | |
| 7610 | return 1 | |
| 7a39a17a PM |
7611 | } |
| 7612 | } | |
| 7613 | return 0 | |
| 7614 | } | |
| 7615 | ||
| c8dfbcf9 | 7616 | proc addtocflist {ids} { |
| 74a40c71 | 7617 | global treediffs |
| 7a39a17a | 7618 | |
| 74a40c71 | 7619 | add_flist $treediffs($ids) |
| c8dfbcf9 | 7620 | getblobdiffs $ids |
| d2610d11 PM |
7621 | } |
| 7622 | ||
| 219ea3a9 | 7623 | proc diffcmd {ids flags} { |
| b2b76d10 | 7624 | global log_showroot nullid nullid2 |
| 219ea3a9 PM |
7625 | |
| 7626 | set i [lsearch -exact $ids $nullid] | |
| 8f489363 | 7627 | set j [lsearch -exact $ids $nullid2] |
| 219ea3a9 | 7628 | if {$i >= 0} { |
| 8f489363 PM |
7629 | if {[llength $ids] > 1 && $j < 0} { |
| 7630 | # comparing working directory with some specific revision | |
| 7631 | set cmd [concat | git diff-index $flags] | |
| 7632 | if {$i == 0} { | |
| 7633 | lappend cmd -R [lindex $ids 1] | |
| 7634 | } else { | |
| 7635 | lappend cmd [lindex $ids 0] | |
| 7636 | } | |
| 7637 | } else { | |
| 7638 | # comparing working directory with index | |
| 7639 | set cmd [concat | git diff-files $flags] | |
| 7640 | if {$j == 1} { | |
| 7641 | lappend cmd -R | |
| 7642 | } | |
| 7643 | } | |
| 7644 | } elseif {$j >= 0} { | |
| 7645 | set cmd [concat | git diff-index --cached $flags] | |
| 219ea3a9 | 7646 | if {[llength $ids] > 1} { |
| 8f489363 | 7647 | # comparing index with specific revision |
| 90a77925 | 7648 | if {$j == 0} { |
| 219ea3a9 PM |
7649 | lappend cmd -R [lindex $ids 1] |
| 7650 | } else { | |
| 7651 | lappend cmd [lindex $ids 0] | |
| 7652 | } | |
| 7653 | } else { | |
| 8f489363 | 7654 | # comparing index with HEAD |
| 219ea3a9 PM |
7655 | lappend cmd HEAD |
| 7656 | } | |
| 7657 | } else { | |
| b2b76d10 MK |
7658 | if {$log_showroot} { |
| 7659 | lappend flags --root | |
| 7660 | } | |
| 8f489363 | 7661 | set cmd [concat | git diff-tree -r $flags $ids] |
| 219ea3a9 PM |
7662 | } |
| 7663 | return $cmd | |
| 7664 | } | |
| 7665 | ||
| c8dfbcf9 | 7666 | proc gettreediffs {ids} { |
| 2c8cd905 | 7667 | global treediff treepending limitdiffs vfilelimit curview |
| 219ea3a9 | 7668 | |
| 2c8cd905 FC |
7669 | set cmd [diffcmd $ids {--no-commit-id}] |
| 7670 | if {$limitdiffs && $vfilelimit($curview) ne {}} { | |
| 7671 | set cmd [concat $cmd -- $vfilelimit($curview)] | |
| 7672 | } | |
| 7673 | if {[catch {set gdtf [open $cmd r]}]} return | |
| 7272131b | 7674 | |
| c8dfbcf9 | 7675 | set treepending $ids |
| 3c461ffe | 7676 | set treediff {} |
| 09c7029d | 7677 | fconfigure $gdtf -blocking 0 -encoding binary |
| 7eb3cb9c | 7678 | filerun $gdtf [list gettreediffline $gdtf $ids] |
| d2610d11 PM |
7679 | } |
| 7680 | ||
| c8dfbcf9 | 7681 | proc gettreediffline {gdtf ids} { |
| 3c461ffe | 7682 | global treediff treediffs treepending diffids diffmergeid |
| 39ee47ef | 7683 | global cmitmode vfilelimit curview limitdiffs perfile_attrs |
| 3c461ffe | 7684 | |
| 7eb3cb9c | 7685 | set nr 0 |
| 4db09304 | 7686 | set sublist {} |
| 39ee47ef PM |
7687 | set max 1000 |
| 7688 | if {$perfile_attrs} { | |
| 7689 | # cache_gitattr is slow, and even slower on win32 where we | |
| 7690 | # have to invoke it for only about 30 paths at a time | |
| 7691 | set max 500 | |
| 7692 | if {[tk windowingsystem] == "win32"} { | |
| 7693 | set max 120 | |
| 7694 | } | |
| 7695 | } | |
| 7696 | while {[incr nr] <= $max && [gets $gdtf line] >= 0} { | |
| 9396cd38 PM |
7697 | set i [string first "\t" $line] |
| 7698 | if {$i >= 0} { | |
| 7699 | set file [string range $line [expr {$i+1}] end] | |
| 7700 | if {[string index $file 0] eq "\""} { | |
| 7701 | set file [lindex $file 0] | |
| 7702 | } | |
| 09c7029d | 7703 | set file [encoding convertfrom $file] |
| 48a81b7c PM |
7704 | if {$file ne [lindex $treediff end]} { |
| 7705 | lappend treediff $file | |
| 7706 | lappend sublist $file | |
| 7707 | } | |
| 9396cd38 | 7708 | } |
| 7eb3cb9c | 7709 | } |
| 39ee47ef PM |
7710 | if {$perfile_attrs} { |
| 7711 | cache_gitattr encoding $sublist | |
| 7712 | } | |
| 7eb3cb9c | 7713 | if {![eof $gdtf]} { |
| 39ee47ef | 7714 | return [expr {$nr >= $max? 2: 1}] |
| 7eb3cb9c PM |
7715 | } |
| 7716 | close $gdtf | |
| 2c8cd905 | 7717 | set treediffs($ids) $treediff |
| 7eb3cb9c | 7718 | unset treepending |
| e1160138 | 7719 | if {$cmitmode eq "tree" && [llength $diffids] == 1} { |
| 7eb3cb9c PM |
7720 | gettree $diffids |
| 7721 | } elseif {$ids != $diffids} { | |
| 7722 | if {![info exists diffmergeid]} { | |
| 7723 | gettreediffs $diffids | |
| b74fd579 | 7724 | } |
| 7eb3cb9c PM |
7725 | } else { |
| 7726 | addtocflist $ids | |
| d2610d11 | 7727 | } |
| 7eb3cb9c | 7728 | return 0 |
| d2610d11 PM |
7729 | } |
| 7730 | ||
| 890fae70 SP |
7731 | # empty string or positive integer |
| 7732 | proc diffcontextvalidate {v} { | |
| 7733 | return [regexp {^(|[1-9][0-9]*)$} $v] | |
| 7734 | } | |
| 7735 | ||
| 7736 | proc diffcontextchange {n1 n2 op} { | |
| 7737 | global diffcontextstring diffcontext | |
| 7738 | ||
| 7739 | if {[string is integer -strict $diffcontextstring]} { | |
| a41ddbb6 | 7740 | if {$diffcontextstring >= 0} { |
| 890fae70 SP |
7741 | set diffcontext $diffcontextstring |
| 7742 | reselectline | |
| 7743 | } | |
| 7744 | } | |
| 7745 | } | |
| 7746 | ||
| b9b86007 SP |
7747 | proc changeignorespace {} { |
| 7748 | reselectline | |
| 7749 | } | |
| 7750 | ||
| ae4e3ff9 TR |
7751 | proc changeworddiff {name ix op} { |
| 7752 | reselectline | |
| 7753 | } | |
| 7754 | ||
| c8dfbcf9 | 7755 | proc getblobdiffs {ids} { |
| 8d73b242 | 7756 | global blobdifffd diffids env |
| 7eb3cb9c | 7757 | global diffinhdr treediffs |
| 890fae70 | 7758 | global diffcontext |
| b9b86007 | 7759 | global ignorespace |
| ae4e3ff9 | 7760 | global worddiff |
| 3ed31a81 | 7761 | global limitdiffs vfilelimit curview |
| 8b07dca1 | 7762 | global diffencoding targetline diffnparents |
| a1d383c5 | 7763 | global git_version currdiffsubmod |
| c8dfbcf9 | 7764 | |
| a8138733 PM |
7765 | set textconv {} |
| 7766 | if {[package vcompare $git_version "1.6.1"] >= 0} { | |
| 7767 | set textconv "--textconv" | |
| 7768 | } | |
| 5c838d23 JL |
7769 | set submodule {} |
| 7770 | if {[package vcompare $git_version "1.6.6"] >= 0} { | |
| 7771 | set submodule "--submodule" | |
| 7772 | } | |
| 7773 | set cmd [diffcmd $ids "-p $textconv $submodule -C --cc --no-commit-id -U$diffcontext"] | |
| b9b86007 SP |
7774 | if {$ignorespace} { |
| 7775 | append cmd " -w" | |
| 7776 | } | |
| ae4e3ff9 TR |
7777 | if {$worddiff ne [mc "Line diff"]} { |
| 7778 | append cmd " --word-diff=porcelain" | |
| 7779 | } | |
| 3ed31a81 PM |
7780 | if {$limitdiffs && $vfilelimit($curview) ne {}} { |
| 7781 | set cmd [concat $cmd -- $vfilelimit($curview)] | |
| 7a39a17a PM |
7782 | } |
| 7783 | if {[catch {set bdf [open $cmd r]} err]} { | |
| 8b07dca1 | 7784 | error_popup [mc "Error getting diffs: %s" $err] |
| e5c2d856 PM |
7785 | return |
| 7786 | } | |
| 8a897742 | 7787 | set targetline {} |
| 8b07dca1 | 7788 | set diffnparents 0 |
| 4f2c2642 | 7789 | set diffinhdr 0 |
| 09c7029d | 7790 | set diffencoding [get_path_encoding {}] |
| 681c3290 | 7791 | fconfigure $bdf -blocking 0 -encoding binary -eofchar {} |
| c8dfbcf9 | 7792 | set blobdifffd($ids) $bdf |
| a1d383c5 | 7793 | set currdiffsubmod "" |
| 7eb3cb9c | 7794 | filerun $bdf [list getblobdiffline $bdf $diffids] |
| e5c2d856 PM |
7795 | } |
| 7796 | ||
| 354af6bd PM |
7797 | proc savecmitpos {} { |
| 7798 | global ctext cmitmode | |
| 7799 | ||
| 7800 | if {$cmitmode eq "tree"} { | |
| 7801 | return {} | |
| 7802 | } | |
| 7803 | return [list target_scrollpos [$ctext index @0,0]] | |
| 7804 | } | |
| 7805 | ||
| 7806 | proc savectextpos {} { | |
| 7807 | global ctext | |
| 7808 | ||
| 7809 | return [list target_scrollpos [$ctext index @0,0]] | |
| 7810 | } | |
| 7811 | ||
| 7812 | proc maybe_scroll_ctext {ateof} { | |
| 7813 | global ctext target_scrollpos | |
| 7814 | ||
| 7815 | if {![info exists target_scrollpos]} return | |
| 7816 | if {!$ateof} { | |
| 7817 | set nlines [expr {[winfo height $ctext] | |
| 7818 | / [font metrics textfont -linespace]}] | |
| 7819 | if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return | |
| 7820 | } | |
| 7821 | $ctext yview $target_scrollpos | |
| 7822 | unset target_scrollpos | |
| 7823 | } | |
| 7824 | ||
| 89b11d3b PM |
7825 | proc setinlist {var i val} { |
| 7826 | global $var | |
| 7827 | ||
| 7828 | while {[llength [set $var]] < $i} { | |
| 7829 | lappend $var {} | |
| 7830 | } | |
| 7831 | if {[llength [set $var]] == $i} { | |
| 7832 | lappend $var $val | |
| 7833 | } else { | |
| 7834 | lset $var $i $val | |
| 7835 | } | |
| 7836 | } | |
| 7837 | ||
| 9396cd38 | 7838 | proc makediffhdr {fname ids} { |
| 8b07dca1 | 7839 | global ctext curdiffstart treediffs diffencoding |
| 8a897742 | 7840 | global ctext_file_names jump_to_here targetline diffline |
| 9396cd38 | 7841 | |
| 8b07dca1 PM |
7842 | set fname [encoding convertfrom $fname] |
| 7843 | set diffencoding [get_path_encoding $fname] | |
| 9396cd38 PM |
7844 | set i [lsearch -exact $treediffs($ids) $fname] |
| 7845 | if {$i >= 0} { | |
| 7846 | setinlist difffilestart $i $curdiffstart | |
| 7847 | } | |
| 48a81b7c | 7848 | lset ctext_file_names end $fname |
| 9396cd38 PM |
7849 | set l [expr {(78 - [string length $fname]) / 2}] |
| 7850 | set pad [string range "----------------------------------------" 1 $l] | |
| 7851 | $ctext insert $curdiffstart "$pad $fname $pad" filesep | |
| 8a897742 PM |
7852 | set targetline {} |
| 7853 | if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} { | |
| 7854 | set targetline [lindex $jump_to_here 1] | |
| 7855 | } | |
| 7856 | set diffline 0 | |
| 9396cd38 PM |
7857 | } |
| 7858 | ||
| c8dfbcf9 | 7859 | proc getblobdiffline {bdf ids} { |
| 9396cd38 | 7860 | global diffids blobdifffd ctext curdiffstart |
| 7eab2933 | 7861 | global diffnexthead diffnextnote difffilestart |
| 7cdc3556 | 7862 | global ctext_file_names ctext_file_lines |
| 8b07dca1 | 7863 | global diffinhdr treediffs mergemax diffnparents |
| a1d383c5 | 7864 | global diffencoding jump_to_here targetline diffline currdiffsubmod |
| ae4e3ff9 | 7865 | global worddiff |
| c8dfbcf9 | 7866 | |
| 7eb3cb9c | 7867 | set nr 0 |
| e5c2d856 | 7868 | $ctext conf -state normal |
| 7eb3cb9c PM |
7869 | while {[incr nr] <= 1000 && [gets $bdf line] >= 0} { |
| 7870 | if {$ids != $diffids || $bdf != $blobdifffd($ids)} { | |
| c21398be | 7871 | catch {close $bdf} |
| 7eb3cb9c | 7872 | return 0 |
| 89b11d3b | 7873 | } |
| 8b07dca1 PM |
7874 | if {![string compare -length 5 "diff " $line]} { |
| 7875 | if {![regexp {^diff (--cc|--git) } $line m type]} { | |
| 7876 | set line [encoding convertfrom $line] | |
| 7877 | $ctext insert end "$line\n" hunksep | |
| 7878 | continue | |
| 7879 | } | |
| 7eb3cb9c | 7880 | # start of a new file |
| 8b07dca1 | 7881 | set diffinhdr 1 |
| 7eb3cb9c | 7882 | $ctext insert end "\n" |
| 9396cd38 | 7883 | set curdiffstart [$ctext index "end - 1c"] |
| 7cdc3556 AG |
7884 | lappend ctext_file_names "" |
| 7885 | lappend ctext_file_lines [lindex [split $curdiffstart "."] 0] | |
| 9396cd38 | 7886 | $ctext insert end "\n" filesep |
| 8b07dca1 PM |
7887 | |
| 7888 | if {$type eq "--cc"} { | |
| 7889 | # start of a new file in a merge diff | |
| 7890 | set fname [string range $line 10 end] | |
| 7891 | if {[lsearch -exact $treediffs($ids) $fname] < 0} { | |
| 7892 | lappend treediffs($ids) $fname | |
| 7893 | add_flist [list $fname] | |
| 7894 | } | |
| 7895 | ||
| 9396cd38 | 7896 | } else { |
| 8b07dca1 PM |
7897 | set line [string range $line 11 end] |
| 7898 | # If the name hasn't changed the length will be odd, | |
| 7899 | # the middle char will be a space, and the two bits either | |
| 7900 | # side will be a/name and b/name, or "a/name" and "b/name". | |
| 7901 | # If the name has changed we'll get "rename from" and | |
| 7902 | # "rename to" or "copy from" and "copy to" lines following | |
| 7903 | # this, and we'll use them to get the filenames. | |
| 7904 | # This complexity is necessary because spaces in the | |
| 7905 | # filename(s) don't get escaped. | |
| 7906 | set l [string length $line] | |
| 7907 | set i [expr {$l / 2}] | |
| 7908 | if {!(($l & 1) && [string index $line $i] eq " " && | |
| 7909 | [string range $line 2 [expr {$i - 1}]] eq \ | |
| 7910 | [string range $line [expr {$i + 3}] end])} { | |
| 7911 | continue | |
| 7912 | } | |
| 7913 | # unescape if quoted and chop off the a/ from the front | |
| 7914 | if {[string index $line 0] eq "\""} { | |
| 7915 | set fname [string range [lindex $line 0] 2 end] | |
| 7916 | } else { | |
| 7917 | set fname [string range $line 2 [expr {$i - 1}]] | |
| 7918 | } | |
| 7eb3cb9c | 7919 | } |
| 9396cd38 PM |
7920 | makediffhdr $fname $ids |
| 7921 | ||
| 48a81b7c PM |
7922 | } elseif {![string compare -length 16 "* Unmerged path " $line]} { |
| 7923 | set fname [encoding convertfrom [string range $line 16 end]] | |
| 7924 | $ctext insert end "\n" | |
| 7925 | set curdiffstart [$ctext index "end - 1c"] | |
| 7926 | lappend ctext_file_names $fname | |
| 7927 | lappend ctext_file_lines [lindex [split $curdiffstart "."] 0] | |
| 7928 | $ctext insert end "$line\n" filesep | |
| 7929 | set i [lsearch -exact $treediffs($ids) $fname] | |
| 7930 | if {$i >= 0} { | |
| 7931 | setinlist difffilestart $i $curdiffstart | |
| 7932 | } | |
| 7933 | ||
| 8b07dca1 PM |
7934 | } elseif {![string compare -length 2 "@@" $line]} { |
| 7935 | regexp {^@@+} $line ats | |
| 09c7029d | 7936 | set line [encoding convertfrom $diffencoding $line] |
| 7eb3cb9c | 7937 | $ctext insert end "$line\n" hunksep |
| 8b07dca1 PM |
7938 | if {[regexp { \+(\d+),\d+ @@} $line m nl]} { |
| 7939 | set diffline $nl | |
| 7940 | } | |
| 7941 | set diffnparents [expr {[string length $ats] - 1}] | |
| 7eb3cb9c | 7942 | set diffinhdr 0 |
| 9396cd38 | 7943 | |
| 5c838d23 JL |
7944 | } elseif {![string compare -length 10 "Submodule " $line]} { |
| 7945 | # start of a new submodule | |
| a1d383c5 JL |
7946 | if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} { |
| 7947 | set fname [string range $line 10 [expr [lindex $nameend 0] - 2]] | |
| 7948 | } else { | |
| 7949 | set fname [string range $line 10 [expr [string first "contains " $line] - 2]] | |
| 7950 | } | |
| 7951 | if {$currdiffsubmod != $fname} { | |
| 5c838d23 JL |
7952 | $ctext insert end "\n"; # Add newline after commit message |
| 7953 | } | |
| 7954 | set curdiffstart [$ctext index "end - 1c"] | |
| 7955 | lappend ctext_file_names "" | |
| a1d383c5 JL |
7956 | if {$currdiffsubmod != $fname} { |
| 7957 | lappend ctext_file_lines $fname | |
| 7958 | makediffhdr $fname $ids | |
| 7959 | set currdiffsubmod $fname | |
| 7960 | $ctext insert end "\n$line\n" filesep | |
| 7961 | } else { | |
| 7962 | $ctext insert end "$line\n" filesep | |
| 7963 | } | |
| 5c838d23 | 7964 | } elseif {![string compare -length 3 " >" $line]} { |
| a1d383c5 | 7965 | set $currdiffsubmod "" |
| 1f2cecfd | 7966 | set line [encoding convertfrom $diffencoding $line] |
| 5c838d23 JL |
7967 | $ctext insert end "$line\n" dresult |
| 7968 | } elseif {![string compare -length 3 " <" $line]} { | |
| a1d383c5 | 7969 | set $currdiffsubmod "" |
| 1f2cecfd | 7970 | set line [encoding convertfrom $diffencoding $line] |
| 5c838d23 | 7971 | $ctext insert end "$line\n" d0 |
| 9396cd38 | 7972 | } elseif {$diffinhdr} { |
| 5e85ec4c | 7973 | if {![string compare -length 12 "rename from " $line]} { |
| d1cb298b | 7974 | set fname [string range $line [expr 6 + [string first " from " $line] ] end] |
| 9396cd38 PM |
7975 | if {[string index $fname 0] eq "\""} { |
| 7976 | set fname [lindex $fname 0] | |
| 7977 | } | |
| 09c7029d | 7978 | set fname [encoding convertfrom $fname] |
| 9396cd38 PM |
7979 | set i [lsearch -exact $treediffs($ids) $fname] |
| 7980 | if {$i >= 0} { | |
| 7981 | setinlist difffilestart $i $curdiffstart | |
| 7982 | } | |
| d1cb298b JS |
7983 | } elseif {![string compare -length 10 $line "rename to "] || |
| 7984 | ![string compare -length 8 $line "copy to "]} { | |
| 7985 | set fname [string range $line [expr 4 + [string first " to " $line] ] end] | |
| 9396cd38 PM |
7986 | if {[string index $fname 0] eq "\""} { |
| 7987 | set fname [lindex $fname 0] | |
| 7988 | } | |
| 7989 | makediffhdr $fname $ids | |
| 7990 | } elseif {[string compare -length 3 $line "---"] == 0} { | |
| 7991 | # do nothing | |
| 7992 | continue | |
| 7993 | } elseif {[string compare -length 3 $line "+++"] == 0} { | |
| 7994 | set diffinhdr 0 | |
| 7995 | continue | |
| 7996 | } | |
| 7997 | $ctext insert end "$line\n" filesep | |
| 7998 | ||
| e5c2d856 | 7999 | } else { |
| 681c3290 PT |
8000 | set line [string map {\x1A ^Z} \ |
| 8001 | [encoding convertfrom $diffencoding $line]] | |
| 8b07dca1 PM |
8002 | # parse the prefix - one ' ', '-' or '+' for each parent |
| 8003 | set prefix [string range $line 0 [expr {$diffnparents - 1}]] | |
| 8004 | set tag [expr {$diffnparents > 1? "m": "d"}] | |
| ae4e3ff9 TR |
8005 | set dowords [expr {$worddiff ne [mc "Line diff"] && $diffnparents == 1}] |
| 8006 | set words_pre_markup "" | |
| 8007 | set words_post_markup "" | |
| 8b07dca1 PM |
8008 | if {[string trim $prefix " -+"] eq {}} { |
| 8009 | # prefix only has " ", "-" and "+" in it: normal diff line | |
| 8010 | set num [string first "-" $prefix] | |
| ae4e3ff9 TR |
8011 | if {$dowords} { |
| 8012 | set line [string range $line 1 end] | |
| 8013 | } | |
| 8b07dca1 PM |
8014 | if {$num >= 0} { |
| 8015 | # removed line, first parent with line is $num | |
| 8016 | if {$num >= $mergemax} { | |
| 8017 | set num "max" | |
| 8018 | } | |
| ae4e3ff9 TR |
8019 | if {$dowords && $worddiff eq [mc "Markup words"]} { |
| 8020 | $ctext insert end "\[-$line-\]" $tag$num | |
| 8021 | } else { | |
| 8022 | $ctext insert end "$line" $tag$num | |
| 8023 | } | |
| 8024 | if {!$dowords} { | |
| 8025 | $ctext insert end "\n" $tag$num | |
| 8026 | } | |
| 8b07dca1 PM |
8027 | } else { |
| 8028 | set tags {} | |
| 8029 | if {[string first "+" $prefix] >= 0} { | |
| 8030 | # added line | |
| 8031 | lappend tags ${tag}result | |
| 8032 | if {$diffnparents > 1} { | |
| 8033 | set num [string first " " $prefix] | |
| 8034 | if {$num >= 0} { | |
| 8035 | if {$num >= $mergemax} { | |
| 8036 | set num "max" | |
| 8037 | } | |
| 8038 | lappend tags m$num | |
| 8039 | } | |
| 8040 | } | |
| ae4e3ff9 TR |
8041 | set words_pre_markup "{+" |
| 8042 | set words_post_markup "+}" | |
| 8b07dca1 PM |
8043 | } |
| 8044 | if {$targetline ne {}} { | |
| 8045 | if {$diffline == $targetline} { | |
| 8046 | set seehere [$ctext index "end - 1 chars"] | |
| 8047 | set targetline {} | |
| 8048 | } else { | |
| 8049 | incr diffline | |
| 8050 | } | |
| 8051 | } | |
| ae4e3ff9 TR |
8052 | if {$dowords && $worddiff eq [mc "Markup words"]} { |
| 8053 | $ctext insert end "$words_pre_markup$line$words_post_markup" $tags | |
| 8054 | } else { | |
| 8055 | $ctext insert end "$line" $tags | |
| 8056 | } | |
| 8057 | if {!$dowords} { | |
| 8058 | $ctext insert end "\n" $tags | |
| 8059 | } | |
| 8b07dca1 | 8060 | } |
| ae4e3ff9 TR |
8061 | } elseif {$dowords && $prefix eq "~"} { |
| 8062 | $ctext insert end "\n" {} | |
| 7eb3cb9c | 8063 | } else { |
| 9396cd38 PM |
8064 | # "\ No newline at end of file", |
| 8065 | # or something else we don't recognize | |
| 8066 | $ctext insert end "$line\n" hunksep | |
| e5c2d856 | 8067 | } |
| e5c2d856 PM |
8068 | } |
| 8069 | } | |
| 8b07dca1 PM |
8070 | if {[info exists seehere]} { |
| 8071 | mark_ctext_line [lindex [split $seehere .] 0] | |
| 8072 | } | |
| 354af6bd | 8073 | maybe_scroll_ctext [eof $bdf] |
| e5c2d856 | 8074 | $ctext conf -state disabled |
| 7eb3cb9c | 8075 | if {[eof $bdf]} { |
| c21398be | 8076 | catch {close $bdf} |
| 7eb3cb9c | 8077 | return 0 |
| c8dfbcf9 | 8078 | } |
| 7eb3cb9c | 8079 | return [expr {$nr >= 1000? 2: 1}] |
| e5c2d856 PM |
8080 | } |
| 8081 | ||
| a8d610a2 PM |
8082 | proc changediffdisp {} { |
| 8083 | global ctext diffelide | |
| 8084 | ||
| 8085 | $ctext tag conf d0 -elide [lindex $diffelide 0] | |
| 8b07dca1 | 8086 | $ctext tag conf dresult -elide [lindex $diffelide 1] |
| a8d610a2 PM |
8087 | } |
| 8088 | ||
| b967135d SH |
8089 | proc highlightfile {cline} { |
| 8090 | global cflist cflist_top | |
| f4c54b3c | 8091 | |
| ce837c9d SH |
8092 | if {![info exists cflist_top]} return |
| 8093 | ||
| f4c54b3c PM |
8094 | $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend" |
| 8095 | $cflist tag add highlight $cline.0 "$cline.0 lineend" | |
| 8096 | $cflist see $cline.0 | |
| 8097 | set cflist_top $cline | |
| 8098 | } | |
| 8099 | ||
| b967135d | 8100 | proc highlightfile_for_scrollpos {topidx} { |
| 978904bf | 8101 | global cmitmode difffilestart |
| b967135d | 8102 | |
| 978904bf | 8103 | if {$cmitmode eq "tree"} return |
| b967135d SH |
8104 | if {![info exists difffilestart]} return |
| 8105 | ||
| 8106 | set top [lindex [split $topidx .] 0] | |
| 8107 | if {$difffilestart eq {} || $top < [lindex $difffilestart 0]} { | |
| 8108 | highlightfile 0 | |
| 8109 | } else { | |
| 8110 | highlightfile [expr {[bsearch $difffilestart $top] + 2}] | |
| 8111 | } | |
| 8112 | } | |
| 8113 | ||
| 67c22874 | 8114 | proc prevfile {} { |
| f4c54b3c PM |
8115 | global difffilestart ctext cmitmode |
| 8116 | ||
| 8117 | if {$cmitmode eq "tree"} return | |
| 8118 | set prev 0.0 | |
| 67c22874 OH |
8119 | set here [$ctext index @0,0] |
| 8120 | foreach loc $difffilestart { | |
| 8121 | if {[$ctext compare $loc >= $here]} { | |
| b967135d | 8122 | $ctext yview $prev |
| 67c22874 OH |
8123 | return |
| 8124 | } | |
| 8125 | set prev $loc | |
| 8126 | } | |
| b967135d | 8127 | $ctext yview $prev |
| 67c22874 OH |
8128 | } |
| 8129 | ||
| 39ad8570 | 8130 | proc nextfile {} { |
| f4c54b3c PM |
8131 | global difffilestart ctext cmitmode |
| 8132 | ||
| 8133 | if {$cmitmode eq "tree"} return | |
| 39ad8570 | 8134 | set here [$ctext index @0,0] |
| 7fcceed7 PM |
8135 | foreach loc $difffilestart { |
| 8136 | if {[$ctext compare $loc > $here]} { | |
| b967135d | 8137 | $ctext yview $loc |
| 67c22874 | 8138 | return |
| 39ad8570 PM |
8139 | } |
| 8140 | } | |
| 1db95b00 PM |
8141 | } |
| 8142 | ||
| 3ea06f9f PM |
8143 | proc clear_ctext {{first 1.0}} { |
| 8144 | global ctext smarktop smarkbot | |
| 7cdc3556 | 8145 | global ctext_file_names ctext_file_lines |
| 97645683 | 8146 | global pendinglinks |
| 3ea06f9f | 8147 | |
| 1902c270 PM |
8148 | set l [lindex [split $first .] 0] |
| 8149 | if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} { | |
| 8150 | set smarktop $l | |
| 3ea06f9f | 8151 | } |
| 1902c270 PM |
8152 | if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} { |
| 8153 | set smarkbot $l | |
| 3ea06f9f PM |
8154 | } |
| 8155 | $ctext delete $first end | |
| 97645683 PM |
8156 | if {$first eq "1.0"} { |
| 8157 | catch {unset pendinglinks} | |
| 8158 | } | |
| 7cdc3556 AG |
8159 | set ctext_file_names {} |
| 8160 | set ctext_file_lines {} | |
| 3ea06f9f PM |
8161 | } |
| 8162 | ||
| 32f1b3e4 | 8163 | proc settabs {{firstab {}}} { |
| 9c311b32 | 8164 | global firsttabstop tabstop ctext have_tk85 |
| 32f1b3e4 PM |
8165 | |
| 8166 | if {$firstab ne {} && $have_tk85} { | |
| 8167 | set firsttabstop $firstab | |
| 8168 | } | |
| 9c311b32 | 8169 | set w [font measure textfont "0"] |
| 32f1b3e4 | 8170 | if {$firsttabstop != 0} { |
| 64b5f146 PM |
8171 | $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \ |
| 8172 | [expr {($firsttabstop + 2 * $tabstop) * $w}]] | |
| 32f1b3e4 PM |
8173 | } elseif {$have_tk85 || $tabstop != 8} { |
| 8174 | $ctext conf -tabs [expr {$tabstop * $w}] | |
| 8175 | } else { | |
| 8176 | $ctext conf -tabs {} | |
| 8177 | } | |
| 3ea06f9f PM |
8178 | } |
| 8179 | ||
| 8180 | proc incrsearch {name ix op} { | |
| 1902c270 | 8181 | global ctext searchstring searchdirn |
| 3ea06f9f | 8182 | |
| 1902c270 PM |
8183 | if {[catch {$ctext index anchor}]} { |
| 8184 | # no anchor set, use start of selection, or of visible area | |
| 8185 | set sel [$ctext tag ranges sel] | |
| 8186 | if {$sel ne {}} { | |
| 8187 | $ctext mark set anchor [lindex $sel 0] | |
| 8188 | } elseif {$searchdirn eq "-forwards"} { | |
| 8189 | $ctext mark set anchor @0,0 | |
| 8190 | } else { | |
| 8191 | $ctext mark set anchor @0,[winfo height $ctext] | |
| 8192 | } | |
| 8193 | } | |
| 3ea06f9f | 8194 | if {$searchstring ne {}} { |
| 30441a6f | 8195 | set here [$ctext search -count mlen $searchdirn -- $searchstring anchor] |
| 1902c270 PM |
8196 | if {$here ne {}} { |
| 8197 | $ctext see $here | |
| 30441a6f SH |
8198 | set mend "$here + $mlen c" |
| 8199 | $ctext tag remove sel 1.0 end | |
| 8200 | $ctext tag add sel $here $mend | |
| b967135d SH |
8201 | suppress_highlighting_file_for_current_scrollpos |
| 8202 | highlightfile_for_scrollpos $here | |
| 1902c270 | 8203 | } |
| 3ea06f9f | 8204 | } |
| c4614994 | 8205 | rehighlight_search_results |
| 3ea06f9f PM |
8206 | } |
| 8207 | ||
| 8208 | proc dosearch {} { | |
| 1902c270 | 8209 | global sstring ctext searchstring searchdirn |
| 3ea06f9f PM |
8210 | |
| 8211 | focus $sstring | |
| 8212 | $sstring icursor end | |
| 1902c270 PM |
8213 | set searchdirn -forwards |
| 8214 | if {$searchstring ne {}} { | |
| 8215 | set sel [$ctext tag ranges sel] | |
| 8216 | if {$sel ne {}} { | |
| 8217 | set start "[lindex $sel 0] + 1c" | |
| 8218 | } elseif {[catch {set start [$ctext index anchor]}]} { | |
| 8219 | set start "@0,0" | |
| 8220 | } | |
| 8221 | set match [$ctext search -count mlen -- $searchstring $start] | |
| 8222 | $ctext tag remove sel 1.0 end | |
| 8223 | if {$match eq {}} { | |
| 8224 | bell | |
| 8225 | return | |
| 8226 | } | |
| 8227 | $ctext see $match | |
| b967135d SH |
8228 | suppress_highlighting_file_for_current_scrollpos |
| 8229 | highlightfile_for_scrollpos $match | |
| 1902c270 PM |
8230 | set mend "$match + $mlen c" |
| 8231 | $ctext tag add sel $match $mend | |
| 8232 | $ctext mark unset anchor | |
| c4614994 | 8233 | rehighlight_search_results |
| 1902c270 PM |
8234 | } |
| 8235 | } | |
| 8236 | ||
| 8237 | proc dosearchback {} { | |
| 8238 | global sstring ctext searchstring searchdirn | |
| 8239 | ||
| 8240 | focus $sstring | |
| 8241 | $sstring icursor end | |
| 8242 | set searchdirn -backwards | |
| 8243 | if {$searchstring ne {}} { | |
| 8244 | set sel [$ctext tag ranges sel] | |
| 8245 | if {$sel ne {}} { | |
| 8246 | set start [lindex $sel 0] | |
| 8247 | } elseif {[catch {set start [$ctext index anchor]}]} { | |
| 8248 | set start @0,[winfo height $ctext] | |
| 8249 | } | |
| 8250 | set match [$ctext search -backwards -count ml -- $searchstring $start] | |
| 8251 | $ctext tag remove sel 1.0 end | |
| 8252 | if {$match eq {}} { | |
| 8253 | bell | |
| 8254 | return | |
| 8255 | } | |
| 8256 | $ctext see $match | |
| b967135d SH |
8257 | suppress_highlighting_file_for_current_scrollpos |
| 8258 | highlightfile_for_scrollpos $match | |
| 1902c270 PM |
8259 | set mend "$match + $ml c" |
| 8260 | $ctext tag add sel $match $mend | |
| 8261 | $ctext mark unset anchor | |
| c4614994 SH |
8262 | rehighlight_search_results |
| 8263 | } | |
| 8264 | } | |
| 8265 | ||
| 8266 | proc rehighlight_search_results {} { | |
| 8267 | global ctext searchstring | |
| 8268 | ||
| 8269 | $ctext tag remove found 1.0 end | |
| 8270 | $ctext tag remove currentsearchhit 1.0 end | |
| 8271 | ||
| 8272 | if {$searchstring ne {}} { | |
| 8273 | searchmarkvisible 1 | |
| 3ea06f9f | 8274 | } |
| 3ea06f9f PM |
8275 | } |
| 8276 | ||
| 8277 | proc searchmark {first last} { | |
| 8278 | global ctext searchstring | |
| 8279 | ||
| c4614994 SH |
8280 | set sel [$ctext tag ranges sel] |
| 8281 | ||
| 3ea06f9f PM |
8282 | set mend $first.0 |
| 8283 | while {1} { | |
| 8284 | set match [$ctext search -count mlen -- $searchstring $mend $last.end] | |
| 8285 | if {$match eq {}} break | |
| 8286 | set mend "$match + $mlen c" | |
| c4614994 SH |
8287 | if {$sel ne {} && [$ctext compare $match == [lindex $sel 0]]} { |
| 8288 | $ctext tag add currentsearchhit $match $mend | |
| 8289 | } else { | |
| 8290 | $ctext tag add found $match $mend | |
| 8291 | } | |
| 3ea06f9f PM |
8292 | } |
| 8293 | } | |
| 8294 | ||
| 8295 | proc searchmarkvisible {doall} { | |
| 8296 | global ctext smarktop smarkbot | |
| 8297 | ||
| 8298 | set topline [lindex [split [$ctext index @0,0] .] 0] | |
| 8299 | set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0] | |
| 8300 | if {$doall || $botline < $smarktop || $topline > $smarkbot} { | |
| 8301 | # no overlap with previous | |
| 8302 | searchmark $topline $botline | |
| 8303 | set smarktop $topline | |
| 8304 | set smarkbot $botline | |
| 8305 | } else { | |
| 8306 | if {$topline < $smarktop} { | |
| 8307 | searchmark $topline [expr {$smarktop-1}] | |
| 8308 | set smarktop $topline | |
| 8309 | } | |
| 8310 | if {$botline > $smarkbot} { | |
| 8311 | searchmark [expr {$smarkbot+1}] $botline | |
| 8312 | set smarkbot $botline | |
| 8313 | } | |
| 8314 | } | |
| 8315 | } | |
| 8316 | ||
| b967135d SH |
8317 | proc suppress_highlighting_file_for_current_scrollpos {} { |
| 8318 | global ctext suppress_highlighting_file_for_this_scrollpos | |
| 8319 | ||
| 8320 | set suppress_highlighting_file_for_this_scrollpos [$ctext index @0,0] | |
| 8321 | } | |
| 8322 | ||
| 3ea06f9f | 8323 | proc scrolltext {f0 f1} { |
| b967135d SH |
8324 | global searchstring cmitmode ctext |
| 8325 | global suppress_highlighting_file_for_this_scrollpos | |
| 8326 | ||
| 978904bf SH |
8327 | set topidx [$ctext index @0,0] |
| 8328 | if {![info exists suppress_highlighting_file_for_this_scrollpos] | |
| 8329 | || $topidx ne $suppress_highlighting_file_for_this_scrollpos} { | |
| 8330 | highlightfile_for_scrollpos $topidx | |
| b967135d SH |
8331 | } |
| 8332 | ||
| 8333 | catch {unset suppress_highlighting_file_for_this_scrollpos} | |
| 3ea06f9f | 8334 | |
| 8809d691 | 8335 | .bleft.bottom.sb set $f0 $f1 |
| 3ea06f9f PM |
8336 | if {$searchstring ne {}} { |
| 8337 | searchmarkvisible 0 | |
| 8338 | } | |
| 8339 | } | |
| 8340 | ||
| 1d10f36d | 8341 | proc setcoords {} { |
| 9c311b32 | 8342 | global linespc charspc canvx0 canvy0 |
| f6075eba | 8343 | global xspc1 xspc2 lthickness |
| 8d858d1a | 8344 | |
| 9c311b32 PM |
8345 | set linespc [font metrics mainfont -linespace] |
| 8346 | set charspc [font measure mainfont "m"] | |
| 9f1afe05 PM |
8347 | set canvy0 [expr {int(3 + 0.5 * $linespc)}] |
| 8348 | set canvx0 [expr {int(3 + 0.5 * $linespc)}] | |
| f6075eba | 8349 | set lthickness [expr {int($linespc / 9) + 1}] |
| 8d858d1a PM |
8350 | set xspc1(0) $linespc |
| 8351 | set xspc2 $linespc | |
| 9a40c50c | 8352 | } |
| 1db95b00 | 8353 | |
| 1d10f36d | 8354 | proc redisplay {} { |
| be0cd098 | 8355 | global canv |
| 9f1afe05 PM |
8356 | global selectedline |
| 8357 | ||
| 8358 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 8359 | if {$ymax eq {} || $ymax == 0} return | |
| 8360 | set span [$canv yview] | |
| 8361 | clear_display | |
| be0cd098 | 8362 | setcanvscroll |
| 9f1afe05 PM |
8363 | allcanvs yview moveto [lindex $span 0] |
| 8364 | drawvisible | |
| 94b4a69f | 8365 | if {$selectedline ne {}} { |
| 9f1afe05 | 8366 | selectline $selectedline 0 |
| ca6d8f58 | 8367 | allcanvs yview moveto [lindex $span 0] |
| 1d10f36d PM |
8368 | } |
| 8369 | } | |
| 8370 | ||
| 0ed1dd3c PM |
8371 | proc parsefont {f n} { |
| 8372 | global fontattr | |
| 8373 | ||
| 8374 | set fontattr($f,family) [lindex $n 0] | |
| 8375 | set s [lindex $n 1] | |
| 8376 | if {$s eq {} || $s == 0} { | |
| 8377 | set s 10 | |
| 8378 | } elseif {$s < 0} { | |
| 8379 | set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}] | |
| 9c311b32 | 8380 | } |
| 0ed1dd3c PM |
8381 | set fontattr($f,size) $s |
| 8382 | set fontattr($f,weight) normal | |
| 8383 | set fontattr($f,slant) roman | |
| 8384 | foreach style [lrange $n 2 end] { | |
| 8385 | switch -- $style { | |
| 8386 | "normal" - | |
| 8387 | "bold" {set fontattr($f,weight) $style} | |
| 8388 | "roman" - | |
| 8389 | "italic" {set fontattr($f,slant) $style} | |
| 8390 | } | |
| 9c311b32 | 8391 | } |
| 0ed1dd3c PM |
8392 | } |
| 8393 | ||
| 8394 | proc fontflags {f {isbold 0}} { | |
| 8395 | global fontattr | |
| 8396 | ||
| 8397 | return [list -family $fontattr($f,family) -size $fontattr($f,size) \ | |
| 8398 | -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \ | |
| 8399 | -slant $fontattr($f,slant)] | |
| 8400 | } | |
| 8401 | ||
| 8402 | proc fontname {f} { | |
| 8403 | global fontattr | |
| 8404 | ||
| 8405 | set n [list $fontattr($f,family) $fontattr($f,size)] | |
| 8406 | if {$fontattr($f,weight) eq "bold"} { | |
| 8407 | lappend n "bold" | |
| 9c311b32 | 8408 | } |
| 0ed1dd3c PM |
8409 | if {$fontattr($f,slant) eq "italic"} { |
| 8410 | lappend n "italic" | |
| 9c311b32 | 8411 | } |
| 0ed1dd3c | 8412 | return $n |
| 9c311b32 PM |
8413 | } |
| 8414 | ||
| 1d10f36d | 8415 | proc incrfont {inc} { |
| 7fcc92bf | 8416 | global mainfont textfont ctext canv cflist showrefstop |
| 0ed1dd3c PM |
8417 | global stopped entries fontattr |
| 8418 | ||
| 1d10f36d | 8419 | unmarkmatches |
| 0ed1dd3c | 8420 | set s $fontattr(mainfont,size) |
| 9c311b32 PM |
8421 | incr s $inc |
| 8422 | if {$s < 1} { | |
| 8423 | set s 1 | |
| 8424 | } | |
| 0ed1dd3c | 8425 | set fontattr(mainfont,size) $s |
| 9c311b32 PM |
8426 | font config mainfont -size $s |
| 8427 | font config mainfontbold -size $s | |
| 0ed1dd3c PM |
8428 | set mainfont [fontname mainfont] |
| 8429 | set s $fontattr(textfont,size) | |
| 9c311b32 PM |
8430 | incr s $inc |
| 8431 | if {$s < 1} { | |
| 8432 | set s 1 | |
| 8433 | } | |
| 0ed1dd3c | 8434 | set fontattr(textfont,size) $s |
| 9c311b32 PM |
8435 | font config textfont -size $s |
| 8436 | font config textfontbold -size $s | |
| 0ed1dd3c | 8437 | set textfont [fontname textfont] |
| 1d10f36d | 8438 | setcoords |
| 32f1b3e4 | 8439 | settabs |
| 1d10f36d PM |
8440 | redisplay |
| 8441 | } | |
| 1db95b00 | 8442 | |
| ee3dc72e PM |
8443 | proc clearsha1 {} { |
| 8444 | global sha1entry sha1string | |
| 8445 | if {[string length $sha1string] == 40} { | |
| 8446 | $sha1entry delete 0 end | |
| 8447 | } | |
| 8448 | } | |
| 8449 | ||
| 887fe3c4 PM |
8450 | proc sha1change {n1 n2 op} { |
| 8451 | global sha1string currentid sha1but | |
| 8452 | if {$sha1string == {} | |
| 8453 | || ([info exists currentid] && $sha1string == $currentid)} { | |
| 8454 | set state disabled | |
| 8455 | } else { | |
| 8456 | set state normal | |
| 8457 | } | |
| 8458 | if {[$sha1but cget -state] == $state} return | |
| 8459 | if {$state == "normal"} { | |
| d990cedf | 8460 | $sha1but conf -state normal -relief raised -text "[mc "Goto:"] " |
| 887fe3c4 | 8461 | } else { |
| d990cedf | 8462 | $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] " |
| 887fe3c4 PM |
8463 | } |
| 8464 | } | |
| 8465 | ||
| 8466 | proc gotocommit {} { | |
| 7fcc92bf | 8467 | global sha1string tagids headids curview varcid |
| f3b8b3ce | 8468 | |
| 887fe3c4 PM |
8469 | if {$sha1string == {} |
| 8470 | || ([info exists currentid] && $sha1string == $currentid)} return | |
| 8471 | if {[info exists tagids($sha1string)]} { | |
| 8472 | set id $tagids($sha1string) | |
| e1007129 SR |
8473 | } elseif {[info exists headids($sha1string)]} { |
| 8474 | set id $headids($sha1string) | |
| 887fe3c4 PM |
8475 | } else { |
| 8476 | set id [string tolower $sha1string] | |
| f3b8b3ce | 8477 | if {[regexp {^[0-9a-f]{4,39}$} $id]} { |
| d375ef9b | 8478 | set matches [longid $id] |
| f3b8b3ce PM |
8479 | if {$matches ne {}} { |
| 8480 | if {[llength $matches] > 1} { | |
| d990cedf | 8481 | error_popup [mc "Short SHA1 id %s is ambiguous" $id] |
| f3b8b3ce PM |
8482 | return |
| 8483 | } | |
| d375ef9b | 8484 | set id [lindex $matches 0] |
| f3b8b3ce | 8485 | } |
| 9bf3acfa TR |
8486 | } else { |
| 8487 | if {[catch {set id [exec git rev-parse --verify $sha1string]}]} { | |
| 8488 | error_popup [mc "Revision %s is not known" $sha1string] | |
| 8489 | return | |
| 8490 | } | |
| f3b8b3ce | 8491 | } |
| 887fe3c4 | 8492 | } |
| 7fcc92bf PM |
8493 | if {[commitinview $id $curview]} { |
| 8494 | selectline [rowofcommit $id] 1 | |
| 887fe3c4 PM |
8495 | return |
| 8496 | } | |
| f3b8b3ce | 8497 | if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} { |
| d990cedf | 8498 | set msg [mc "SHA1 id %s is not known" $sha1string] |
| 887fe3c4 | 8499 | } else { |
| 9bf3acfa | 8500 | set msg [mc "Revision %s is not in the current view" $sha1string] |
| 887fe3c4 | 8501 | } |
| d990cedf | 8502 | error_popup $msg |
| 887fe3c4 PM |
8503 | } |
| 8504 | ||
| 84ba7345 PM |
8505 | proc lineenter {x y id} { |
| 8506 | global hoverx hovery hoverid hovertimer | |
| 8507 | global commitinfo canv | |
| 8508 | ||
| 8ed16484 | 8509 | if {![info exists commitinfo($id)] && ![getcommit $id]} return |
| 84ba7345 PM |
8510 | set hoverx $x |
| 8511 | set hovery $y | |
| 8512 | set hoverid $id | |
| 8513 | if {[info exists hovertimer]} { | |
| 8514 | after cancel $hovertimer | |
| 8515 | } | |
| 8516 | set hovertimer [after 500 linehover] | |
| 8517 | $canv delete hover | |
| 8518 | } | |
| 8519 | ||
| 8520 | proc linemotion {x y id} { | |
| 8521 | global hoverx hovery hoverid hovertimer | |
| 8522 | ||
| 8523 | if {[info exists hoverid] && $id == $hoverid} { | |
| 8524 | set hoverx $x | |
| 8525 | set hovery $y | |
| 8526 | if {[info exists hovertimer]} { | |
| 8527 | after cancel $hovertimer | |
| 8528 | } | |
| 8529 | set hovertimer [after 500 linehover] | |
| 8530 | } | |
| 8531 | } | |
| 8532 | ||
| 8533 | proc lineleave {id} { | |
| 8534 | global hoverid hovertimer canv | |
| 8535 | ||
| 8536 | if {[info exists hoverid] && $id == $hoverid} { | |
| 8537 | $canv delete hover | |
| 8538 | if {[info exists hovertimer]} { | |
| 8539 | after cancel $hovertimer | |
| 8540 | unset hovertimer | |
| 8541 | } | |
| 8542 | unset hoverid | |
| 8543 | } | |
| 8544 | } | |
| 8545 | ||
| 8546 | proc linehover {} { | |
| 8547 | global hoverx hovery hoverid hovertimer | |
| 8548 | global canv linespc lthickness | |
| 252c52df GÖ |
8549 | global linehoverbgcolor linehoverfgcolor linehoveroutlinecolor |
| 8550 | ||
| 9c311b32 | 8551 | global commitinfo |
| 84ba7345 PM |
8552 | |
| 8553 | set text [lindex $commitinfo($hoverid) 0] | |
| 8554 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 8555 | if {$ymax == {}} return | |
| 8556 | set yfrac [lindex [$canv yview] 0] | |
| 8557 | set x [expr {$hoverx + 2 * $linespc}] | |
| 8558 | set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}] | |
| 8559 | set x0 [expr {$x - 2 * $lthickness}] | |
| 8560 | set y0 [expr {$y - 2 * $lthickness}] | |
| 9c311b32 | 8561 | set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}] |
| 84ba7345 PM |
8562 | set y1 [expr {$y + $linespc + 2 * $lthickness}] |
| 8563 | set t [$canv create rectangle $x0 $y0 $x1 $y1 \ | |
| 252c52df GÖ |
8564 | -fill $linehoverbgcolor -outline $linehoveroutlinecolor \ |
| 8565 | -width 1 -tags hover] | |
| 84ba7345 | 8566 | $canv raise $t |
| f8a2c0d1 | 8567 | set t [$canv create text $x $y -anchor nw -text $text -tags hover \ |
| 252c52df | 8568 | -font mainfont -fill $linehoverfgcolor] |
| 84ba7345 PM |
8569 | $canv raise $t |
| 8570 | } | |
| 8571 | ||
| 9843c307 | 8572 | proc clickisonarrow {id y} { |
| 50b44ece | 8573 | global lthickness |
| 9843c307 | 8574 | |
| 50b44ece | 8575 | set ranges [rowranges $id] |
| 9843c307 | 8576 | set thresh [expr {2 * $lthickness + 6}] |
| 50b44ece | 8577 | set n [expr {[llength $ranges] - 1}] |
| f6342480 | 8578 | for {set i 1} {$i < $n} {incr i} { |
| 50b44ece | 8579 | set row [lindex $ranges $i] |
| f6342480 PM |
8580 | if {abs([yc $row] - $y) < $thresh} { |
| 8581 | return $i | |
| 9843c307 PM |
8582 | } |
| 8583 | } | |
| 8584 | return {} | |
| 8585 | } | |
| 8586 | ||
| f6342480 | 8587 | proc arrowjump {id n y} { |
| 50b44ece | 8588 | global canv |
| 9843c307 | 8589 | |
| f6342480 PM |
8590 | # 1 <-> 2, 3 <-> 4, etc... |
| 8591 | set n [expr {(($n - 1) ^ 1) + 1}] | |
| 50b44ece | 8592 | set row [lindex [rowranges $id] $n] |
| f6342480 | 8593 | set yt [yc $row] |
| 9843c307 PM |
8594 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 8595 | if {$ymax eq {} || $ymax <= 0} return | |
| 8596 | set view [$canv yview] | |
| 8597 | set yspan [expr {[lindex $view 1] - [lindex $view 0]}] | |
| 8598 | set yfrac [expr {$yt / $ymax - $yspan / 2}] | |
| 8599 | if {$yfrac < 0} { | |
| 8600 | set yfrac 0 | |
| 8601 | } | |
| f6342480 | 8602 | allcanvs yview moveto $yfrac |
| 9843c307 PM |
8603 | } |
| 8604 | ||
| fa4da7b3 | 8605 | proc lineclick {x y id isnew} { |
| 7fcc92bf | 8606 | global ctext commitinfo children canv thickerline curview |
| c8dfbcf9 | 8607 | |
| 8ed16484 | 8608 | if {![info exists commitinfo($id)] && ![getcommit $id]} return |
| c8dfbcf9 | 8609 | unmarkmatches |
| fa4da7b3 | 8610 | unselectline |
| 9843c307 PM |
8611 | normalline |
| 8612 | $canv delete hover | |
| 8613 | # draw this line thicker than normal | |
| 9843c307 | 8614 | set thickerline $id |
| c934a8a3 | 8615 | drawlines $id |
| fa4da7b3 | 8616 | if {$isnew} { |
| 9843c307 PM |
8617 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 8618 | if {$ymax eq {}} return | |
| 8619 | set yfrac [lindex [$canv yview] 0] | |
| 8620 | set y [expr {$y + $yfrac * $ymax}] | |
| 8621 | } | |
| 8622 | set dirn [clickisonarrow $id $y] | |
| 8623 | if {$dirn ne {}} { | |
| 8624 | arrowjump $id $dirn $y | |
| 8625 | return | |
| 8626 | } | |
| 8627 | ||
| 8628 | if {$isnew} { | |
| 354af6bd | 8629 | addtohistory [list lineclick $x $y $id 0] savectextpos |
| fa4da7b3 | 8630 | } |
| c8dfbcf9 PM |
8631 | # fill the details pane with info about this line |
| 8632 | $ctext conf -state normal | |
| 3ea06f9f | 8633 | clear_ctext |
| 32f1b3e4 | 8634 | settabs 0 |
| d990cedf | 8635 | $ctext insert end "[mc "Parent"]:\t" |
| 97645683 PM |
8636 | $ctext insert end $id link0 |
| 8637 | setlink $id link0 | |
| c8dfbcf9 | 8638 | set info $commitinfo($id) |
| fa4da7b3 | 8639 | $ctext insert end "\n\t[lindex $info 0]\n" |
| d990cedf | 8640 | $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n" |
| 232475d3 | 8641 | set date [formatdate [lindex $info 2]] |
| d990cedf | 8642 | $ctext insert end "\t[mc "Date"]:\t$date\n" |
| da7c24dd | 8643 | set kids $children($curview,$id) |
| 79b2c75e | 8644 | if {$kids ne {}} { |
| d990cedf | 8645 | $ctext insert end "\n[mc "Children"]:" |
| fa4da7b3 | 8646 | set i 0 |
| 79b2c75e | 8647 | foreach child $kids { |
| fa4da7b3 | 8648 | incr i |
| 8ed16484 | 8649 | if {![info exists commitinfo($child)] && ![getcommit $child]} continue |
| c8dfbcf9 | 8650 | set info $commitinfo($child) |
| fa4da7b3 | 8651 | $ctext insert end "\n\t" |
| 97645683 PM |
8652 | $ctext insert end $child link$i |
| 8653 | setlink $child link$i | |
| fa4da7b3 | 8654 | $ctext insert end "\n\t[lindex $info 0]" |
| d990cedf | 8655 | $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]" |
| 232475d3 | 8656 | set date [formatdate [lindex $info 2]] |
| d990cedf | 8657 | $ctext insert end "\n\t[mc "Date"]:\t$date\n" |
| c8dfbcf9 PM |
8658 | } |
| 8659 | } | |
| 354af6bd | 8660 | maybe_scroll_ctext 1 |
| c8dfbcf9 | 8661 | $ctext conf -state disabled |
| 7fcceed7 | 8662 | init_flist {} |
| c8dfbcf9 PM |
8663 | } |
| 8664 | ||
| 9843c307 PM |
8665 | proc normalline {} { |
| 8666 | global thickerline | |
| 8667 | if {[info exists thickerline]} { | |
| c934a8a3 | 8668 | set id $thickerline |
| 9843c307 | 8669 | unset thickerline |
| c934a8a3 | 8670 | drawlines $id |
| 9843c307 PM |
8671 | } |
| 8672 | } | |
| 8673 | ||
| 354af6bd | 8674 | proc selbyid {id {isnew 1}} { |
| 7fcc92bf PM |
8675 | global curview |
| 8676 | if {[commitinview $id $curview]} { | |
| 354af6bd | 8677 | selectline [rowofcommit $id] $isnew |
| c8dfbcf9 PM |
8678 | } |
| 8679 | } | |
| 8680 | ||
| 8681 | proc mstime {} { | |
| 8682 | global startmstime | |
| 8683 | if {![info exists startmstime]} { | |
| 8684 | set startmstime [clock clicks -milliseconds] | |
| 8685 | } | |
| 8686 | return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]] | |
| 8687 | } | |
| 8688 | ||
| 8689 | proc rowmenu {x y id} { | |
| 7fcc92bf | 8690 | global rowctxmenu selectedline rowmenuid curview |
| b9fdba7f | 8691 | global nullid nullid2 fakerowmenu mainhead markedid |
| c8dfbcf9 | 8692 | |
| bb3edc8b | 8693 | stopfinding |
| 219ea3a9 | 8694 | set rowmenuid $id |
| 94b4a69f | 8695 | if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} { |
| c8dfbcf9 PM |
8696 | set state disabled |
| 8697 | } else { | |
| 8698 | set state normal | |
| 8699 | } | |
| 6febdede PM |
8700 | if {[info exists markedid] && $markedid ne $id} { |
| 8701 | set mstate normal | |
| 8702 | } else { | |
| 8703 | set mstate disabled | |
| 8704 | } | |
| 8f489363 | 8705 | if {$id ne $nullid && $id ne $nullid2} { |
| 219ea3a9 | 8706 | set menu $rowctxmenu |
| 5e3502da | 8707 | if {$mainhead ne {}} { |
| da12e59d | 8708 | $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead] -state normal |
| 5e3502da MB |
8709 | } else { |
| 8710 | $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled | |
| 8711 | } | |
| 6febdede PM |
8712 | $menu entryconfigure 9 -state $mstate |
| 8713 | $menu entryconfigure 10 -state $mstate | |
| 8714 | $menu entryconfigure 11 -state $mstate | |
| 219ea3a9 PM |
8715 | } else { |
| 8716 | set menu $fakerowmenu | |
| 8717 | } | |
| f2d0bbbd PM |
8718 | $menu entryconfigure [mca "Diff this -> selected"] -state $state |
| 8719 | $menu entryconfigure [mca "Diff selected -> this"] -state $state | |
| 8720 | $menu entryconfigure [mca "Make patch"] -state $state | |
| 6febdede PM |
8721 | $menu entryconfigure [mca "Diff this -> marked commit"] -state $mstate |
| 8722 | $menu entryconfigure [mca "Diff marked commit -> this"] -state $mstate | |
| 219ea3a9 | 8723 | tk_popup $menu $x $y |
| c8dfbcf9 PM |
8724 | } |
| 8725 | ||
| b9fdba7f PM |
8726 | proc markhere {} { |
| 8727 | global rowmenuid markedid canv | |
| 8728 | ||
| 8729 | set markedid $rowmenuid | |
| 8730 | make_idmark $markedid | |
| 8731 | } | |
| 8732 | ||
| 8733 | proc gotomark {} { | |
| 8734 | global markedid | |
| 8735 | ||
| 8736 | if {[info exists markedid]} { | |
| 8737 | selbyid $markedid | |
| 8738 | } | |
| 8739 | } | |
| 8740 | ||
| 8741 | proc replace_by_kids {l r} { | |
| 8742 | global curview children | |
| 8743 | ||
| 8744 | set id [commitonrow $r] | |
| 8745 | set l [lreplace $l 0 0] | |
| 8746 | foreach kid $children($curview,$id) { | |
| 8747 | lappend l [rowofcommit $kid] | |
| 8748 | } | |
| 8749 | return [lsort -integer -decreasing -unique $l] | |
| 8750 | } | |
| 8751 | ||
| 8752 | proc find_common_desc {} { | |
| 8753 | global markedid rowmenuid curview children | |
| 8754 | ||
| 8755 | if {![info exists markedid]} return | |
| 8756 | if {![commitinview $markedid $curview] || | |
| 8757 | ![commitinview $rowmenuid $curview]} return | |
| 8758 | #set t1 [clock clicks -milliseconds] | |
| 8759 | set l1 [list [rowofcommit $markedid]] | |
| 8760 | set l2 [list [rowofcommit $rowmenuid]] | |
| 8761 | while 1 { | |
| 8762 | set r1 [lindex $l1 0] | |
| 8763 | set r2 [lindex $l2 0] | |
| 8764 | if {$r1 eq {} || $r2 eq {}} break | |
| 8765 | if {$r1 == $r2} { | |
| 8766 | selectline $r1 1 | |
| 8767 | break | |
| 8768 | } | |
| 8769 | if {$r1 > $r2} { | |
| 8770 | set l1 [replace_by_kids $l1 $r1] | |
| 8771 | } else { | |
| 8772 | set l2 [replace_by_kids $l2 $r2] | |
| 8773 | } | |
| 8774 | } | |
| 8775 | #set t2 [clock clicks -milliseconds] | |
| 8776 | #puts "took [expr {$t2-$t1}]ms" | |
| 8777 | } | |
| 8778 | ||
| 010509f2 PM |
8779 | proc compare_commits {} { |
| 8780 | global markedid rowmenuid curview children | |
| 8781 | ||
| 8782 | if {![info exists markedid]} return | |
| 8783 | if {![commitinview $markedid $curview]} return | |
| 8784 | addtohistory [list do_cmp_commits $markedid $rowmenuid] | |
| 8785 | do_cmp_commits $markedid $rowmenuid | |
| 8786 | } | |
| 8787 | ||
| 8788 | proc getpatchid {id} { | |
| 8789 | global patchids | |
| 8790 | ||
| 8791 | if {![info exists patchids($id)]} { | |
| 6f63fc18 PM |
8792 | set cmd [diffcmd [list $id] {-p --root}] |
| 8793 | # trim off the initial "|" | |
| 8794 | set cmd [lrange $cmd 1 end] | |
| 8795 | if {[catch { | |
| 8796 | set x [eval exec $cmd | git patch-id] | |
| 8797 | set patchids($id) [lindex $x 0] | |
| 8798 | }]} { | |
| 8799 | set patchids($id) "error" | |
| 8800 | } | |
| 010509f2 PM |
8801 | } |
| 8802 | return $patchids($id) | |
| 8803 | } | |
| 8804 | ||
| 8805 | proc do_cmp_commits {a b} { | |
| 8806 | global ctext curview parents children patchids commitinfo | |
| 8807 | ||
| 8808 | $ctext conf -state normal | |
| 8809 | clear_ctext | |
| 8810 | init_flist {} | |
| 8811 | for {set i 0} {$i < 100} {incr i} { | |
| 010509f2 PM |
8812 | set skipa 0 |
| 8813 | set skipb 0 | |
| 8814 | if {[llength $parents($curview,$a)] > 1} { | |
| 6f63fc18 | 8815 | appendshortlink $a [mc "Skipping merge commit "] "\n" |
| 010509f2 PM |
8816 | set skipa 1 |
| 8817 | } else { | |
| 8818 | set patcha [getpatchid $a] | |
| 8819 | } | |
| 8820 | if {[llength $parents($curview,$b)] > 1} { | |
| 6f63fc18 | 8821 | appendshortlink $b [mc "Skipping merge commit "] "\n" |
| 010509f2 PM |
8822 | set skipb 1 |
| 8823 | } else { | |
| 8824 | set patchb [getpatchid $b] | |
| 8825 | } | |
| 8826 | if {!$skipa && !$skipb} { | |
| 8827 | set heada [lindex $commitinfo($a) 0] | |
| 8828 | set headb [lindex $commitinfo($b) 0] | |
| 6f63fc18 PM |
8829 | if {$patcha eq "error"} { |
| 8830 | appendshortlink $a [mc "Error getting patch ID for "] \ | |
| 8831 | [mc " - stopping\n"] | |
| 8832 | break | |
| 8833 | } | |
| 8834 | if {$patchb eq "error"} { | |
| 8835 | appendshortlink $b [mc "Error getting patch ID for "] \ | |
| 8836 | [mc " - stopping\n"] | |
| 8837 | break | |
| 8838 | } | |
| 010509f2 PM |
8839 | if {$patcha eq $patchb} { |
| 8840 | if {$heada eq $headb} { | |
| 6f63fc18 PM |
8841 | appendshortlink $a [mc "Commit "] |
| 8842 | appendshortlink $b " == " " $heada\n" | |
| 010509f2 | 8843 | } else { |
| 6f63fc18 PM |
8844 | appendshortlink $a [mc "Commit "] " $heada\n" |
| 8845 | appendshortlink $b [mc " is the same patch as\n "] \ | |
| 8846 | " $headb\n" | |
| 010509f2 PM |
8847 | } |
| 8848 | set skipa 1 | |
| 8849 | set skipb 1 | |
| 8850 | } else { | |
| 8851 | $ctext insert end "\n" | |
| 6f63fc18 PM |
8852 | appendshortlink $a [mc "Commit "] " $heada\n" |
| 8853 | appendshortlink $b [mc " differs from\n "] \ | |
| 8854 | " $headb\n" | |
| c21398be PM |
8855 | $ctext insert end [mc "Diff of commits:\n\n"] |
| 8856 | $ctext conf -state disabled | |
| 8857 | update | |
| 8858 | diffcommits $a $b | |
| 8859 | return | |
| 010509f2 PM |
8860 | } |
| 8861 | } | |
| 8862 | if {$skipa} { | |
| aa43561a PM |
8863 | set kids [real_children $curview,$a] |
| 8864 | if {[llength $kids] != 1} { | |
| 010509f2 | 8865 | $ctext insert end "\n" |
| 6f63fc18 | 8866 | appendshortlink $a [mc "Commit "] \ |
| aa43561a | 8867 | [mc " has %s children - stopping\n" [llength $kids]] |
| 010509f2 PM |
8868 | break |
| 8869 | } | |
| aa43561a | 8870 | set a [lindex $kids 0] |
| 010509f2 PM |
8871 | } |
| 8872 | if {$skipb} { | |
| aa43561a PM |
8873 | set kids [real_children $curview,$b] |
| 8874 | if {[llength $kids] != 1} { | |
| 6f63fc18 | 8875 | appendshortlink $b [mc "Commit "] \ |
| aa43561a | 8876 | [mc " has %s children - stopping\n" [llength $kids]] |
| 010509f2 PM |
8877 | break |
| 8878 | } | |
| aa43561a | 8879 | set b [lindex $kids 0] |
| 010509f2 PM |
8880 | } |
| 8881 | } | |
| 8882 | $ctext conf -state disabled | |
| 8883 | } | |
| 8884 | ||
| c21398be | 8885 | proc diffcommits {a b} { |
| a1d383c5 | 8886 | global diffcontext diffids blobdifffd diffinhdr currdiffsubmod |
| c21398be PM |
8887 | |
| 8888 | set tmpdir [gitknewtmpdir] | |
| 8889 | set fna [file join $tmpdir "commit-[string range $a 0 7]"] | |
| 8890 | set fnb [file join $tmpdir "commit-[string range $b 0 7]"] | |
| 8891 | if {[catch { | |
| 8892 | exec git diff-tree -p --pretty $a >$fna | |
| 8893 | exec git diff-tree -p --pretty $b >$fnb | |
| 8894 | } err]} { | |
| 8895 | error_popup [mc "Error writing commit to file: %s" $err] | |
| 8896 | return | |
| 8897 | } | |
| 8898 | if {[catch { | |
| 8899 | set fd [open "| diff -U$diffcontext $fna $fnb" r] | |
| 8900 | } err]} { | |
| 8901 | error_popup [mc "Error diffing commits: %s" $err] | |
| 8902 | return | |
| 8903 | } | |
| 8904 | set diffids [list commits $a $b] | |
| 8905 | set blobdifffd($diffids) $fd | |
| 8906 | set diffinhdr 0 | |
| a1d383c5 | 8907 | set currdiffsubmod "" |
| c21398be PM |
8908 | filerun $fd [list getblobdiffline $fd $diffids] |
| 8909 | } | |
| 8910 | ||
| c8dfbcf9 | 8911 | proc diffvssel {dirn} { |
| 7fcc92bf | 8912 | global rowmenuid selectedline |
| c8dfbcf9 | 8913 | |
| 94b4a69f | 8914 | if {$selectedline eq {}} return |
| c8dfbcf9 | 8915 | if {$dirn} { |
| 7fcc92bf | 8916 | set oldid [commitonrow $selectedline] |
| c8dfbcf9 PM |
8917 | set newid $rowmenuid |
| 8918 | } else { | |
| 8919 | set oldid $rowmenuid | |
| 7fcc92bf | 8920 | set newid [commitonrow $selectedline] |
| c8dfbcf9 | 8921 | } |
| 354af6bd | 8922 | addtohistory [list doseldiff $oldid $newid] savectextpos |
| fa4da7b3 PM |
8923 | doseldiff $oldid $newid |
| 8924 | } | |
| 8925 | ||
| 6febdede PM |
8926 | proc diffvsmark {dirn} { |
| 8927 | global rowmenuid markedid | |
| 8928 | ||
| 8929 | if {![info exists markedid]} return | |
| 8930 | if {$dirn} { | |
| 8931 | set oldid $markedid | |
| 8932 | set newid $rowmenuid | |
| 8933 | } else { | |
| 8934 | set oldid $rowmenuid | |
| 8935 | set newid $markedid | |
| 8936 | } | |
| 8937 | addtohistory [list doseldiff $oldid $newid] savectextpos | |
| 8938 | doseldiff $oldid $newid | |
| 8939 | } | |
| 8940 | ||
| fa4da7b3 | 8941 | proc doseldiff {oldid newid} { |
| 7fcceed7 | 8942 | global ctext |
| fa4da7b3 PM |
8943 | global commitinfo |
| 8944 | ||
| c8dfbcf9 | 8945 | $ctext conf -state normal |
| 3ea06f9f | 8946 | clear_ctext |
| d990cedf CS |
8947 | init_flist [mc "Top"] |
| 8948 | $ctext insert end "[mc "From"] " | |
| 97645683 PM |
8949 | $ctext insert end $oldid link0 |
| 8950 | setlink $oldid link0 | |
| fa4da7b3 | 8951 | $ctext insert end "\n " |
| c8dfbcf9 | 8952 | $ctext insert end [lindex $commitinfo($oldid) 0] |
| d990cedf | 8953 | $ctext insert end "\n\n[mc "To"] " |
| 97645683 PM |
8954 | $ctext insert end $newid link1 |
| 8955 | setlink $newid link1 | |
| fa4da7b3 | 8956 | $ctext insert end "\n " |
| c8dfbcf9 PM |
8957 | $ctext insert end [lindex $commitinfo($newid) 0] |
| 8958 | $ctext insert end "\n" | |
| 8959 | $ctext conf -state disabled | |
| c8dfbcf9 | 8960 | $ctext tag remove found 1.0 end |
| d327244a | 8961 | startdiff [list $oldid $newid] |
| c8dfbcf9 PM |
8962 | } |
| 8963 | ||
| 74daedb6 | 8964 | proc mkpatch {} { |
| d93f1713 | 8965 | global rowmenuid currentid commitinfo patchtop patchnum NS |
| 74daedb6 PM |
8966 | |
| 8967 | if {![info exists currentid]} return | |
| 8968 | set oldid $currentid | |
| 8969 | set oldhead [lindex $commitinfo($oldid) 0] | |
| 8970 | set newid $rowmenuid | |
| 8971 | set newhead [lindex $commitinfo($newid) 0] | |
| 8972 | set top .patch | |
| 8973 | set patchtop $top | |
| 8974 | catch {destroy $top} | |
| d93f1713 | 8975 | ttk_toplevel $top |
| e7d64008 | 8976 | make_transient $top . |
| d93f1713 | 8977 | ${NS}::label $top.title -text [mc "Generate patch"] |
| 4a2139f5 | 8978 | grid $top.title - -pady 10 |
| d93f1713 PT |
8979 | ${NS}::label $top.from -text [mc "From:"] |
| 8980 | ${NS}::entry $top.fromsha1 -width 40 | |
| 74daedb6 PM |
8981 | $top.fromsha1 insert 0 $oldid |
| 8982 | $top.fromsha1 conf -state readonly | |
| 8983 | grid $top.from $top.fromsha1 -sticky w | |
| d93f1713 | 8984 | ${NS}::entry $top.fromhead -width 60 |
| 74daedb6 PM |
8985 | $top.fromhead insert 0 $oldhead |
| 8986 | $top.fromhead conf -state readonly | |
| 8987 | grid x $top.fromhead -sticky w | |
| d93f1713 PT |
8988 | ${NS}::label $top.to -text [mc "To:"] |
| 8989 | ${NS}::entry $top.tosha1 -width 40 | |
| 74daedb6 PM |
8990 | $top.tosha1 insert 0 $newid |
| 8991 | $top.tosha1 conf -state readonly | |
| 8992 | grid $top.to $top.tosha1 -sticky w | |
| d93f1713 | 8993 | ${NS}::entry $top.tohead -width 60 |
| 74daedb6 PM |
8994 | $top.tohead insert 0 $newhead |
| 8995 | $top.tohead conf -state readonly | |
| 8996 | grid x $top.tohead -sticky w | |
| d93f1713 PT |
8997 | ${NS}::button $top.rev -text [mc "Reverse"] -command mkpatchrev |
| 8998 | grid $top.rev x -pady 10 -padx 5 | |
| 8999 | ${NS}::label $top.flab -text [mc "Output file:"] | |
| 9000 | ${NS}::entry $top.fname -width 60 | |
| 74daedb6 PM |
9001 | $top.fname insert 0 [file normalize "patch$patchnum.patch"] |
| 9002 | incr patchnum | |
| bdbfbe3d | 9003 | grid $top.flab $top.fname -sticky w |
| d93f1713 PT |
9004 | ${NS}::frame $top.buts |
| 9005 | ${NS}::button $top.buts.gen -text [mc "Generate"] -command mkpatchgo | |
| 9006 | ${NS}::button $top.buts.can -text [mc "Cancel"] -command mkpatchcan | |
| 76f15947 AG |
9007 | bind $top <Key-Return> mkpatchgo |
| 9008 | bind $top <Key-Escape> mkpatchcan | |
| 74daedb6 PM |
9009 | grid $top.buts.gen $top.buts.can |
| 9010 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 9011 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 9012 | grid $top.buts - -pady 10 -sticky ew | |
| bdbfbe3d | 9013 | focus $top.fname |
| 74daedb6 PM |
9014 | } |
| 9015 | ||
| 9016 | proc mkpatchrev {} { | |
| 9017 | global patchtop | |
| 9018 | ||
| 9019 | set oldid [$patchtop.fromsha1 get] | |
| 9020 | set oldhead [$patchtop.fromhead get] | |
| 9021 | set newid [$patchtop.tosha1 get] | |
| 9022 | set newhead [$patchtop.tohead get] | |
| 9023 | foreach e [list fromsha1 fromhead tosha1 tohead] \ | |
| 9024 | v [list $newid $newhead $oldid $oldhead] { | |
| 9025 | $patchtop.$e conf -state normal | |
| 9026 | $patchtop.$e delete 0 end | |
| 9027 | $patchtop.$e insert 0 $v | |
| 9028 | $patchtop.$e conf -state readonly | |
| 9029 | } | |
| 9030 | } | |
| 9031 | ||
| 9032 | proc mkpatchgo {} { | |
| 8f489363 | 9033 | global patchtop nullid nullid2 |
| 74daedb6 PM |
9034 | |
| 9035 | set oldid [$patchtop.fromsha1 get] | |
| 9036 | set newid [$patchtop.tosha1 get] | |
| 9037 | set fname [$patchtop.fname get] | |
| 8f489363 | 9038 | set cmd [diffcmd [list $oldid $newid] -p] |
| d372e216 PM |
9039 | # trim off the initial "|" |
| 9040 | set cmd [lrange $cmd 1 end] | |
| 219ea3a9 PM |
9041 | lappend cmd >$fname & |
| 9042 | if {[catch {eval exec $cmd} err]} { | |
| 84a76f18 | 9043 | error_popup "[mc "Error creating patch:"] $err" $patchtop |
| 74daedb6 PM |
9044 | } |
| 9045 | catch {destroy $patchtop} | |
| 9046 | unset patchtop | |
| 9047 | } | |
| 9048 | ||
| 9049 | proc mkpatchcan {} { | |
| 9050 | global patchtop | |
| 9051 | ||
| 9052 | catch {destroy $patchtop} | |
| 9053 | unset patchtop | |
| 9054 | } | |
| 9055 | ||
| bdbfbe3d | 9056 | proc mktag {} { |
| d93f1713 | 9057 | global rowmenuid mktagtop commitinfo NS |
| bdbfbe3d PM |
9058 | |
| 9059 | set top .maketag | |
| 9060 | set mktagtop $top | |
| 9061 | catch {destroy $top} | |
| d93f1713 | 9062 | ttk_toplevel $top |
| e7d64008 | 9063 | make_transient $top . |
| d93f1713 | 9064 | ${NS}::label $top.title -text [mc "Create tag"] |
| 4a2139f5 | 9065 | grid $top.title - -pady 10 |
| d93f1713 PT |
9066 | ${NS}::label $top.id -text [mc "ID:"] |
| 9067 | ${NS}::entry $top.sha1 -width 40 | |
| bdbfbe3d PM |
9068 | $top.sha1 insert 0 $rowmenuid |
| 9069 | $top.sha1 conf -state readonly | |
| 9070 | grid $top.id $top.sha1 -sticky w | |
| d93f1713 | 9071 | ${NS}::entry $top.head -width 60 |
| bdbfbe3d PM |
9072 | $top.head insert 0 [lindex $commitinfo($rowmenuid) 0] |
| 9073 | $top.head conf -state readonly | |
| 9074 | grid x $top.head -sticky w | |
| d93f1713 PT |
9075 | ${NS}::label $top.tlab -text [mc "Tag name:"] |
| 9076 | ${NS}::entry $top.tag -width 60 | |
| bdbfbe3d | 9077 | grid $top.tlab $top.tag -sticky w |
| dfb891e3 DD |
9078 | ${NS}::label $top.op -text [mc "Tag message is optional"] |
| 9079 | grid $top.op -columnspan 2 -sticky we | |
| 9080 | ${NS}::label $top.mlab -text [mc "Tag message:"] | |
| 9081 | ${NS}::entry $top.msg -width 60 | |
| 9082 | grid $top.mlab $top.msg -sticky w | |
| d93f1713 PT |
9083 | ${NS}::frame $top.buts |
| 9084 | ${NS}::button $top.buts.gen -text [mc "Create"] -command mktaggo | |
| 9085 | ${NS}::button $top.buts.can -text [mc "Cancel"] -command mktagcan | |
| 76f15947 AG |
9086 | bind $top <Key-Return> mktaggo |
| 9087 | bind $top <Key-Escape> mktagcan | |
| bdbfbe3d PM |
9088 | grid $top.buts.gen $top.buts.can |
| 9089 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 9090 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 9091 | grid $top.buts - -pady 10 -sticky ew | |
| 9092 | focus $top.tag | |
| 9093 | } | |
| 9094 | ||
| 9095 | proc domktag {} { | |
| 9096 | global mktagtop env tagids idtags | |
| bdbfbe3d PM |
9097 | |
| 9098 | set id [$mktagtop.sha1 get] | |
| 9099 | set tag [$mktagtop.tag get] | |
| dfb891e3 | 9100 | set msg [$mktagtop.msg get] |
| bdbfbe3d | 9101 | if {$tag == {}} { |
| 84a76f18 AG |
9102 | error_popup [mc "No tag name specified"] $mktagtop |
| 9103 | return 0 | |
| bdbfbe3d PM |
9104 | } |
| 9105 | if {[info exists tagids($tag)]} { | |
| 84a76f18 AG |
9106 | error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop |
| 9107 | return 0 | |
| bdbfbe3d PM |
9108 | } |
| 9109 | if {[catch { | |
| dfb891e3 DD |
9110 | if {$msg != {}} { |
| 9111 | exec git tag -a -m $msg $tag $id | |
| 9112 | } else { | |
| 9113 | exec git tag $tag $id | |
| 9114 | } | |
| bdbfbe3d | 9115 | } err]} { |
| 84a76f18 AG |
9116 | error_popup "[mc "Error creating tag:"] $err" $mktagtop |
| 9117 | return 0 | |
| bdbfbe3d PM |
9118 | } |
| 9119 | ||
| 9120 | set tagids($tag) $id | |
| 9121 | lappend idtags($id) $tag | |
| f1d83ba3 | 9122 | redrawtags $id |
| ceadfe90 | 9123 | addedtag $id |
| 887c996e PM |
9124 | dispneartags 0 |
| 9125 | run refill_reflist | |
| 84a76f18 | 9126 | return 1 |
| f1d83ba3 PM |
9127 | } |
| 9128 | ||
| 9129 | proc redrawtags {id} { | |
| b9fdba7f | 9130 | global canv linehtag idpos currentid curview cmitlisted markedid |
| c11ff120 | 9131 | global canvxmax iddrawn circleitem mainheadid circlecolors |
| 252c52df | 9132 | global mainheadcirclecolor |
| f1d83ba3 | 9133 | |
| 7fcc92bf | 9134 | if {![commitinview $id $curview]} return |
| 322a8cc9 | 9135 | if {![info exists iddrawn($id)]} return |
| fc2a256f | 9136 | set row [rowofcommit $id] |
| c11ff120 | 9137 | if {$id eq $mainheadid} { |
| 252c52df | 9138 | set ofill $mainheadcirclecolor |
| c11ff120 PM |
9139 | } else { |
| 9140 | set ofill [lindex $circlecolors $cmitlisted($curview,$id)] | |
| 9141 | } | |
| 9142 | $canv itemconf $circleitem($row) -fill $ofill | |
| bdbfbe3d PM |
9143 | $canv delete tag.$id |
| 9144 | set xt [eval drawtags $id $idpos($id)] | |
| 28593d3f PM |
9145 | $canv coords $linehtag($id) $xt [lindex $idpos($id) 2] |
| 9146 | set text [$canv itemcget $linehtag($id) -text] | |
| 9147 | set font [$canv itemcget $linehtag($id) -font] | |
| fc2a256f | 9148 | set xr [expr {$xt + [font measure $font $text]}] |
| b8ab2e17 PM |
9149 | if {$xr > $canvxmax} { |
| 9150 | set canvxmax $xr | |
| 9151 | setcanvscroll | |
| 9152 | } | |
| fc2a256f | 9153 | if {[info exists currentid] && $currentid == $id} { |
| 28593d3f | 9154 | make_secsel $id |
| bdbfbe3d | 9155 | } |
| b9fdba7f PM |
9156 | if {[info exists markedid] && $markedid eq $id} { |
| 9157 | make_idmark $id | |
| 9158 | } | |
| bdbfbe3d PM |
9159 | } |
| 9160 | ||
| 9161 | proc mktagcan {} { | |
| 9162 | global mktagtop | |
| 9163 | ||
| 9164 | catch {destroy $mktagtop} | |
| 9165 | unset mktagtop | |
| 9166 | } | |
| 9167 | ||
| 9168 | proc mktaggo {} { | |
| 84a76f18 | 9169 | if {![domktag]} return |
| bdbfbe3d PM |
9170 | mktagcan |
| 9171 | } | |
| 9172 | ||
| 4a2139f5 | 9173 | proc writecommit {} { |
| d93f1713 | 9174 | global rowmenuid wrcomtop commitinfo wrcomcmd NS |
| 4a2139f5 PM |
9175 | |
| 9176 | set top .writecommit | |
| 9177 | set wrcomtop $top | |
| 9178 | catch {destroy $top} | |
| d93f1713 | 9179 | ttk_toplevel $top |
| e7d64008 | 9180 | make_transient $top . |
| d93f1713 | 9181 | ${NS}::label $top.title -text [mc "Write commit to file"] |
| 4a2139f5 | 9182 | grid $top.title - -pady 10 |
| d93f1713 PT |
9183 | ${NS}::label $top.id -text [mc "ID:"] |
| 9184 | ${NS}::entry $top.sha1 -width 40 | |
| 4a2139f5 PM |
9185 | $top.sha1 insert 0 $rowmenuid |
| 9186 | $top.sha1 conf -state readonly | |
| 9187 | grid $top.id $top.sha1 -sticky w | |
| d93f1713 | 9188 | ${NS}::entry $top.head -width 60 |
| 4a2139f5 PM |
9189 | $top.head insert 0 [lindex $commitinfo($rowmenuid) 0] |
| 9190 | $top.head conf -state readonly | |
| 9191 | grid x $top.head -sticky w | |
| d93f1713 PT |
9192 | ${NS}::label $top.clab -text [mc "Command:"] |
| 9193 | ${NS}::entry $top.cmd -width 60 -textvariable wrcomcmd | |
| 4a2139f5 | 9194 | grid $top.clab $top.cmd -sticky w -pady 10 |
| d93f1713 PT |
9195 | ${NS}::label $top.flab -text [mc "Output file:"] |
| 9196 | ${NS}::entry $top.fname -width 60 | |
| 4a2139f5 PM |
9197 | $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"] |
| 9198 | grid $top.flab $top.fname -sticky w | |
| d93f1713 PT |
9199 | ${NS}::frame $top.buts |
| 9200 | ${NS}::button $top.buts.gen -text [mc "Write"] -command wrcomgo | |
| 9201 | ${NS}::button $top.buts.can -text [mc "Cancel"] -command wrcomcan | |
| 76f15947 AG |
9202 | bind $top <Key-Return> wrcomgo |
| 9203 | bind $top <Key-Escape> wrcomcan | |
| 4a2139f5 PM |
9204 | grid $top.buts.gen $top.buts.can |
| 9205 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 9206 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 9207 | grid $top.buts - -pady 10 -sticky ew | |
| 9208 | focus $top.fname | |
| 9209 | } | |
| 9210 | ||
| 9211 | proc wrcomgo {} { | |
| 9212 | global wrcomtop | |
| 9213 | ||
| 9214 | set id [$wrcomtop.sha1 get] | |
| 9215 | set cmd "echo $id | [$wrcomtop.cmd get]" | |
| 9216 | set fname [$wrcomtop.fname get] | |
| 9217 | if {[catch {exec sh -c $cmd >$fname &} err]} { | |
| 84a76f18 | 9218 | error_popup "[mc "Error writing commit:"] $err" $wrcomtop |
| 4a2139f5 PM |
9219 | } |
| 9220 | catch {destroy $wrcomtop} | |
| 9221 | unset wrcomtop | |
| 9222 | } | |
| 9223 | ||
| 9224 | proc wrcomcan {} { | |
| 9225 | global wrcomtop | |
| 9226 | ||
| 9227 | catch {destroy $wrcomtop} | |
| 9228 | unset wrcomtop | |
| 9229 | } | |
| 9230 | ||
| d6ac1a86 | 9231 | proc mkbranch {} { |
| d93f1713 | 9232 | global rowmenuid mkbrtop NS |
| d6ac1a86 PM |
9233 | |
| 9234 | set top .makebranch | |
| 9235 | catch {destroy $top} | |
| d93f1713 | 9236 | ttk_toplevel $top |
| e7d64008 | 9237 | make_transient $top . |
| d93f1713 | 9238 | ${NS}::label $top.title -text [mc "Create new branch"] |
| d6ac1a86 | 9239 | grid $top.title - -pady 10 |
| d93f1713 PT |
9240 | ${NS}::label $top.id -text [mc "ID:"] |
| 9241 | ${NS}::entry $top.sha1 -width 40 | |
| d6ac1a86 PM |
9242 | $top.sha1 insert 0 $rowmenuid |
| 9243 | $top.sha1 conf -state readonly | |
| 9244 | grid $top.id $top.sha1 -sticky w | |
| d93f1713 PT |
9245 | ${NS}::label $top.nlab -text [mc "Name:"] |
| 9246 | ${NS}::entry $top.name -width 40 | |
| d6ac1a86 | 9247 | grid $top.nlab $top.name -sticky w |
| d93f1713 PT |
9248 | ${NS}::frame $top.buts |
| 9249 | ${NS}::button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top] | |
| 9250 | ${NS}::button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}" | |
| 76f15947 AG |
9251 | bind $top <Key-Return> [list mkbrgo $top] |
| 9252 | bind $top <Key-Escape> "catch {destroy $top}" | |
| d6ac1a86 PM |
9253 | grid $top.buts.go $top.buts.can |
| 9254 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 9255 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 9256 | grid $top.buts - -pady 10 -sticky ew | |
| 9257 | focus $top.name | |
| 9258 | } | |
| 9259 | ||
| 9260 | proc mkbrgo {top} { | |
| 9261 | global headids idheads | |
| 9262 | ||
| 9263 | set name [$top.name get] | |
| 9264 | set id [$top.sha1 get] | |
| bee866fa AG |
9265 | set cmdargs {} |
| 9266 | set old_id {} | |
| d6ac1a86 | 9267 | if {$name eq {}} { |
| 84a76f18 | 9268 | error_popup [mc "Please specify a name for the new branch"] $top |
| d6ac1a86 PM |
9269 | return |
| 9270 | } | |
| bee866fa AG |
9271 | if {[info exists headids($name)]} { |
| 9272 | if {![confirm_popup [mc \ | |
| 84a76f18 | 9273 | "Branch '%s' already exists. Overwrite?" $name] $top]} { |
| bee866fa AG |
9274 | return |
| 9275 | } | |
| 9276 | set old_id $headids($name) | |
| 9277 | lappend cmdargs -f | |
| 9278 | } | |
| d6ac1a86 | 9279 | catch {destroy $top} |
| bee866fa | 9280 | lappend cmdargs $name $id |
| d6ac1a86 PM |
9281 | nowbusy newbranch |
| 9282 | update | |
| 9283 | if {[catch { | |
| bee866fa | 9284 | eval exec git branch $cmdargs |
| d6ac1a86 PM |
9285 | } err]} { |
| 9286 | notbusy newbranch | |
| 9287 | error_popup $err | |
| 9288 | } else { | |
| d6ac1a86 | 9289 | notbusy newbranch |
| bee866fa AG |
9290 | if {$old_id ne {}} { |
| 9291 | movehead $id $name | |
| 9292 | movedhead $id $name | |
| 9293 | redrawtags $old_id | |
| 9294 | redrawtags $id | |
| 9295 | } else { | |
| 9296 | set headids($name) $id | |
| 9297 | lappend idheads($id) $name | |
| 9298 | addedhead $id $name | |
| 9299 | redrawtags $id | |
| 9300 | } | |
| e11f1233 | 9301 | dispneartags 0 |
| 887c996e | 9302 | run refill_reflist |
| d6ac1a86 PM |
9303 | } |
| 9304 | } | |
| 9305 | ||
| 15e35055 AG |
9306 | proc exec_citool {tool_args {baseid {}}} { |
| 9307 | global commitinfo env | |
| 9308 | ||
| 9309 | set save_env [array get env GIT_AUTHOR_*] | |
| 9310 | ||
| 9311 | if {$baseid ne {}} { | |
| 9312 | if {![info exists commitinfo($baseid)]} { | |
| 9313 | getcommit $baseid | |
| 9314 | } | |
| 9315 | set author [lindex $commitinfo($baseid) 1] | |
| 9316 | set date [lindex $commitinfo($baseid) 2] | |
| 9317 | if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \ | |
| 9318 | $author author name email] | |
| 9319 | && $date ne {}} { | |
| 9320 | set env(GIT_AUTHOR_NAME) $name | |
| 9321 | set env(GIT_AUTHOR_EMAIL) $email | |
| 9322 | set env(GIT_AUTHOR_DATE) $date | |
| 9323 | } | |
| 9324 | } | |
| 9325 | ||
| 9326 | eval exec git citool $tool_args & | |
| 9327 | ||
| 9328 | array unset env GIT_AUTHOR_* | |
| 9329 | array set env $save_env | |
| 9330 | } | |
| 9331 | ||
| ca6d8f58 | 9332 | proc cherrypick {} { |
| 468bcaed | 9333 | global rowmenuid curview |
| b8a938cf | 9334 | global mainhead mainheadid |
| da616db5 | 9335 | global gitdir |
| ca6d8f58 | 9336 | |
| e11f1233 PM |
9337 | set oldhead [exec git rev-parse HEAD] |
| 9338 | set dheads [descheads $rowmenuid] | |
| 9339 | if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} { | |
| d990cedf CS |
9340 | set ok [confirm_popup [mc "Commit %s is already\ |
| 9341 | included in branch %s -- really re-apply it?" \ | |
| 9342 | [string range $rowmenuid 0 7] $mainhead]] | |
| ca6d8f58 PM |
9343 | if {!$ok} return |
| 9344 | } | |
| d990cedf | 9345 | nowbusy cherrypick [mc "Cherry-picking"] |
| ca6d8f58 | 9346 | update |
| ca6d8f58 PM |
9347 | # Unfortunately git-cherry-pick writes stuff to stderr even when |
| 9348 | # no error occurs, and exec takes that as an indication of error... | |
| 9349 | if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} { | |
| 9350 | notbusy cherrypick | |
| 15e35055 | 9351 | if {[regexp -line \ |
| 887a791f PM |
9352 | {Entry '(.*)' (would be overwritten by merge|not uptodate)} \ |
| 9353 | $err msg fname]} { | |
| 9354 | error_popup [mc "Cherry-pick failed because of local changes\ | |
| 9355 | to file '%s'.\nPlease commit, reset or stash\ | |
| 9356 | your changes and try again." $fname] | |
| 9357 | } elseif {[regexp -line \ | |
| b74307f6 | 9358 | {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \ |
| 887a791f PM |
9359 | $err]} { |
| 9360 | if {[confirm_popup [mc "Cherry-pick failed because of merge\ | |
| 9361 | conflict.\nDo you wish to run git citool to\ | |
| 9362 | resolve it?"]]} { | |
| 9363 | # Force citool to read MERGE_MSG | |
| da616db5 | 9364 | file delete [file join $gitdir "GITGUI_MSG"] |
| 887a791f PM |
9365 | exec_citool {} $rowmenuid |
| 9366 | } | |
| 15e35055 AG |
9367 | } else { |
| 9368 | error_popup $err | |
| 9369 | } | |
| 887a791f | 9370 | run updatecommits |
| ca6d8f58 PM |
9371 | return |
| 9372 | } | |
| 9373 | set newhead [exec git rev-parse HEAD] | |
| 9374 | if {$newhead eq $oldhead} { | |
| 9375 | notbusy cherrypick | |
| d990cedf | 9376 | error_popup [mc "No changes committed"] |
| ca6d8f58 PM |
9377 | return |
| 9378 | } | |
| e11f1233 | 9379 | addnewchild $newhead $oldhead |
| 7fcc92bf | 9380 | if {[commitinview $oldhead $curview]} { |
| cdc8429c | 9381 | # XXX this isn't right if we have a path limit... |
| 7fcc92bf | 9382 | insertrow $newhead $oldhead $curview |
| ca6d8f58 | 9383 | if {$mainhead ne {}} { |
| e11f1233 | 9384 | movehead $newhead $mainhead |
| ca6d8f58 PM |
9385 | movedhead $newhead $mainhead |
| 9386 | } | |
| c11ff120 | 9387 | set mainheadid $newhead |
| ca6d8f58 PM |
9388 | redrawtags $oldhead |
| 9389 | redrawtags $newhead | |
| 46308ea1 | 9390 | selbyid $newhead |
| ca6d8f58 PM |
9391 | } |
| 9392 | notbusy cherrypick | |
| 9393 | } | |
| 9394 | ||
| 8f3ff933 KF |
9395 | proc revert {} { |
| 9396 | global rowmenuid curview | |
| 9397 | global mainhead mainheadid | |
| 9398 | global gitdir | |
| 9399 | ||
| 9400 | set oldhead [exec git rev-parse HEAD] | |
| 9401 | set dheads [descheads $rowmenuid] | |
| 9402 | if { $dheads eq {} || [lsearch -exact $dheads $oldhead] == -1 } { | |
| 9403 | set ok [confirm_popup [mc "Commit %s is not\ | |
| 9404 | included in branch %s -- really revert it?" \ | |
| 9405 | [string range $rowmenuid 0 7] $mainhead]] | |
| 9406 | if {!$ok} return | |
| 9407 | } | |
| 9408 | nowbusy revert [mc "Reverting"] | |
| 9409 | update | |
| 9410 | ||
| 9411 | if [catch {exec git revert --no-edit $rowmenuid} err] { | |
| 9412 | notbusy revert | |
| 9413 | if [regexp {files would be overwritten by merge:(\n(( |\t)+[^\n]+\n)+)}\ | |
| 9414 | $err match files] { | |
| 9415 | regsub {\n( |\t)+} $files "\n" files | |
| 9416 | error_popup [mc "Revert failed because of local changes to\ | |
| 9417 | the following files:%s Please commit, reset or stash \ | |
| 9418 | your changes and try again." $files] | |
| 9419 | } elseif [regexp {error: could not revert} $err] { | |
| 9420 | if [confirm_popup [mc "Revert failed because of merge conflict.\n\ | |
| 9421 | Do you wish to run git citool to resolve it?"]] { | |
| 9422 | # Force citool to read MERGE_MSG | |
| 9423 | file delete [file join $gitdir "GITGUI_MSG"] | |
| 9424 | exec_citool {} $rowmenuid | |
| 9425 | } | |
| 9426 | } else { error_popup $err } | |
| 9427 | run updatecommits | |
| 9428 | return | |
| 9429 | } | |
| 9430 | ||
| 9431 | set newhead [exec git rev-parse HEAD] | |
| 9432 | if { $newhead eq $oldhead } { | |
| 9433 | notbusy revert | |
| 9434 | error_popup [mc "No changes committed"] | |
| 9435 | return | |
| 9436 | } | |
| 9437 | ||
| 9438 | addnewchild $newhead $oldhead | |
| 9439 | ||
| 9440 | if [commitinview $oldhead $curview] { | |
| 9441 | # XXX this isn't right if we have a path limit... | |
| 9442 | insertrow $newhead $oldhead $curview | |
| 9443 | if {$mainhead ne {}} { | |
| 9444 | movehead $newhead $mainhead | |
| 9445 | movedhead $newhead $mainhead | |
| 9446 | } | |
| 9447 | set mainheadid $newhead | |
| 9448 | redrawtags $oldhead | |
| 9449 | redrawtags $newhead | |
| 9450 | selbyid $newhead | |
| 9451 | } | |
| 9452 | ||
| 9453 | notbusy revert | |
| 9454 | } | |
| 9455 | ||
| 6fb735ae | 9456 | proc resethead {} { |
| d93f1713 | 9457 | global mainhead rowmenuid confirm_ok resettype NS |
| 6fb735ae PM |
9458 | |
| 9459 | set confirm_ok 0 | |
| 9460 | set w ".confirmreset" | |
| d93f1713 | 9461 | ttk_toplevel $w |
| e7d64008 | 9462 | make_transient $w . |
| d990cedf | 9463 | wm title $w [mc "Confirm reset"] |
| d93f1713 PT |
9464 | ${NS}::label $w.m -text \ |
| 9465 | [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] | |
| 6fb735ae | 9466 | pack $w.m -side top -fill x -padx 20 -pady 20 |
| d93f1713 | 9467 | ${NS}::labelframe $w.f -text [mc "Reset type:"] |
| 6fb735ae | 9468 | set resettype mixed |
| d93f1713 | 9469 | ${NS}::radiobutton $w.f.soft -value soft -variable resettype \ |
| d990cedf | 9470 | -text [mc "Soft: Leave working tree and index untouched"] |
| 6fb735ae | 9471 | grid $w.f.soft -sticky w |
| d93f1713 | 9472 | ${NS}::radiobutton $w.f.mixed -value mixed -variable resettype \ |
| d990cedf | 9473 | -text [mc "Mixed: Leave working tree untouched, reset index"] |
| 6fb735ae | 9474 | grid $w.f.mixed -sticky w |
| d93f1713 | 9475 | ${NS}::radiobutton $w.f.hard -value hard -variable resettype \ |
| d990cedf | 9476 | -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"] |
| 6fb735ae | 9477 | grid $w.f.hard -sticky w |
| d93f1713 PT |
9478 | pack $w.f -side top -fill x -padx 4 |
| 9479 | ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w" | |
| 6fb735ae | 9480 | pack $w.ok -side left -fill x -padx 20 -pady 20 |
| d93f1713 | 9481 | ${NS}::button $w.cancel -text [mc Cancel] -command "destroy $w" |
| 76f15947 | 9482 | bind $w <Key-Escape> [list destroy $w] |
| 6fb735ae PM |
9483 | pack $w.cancel -side right -fill x -padx 20 -pady 20 |
| 9484 | bind $w <Visibility> "grab $w; focus $w" | |
| 9485 | tkwait window $w | |
| 9486 | if {!$confirm_ok} return | |
| 706d6c3e | 9487 | if {[catch {set fd [open \ |
| 08ba820f | 9488 | [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} { |
| 6fb735ae PM |
9489 | error_popup $err |
| 9490 | } else { | |
| 706d6c3e | 9491 | dohidelocalchanges |
| a137a90f | 9492 | filerun $fd [list readresetstat $fd] |
| d990cedf | 9493 | nowbusy reset [mc "Resetting"] |
| 46308ea1 | 9494 | selbyid $rowmenuid |
| 706d6c3e PM |
9495 | } |
| 9496 | } | |
| 9497 | ||
| a137a90f PM |
9498 | proc readresetstat {fd} { |
| 9499 | global mainhead mainheadid showlocalchanges rprogcoord | |
| 706d6c3e PM |
9500 | |
| 9501 | if {[gets $fd line] >= 0} { | |
| 9502 | if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} { | |
| a137a90f PM |
9503 | set rprogcoord [expr {1.0 * $m / $n}] |
| 9504 | adjustprogress | |
| 706d6c3e PM |
9505 | } |
| 9506 | return 1 | |
| 9507 | } | |
| a137a90f PM |
9508 | set rprogcoord 0 |
| 9509 | adjustprogress | |
| 706d6c3e PM |
9510 | notbusy reset |
| 9511 | if {[catch {close $fd} err]} { | |
| 9512 | error_popup $err | |
| 9513 | } | |
| 9514 | set oldhead $mainheadid | |
| 9515 | set newhead [exec git rev-parse HEAD] | |
| 9516 | if {$newhead ne $oldhead} { | |
| 9517 | movehead $newhead $mainhead | |
| 9518 | movedhead $newhead $mainhead | |
| 9519 | set mainheadid $newhead | |
| 6fb735ae | 9520 | redrawtags $oldhead |
| 706d6c3e | 9521 | redrawtags $newhead |
| 6fb735ae PM |
9522 | } |
| 9523 | if {$showlocalchanges} { | |
| 9524 | doshowlocalchanges | |
| 9525 | } | |
| 706d6c3e | 9526 | return 0 |
| 6fb735ae PM |
9527 | } |
| 9528 | ||
| 10299152 PM |
9529 | # context menu for a head |
| 9530 | proc headmenu {x y id head} { | |
| 00609463 | 9531 | global headmenuid headmenuhead headctxmenu mainhead |
| 10299152 | 9532 | |
| bb3edc8b | 9533 | stopfinding |
| 10299152 PM |
9534 | set headmenuid $id |
| 9535 | set headmenuhead $head | |
| 00609463 | 9536 | set state normal |
| 70a5fc44 SC |
9537 | if {[string match "remotes/*" $head]} { |
| 9538 | set state disabled | |
| 9539 | } | |
| 00609463 PM |
9540 | if {$head eq $mainhead} { |
| 9541 | set state disabled | |
| 9542 | } | |
| 9543 | $headctxmenu entryconfigure 0 -state $state | |
| 9544 | $headctxmenu entryconfigure 1 -state $state | |
| 10299152 PM |
9545 | tk_popup $headctxmenu $x $y |
| 9546 | } | |
| 9547 | ||
| 9548 | proc cobranch {} { | |
| c11ff120 | 9549 | global headmenuid headmenuhead headids |
| cdc8429c | 9550 | global showlocalchanges |
| 10299152 PM |
9551 | |
| 9552 | # check the tree is clean first?? | |
| d990cedf | 9553 | nowbusy checkout [mc "Checking out"] |
| 10299152 | 9554 | update |
| 219ea3a9 | 9555 | dohidelocalchanges |
| 10299152 | 9556 | if {[catch { |
| 08ba820f | 9557 | set fd [open [list | git checkout $headmenuhead 2>@1] r] |
| 10299152 PM |
9558 | } err]} { |
| 9559 | notbusy checkout | |
| 9560 | error_popup $err | |
| 08ba820f PM |
9561 | if {$showlocalchanges} { |
| 9562 | dodiffindex | |
| 9563 | } | |
| 10299152 | 9564 | } else { |
| 08ba820f PM |
9565 | filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid] |
| 9566 | } | |
| 9567 | } | |
| 9568 | ||
| 9569 | proc readcheckoutstat {fd newhead newheadid} { | |
| 9570 | global mainhead mainheadid headids showlocalchanges progresscoords | |
| cdc8429c | 9571 | global viewmainheadid curview |
| 08ba820f PM |
9572 | |
| 9573 | if {[gets $fd line] >= 0} { | |
| 9574 | if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} { | |
| 9575 | set progresscoords [list 0 [expr {1.0 * $m / $n}]] | |
| 9576 | adjustprogress | |
| 10299152 | 9577 | } |
| 08ba820f PM |
9578 | return 1 |
| 9579 | } | |
| 9580 | set progresscoords {0 0} | |
| 9581 | adjustprogress | |
| 9582 | notbusy checkout | |
| 9583 | if {[catch {close $fd} err]} { | |
| 9584 | error_popup $err | |
| 9585 | } | |
| c11ff120 | 9586 | set oldmainid $mainheadid |
| 08ba820f PM |
9587 | set mainhead $newhead |
| 9588 | set mainheadid $newheadid | |
| cdc8429c | 9589 | set viewmainheadid($curview) $newheadid |
| c11ff120 | 9590 | redrawtags $oldmainid |
| 08ba820f PM |
9591 | redrawtags $newheadid |
| 9592 | selbyid $newheadid | |
| 6fb735ae PM |
9593 | if {$showlocalchanges} { |
| 9594 | dodiffindex | |
| 10299152 PM |
9595 | } |
| 9596 | } | |
| 9597 | ||
| 9598 | proc rmbranch {} { | |
| e11f1233 | 9599 | global headmenuid headmenuhead mainhead |
| b1054ac9 | 9600 | global idheads |
| 10299152 PM |
9601 | |
| 9602 | set head $headmenuhead | |
| 9603 | set id $headmenuid | |
| 00609463 | 9604 | # this check shouldn't be needed any more... |
| 10299152 | 9605 | if {$head eq $mainhead} { |
| d990cedf | 9606 | error_popup [mc "Cannot delete the currently checked-out branch"] |
| 10299152 PM |
9607 | return |
| 9608 | } | |
| e11f1233 | 9609 | set dheads [descheads $id] |
| d7b16113 | 9610 | if {[llength $dheads] == 1 && $idheads($dheads) eq $head} { |
| 10299152 | 9611 | # the stuff on this branch isn't on any other branch |
| d990cedf CS |
9612 | if {![confirm_popup [mc "The commits on branch %s aren't on any other\ |
| 9613 | branch.\nReally delete branch %s?" $head $head]]} return | |
| 10299152 PM |
9614 | } |
| 9615 | nowbusy rmbranch | |
| 9616 | update | |
| 9617 | if {[catch {exec git branch -D $head} err]} { | |
| 9618 | notbusy rmbranch | |
| 9619 | error_popup $err | |
| 9620 | return | |
| 9621 | } | |
| e11f1233 | 9622 | removehead $id $head |
| ca6d8f58 | 9623 | removedhead $id $head |
| 10299152 PM |
9624 | redrawtags $id |
| 9625 | notbusy rmbranch | |
| e11f1233 | 9626 | dispneartags 0 |
| 887c996e PM |
9627 | run refill_reflist |
| 9628 | } | |
| 9629 | ||
| 9630 | # Display a list of tags and heads | |
| 9631 | proc showrefs {} { | |
| d93f1713 | 9632 | global showrefstop bgcolor fgcolor selectbgcolor NS |
| 9c311b32 | 9633 | global bglist fglist reflistfilter reflist maincursor |
| 887c996e PM |
9634 | |
| 9635 | set top .showrefs | |
| 9636 | set showrefstop $top | |
| 9637 | if {[winfo exists $top]} { | |
| 9638 | raise $top | |
| 9639 | refill_reflist | |
| 9640 | return | |
| 9641 | } | |
| d93f1713 | 9642 | ttk_toplevel $top |
| d990cedf | 9643 | wm title $top [mc "Tags and heads: %s" [file tail [pwd]]] |
| e7d64008 | 9644 | make_transient $top . |
| 887c996e | 9645 | text $top.list -background $bgcolor -foreground $fgcolor \ |
| 9c311b32 | 9646 | -selectbackground $selectbgcolor -font mainfont \ |
| 887c996e PM |
9647 | -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \ |
| 9648 | -width 30 -height 20 -cursor $maincursor \ | |
| 9649 | -spacing1 1 -spacing3 1 -state disabled | |
| 9650 | $top.list tag configure highlight -background $selectbgcolor | |
| 9651 | lappend bglist $top.list | |
| 9652 | lappend fglist $top.list | |
| d93f1713 PT |
9653 | ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical |
| 9654 | ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal | |
| 887c996e PM |
9655 | grid $top.list $top.ysb -sticky nsew |
| 9656 | grid $top.xsb x -sticky ew | |
| d93f1713 PT |
9657 | ${NS}::frame $top.f |
| 9658 | ${NS}::label $top.f.l -text "[mc "Filter"]: " | |
| 9659 | ${NS}::entry $top.f.e -width 20 -textvariable reflistfilter | |
| 887c996e PM |
9660 | set reflistfilter "*" |
| 9661 | trace add variable reflistfilter write reflistfilter_change | |
| 9662 | pack $top.f.e -side right -fill x -expand 1 | |
| 9663 | pack $top.f.l -side left | |
| 9664 | grid $top.f - -sticky ew -pady 2 | |
| d93f1713 | 9665 | ${NS}::button $top.close -command [list destroy $top] -text [mc "Close"] |
| 76f15947 | 9666 | bind $top <Key-Escape> [list destroy $top] |
| 887c996e PM |
9667 | grid $top.close - |
| 9668 | grid columnconfigure $top 0 -weight 1 | |
| 9669 | grid rowconfigure $top 0 -weight 1 | |
| 9670 | bind $top.list <1> {break} | |
| 9671 | bind $top.list <B1-Motion> {break} | |
| 9672 | bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break} | |
| 9673 | set reflist {} | |
| 9674 | refill_reflist | |
| 9675 | } | |
| 9676 | ||
| 9677 | proc sel_reflist {w x y} { | |
| 9678 | global showrefstop reflist headids tagids otherrefids | |
| 9679 | ||
| 9680 | if {![winfo exists $showrefstop]} return | |
| 9681 | set l [lindex [split [$w index "@$x,$y"] "."] 0] | |
| 9682 | set ref [lindex $reflist [expr {$l-1}]] | |
| 9683 | set n [lindex $ref 0] | |
| 9684 | switch -- [lindex $ref 1] { | |
| 9685 | "H" {selbyid $headids($n)} | |
| 9686 | "T" {selbyid $tagids($n)} | |
| 9687 | "o" {selbyid $otherrefids($n)} | |
| 9688 | } | |
| 9689 | $showrefstop.list tag add highlight $l.0 "$l.0 lineend" | |
| 9690 | } | |
| 9691 | ||
| 9692 | proc unsel_reflist {} { | |
| 9693 | global showrefstop | |
| 9694 | ||
| 9695 | if {![info exists showrefstop] || ![winfo exists $showrefstop]} return | |
| 9696 | $showrefstop.list tag remove highlight 0.0 end | |
| 9697 | } | |
| 9698 | ||
| 9699 | proc reflistfilter_change {n1 n2 op} { | |
| 9700 | global reflistfilter | |
| 9701 | ||
| 9702 | after cancel refill_reflist | |
| 9703 | after 200 refill_reflist | |
| 9704 | } | |
| 9705 | ||
| 9706 | proc refill_reflist {} { | |
| 9707 | global reflist reflistfilter showrefstop headids tagids otherrefids | |
| d375ef9b | 9708 | global curview |
| 887c996e PM |
9709 | |
| 9710 | if {![info exists showrefstop] || ![winfo exists $showrefstop]} return | |
| 9711 | set refs {} | |
| 9712 | foreach n [array names headids] { | |
| 9713 | if {[string match $reflistfilter $n]} { | |
| 7fcc92bf | 9714 | if {[commitinview $headids($n) $curview]} { |
| 887c996e PM |
9715 | lappend refs [list $n H] |
| 9716 | } else { | |
| d375ef9b | 9717 | interestedin $headids($n) {run refill_reflist} |
| 887c996e PM |
9718 | } |
| 9719 | } | |
| 9720 | } | |
| 9721 | foreach n [array names tagids] { | |
| 9722 | if {[string match $reflistfilter $n]} { | |
| 7fcc92bf | 9723 | if {[commitinview $tagids($n) $curview]} { |
| 887c996e PM |
9724 | lappend refs [list $n T] |
| 9725 | } else { | |
| d375ef9b | 9726 | interestedin $tagids($n) {run refill_reflist} |
| 887c996e PM |
9727 | } |
| 9728 | } | |
| 9729 | } | |
| 9730 | foreach n [array names otherrefids] { | |
| 9731 | if {[string match $reflistfilter $n]} { | |
| 7fcc92bf | 9732 | if {[commitinview $otherrefids($n) $curview]} { |
| 887c996e PM |
9733 | lappend refs [list $n o] |
| 9734 | } else { | |
| d375ef9b | 9735 | interestedin $otherrefids($n) {run refill_reflist} |
| 887c996e PM |
9736 | } |
| 9737 | } | |
| 9738 | } | |
| 9739 | set refs [lsort -index 0 $refs] | |
| 9740 | if {$refs eq $reflist} return | |
| 9741 | ||
| 9742 | # Update the contents of $showrefstop.list according to the | |
| 9743 | # differences between $reflist (old) and $refs (new) | |
| 9744 | $showrefstop.list conf -state normal | |
| 9745 | $showrefstop.list insert end "\n" | |
| 9746 | set i 0 | |
| 9747 | set j 0 | |
| 9748 | while {$i < [llength $reflist] || $j < [llength $refs]} { | |
| 9749 | if {$i < [llength $reflist]} { | |
| 9750 | if {$j < [llength $refs]} { | |
| 9751 | set cmp [string compare [lindex $reflist $i 0] \ | |
| 9752 | [lindex $refs $j 0]] | |
| 9753 | if {$cmp == 0} { | |
| 9754 | set cmp [string compare [lindex $reflist $i 1] \ | |
| 9755 | [lindex $refs $j 1]] | |
| 9756 | } | |
| 9757 | } else { | |
| 9758 | set cmp -1 | |
| 9759 | } | |
| 9760 | } else { | |
| 9761 | set cmp 1 | |
| 9762 | } | |
| 9763 | switch -- $cmp { | |
| 9764 | -1 { | |
| 9765 | $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0" | |
| 9766 | incr i | |
| 9767 | } | |
| 9768 | 0 { | |
| 9769 | incr i | |
| 9770 | incr j | |
| 9771 | } | |
| 9772 | 1 { | |
| 9773 | set l [expr {$j + 1}] | |
| 9774 | $showrefstop.list image create $l.0 -align baseline \ | |
| 9775 | -image reficon-[lindex $refs $j 1] -padx 2 | |
| 9776 | $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n" | |
| 9777 | incr j | |
| 9778 | } | |
| 9779 | } | |
| 9780 | } | |
| 9781 | set reflist $refs | |
| 9782 | # delete last newline | |
| 9783 | $showrefstop.list delete end-2c end-1c | |
| 9784 | $showrefstop.list conf -state disabled | |
| 10299152 PM |
9785 | } |
| 9786 | ||
| b8ab2e17 PM |
9787 | # Stuff for finding nearby tags |
| 9788 | proc getallcommits {} { | |
| 5cd15b6b PM |
9789 | global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate |
| 9790 | global idheads idtags idotherrefs allparents tagobjid | |
| da616db5 | 9791 | global gitdir |
| f1d83ba3 | 9792 | |
| a69b2d1a | 9793 | if {![info exists allcommits]} { |
| a69b2d1a PM |
9794 | set nextarc 0 |
| 9795 | set allcommits 0 | |
| 9796 | set seeds {} | |
| 5cd15b6b PM |
9797 | set allcwait 0 |
| 9798 | set cachedarcs 0 | |
| da616db5 | 9799 | set allccache [file join $gitdir "gitk.cache"] |
| 5cd15b6b PM |
9800 | if {![catch { |
| 9801 | set f [open $allccache r] | |
| 9802 | set allcwait 1 | |
| 9803 | getcache $f | |
| 9804 | }]} return | |
| a69b2d1a | 9805 | } |
| 2d71bccc | 9806 | |
| 5cd15b6b PM |
9807 | if {$allcwait} { |
| 9808 | return | |
| 9809 | } | |
| 9810 | set cmd [list | git rev-list --parents] | |
| 9811 | set allcupdate [expr {$seeds ne {}}] | |
| 9812 | if {!$allcupdate} { | |
| 9813 | set ids "--all" | |
| 9814 | } else { | |
| 9815 | set refs [concat [array names idheads] [array names idtags] \ | |
| 9816 | [array names idotherrefs]] | |
| 9817 | set ids {} | |
| 9818 | set tagobjs {} | |
| 9819 | foreach name [array names tagobjid] { | |
| 9820 | lappend tagobjs $tagobjid($name) | |
| 9821 | } | |
| 9822 | foreach id [lsort -unique $refs] { | |
| 9823 | if {![info exists allparents($id)] && | |
| 9824 | [lsearch -exact $tagobjs $id] < 0} { | |
| 9825 | lappend ids $id | |
| 9826 | } | |
| 9827 | } | |
| 9828 | if {$ids ne {}} { | |
| 9829 | foreach id $seeds { | |
| 9830 | lappend ids "^$id" | |
| 9831 | } | |
| 9832 | } | |
| 9833 | } | |
| 9834 | if {$ids ne {}} { | |
| 9835 | set fd [open [concat $cmd $ids] r] | |
| 9836 | fconfigure $fd -blocking 0 | |
| 9837 | incr allcommits | |
| 9838 | nowbusy allcommits | |
| 9839 | filerun $fd [list getallclines $fd] | |
| 9840 | } else { | |
| 9841 | dispneartags 0 | |
| 2d71bccc | 9842 | } |
| e11f1233 PM |
9843 | } |
| 9844 | ||
| 9845 | # Since most commits have 1 parent and 1 child, we group strings of | |
| 9846 | # such commits into "arcs" joining branch/merge points (BMPs), which | |
| 9847 | # are commits that either don't have 1 parent or don't have 1 child. | |
| 9848 | # | |
| 9849 | # arcnos(id) - incoming arcs for BMP, arc we're on for other nodes | |
| 9850 | # arcout(id) - outgoing arcs for BMP | |
| 9851 | # arcids(a) - list of IDs on arc including end but not start | |
| 9852 | # arcstart(a) - BMP ID at start of arc | |
| 9853 | # arcend(a) - BMP ID at end of arc | |
| 9854 | # growing(a) - arc a is still growing | |
| 9855 | # arctags(a) - IDs out of arcids (excluding end) that have tags | |
| 9856 | # archeads(a) - IDs out of arcids (excluding end) that have heads | |
| 9857 | # The start of an arc is at the descendent end, so "incoming" means | |
| 9858 | # coming from descendents, and "outgoing" means going towards ancestors. | |
| 9859 | ||
| 9860 | proc getallclines {fd} { | |
| 5cd15b6b | 9861 | global allparents allchildren idtags idheads nextarc |
| e11f1233 | 9862 | global arcnos arcids arctags arcout arcend arcstart archeads growing |
| 5cd15b6b | 9863 | global seeds allcommits cachedarcs allcupdate |
| d93f1713 | 9864 | |
| e11f1233 | 9865 | set nid 0 |
| 7eb3cb9c | 9866 | while {[incr nid] <= 1000 && [gets $fd line] >= 0} { |
| e11f1233 PM |
9867 | set id [lindex $line 0] |
| 9868 | if {[info exists allparents($id)]} { | |
| 9869 | # seen it already | |
| 9870 | continue | |
| 9871 | } | |
| 5cd15b6b | 9872 | set cachedarcs 0 |
| e11f1233 PM |
9873 | set olds [lrange $line 1 end] |
| 9874 | set allparents($id) $olds | |
| 9875 | if {![info exists allchildren($id)]} { | |
| 9876 | set allchildren($id) {} | |
| 9877 | set arcnos($id) {} | |
| 9878 | lappend seeds $id | |
| 9879 | } else { | |
| 9880 | set a $arcnos($id) | |
| 9881 | if {[llength $olds] == 1 && [llength $a] == 1} { | |
| 9882 | lappend arcids($a) $id | |
| 9883 | if {[info exists idtags($id)]} { | |
| 9884 | lappend arctags($a) $id | |
| b8ab2e17 | 9885 | } |
| e11f1233 PM |
9886 | if {[info exists idheads($id)]} { |
| 9887 | lappend archeads($a) $id | |
| 9888 | } | |
| 9889 | if {[info exists allparents($olds)]} { | |
| 9890 | # seen parent already | |
| 9891 | if {![info exists arcout($olds)]} { | |
| 9892 | splitarc $olds | |
| 9893 | } | |
| 9894 | lappend arcids($a) $olds | |
| 9895 | set arcend($a) $olds | |
| 9896 | unset growing($a) | |
| 9897 | } | |
| 9898 | lappend allchildren($olds) $id | |
| 9899 | lappend arcnos($olds) $a | |
| 9900 | continue | |
| 9901 | } | |
| 9902 | } | |
| e11f1233 PM |
9903 | foreach a $arcnos($id) { |
| 9904 | lappend arcids($a) $id | |
| 9905 | set arcend($a) $id | |
| 9906 | unset growing($a) | |
| 9907 | } | |
| 9908 | ||
| 9909 | set ao {} | |
| 9910 | foreach p $olds { | |
| 9911 | lappend allchildren($p) $id | |
| 9912 | set a [incr nextarc] | |
| 9913 | set arcstart($a) $id | |
| 9914 | set archeads($a) {} | |
| 9915 | set arctags($a) {} | |
| 9916 | set archeads($a) {} | |
| 9917 | set arcids($a) {} | |
| 9918 | lappend ao $a | |
| 9919 | set growing($a) 1 | |
| 9920 | if {[info exists allparents($p)]} { | |
| 9921 | # seen it already, may need to make a new branch | |
| 9922 | if {![info exists arcout($p)]} { | |
| 9923 | splitarc $p | |
| 9924 | } | |
| 9925 | lappend arcids($a) $p | |
| 9926 | set arcend($a) $p | |
| 9927 | unset growing($a) | |
| 9928 | } | |
| 9929 | lappend arcnos($p) $a | |
| 9930 | } | |
| 9931 | set arcout($id) $ao | |
| f1d83ba3 | 9932 | } |
| f3326b66 PM |
9933 | if {$nid > 0} { |
| 9934 | global cached_dheads cached_dtags cached_atags | |
| 9935 | catch {unset cached_dheads} | |
| 9936 | catch {unset cached_dtags} | |
| 9937 | catch {unset cached_atags} | |
| 9938 | } | |
| 7eb3cb9c PM |
9939 | if {![eof $fd]} { |
| 9940 | return [expr {$nid >= 1000? 2: 1}] | |
| 9941 | } | |
| 5cd15b6b PM |
9942 | set cacheok 1 |
| 9943 | if {[catch { | |
| 9944 | fconfigure $fd -blocking 1 | |
| 9945 | close $fd | |
| 9946 | } err]} { | |
| 9947 | # got an error reading the list of commits | |
| 9948 | # if we were updating, try rereading the whole thing again | |
| 9949 | if {$allcupdate} { | |
| 9950 | incr allcommits -1 | |
| 9951 | dropcache $err | |
| 9952 | return | |
| 9953 | } | |
| d990cedf | 9954 | error_popup "[mc "Error reading commit topology information;\ |
| 5cd15b6b | 9955 | branch and preceding/following tag information\ |
| d990cedf | 9956 | will be incomplete."]\n($err)" |
| 5cd15b6b PM |
9957 | set cacheok 0 |
| 9958 | } | |
| e11f1233 PM |
9959 | if {[incr allcommits -1] == 0} { |
| 9960 | notbusy allcommits | |
| 5cd15b6b PM |
9961 | if {$cacheok} { |
| 9962 | run savecache | |
| 9963 | } | |
| e11f1233 PM |
9964 | } |
| 9965 | dispneartags 0 | |
| 7eb3cb9c | 9966 | return 0 |
| b8ab2e17 PM |
9967 | } |
| 9968 | ||
| e11f1233 PM |
9969 | proc recalcarc {a} { |
| 9970 | global arctags archeads arcids idtags idheads | |
| b8ab2e17 | 9971 | |
| e11f1233 PM |
9972 | set at {} |
| 9973 | set ah {} | |
| 9974 | foreach id [lrange $arcids($a) 0 end-1] { | |
| 9975 | if {[info exists idtags($id)]} { | |
| 9976 | lappend at $id | |
| 9977 | } | |
| 9978 | if {[info exists idheads($id)]} { | |
| 9979 | lappend ah $id | |
| b8ab2e17 | 9980 | } |
| f1d83ba3 | 9981 | } |
| e11f1233 PM |
9982 | set arctags($a) $at |
| 9983 | set archeads($a) $ah | |
| b8ab2e17 PM |
9984 | } |
| 9985 | ||
| e11f1233 | 9986 | proc splitarc {p} { |
| 5cd15b6b | 9987 | global arcnos arcids nextarc arctags archeads idtags idheads |
| e11f1233 | 9988 | global arcstart arcend arcout allparents growing |
| cec7bece | 9989 | |
| e11f1233 PM |
9990 | set a $arcnos($p) |
| 9991 | if {[llength $a] != 1} { | |
| 9992 | puts "oops splitarc called but [llength $a] arcs already" | |
| 9993 | return | |
| 9994 | } | |
| 9995 | set a [lindex $a 0] | |
| 9996 | set i [lsearch -exact $arcids($a) $p] | |
| 9997 | if {$i < 0} { | |
| 9998 | puts "oops splitarc $p not in arc $a" | |
| 9999 | return | |
| 10000 | } | |
| 10001 | set na [incr nextarc] | |
| 10002 | if {[info exists arcend($a)]} { | |
| 10003 | set arcend($na) $arcend($a) | |
| 10004 | } else { | |
| 10005 | set l [lindex $allparents([lindex $arcids($a) end]) 0] | |
| 10006 | set j [lsearch -exact $arcnos($l) $a] | |
| 10007 | set arcnos($l) [lreplace $arcnos($l) $j $j $na] | |
| 10008 | } | |
| 10009 | set tail [lrange $arcids($a) [expr {$i+1}] end] | |
| 10010 | set arcids($a) [lrange $arcids($a) 0 $i] | |
| 10011 | set arcend($a) $p | |
| 10012 | set arcstart($na) $p | |
| 10013 | set arcout($p) $na | |
| 10014 | set arcids($na) $tail | |
| 10015 | if {[info exists growing($a)]} { | |
| 10016 | set growing($na) 1 | |
| 10017 | unset growing($a) | |
| 10018 | } | |
| e11f1233 PM |
10019 | |
| 10020 | foreach id $tail { | |
| 10021 | if {[llength $arcnos($id)] == 1} { | |
| 10022 | set arcnos($id) $na | |
| cec7bece | 10023 | } else { |
| e11f1233 PM |
10024 | set j [lsearch -exact $arcnos($id) $a] |
| 10025 | set arcnos($id) [lreplace $arcnos($id) $j $j $na] | |
| cec7bece | 10026 | } |
| e11f1233 PM |
10027 | } |
| 10028 | ||
| 10029 | # reconstruct tags and heads lists | |
| 10030 | if {$arctags($a) ne {} || $archeads($a) ne {}} { | |
| 10031 | recalcarc $a | |
| 10032 | recalcarc $na | |
| 10033 | } else { | |
| 10034 | set arctags($na) {} | |
| 10035 | set archeads($na) {} | |
| 10036 | } | |
| 10037 | } | |
| 10038 | ||
| 10039 | # Update things for a new commit added that is a child of one | |
| 10040 | # existing commit. Used when cherry-picking. | |
| 10041 | proc addnewchild {id p} { | |
| 5cd15b6b | 10042 | global allparents allchildren idtags nextarc |
| e11f1233 | 10043 | global arcnos arcids arctags arcout arcend arcstart archeads growing |
| 719c2b9d | 10044 | global seeds allcommits |
| e11f1233 | 10045 | |
| 3ebba3c7 | 10046 | if {![info exists allcommits] || ![info exists arcnos($p)]} return |
| e11f1233 PM |
10047 | set allparents($id) [list $p] |
| 10048 | set allchildren($id) {} | |
| 10049 | set arcnos($id) {} | |
| 10050 | lappend seeds $id | |
| e11f1233 PM |
10051 | lappend allchildren($p) $id |
| 10052 | set a [incr nextarc] | |
| 10053 | set arcstart($a) $id | |
| 10054 | set archeads($a) {} | |
| 10055 | set arctags($a) {} | |
| 10056 | set arcids($a) [list $p] | |
| 10057 | set arcend($a) $p | |
| 10058 | if {![info exists arcout($p)]} { | |
| 10059 | splitarc $p | |
| 10060 | } | |
| 10061 | lappend arcnos($p) $a | |
| 10062 | set arcout($id) [list $a] | |
| 10063 | } | |
| 10064 | ||
| 5cd15b6b PM |
10065 | # This implements a cache for the topology information. |
| 10066 | # The cache saves, for each arc, the start and end of the arc, | |
| 10067 | # the ids on the arc, and the outgoing arcs from the end. | |
| 10068 | proc readcache {f} { | |
| 10069 | global arcnos arcids arcout arcstart arcend arctags archeads nextarc | |
| 10070 | global idtags idheads allparents cachedarcs possible_seeds seeds growing | |
| 10071 | global allcwait | |
| 10072 | ||
| 10073 | set a $nextarc | |
| 10074 | set lim $cachedarcs | |
| 10075 | if {$lim - $a > 500} { | |
| 10076 | set lim [expr {$a + 500}] | |
| 10077 | } | |
| 10078 | if {[catch { | |
| 10079 | if {$a == $lim} { | |
| 10080 | # finish reading the cache and setting up arctags, etc. | |
| 10081 | set line [gets $f] | |
| 10082 | if {$line ne "1"} {error "bad final version"} | |
| 10083 | close $f | |
| 10084 | foreach id [array names idtags] { | |
| 10085 | if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 && | |
| 10086 | [llength $allparents($id)] == 1} { | |
| 10087 | set a [lindex $arcnos($id) 0] | |
| 10088 | if {$arctags($a) eq {}} { | |
| 10089 | recalcarc $a | |
| 10090 | } | |
| 10091 | } | |
| 10092 | } | |
| 10093 | foreach id [array names idheads] { | |
| 10094 | if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 && | |
| 10095 | [llength $allparents($id)] == 1} { | |
| 10096 | set a [lindex $arcnos($id) 0] | |
| 10097 | if {$archeads($a) eq {}} { | |
| 10098 | recalcarc $a | |
| 10099 | } | |
| 10100 | } | |
| 10101 | } | |
| 10102 | foreach id [lsort -unique $possible_seeds] { | |
| 10103 | if {$arcnos($id) eq {}} { | |
| 10104 | lappend seeds $id | |
| 10105 | } | |
| 10106 | } | |
| 10107 | set allcwait 0 | |
| 10108 | } else { | |
| 10109 | while {[incr a] <= $lim} { | |
| 10110 | set line [gets $f] | |
| 10111 | if {[llength $line] != 3} {error "bad line"} | |
| 10112 | set s [lindex $line 0] | |
| 10113 | set arcstart($a) $s | |
| 10114 | lappend arcout($s) $a | |
| 10115 | if {![info exists arcnos($s)]} { | |
| 10116 | lappend possible_seeds $s | |
| 10117 | set arcnos($s) {} | |
| 10118 | } | |
| 10119 | set e [lindex $line 1] | |
| 10120 | if {$e eq {}} { | |
| 10121 | set growing($a) 1 | |
| 10122 | } else { | |
| 10123 | set arcend($a) $e | |
| 10124 | if {![info exists arcout($e)]} { | |
| 10125 | set arcout($e) {} | |
| 10126 | } | |
| 10127 | } | |
| 10128 | set arcids($a) [lindex $line 2] | |
| 10129 | foreach id $arcids($a) { | |
| 10130 | lappend allparents($s) $id | |
| 10131 | set s $id | |
| 10132 | lappend arcnos($id) $a | |
| 10133 | } | |
| 10134 | if {![info exists allparents($s)]} { | |
| 10135 | set allparents($s) {} | |
| 10136 | } | |
| 10137 | set arctags($a) {} | |
| 10138 | set archeads($a) {} | |
| 10139 | } | |
| 10140 | set nextarc [expr {$a - 1}] | |
| 10141 | } | |
| 10142 | } err]} { | |
| 10143 | dropcache $err | |
| 10144 | return 0 | |
| 10145 | } | |
| 10146 | if {!$allcwait} { | |
| 10147 | getallcommits | |
| 10148 | } | |
| 10149 | return $allcwait | |
| 10150 | } | |
| 10151 | ||
| 10152 | proc getcache {f} { | |
| 10153 | global nextarc cachedarcs possible_seeds | |
| 10154 | ||
| 10155 | if {[catch { | |
| 10156 | set line [gets $f] | |
| 10157 | if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"} | |
| 10158 | # make sure it's an integer | |
| 10159 | set cachedarcs [expr {int([lindex $line 1])}] | |
| 10160 | if {$cachedarcs < 0} {error "bad number of arcs"} | |
| 10161 | set nextarc 0 | |
| 10162 | set possible_seeds {} | |
| 10163 | run readcache $f | |
| 10164 | } err]} { | |
| 10165 | dropcache $err | |
| 10166 | } | |
| 10167 | return 0 | |
| 10168 | } | |
| 10169 | ||
| 10170 | proc dropcache {err} { | |
| 10171 | global allcwait nextarc cachedarcs seeds | |
| 10172 | ||
| 10173 | #puts "dropping cache ($err)" | |
| 10174 | foreach v {arcnos arcout arcids arcstart arcend growing \ | |
| 10175 | arctags archeads allparents allchildren} { | |
| 10176 | global $v | |
| 10177 | catch {unset $v} | |
| 10178 | } | |
| 10179 | set allcwait 0 | |
| 10180 | set nextarc 0 | |
| 10181 | set cachedarcs 0 | |
| 10182 | set seeds {} | |
| 10183 | getallcommits | |
| 10184 | } | |
| 10185 | ||
| 10186 | proc writecache {f} { | |
| 10187 | global cachearc cachedarcs allccache | |
| 10188 | global arcstart arcend arcnos arcids arcout | |
| 10189 | ||
| 10190 | set a $cachearc | |
| 10191 | set lim $cachedarcs | |
| 10192 | if {$lim - $a > 1000} { | |
| 10193 | set lim [expr {$a + 1000}] | |
| 10194 | } | |
| 10195 | if {[catch { | |
| 10196 | while {[incr a] <= $lim} { | |
| 10197 | if {[info exists arcend($a)]} { | |
| 10198 | puts $f [list $arcstart($a) $arcend($a) $arcids($a)] | |
| 10199 | } else { | |
| 10200 | puts $f [list $arcstart($a) {} $arcids($a)] | |
| 10201 | } | |
| 10202 | } | |
| 10203 | } err]} { | |
| 10204 | catch {close $f} | |
| 10205 | catch {file delete $allccache} | |
| 10206 | #puts "writing cache failed ($err)" | |
| 10207 | return 0 | |
| 10208 | } | |
| 10209 | set cachearc [expr {$a - 1}] | |
| 10210 | if {$a > $cachedarcs} { | |
| 10211 | puts $f "1" | |
| 10212 | close $f | |
| 10213 | return 0 | |
| 10214 | } | |
| 10215 | return 1 | |
| 10216 | } | |
| 10217 | ||
| 10218 | proc savecache {} { | |
| 10219 | global nextarc cachedarcs cachearc allccache | |
| 10220 | ||
| 10221 | if {$nextarc == $cachedarcs} return | |
| 10222 | set cachearc 0 | |
| 10223 | set cachedarcs $nextarc | |
| 10224 | catch { | |
| 10225 | set f [open $allccache w] | |
| 10226 | puts $f [list 1 $cachedarcs] | |
| 10227 | run writecache $f | |
| 10228 | } | |
| 10229 | } | |
| 10230 | ||
| e11f1233 PM |
10231 | # Returns 1 if a is an ancestor of b, -1 if b is an ancestor of a, |
| 10232 | # or 0 if neither is true. | |
| 10233 | proc anc_or_desc {a b} { | |
| 10234 | global arcout arcstart arcend arcnos cached_isanc | |
| 10235 | ||
| 10236 | if {$arcnos($a) eq $arcnos($b)} { | |
| 10237 | # Both are on the same arc(s); either both are the same BMP, | |
| 10238 | # or if one is not a BMP, the other is also not a BMP or is | |
| 10239 | # the BMP at end of the arc (and it only has 1 incoming arc). | |
| 69c0b5d2 PM |
10240 | # Or both can be BMPs with no incoming arcs. |
| 10241 | if {$a eq $b || $arcnos($a) eq {}} { | |
| e11f1233 | 10242 | return 0 |
| cec7bece | 10243 | } |
| e11f1233 PM |
10244 | # assert {[llength $arcnos($a)] == 1} |
| 10245 | set arc [lindex $arcnos($a) 0] | |
| 10246 | set i [lsearch -exact $arcids($arc) $a] | |
| 10247 | set j [lsearch -exact $arcids($arc) $b] | |
| 10248 | if {$i < 0 || $i > $j} { | |
| 10249 | return 1 | |
| 10250 | } else { | |
| 10251 | return -1 | |
| cec7bece PM |
10252 | } |
| 10253 | } | |
| e11f1233 PM |
10254 | |
| 10255 | if {![info exists arcout($a)]} { | |
| 10256 | set arc [lindex $arcnos($a) 0] | |
| 10257 | if {[info exists arcend($arc)]} { | |
| 10258 | set aend $arcend($arc) | |
| 10259 | } else { | |
| 10260 | set aend {} | |
| cec7bece | 10261 | } |
| e11f1233 PM |
10262 | set a $arcstart($arc) |
| 10263 | } else { | |
| 10264 | set aend $a | |
| 10265 | } | |
| 10266 | if {![info exists arcout($b)]} { | |
| 10267 | set arc [lindex $arcnos($b) 0] | |
| 10268 | if {[info exists arcend($arc)]} { | |
| 10269 | set bend $arcend($arc) | |
| 10270 | } else { | |
| 10271 | set bend {} | |
| cec7bece | 10272 | } |
| e11f1233 PM |
10273 | set b $arcstart($arc) |
| 10274 | } else { | |
| 10275 | set bend $b | |
| cec7bece | 10276 | } |
| e11f1233 PM |
10277 | if {$a eq $bend} { |
| 10278 | return 1 | |
| 10279 | } | |
| 10280 | if {$b eq $aend} { | |
| 10281 | return -1 | |
| 10282 | } | |
| 10283 | if {[info exists cached_isanc($a,$bend)]} { | |
| 10284 | if {$cached_isanc($a,$bend)} { | |
| 10285 | return 1 | |
| 10286 | } | |
| 10287 | } | |
| 10288 | if {[info exists cached_isanc($b,$aend)]} { | |
| 10289 | if {$cached_isanc($b,$aend)} { | |
| 10290 | return -1 | |
| 10291 | } | |
| 10292 | if {[info exists cached_isanc($a,$bend)]} { | |
| 10293 | return 0 | |
| 10294 | } | |
| cec7bece | 10295 | } |
| cec7bece | 10296 | |
| e11f1233 PM |
10297 | set todo [list $a $b] |
| 10298 | set anc($a) a | |
| 10299 | set anc($b) b | |
| 10300 | for {set i 0} {$i < [llength $todo]} {incr i} { | |
| 10301 | set x [lindex $todo $i] | |
| 10302 | if {$anc($x) eq {}} { | |
| 10303 | continue | |
| 10304 | } | |
| 10305 | foreach arc $arcnos($x) { | |
| 10306 | set xd $arcstart($arc) | |
| 10307 | if {$xd eq $bend} { | |
| 10308 | set cached_isanc($a,$bend) 1 | |
| 10309 | set cached_isanc($b,$aend) 0 | |
| 10310 | return 1 | |
| 10311 | } elseif {$xd eq $aend} { | |
| 10312 | set cached_isanc($b,$aend) 1 | |
| 10313 | set cached_isanc($a,$bend) 0 | |
| 10314 | return -1 | |
| 10315 | } | |
| 10316 | if {![info exists anc($xd)]} { | |
| 10317 | set anc($xd) $anc($x) | |
| 10318 | lappend todo $xd | |
| 10319 | } elseif {$anc($xd) ne $anc($x)} { | |
| 10320 | set anc($xd) {} | |
| 10321 | } | |
| 10322 | } | |
| 10323 | } | |
| 10324 | set cached_isanc($a,$bend) 0 | |
| 10325 | set cached_isanc($b,$aend) 0 | |
| 10326 | return 0 | |
| 10327 | } | |
| b8ab2e17 | 10328 | |
| e11f1233 PM |
10329 | # This identifies whether $desc has an ancestor that is |
| 10330 | # a growing tip of the graph and which is not an ancestor of $anc | |
| 10331 | # and returns 0 if so and 1 if not. | |
| 10332 | # If we subsequently discover a tag on such a growing tip, and that | |
| 10333 | # turns out to be a descendent of $anc (which it could, since we | |
| 10334 | # don't necessarily see children before parents), then $desc | |
| 10335 | # isn't a good choice to display as a descendent tag of | |
| 10336 | # $anc (since it is the descendent of another tag which is | |
| 10337 | # a descendent of $anc). Similarly, $anc isn't a good choice to | |
| 10338 | # display as a ancestor tag of $desc. | |
| 10339 | # | |
| 10340 | proc is_certain {desc anc} { | |
| 10341 | global arcnos arcout arcstart arcend growing problems | |
| 10342 | ||
| 10343 | set certain {} | |
| 10344 | if {[llength $arcnos($anc)] == 1} { | |
| 10345 | # tags on the same arc are certain | |
| 10346 | if {$arcnos($desc) eq $arcnos($anc)} { | |
| 10347 | return 1 | |
| b8ab2e17 | 10348 | } |
| e11f1233 PM |
10349 | if {![info exists arcout($anc)]} { |
| 10350 | # if $anc is partway along an arc, use the start of the arc instead | |
| 10351 | set a [lindex $arcnos($anc) 0] | |
| 10352 | set anc $arcstart($a) | |
| b8ab2e17 | 10353 | } |
| e11f1233 PM |
10354 | } |
| 10355 | if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} { | |
| 10356 | set x $desc | |
| 10357 | } else { | |
| 10358 | set a [lindex $arcnos($desc) 0] | |
| 10359 | set x $arcend($a) | |
| 10360 | } | |
| 10361 | if {$x == $anc} { | |
| 10362 | return 1 | |
| 10363 | } | |
| 10364 | set anclist [list $x] | |
| 10365 | set dl($x) 1 | |
| 10366 | set nnh 1 | |
| 10367 | set ngrowanc 0 | |
| 10368 | for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} { | |
| 10369 | set x [lindex $anclist $i] | |
| 10370 | if {$dl($x)} { | |
| 10371 | incr nnh -1 | |
| 10372 | } | |
| 10373 | set done($x) 1 | |
| 10374 | foreach a $arcout($x) { | |
| 10375 | if {[info exists growing($a)]} { | |
| 10376 | if {![info exists growanc($x)] && $dl($x)} { | |
| 10377 | set growanc($x) 1 | |
| 10378 | incr ngrowanc | |
| 10379 | } | |
| 10380 | } else { | |
| 10381 | set y $arcend($a) | |
| 10382 | if {[info exists dl($y)]} { | |
| 10383 | if {$dl($y)} { | |
| 10384 | if {!$dl($x)} { | |
| 10385 | set dl($y) 0 | |
| 10386 | if {![info exists done($y)]} { | |
| 10387 | incr nnh -1 | |
| 10388 | } | |
| 10389 | if {[info exists growanc($x)]} { | |
| 10390 | incr ngrowanc -1 | |
| 10391 | } | |
| 10392 | set xl [list $y] | |
| 10393 | for {set k 0} {$k < [llength $xl]} {incr k} { | |
| 10394 | set z [lindex $xl $k] | |
| 10395 | foreach c $arcout($z) { | |
| 10396 | if {[info exists arcend($c)]} { | |
| 10397 | set v $arcend($c) | |
| 10398 | if {[info exists dl($v)] && $dl($v)} { | |
| 10399 | set dl($v) 0 | |
| 10400 | if {![info exists done($v)]} { | |
| 10401 | incr nnh -1 | |
| 10402 | } | |
| 10403 | if {[info exists growanc($v)]} { | |
| 10404 | incr ngrowanc -1 | |
| 10405 | } | |
| 10406 | lappend xl $v | |
| 10407 | } | |
| 10408 | } | |
| 10409 | } | |
| 10410 | } | |
| 10411 | } | |
| 10412 | } | |
| 10413 | } elseif {$y eq $anc || !$dl($x)} { | |
| 10414 | set dl($y) 0 | |
| 10415 | lappend anclist $y | |
| 10416 | } else { | |
| 10417 | set dl($y) 1 | |
| 10418 | lappend anclist $y | |
| 10419 | incr nnh | |
| 10420 | } | |
| 10421 | } | |
| b8ab2e17 PM |
10422 | } |
| 10423 | } | |
| e11f1233 PM |
10424 | foreach x [array names growanc] { |
| 10425 | if {$dl($x)} { | |
| 10426 | return 0 | |
| b8ab2e17 | 10427 | } |
| 7eb3cb9c | 10428 | return 0 |
| b8ab2e17 | 10429 | } |
| e11f1233 | 10430 | return 1 |
| b8ab2e17 PM |
10431 | } |
| 10432 | ||
| e11f1233 PM |
10433 | proc validate_arctags {a} { |
| 10434 | global arctags idtags | |
| b8ab2e17 | 10435 | |
| e11f1233 PM |
10436 | set i -1 |
| 10437 | set na $arctags($a) | |
| 10438 | foreach id $arctags($a) { | |
| 10439 | incr i | |
| 10440 | if {![info exists idtags($id)]} { | |
| 10441 | set na [lreplace $na $i $i] | |
| 10442 | incr i -1 | |
| 10443 | } | |
| 10444 | } | |
| 10445 | set arctags($a) $na | |
| 10446 | } | |
| 10447 | ||
| 10448 | proc validate_archeads {a} { | |
| 10449 | global archeads idheads | |
| 10450 | ||
| 10451 | set i -1 | |
| 10452 | set na $archeads($a) | |
| 10453 | foreach id $archeads($a) { | |
| 10454 | incr i | |
| 10455 | if {![info exists idheads($id)]} { | |
| 10456 | set na [lreplace $na $i $i] | |
| 10457 | incr i -1 | |
| 10458 | } | |
| 10459 | } | |
| 10460 | set archeads($a) $na | |
| 10461 | } | |
| 10462 | ||
| 10463 | # Return the list of IDs that have tags that are descendents of id, | |
| 10464 | # ignoring IDs that are descendents of IDs already reported. | |
| 10465 | proc desctags {id} { | |
| 10466 | global arcnos arcstart arcids arctags idtags allparents | |
| 10467 | global growing cached_dtags | |
| 10468 | ||
| 10469 | if {![info exists allparents($id)]} { | |
| 10470 | return {} | |
| 10471 | } | |
| 10472 | set t1 [clock clicks -milliseconds] | |
| 10473 | set argid $id | |
| 10474 | if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} { | |
| 10475 | # part-way along an arc; check that arc first | |
| 10476 | set a [lindex $arcnos($id) 0] | |
| 10477 | if {$arctags($a) ne {}} { | |
| 10478 | validate_arctags $a | |
| 10479 | set i [lsearch -exact $arcids($a) $id] | |
| 10480 | set tid {} | |
| 10481 | foreach t $arctags($a) { | |
| 10482 | set j [lsearch -exact $arcids($a) $t] | |
| 10483 | if {$j >= $i} break | |
| 10484 | set tid $t | |
| b8ab2e17 | 10485 | } |
| e11f1233 PM |
10486 | if {$tid ne {}} { |
| 10487 | return $tid | |
| b8ab2e17 PM |
10488 | } |
| 10489 | } | |
| e11f1233 PM |
10490 | set id $arcstart($a) |
| 10491 | if {[info exists idtags($id)]} { | |
| 10492 | return $id | |
| 10493 | } | |
| 10494 | } | |
| 10495 | if {[info exists cached_dtags($id)]} { | |
| 10496 | return $cached_dtags($id) | |
| 10497 | } | |
| 10498 | ||
| 10499 | set origid $id | |
| 10500 | set todo [list $id] | |
| 10501 | set queued($id) 1 | |
| 10502 | set nc 1 | |
| 10503 | for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} { | |
| 10504 | set id [lindex $todo $i] | |
| 10505 | set done($id) 1 | |
| 10506 | set ta [info exists hastaggedancestor($id)] | |
| 10507 | if {!$ta} { | |
| 10508 | incr nc -1 | |
| 10509 | } | |
| 10510 | # ignore tags on starting node | |
| 10511 | if {!$ta && $i > 0} { | |
| 10512 | if {[info exists idtags($id)]} { | |
| 10513 | set tagloc($id) $id | |
| 10514 | set ta 1 | |
| 10515 | } elseif {[info exists cached_dtags($id)]} { | |
| 10516 | set tagloc($id) $cached_dtags($id) | |
| 10517 | set ta 1 | |
| 10518 | } | |
| 10519 | } | |
| 10520 | foreach a $arcnos($id) { | |
| 10521 | set d $arcstart($a) | |
| 10522 | if {!$ta && $arctags($a) ne {}} { | |
| 10523 | validate_arctags $a | |
| 10524 | if {$arctags($a) ne {}} { | |
| 10525 | lappend tagloc($id) [lindex $arctags($a) end] | |
| 10526 | } | |
| 10527 | } | |
| 10528 | if {$ta || $arctags($a) ne {}} { | |
| 10529 | set tomark [list $d] | |
| 10530 | for {set j 0} {$j < [llength $tomark]} {incr j} { | |
| 10531 | set dd [lindex $tomark $j] | |
| 10532 | if {![info exists hastaggedancestor($dd)]} { | |
| 10533 | if {[info exists done($dd)]} { | |
| 10534 | foreach b $arcnos($dd) { | |
| 10535 | lappend tomark $arcstart($b) | |
| 10536 | } | |
| 10537 | if {[info exists tagloc($dd)]} { | |
| 10538 | unset tagloc($dd) | |
| 10539 | } | |
| 10540 | } elseif {[info exists queued($dd)]} { | |
| 10541 | incr nc -1 | |
| 10542 | } | |
| 10543 | set hastaggedancestor($dd) 1 | |
| 10544 | } | |
| 10545 | } | |
| 10546 | } | |
| 10547 | if {![info exists queued($d)]} { | |
| 10548 | lappend todo $d | |
| 10549 | set queued($d) 1 | |
| 10550 | if {![info exists hastaggedancestor($d)]} { | |
| 10551 | incr nc | |
| 10552 | } | |
| 10553 | } | |
| b8ab2e17 | 10554 | } |
| f1d83ba3 | 10555 | } |
| e11f1233 PM |
10556 | set tags {} |
| 10557 | foreach id [array names tagloc] { | |
| 10558 | if {![info exists hastaggedancestor($id)]} { | |
| 10559 | foreach t $tagloc($id) { | |
| 10560 | if {[lsearch -exact $tags $t] < 0} { | |
| 10561 | lappend tags $t | |
| 10562 | } | |
| 10563 | } | |
| 10564 | } | |
| 10565 | } | |
| 10566 | set t2 [clock clicks -milliseconds] | |
| 10567 | set loopix $i | |
| f1d83ba3 | 10568 | |
| e11f1233 PM |
10569 | # remove tags that are descendents of other tags |
| 10570 | for {set i 0} {$i < [llength $tags]} {incr i} { | |
| 10571 | set a [lindex $tags $i] | |
| 10572 | for {set j 0} {$j < $i} {incr j} { | |
| 10573 | set b [lindex $tags $j] | |
| 10574 | set r [anc_or_desc $a $b] | |
| 10575 | if {$r == 1} { | |
| 10576 | set tags [lreplace $tags $j $j] | |
| 10577 | incr j -1 | |
| 10578 | incr i -1 | |
| 10579 | } elseif {$r == -1} { | |
| 10580 | set tags [lreplace $tags $i $i] | |
| 10581 | incr i -1 | |
| 10582 | break | |
| ceadfe90 PM |
10583 | } |
| 10584 | } | |
| 10585 | } | |
| 10586 | ||
| e11f1233 PM |
10587 | if {[array names growing] ne {}} { |
| 10588 | # graph isn't finished, need to check if any tag could get | |
| 10589 | # eclipsed by another tag coming later. Simply ignore any | |
| 10590 | # tags that could later get eclipsed. | |
| 10591 | set ctags {} | |
| 10592 | foreach t $tags { | |
| 10593 | if {[is_certain $t $origid]} { | |
| 10594 | lappend ctags $t | |
| 10595 | } | |
| ceadfe90 | 10596 | } |
| e11f1233 PM |
10597 | if {$tags eq $ctags} { |
| 10598 | set cached_dtags($origid) $tags | |
| 10599 | } else { | |
| 10600 | set tags $ctags | |
| ceadfe90 | 10601 | } |
| e11f1233 PM |
10602 | } else { |
| 10603 | set cached_dtags($origid) $tags | |
| 10604 | } | |
| 10605 | set t3 [clock clicks -milliseconds] | |
| 10606 | if {0 && $t3 - $t1 >= 100} { | |
| 10607 | puts "iterating descendents ($loopix/[llength $todo] nodes) took\ | |
| 10608 | [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left" | |
| ceadfe90 | 10609 | } |
| e11f1233 PM |
10610 | return $tags |
| 10611 | } | |
| ceadfe90 | 10612 | |
| e11f1233 PM |
10613 | proc anctags {id} { |
| 10614 | global arcnos arcids arcout arcend arctags idtags allparents | |
| 10615 | global growing cached_atags | |
| 10616 | ||
| 10617 | if {![info exists allparents($id)]} { | |
| 10618 | return {} | |
| 10619 | } | |
| 10620 | set t1 [clock clicks -milliseconds] | |
| 10621 | set argid $id | |
| 10622 | if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} { | |
| 10623 | # part-way along an arc; check that arc first | |
| 10624 | set a [lindex $arcnos($id) 0] | |
| 10625 | if {$arctags($a) ne {}} { | |
| 10626 | validate_arctags $a | |
| 10627 | set i [lsearch -exact $arcids($a) $id] | |
| 10628 | foreach t $arctags($a) { | |
| 10629 | set j [lsearch -exact $arcids($a) $t] | |
| 10630 | if {$j > $i} { | |
| 10631 | return $t | |
| 10632 | } | |
| 10633 | } | |
| ceadfe90 | 10634 | } |
| e11f1233 PM |
10635 | if {![info exists arcend($a)]} { |
| 10636 | return {} | |
| 10637 | } | |
| 10638 | set id $arcend($a) | |
| 10639 | if {[info exists idtags($id)]} { | |
| 10640 | return $id | |
| 10641 | } | |
| 10642 | } | |
| 10643 | if {[info exists cached_atags($id)]} { | |
| 10644 | return $cached_atags($id) | |
| 10645 | } | |
| 10646 | ||
| 10647 | set origid $id | |
| 10648 | set todo [list $id] | |
| 10649 | set queued($id) 1 | |
| 10650 | set taglist {} | |
| 10651 | set nc 1 | |
| 10652 | for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} { | |
| 10653 | set id [lindex $todo $i] | |
| 10654 | set done($id) 1 | |
| 10655 | set td [info exists hastaggeddescendent($id)] | |
| 10656 | if {!$td} { | |
| 10657 | incr nc -1 | |
| 10658 | } | |
| 10659 | # ignore tags on starting node | |
| 10660 | if {!$td && $i > 0} { | |
| 10661 | if {[info exists idtags($id)]} { | |
| 10662 | set tagloc($id) $id | |
| 10663 | set td 1 | |
| 10664 | } elseif {[info exists cached_atags($id)]} { | |
| 10665 | set tagloc($id) $cached_atags($id) | |
| 10666 | set td 1 | |
| 10667 | } | |
| 10668 | } | |
| 10669 | foreach a $arcout($id) { | |
| 10670 | if {!$td && $arctags($a) ne {}} { | |
| 10671 | validate_arctags $a | |
| 10672 | if {$arctags($a) ne {}} { | |
| 10673 | lappend tagloc($id) [lindex $arctags($a) 0] | |
| 10674 | } | |
| 10675 | } | |
| 10676 | if {![info exists arcend($a)]} continue | |
| 10677 | set d $arcend($a) | |
| 10678 | if {$td || $arctags($a) ne {}} { | |
| 10679 | set tomark [list $d] | |
| 10680 | for {set j 0} {$j < [llength $tomark]} {incr j} { | |
| 10681 | set dd [lindex $tomark $j] | |
| 10682 | if {![info exists hastaggeddescendent($dd)]} { | |
| 10683 | if {[info exists done($dd)]} { | |
| 10684 | foreach b $arcout($dd) { | |
| 10685 | if {[info exists arcend($b)]} { | |
| 10686 | lappend tomark $arcend($b) | |
| 10687 | } | |
| 10688 | } | |
| 10689 | if {[info exists tagloc($dd)]} { | |
| 10690 | unset tagloc($dd) | |
| 10691 | } | |
| 10692 | } elseif {[info exists queued($dd)]} { | |
| 10693 | incr nc -1 | |
| 10694 | } | |
| 10695 | set hastaggeddescendent($dd) 1 | |
| 10696 | } | |
| 10697 | } | |
| 10698 | } | |
| 10699 | if {![info exists queued($d)]} { | |
| 10700 | lappend todo $d | |
| 10701 | set queued($d) 1 | |
| 10702 | if {![info exists hastaggeddescendent($d)]} { | |
| 10703 | incr nc | |
| 10704 | } | |
| 10705 | } | |
| 10706 | } | |
| 10707 | } | |
| 10708 | set t2 [clock clicks -milliseconds] | |
| 10709 | set loopix $i | |
| 10710 | set tags {} | |
| 10711 | foreach id [array names tagloc] { | |
| 10712 | if {![info exists hastaggeddescendent($id)]} { | |
| 10713 | foreach t $tagloc($id) { | |
| 10714 | if {[lsearch -exact $tags $t] < 0} { | |
| 10715 | lappend tags $t | |
| 10716 | } | |
| 10717 | } | |
| ceadfe90 PM |
10718 | } |
| 10719 | } | |
| ceadfe90 | 10720 | |
| e11f1233 PM |
10721 | # remove tags that are ancestors of other tags |
| 10722 | for {set i 0} {$i < [llength $tags]} {incr i} { | |
| 10723 | set a [lindex $tags $i] | |
| 10724 | for {set j 0} {$j < $i} {incr j} { | |
| 10725 | set b [lindex $tags $j] | |
| 10726 | set r [anc_or_desc $a $b] | |
| 10727 | if {$r == -1} { | |
| 10728 | set tags [lreplace $tags $j $j] | |
| 10729 | incr j -1 | |
| 10730 | incr i -1 | |
| 10731 | } elseif {$r == 1} { | |
| 10732 | set tags [lreplace $tags $i $i] | |
| 10733 | incr i -1 | |
| 10734 | break | |
| 10735 | } | |
| 10736 | } | |
| 10737 | } | |
| 10738 | ||
| 10739 | if {[array names growing] ne {}} { | |
| 10740 | # graph isn't finished, need to check if any tag could get | |
| 10741 | # eclipsed by another tag coming later. Simply ignore any | |
| 10742 | # tags that could later get eclipsed. | |
| 10743 | set ctags {} | |
| 10744 | foreach t $tags { | |
| 10745 | if {[is_certain $origid $t]} { | |
| 10746 | lappend ctags $t | |
| 10747 | } | |
| 10748 | } | |
| 10749 | if {$tags eq $ctags} { | |
| 10750 | set cached_atags($origid) $tags | |
| 10751 | } else { | |
| 10752 | set tags $ctags | |
| d6ac1a86 | 10753 | } |
| e11f1233 PM |
10754 | } else { |
| 10755 | set cached_atags($origid) $tags | |
| 10756 | } | |
| 10757 | set t3 [clock clicks -milliseconds] | |
| 10758 | if {0 && $t3 - $t1 >= 100} { | |
| 10759 | puts "iterating ancestors ($loopix/[llength $todo] nodes) took\ | |
| 10760 | [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left" | |
| d6ac1a86 | 10761 | } |
| e11f1233 | 10762 | return $tags |
| d6ac1a86 PM |
10763 | } |
| 10764 | ||
| e11f1233 PM |
10765 | # Return the list of IDs that have heads that are descendents of id, |
| 10766 | # including id itself if it has a head. | |
| 10767 | proc descheads {id} { | |
| 10768 | global arcnos arcstart arcids archeads idheads cached_dheads | |
| d809fb17 | 10769 | global allparents arcout |
| ca6d8f58 | 10770 | |
| e11f1233 PM |
10771 | if {![info exists allparents($id)]} { |
| 10772 | return {} | |
| 10773 | } | |
| f3326b66 | 10774 | set aret {} |
| d809fb17 | 10775 | if {![info exists arcout($id)]} { |
| e11f1233 PM |
10776 | # part-way along an arc; check it first |
| 10777 | set a [lindex $arcnos($id) 0] | |
| 10778 | if {$archeads($a) ne {}} { | |
| 10779 | validate_archeads $a | |
| 10780 | set i [lsearch -exact $arcids($a) $id] | |
| 10781 | foreach t $archeads($a) { | |
| 10782 | set j [lsearch -exact $arcids($a) $t] | |
| 10783 | if {$j > $i} break | |
| f3326b66 | 10784 | lappend aret $t |
| e11f1233 | 10785 | } |
| ca6d8f58 | 10786 | } |
| e11f1233 | 10787 | set id $arcstart($a) |
| ca6d8f58 | 10788 | } |
| e11f1233 PM |
10789 | set origid $id |
| 10790 | set todo [list $id] | |
| 10791 | set seen($id) 1 | |
| f3326b66 | 10792 | set ret {} |
| e11f1233 PM |
10793 | for {set i 0} {$i < [llength $todo]} {incr i} { |
| 10794 | set id [lindex $todo $i] | |
| 10795 | if {[info exists cached_dheads($id)]} { | |
| 10796 | set ret [concat $ret $cached_dheads($id)] | |
| 10797 | } else { | |
| 10798 | if {[info exists idheads($id)]} { | |
| 10799 | lappend ret $id | |
| 10800 | } | |
| 10801 | foreach a $arcnos($id) { | |
| 10802 | if {$archeads($a) ne {}} { | |
| 706d6c3e PM |
10803 | validate_archeads $a |
| 10804 | if {$archeads($a) ne {}} { | |
| 10805 | set ret [concat $ret $archeads($a)] | |
| 10806 | } | |
| e11f1233 PM |
10807 | } |
| 10808 | set d $arcstart($a) | |
| 10809 | if {![info exists seen($d)]} { | |
| 10810 | lappend todo $d | |
| 10811 | set seen($d) 1 | |
| 10812 | } | |
| 10813 | } | |
| 10299152 | 10814 | } |
| 10299152 | 10815 | } |
| e11f1233 PM |
10816 | set ret [lsort -unique $ret] |
| 10817 | set cached_dheads($origid) $ret | |
| f3326b66 | 10818 | return [concat $ret $aret] |
| 10299152 PM |
10819 | } |
| 10820 | ||
| e11f1233 PM |
10821 | proc addedtag {id} { |
| 10822 | global arcnos arcout cached_dtags cached_atags | |
| ca6d8f58 | 10823 | |
| e11f1233 PM |
10824 | if {![info exists arcnos($id)]} return |
| 10825 | if {![info exists arcout($id)]} { | |
| 10826 | recalcarc [lindex $arcnos($id) 0] | |
| ca6d8f58 | 10827 | } |
| e11f1233 PM |
10828 | catch {unset cached_dtags} |
| 10829 | catch {unset cached_atags} | |
| ca6d8f58 PM |
10830 | } |
| 10831 | ||
| e11f1233 PM |
10832 | proc addedhead {hid head} { |
| 10833 | global arcnos arcout cached_dheads | |
| 10834 | ||
| 10835 | if {![info exists arcnos($hid)]} return | |
| 10836 | if {![info exists arcout($hid)]} { | |
| 10837 | recalcarc [lindex $arcnos($hid) 0] | |
| 10838 | } | |
| 10839 | catch {unset cached_dheads} | |
| 10840 | } | |
| 10841 | ||
| 10842 | proc removedhead {hid head} { | |
| 10843 | global cached_dheads | |
| 10844 | ||
| 10845 | catch {unset cached_dheads} | |
| 10846 | } | |
| 10847 | ||
| 10848 | proc movedhead {hid head} { | |
| 10849 | global arcnos arcout cached_dheads | |
| cec7bece | 10850 | |
| e11f1233 PM |
10851 | if {![info exists arcnos($hid)]} return |
| 10852 | if {![info exists arcout($hid)]} { | |
| 10853 | recalcarc [lindex $arcnos($hid) 0] | |
| cec7bece | 10854 | } |
| e11f1233 PM |
10855 | catch {unset cached_dheads} |
| 10856 | } | |
| 10857 | ||
| 10858 | proc changedrefs {} { | |
| 587277fe | 10859 | global cached_dheads cached_dtags cached_atags cached_tagcontent |
| e11f1233 PM |
10860 | global arctags archeads arcnos arcout idheads idtags |
| 10861 | ||
| 10862 | foreach id [concat [array names idheads] [array names idtags]] { | |
| 10863 | if {[info exists arcnos($id)] && ![info exists arcout($id)]} { | |
| 10864 | set a [lindex $arcnos($id) 0] | |
| 10865 | if {![info exists donearc($a)]} { | |
| 10866 | recalcarc $a | |
| 10867 | set donearc($a) 1 | |
| 10868 | } | |
| cec7bece PM |
10869 | } |
| 10870 | } | |
| 587277fe | 10871 | catch {unset cached_tagcontent} |
| e11f1233 PM |
10872 | catch {unset cached_dtags} |
| 10873 | catch {unset cached_atags} | |
| 10874 | catch {unset cached_dheads} | |
| cec7bece PM |
10875 | } |
| 10876 | ||
| f1d83ba3 | 10877 | proc rereadrefs {} { |
| fc2a256f | 10878 | global idtags idheads idotherrefs mainheadid |
| f1d83ba3 PM |
10879 | |
| 10880 | set refids [concat [array names idtags] \ | |
| 10881 | [array names idheads] [array names idotherrefs]] | |
| 10882 | foreach id $refids { | |
| 10883 | if {![info exists ref($id)]} { | |
| 10884 | set ref($id) [listrefs $id] | |
| 10885 | } | |
| 10886 | } | |
| fc2a256f | 10887 | set oldmainhead $mainheadid |
| f1d83ba3 | 10888 | readrefs |
| cec7bece | 10889 | changedrefs |
| f1d83ba3 PM |
10890 | set refids [lsort -unique [concat $refids [array names idtags] \ |
| 10891 | [array names idheads] [array names idotherrefs]]] | |
| 10892 | foreach id $refids { | |
| 10893 | set v [listrefs $id] | |
| c11ff120 | 10894 | if {![info exists ref($id)] || $ref($id) != $v} { |
| f1d83ba3 PM |
10895 | redrawtags $id |
| 10896 | } | |
| 10897 | } | |
| c11ff120 PM |
10898 | if {$oldmainhead ne $mainheadid} { |
| 10899 | redrawtags $oldmainhead | |
| 10900 | redrawtags $mainheadid | |
| 10901 | } | |
| 887c996e | 10902 | run refill_reflist |
| f1d83ba3 PM |
10903 | } |
| 10904 | ||
| 2e1ded44 JH |
10905 | proc listrefs {id} { |
| 10906 | global idtags idheads idotherrefs | |
| 10907 | ||
| 10908 | set x {} | |
| 10909 | if {[info exists idtags($id)]} { | |
| 10910 | set x $idtags($id) | |
| 10911 | } | |
| 10912 | set y {} | |
| 10913 | if {[info exists idheads($id)]} { | |
| 10914 | set y $idheads($id) | |
| 10915 | } | |
| 10916 | set z {} | |
| 10917 | if {[info exists idotherrefs($id)]} { | |
| 10918 | set z $idotherrefs($id) | |
| 10919 | } | |
| 10920 | return [list $x $y $z] | |
| 10921 | } | |
| 10922 | ||
| 4399fe33 PM |
10923 | proc add_tag_ctext {tag} { |
| 10924 | global ctext cached_tagcontent tagids | |
| 10925 | ||
| 10926 | if {![info exists cached_tagcontent($tag)]} { | |
| 10927 | catch { | |
| 10928 | set cached_tagcontent($tag) [exec git cat-file -p $tag] | |
| 10929 | } | |
| 10930 | } | |
| 10931 | $ctext insert end "[mc "Tag"]: $tag\n" bold | |
| 10932 | if {[info exists cached_tagcontent($tag)]} { | |
| 10933 | set text $cached_tagcontent($tag) | |
| 10934 | } else { | |
| 10935 | set text "[mc "Id"]: $tagids($tag)" | |
| 10936 | } | |
| 10937 | appendwithlinks $text {} | |
| 10938 | } | |
| 10939 | ||
| 106288cb | 10940 | proc showtag {tag isnew} { |
| 587277fe | 10941 | global ctext cached_tagcontent tagids linknum tagobjid |
| 106288cb PM |
10942 | |
| 10943 | if {$isnew} { | |
| 354af6bd | 10944 | addtohistory [list showtag $tag 0] savectextpos |
| 106288cb PM |
10945 | } |
| 10946 | $ctext conf -state normal | |
| 3ea06f9f | 10947 | clear_ctext |
| 32f1b3e4 | 10948 | settabs 0 |
| 106288cb | 10949 | set linknum 0 |
| 4399fe33 PM |
10950 | add_tag_ctext $tag |
| 10951 | maybe_scroll_ctext 1 | |
| 10952 | $ctext conf -state disabled | |
| 10953 | init_flist {} | |
| 10954 | } | |
| 10955 | ||
| 10956 | proc showtags {id isnew} { | |
| 10957 | global idtags ctext linknum | |
| 10958 | ||
| 10959 | if {$isnew} { | |
| 10960 | addtohistory [list showtags $id 0] savectextpos | |
| 62d3ea65 | 10961 | } |
| 4399fe33 PM |
10962 | $ctext conf -state normal |
| 10963 | clear_ctext | |
| 10964 | settabs 0 | |
| 10965 | set linknum 0 | |
| 10966 | set sep {} | |
| 10967 | foreach tag $idtags($id) { | |
| 10968 | $ctext insert end $sep | |
| 10969 | add_tag_ctext $tag | |
| 10970 | set sep "\n\n" | |
| 106288cb | 10971 | } |
| a80e82f6 | 10972 | maybe_scroll_ctext 1 |
| 106288cb | 10973 | $ctext conf -state disabled |
| 7fcceed7 | 10974 | init_flist {} |
| 106288cb PM |
10975 | } |
| 10976 | ||
| 1d10f36d PM |
10977 | proc doquit {} { |
| 10978 | global stopped | |
| 314f5de1 TA |
10979 | global gitktmpdir |
| 10980 | ||
| 1d10f36d | 10981 | set stopped 100 |
| b6047c5a | 10982 | savestuff . |
| 1d10f36d | 10983 | destroy . |
| 314f5de1 TA |
10984 | |
| 10985 | if {[info exists gitktmpdir]} { | |
| 10986 | catch {file delete -force $gitktmpdir} | |
| 10987 | } | |
| 1d10f36d | 10988 | } |
| 1db95b00 | 10989 | |
| 9a7558f3 | 10990 | proc mkfontdisp {font top which} { |
| d93f1713 | 10991 | global fontattr fontpref $font NS use_ttk |
| 9a7558f3 PM |
10992 | |
| 10993 | set fontpref($font) [set $font] | |
| d93f1713 | 10994 | ${NS}::button $top.${font}but -text $which \ |
| 9a7558f3 | 10995 | -command [list choosefont $font $which] |
| d93f1713 | 10996 | ${NS}::label $top.$font -relief flat -font $font \ |
| 9a7558f3 PM |
10997 | -text $fontattr($font,family) -justify left |
| 10998 | grid x $top.${font}but $top.$font -sticky w | |
| 10999 | } | |
| 11000 | ||
| 11001 | proc choosefont {font which} { | |
| 11002 | global fontparam fontlist fonttop fontattr | |
| d93f1713 | 11003 | global prefstop NS |
| 9a7558f3 PM |
11004 | |
| 11005 | set fontparam(which) $which | |
| 11006 | set fontparam(font) $font | |
| 11007 | set fontparam(family) [font actual $font -family] | |
| 11008 | set fontparam(size) $fontattr($font,size) | |
| 11009 | set fontparam(weight) $fontattr($font,weight) | |
| 11010 | set fontparam(slant) $fontattr($font,slant) | |
| 11011 | set top .gitkfont | |
| 11012 | set fonttop $top | |
| 11013 | if {![winfo exists $top]} { | |
| 11014 | font create sample | |
| 11015 | eval font config sample [font actual $font] | |
| d93f1713 | 11016 | ttk_toplevel $top |
| e7d64008 | 11017 | make_transient $top $prefstop |
| d990cedf | 11018 | wm title $top [mc "Gitk font chooser"] |
| d93f1713 | 11019 | ${NS}::label $top.l -textvariable fontparam(which) |
| 9a7558f3 PM |
11020 | pack $top.l -side top |
| 11021 | set fontlist [lsort [font families]] | |
| d93f1713 | 11022 | ${NS}::frame $top.f |
| 9a7558f3 PM |
11023 | listbox $top.f.fam -listvariable fontlist \ |
| 11024 | -yscrollcommand [list $top.f.sb set] | |
| 11025 | bind $top.f.fam <<ListboxSelect>> selfontfam | |
| d93f1713 | 11026 | ${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview] |
| 9a7558f3 PM |
11027 | pack $top.f.sb -side right -fill y |
| 11028 | pack $top.f.fam -side left -fill both -expand 1 | |
| 11029 | pack $top.f -side top -fill both -expand 1 | |
| d93f1713 | 11030 | ${NS}::frame $top.g |
| 9a7558f3 PM |
11031 | spinbox $top.g.size -from 4 -to 40 -width 4 \ |
| 11032 | -textvariable fontparam(size) \ | |
| 11033 | -validatecommand {string is integer -strict %s} | |
| 11034 | checkbutton $top.g.bold -padx 5 \ | |
| d990cedf | 11035 | -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \ |
| 9a7558f3 PM |
11036 | -variable fontparam(weight) -onvalue bold -offvalue normal |
| 11037 | checkbutton $top.g.ital -padx 5 \ | |
| d990cedf | 11038 | -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0 \ |
| 9a7558f3 PM |
11039 | -variable fontparam(slant) -onvalue italic -offvalue roman |
| 11040 | pack $top.g.size $top.g.bold $top.g.ital -side left | |
| 11041 | pack $top.g -side top | |
| 11042 | canvas $top.c -width 150 -height 50 -border 2 -relief sunk \ | |
| 11043 | -background white | |
| 11044 | $top.c create text 100 25 -anchor center -text $which -font sample \ | |
| 11045 | -fill black -tags text | |
| 11046 | bind $top.c <Configure> [list centertext $top.c] | |
| 11047 | pack $top.c -side top -fill x | |
| d93f1713 PT |
11048 | ${NS}::frame $top.buts |
| 11049 | ${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active | |
| 11050 | ${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal | |
| 76f15947 AG |
11051 | bind $top <Key-Return> fontok |
| 11052 | bind $top <Key-Escape> fontcan | |
| 9a7558f3 PM |
11053 | grid $top.buts.ok $top.buts.can |
| 11054 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 11055 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 11056 | pack $top.buts -side bottom -fill x | |
| 11057 | trace add variable fontparam write chg_fontparam | |
| 11058 | } else { | |
| 11059 | raise $top | |
| 11060 | $top.c itemconf text -text $which | |
| 11061 | } | |
| 11062 | set i [lsearch -exact $fontlist $fontparam(family)] | |
| 11063 | if {$i >= 0} { | |
| 11064 | $top.f.fam selection set $i | |
| 11065 | $top.f.fam see $i | |
| 11066 | } | |
| 11067 | } | |
| 11068 | ||
| 11069 | proc centertext {w} { | |
| 11070 | $w coords text [expr {[winfo width $w] / 2}] [expr {[winfo height $w] / 2}] | |
| 11071 | } | |
| 11072 | ||
| 11073 | proc fontok {} { | |
| 11074 | global fontparam fontpref prefstop | |
| 11075 | ||
| 11076 | set f $fontparam(font) | |
| 11077 | set fontpref($f) [list $fontparam(family) $fontparam(size)] | |
| 11078 | if {$fontparam(weight) eq "bold"} { | |
| 11079 | lappend fontpref($f) "bold" | |
| 11080 | } | |
| 11081 | if {$fontparam(slant) eq "italic"} { | |
| 11082 | lappend fontpref($f) "italic" | |
| 11083 | } | |
| 39ddf99c | 11084 | set w $prefstop.notebook.fonts.$f |
| 9a7558f3 | 11085 | $w conf -text $fontparam(family) -font $fontpref($f) |
| d93f1713 | 11086 | |
| 9a7558f3 PM |
11087 | fontcan |
| 11088 | } | |
| 11089 | ||
| 11090 | proc fontcan {} { | |
| 11091 | global fonttop fontparam | |
| 11092 | ||
| 11093 | if {[info exists fonttop]} { | |
| 11094 | catch {destroy $fonttop} | |
| 11095 | catch {font delete sample} | |
| 11096 | unset fonttop | |
| 11097 | unset fontparam | |
| 11098 | } | |
| 11099 | } | |
| 11100 | ||
| d93f1713 PT |
11101 | if {[package vsatisfies [package provide Tk] 8.6]} { |
| 11102 | # In Tk 8.6 we have a native font chooser dialog. Overwrite the above | |
| 11103 | # function to make use of it. | |
| 11104 | proc choosefont {font which} { | |
| 11105 | tk fontchooser configure -title $which -font $font \ | |
| 11106 | -command [list on_choosefont $font $which] | |
| 11107 | tk fontchooser show | |
| 11108 | } | |
| 11109 | proc on_choosefont {font which newfont} { | |
| 11110 | global fontparam | |
| 11111 | puts stderr "$font $newfont" | |
| 11112 | array set f [font actual $newfont] | |
| 11113 | set fontparam(which) $which | |
| 11114 | set fontparam(font) $font | |
| 11115 | set fontparam(family) $f(-family) | |
| 11116 | set fontparam(size) $f(-size) | |
| 11117 | set fontparam(weight) $f(-weight) | |
| 11118 | set fontparam(slant) $f(-slant) | |
| 11119 | fontok | |
| 11120 | } | |
| 11121 | } | |
| 11122 | ||
| 9a7558f3 PM |
11123 | proc selfontfam {} { |
| 11124 | global fonttop fontparam | |
| 11125 | ||
| 11126 | set i [$fonttop.f.fam curselection] | |
| 11127 | if {$i ne {}} { | |
| 11128 | set fontparam(family) [$fonttop.f.fam get $i] | |
| 11129 | } | |
| 11130 | } | |
| 11131 | ||
| 11132 | proc chg_fontparam {v sub op} { | |
| 11133 | global fontparam | |
| 11134 | ||
| 11135 | font config sample -$sub $fontparam($sub) | |
| 11136 | } | |
| 11137 | ||
| 44acce0b PT |
11138 | # Create a property sheet tab page |
| 11139 | proc create_prefs_page {w} { | |
| 11140 | global NS | |
| 11141 | set parent [join [lrange [split $w .] 0 end-1] .] | |
| 11142 | if {[winfo class $parent] eq "TNotebook"} { | |
| 11143 | ${NS}::frame $w | |
| 11144 | } else { | |
| 11145 | ${NS}::labelframe $w | |
| 11146 | } | |
| 11147 | } | |
| 11148 | ||
| 11149 | proc prefspage_general {notebook} { | |
| 11150 | global NS maxwidth maxgraphpct showneartags showlocalchanges | |
| 11151 | global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs | |
| d34835c9 | 11152 | global hideremotes want_ttk have_ttk maxrefs |
| 44acce0b PT |
11153 | |
| 11154 | set page [create_prefs_page $notebook.general] | |
| 11155 | ||
| 11156 | ${NS}::label $page.ldisp -text [mc "Commit list display options"] | |
| 11157 | grid $page.ldisp - -sticky w -pady 10 | |
| 11158 | ${NS}::label $page.spacer -text " " | |
| 11159 | ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"] | |
| 11160 | spinbox $page.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth | |
| 11161 | grid $page.spacer $page.maxwidthl $page.maxwidth -sticky w | |
| 11162 | ${NS}::label $page.maxpctl -text [mc "Maximum graph width (% of pane)"] | |
| 11163 | spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct | |
| 11164 | grid x $page.maxpctl $page.maxpct -sticky w | |
| 11165 | ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \ | |
| 11166 | -variable showlocalchanges | |
| 11167 | grid x $page.showlocal -sticky w | |
| 11168 | ${NS}::checkbutton $page.autoselect -text [mc "Auto-select SHA1 (length)"] \ | |
| 11169 | -variable autoselect | |
| 11170 | spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen | |
| 11171 | grid x $page.autoselect $page.autosellen -sticky w | |
| 11172 | ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \ | |
| 11173 | -variable hideremotes | |
| 11174 | grid x $page.hideremotes -sticky w | |
| 11175 | ||
| 11176 | ${NS}::label $page.ddisp -text [mc "Diff display options"] | |
| 11177 | grid $page.ddisp - -sticky w -pady 10 | |
| 11178 | ${NS}::label $page.tabstopl -text [mc "Tab spacing"] | |
| 11179 | spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop | |
| 11180 | grid x $page.tabstopl $page.tabstop -sticky w | |
| d34835c9 | 11181 | ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \ |
| 44acce0b PT |
11182 | -variable showneartags |
| 11183 | grid x $page.ntag -sticky w | |
| d34835c9 PM |
11184 | ${NS}::label $page.maxrefsl -text [mc "Maximum # tags/heads to show"] |
| 11185 | spinbox $page.maxrefs -from 1 -to 1000 -width 4 -textvariable maxrefs | |
| 11186 | grid x $page.maxrefsl $page.maxrefs -sticky w | |
| 44acce0b PT |
11187 | ${NS}::checkbutton $page.ldiff -text [mc "Limit diffs to listed paths"] \ |
| 11188 | -variable limitdiffs | |
| 11189 | grid x $page.ldiff -sticky w | |
| 11190 | ${NS}::checkbutton $page.lattr -text [mc "Support per-file encodings"] \ | |
| 11191 | -variable perfile_attrs | |
| 11192 | grid x $page.lattr -sticky w | |
| 11193 | ||
| 11194 | ${NS}::entry $page.extdifft -textvariable extdifftool | |
| 11195 | ${NS}::frame $page.extdifff | |
| 11196 | ${NS}::label $page.extdifff.l -text [mc "External diff tool" ] | |
| 11197 | ${NS}::button $page.extdifff.b -text [mc "Choose..."] -command choose_extdiff | |
| 11198 | pack $page.extdifff.l $page.extdifff.b -side left | |
| 11199 | pack configure $page.extdifff.l -padx 10 | |
| 11200 | grid x $page.extdifff $page.extdifft -sticky ew | |
| 11201 | ||
| 11202 | ${NS}::label $page.lgen -text [mc "General options"] | |
| 11203 | grid $page.lgen - -sticky w -pady 10 | |
| 11204 | ${NS}::checkbutton $page.want_ttk -variable want_ttk \ | |
| 11205 | -text [mc "Use themed widgets"] | |
| 11206 | if {$have_ttk} { | |
| 11207 | ${NS}::label $page.ttk_note -text [mc "(change requires restart)"] | |
| 11208 | } else { | |
| 11209 | ${NS}::label $page.ttk_note -text [mc "(currently unavailable)"] | |
| 11210 | } | |
| 11211 | grid x $page.want_ttk $page.ttk_note -sticky w | |
| 11212 | return $page | |
| 11213 | } | |
| 11214 | ||
| 11215 | proc prefspage_colors {notebook} { | |
| 11216 | global NS uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor | |
| 11217 | ||
| 11218 | set page [create_prefs_page $notebook.colors] | |
| 11219 | ||
| 11220 | ${NS}::label $page.cdisp -text [mc "Colors: press to choose"] | |
| 11221 | grid $page.cdisp - -sticky w -pady 10 | |
| 11222 | label $page.ui -padx 40 -relief sunk -background $uicolor | |
| 11223 | ${NS}::button $page.uibut -text [mc "Interface"] \ | |
| 11224 | -command [list choosecolor uicolor {} $page.ui [mc "interface"] setui] | |
| 11225 | grid x $page.uibut $page.ui -sticky w | |
| 11226 | label $page.bg -padx 40 -relief sunk -background $bgcolor | |
| 11227 | ${NS}::button $page.bgbut -text [mc "Background"] \ | |
| 11228 | -command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg] | |
| 11229 | grid x $page.bgbut $page.bg -sticky w | |
| 11230 | label $page.fg -padx 40 -relief sunk -background $fgcolor | |
| 11231 | ${NS}::button $page.fgbut -text [mc "Foreground"] \ | |
| 11232 | -command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg] | |
| 11233 | grid x $page.fgbut $page.fg -sticky w | |
| 11234 | label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0] | |
| 11235 | ${NS}::button $page.diffoldbut -text [mc "Diff: old lines"] \ | |
| 11236 | -command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \ | |
| 11237 | [list $ctext tag conf d0 -foreground]] | |
| 11238 | grid x $page.diffoldbut $page.diffold -sticky w | |
| 11239 | label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1] | |
| 11240 | ${NS}::button $page.diffnewbut -text [mc "Diff: new lines"] \ | |
| 11241 | -command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \ | |
| 11242 | [list $ctext tag conf dresult -foreground]] | |
| 11243 | grid x $page.diffnewbut $page.diffnew -sticky w | |
| 11244 | label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2] | |
| 11245 | ${NS}::button $page.hunksepbut -text [mc "Diff: hunk header"] \ | |
| 11246 | -command [list choosecolor diffcolors 2 $page.hunksep \ | |
| 11247 | [mc "diff hunk header"] \ | |
| 11248 | [list $ctext tag conf hunksep -foreground]] | |
| 11249 | grid x $page.hunksepbut $page.hunksep -sticky w | |
| 11250 | label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor | |
| 11251 | ${NS}::button $page.markbgbut -text [mc "Marked line bg"] \ | |
| 11252 | -command [list choosecolor markbgcolor {} $page.markbgsep \ | |
| 11253 | [mc "marked line background"] \ | |
| 11254 | [list $ctext tag conf omark -background]] | |
| 11255 | grid x $page.markbgbut $page.markbgsep -sticky w | |
| 11256 | label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor | |
| 11257 | ${NS}::button $page.selbgbut -text [mc "Select bg"] \ | |
| 11258 | -command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg] | |
| 11259 | grid x $page.selbgbut $page.selbgsep -sticky w | |
| 11260 | return $page | |
| 11261 | } | |
| 11262 | ||
| 11263 | proc prefspage_fonts {notebook} { | |
| 11264 | global NS | |
| 11265 | set page [create_prefs_page $notebook.fonts] | |
| 11266 | ${NS}::label $page.cfont -text [mc "Fonts: press to choose"] | |
| 11267 | grid $page.cfont - -sticky w -pady 10 | |
| 11268 | mkfontdisp mainfont $page [mc "Main font"] | |
| 11269 | mkfontdisp textfont $page [mc "Diff display font"] | |
| 11270 | mkfontdisp uifont $page [mc "User interface font"] | |
| 11271 | return $page | |
| 11272 | } | |
| 11273 | ||
| 712fcc08 | 11274 | proc doprefs {} { |
| d93f1713 | 11275 | global maxwidth maxgraphpct use_ttk NS |
| 219ea3a9 | 11276 | global oldprefs prefstop showneartags showlocalchanges |
| 5497f7a2 | 11277 | global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor |
| 21ac8a8d | 11278 | global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs |
| 0cc08ff7 | 11279 | global hideremotes want_ttk have_ttk |
| 232475d3 | 11280 | |
| 712fcc08 PM |
11281 | set top .gitkprefs |
| 11282 | set prefstop $top | |
| 11283 | if {[winfo exists $top]} { | |
| 11284 | raise $top | |
| 11285 | return | |
| 757f17bc | 11286 | } |
| 3de07118 | 11287 | foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ |
| 0cc08ff7 | 11288 | limitdiffs tabstop perfile_attrs hideremotes want_ttk} { |
| 712fcc08 | 11289 | set oldprefs($v) [set $v] |
| 232475d3 | 11290 | } |
| d93f1713 | 11291 | ttk_toplevel $top |
| d990cedf | 11292 | wm title $top [mc "Gitk preferences"] |
| e7d64008 | 11293 | make_transient $top . |
| 44acce0b PT |
11294 | |
| 11295 | if {[set use_notebook [expr {$use_ttk && [info command ::ttk::notebook] ne ""}]]} { | |
| 11296 | set notebook [ttk::notebook $top.notebook] | |
| 0cc08ff7 | 11297 | } else { |
| 44acce0b PT |
11298 | set notebook [${NS}::frame $top.notebook -borderwidth 0 -relief flat] |
| 11299 | } | |
| 11300 | ||
| 11301 | lappend pages [prefspage_general $notebook] [mc "General"] | |
| 11302 | lappend pages [prefspage_colors $notebook] [mc "Colors"] | |
| 11303 | lappend pages [prefspage_fonts $notebook] [mc "Fonts"] | |
| 28cb7074 | 11304 | set col 0 |
| 44acce0b PT |
11305 | foreach {page title} $pages { |
| 11306 | if {$use_notebook} { | |
| 11307 | $notebook add $page -text $title | |
| 11308 | } else { | |
| 11309 | set btn [${NS}::button $notebook.b_[string map {. X} $page] \ | |
| 11310 | -text $title -command [list raise $page]] | |
| 11311 | $page configure -text $title | |
| 11312 | grid $btn -row 0 -column [incr col] -sticky w | |
| 11313 | grid $page -row 1 -column 0 -sticky news -columnspan 100 | |
| 11314 | } | |
| 11315 | } | |
| 11316 | ||
| 11317 | if {!$use_notebook} { | |
| 11318 | grid columnconfigure $notebook 0 -weight 1 | |
| 11319 | grid rowconfigure $notebook 1 -weight 1 | |
| 11320 | raise [lindex $pages 0] | |
| 11321 | } | |
| 11322 | ||
| 11323 | grid $notebook -sticky news -padx 2 -pady 2 | |
| 11324 | grid rowconfigure $top 0 -weight 1 | |
| 11325 | grid columnconfigure $top 0 -weight 1 | |
| 9a7558f3 | 11326 | |
| d93f1713 PT |
11327 | ${NS}::frame $top.buts |
| 11328 | ${NS}::button $top.buts.ok -text [mc "OK"] -command prefsok -default active | |
| 11329 | ${NS}::button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal | |
| 76f15947 AG |
11330 | bind $top <Key-Return> prefsok |
| 11331 | bind $top <Key-Escape> prefscan | |
| 712fcc08 PM |
11332 | grid $top.buts.ok $top.buts.can |
| 11333 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 11334 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 11335 | grid $top.buts - - -pady 10 -sticky ew | |
| d93f1713 | 11336 | grid columnconfigure $top 2 -weight 1 |
| 44acce0b | 11337 | bind $top <Visibility> [list focus $top.buts.ok] |
| 712fcc08 PM |
11338 | } |
| 11339 | ||
| 314f5de1 TA |
11340 | proc choose_extdiff {} { |
| 11341 | global extdifftool | |
| 11342 | ||
| b56e0a9a | 11343 | set prog [tk_getOpenFile -title [mc "External diff tool"] -multiple false] |
| 314f5de1 TA |
11344 | if {$prog ne {}} { |
| 11345 | set extdifftool $prog | |
| 11346 | } | |
| 11347 | } | |
| 11348 | ||
| f8a2c0d1 PM |
11349 | proc choosecolor {v vi w x cmd} { |
| 11350 | global $v | |
| 11351 | ||
| 11352 | set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \ | |
| d990cedf | 11353 | -title [mc "Gitk: choose color for %s" $x]] |
| f8a2c0d1 PM |
11354 | if {$c eq {}} return |
| 11355 | $w conf -background $c | |
| 11356 | lset $v $vi $c | |
| 11357 | eval $cmd $c | |
| 11358 | } | |
| 11359 | ||
| 60378c0c ML |
11360 | proc setselbg {c} { |
| 11361 | global bglist cflist | |
| 11362 | foreach w $bglist { | |
| 11363 | $w configure -selectbackground $c | |
| 11364 | } | |
| 11365 | $cflist tag configure highlight \ | |
| 11366 | -background [$cflist cget -selectbackground] | |
| 11367 | allcanvs itemconf secsel -fill $c | |
| 11368 | } | |
| 11369 | ||
| 51a7e8b6 PM |
11370 | # This sets the background color and the color scheme for the whole UI. |
| 11371 | # For some reason, tk_setPalette chooses a nasty dark red for selectColor | |
| 11372 | # if we don't specify one ourselves, which makes the checkbuttons and | |
| 11373 | # radiobuttons look bad. This chooses white for selectColor if the | |
| 11374 | # background color is light, or black if it is dark. | |
| 5497f7a2 | 11375 | proc setui {c} { |
| 2e58c944 | 11376 | if {[tk windowingsystem] eq "win32"} { return } |
| 51a7e8b6 PM |
11377 | set bg [winfo rgb . $c] |
| 11378 | set selc black | |
| 11379 | if {[lindex $bg 0] + 1.5 * [lindex $bg 1] + 0.5 * [lindex $bg 2] > 100000} { | |
| 11380 | set selc white | |
| 11381 | } | |
| 11382 | tk_setPalette background $c selectColor $selc | |
| 5497f7a2 GR |
11383 | } |
| 11384 | ||
| f8a2c0d1 PM |
11385 | proc setbg {c} { |
| 11386 | global bglist | |
| 11387 | ||
| 11388 | foreach w $bglist { | |
| 11389 | $w conf -background $c | |
| 11390 | } | |
| 11391 | } | |
| 11392 | ||
| 11393 | proc setfg {c} { | |
| 11394 | global fglist canv | |
| 11395 | ||
| 11396 | foreach w $fglist { | |
| 11397 | $w conf -foreground $c | |
| 11398 | } | |
| 11399 | allcanvs itemconf text -fill $c | |
| 11400 | $canv itemconf circle -outline $c | |
| b9fdba7f | 11401 | $canv itemconf markid -outline $c |
| f8a2c0d1 PM |
11402 | } |
| 11403 | ||
| 712fcc08 | 11404 | proc prefscan {} { |
| 94503918 | 11405 | global oldprefs prefstop |
| 712fcc08 | 11406 | |
| 3de07118 | 11407 | foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ |
| 0cc08ff7 | 11408 | limitdiffs tabstop perfile_attrs hideremotes want_ttk} { |
| 94503918 | 11409 | global $v |
| 712fcc08 PM |
11410 | set $v $oldprefs($v) |
| 11411 | } | |
| 11412 | catch {destroy $prefstop} | |
| 11413 | unset prefstop | |
| 9a7558f3 | 11414 | fontcan |
| 712fcc08 PM |
11415 | } |
| 11416 | ||
| 11417 | proc prefsok {} { | |
| 11418 | global maxwidth maxgraphpct | |
| 219ea3a9 | 11419 | global oldprefs prefstop showneartags showlocalchanges |
| 9a7558f3 | 11420 | global fontpref mainfont textfont uifont |
| 39ee47ef | 11421 | global limitdiffs treediffs perfile_attrs |
| ffe15297 | 11422 | global hideremotes |
| 712fcc08 PM |
11423 | |
| 11424 | catch {destroy $prefstop} | |
| 11425 | unset prefstop | |
| 9a7558f3 PM |
11426 | fontcan |
| 11427 | set fontchanged 0 | |
| 11428 | if {$mainfont ne $fontpref(mainfont)} { | |
| 11429 | set mainfont $fontpref(mainfont) | |
| 11430 | parsefont mainfont $mainfont | |
| 11431 | eval font configure mainfont [fontflags mainfont] | |
| 11432 | eval font configure mainfontbold [fontflags mainfont 1] | |
| 11433 | setcoords | |
| 11434 | set fontchanged 1 | |
| 11435 | } | |
| 11436 | if {$textfont ne $fontpref(textfont)} { | |
| 11437 | set textfont $fontpref(textfont) | |
| 11438 | parsefont textfont $textfont | |
| 11439 | eval font configure textfont [fontflags textfont] | |
| 11440 | eval font configure textfontbold [fontflags textfont 1] | |
| 11441 | } | |
| 11442 | if {$uifont ne $fontpref(uifont)} { | |
| 11443 | set uifont $fontpref(uifont) | |
| 11444 | parsefont uifont $uifont | |
| 11445 | eval font configure uifont [fontflags uifont] | |
| 11446 | } | |
| 32f1b3e4 | 11447 | settabs |
| 219ea3a9 PM |
11448 | if {$showlocalchanges != $oldprefs(showlocalchanges)} { |
| 11449 | if {$showlocalchanges} { | |
| 11450 | doshowlocalchanges | |
| 11451 | } else { | |
| 11452 | dohidelocalchanges | |
| 11453 | } | |
| 11454 | } | |
| 39ee47ef PM |
11455 | if {$limitdiffs != $oldprefs(limitdiffs) || |
| 11456 | ($perfile_attrs && !$oldprefs(perfile_attrs))} { | |
| 11457 | # treediffs elements are limited by path; | |
| 11458 | # won't have encodings cached if perfile_attrs was just turned on | |
| 74a40c71 PM |
11459 | catch {unset treediffs} |
| 11460 | } | |
| 9a7558f3 | 11461 | if {$fontchanged || $maxwidth != $oldprefs(maxwidth) |
| 712fcc08 PM |
11462 | || $maxgraphpct != $oldprefs(maxgraphpct)} { |
| 11463 | redisplay | |
| 7a39a17a PM |
11464 | } elseif {$showneartags != $oldprefs(showneartags) || |
| 11465 | $limitdiffs != $oldprefs(limitdiffs)} { | |
| b8ab2e17 | 11466 | reselectline |
| 712fcc08 | 11467 | } |
| ffe15297 TR |
11468 | if {$hideremotes != $oldprefs(hideremotes)} { |
| 11469 | rereadrefs | |
| 11470 | } | |
| 712fcc08 PM |
11471 | } |
| 11472 | ||
| 11473 | proc formatdate {d} { | |
| e8b5f4be | 11474 | global datetimeformat |
| 219ea3a9 | 11475 | if {$d ne {}} { |
| f5974d97 | 11476 | set d [clock format [lindex $d 0] -format $datetimeformat] |
| 219ea3a9 PM |
11477 | } |
| 11478 | return $d | |
| 232475d3 PM |
11479 | } |
| 11480 | ||
| fd8ccbec PM |
11481 | # This list of encoding names and aliases is distilled from |
| 11482 | # http://www.iana.org/assignments/character-sets. | |
| 11483 | # Not all of them are supported by Tcl. | |
| 11484 | set encoding_aliases { | |
| 11485 | { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII | |
| 11486 | ISO646-US US-ASCII us IBM367 cp367 csASCII } | |
| 11487 | { ISO-10646-UTF-1 csISO10646UTF1 } | |
| 11488 | { ISO_646.basic:1983 ref csISO646basic1983 } | |
| 11489 | { INVARIANT csINVARIANT } | |
| 11490 | { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion } | |
| 11491 | { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom } | |
| 11492 | { NATS-SEFI iso-ir-8-1 csNATSSEFI } | |
| 11493 | { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD } | |
| 11494 | { NATS-DANO iso-ir-9-1 csNATSDANO } | |
| 11495 | { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD } | |
| 11496 | { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish } | |
| 11497 | { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames } | |
| 11498 | { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 } | |
| 11499 | { ISO-2022-KR csISO2022KR } | |
| 11500 | { EUC-KR csEUCKR } | |
| 11501 | { ISO-2022-JP csISO2022JP } | |
| 11502 | { ISO-2022-JP-2 csISO2022JP2 } | |
| 11503 | { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7 | |
| 11504 | csISO13JISC6220jp } | |
| 11505 | { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro } | |
| 11506 | { IT iso-ir-15 ISO646-IT csISO15Italian } | |
| 11507 | { PT iso-ir-16 ISO646-PT csISO16Portuguese } | |
| 11508 | { ES iso-ir-17 ISO646-ES csISO17Spanish } | |
| 11509 | { greek7-old iso-ir-18 csISO18Greek7Old } | |
| 11510 | { latin-greek iso-ir-19 csISO19LatinGreek } | |
| 11511 | { DIN_66003 iso-ir-21 de ISO646-DE csISO21German } | |
| 11512 | { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French } | |
| 11513 | { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 } | |
| 11514 | { ISO_5427 iso-ir-37 csISO5427Cyrillic } | |
| 11515 | { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 } | |
| 11516 | { BS_viewdata iso-ir-47 csISO47BSViewdata } | |
| 11517 | { INIS iso-ir-49 csISO49INIS } | |
| 11518 | { INIS-8 iso-ir-50 csISO50INIS8 } | |
| 11519 | { INIS-cyrillic iso-ir-51 csISO51INISCyrillic } | |
| 11520 | { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 } | |
| 11521 | { ISO_5428:1980 iso-ir-55 csISO5428Greek } | |
| 11522 | { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 } | |
| 11523 | { GB_2312-80 iso-ir-58 chinese csISO58GB231280 } | |
| 11524 | { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian | |
| 11525 | csISO60Norwegian1 } | |
| 11526 | { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 } | |
| 11527 | { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French } | |
| 11528 | { videotex-suppl iso-ir-70 csISO70VideotexSupp1 } | |
| 11529 | { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 } | |
| 11530 | { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 } | |
| 11531 | { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian } | |
| 11532 | { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 } | |
| 11533 | { greek7 iso-ir-88 csISO88Greek7 } | |
| 11534 | { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 } | |
| 11535 | { iso-ir-90 csISO90 } | |
| 11536 | { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a } | |
| 11537 | { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b | |
| 11538 | csISO92JISC62991984b } | |
| 11539 | { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd } | |
| 11540 | { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand } | |
| 11541 | { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add | |
| 11542 | csISO95JIS62291984handadd } | |
| 11543 | { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana } | |
| 11544 | { ISO_2033-1983 iso-ir-98 e13b csISO2033 } | |
| 11545 | { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS } | |
| 11546 | { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819 | |
| 11547 | CP819 csISOLatin1 } | |
| 11548 | { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 } | |
| 11549 | { T.61-7bit iso-ir-102 csISO102T617bit } | |
| 11550 | { T.61-8bit T.61 iso-ir-103 csISO103T618bit } | |
| 11551 | { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 } | |
| 11552 | { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 } | |
| 11553 | { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic } | |
| 11554 | { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 } | |
| 11555 | { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 } | |
| 11556 | { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr } | |
| 11557 | { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708 | |
| 11558 | arabic csISOLatinArabic } | |
| 11559 | { ISO_8859-6-E csISO88596E ISO-8859-6-E } | |
| 11560 | { ISO_8859-6-I csISO88596I ISO-8859-6-I } | |
| 11561 | { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118 | |
| 11562 | greek greek8 csISOLatinGreek } | |
| 11563 | { T.101-G2 iso-ir-128 csISO128T101G2 } | |
| 11564 | { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew | |
| 11565 | csISOLatinHebrew } | |
| 11566 | { ISO_8859-8-E csISO88598E ISO-8859-8-E } | |
| 11567 | { ISO_8859-8-I csISO88598I ISO-8859-8-I } | |
| 11568 | { CSN_369103 iso-ir-139 csISO139CSN369103 } | |
| 11569 | { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 } | |
| 11570 | { ISO_6937-2-add iso-ir-142 csISOTextComm } | |
| 11571 | { IEC_P27-1 iso-ir-143 csISO143IECP271 } | |
| 11572 | { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic | |
| 11573 | csISOLatinCyrillic } | |
| 11574 | { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian } | |
| 11575 | { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian } | |
| 11576 | { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 } | |
| 11577 | { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT } | |
| 11578 | { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba } | |
| 11579 | { ISO_6937-2-25 iso-ir-152 csISO6937Add } | |
| 11580 | { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 } | |
| 11581 | { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp } | |
| 11582 | { ISO_10367-box iso-ir-155 csISO10367Box } | |
| 11583 | { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 } | |
| 11584 | { latin-lap lap iso-ir-158 csISO158Lap } | |
| 11585 | { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 } | |
| 11586 | { DS_2089 DS2089 ISO646-DK dk csISO646Danish } | |
| 11587 | { us-dk csUSDK } | |
| 11588 | { dk-us csDKUS } | |
| 11589 | { JIS_X0201 X0201 csHalfWidthKatakana } | |
| 11590 | { KSC5636 ISO646-KR csKSC5636 } | |
| 11591 | { ISO-10646-UCS-2 csUnicode } | |
| 11592 | { ISO-10646-UCS-4 csUCS4 } | |
| 11593 | { DEC-MCS dec csDECMCS } | |
| 11594 | { hp-roman8 roman8 r8 csHPRoman8 } | |
| 11595 | { macintosh mac csMacintosh } | |
| 11596 | { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl | |
| 11597 | csIBM037 } | |
| 11598 | { IBM038 EBCDIC-INT cp038 csIBM038 } | |
| 11599 | { IBM273 CP273 csIBM273 } | |
| 11600 | { IBM274 EBCDIC-BE CP274 csIBM274 } | |
| 11601 | { IBM275 EBCDIC-BR cp275 csIBM275 } | |
| 11602 | { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 } | |
| 11603 | { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 } | |
| 11604 | { IBM280 CP280 ebcdic-cp-it csIBM280 } | |
| 11605 | { IBM281 EBCDIC-JP-E cp281 csIBM281 } | |
| 11606 | { IBM284 CP284 ebcdic-cp-es csIBM284 } | |
| 11607 | { IBM285 CP285 ebcdic-cp-gb csIBM285 } | |
| 11608 | { IBM290 cp290 EBCDIC-JP-kana csIBM290 } | |
| 11609 | { IBM297 cp297 ebcdic-cp-fr csIBM297 } | |
| 11610 | { IBM420 cp420 ebcdic-cp-ar1 csIBM420 } | |
| 11611 | { IBM423 cp423 ebcdic-cp-gr csIBM423 } | |
| 11612 | { IBM424 cp424 ebcdic-cp-he csIBM424 } | |
| 11613 | { IBM437 cp437 437 csPC8CodePage437 } | |
| 11614 | { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 } | |
| 11615 | { IBM775 cp775 csPC775Baltic } | |
| 11616 | { IBM850 cp850 850 csPC850Multilingual } | |
| 11617 | { IBM851 cp851 851 csIBM851 } | |
| 11618 | { IBM852 cp852 852 csPCp852 } | |
| 11619 | { IBM855 cp855 855 csIBM855 } | |
| 11620 | { IBM857 cp857 857 csIBM857 } | |
| 11621 | { IBM860 cp860 860 csIBM860 } | |
| 11622 | { IBM861 cp861 861 cp-is csIBM861 } | |
| 11623 | { IBM862 cp862 862 csPC862LatinHebrew } | |
| 11624 | { IBM863 cp863 863 csIBM863 } | |
| 11625 | { IBM864 cp864 csIBM864 } | |
| 11626 | { IBM865 cp865 865 csIBM865 } | |
| 11627 | { IBM866 cp866 866 csIBM866 } | |
| 11628 | { IBM868 CP868 cp-ar csIBM868 } | |
| 11629 | { IBM869 cp869 869 cp-gr csIBM869 } | |
| 11630 | { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 } | |
| 11631 | { IBM871 CP871 ebcdic-cp-is csIBM871 } | |
| 11632 | { IBM880 cp880 EBCDIC-Cyrillic csIBM880 } | |
| 11633 | { IBM891 cp891 csIBM891 } | |
| 11634 | { IBM903 cp903 csIBM903 } | |
| 11635 | { IBM904 cp904 904 csIBBM904 } | |
| 11636 | { IBM905 CP905 ebcdic-cp-tr csIBM905 } | |
| 11637 | { IBM918 CP918 ebcdic-cp-ar2 csIBM918 } | |
| 11638 | { IBM1026 CP1026 csIBM1026 } | |
| 11639 | { EBCDIC-AT-DE csIBMEBCDICATDE } | |
| 11640 | { EBCDIC-AT-DE-A csEBCDICATDEA } | |
| 11641 | { EBCDIC-CA-FR csEBCDICCAFR } | |
| 11642 | { EBCDIC-DK-NO csEBCDICDKNO } | |
| 11643 | { EBCDIC-DK-NO-A csEBCDICDKNOA } | |
| 11644 | { EBCDIC-FI-SE csEBCDICFISE } | |
| 11645 | { EBCDIC-FI-SE-A csEBCDICFISEA } | |
| 11646 | { EBCDIC-FR csEBCDICFR } | |
| 11647 | { EBCDIC-IT csEBCDICIT } | |
| 11648 | { EBCDIC-PT csEBCDICPT } | |
| 11649 | { EBCDIC-ES csEBCDICES } | |
| 11650 | { EBCDIC-ES-A csEBCDICESA } | |
| 11651 | { EBCDIC-ES-S csEBCDICESS } | |
| 11652 | { EBCDIC-UK csEBCDICUK } | |
| 11653 | { EBCDIC-US csEBCDICUS } | |
| 11654 | { UNKNOWN-8BIT csUnknown8BiT } | |
| 11655 | { MNEMONIC csMnemonic } | |
| 11656 | { MNEM csMnem } | |
| 11657 | { VISCII csVISCII } | |
| 11658 | { VIQR csVIQR } | |
| 11659 | { KOI8-R csKOI8R } | |
| 11660 | { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro } | |
| 11661 | { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro } | |
| 11662 | { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro } | |
| 11663 | { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro } | |
| 11664 | { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro } | |
| 11665 | { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro } | |
| 11666 | { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro } | |
| 11667 | { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro } | |
| 11668 | { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro } | |
| 11669 | { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro } | |
| 11670 | { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro } | |
| 11671 | { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro } | |
| 11672 | { IBM1047 IBM-1047 } | |
| 11673 | { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian } | |
| 11674 | { Amiga-1251 Ami1251 Amiga1251 Ami-1251 } | |
| 11675 | { UNICODE-1-1 csUnicode11 } | |
| 11676 | { CESU-8 csCESU-8 } | |
| 11677 | { BOCU-1 csBOCU-1 } | |
| 11678 | { UNICODE-1-1-UTF-7 csUnicode11UTF7 } | |
| 11679 | { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic | |
| 11680 | l8 } | |
| 11681 | { ISO-8859-15 ISO_8859-15 Latin-9 } | |
| 11682 | { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 } | |
| 11683 | { GBK CP936 MS936 windows-936 } | |
| 11684 | { JIS_Encoding csJISEncoding } | |
| 09c7029d | 11685 | { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS } |
| fd8ccbec PM |
11686 | { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese |
| 11687 | EUC-JP } | |
| 11688 | { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese } | |
| 11689 | { ISO-10646-UCS-Basic csUnicodeASCII } | |
| 11690 | { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 } | |
| 11691 | { ISO-Unicode-IBM-1261 csUnicodeIBM1261 } | |
| 11692 | { ISO-Unicode-IBM-1268 csUnicodeIBM1268 } | |
| 11693 | { ISO-Unicode-IBM-1276 csUnicodeIBM1276 } | |
| 11694 | { ISO-Unicode-IBM-1264 csUnicodeIBM1264 } | |
| 11695 | { ISO-Unicode-IBM-1265 csUnicodeIBM1265 } | |
| 11696 | { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 } | |
| 11697 | { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 } | |
| 11698 | { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 } | |
| 11699 | { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 } | |
| 11700 | { Adobe-Standard-Encoding csAdobeStandardEncoding } | |
| 11701 | { Ventura-US csVenturaUS } | |
| 11702 | { Ventura-International csVenturaInternational } | |
| 11703 | { PC8-Danish-Norwegian csPC8DanishNorwegian } | |
| 11704 | { PC8-Turkish csPC8Turkish } | |
| 11705 | { IBM-Symbols csIBMSymbols } | |
| 11706 | { IBM-Thai csIBMThai } | |
| 11707 | { HP-Legal csHPLegal } | |
| 11708 | { HP-Pi-font csHPPiFont } | |
| 11709 | { HP-Math8 csHPMath8 } | |
| 11710 | { Adobe-Symbol-Encoding csHPPSMath } | |
| 11711 | { HP-DeskTop csHPDesktop } | |
| 11712 | { Ventura-Math csVenturaMath } | |
| 11713 | { Microsoft-Publishing csMicrosoftPublishing } | |
| 11714 | { Windows-31J csWindows31J } | |
| 11715 | { GB2312 csGB2312 } | |
| 11716 | { Big5 csBig5 } | |
| 11717 | } | |
| 11718 | ||
| 11719 | proc tcl_encoding {enc} { | |
| 39ee47ef PM |
11720 | global encoding_aliases tcl_encoding_cache |
| 11721 | if {[info exists tcl_encoding_cache($enc)]} { | |
| 11722 | return $tcl_encoding_cache($enc) | |
| 11723 | } | |
| fd8ccbec PM |
11724 | set names [encoding names] |
| 11725 | set lcnames [string tolower $names] | |
| 11726 | set enc [string tolower $enc] | |
| 11727 | set i [lsearch -exact $lcnames $enc] | |
| 11728 | if {$i < 0} { | |
| 11729 | # look for "isonnn" instead of "iso-nnn" or "iso_nnn" | |
| 09c7029d | 11730 | if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} { |
| fd8ccbec PM |
11731 | set i [lsearch -exact $lcnames $encx] |
| 11732 | } | |
| 11733 | } | |
| 11734 | if {$i < 0} { | |
| 11735 | foreach l $encoding_aliases { | |
| 11736 | set ll [string tolower $l] | |
| 11737 | if {[lsearch -exact $ll $enc] < 0} continue | |
| 11738 | # look through the aliases for one that tcl knows about | |
| 11739 | foreach e $ll { | |
| 11740 | set i [lsearch -exact $lcnames $e] | |
| 11741 | if {$i < 0} { | |
| 09c7029d | 11742 | if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} { |
| fd8ccbec PM |
11743 | set i [lsearch -exact $lcnames $ex] |
| 11744 | } | |
| 11745 | } | |
| 11746 | if {$i >= 0} break | |
| 11747 | } | |
| 11748 | break | |
| 11749 | } | |
| 11750 | } | |
| 39ee47ef | 11751 | set tclenc {} |
| fd8ccbec | 11752 | if {$i >= 0} { |
| 39ee47ef | 11753 | set tclenc [lindex $names $i] |
| fd8ccbec | 11754 | } |
| 39ee47ef PM |
11755 | set tcl_encoding_cache($enc) $tclenc |
| 11756 | return $tclenc | |
| fd8ccbec PM |
11757 | } |
| 11758 | ||
| 09c7029d | 11759 | proc gitattr {path attr default} { |
| 39ee47ef PM |
11760 | global path_attr_cache |
| 11761 | if {[info exists path_attr_cache($attr,$path)]} { | |
| 11762 | set r $path_attr_cache($attr,$path) | |
| 11763 | } else { | |
| 11764 | set r "unspecified" | |
| 11765 | if {![catch {set line [exec git check-attr $attr -- $path]}]} { | |
| 097e1118 | 11766 | regexp "(.*): $attr: (.*)" $line m f r |
| 09c7029d | 11767 | } |
| 4db09304 | 11768 | set path_attr_cache($attr,$path) $r |
| 39ee47ef PM |
11769 | } |
| 11770 | if {$r eq "unspecified"} { | |
| 11771 | return $default | |
| 11772 | } | |
| 11773 | return $r | |
| 09c7029d AG |
11774 | } |
| 11775 | ||
| 4db09304 | 11776 | proc cache_gitattr {attr pathlist} { |
| 39ee47ef PM |
11777 | global path_attr_cache |
| 11778 | set newlist {} | |
| 11779 | foreach path $pathlist { | |
| 11780 | if {![info exists path_attr_cache($attr,$path)]} { | |
| 11781 | lappend newlist $path | |
| 11782 | } | |
| 11783 | } | |
| 11784 | set lim 1000 | |
| 11785 | if {[tk windowingsystem] == "win32"} { | |
| 11786 | # windows has a 32k limit on the arguments to a command... | |
| 11787 | set lim 30 | |
| 11788 | } | |
| 11789 | while {$newlist ne {}} { | |
| 11790 | set head [lrange $newlist 0 [expr {$lim - 1}]] | |
| 11791 | set newlist [lrange $newlist $lim end] | |
| 11792 | if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} { | |
| 11793 | foreach row [split $rlist "\n"] { | |
| 097e1118 | 11794 | if {[regexp "(.*): $attr: (.*)" $row m path value]} { |
| 39ee47ef PM |
11795 | if {[string index $path 0] eq "\""} { |
| 11796 | set path [encoding convertfrom [lindex $path 0]] | |
| 11797 | } | |
| 11798 | set path_attr_cache($attr,$path) $value | |
| 4db09304 | 11799 | } |
| 39ee47ef | 11800 | } |
| 4db09304 | 11801 | } |
| 39ee47ef | 11802 | } |
| 4db09304 AG |
11803 | } |
| 11804 | ||
| 09c7029d | 11805 | proc get_path_encoding {path} { |
| 39ee47ef PM |
11806 | global gui_encoding perfile_attrs |
| 11807 | set tcl_enc $gui_encoding | |
| 11808 | if {$path ne {} && $perfile_attrs} { | |
| 11809 | set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]] | |
| 11810 | if {$enc2 ne {}} { | |
| 11811 | set tcl_enc $enc2 | |
| 09c7029d | 11812 | } |
| 39ee47ef PM |
11813 | } |
| 11814 | return $tcl_enc | |
| 09c7029d AG |
11815 | } |
| 11816 | ||
| 5d7589d4 PM |
11817 | # First check that Tcl/Tk is recent enough |
| 11818 | if {[catch {package require Tk 8.4} err]} { | |
| 8d849957 BH |
11819 | show_error {} . "Sorry, gitk cannot run with this version of Tcl/Tk.\n\ |
| 11820 | Gitk requires at least Tcl/Tk 8.4." list | |
| 5d7589d4 PM |
11821 | exit 1 |
| 11822 | } | |
| 11823 | ||
| 76bf6ff9 TS |
11824 | # on OSX bring the current Wish process window to front |
| 11825 | if {[tk windowingsystem] eq "aqua"} { | |
| 11826 | exec osascript -e [format { | |
| 11827 | tell application "System Events" | |
| 11828 | set frontmost of processes whose unix id is %d to true | |
| 11829 | end tell | |
| 11830 | } [pid] ] | |
| 11831 | } | |
| 11832 | ||
| 0ae10357 AO |
11833 | # Unset GIT_TRACE var if set |
| 11834 | if { [info exists ::env(GIT_TRACE)] } { | |
| 11835 | unset ::env(GIT_TRACE) | |
| 11836 | } | |
| 11837 | ||
| 1d10f36d | 11838 | # defaults... |
| 8974c6f9 | 11839 | set wrcomcmd "git diff-tree --stdin -p --pretty" |
| 671bc153 | 11840 | |
| fd8ccbec | 11841 | set gitencoding {} |
| 671bc153 | 11842 | catch { |
| 27cb61ca | 11843 | set gitencoding [exec git config --get i18n.commitencoding] |
| 671bc153 | 11844 | } |
| 590915da AG |
11845 | catch { |
| 11846 | set gitencoding [exec git config --get i18n.logoutputencoding] | |
| 11847 | } | |
| 671bc153 | 11848 | if {$gitencoding == ""} { |
| fd8ccbec PM |
11849 | set gitencoding "utf-8" |
| 11850 | } | |
| 11851 | set tclencoding [tcl_encoding $gitencoding] | |
| 11852 | if {$tclencoding == {}} { | |
| 11853 | puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk" | |
| 671bc153 | 11854 | } |
| 1db95b00 | 11855 | |
| 09c7029d AG |
11856 | set gui_encoding [encoding system] |
| 11857 | catch { | |
| 39ee47ef PM |
11858 | set enc [exec git config --get gui.encoding] |
| 11859 | if {$enc ne {}} { | |
| 11860 | set tclenc [tcl_encoding $enc] | |
| 11861 | if {$tclenc ne {}} { | |
| 11862 | set gui_encoding $tclenc | |
| 11863 | } else { | |
| 11864 | puts stderr "Warning: encoding $enc is not supported by Tcl/Tk" | |
| 11865 | } | |
| 11866 | } | |
| 09c7029d AG |
11867 | } |
| 11868 | ||
| b2b76d10 MK |
11869 | set log_showroot true |
| 11870 | catch { | |
| 11871 | set log_showroot [exec git config --bool --get log.showroot] | |
| 11872 | } | |
| 11873 | ||
| 5fdcbb13 DS |
11874 | if {[tk windowingsystem] eq "aqua"} { |
| 11875 | set mainfont {{Lucida Grande} 9} | |
| 11876 | set textfont {Monaco 9} | |
| 11877 | set uifont {{Lucida Grande} 9 bold} | |
| 5c9096f7 JN |
11878 | } elseif {![catch {::tk::pkgconfig get fontsystem} xft] && $xft eq "xft"} { |
| 11879 | # fontconfig! | |
| 11880 | set mainfont {sans 9} | |
| 11881 | set textfont {monospace 9} | |
| 11882 | set uifont {sans 9 bold} | |
| 5fdcbb13 DS |
11883 | } else { |
| 11884 | set mainfont {Helvetica 9} | |
| 11885 | set textfont {Courier 9} | |
| 11886 | set uifont {Helvetica 9 bold} | |
| 11887 | } | |
| 7e12f1a6 | 11888 | set tabstop 8 |
| b74fd579 | 11889 | set findmergefiles 0 |
| 8d858d1a | 11890 | set maxgraphpct 50 |
| f6075eba | 11891 | set maxwidth 16 |
| 232475d3 | 11892 | set revlistorder 0 |
| 757f17bc | 11893 | set fastdate 0 |
| 6e8c8707 PM |
11894 | set uparrowlen 5 |
| 11895 | set downarrowlen 5 | |
| 11896 | set mingaplen 100 | |
| f8b28a40 | 11897 | set cmitmode "patch" |
| f1b86294 | 11898 | set wrapcomment "none" |
| b8ab2e17 | 11899 | set showneartags 1 |
| ffe15297 | 11900 | set hideremotes 0 |
| 0a4dd8b8 | 11901 | set maxrefs 20 |
| 322a8cc9 | 11902 | set maxlinelen 200 |
| 219ea3a9 | 11903 | set showlocalchanges 1 |
| 7a39a17a | 11904 | set limitdiffs 1 |
| e8b5f4be | 11905 | set datetimeformat "%Y-%m-%d %H:%M:%S" |
| 95293b58 | 11906 | set autoselect 1 |
| 21ac8a8d | 11907 | set autosellen 40 |
| 39ee47ef | 11908 | set perfile_attrs 0 |
| 0cc08ff7 | 11909 | set want_ttk 1 |
| 1d10f36d | 11910 | |
| 5fdcbb13 DS |
11911 | if {[tk windowingsystem] eq "aqua"} { |
| 11912 | set extdifftool "opendiff" | |
| 11913 | } else { | |
| 11914 | set extdifftool "meld" | |
| 11915 | } | |
| 314f5de1 | 11916 | |
| 1d10f36d | 11917 | set colors {green red blue magenta darkgrey brown orange} |
| 1924d1bc PT |
11918 | if {[tk windowingsystem] eq "win32"} { |
| 11919 | set uicolor SystemButtonFace | |
| 252c52df GÖ |
11920 | set uifgcolor SystemButtonText |
| 11921 | set uifgdisabledcolor SystemDisabledText | |
| 1924d1bc | 11922 | set bgcolor SystemWindow |
| 252c52df | 11923 | set fgcolor SystemWindowText |
| 1924d1bc PT |
11924 | set selectbgcolor SystemHighlight |
| 11925 | } else { | |
| 11926 | set uicolor grey85 | |
| 252c52df GÖ |
11927 | set uifgcolor black |
| 11928 | set uifgdisabledcolor "#999" | |
| 1924d1bc PT |
11929 | set bgcolor white |
| 11930 | set fgcolor black | |
| 11931 | set selectbgcolor gray85 | |
| 11932 | } | |
| f8a2c0d1 | 11933 | set diffcolors {red "#00a000" blue} |
| 890fae70 | 11934 | set diffcontext 3 |
| 252c52df | 11935 | set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} |
| b9b86007 | 11936 | set ignorespace 0 |
| ae4e3ff9 | 11937 | set worddiff "" |
| e3e901be | 11938 | set markbgcolor "#e0e0ff" |
| 1d10f36d | 11939 | |
| 252c52df GÖ |
11940 | set headbgcolor green |
| 11941 | set headfgcolor black | |
| 11942 | set headoutlinecolor black | |
| 11943 | set remotebgcolor #ffddaa | |
| 11944 | set tagbgcolor yellow | |
| 11945 | set tagfgcolor black | |
| 11946 | set tagoutlinecolor black | |
| 11947 | set reflinecolor black | |
| 11948 | set filesepbgcolor #aaaaaa | |
| 11949 | set filesepfgcolor black | |
| 11950 | set linehoverbgcolor #ffff80 | |
| 11951 | set linehoverfgcolor black | |
| 11952 | set linehoveroutlinecolor black | |
| 11953 | set mainheadcirclecolor yellow | |
| 11954 | set workingfilescirclecolor red | |
| 11955 | set indexcirclecolor green | |
| c11ff120 | 11956 | set circlecolors {white blue gray blue blue} |
| 252c52df GÖ |
11957 | set linkfgcolor blue |
| 11958 | set circleoutlinecolor $fgcolor | |
| 11959 | set foundbgcolor yellow | |
| 11960 | set currentsearchhitbgcolor orange | |
| c11ff120 | 11961 | |
| d277e89f PM |
11962 | # button for popping up context menus |
| 11963 | if {[tk windowingsystem] eq "aqua"} { | |
| 11964 | set ctxbut <Button-2> | |
| 11965 | } else { | |
| 11966 | set ctxbut <Button-3> | |
| 11967 | } | |
| 11968 | ||
| 663c3aa9 CS |
11969 | ## For msgcat loading, first locate the installation location. |
| 11970 | if { [info exists ::env(GITK_MSGSDIR)] } { | |
| 11971 | ## Msgsdir was manually set in the environment. | |
| 11972 | set gitk_msgsdir $::env(GITK_MSGSDIR) | |
| 11973 | } else { | |
| 11974 | ## Let's guess the prefix from argv0. | |
| 11975 | set gitk_prefix [file dirname [file dirname [file normalize $argv0]]] | |
| 11976 | set gitk_libdir [file join $gitk_prefix share gitk lib] | |
| 11977 | set gitk_msgsdir [file join $gitk_libdir msgs] | |
| 11978 | unset gitk_prefix | |
| 11979 | } | |
| 11980 | ||
| 11981 | ## Internationalization (i18n) through msgcat and gettext. See | |
| 11982 | ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html | |
| 11983 | package require msgcat | |
| 11984 | namespace import ::msgcat::mc | |
| 11985 | ## And eventually load the actual message catalog | |
| 11986 | ::msgcat::mcload $gitk_msgsdir | |
| 11987 | ||
| 1d10f36d PM |
11988 | catch {source ~/.gitk} |
| 11989 | ||
| 0ed1dd3c PM |
11990 | parsefont mainfont $mainfont |
| 11991 | eval font create mainfont [fontflags mainfont] | |
| 11992 | eval font create mainfontbold [fontflags mainfont 1] | |
| 11993 | ||
| 11994 | parsefont textfont $textfont | |
| 11995 | eval font create textfont [fontflags textfont] | |
| 11996 | eval font create textfontbold [fontflags textfont 1] | |
| 11997 | ||
| 11998 | parsefont uifont $uifont | |
| 11999 | eval font create uifont [fontflags uifont] | |
| 17386066 | 12000 | |
| 51a7e8b6 | 12001 | setui $uicolor |
| 5497f7a2 | 12002 | |
| b039f0a6 PM |
12003 | setoptions |
| 12004 | ||
| cdaee5db | 12005 | # check that we can find a .git directory somewhere... |
| 86e847bc | 12006 | if {[catch {set gitdir [exec git rev-parse --git-dir]}]} { |
| d990cedf | 12007 | show_error {} . [mc "Cannot find a git repository here."] |
| 6c87d60c AR |
12008 | exit 1 |
| 12009 | } | |
| cdaee5db | 12010 | |
| 39816d60 AG |
12011 | set selecthead {} |
| 12012 | set selectheadid {} | |
| 12013 | ||
| 1d10f36d | 12014 | set revtreeargs {} |
| cdaee5db PM |
12015 | set cmdline_files {} |
| 12016 | set i 0 | |
| 2d480856 | 12017 | set revtreeargscmd {} |
| 1d10f36d | 12018 | foreach arg $argv { |
| 2d480856 | 12019 | switch -glob -- $arg { |
| 6ebedabf | 12020 | "" { } |
| cdaee5db PM |
12021 | "--" { |
| 12022 | set cmdline_files [lrange $argv [expr {$i + 1}] end] | |
| 12023 | break | |
| 12024 | } | |
| 39816d60 AG |
12025 | "--select-commit=*" { |
| 12026 | set selecthead [string range $arg 16 end] | |
| 12027 | } | |
| 2d480856 YD |
12028 | "--argscmd=*" { |
| 12029 | set revtreeargscmd [string range $arg 10 end] | |
| 12030 | } | |
| 1d10f36d PM |
12031 | default { |
| 12032 | lappend revtreeargs $arg | |
| 12033 | } | |
| 12034 | } | |
| cdaee5db | 12035 | incr i |
| 1db95b00 | 12036 | } |
| 1d10f36d | 12037 | |
| 39816d60 AG |
12038 | if {$selecthead eq "HEAD"} { |
| 12039 | set selecthead {} | |
| 12040 | } | |
| 12041 | ||
| cdaee5db | 12042 | if {$i >= [llength $argv] && $revtreeargs ne {}} { |
| 3ed31a81 | 12043 | # no -- on command line, but some arguments (other than --argscmd) |
| 098dd8a3 | 12044 | if {[catch { |
| 8974c6f9 | 12045 | set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs] |
| 098dd8a3 PM |
12046 | set cmdline_files [split $f "\n"] |
| 12047 | set n [llength $cmdline_files] | |
| 12048 | set revtreeargs [lrange $revtreeargs 0 end-$n] | |
| cdaee5db PM |
12049 | # Unfortunately git rev-parse doesn't produce an error when |
| 12050 | # something is both a revision and a filename. To be consistent | |
| 12051 | # with git log and git rev-list, check revtreeargs for filenames. | |
| 12052 | foreach arg $revtreeargs { | |
| 12053 | if {[file exists $arg]} { | |
| d990cedf CS |
12054 | show_error {} . [mc "Ambiguous argument '%s': both revision\ |
| 12055 | and filename" $arg] | |
| cdaee5db PM |
12056 | exit 1 |
| 12057 | } | |
| 12058 | } | |
| 098dd8a3 PM |
12059 | } err]} { |
| 12060 | # unfortunately we get both stdout and stderr in $err, | |
| 12061 | # so look for "fatal:". | |
| 12062 | set i [string first "fatal:" $err] | |
| 12063 | if {$i > 0} { | |
| b5e09633 | 12064 | set err [string range $err [expr {$i + 6}] end] |
| 098dd8a3 | 12065 | } |
| d990cedf | 12066 | show_error {} . "[mc "Bad arguments to gitk:"]\n$err" |
| 098dd8a3 PM |
12067 | exit 1 |
| 12068 | } | |
| 12069 | } | |
| 12070 | ||
| 219ea3a9 | 12071 | set nullid "0000000000000000000000000000000000000000" |
| 8f489363 | 12072 | set nullid2 "0000000000000000000000000000000000000001" |
| 314f5de1 | 12073 | set nullfile "/dev/null" |
| 8f489363 | 12074 | |
| 32f1b3e4 | 12075 | set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}] |
| 0cc08ff7 PM |
12076 | if {![info exists have_ttk]} { |
| 12077 | set have_ttk [llength [info commands ::ttk::style]] | |
| d93f1713 | 12078 | } |
| 0cc08ff7 | 12079 | set use_ttk [expr {$have_ttk && $want_ttk}] |
| d93f1713 | 12080 | set NS [expr {$use_ttk ? "ttk" : ""}] |
| 0cc08ff7 | 12081 | |
| 7add5aff | 12082 | regexp {^git version ([\d.]*\d)} [exec git version] _ git_version |
| 219ea3a9 | 12083 | |
| 7defefb1 KS |
12084 | set show_notes {} |
| 12085 | if {[package vcompare $git_version "1.6.6.2"] >= 0} { | |
| 12086 | set show_notes "--show-notes" | |
| 12087 | } | |
| 12088 | ||
| 3878e636 ZJS |
12089 | set appname "gitk" |
| 12090 | ||
| 7eb3cb9c | 12091 | set runq {} |
| d698206c PM |
12092 | set history {} |
| 12093 | set historyindex 0 | |
| 908c3585 | 12094 | set fh_serial 0 |
| 908c3585 | 12095 | set nhl_names {} |
| 63b79191 | 12096 | set highlight_paths {} |
| 687c8765 | 12097 | set findpattern {} |
| 1902c270 | 12098 | set searchdirn -forwards |
| 28593d3f PM |
12099 | set boldids {} |
| 12100 | set boldnameids {} | |
| a8d610a2 | 12101 | set diffelide {0 0} |
| 4fb0fa19 | 12102 | set markingmatches 0 |
| 97645683 | 12103 | set linkentercount 0 |
| 0380081c PM |
12104 | set need_redisplay 0 |
| 12105 | set nrows_drawn 0 | |
| 32f1b3e4 | 12106 | set firsttabstop 0 |
| 9f1afe05 | 12107 | |
| 50b44ece PM |
12108 | set nextviewnum 1 |
| 12109 | set curview 0 | |
| a90a6d24 | 12110 | set selectedview 0 |
| b007ee20 CS |
12111 | set selectedhlview [mc "None"] |
| 12112 | set highlight_related [mc "None"] | |
| 687c8765 | 12113 | set highlight_files {} |
| 50b44ece | 12114 | set viewfiles(0) {} |
| a90a6d24 | 12115 | set viewperm(0) 0 |
| 098dd8a3 | 12116 | set viewargs(0) {} |
| 2d480856 | 12117 | set viewargscmd(0) {} |
| 50b44ece | 12118 | |
| 94b4a69f | 12119 | set selectedline {} |
| 6df7403a | 12120 | set numcommits 0 |
| 7fcc92bf | 12121 | set loginstance 0 |
| 098dd8a3 | 12122 | set cmdlineok 0 |
| 1d10f36d | 12123 | set stopped 0 |
| 0fba86b3 | 12124 | set stuffsaved 0 |
| 74daedb6 | 12125 | set patchnum 0 |
| 219ea3a9 | 12126 | set lserial 0 |
| 74cb884f | 12127 | set hasworktree [hasworktree] |
| c332f445 | 12128 | set cdup {} |
| 74cb884f | 12129 | if {[expr {[exec git rev-parse --is-inside-work-tree] == "true"}]} { |
| c332f445 MZ |
12130 | set cdup [exec git rev-parse --show-cdup] |
| 12131 | } | |
| 784b7e2f | 12132 | set worktree [exec git rev-parse --show-toplevel] |
| 1d10f36d | 12133 | setcoords |
| d94f8cd6 | 12134 | makewindow |
| 37871b73 GB |
12135 | catch { |
| 12136 | image create photo gitlogo -width 16 -height 16 | |
| 12137 | ||
| 12138 | image create photo gitlogominus -width 4 -height 2 | |
| 12139 | gitlogominus put #C00000 -to 0 0 4 2 | |
| 12140 | gitlogo copy gitlogominus -to 1 5 | |
| 12141 | gitlogo copy gitlogominus -to 6 5 | |
| 12142 | gitlogo copy gitlogominus -to 11 5 | |
| 12143 | image delete gitlogominus | |
| 12144 | ||
| 12145 | image create photo gitlogoplus -width 4 -height 4 | |
| 12146 | gitlogoplus put #008000 -to 1 0 3 4 | |
| 12147 | gitlogoplus put #008000 -to 0 1 4 3 | |
| 12148 | gitlogo copy gitlogoplus -to 1 9 | |
| 12149 | gitlogo copy gitlogoplus -to 6 9 | |
| 12150 | gitlogo copy gitlogoplus -to 11 9 | |
| 12151 | image delete gitlogoplus | |
| 12152 | ||
| d38d7d49 SB |
12153 | image create photo gitlogo32 -width 32 -height 32 |
| 12154 | gitlogo32 copy gitlogo -zoom 2 2 | |
| 12155 | ||
| 12156 | wm iconphoto . -default gitlogo gitlogo32 | |
| 37871b73 | 12157 | } |
| 0eafba14 PM |
12158 | # wait for the window to become visible |
| 12159 | tkwait visibility . | |
| 3878e636 | 12160 | wm title . "$appname: [reponame]" |
| 478afad6 | 12161 | update |
| 887fe3c4 | 12162 | readrefs |
| a8aaf19c | 12163 | |
| 2d480856 | 12164 | if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} { |
| 50b44ece PM |
12165 | # create a view for the files/dirs specified on the command line |
| 12166 | set curview 1 | |
| a90a6d24 | 12167 | set selectedview 1 |
| 50b44ece | 12168 | set nextviewnum 2 |
| d990cedf | 12169 | set viewname(1) [mc "Command line"] |
| 50b44ece | 12170 | set viewfiles(1) $cmdline_files |
| 098dd8a3 | 12171 | set viewargs(1) $revtreeargs |
| 2d480856 | 12172 | set viewargscmd(1) $revtreeargscmd |
| a90a6d24 | 12173 | set viewperm(1) 0 |
| 3ed31a81 | 12174 | set vdatemode(1) 0 |
| da7c24dd | 12175 | addviewmenu 1 |
| f2d0bbbd PM |
12176 | .bar.view entryconf [mca "Edit view..."] -state normal |
| 12177 | .bar.view entryconf [mca "Delete view"] -state normal | |
| 50b44ece | 12178 | } |
| a90a6d24 PM |
12179 | |
| 12180 | if {[info exists permviews]} { | |
| 12181 | foreach v $permviews { | |
| 12182 | set n $nextviewnum | |
| 12183 | incr nextviewnum | |
| 12184 | set viewname($n) [lindex $v 0] | |
| 12185 | set viewfiles($n) [lindex $v 1] | |
| 098dd8a3 | 12186 | set viewargs($n) [lindex $v 2] |
| 2d480856 | 12187 | set viewargscmd($n) [lindex $v 3] |
| a90a6d24 | 12188 | set viewperm($n) 1 |
| da7c24dd | 12189 | addviewmenu $n |
| a90a6d24 PM |
12190 | } |
| 12191 | } | |
| e4df519f JS |
12192 | |
| 12193 | if {[tk windowingsystem] eq "win32"} { | |
| 12194 | focus -force . | |
| 12195 | } | |
| 12196 | ||
| 567c34e0 | 12197 | getcommits {} |
| adab0dab PT |
12198 | |
| 12199 | # Local variables: | |
| 12200 | # mode: tcl | |
| 12201 | # indent-tabs-mode: t | |
| 12202 | # tab-width: 8 | |
| 12203 | # End: |