projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 1db95b00 PM |
1 | #!/bin/sh |
| 2 | # Tcl ignores the next line -*- tcl -*- \ | |
| 9e026d39 | 3 | exec wish "$0" -- "$@" |
| 1db95b00 | 4 | |
| ee66e089 | 5 | # Copyright © 2005-2008 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 | ||
| 73b6a6cb JH |
10 | proc gitdir {} { |
| 11 | global env | |
| 12 | if {[info exists env(GIT_DIR)]} { | |
| 13 | return $env(GIT_DIR) | |
| 14 | } else { | |
| 5024baa4 | 15 | return [exec git rev-parse --git-dir] |
| 73b6a6cb JH |
16 | } |
| 17 | } | |
| 18 | ||
| 7eb3cb9c PM |
19 | # A simple scheduler for compute-intensive stuff. |
| 20 | # The aim is to make sure that event handlers for GUI actions can | |
| 21 | # run at least every 50-100 ms. Unfortunately fileevent handlers are | |
| 22 | # run before X event handlers, so reading from a fast source can | |
| 23 | # make the GUI completely unresponsive. | |
| 24 | proc run args { | |
| df75e86d | 25 | global isonrunq runq currunq |
| 7eb3cb9c PM |
26 | |
| 27 | set script $args | |
| 28 | if {[info exists isonrunq($script)]} return | |
| df75e86d | 29 | if {$runq eq {} && ![info exists currunq]} { |
| 7eb3cb9c PM |
30 | after idle dorunq |
| 31 | } | |
| 32 | lappend runq [list {} $script] | |
| 33 | set isonrunq($script) 1 | |
| 34 | } | |
| 35 | ||
| 36 | proc filerun {fd script} { | |
| 37 | fileevent $fd readable [list filereadable $fd $script] | |
| 38 | } | |
| 39 | ||
| 40 | proc filereadable {fd script} { | |
| df75e86d | 41 | global runq currunq |
| 7eb3cb9c PM |
42 | |
| 43 | fileevent $fd readable {} | |
| df75e86d | 44 | if {$runq eq {} && ![info exists currunq]} { |
| 7eb3cb9c PM |
45 | after idle dorunq |
| 46 | } | |
| 47 | lappend runq [list $fd $script] | |
| 48 | } | |
| 49 | ||
| 7fcc92bf PM |
50 | proc nukefile {fd} { |
| 51 | global runq | |
| 52 | ||
| 53 | for {set i 0} {$i < [llength $runq]} {} { | |
| 54 | if {[lindex $runq $i 0] eq $fd} { | |
| 55 | set runq [lreplace $runq $i $i] | |
| 56 | } else { | |
| 57 | incr i | |
| 58 | } | |
| 59 | } | |
| 60 | } | |
| 61 | ||
| 7eb3cb9c | 62 | proc dorunq {} { |
| df75e86d | 63 | global isonrunq runq currunq |
| 7eb3cb9c PM |
64 | |
| 65 | set tstart [clock clicks -milliseconds] | |
| 66 | set t0 $tstart | |
| 7fcc92bf | 67 | while {[llength $runq] > 0} { |
| 7eb3cb9c PM |
68 | set fd [lindex $runq 0 0] |
| 69 | set script [lindex $runq 0 1] | |
| df75e86d AG |
70 | set currunq [lindex $runq 0] |
| 71 | set runq [lrange $runq 1 end] | |
| 7eb3cb9c | 72 | set repeat [eval $script] |
| df75e86d | 73 | unset currunq |
| 7eb3cb9c PM |
74 | set t1 [clock clicks -milliseconds] |
| 75 | set t [expr {$t1 - $t0}] | |
| 7eb3cb9c PM |
76 | if {$repeat ne {} && $repeat} { |
| 77 | if {$fd eq {} || $repeat == 2} { | |
| 78 | # script returns 1 if it wants to be readded | |
| 79 | # file readers return 2 if they could do more straight away | |
| 80 | lappend runq [list $fd $script] | |
| 81 | } else { | |
| 82 | fileevent $fd readable [list filereadable $fd $script] | |
| 83 | } | |
| 84 | } elseif {$fd eq {}} { | |
| 85 | unset isonrunq($script) | |
| 86 | } | |
| 87 | set t0 $t1 | |
| 88 | if {$t1 - $tstart >= 80} break | |
| 89 | } | |
| 90 | if {$runq ne {}} { | |
| 91 | after idle dorunq | |
| 92 | } | |
| 93 | } | |
| 94 | ||
| e439e092 AG |
95 | proc reg_instance {fd} { |
| 96 | global commfd leftover loginstance | |
| 97 | ||
| 98 | set i [incr loginstance] | |
| 99 | set commfd($i) $fd | |
| 100 | set leftover($i) {} | |
| 101 | return $i | |
| 102 | } | |
| 103 | ||
| 3ed31a81 PM |
104 | proc unmerged_files {files} { |
| 105 | global nr_unmerged | |
| 106 | ||
| 107 | # find the list of unmerged files | |
| 108 | set mlist {} | |
| 109 | set nr_unmerged 0 | |
| 110 | if {[catch { | |
| 111 | set fd [open "| git ls-files -u" r] | |
| 112 | } err]} { | |
| 113 | show_error {} . "[mc "Couldn't get list of unmerged files:"] $err" | |
| 114 | exit 1 | |
| 115 | } | |
| 116 | while {[gets $fd line] >= 0} { | |
| 117 | set i [string first "\t" $line] | |
| 118 | if {$i < 0} continue | |
| 119 | set fname [string range $line [expr {$i+1}] end] | |
| 120 | if {[lsearch -exact $mlist $fname] >= 0} continue | |
| 121 | incr nr_unmerged | |
| 122 | if {$files eq {} || [path_filter $files $fname]} { | |
| 123 | lappend mlist $fname | |
| 124 | } | |
| 125 | } | |
| 126 | catch {close $fd} | |
| 127 | return $mlist | |
| 128 | } | |
| 129 | ||
| 130 | proc parseviewargs {n arglist} { | |
| ee66e089 | 131 | global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs |
| 3ed31a81 PM |
132 | |
| 133 | set vdatemode($n) 0 | |
| 134 | set vmergeonly($n) 0 | |
| ee66e089 PM |
135 | set glflags {} |
| 136 | set diffargs {} | |
| 137 | set nextisval 0 | |
| 138 | set revargs {} | |
| 139 | set origargs $arglist | |
| 140 | set allknown 1 | |
| 141 | set filtered 0 | |
| 142 | set i -1 | |
| 143 | foreach arg $arglist { | |
| 144 | incr i | |
| 145 | if {$nextisval} { | |
| 146 | lappend glflags $arg | |
| 147 | set nextisval 0 | |
| 148 | continue | |
| 149 | } | |
| 3ed31a81 PM |
150 | switch -glob -- $arg { |
| 151 | "-d" - | |
| 152 | "--date-order" { | |
| 153 | set vdatemode($n) 1 | |
| ee66e089 PM |
154 | # remove from origargs in case we hit an unknown option |
| 155 | set origargs [lreplace $origargs $i $i] | |
| 156 | incr i -1 | |
| 157 | } | |
| ee66e089 PM |
158 | "-[puabwcrRBMC]" - |
| 159 | "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" - | |
| 160 | "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" - | |
| 161 | "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" - | |
| 162 | "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" - | |
| 163 | "--ignore-space-change" - "-U*" - "--unified=*" { | |
| 29582284 PM |
164 | # These request or affect diff output, which we don't want. |
| 165 | # Some could be used to set our defaults for diff display. | |
| ee66e089 PM |
166 | lappend diffargs $arg |
| 167 | } | |
| ee66e089 PM |
168 | "--raw" - "--patch-with-raw" - "--patch-with-stat" - |
| 169 | "--name-only" - "--name-status" - "--color" - "--color-words" - | |
| 170 | "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" - | |
| 171 | "--cc" - "-z" - "--header" - "--parents" - "--boundary" - | |
| 172 | "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" - | |
| 173 | "--timestamp" - "relative-date" - "--date=*" - "--stdin" - | |
| 174 | "--objects" - "--objects-edge" - "--reverse" { | |
| 29582284 PM |
175 | # These cause our parsing of git log's output to fail, or else |
| 176 | # they're options we want to set ourselves, so ignore them. | |
| ee66e089 | 177 | } |
| ee66e089 PM |
178 | "--stat=*" - "--numstat" - "--shortstat" - "--summary" - |
| 179 | "--check" - "--exit-code" - "--quiet" - "--topo-order" - | |
| 180 | "--full-history" - "--dense" - "--sparse" - | |
| 181 | "--follow" - "--left-right" - "--encoding=*" { | |
| 29582284 | 182 | # These are harmless, and some are even useful |
| ee66e089 PM |
183 | lappend glflags $arg |
| 184 | } | |
| ee66e089 PM |
185 | "--diff-filter=*" - "--no-merges" - "--unpacked" - |
| 186 | "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" - | |
| 187 | "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" - | |
| 188 | "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" - | |
| 189 | "--remove-empty" - "--first-parent" - "--cherry-pick" - | |
| 29582284 PM |
190 | "-S*" - "--pickaxe-all" - "--pickaxe-regex" { |
| 191 | # These mean that we get a subset of the commits | |
| ee66e089 PM |
192 | set filtered 1 |
| 193 | lappend glflags $arg | |
| 194 | } | |
| ee66e089 | 195 | "-n" { |
| 29582284 PM |
196 | # This appears to be the only one that has a value as a |
| 197 | # separate word following it | |
| ee66e089 PM |
198 | set filtered 1 |
| 199 | set nextisval 1 | |
| 200 | lappend glflags $arg | |
| 201 | } | |
| 6e7e87c7 | 202 | "--not" - "--all" { |
| ee66e089 | 203 | lappend revargs $arg |
| 3ed31a81 PM |
204 | } |
| 205 | "--merge" { | |
| 206 | set vmergeonly($n) 1 | |
| ee66e089 PM |
207 | # git rev-parse doesn't understand --merge |
| 208 | lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD | |
| 209 | } | |
| ee66e089 | 210 | "-*" { |
| 29582284 | 211 | # Other flag arguments including -<n> |
| ee66e089 PM |
212 | if {[string is digit -strict [string range $arg 1 end]]} { |
| 213 | set filtered 1 | |
| 214 | } else { | |
| 215 | # a flag argument that we don't recognize; | |
| 216 | # that means we can't optimize | |
| 217 | set allknown 0 | |
| 218 | } | |
| 219 | lappend glflags $arg | |
| 3ed31a81 PM |
220 | } |
| 221 | default { | |
| 29582284 | 222 | # Non-flag arguments specify commits or ranges of commits |
| ee66e089 PM |
223 | if {[string match "*...*" $arg]} { |
| 224 | lappend revargs --gitk-symmetric-diff-marker | |
| 225 | } | |
| 226 | lappend revargs $arg | |
| 227 | } | |
| 228 | } | |
| 229 | } | |
| 230 | set vdflags($n) $diffargs | |
| 231 | set vflags($n) $glflags | |
| 232 | set vrevs($n) $revargs | |
| 233 | set vfiltered($n) $filtered | |
| 234 | set vorigargs($n) $origargs | |
| 235 | return $allknown | |
| 236 | } | |
| 237 | ||
| 238 | proc parseviewrevs {view revs} { | |
| 239 | global vposids vnegids | |
| 240 | ||
| 241 | if {$revs eq {}} { | |
| 242 | set revs HEAD | |
| 243 | } | |
| 244 | if {[catch {set ids [eval exec git rev-parse $revs]} err]} { | |
| 245 | # we get stdout followed by stderr in $err | |
| 246 | # for an unknown rev, git rev-parse echoes it and then errors out | |
| 247 | set errlines [split $err "\n"] | |
| 248 | set badrev {} | |
| 249 | for {set l 0} {$l < [llength $errlines]} {incr l} { | |
| 250 | set line [lindex $errlines $l] | |
| 251 | if {!([string length $line] == 40 && [string is xdigit $line])} { | |
| 252 | if {[string match "fatal:*" $line]} { | |
| 253 | if {[string match "fatal: ambiguous argument*" $line] | |
| 254 | && $badrev ne {}} { | |
| 255 | if {[llength $badrev] == 1} { | |
| 256 | set err "unknown revision $badrev" | |
| 257 | } else { | |
| 258 | set err "unknown revisions: [join $badrev ", "]" | |
| 259 | } | |
| 260 | } else { | |
| 261 | set err [join [lrange $errlines $l end] "\n"] | |
| 262 | } | |
| 263 | break | |
| 264 | } | |
| 265 | lappend badrev $line | |
| 266 | } | |
| 267 | } | |
| 3945d2c0 | 268 | error_popup "[mc "Error parsing revisions:"] $err" |
| ee66e089 PM |
269 | return {} |
| 270 | } | |
| 271 | set ret {} | |
| 272 | set pos {} | |
| 273 | set neg {} | |
| 274 | set sdm 0 | |
| 275 | foreach id [split $ids "\n"] { | |
| 276 | if {$id eq "--gitk-symmetric-diff-marker"} { | |
| 277 | set sdm 4 | |
| 278 | } elseif {[string match "^*" $id]} { | |
| 279 | if {$sdm != 1} { | |
| 280 | lappend ret $id | |
| 281 | if {$sdm == 3} { | |
| 282 | set sdm 0 | |
| 283 | } | |
| 284 | } | |
| 285 | lappend neg [string range $id 1 end] | |
| 286 | } else { | |
| 287 | if {$sdm != 2} { | |
| 288 | lappend ret $id | |
| 289 | } else { | |
| 290 | lset ret end [lindex $ret end]...$id | |
| 3ed31a81 | 291 | } |
| ee66e089 | 292 | lappend pos $id |
| 3ed31a81 | 293 | } |
| ee66e089 | 294 | incr sdm -1 |
| 3ed31a81 | 295 | } |
| ee66e089 PM |
296 | set vposids($view) $pos |
| 297 | set vnegids($view) $neg | |
| 298 | return $ret | |
| 3ed31a81 PM |
299 | } |
| 300 | ||
| f9e0b6fb | 301 | # Start off a git log process and arrange to read its output |
| da7c24dd | 302 | proc start_rev_list {view} { |
| 6df7403a | 303 | global startmsecs commitidx viewcomplete curview |
| e439e092 | 304 | global tclencoding |
| ee66e089 | 305 | global viewargs viewargscmd viewfiles vfilelimit |
| d375ef9b | 306 | global showlocalchanges |
| e439e092 | 307 | global viewactive viewinstances vmergeonly |
| cdc8429c | 308 | global mainheadid viewmainheadid viewmainheadid_orig |
| ee66e089 | 309 | global vcanopt vflags vrevs vorigargs |
| 9ccbdfbf | 310 | |
| 9ccbdfbf | 311 | set startmsecs [clock clicks -milliseconds] |
| da7c24dd | 312 | set commitidx($view) 0 |
| 3ed31a81 PM |
313 | # these are set this way for the error exits |
| 314 | set viewcomplete($view) 1 | |
| 315 | set viewactive($view) 0 | |
| 7fcc92bf PM |
316 | varcinit $view |
| 317 | ||
| 2d480856 YD |
318 | set args $viewargs($view) |
| 319 | if {$viewargscmd($view) ne {}} { | |
| 320 | if {[catch { | |
| 321 | set str [exec sh -c $viewargscmd($view)] | |
| 322 | } err]} { | |
| 3945d2c0 | 323 | error_popup "[mc "Error executing --argscmd command:"] $err" |
| 3ed31a81 | 324 | return 0 |
| 2d480856 YD |
325 | } |
| 326 | set args [concat $args [split $str "\n"]] | |
| 327 | } | |
| ee66e089 | 328 | set vcanopt($view) [parseviewargs $view $args] |
| 3ed31a81 PM |
329 | |
| 330 | set files $viewfiles($view) | |
| 331 | if {$vmergeonly($view)} { | |
| 332 | set files [unmerged_files $files] | |
| 333 | if {$files eq {}} { | |
| 334 | global nr_unmerged | |
| 335 | if {$nr_unmerged == 0} { | |
| 336 | error_popup [mc "No files selected: --merge specified but\ | |
| 337 | no files are unmerged."] | |
| 338 | } else { | |
| 339 | error_popup [mc "No files selected: --merge specified but\ | |
| 340 | no unmerged files are within file limit."] | |
| 341 | } | |
| 342 | return 0 | |
| 343 | } | |
| 344 | } | |
| 345 | set vfilelimit($view) $files | |
| 346 | ||
| ee66e089 PM |
347 | if {$vcanopt($view)} { |
| 348 | set revs [parseviewrevs $view $vrevs($view)] | |
| 349 | if {$revs eq {}} { | |
| 350 | return 0 | |
| 351 | } | |
| 352 | set args [concat $vflags($view) $revs] | |
| 353 | } else { | |
| 354 | set args $vorigargs($view) | |
| 355 | } | |
| 356 | ||
| 418c4c7b | 357 | if {[catch { |
| 7fcc92bf | 358 | set fd [open [concat | git log --no-color -z --pretty=raw --parents \ |
| 3ed31a81 | 359 | --boundary $args "--" $files] r] |
| 418c4c7b | 360 | } err]} { |
| 00abadb9 | 361 | error_popup "[mc "Error executing git log:"] $err" |
| 3ed31a81 | 362 | return 0 |
| 1d10f36d | 363 | } |
| e439e092 | 364 | set i [reg_instance $fd] |
| 7fcc92bf | 365 | set viewinstances($view) [list $i] |
| cdc8429c PM |
366 | set viewmainheadid($view) $mainheadid |
| 367 | set viewmainheadid_orig($view) $mainheadid | |
| 368 | if {$files ne {} && $mainheadid ne {}} { | |
| 369 | get_viewmainhead $view | |
| 370 | } | |
| 371 | if {$showlocalchanges && $viewmainheadid($view) ne {}} { | |
| 372 | interestedin $viewmainheadid($view) dodiffindex | |
| 3e6b893f | 373 | } |
| 86da5b6c | 374 | fconfigure $fd -blocking 0 -translation lf -eofchar {} |
| fd8ccbec | 375 | if {$tclencoding != {}} { |
| da7c24dd | 376 | fconfigure $fd -encoding $tclencoding |
| fd8ccbec | 377 | } |
| f806f0fb | 378 | filerun $fd [list getcommitlines $fd $i $view 0] |
| d990cedf | 379 | nowbusy $view [mc "Reading"] |
| 3ed31a81 PM |
380 | set viewcomplete($view) 0 |
| 381 | set viewactive($view) 1 | |
| 382 | return 1 | |
| 38ad0910 PM |
383 | } |
| 384 | ||
| e2f90ee4 AG |
385 | proc stop_instance {inst} { |
| 386 | global commfd leftover | |
| 387 | ||
| 388 | set fd $commfd($inst) | |
| 389 | catch { | |
| 390 | set pid [pid $fd] | |
| b6326e92 AG |
391 | |
| 392 | if {$::tcl_platform(platform) eq {windows}} { | |
| 393 | exec kill -f $pid | |
| 394 | } else { | |
| 395 | exec kill $pid | |
| 396 | } | |
| e2f90ee4 AG |
397 | } |
| 398 | catch {close $fd} | |
| 399 | nukefile $fd | |
| 400 | unset commfd($inst) | |
| 401 | unset leftover($inst) | |
| 402 | } | |
| 403 | ||
| 404 | proc stop_backends {} { | |
| 405 | global commfd | |
| 406 | ||
| 407 | foreach inst [array names commfd] { | |
| 408 | stop_instance $inst | |
| 409 | } | |
| 410 | } | |
| 411 | ||
| 7fcc92bf | 412 | proc stop_rev_list {view} { |
| e2f90ee4 | 413 | global viewinstances |
| 22626ef4 | 414 | |
| 7fcc92bf | 415 | foreach inst $viewinstances($view) { |
| e2f90ee4 | 416 | stop_instance $inst |
| 22626ef4 | 417 | } |
| 7fcc92bf | 418 | set viewinstances($view) {} |
| 22626ef4 PM |
419 | } |
| 420 | ||
| 567c34e0 | 421 | proc reset_pending_select {selid} { |
| 39816d60 | 422 | global pending_select mainheadid selectheadid |
| 567c34e0 AG |
423 | |
| 424 | if {$selid ne {}} { | |
| 425 | set pending_select $selid | |
| 39816d60 AG |
426 | } elseif {$selectheadid ne {}} { |
| 427 | set pending_select $selectheadid | |
| 567c34e0 AG |
428 | } else { |
| 429 | set pending_select $mainheadid | |
| 430 | } | |
| 431 | } | |
| 432 | ||
| 433 | proc getcommits {selid} { | |
| 3ed31a81 | 434 | global canv curview need_redisplay viewactive |
| 38ad0910 | 435 | |
| da7c24dd | 436 | initlayout |
| 3ed31a81 | 437 | if {[start_rev_list $curview]} { |
| 567c34e0 | 438 | reset_pending_select $selid |
| 3ed31a81 PM |
439 | show_status [mc "Reading commits..."] |
| 440 | set need_redisplay 1 | |
| 441 | } else { | |
| 442 | show_status [mc "No commits selected"] | |
| 443 | } | |
| 1d10f36d PM |
444 | } |
| 445 | ||
| 7fcc92bf | 446 | proc updatecommits {} { |
| ee66e089 | 447 | global curview vcanopt vorigargs vfilelimit viewinstances |
| e439e092 AG |
448 | global viewactive viewcomplete tclencoding |
| 449 | global startmsecs showneartags showlocalchanges | |
| cdc8429c | 450 | global mainheadid viewmainheadid viewmainheadid_orig pending_select |
| 92e22ca0 | 451 | global isworktree |
| ee66e089 | 452 | global varcid vposids vnegids vflags vrevs |
| 7fcc92bf | 453 | |
| 92e22ca0 | 454 | set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}] |
| fc2a256f | 455 | rereadrefs |
| cdc8429c PM |
456 | set view $curview |
| 457 | if {$mainheadid ne $viewmainheadid_orig($view)} { | |
| 458 | if {$showlocalchanges} { | |
| eb5f8c9c PM |
459 | dohidelocalchanges |
| 460 | } | |
| cdc8429c PM |
461 | set viewmainheadid($view) $mainheadid |
| 462 | set viewmainheadid_orig($view) $mainheadid | |
| 463 | if {$vfilelimit($view) ne {}} { | |
| 464 | get_viewmainhead $view | |
| eb5f8c9c PM |
465 | } |
| 466 | } | |
| cdc8429c PM |
467 | if {$showlocalchanges} { |
| 468 | doshowlocalchanges | |
| 469 | } | |
| ee66e089 PM |
470 | if {$vcanopt($view)} { |
| 471 | set oldpos $vposids($view) | |
| 472 | set oldneg $vnegids($view) | |
| 473 | set revs [parseviewrevs $view $vrevs($view)] | |
| 474 | if {$revs eq {}} { | |
| 475 | return | |
| 476 | } | |
| 477 | # note: getting the delta when negative refs change is hard, | |
| 478 | # and could require multiple git log invocations, so in that | |
| 479 | # case we ask git log for all the commits (not just the delta) | |
| 480 | if {$oldneg eq $vnegids($view)} { | |
| 481 | set newrevs {} | |
| 482 | set npos 0 | |
| 483 | # take out positive refs that we asked for before or | |
| 484 | # that we have already seen | |
| 485 | foreach rev $revs { | |
| 486 | if {[string length $rev] == 40} { | |
| 487 | if {[lsearch -exact $oldpos $rev] < 0 | |
| 488 | && ![info exists varcid($view,$rev)]} { | |
| 489 | lappend newrevs $rev | |
| 490 | incr npos | |
| 491 | } | |
| 492 | } else { | |
| 493 | lappend $newrevs $rev | |
| 494 | } | |
| 495 | } | |
| 496 | if {$npos == 0} return | |
| 497 | set revs $newrevs | |
| 498 | set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]] | |
| 499 | } | |
| 500 | set args [concat $vflags($view) $revs --not $oldpos] | |
| 501 | } else { | |
| 502 | set args $vorigargs($view) | |
| 503 | } | |
| 7fcc92bf PM |
504 | if {[catch { |
| 505 | set fd [open [concat | git log --no-color -z --pretty=raw --parents \ | |
| ee66e089 | 506 | --boundary $args "--" $vfilelimit($view)] r] |
| 7fcc92bf | 507 | } err]} { |
| 3945d2c0 | 508 | error_popup "[mc "Error executing git log:"] $err" |
| ee66e089 | 509 | return |
| 7fcc92bf PM |
510 | } |
| 511 | if {$viewactive($view) == 0} { | |
| 512 | set startmsecs [clock clicks -milliseconds] | |
| 513 | } | |
| e439e092 | 514 | set i [reg_instance $fd] |
| 7fcc92bf | 515 | lappend viewinstances($view) $i |
| 7fcc92bf PM |
516 | fconfigure $fd -blocking 0 -translation lf -eofchar {} |
| 517 | if {$tclencoding != {}} { | |
| 518 | fconfigure $fd -encoding $tclencoding | |
| 519 | } | |
| f806f0fb | 520 | filerun $fd [list getcommitlines $fd $i $view 1] |
| 7fcc92bf PM |
521 | incr viewactive($view) |
| 522 | set viewcomplete($view) 0 | |
| 567c34e0 | 523 | reset_pending_select {} |
| 7fcc92bf | 524 | nowbusy $view "Reading" |
| 7fcc92bf PM |
525 | if {$showneartags} { |
| 526 | getallcommits | |
| 527 | } | |
| 528 | } | |
| 529 | ||
| 530 | proc reloadcommits {} { | |
| 531 | global curview viewcomplete selectedline currentid thickerline | |
| 532 | global showneartags treediffs commitinterest cached_commitrow | |
| 6df7403a | 533 | global targetid |
| 7fcc92bf | 534 | |
| 567c34e0 AG |
535 | set selid {} |
| 536 | if {$selectedline ne {}} { | |
| 537 | set selid $currentid | |
| 538 | } | |
| 539 | ||
| 7fcc92bf PM |
540 | if {!$viewcomplete($curview)} { |
| 541 | stop_rev_list $curview | |
| 7fcc92bf PM |
542 | } |
| 543 | resetvarcs $curview | |
| 94b4a69f | 544 | set selectedline {} |
| 7fcc92bf PM |
545 | catch {unset currentid} |
| 546 | catch {unset thickerline} | |
| 547 | catch {unset treediffs} | |
| 548 | readrefs | |
| 549 | changedrefs | |
| 550 | if {$showneartags} { | |
| 551 | getallcommits | |
| 552 | } | |
| 553 | clear_display | |
| 554 | catch {unset commitinterest} | |
| 555 | catch {unset cached_commitrow} | |
| 42a671fc | 556 | catch {unset targetid} |
| 7fcc92bf | 557 | setcanvscroll |
| 567c34e0 | 558 | getcommits $selid |
| e7297a1c | 559 | return 0 |
| 7fcc92bf PM |
560 | } |
| 561 | ||
| 6e8c8707 PM |
562 | # This makes a string representation of a positive integer which |
| 563 | # sorts as a string in numerical order | |
| 564 | proc strrep {n} { | |
| 565 | if {$n < 16} { | |
| 566 | return [format "%x" $n] | |
| 567 | } elseif {$n < 256} { | |
| 568 | return [format "x%.2x" $n] | |
| 569 | } elseif {$n < 65536} { | |
| 570 | return [format "y%.4x" $n] | |
| 571 | } | |
| 572 | return [format "z%.8x" $n] | |
| 573 | } | |
| 574 | ||
| 7fcc92bf PM |
575 | # Procedures used in reordering commits from git log (without |
| 576 | # --topo-order) into the order for display. | |
| 577 | ||
| 578 | proc varcinit {view} { | |
| f3ea5ede PM |
579 | global varcstart vupptr vdownptr vleftptr vbackptr varctok varcrow |
| 580 | global vtokmod varcmod vrowmod varcix vlastins | |
| 7fcc92bf | 581 | |
| 7fcc92bf PM |
582 | set varcstart($view) {{}} |
| 583 | set vupptr($view) {0} | |
| 584 | set vdownptr($view) {0} | |
| 585 | set vleftptr($view) {0} | |
| f3ea5ede | 586 | set vbackptr($view) {0} |
| 7fcc92bf PM |
587 | set varctok($view) {{}} |
| 588 | set varcrow($view) {{}} | |
| 589 | set vtokmod($view) {} | |
| 590 | set varcmod($view) 0 | |
| e5b37ac1 | 591 | set vrowmod($view) 0 |
| 7fcc92bf | 592 | set varcix($view) {{}} |
| f3ea5ede | 593 | set vlastins($view) {0} |
| 7fcc92bf PM |
594 | } |
| 595 | ||
| 596 | proc resetvarcs {view} { | |
| 597 | global varcid varccommits parents children vseedcount ordertok | |
| 598 | ||
| 599 | foreach vid [array names varcid $view,*] { | |
| 600 | unset varcid($vid) | |
| 601 | unset children($vid) | |
| 602 | unset parents($vid) | |
| 603 | } | |
| 604 | # some commits might have children but haven't been seen yet | |
| 605 | foreach vid [array names children $view,*] { | |
| 606 | unset children($vid) | |
| 607 | } | |
| 608 | foreach va [array names varccommits $view,*] { | |
| 609 | unset varccommits($va) | |
| 610 | } | |
| 611 | foreach vd [array names vseedcount $view,*] { | |
| 612 | unset vseedcount($vd) | |
| 613 | } | |
| 9257d8f7 | 614 | catch {unset ordertok} |
| 7fcc92bf PM |
615 | } |
| 616 | ||
| 468bcaed PM |
617 | # returns a list of the commits with no children |
| 618 | proc seeds {v} { | |
| 619 | global vdownptr vleftptr varcstart | |
| 620 | ||
| 621 | set ret {} | |
| 622 | set a [lindex $vdownptr($v) 0] | |
| 623 | while {$a != 0} { | |
| 624 | lappend ret [lindex $varcstart($v) $a] | |
| 625 | set a [lindex $vleftptr($v) $a] | |
| 626 | } | |
| 627 | return $ret | |
| 628 | } | |
| 629 | ||
| 7fcc92bf | 630 | proc newvarc {view id} { |
| 3ed31a81 | 631 | global varcid varctok parents children vdatemode |
| f3ea5ede PM |
632 | global vupptr vdownptr vleftptr vbackptr varcrow varcix varcstart |
| 633 | global commitdata commitinfo vseedcount varccommits vlastins | |
| 7fcc92bf PM |
634 | |
| 635 | set a [llength $varctok($view)] | |
| 636 | set vid $view,$id | |
| 3ed31a81 | 637 | if {[llength $children($vid)] == 0 || $vdatemode($view)} { |
| 7fcc92bf PM |
638 | if {![info exists commitinfo($id)]} { |
| 639 | parsecommit $id $commitdata($id) 1 | |
| 640 | } | |
| 641 | set cdate [lindex $commitinfo($id) 4] | |
| 642 | if {![string is integer -strict $cdate]} { | |
| 643 | set cdate 0 | |
| 644 | } | |
| 645 | if {![info exists vseedcount($view,$cdate)]} { | |
| 646 | set vseedcount($view,$cdate) -1 | |
| 647 | } | |
| 648 | set c [incr vseedcount($view,$cdate)] | |
| 649 | set cdate [expr {$cdate ^ 0xffffffff}] | |
| 650 | set tok "s[strrep $cdate][strrep $c]" | |
| 7fcc92bf PM |
651 | } else { |
| 652 | set tok {} | |
| f3ea5ede PM |
653 | } |
| 654 | set ka 0 | |
| 655 | if {[llength $children($vid)] > 0} { | |
| 656 | set kid [lindex $children($vid) end] | |
| 657 | set k $varcid($view,$kid) | |
| 658 | if {[string compare [lindex $varctok($view) $k] $tok] > 0} { | |
| 659 | set ki $kid | |
| 660 | set ka $k | |
| 661 | set tok [lindex $varctok($view) $k] | |
| 7fcc92bf | 662 | } |
| f3ea5ede PM |
663 | } |
| 664 | if {$ka != 0} { | |
| 7fcc92bf PM |
665 | set i [lsearch -exact $parents($view,$ki) $id] |
| 666 | set j [expr {[llength $parents($view,$ki)] - 1 - $i}] | |
| 7fcc92bf PM |
667 | append tok [strrep $j] |
| 668 | } | |
| f3ea5ede PM |
669 | set c [lindex $vlastins($view) $ka] |
| 670 | if {$c == 0 || [string compare $tok [lindex $varctok($view) $c]] < 0} { | |
| 671 | set c $ka | |
| 672 | set b [lindex $vdownptr($view) $ka] | |
| 673 | } else { | |
| 674 | set b [lindex $vleftptr($view) $c] | |
| 675 | } | |
| 676 | while {$b != 0 && [string compare $tok [lindex $varctok($view) $b]] >= 0} { | |
| 677 | set c $b | |
| 678 | set b [lindex $vleftptr($view) $c] | |
| 679 | } | |
| 680 | if {$c == $ka} { | |
| 681 | lset vdownptr($view) $ka $a | |
| 682 | lappend vbackptr($view) 0 | |
| 683 | } else { | |
| 684 | lset vleftptr($view) $c $a | |
| 685 | lappend vbackptr($view) $c | |
| 686 | } | |
| 687 | lset vlastins($view) $ka $a | |
| 688 | lappend vupptr($view) $ka | |
| 689 | lappend vleftptr($view) $b | |
| 690 | if {$b != 0} { | |
| 691 | lset vbackptr($view) $b $a | |
| 692 | } | |
| 7fcc92bf PM |
693 | lappend varctok($view) $tok |
| 694 | lappend varcstart($view) $id | |
| 695 | lappend vdownptr($view) 0 | |
| 696 | lappend varcrow($view) {} | |
| 697 | lappend varcix($view) {} | |
| e5b37ac1 | 698 | set varccommits($view,$a) {} |
| f3ea5ede | 699 | lappend vlastins($view) 0 |
| 7fcc92bf PM |
700 | return $a |
| 701 | } | |
| 702 | ||
| 703 | proc splitvarc {p v} { | |
| 704 | global varcid varcstart varccommits varctok | |
| f3ea5ede | 705 | global vupptr vdownptr vleftptr vbackptr varcix varcrow vlastins |
| 7fcc92bf PM |
706 | |
| 707 | set oa $varcid($v,$p) | |
| 708 | set ac $varccommits($v,$oa) | |
| 709 | set i [lsearch -exact $varccommits($v,$oa) $p] | |
| 710 | if {$i <= 0} return | |
| 711 | set na [llength $varctok($v)] | |
| 712 | # "%" sorts before "0"... | |
| 713 | set tok "[lindex $varctok($v) $oa]%[strrep $i]" | |
| 714 | lappend varctok($v) $tok | |
| 715 | lappend varcrow($v) {} | |
| 716 | lappend varcix($v) {} | |
| 717 | set varccommits($v,$oa) [lrange $ac 0 [expr {$i - 1}]] | |
| 718 | set varccommits($v,$na) [lrange $ac $i end] | |
| 719 | lappend varcstart($v) $p | |
| 720 | foreach id $varccommits($v,$na) { | |
| 721 | set varcid($v,$id) $na | |
| 722 | } | |
| 723 | lappend vdownptr($v) [lindex $vdownptr($v) $oa] | |
| 841ea824 | 724 | lappend vlastins($v) [lindex $vlastins($v) $oa] |
| 7fcc92bf | 725 | lset vdownptr($v) $oa $na |
| 841ea824 | 726 | lset vlastins($v) $oa 0 |
| 7fcc92bf PM |
727 | lappend vupptr($v) $oa |
| 728 | lappend vleftptr($v) 0 | |
| f3ea5ede | 729 | lappend vbackptr($v) 0 |
| 7fcc92bf PM |
730 | for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} { |
| 731 | lset vupptr($v) $b $na | |
| 732 | } | |
| 733 | } | |
| 734 | ||
| 735 | proc renumbervarc {a v} { | |
| 736 | global parents children varctok varcstart varccommits | |
| 3ed31a81 | 737 | global vupptr vdownptr vleftptr vbackptr vlastins varcid vtokmod vdatemode |
| 7fcc92bf PM |
738 | |
| 739 | set t1 [clock clicks -milliseconds] | |
| 740 | set todo {} | |
| 741 | set isrelated($a) 1 | |
| f3ea5ede | 742 | set kidchanged($a) 1 |
| 7fcc92bf PM |
743 | set ntot 0 |
| 744 | while {$a != 0} { | |
| 745 | if {[info exists isrelated($a)]} { | |
| 746 | lappend todo $a | |
| 747 | set id [lindex $varccommits($v,$a) end] | |
| 748 | foreach p $parents($v,$id) { | |
| 749 | if {[info exists varcid($v,$p)]} { | |
| 750 | set isrelated($varcid($v,$p)) 1 | |
| 751 | } | |
| 752 | } | |
| 753 | } | |
| 754 | incr ntot | |
| 755 | set b [lindex $vdownptr($v) $a] | |
| 756 | if {$b == 0} { | |
| 757 | while {$a != 0} { | |
| 758 | set b [lindex $vleftptr($v) $a] | |
| 759 | if {$b != 0} break | |
| 760 | set a [lindex $vupptr($v) $a] | |
| 761 | } | |
| 762 | } | |
| 763 | set a $b | |
| 764 | } | |
| 765 | foreach a $todo { | |
| f3ea5ede | 766 | if {![info exists kidchanged($a)]} continue |
| 7fcc92bf | 767 | set id [lindex $varcstart($v) $a] |
| f3ea5ede PM |
768 | if {[llength $children($v,$id)] > 1} { |
| 769 | set children($v,$id) [lsort -command [list vtokcmp $v] \ | |
| 770 | $children($v,$id)] | |
| 771 | } | |
| 772 | set oldtok [lindex $varctok($v) $a] | |
| 3ed31a81 | 773 | if {!$vdatemode($v)} { |
| f3ea5ede PM |
774 | set tok {} |
| 775 | } else { | |
| 776 | set tok $oldtok | |
| 777 | } | |
| 778 | set ka 0 | |
| c8c9f3d9 PM |
779 | set kid [last_real_child $v,$id] |
| 780 | if {$kid ne {}} { | |
| f3ea5ede PM |
781 | set k $varcid($v,$kid) |
| 782 | if {[string compare [lindex $varctok($v) $k] $tok] > 0} { | |
| 783 | set ki $kid | |
| 784 | set ka $k | |
| 785 | set tok [lindex $varctok($v) $k] | |
| 7fcc92bf PM |
786 | } |
| 787 | } | |
| f3ea5ede | 788 | if {$ka != 0} { |
| 7fcc92bf PM |
789 | set i [lsearch -exact $parents($v,$ki) $id] |
| 790 | set j [expr {[llength $parents($v,$ki)] - 1 - $i}] | |
| 791 | append tok [strrep $j] | |
| 7fcc92bf | 792 | } |
| f3ea5ede PM |
793 | if {$tok eq $oldtok} { |
| 794 | continue | |
| 795 | } | |
| 796 | set id [lindex $varccommits($v,$a) end] | |
| 797 | foreach p $parents($v,$id) { | |
| 798 | if {[info exists varcid($v,$p)]} { | |
| 799 | set kidchanged($varcid($v,$p)) 1 | |
| 800 | } else { | |
| 801 | set sortkids($p) 1 | |
| 802 | } | |
| 803 | } | |
| 804 | lset varctok($v) $a $tok | |
| 7fcc92bf PM |
805 | set b [lindex $vupptr($v) $a] |
| 806 | if {$b != $ka} { | |
| 9257d8f7 PM |
807 | if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} { |
| 808 | modify_arc $v $ka | |
| 38dfe939 | 809 | } |
| 9257d8f7 PM |
810 | if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} { |
| 811 | modify_arc $v $b | |
| 38dfe939 | 812 | } |
| f3ea5ede PM |
813 | set c [lindex $vbackptr($v) $a] |
| 814 | set d [lindex $vleftptr($v) $a] | |
| 815 | if {$c == 0} { | |
| 816 | lset vdownptr($v) $b $d | |
| 7fcc92bf | 817 | } else { |
| f3ea5ede PM |
818 | lset vleftptr($v) $c $d |
| 819 | } | |
| 820 | if {$d != 0} { | |
| 821 | lset vbackptr($v) $d $c | |
| 7fcc92bf | 822 | } |
| 841ea824 PM |
823 | if {[lindex $vlastins($v) $b] == $a} { |
| 824 | lset vlastins($v) $b $c | |
| 825 | } | |
| 7fcc92bf | 826 | lset vupptr($v) $a $ka |
| f3ea5ede PM |
827 | set c [lindex $vlastins($v) $ka] |
| 828 | if {$c == 0 || \ | |
| 829 | [string compare $tok [lindex $varctok($v) $c]] < 0} { | |
| 830 | set c $ka | |
| 831 | set b [lindex $vdownptr($v) $ka] | |
| 832 | } else { | |
| 833 | set b [lindex $vleftptr($v) $c] | |
| 834 | } | |
| 835 | while {$b != 0 && \ | |
| 836 | [string compare $tok [lindex $varctok($v) $b]] >= 0} { | |
| 837 | set c $b | |
| 838 | set b [lindex $vleftptr($v) $c] | |
| 7fcc92bf | 839 | } |
| f3ea5ede PM |
840 | if {$c == $ka} { |
| 841 | lset vdownptr($v) $ka $a | |
| 842 | lset vbackptr($v) $a 0 | |
| 843 | } else { | |
| 844 | lset vleftptr($v) $c $a | |
| 845 | lset vbackptr($v) $a $c | |
| 7fcc92bf | 846 | } |
| f3ea5ede PM |
847 | lset vleftptr($v) $a $b |
| 848 | if {$b != 0} { | |
| 849 | lset vbackptr($v) $b $a | |
| 850 | } | |
| 851 | lset vlastins($v) $ka $a | |
| 852 | } | |
| 853 | } | |
| 854 | foreach id [array names sortkids] { | |
| 855 | if {[llength $children($v,$id)] > 1} { | |
| 856 | set children($v,$id) [lsort -command [list vtokcmp $v] \ | |
| 857 | $children($v,$id)] | |
| 7fcc92bf PM |
858 | } |
| 859 | } | |
| 860 | set t2 [clock clicks -milliseconds] | |
| 861 | #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms" | |
| 862 | } | |
| 863 | ||
| f806f0fb PM |
864 | # Fix up the graph after we have found out that in view $v, |
| 865 | # $p (a commit that we have already seen) is actually the parent | |
| 866 | # of the last commit in arc $a. | |
| 7fcc92bf | 867 | proc fix_reversal {p a v} { |
| 24f7a667 | 868 | global varcid varcstart varctok vupptr |
| 7fcc92bf PM |
869 | |
| 870 | set pa $varcid($v,$p) | |
| 871 | if {$p ne [lindex $varcstart($v) $pa]} { | |
| 872 | splitvarc $p $v | |
| 873 | set pa $varcid($v,$p) | |
| 874 | } | |
| 24f7a667 PM |
875 | # seeds always need to be renumbered |
| 876 | if {[lindex $vupptr($v) $pa] == 0 || | |
| 877 | [string compare [lindex $varctok($v) $a] \ | |
| 878 | [lindex $varctok($v) $pa]] > 0} { | |
| 7fcc92bf PM |
879 | renumbervarc $pa $v |
| 880 | } | |
| 881 | } | |
| 882 | ||
| 883 | proc insertrow {id p v} { | |
| b8a938cf PM |
884 | global cmitlisted children parents varcid varctok vtokmod |
| 885 | global varccommits ordertok commitidx numcommits curview | |
| 886 | global targetid targetrow | |
| 887 | ||
| 888 | readcommit $id | |
| 889 | set vid $v,$id | |
| 890 | set cmitlisted($vid) 1 | |
| 891 | set children($vid) {} | |
| 892 | set parents($vid) [list $p] | |
| 893 | set a [newvarc $v $id] | |
| 894 | set varcid($vid) $a | |
| 895 | if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] < 0} { | |
| 896 | modify_arc $v $a | |
| 897 | } | |
| 898 | lappend varccommits($v,$a) $id | |
| 899 | set vp $v,$p | |
| 900 | if {[llength [lappend children($vp) $id]] > 1} { | |
| 901 | set children($vp) [lsort -command [list vtokcmp $v] $children($vp)] | |
| 902 | catch {unset ordertok} | |
| 903 | } | |
| 904 | fix_reversal $p $a $v | |
| 905 | incr commitidx($v) | |
| 906 | if {$v == $curview} { | |
| 907 | set numcommits $commitidx($v) | |
| 908 | setcanvscroll | |
| 909 | if {[info exists targetid]} { | |
| 910 | if {![comes_before $targetid $p]} { | |
| 911 | incr targetrow | |
| 912 | } | |
| 913 | } | |
| 914 | } | |
| 915 | } | |
| 916 | ||
| 917 | proc insertfakerow {id p} { | |
| 9257d8f7 | 918 | global varcid varccommits parents children cmitlisted |
| b8a938cf | 919 | global commitidx varctok vtokmod targetid targetrow curview numcommits |
| 7fcc92bf | 920 | |
| b8a938cf | 921 | set v $curview |
| 7fcc92bf PM |
922 | set a $varcid($v,$p) |
| 923 | set i [lsearch -exact $varccommits($v,$a) $p] | |
| 924 | if {$i < 0} { | |
| b8a938cf | 925 | puts "oops: insertfakerow can't find [shortids $p] on arc $a" |
| 7fcc92bf PM |
926 | return |
| 927 | } | |
| 928 | set children($v,$id) {} | |
| 929 | set parents($v,$id) [list $p] | |
| 930 | set varcid($v,$id) $a | |
| 9257d8f7 | 931 | lappend children($v,$p) $id |
| 7fcc92bf | 932 | set cmitlisted($v,$id) 1 |
| b8a938cf | 933 | set numcommits [incr commitidx($v)] |
| 7fcc92bf PM |
934 | # note we deliberately don't update varcstart($v) even if $i == 0 |
| 935 | set varccommits($v,$a) [linsert $varccommits($v,$a) $i $id] | |
| c9cfdc96 | 936 | modify_arc $v $a $i |
| 42a671fc PM |
937 | if {[info exists targetid]} { |
| 938 | if {![comes_before $targetid $p]} { | |
| 939 | incr targetrow | |
| 940 | } | |
| 941 | } | |
| b8a938cf | 942 | setcanvscroll |
| 9257d8f7 | 943 | drawvisible |
| 7fcc92bf PM |
944 | } |
| 945 | ||
| b8a938cf | 946 | proc removefakerow {id} { |
| 9257d8f7 | 947 | global varcid varccommits parents children commitidx |
| fc2a256f | 948 | global varctok vtokmod cmitlisted currentid selectedline |
| b8a938cf | 949 | global targetid curview numcommits |
| 7fcc92bf | 950 | |
| b8a938cf | 951 | set v $curview |
| 7fcc92bf | 952 | if {[llength $parents($v,$id)] != 1} { |
| b8a938cf | 953 | puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents" |
| 7fcc92bf PM |
954 | return |
| 955 | } | |
| 956 | set p [lindex $parents($v,$id) 0] | |
| 957 | set a $varcid($v,$id) | |
| 958 | set i [lsearch -exact $varccommits($v,$a) $id] | |
| 959 | if {$i < 0} { | |
| b8a938cf | 960 | puts "oops: removefakerow can't find [shortids $id] on arc $a" |
| 7fcc92bf PM |
961 | return |
| 962 | } | |
| 963 | unset varcid($v,$id) | |
| 964 | set varccommits($v,$a) [lreplace $varccommits($v,$a) $i $i] | |
| 965 | unset parents($v,$id) | |
| 966 | unset children($v,$id) | |
| 967 | unset cmitlisted($v,$id) | |
| b8a938cf | 968 | set numcommits [incr commitidx($v) -1] |
| 7fcc92bf PM |
969 | set j [lsearch -exact $children($v,$p) $id] |
| 970 | if {$j >= 0} { | |
| 971 | set children($v,$p) [lreplace $children($v,$p) $j $j] | |
| 972 | } | |
| c9cfdc96 | 973 | modify_arc $v $a $i |
| fc2a256f PM |
974 | if {[info exist currentid] && $id eq $currentid} { |
| 975 | unset currentid | |
| 94b4a69f | 976 | set selectedline {} |
| fc2a256f | 977 | } |
| 42a671fc PM |
978 | if {[info exists targetid] && $targetid eq $id} { |
| 979 | set targetid $p | |
| 980 | } | |
| b8a938cf | 981 | setcanvscroll |
| 9257d8f7 | 982 | drawvisible |
| 7fcc92bf PM |
983 | } |
| 984 | ||
| c8c9f3d9 PM |
985 | proc first_real_child {vp} { |
| 986 | global children nullid nullid2 | |
| 987 | ||
| 988 | foreach id $children($vp) { | |
| 989 | if {$id ne $nullid && $id ne $nullid2} { | |
| 990 | return $id | |
| 991 | } | |
| 992 | } | |
| 993 | return {} | |
| 994 | } | |
| 995 | ||
| 996 | proc last_real_child {vp} { | |
| 997 | global children nullid nullid2 | |
| 998 | ||
| 999 | set kids $children($vp) | |
| 1000 | for {set i [llength $kids]} {[incr i -1] >= 0} {} { | |
| 1001 | set id [lindex $kids $i] | |
| 1002 | if {$id ne $nullid && $id ne $nullid2} { | |
| 1003 | return $id | |
| 1004 | } | |
| 1005 | } | |
| 1006 | return {} | |
| 1007 | } | |
| 1008 | ||
| 7fcc92bf PM |
1009 | proc vtokcmp {v a b} { |
| 1010 | global varctok varcid | |
| 1011 | ||
| 1012 | return [string compare [lindex $varctok($v) $varcid($v,$a)] \ | |
| 1013 | [lindex $varctok($v) $varcid($v,$b)]] | |
| 1014 | } | |
| 1015 | ||
| c9cfdc96 PM |
1016 | # This assumes that if lim is not given, the caller has checked that |
| 1017 | # arc a's token is less than $vtokmod($v) | |
| e5b37ac1 PM |
1018 | proc modify_arc {v a {lim {}}} { |
| 1019 | global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits | |
| 9257d8f7 | 1020 | |
| c9cfdc96 PM |
1021 | if {$lim ne {}} { |
| 1022 | set c [string compare [lindex $varctok($v) $a] $vtokmod($v)] | |
| 1023 | if {$c > 0} return | |
| 1024 | if {$c == 0} { | |
| 1025 | set r [lindex $varcrow($v) $a] | |
| 1026 | if {$r ne {} && $vrowmod($v) <= $r + $lim} return | |
| 1027 | } | |
| 1028 | } | |
| 9257d8f7 PM |
1029 | set vtokmod($v) [lindex $varctok($v) $a] |
| 1030 | set varcmod($v) $a | |
| 1031 | if {$v == $curview} { | |
| 1032 | while {$a != 0 && [lindex $varcrow($v) $a] eq {}} { | |
| 1033 | set a [lindex $vupptr($v) $a] | |
| e5b37ac1 | 1034 | set lim {} |
| 9257d8f7 | 1035 | } |
| e5b37ac1 PM |
1036 | set r 0 |
| 1037 | if {$a != 0} { | |
| 1038 | if {$lim eq {}} { | |
| 1039 | set lim [llength $varccommits($v,$a)] | |
| 1040 | } | |
| 1041 | set r [expr {[lindex $varcrow($v) $a] + $lim}] | |
| 1042 | } | |
| 1043 | set vrowmod($v) $r | |
| 0c27886e | 1044 | undolayout $r |
| 9257d8f7 PM |
1045 | } |
| 1046 | } | |
| 1047 | ||
| 7fcc92bf | 1048 | proc update_arcrows {v} { |
| e5b37ac1 | 1049 | global vtokmod varcmod vrowmod varcrow commitidx currentid selectedline |
| 24f7a667 | 1050 | global varcid vrownum varcorder varcix varccommits |
| 7fcc92bf | 1051 | global vupptr vdownptr vleftptr varctok |
| 24f7a667 | 1052 | global displayorder parentlist curview cached_commitrow |
| 7fcc92bf | 1053 | |
| c9cfdc96 PM |
1054 | if {$vrowmod($v) == $commitidx($v)} return |
| 1055 | if {$v == $curview} { | |
| 1056 | if {[llength $displayorder] > $vrowmod($v)} { | |
| 1057 | set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]] | |
| 1058 | set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]] | |
| 1059 | } | |
| 1060 | catch {unset cached_commitrow} | |
| 1061 | } | |
| 7fcc92bf PM |
1062 | set narctot [expr {[llength $varctok($v)] - 1}] |
| 1063 | set a $varcmod($v) | |
| 1064 | while {$a != 0 && [lindex $varcix($v) $a] eq {}} { | |
| 1065 | # go up the tree until we find something that has a row number, | |
| 1066 | # or we get to a seed | |
| 1067 | set a [lindex $vupptr($v) $a] | |
| 1068 | } | |
| 1069 | if {$a == 0} { | |
| 1070 | set a [lindex $vdownptr($v) 0] | |
| 1071 | if {$a == 0} return | |
| 1072 | set vrownum($v) {0} | |
| 1073 | set varcorder($v) [list $a] | |
| 1074 | lset varcix($v) $a 0 | |
| 1075 | lset varcrow($v) $a 0 | |
| 1076 | set arcn 0 | |
| 1077 | set row 0 | |
| 1078 | } else { | |
| 1079 | set arcn [lindex $varcix($v) $a] | |
| 7fcc92bf PM |
1080 | if {[llength $vrownum($v)] > $arcn + 1} { |
| 1081 | set vrownum($v) [lrange $vrownum($v) 0 $arcn] | |
| 1082 | set varcorder($v) [lrange $varcorder($v) 0 $arcn] | |
| 1083 | } | |
| 1084 | set row [lindex $varcrow($v) $a] | |
| 1085 | } | |
| 7fcc92bf PM |
1086 | while {1} { |
| 1087 | set p $a | |
| 1088 | incr row [llength $varccommits($v,$a)] | |
| 1089 | # go down if possible | |
| 1090 | set b [lindex $vdownptr($v) $a] | |
| 1091 | if {$b == 0} { | |
| 1092 | # if not, go left, or go up until we can go left | |
| 1093 | while {$a != 0} { | |
| 1094 | set b [lindex $vleftptr($v) $a] | |
| 1095 | if {$b != 0} break | |
| 1096 | set a [lindex $vupptr($v) $a] | |
| 1097 | } | |
| 1098 | if {$a == 0} break | |
| 1099 | } | |
| 1100 | set a $b | |
| 1101 | incr arcn | |
| 1102 | lappend vrownum($v) $row | |
| 1103 | lappend varcorder($v) $a | |
| 1104 | lset varcix($v) $a $arcn | |
| 1105 | lset varcrow($v) $a $row | |
| 1106 | } | |
| e5b37ac1 PM |
1107 | set vtokmod($v) [lindex $varctok($v) $p] |
| 1108 | set varcmod($v) $p | |
| 1109 | set vrowmod($v) $row | |
| 7fcc92bf PM |
1110 | if {[info exists currentid]} { |
| 1111 | set selectedline [rowofcommit $currentid] | |
| 1112 | } | |
| 7fcc92bf PM |
1113 | } |
| 1114 | ||
| 1115 | # Test whether view $v contains commit $id | |
| 1116 | proc commitinview {id v} { | |
| 1117 | global varcid | |
| 1118 | ||
| 1119 | return [info exists varcid($v,$id)] | |
| 1120 | } | |
| 1121 | ||
| 1122 | # Return the row number for commit $id in the current view | |
| 1123 | proc rowofcommit {id} { | |
| 1124 | global varcid varccommits varcrow curview cached_commitrow | |
| 9257d8f7 | 1125 | global varctok vtokmod |
| 7fcc92bf | 1126 | |
| 7fcc92bf PM |
1127 | set v $curview |
| 1128 | if {![info exists varcid($v,$id)]} { | |
| 1129 | puts "oops rowofcommit no arc for [shortids $id]" | |
| 1130 | return {} | |
| 1131 | } | |
| 1132 | set a $varcid($v,$id) | |
| fc2a256f | 1133 | if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} { |
| 9257d8f7 PM |
1134 | update_arcrows $v |
| 1135 | } | |
| 31c0eaa8 PM |
1136 | if {[info exists cached_commitrow($id)]} { |
| 1137 | return $cached_commitrow($id) | |
| 1138 | } | |
| 7fcc92bf PM |
1139 | set i [lsearch -exact $varccommits($v,$a) $id] |
| 1140 | if {$i < 0} { | |
| 1141 | puts "oops didn't find commit [shortids $id] in arc $a" | |
| 1142 | return {} | |
| 1143 | } | |
| 1144 | incr i [lindex $varcrow($v) $a] | |
| 1145 | set cached_commitrow($id) $i | |
| 1146 | return $i | |
| 1147 | } | |
| 1148 | ||
| 42a671fc PM |
1149 | # Returns 1 if a is on an earlier row than b, otherwise 0 |
| 1150 | proc comes_before {a b} { | |
| 1151 | global varcid varctok curview | |
| 1152 | ||
| 1153 | set v $curview | |
| 1154 | if {$a eq $b || ![info exists varcid($v,$a)] || \ | |
| 1155 | ![info exists varcid($v,$b)]} { | |
| 1156 | return 0 | |
| 1157 | } | |
| 1158 | if {$varcid($v,$a) != $varcid($v,$b)} { | |
| 1159 | return [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \ | |
| 1160 | [lindex $varctok($v) $varcid($v,$b)]] < 0}] | |
| 1161 | } | |
| 1162 | return [expr {[rowofcommit $a] < [rowofcommit $b]}] | |
| 1163 | } | |
| 1164 | ||
| 7fcc92bf PM |
1165 | proc bsearch {l elt} { |
| 1166 | if {[llength $l] == 0 || $elt <= [lindex $l 0]} { | |
| 1167 | return 0 | |
| 1168 | } | |
| 1169 | set lo 0 | |
| 1170 | set hi [llength $l] | |
| 1171 | while {$hi - $lo > 1} { | |
| 1172 | set mid [expr {int(($lo + $hi) / 2)}] | |
| 1173 | set t [lindex $l $mid] | |
| 1174 | if {$elt < $t} { | |
| 1175 | set hi $mid | |
| 1176 | } elseif {$elt > $t} { | |
| 1177 | set lo $mid | |
| 1178 | } else { | |
| 1179 | return $mid | |
| 1180 | } | |
| 1181 | } | |
| 1182 | return $lo | |
| 1183 | } | |
| 1184 | ||
| 1185 | # Make sure rows $start..$end-1 are valid in displayorder and parentlist | |
| 1186 | proc make_disporder {start end} { | |
| 1187 | global vrownum curview commitidx displayorder parentlist | |
| e5b37ac1 | 1188 | global varccommits varcorder parents vrowmod varcrow |
| 7fcc92bf PM |
1189 | global d_valid_start d_valid_end |
| 1190 | ||
| e5b37ac1 | 1191 | if {$end > $vrowmod($curview)} { |
| 9257d8f7 PM |
1192 | update_arcrows $curview |
| 1193 | } | |
| 7fcc92bf PM |
1194 | set ai [bsearch $vrownum($curview) $start] |
| 1195 | set start [lindex $vrownum($curview) $ai] | |
| 1196 | set narc [llength $vrownum($curview)] | |
| 1197 | for {set r $start} {$ai < $narc && $r < $end} {incr ai} { | |
| 1198 | set a [lindex $varcorder($curview) $ai] | |
| 1199 | set l [llength $displayorder] | |
| 1200 | set al [llength $varccommits($curview,$a)] | |
| 1201 | if {$l < $r + $al} { | |
| 1202 | if {$l < $r} { | |
| 1203 | set pad [ntimes [expr {$r - $l}] {}] | |
| 1204 | set displayorder [concat $displayorder $pad] | |
| 1205 | set parentlist [concat $parentlist $pad] | |
| 1206 | } elseif {$l > $r} { | |
| 1207 | set displayorder [lrange $displayorder 0 [expr {$r - 1}]] | |
| 1208 | set parentlist [lrange $parentlist 0 [expr {$r - 1}]] | |
| 1209 | } | |
| 1210 | foreach id $varccommits($curview,$a) { | |
| 1211 | lappend displayorder $id | |
| 1212 | lappend parentlist $parents($curview,$id) | |
| 1213 | } | |
| 17529cf9 | 1214 | } elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} { |
| 7fcc92bf PM |
1215 | set i $r |
| 1216 | foreach id $varccommits($curview,$a) { | |
| 1217 | lset displayorder $i $id | |
| 1218 | lset parentlist $i $parents($curview,$id) | |
| 1219 | incr i | |
| 1220 | } | |
| 1221 | } | |
| 1222 | incr r $al | |
| 1223 | } | |
| 1224 | } | |
| 1225 | ||
| 1226 | proc commitonrow {row} { | |
| 1227 | global displayorder | |
| 1228 | ||
| 1229 | set id [lindex $displayorder $row] | |
| 1230 | if {$id eq {}} { | |
| 1231 | make_disporder $row [expr {$row + 1}] | |
| 1232 | set id [lindex $displayorder $row] | |
| 1233 | } | |
| 1234 | return $id | |
| 1235 | } | |
| 1236 | ||
| 1237 | proc closevarcs {v} { | |
| 1238 | global varctok varccommits varcid parents children | |
| d375ef9b | 1239 | global cmitlisted commitidx vtokmod |
| 7fcc92bf PM |
1240 | |
| 1241 | set missing_parents 0 | |
| 1242 | set scripts {} | |
| 1243 | set narcs [llength $varctok($v)] | |
| 1244 | for {set a 1} {$a < $narcs} {incr a} { | |
| 1245 | set id [lindex $varccommits($v,$a) end] | |
| 1246 | foreach p $parents($v,$id) { | |
| 1247 | if {[info exists varcid($v,$p)]} continue | |
| 1248 | # add p as a new commit | |
| 1249 | incr missing_parents | |
| 1250 | set cmitlisted($v,$p) 0 | |
| 1251 | set parents($v,$p) {} | |
| 1252 | if {[llength $children($v,$p)] == 1 && | |
| 1253 | [llength $parents($v,$id)] == 1} { | |
| 1254 | set b $a | |
| 1255 | } else { | |
| 1256 | set b [newvarc $v $p] | |
| 1257 | } | |
| 1258 | set varcid($v,$p) $b | |
| 9257d8f7 PM |
1259 | if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} { |
| 1260 | modify_arc $v $b | |
| 7fcc92bf | 1261 | } |
| e5b37ac1 | 1262 | lappend varccommits($v,$b) $p |
| 7fcc92bf | 1263 | incr commitidx($v) |
| d375ef9b | 1264 | set scripts [check_interest $p $scripts] |
| 7fcc92bf PM |
1265 | } |
| 1266 | } | |
| 1267 | if {$missing_parents > 0} { | |
| 7fcc92bf PM |
1268 | foreach s $scripts { |
| 1269 | eval $s | |
| 1270 | } | |
| 1271 | } | |
| 1272 | } | |
| 1273 | ||
| f806f0fb PM |
1274 | # Use $rwid as a substitute for $id, i.e. reparent $id's children to $rwid |
| 1275 | # Assumes we already have an arc for $rwid. | |
| 1276 | proc rewrite_commit {v id rwid} { | |
| 1277 | global children parents varcid varctok vtokmod varccommits | |
| 1278 | ||
| 1279 | foreach ch $children($v,$id) { | |
| 1280 | # make $rwid be $ch's parent in place of $id | |
| 1281 | set i [lsearch -exact $parents($v,$ch) $id] | |
| 1282 | if {$i < 0} { | |
| 1283 | puts "oops rewrite_commit didn't find $id in parent list for $ch" | |
| 1284 | } | |
| 1285 | set parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid] | |
| 1286 | # add $ch to $rwid's children and sort the list if necessary | |
| 1287 | if {[llength [lappend children($v,$rwid) $ch]] > 1} { | |
| 1288 | set children($v,$rwid) [lsort -command [list vtokcmp $v] \ | |
| 1289 | $children($v,$rwid)] | |
| 1290 | } | |
| 1291 | # fix the graph after joining $id to $rwid | |
| 1292 | set a $varcid($v,$ch) | |
| 1293 | fix_reversal $rwid $a $v | |
| c9cfdc96 PM |
1294 | # parentlist is wrong for the last element of arc $a |
| 1295 | # even if displayorder is right, hence the 3rd arg here | |
| 1296 | modify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}] | |
| f806f0fb PM |
1297 | } |
| 1298 | } | |
| 1299 | ||
| d375ef9b PM |
1300 | # Mechanism for registering a command to be executed when we come |
| 1301 | # across a particular commit. To handle the case when only the | |
| 1302 | # prefix of the commit is known, the commitinterest array is now | |
| 1303 | # indexed by the first 4 characters of the ID. Each element is a | |
| 1304 | # list of id, cmd pairs. | |
| 1305 | proc interestedin {id cmd} { | |
| 1306 | global commitinterest | |
| 1307 | ||
| 1308 | lappend commitinterest([string range $id 0 3]) $id $cmd | |
| 1309 | } | |
| 1310 | ||
| 1311 | proc check_interest {id scripts} { | |
| 1312 | global commitinterest | |
| 1313 | ||
| 1314 | set prefix [string range $id 0 3] | |
| 1315 | if {[info exists commitinterest($prefix)]} { | |
| 1316 | set newlist {} | |
| 1317 | foreach {i script} $commitinterest($prefix) { | |
| 1318 | if {[string match "$i*" $id]} { | |
| 1319 | lappend scripts [string map [list "%I" $id "%P" $i] $script] | |
| 1320 | } else { | |
| 1321 | lappend newlist $i $script | |
| 1322 | } | |
| 1323 | } | |
| 1324 | if {$newlist ne {}} { | |
| 1325 | set commitinterest($prefix) $newlist | |
| 1326 | } else { | |
| 1327 | unset commitinterest($prefix) | |
| 1328 | } | |
| 1329 | } | |
| 1330 | return $scripts | |
| 1331 | } | |
| 1332 | ||
| f806f0fb | 1333 | proc getcommitlines {fd inst view updating} { |
| d375ef9b | 1334 | global cmitlisted leftover |
| 3ed31a81 | 1335 | global commitidx commitdata vdatemode |
| 7fcc92bf | 1336 | global parents children curview hlview |
| 468bcaed | 1337 | global idpending ordertok |
| 3ed31a81 | 1338 | global varccommits varcid varctok vtokmod vfilelimit |
| 9ccbdfbf | 1339 | |
| d1e46756 | 1340 | set stuff [read $fd 500000] |
| 005a2f4e | 1341 | # git log doesn't terminate the last commit with a null... |
| 7fcc92bf | 1342 | if {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} { |
| 005a2f4e PM |
1343 | set stuff "\0" |
| 1344 | } | |
| b490a991 | 1345 | if {$stuff == {}} { |
| 7eb3cb9c PM |
1346 | if {![eof $fd]} { |
| 1347 | return 1 | |
| 1348 | } | |
| 6df7403a | 1349 | global commfd viewcomplete viewactive viewname |
| 7fcc92bf PM |
1350 | global viewinstances |
| 1351 | unset commfd($inst) | |
| 1352 | set i [lsearch -exact $viewinstances($view) $inst] | |
| 1353 | if {$i >= 0} { | |
| 1354 | set viewinstances($view) [lreplace $viewinstances($view) $i $i] | |
| b0cdca99 | 1355 | } |
| f0654861 | 1356 | # set it blocking so we wait for the process to terminate |
| da7c24dd | 1357 | fconfigure $fd -blocking 1 |
| 098dd8a3 PM |
1358 | if {[catch {close $fd} err]} { |
| 1359 | set fv {} | |
| 1360 | if {$view != $curview} { | |
| 1361 | set fv " for the \"$viewname($view)\" view" | |
| da7c24dd | 1362 | } |
| 098dd8a3 PM |
1363 | if {[string range $err 0 4] == "usage"} { |
| 1364 | set err "Gitk: error reading commits$fv:\ | |
| f9e0b6fb | 1365 | bad arguments to git log." |
| 098dd8a3 PM |
1366 | if {$viewname($view) eq "Command line"} { |
| 1367 | append err \ | |
| f9e0b6fb | 1368 | " (Note: arguments to gitk are passed to git log\ |
| 098dd8a3 PM |
1369 | to allow selection of commits to be displayed.)" |
| 1370 | } | |
| 1371 | } else { | |
| 1372 | set err "Error reading commits$fv: $err" | |
| 1373 | } | |
| 1374 | error_popup $err | |
| 1d10f36d | 1375 | } |
| 7fcc92bf PM |
1376 | if {[incr viewactive($view) -1] <= 0} { |
| 1377 | set viewcomplete($view) 1 | |
| 1378 | # Check if we have seen any ids listed as parents that haven't | |
| 1379 | # appeared in the list | |
| 1380 | closevarcs $view | |
| 1381 | notbusy $view | |
| 7fcc92bf | 1382 | } |
| 098dd8a3 | 1383 | if {$view == $curview} { |
| ac1276ab | 1384 | run chewcommits |
| 9a40c50c | 1385 | } |
| 7eb3cb9c | 1386 | return 0 |
| 9a40c50c | 1387 | } |
| b490a991 | 1388 | set start 0 |
| 8f7d0cec | 1389 | set gotsome 0 |
| 7fcc92bf | 1390 | set scripts {} |
| b490a991 PM |
1391 | while 1 { |
| 1392 | set i [string first "\0" $stuff $start] | |
| 1393 | if {$i < 0} { | |
| 7fcc92bf | 1394 | append leftover($inst) [string range $stuff $start end] |
| 9f1afe05 | 1395 | break |
| 9ccbdfbf | 1396 | } |
| b490a991 | 1397 | if {$start == 0} { |
| 7fcc92bf | 1398 | set cmit $leftover($inst) |
| 8f7d0cec | 1399 | append cmit [string range $stuff 0 [expr {$i - 1}]] |
| 7fcc92bf | 1400 | set leftover($inst) {} |
| 8f7d0cec PM |
1401 | } else { |
| 1402 | set cmit [string range $stuff $start [expr {$i - 1}]] | |
| b490a991 PM |
1403 | } |
| 1404 | set start [expr {$i + 1}] | |
| e5ea701b PM |
1405 | set j [string first "\n" $cmit] |
| 1406 | set ok 0 | |
| 16c1ff96 | 1407 | set listed 1 |
| c961b228 PM |
1408 | if {$j >= 0 && [string match "commit *" $cmit]} { |
| 1409 | set ids [string range $cmit 7 [expr {$j - 1}]] | |
| 1407ade9 | 1410 | if {[string match {[-^<>]*} $ids]} { |
| c961b228 PM |
1411 | switch -- [string index $ids 0] { |
| 1412 | "-" {set listed 0} | |
| 1407ade9 LT |
1413 | "^" {set listed 2} |
| 1414 | "<" {set listed 3} | |
| 1415 | ">" {set listed 4} | |
| c961b228 | 1416 | } |
| 16c1ff96 PM |
1417 | set ids [string range $ids 1 end] |
| 1418 | } | |
| e5ea701b PM |
1419 | set ok 1 |
| 1420 | foreach id $ids { | |
| 8f7d0cec | 1421 | if {[string length $id] != 40} { |
| e5ea701b PM |
1422 | set ok 0 |
| 1423 | break | |
| 1424 | } | |
| 1425 | } | |
| 1426 | } | |
| 1427 | if {!$ok} { | |
| 7e952e79 PM |
1428 | set shortcmit $cmit |
| 1429 | if {[string length $shortcmit] > 80} { | |
| 1430 | set shortcmit "[string range $shortcmit 0 80]..." | |
| 1431 | } | |
| d990cedf | 1432 | error_popup "[mc "Can't parse git log output:"] {$shortcmit}" |
| b490a991 PM |
1433 | exit 1 |
| 1434 | } | |
| e5ea701b | 1435 | set id [lindex $ids 0] |
| 7fcc92bf | 1436 | set vid $view,$id |
| f806f0fb PM |
1437 | |
| 1438 | if {!$listed && $updating && ![info exists varcid($vid)] && | |
| 3ed31a81 | 1439 | $vfilelimit($view) ne {}} { |
| f806f0fb PM |
1440 | # git log doesn't rewrite parents for unlisted commits |
| 1441 | # when doing path limiting, so work around that here | |
| 1442 | # by working out the rewritten parent with git rev-list | |
| 1443 | # and if we already know about it, using the rewritten | |
| 1444 | # parent as a substitute parent for $id's children. | |
| 1445 | if {![catch { | |
| 1446 | set rwid [exec git rev-list --first-parent --max-count=1 \ | |
| 3ed31a81 | 1447 | $id -- $vfilelimit($view)] |
| f806f0fb PM |
1448 | }]} { |
| 1449 | if {$rwid ne {} && [info exists varcid($view,$rwid)]} { | |
| 1450 | # use $rwid in place of $id | |
| 1451 | rewrite_commit $view $id $rwid | |
| 1452 | continue | |
| 1453 | } | |
| 1454 | } | |
| 1455 | } | |
| 1456 | ||
| f1bf4ee6 PM |
1457 | set a 0 |
| 1458 | if {[info exists varcid($vid)]} { | |
| 1459 | if {$cmitlisted($vid) || !$listed} continue | |
| 1460 | set a $varcid($vid) | |
| 1461 | } | |
| 16c1ff96 PM |
1462 | if {$listed} { |
| 1463 | set olds [lrange $ids 1 end] | |
| 16c1ff96 PM |
1464 | } else { |
| 1465 | set olds {} | |
| 1466 | } | |
| f7a3e8d2 | 1467 | set commitdata($id) [string range $cmit [expr {$j + 1}] end] |
| 7fcc92bf PM |
1468 | set cmitlisted($vid) $listed |
| 1469 | set parents($vid) $olds | |
| 7fcc92bf PM |
1470 | if {![info exists children($vid)]} { |
| 1471 | set children($vid) {} | |
| f1bf4ee6 | 1472 | } elseif {$a == 0 && [llength $children($vid)] == 1} { |
| f3ea5ede PM |
1473 | set k [lindex $children($vid) 0] |
| 1474 | if {[llength $parents($view,$k)] == 1 && | |
| 3ed31a81 | 1475 | (!$vdatemode($view) || |
| f3ea5ede PM |
1476 | $varcid($view,$k) == [llength $varctok($view)] - 1)} { |
| 1477 | set a $varcid($view,$k) | |
| 7fcc92bf | 1478 | } |
| da7c24dd | 1479 | } |
| 7fcc92bf PM |
1480 | if {$a == 0} { |
| 1481 | # new arc | |
| 1482 | set a [newvarc $view $id] | |
| 1483 | } | |
| e5b37ac1 PM |
1484 | if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} { |
| 1485 | modify_arc $view $a | |
| 1486 | } | |
| f1bf4ee6 PM |
1487 | if {![info exists varcid($vid)]} { |
| 1488 | set varcid($vid) $a | |
| 1489 | lappend varccommits($view,$a) $id | |
| 1490 | incr commitidx($view) | |
| 1491 | } | |
| e5b37ac1 | 1492 | |
| 7fcc92bf PM |
1493 | set i 0 |
| 1494 | foreach p $olds { | |
| 1495 | if {$i == 0 || [lsearch -exact $olds $p] >= $i} { | |
| 1496 | set vp $view,$p | |
| 1497 | if {[llength [lappend children($vp) $id]] > 1 && | |
| 1498 | [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} { | |
| 1499 | set children($vp) [lsort -command [list vtokcmp $view] \ | |
| 1500 | $children($vp)] | |
| 9257d8f7 | 1501 | catch {unset ordertok} |
| 7fcc92bf | 1502 | } |
| f3ea5ede PM |
1503 | if {[info exists varcid($view,$p)]} { |
| 1504 | fix_reversal $p $a $view | |
| 1505 | } | |
| 7fcc92bf PM |
1506 | } |
| 1507 | incr i | |
| 1508 | } | |
| 7fcc92bf | 1509 | |
| d375ef9b | 1510 | set scripts [check_interest $id $scripts] |
| 8f7d0cec PM |
1511 | set gotsome 1 |
| 1512 | } | |
| 1513 | if {$gotsome} { | |
| ac1276ab PM |
1514 | global numcommits hlview |
| 1515 | ||
| 1516 | if {$view == $curview} { | |
| 1517 | set numcommits $commitidx($view) | |
| 1518 | run chewcommits | |
| 1519 | } | |
| 1520 | if {[info exists hlview] && $view == $hlview} { | |
| 1521 | # we never actually get here... | |
| 1522 | run vhighlightmore | |
| 1523 | } | |
| 7fcc92bf PM |
1524 | foreach s $scripts { |
| 1525 | eval $s | |
| 1526 | } | |
| 9ccbdfbf | 1527 | } |
| 7eb3cb9c | 1528 | return 2 |
| 9ccbdfbf PM |
1529 | } |
| 1530 | ||
| ac1276ab | 1531 | proc chewcommits {} { |
| f5f3c2e2 | 1532 | global curview hlview viewcomplete |
| 7fcc92bf | 1533 | global pending_select |
| 7eb3cb9c | 1534 | |
| ac1276ab PM |
1535 | layoutmore |
| 1536 | if {$viewcomplete($curview)} { | |
| 1537 | global commitidx varctok | |
| 1538 | global numcommits startmsecs | |
| ac1276ab PM |
1539 | |
| 1540 | if {[info exists pending_select]} { | |
| 835e62ae AG |
1541 | update |
| 1542 | reset_pending_select {} | |
| 1543 | ||
| 1544 | if {[commitinview $pending_select $curview]} { | |
| 1545 | selectline [rowofcommit $pending_select] 1 | |
| 1546 | } else { | |
| 1547 | set row [first_real_row] | |
| 1548 | selectline $row 1 | |
| 1549 | } | |
| 7eb3cb9c | 1550 | } |
| ac1276ab PM |
1551 | if {$commitidx($curview) > 0} { |
| 1552 | #set ms [expr {[clock clicks -milliseconds] - $startmsecs}] | |
| 1553 | #puts "overall $ms ms for $numcommits commits" | |
| 1554 | #puts "[llength $varctok($view)] arcs, $commitidx($view) commits" | |
| 1555 | } else { | |
| 1556 | show_status [mc "No commits selected"] | |
| 1557 | } | |
| 1558 | notbusy layout | |
| b664550c | 1559 | } |
| f5f3c2e2 | 1560 | return 0 |
| 1db95b00 PM |
1561 | } |
| 1562 | ||
| 590915da AG |
1563 | proc do_readcommit {id} { |
| 1564 | global tclencoding | |
| 1565 | ||
| 1566 | # Invoke git-log to handle automatic encoding conversion | |
| 1567 | set fd [open [concat | git log --no-color --pretty=raw -1 $id] r] | |
| 1568 | # Read the results using i18n.logoutputencoding | |
| 1569 | fconfigure $fd -translation lf -eofchar {} | |
| 1570 | if {$tclencoding != {}} { | |
| 1571 | fconfigure $fd -encoding $tclencoding | |
| 1572 | } | |
| 1573 | set contents [read $fd] | |
| 1574 | close $fd | |
| 1575 | # Remove the heading line | |
| 1576 | regsub {^commit [0-9a-f]+\n} $contents {} contents | |
| 1577 | ||
| 1578 | return $contents | |
| 1579 | } | |
| 1580 | ||
| 1db95b00 | 1581 | proc readcommit {id} { |
| 590915da AG |
1582 | if {[catch {set contents [do_readcommit $id]}]} return |
| 1583 | parsecommit $id $contents 1 | |
| b490a991 PM |
1584 | } |
| 1585 | ||
| 8f7d0cec | 1586 | proc parsecommit {id contents listed} { |
| b5c2f306 SV |
1587 | global commitinfo cdate |
| 1588 | ||
| 1589 | set inhdr 1 | |
| 1590 | set comment {} | |
| 1591 | set headline {} | |
| 1592 | set auname {} | |
| 1593 | set audate {} | |
| 1594 | set comname {} | |
| 1595 | set comdate {} | |
| 232475d3 PM |
1596 | set hdrend [string first "\n\n" $contents] |
| 1597 | if {$hdrend < 0} { | |
| 1598 | # should never happen... | |
| 1599 | set hdrend [string length $contents] | |
| 1600 | } | |
| 1601 | set header [string range $contents 0 [expr {$hdrend - 1}]] | |
| 1602 | set comment [string range $contents [expr {$hdrend + 2}] end] | |
| 1603 | foreach line [split $header "\n"] { | |
| 1604 | set tag [lindex $line 0] | |
| 1605 | if {$tag == "author"} { | |
| 1606 | set audate [lindex $line end-1] | |
| 1607 | set auname [lrange $line 1 end-2] | |
| 1608 | } elseif {$tag == "committer"} { | |
| 1609 | set comdate [lindex $line end-1] | |
| 1610 | set comname [lrange $line 1 end-2] | |
| 1db95b00 PM |
1611 | } |
| 1612 | } | |
| 232475d3 | 1613 | set headline {} |
| 43c25074 PM |
1614 | # take the first non-blank line of the comment as the headline |
| 1615 | set headline [string trimleft $comment] | |
| 1616 | set i [string first "\n" $headline] | |
| 232475d3 | 1617 | if {$i >= 0} { |
| 43c25074 PM |
1618 | set headline [string range $headline 0 $i] |
| 1619 | } | |
| 1620 | set headline [string trimright $headline] | |
| 1621 | set i [string first "\r" $headline] | |
| 1622 | if {$i >= 0} { | |
| 1623 | set headline [string trimright [string range $headline 0 $i]] | |
| 232475d3 PM |
1624 | } |
| 1625 | if {!$listed} { | |
| f9e0b6fb | 1626 | # git log indents the comment by 4 spaces; |
| 8974c6f9 | 1627 | # if we got this via git cat-file, add the indentation |
| 232475d3 PM |
1628 | set newcomment {} |
| 1629 | foreach line [split $comment "\n"] { | |
| 1630 | append newcomment " " | |
| 1631 | append newcomment $line | |
| f6e2869f | 1632 | append newcomment "\n" |
| 232475d3 PM |
1633 | } |
| 1634 | set comment $newcomment | |
| 1db95b00 PM |
1635 | } |
| 1636 | if {$comdate != {}} { | |
| cfb4563c | 1637 | set cdate($id) $comdate |
| 1db95b00 | 1638 | } |
| e5c2d856 PM |
1639 | set commitinfo($id) [list $headline $auname $audate \ |
| 1640 | $comname $comdate $comment] | |
| 1db95b00 PM |
1641 | } |
| 1642 | ||
| f7a3e8d2 | 1643 | proc getcommit {id} { |
| 79b2c75e | 1644 | global commitdata commitinfo |
| 8ed16484 | 1645 | |
| f7a3e8d2 PM |
1646 | if {[info exists commitdata($id)]} { |
| 1647 | parsecommit $id $commitdata($id) 1 | |
| 8ed16484 PM |
1648 | } else { |
| 1649 | readcommit $id | |
| 1650 | if {![info exists commitinfo($id)]} { | |
| d990cedf | 1651 | set commitinfo($id) [list [mc "No commit information available"]] |
| 8ed16484 PM |
1652 | } |
| 1653 | } | |
| 1654 | return 1 | |
| 1655 | } | |
| 1656 | ||
| d375ef9b PM |
1657 | # Expand an abbreviated commit ID to a list of full 40-char IDs that match |
| 1658 | # and are present in the current view. | |
| 1659 | # This is fairly slow... | |
| 1660 | proc longid {prefix} { | |
| 1661 | global varcid curview | |
| 1662 | ||
| 1663 | set ids {} | |
| 1664 | foreach match [array names varcid "$curview,$prefix*"] { | |
| 1665 | lappend ids [lindex [split $match ","] 1] | |
| 1666 | } | |
| 1667 | return $ids | |
| 1668 | } | |
| 1669 | ||
| 887fe3c4 | 1670 | proc readrefs {} { |
| 62d3ea65 | 1671 | global tagids idtags headids idheads tagobjid |
| 219ea3a9 | 1672 | global otherrefids idotherrefs mainhead mainheadid |
| 39816d60 | 1673 | global selecthead selectheadid |
| 106288cb | 1674 | |
| b5c2f306 SV |
1675 | foreach v {tagids idtags headids idheads otherrefids idotherrefs} { |
| 1676 | catch {unset $v} | |
| 1677 | } | |
| 62d3ea65 PM |
1678 | set refd [open [list | git show-ref -d] r] |
| 1679 | while {[gets $refd line] >= 0} { | |
| 1680 | if {[string index $line 40] ne " "} continue | |
| 1681 | set id [string range $line 0 39] | |
| 1682 | set ref [string range $line 41 end] | |
| 1683 | if {![string match "refs/*" $ref]} continue | |
| 1684 | set name [string range $ref 5 end] | |
| 1685 | if {[string match "remotes/*" $name]} { | |
| 1686 | if {![string match "*/HEAD" $name]} { | |
| 1687 | set headids($name) $id | |
| 1688 | lappend idheads($id) $name | |
| f1d83ba3 | 1689 | } |
| 62d3ea65 PM |
1690 | } elseif {[string match "heads/*" $name]} { |
| 1691 | set name [string range $name 6 end] | |
| 36a7cad6 JH |
1692 | set headids($name) $id |
| 1693 | lappend idheads($id) $name | |
| 62d3ea65 PM |
1694 | } elseif {[string match "tags/*" $name]} { |
| 1695 | # this lets refs/tags/foo^{} overwrite refs/tags/foo, | |
| 1696 | # which is what we want since the former is the commit ID | |
| 1697 | set name [string range $name 5 end] | |
| 1698 | if {[string match "*^{}" $name]} { | |
| 1699 | set name [string range $name 0 end-3] | |
| 1700 | } else { | |
| 1701 | set tagobjid($name) $id | |
| 1702 | } | |
| 1703 | set tagids($name) $id | |
| 1704 | lappend idtags($id) $name | |
| 36a7cad6 JH |
1705 | } else { |
| 1706 | set otherrefids($name) $id | |
| 1707 | lappend idotherrefs($id) $name | |
| f1d83ba3 PM |
1708 | } |
| 1709 | } | |
| 062d671f | 1710 | catch {close $refd} |
| 8a48571c | 1711 | set mainhead {} |
| 219ea3a9 | 1712 | set mainheadid {} |
| 8a48571c | 1713 | catch { |
| c11ff120 | 1714 | set mainheadid [exec git rev-parse HEAD] |
| 8a48571c PM |
1715 | set thehead [exec git symbolic-ref HEAD] |
| 1716 | if {[string match "refs/heads/*" $thehead]} { | |
| 1717 | set mainhead [string range $thehead 11 end] | |
| 1718 | } | |
| 1719 | } | |
| 39816d60 AG |
1720 | set selectheadid {} |
| 1721 | if {$selecthead ne {}} { | |
| 1722 | catch { | |
| 1723 | set selectheadid [exec git rev-parse --verify $selecthead] | |
| 1724 | } | |
| 1725 | } | |
| 887fe3c4 PM |
1726 | } |
| 1727 | ||
| 8f489363 PM |
1728 | # skip over fake commits |
| 1729 | proc first_real_row {} { | |
| 7fcc92bf | 1730 | global nullid nullid2 numcommits |
| 8f489363 PM |
1731 | |
| 1732 | for {set row 0} {$row < $numcommits} {incr row} { | |
| 7fcc92bf | 1733 | set id [commitonrow $row] |
| 8f489363 PM |
1734 | if {$id ne $nullid && $id ne $nullid2} { |
| 1735 | break | |
| 1736 | } | |
| 1737 | } | |
| 1738 | return $row | |
| 1739 | } | |
| 1740 | ||
| e11f1233 PM |
1741 | # update things for a head moved to a child of its previous location |
| 1742 | proc movehead {id name} { | |
| 1743 | global headids idheads | |
| 1744 | ||
| 1745 | removehead $headids($name) $name | |
| 1746 | set headids($name) $id | |
| 1747 | lappend idheads($id) $name | |
| 1748 | } | |
| 1749 | ||
| 1750 | # update things when a head has been removed | |
| 1751 | proc removehead {id name} { | |
| 1752 | global headids idheads | |
| 1753 | ||
| 1754 | if {$idheads($id) eq $name} { | |
| 1755 | unset idheads($id) | |
| 1756 | } else { | |
| 1757 | set i [lsearch -exact $idheads($id) $name] | |
| 1758 | if {$i >= 0} { | |
| 1759 | set idheads($id) [lreplace $idheads($id) $i $i] | |
| 1760 | } | |
| 1761 | } | |
| 1762 | unset headids($name) | |
| 1763 | } | |
| 1764 | ||
| e7d64008 AG |
1765 | proc make_transient {window origin} { |
| 1766 | global have_tk85 | |
| 1767 | ||
| 1768 | # In MacOS Tk 8.4 transient appears to work by setting | |
| 1769 | # overrideredirect, which is utterly useless, since the | |
| 1770 | # windows get no border, and are not even kept above | |
| 1771 | # the parent. | |
| 1772 | if {!$have_tk85 && [tk windowingsystem] eq {aqua}} return | |
| 1773 | ||
| 1774 | wm transient $window $origin | |
| 1775 | ||
| 1776 | # Windows fails to place transient windows normally, so | |
| 1777 | # schedule a callback to center them on the parent. | |
| 1778 | if {[tk windowingsystem] eq {win32}} { | |
| 1779 | after idle [list tk::PlaceWindow $window widget $origin] | |
| 1780 | } | |
| 1781 | } | |
| 1782 | ||
| e54be9e3 | 1783 | proc show_error {w top msg} { |
| df3d83b1 PM |
1784 | message $w.m -text $msg -justify center -aspect 400 |
| 1785 | pack $w.m -side top -fill x -padx 20 -pady 20 | |
| d990cedf | 1786 | button $w.ok -text [mc OK] -command "destroy $top" |
| df3d83b1 | 1787 | pack $w.ok -side bottom -fill x |
| e54be9e3 PM |
1788 | bind $top <Visibility> "grab $top; focus $top" |
| 1789 | bind $top <Key-Return> "destroy $top" | |
| 76f15947 AG |
1790 | bind $top <Key-space> "destroy $top" |
| 1791 | bind $top <Key-Escape> "destroy $top" | |
| e54be9e3 | 1792 | tkwait window $top |
| df3d83b1 PM |
1793 | } |
| 1794 | ||
| 84a76f18 | 1795 | proc error_popup {msg {owner .}} { |
| 098dd8a3 PM |
1796 | set w .error |
| 1797 | toplevel $w | |
| e7d64008 | 1798 | make_transient $w $owner |
| e54be9e3 | 1799 | show_error $w $w $msg |
| 098dd8a3 PM |
1800 | } |
| 1801 | ||
| 84a76f18 | 1802 | proc confirm_popup {msg {owner .}} { |
| 10299152 PM |
1803 | global confirm_ok |
| 1804 | set confirm_ok 0 | |
| 1805 | set w .confirm | |
| 1806 | toplevel $w | |
| e7d64008 | 1807 | make_transient $w $owner |
| 10299152 PM |
1808 | message $w.m -text $msg -justify center -aspect 400 |
| 1809 | pack $w.m -side top -fill x -padx 20 -pady 20 | |
| d990cedf | 1810 | button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w" |
| 10299152 | 1811 | pack $w.ok -side left -fill x |
| d990cedf | 1812 | button $w.cancel -text [mc Cancel] -command "destroy $w" |
| 10299152 PM |
1813 | pack $w.cancel -side right -fill x |
| 1814 | bind $w <Visibility> "grab $w; focus $w" | |
| 76f15947 AG |
1815 | bind $w <Key-Return> "set confirm_ok 1; destroy $w" |
| 1816 | bind $w <Key-space> "set confirm_ok 1; destroy $w" | |
| 1817 | bind $w <Key-Escape> "destroy $w" | |
| 10299152 PM |
1818 | tkwait window $w |
| 1819 | return $confirm_ok | |
| 1820 | } | |
| 1821 | ||
| b039f0a6 PM |
1822 | proc setoptions {} { |
| 1823 | option add *Panedwindow.showHandle 1 startupFile | |
| 1824 | option add *Panedwindow.sashRelief raised startupFile | |
| 1825 | option add *Button.font uifont startupFile | |
| 1826 | option add *Checkbutton.font uifont startupFile | |
| 1827 | option add *Radiobutton.font uifont startupFile | |
| 1828 | option add *Menu.font uifont startupFile | |
| 1829 | option add *Menubutton.font uifont startupFile | |
| 1830 | option add *Label.font uifont startupFile | |
| 1831 | option add *Message.font uifont startupFile | |
| 1832 | option add *Entry.font uifont startupFile | |
| 1833 | } | |
| 1834 | ||
| 79056034 PM |
1835 | # Make a menu and submenus. |
| 1836 | # m is the window name for the menu, items is the list of menu items to add. | |
| 1837 | # Each item is a list {mc label type description options...} | |
| 1838 | # mc is ignored; it's so we can put mc there to alert xgettext | |
| 1839 | # label is the string that appears in the menu | |
| 1840 | # type is cascade, command or radiobutton (should add checkbutton) | |
| 1841 | # description depends on type; it's the sublist for cascade, the | |
| 1842 | # command to invoke for command, or {variable value} for radiobutton | |
| f2d0bbbd PM |
1843 | proc makemenu {m items} { |
| 1844 | menu $m | |
| cea07cf8 AG |
1845 | if {[tk windowingsystem] eq {aqua}} { |
| 1846 | set Meta1 Cmd | |
| 1847 | } else { | |
| 1848 | set Meta1 Ctrl | |
| 1849 | } | |
| f2d0bbbd | 1850 | foreach i $items { |
| 79056034 PM |
1851 | set name [mc [lindex $i 1]] |
| 1852 | set type [lindex $i 2] | |
| 1853 | set thing [lindex $i 3] | |
| f2d0bbbd PM |
1854 | set params [list $type] |
| 1855 | if {$name ne {}} { | |
| 1856 | set u [string first "&" [string map {&& x} $name]] | |
| 1857 | lappend params -label [string map {&& & & {}} $name] | |
| 1858 | if {$u >= 0} { | |
| 1859 | lappend params -underline $u | |
| 1860 | } | |
| 1861 | } | |
| 1862 | switch -- $type { | |
| 1863 | "cascade" { | |
| 79056034 | 1864 | set submenu [string tolower [string map {& ""} [lindex $i 1]]] |
| f2d0bbbd PM |
1865 | lappend params -menu $m.$submenu |
| 1866 | } | |
| 1867 | "command" { | |
| 1868 | lappend params -command $thing | |
| 1869 | } | |
| 1870 | "radiobutton" { | |
| 1871 | lappend params -variable [lindex $thing 0] \ | |
| 1872 | -value [lindex $thing 1] | |
| 1873 | } | |
| 1874 | } | |
| cea07cf8 AG |
1875 | set tail [lrange $i 4 end] |
| 1876 | regsub -all {\yMeta1\y} $tail $Meta1 tail | |
| 1877 | eval $m add $params $tail | |
| f2d0bbbd PM |
1878 | if {$type eq "cascade"} { |
| 1879 | makemenu $m.$submenu $thing | |
| 1880 | } | |
| 1881 | } | |
| 1882 | } | |
| 1883 | ||
| 1884 | # translate string and remove ampersands | |
| 1885 | proc mca {str} { | |
| 1886 | return [string map {&& & & {}} [mc $str]] | |
| 1887 | } | |
| 1888 | ||
| d94f8cd6 | 1889 | proc makewindow {} { |
| 31c0eaa8 | 1890 | global canv canv2 canv3 linespc charspc ctext cflist cscroll |
| 9c311b32 | 1891 | global tabstop |
| b74fd579 | 1892 | global findtype findtypemenu findloc findstring fstring geometry |
| 887fe3c4 | 1893 | global entries sha1entry sha1string sha1but |
| 890fae70 | 1894 | global diffcontextstring diffcontext |
| b9b86007 | 1895 | global ignorespace |
| 94a2eede | 1896 | global maincursor textcursor curtextcursor |
| 219ea3a9 | 1897 | global rowctxmenu fakerowmenu mergemax wrapcomment |
| 60f7a7dc | 1898 | global highlight_files gdttype |
| 3ea06f9f | 1899 | global searchstring sstring |
| 60378c0c | 1900 | global bgcolor fgcolor bglist fglist diffcolors selectbgcolor |
| bb3edc8b PM |
1901 | global headctxmenu progresscanv progressitem progresscoords statusw |
| 1902 | global fprogitem fprogcoord lastprogupdate progupdatepending | |
| 6df7403a | 1903 | global rprogitem rprogcoord rownumsel numcommits |
| 32f1b3e4 | 1904 | global have_tk85 |
| 9a40c50c | 1905 | |
| 79056034 PM |
1906 | # The "mc" arguments here are purely so that xgettext |
| 1907 | # sees the following string as needing to be translated | |
| f2d0bbbd | 1908 | makemenu .bar { |
| 79056034 PM |
1909 | {mc "File" cascade { |
| 1910 | {mc "Update" command updatecommits -accelerator F5} | |
| cea07cf8 | 1911 | {mc "Reload" command reloadcommits -accelerator Meta1-F5} |
| 79056034 | 1912 | {mc "Reread references" command rereadrefs} |
| cea07cf8 | 1913 | {mc "List references" command showrefs -accelerator F2} |
| 7fb0abb1 AG |
1914 | {xx "" separator} |
| 1915 | {mc "Start git gui" command {exec git gui &}} | |
| 1916 | {xx "" separator} | |
| cea07cf8 | 1917 | {mc "Quit" command doquit -accelerator Meta1-Q} |
| f2d0bbbd | 1918 | }} |
| 79056034 PM |
1919 | {mc "Edit" cascade { |
| 1920 | {mc "Preferences" command doprefs} | |
| f2d0bbbd | 1921 | }} |
| 79056034 | 1922 | {mc "View" cascade { |
| cea07cf8 AG |
1923 | {mc "New view..." command {newview 0} -accelerator Shift-F4} |
| 1924 | {mc "Edit view..." command editview -state disabled -accelerator F4} | |
| 79056034 PM |
1925 | {mc "Delete view" command delview -state disabled} |
| 1926 | {xx "" separator} | |
| 1927 | {mc "All files" radiobutton {selectedview 0} -command {showview 0}} | |
| f2d0bbbd | 1928 | }} |
| 79056034 PM |
1929 | {mc "Help" cascade { |
| 1930 | {mc "About gitk" command about} | |
| 1931 | {mc "Key bindings" command keys} | |
| f2d0bbbd PM |
1932 | }} |
| 1933 | } | |
| 9a40c50c PM |
1934 | . configure -menu .bar |
| 1935 | ||
| e9937d2a | 1936 | # the gui has upper and lower half, parts of a paned window. |
| 0327d27a | 1937 | panedwindow .ctop -orient vertical |
| e9937d2a JH |
1938 | |
| 1939 | # possibly use assumed geometry | |
| 9ca72f4f | 1940 | if {![info exists geometry(pwsash0)]} { |
| e9937d2a JH |
1941 | set geometry(topheight) [expr {15 * $linespc}] |
| 1942 | set geometry(topwidth) [expr {80 * $charspc}] | |
| 1943 | set geometry(botheight) [expr {15 * $linespc}] | |
| 1944 | set geometry(botwidth) [expr {50 * $charspc}] | |
| 9ca72f4f ML |
1945 | set geometry(pwsash0) "[expr {40 * $charspc}] 2" |
| 1946 | set geometry(pwsash1) "[expr {60 * $charspc}] 2" | |
| e9937d2a JH |
1947 | } |
| 1948 | ||
| 1949 | # the upper half will have a paned window, a scroll bar to the right, and some stuff below | |
| 1950 | frame .tf -height $geometry(topheight) -width $geometry(topwidth) | |
| 1951 | frame .tf.histframe | |
| 1952 | panedwindow .tf.histframe.pwclist -orient horizontal -sashpad 0 -handlesize 4 | |
| 1953 | ||
| 1954 | # create three canvases | |
| 1955 | set cscroll .tf.histframe.csb | |
| 1956 | set canv .tf.histframe.pwclist.canv | |
| 9ca72f4f | 1957 | canvas $canv \ |
| 60378c0c | 1958 | -selectbackground $selectbgcolor \ |
| f8a2c0d1 | 1959 | -background $bgcolor -bd 0 \ |
| 9f1afe05 | 1960 | -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll" |
| e9937d2a JH |
1961 | .tf.histframe.pwclist add $canv |
| 1962 | set canv2 .tf.histframe.pwclist.canv2 | |
| 9ca72f4f | 1963 | canvas $canv2 \ |
| 60378c0c | 1964 | -selectbackground $selectbgcolor \ |
| f8a2c0d1 | 1965 | -background $bgcolor -bd 0 -yscrollincr $linespc |
| e9937d2a JH |
1966 | .tf.histframe.pwclist add $canv2 |
| 1967 | set canv3 .tf.histframe.pwclist.canv3 | |
| 9ca72f4f | 1968 | canvas $canv3 \ |
| 60378c0c | 1969 | -selectbackground $selectbgcolor \ |
| f8a2c0d1 | 1970 | -background $bgcolor -bd 0 -yscrollincr $linespc |
| e9937d2a | 1971 | .tf.histframe.pwclist add $canv3 |
| 9ca72f4f ML |
1972 | eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0) |
| 1973 | eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1) | |
| e9937d2a JH |
1974 | |
| 1975 | # a scroll bar to rule them | |
| 1976 | scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0 | |
| 1977 | pack $cscroll -side right -fill y | |
| 1978 | bind .tf.histframe.pwclist <Configure> {resizeclistpanes %W %w} | |
| f8a2c0d1 | 1979 | lappend bglist $canv $canv2 $canv3 |
| e9937d2a | 1980 | pack .tf.histframe.pwclist -fill both -expand 1 -side left |
| 98f350e5 | 1981 | |
| e9937d2a JH |
1982 | # we have two button bars at bottom of top frame. Bar 1 |
| 1983 | frame .tf.bar | |
| 1984 | frame .tf.lbar -height 15 | |
| 1985 | ||
| 1986 | set sha1entry .tf.bar.sha1 | |
| 887fe3c4 | 1987 | set entries $sha1entry |
| e9937d2a | 1988 | set sha1but .tf.bar.sha1label |
| d990cedf | 1989 | button $sha1but -text [mc "SHA1 ID: "] -state disabled -relief flat \ |
| b039f0a6 | 1990 | -command gotocommit -width 8 |
| 887fe3c4 | 1991 | $sha1but conf -disabledforeground [$sha1but cget -foreground] |
| e9937d2a | 1992 | pack .tf.bar.sha1label -side left |
| 9c311b32 | 1993 | entry $sha1entry -width 40 -font textfont -textvariable sha1string |
| 887fe3c4 | 1994 | trace add variable sha1string write sha1change |
| 98f350e5 | 1995 | pack $sha1entry -side left -pady 2 |
| d698206c PM |
1996 | |
| 1997 | image create bitmap bm-left -data { | |
| 1998 | #define left_width 16 | |
| 1999 | #define left_height 16 | |
| 2000 | static unsigned char left_bits[] = { | |
| 2001 | 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00, | |
| 2002 | 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00, | |
| 2003 | 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01}; | |
| 2004 | } | |
| 2005 | image create bitmap bm-right -data { | |
| 2006 | #define right_width 16 | |
| 2007 | #define right_height 16 | |
| 2008 | static unsigned char right_bits[] = { | |
| 2009 | 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c, | |
| 2010 | 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c, | |
| 2011 | 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01}; | |
| 2012 | } | |
| e9937d2a | 2013 | button .tf.bar.leftbut -image bm-left -command goback \ |
| d698206c | 2014 | -state disabled -width 26 |
| e9937d2a JH |
2015 | pack .tf.bar.leftbut -side left -fill y |
| 2016 | button .tf.bar.rightbut -image bm-right -command goforw \ | |
| d698206c | 2017 | -state disabled -width 26 |
| e9937d2a | 2018 | pack .tf.bar.rightbut -side left -fill y |
| d698206c | 2019 | |
| 6df7403a PM |
2020 | label .tf.bar.rowlabel -text [mc "Row"] |
| 2021 | set rownumsel {} | |
| 2022 | label .tf.bar.rownum -width 7 -font textfont -textvariable rownumsel \ | |
| 2023 | -relief sunken -anchor e | |
| 2024 | label .tf.bar.rowlabel2 -text "/" | |
| 2025 | label .tf.bar.numcommits -width 7 -font textfont -textvariable numcommits \ | |
| 2026 | -relief sunken -anchor e | |
| 2027 | pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \ | |
| 2028 | -side left | |
| 2029 | global selectedline | |
| 94b4a69f | 2030 | trace add variable selectedline write selectedline_change |
| 6df7403a | 2031 | |
| bb3edc8b PM |
2032 | # Status label and progress bar |
| 2033 | set statusw .tf.bar.status | |
| b039f0a6 | 2034 | label $statusw -width 15 -relief sunken |
| bb3edc8b | 2035 | pack $statusw -side left -padx 5 |
| 9c311b32 | 2036 | set h [expr {[font metrics uifont -linespace] + 2}] |
| bb3edc8b PM |
2037 | set progresscanv .tf.bar.progress |
| 2038 | canvas $progresscanv -relief sunken -height $h -borderwidth 2 | |
| 2039 | set progressitem [$progresscanv create rect -1 0 0 $h -fill green] | |
| 2040 | set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow] | |
| a137a90f | 2041 | set rprogitem [$progresscanv create rect -1 0 0 $h -fill red] |
| bb3edc8b PM |
2042 | pack $progresscanv -side right -expand 1 -fill x |
| 2043 | set progresscoords {0 0} | |
| 2044 | set fprogcoord 0 | |
| a137a90f | 2045 | set rprogcoord 0 |
| bb3edc8b PM |
2046 | bind $progresscanv <Configure> adjustprogress |
| 2047 | set lastprogupdate [clock clicks -milliseconds] | |
| 2048 | set progupdatepending 0 | |
| 2049 | ||
| 687c8765 | 2050 | # build up the bottom bar of upper window |
| b039f0a6 PM |
2051 | label .tf.lbar.flabel -text "[mc "Find"] " |
| 2052 | button .tf.lbar.fnext -text [mc "next"] -command {dofind 1 1} | |
| 2053 | button .tf.lbar.fprev -text [mc "prev"] -command {dofind -1 1} | |
| 2054 | label .tf.lbar.flab2 -text " [mc "commit"] " | |
| 687c8765 PM |
2055 | pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \ |
| 2056 | -side left -fill y | |
| b007ee20 | 2057 | set gdttype [mc "containing:"] |
| 687c8765 | 2058 | set gm [tk_optionMenu .tf.lbar.gdttype gdttype \ |
| b007ee20 CS |
2059 | [mc "containing:"] \ |
| 2060 | [mc "touching paths:"] \ | |
| 2061 | [mc "adding/removing string:"]] | |
| 687c8765 | 2062 | trace add variable gdttype write gdttype_change |
| 687c8765 PM |
2063 | pack .tf.lbar.gdttype -side left -fill y |
| 2064 | ||
| 98f350e5 | 2065 | set findstring {} |
| 687c8765 | 2066 | set fstring .tf.lbar.findstring |
| 887fe3c4 | 2067 | lappend entries $fstring |
| 9c311b32 | 2068 | entry $fstring -width 30 -font textfont -textvariable findstring |
| 60f7a7dc | 2069 | trace add variable findstring write find_change |
| b007ee20 | 2070 | set findtype [mc "Exact"] |
| 687c8765 | 2071 | set findtypemenu [tk_optionMenu .tf.lbar.findtype \ |
| b007ee20 | 2072 | findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]] |
| 687c8765 | 2073 | trace add variable findtype write findcom_change |
| b007ee20 CS |
2074 | set findloc [mc "All fields"] |
| 2075 | tk_optionMenu .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \ | |
| 2076 | [mc "Comments"] [mc "Author"] [mc "Committer"] | |
| 60f7a7dc | 2077 | trace add variable findloc write find_change |
| 687c8765 PM |
2078 | pack .tf.lbar.findloc -side right |
| 2079 | pack .tf.lbar.findtype -side right | |
| 2080 | pack $fstring -side left -expand 1 -fill x | |
| e9937d2a JH |
2081 | |
| 2082 | # Finish putting the upper half of the viewer together | |
| 2083 | pack .tf.lbar -in .tf -side bottom -fill x | |
| 2084 | pack .tf.bar -in .tf -side bottom -fill x | |
| 2085 | pack .tf.histframe -fill both -side top -expand 1 | |
| 2086 | .ctop add .tf | |
| 9ca72f4f ML |
2087 | .ctop paneconfigure .tf -height $geometry(topheight) |
| 2088 | .ctop paneconfigure .tf -width $geometry(topwidth) | |
| e9937d2a JH |
2089 | |
| 2090 | # now build up the bottom | |
| 2091 | panedwindow .pwbottom -orient horizontal | |
| 2092 | ||
| 2093 | # lower left, a text box over search bar, scroll bar to the right | |
| 2094 | # if we know window height, then that will set the lower text height, otherwise | |
| 2095 | # we set lower text height which will drive window height | |
| 2096 | if {[info exists geometry(main)]} { | |
| 2097 | frame .bleft -width $geometry(botwidth) | |
| 2098 | } else { | |
| 2099 | frame .bleft -width $geometry(botwidth) -height $geometry(botheight) | |
| 2100 | } | |
| 2101 | frame .bleft.top | |
| a8d610a2 | 2102 | frame .bleft.mid |
| 8809d691 | 2103 | frame .bleft.bottom |
| e9937d2a | 2104 | |
| b039f0a6 | 2105 | button .bleft.top.search -text [mc "Search"] -command dosearch |
| e9937d2a JH |
2106 | pack .bleft.top.search -side left -padx 5 |
| 2107 | set sstring .bleft.top.sstring | |
| 9c311b32 | 2108 | entry $sstring -width 20 -font textfont -textvariable searchstring |
| 3ea06f9f PM |
2109 | lappend entries $sstring |
| 2110 | trace add variable searchstring write incrsearch | |
| 2111 | pack $sstring -side left -expand 1 -fill x | |
| b039f0a6 | 2112 | radiobutton .bleft.mid.diff -text [mc "Diff"] \ |
| a8d610a2 | 2113 | -command changediffdisp -variable diffelide -value {0 0} |
| b039f0a6 | 2114 | radiobutton .bleft.mid.old -text [mc "Old version"] \ |
| a8d610a2 | 2115 | -command changediffdisp -variable diffelide -value {0 1} |
| b039f0a6 | 2116 | radiobutton .bleft.mid.new -text [mc "New version"] \ |
| a8d610a2 | 2117 | -command changediffdisp -variable diffelide -value {1 0} |
| b039f0a6 | 2118 | label .bleft.mid.labeldiffcontext -text " [mc "Lines of context"]: " |
| a8d610a2 | 2119 | pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left |
| 9c311b32 | 2120 | spinbox .bleft.mid.diffcontext -width 5 -font textfont \ |
| 890fae70 SP |
2121 | -from 1 -increment 1 -to 10000000 \ |
| 2122 | -validate all -validatecommand "diffcontextvalidate %P" \ | |
| 2123 | -textvariable diffcontextstring | |
| 2124 | .bleft.mid.diffcontext set $diffcontext | |
| 2125 | trace add variable diffcontextstring write diffcontextchange | |
| 2126 | lappend entries .bleft.mid.diffcontext | |
| 2127 | pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left | |
| b9b86007 SP |
2128 | checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \ |
| 2129 | -command changeignorespace -variable ignorespace | |
| 2130 | pack .bleft.mid.ignspace -side left -padx 5 | |
| 8809d691 | 2131 | set ctext .bleft.bottom.ctext |
| f8a2c0d1 | 2132 | text $ctext -background $bgcolor -foreground $fgcolor \ |
| 9c311b32 | 2133 | -state disabled -font textfont \ |
| 8809d691 PK |
2134 | -yscrollcommand scrolltext -wrap none \ |
| 2135 | -xscrollcommand ".bleft.bottom.sbhorizontal set" | |
| 32f1b3e4 PM |
2136 | if {$have_tk85} { |
| 2137 | $ctext conf -tabstyle wordprocessor | |
| 2138 | } | |
| 8809d691 PK |
2139 | scrollbar .bleft.bottom.sb -command "$ctext yview" |
| 2140 | scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h \ | |
| 2141 | -width 10 | |
| e9937d2a | 2142 | pack .bleft.top -side top -fill x |
| a8d610a2 | 2143 | pack .bleft.mid -side top -fill x |
| 8809d691 PK |
2144 | grid $ctext .bleft.bottom.sb -sticky nsew |
| 2145 | grid .bleft.bottom.sbhorizontal -sticky ew | |
| 2146 | grid columnconfigure .bleft.bottom 0 -weight 1 | |
| 2147 | grid rowconfigure .bleft.bottom 0 -weight 1 | |
| 2148 | grid rowconfigure .bleft.bottom 1 -weight 0 | |
| 2149 | pack .bleft.bottom -side top -fill both -expand 1 | |
| f8a2c0d1 PM |
2150 | lappend bglist $ctext |
| 2151 | lappend fglist $ctext | |
| d2610d11 | 2152 | |
| f1b86294 | 2153 | $ctext tag conf comment -wrap $wrapcomment |
| 9c311b32 | 2154 | $ctext tag conf filesep -font textfontbold -back "#aaaaaa" |
| f8a2c0d1 PM |
2155 | $ctext tag conf hunksep -fore [lindex $diffcolors 2] |
| 2156 | $ctext tag conf d0 -fore [lindex $diffcolors 0] | |
| 8b07dca1 | 2157 | $ctext tag conf dresult -fore [lindex $diffcolors 1] |
| 712fcc08 PM |
2158 | $ctext tag conf m0 -fore red |
| 2159 | $ctext tag conf m1 -fore blue | |
| 2160 | $ctext tag conf m2 -fore green | |
| 2161 | $ctext tag conf m3 -fore purple | |
| 2162 | $ctext tag conf m4 -fore brown | |
| b77b0278 PM |
2163 | $ctext tag conf m5 -fore "#009090" |
| 2164 | $ctext tag conf m6 -fore magenta | |
| 2165 | $ctext tag conf m7 -fore "#808000" | |
| 2166 | $ctext tag conf m8 -fore "#009000" | |
| 2167 | $ctext tag conf m9 -fore "#ff0080" | |
| 2168 | $ctext tag conf m10 -fore cyan | |
| 2169 | $ctext tag conf m11 -fore "#b07070" | |
| 2170 | $ctext tag conf m12 -fore "#70b0f0" | |
| 2171 | $ctext tag conf m13 -fore "#70f0b0" | |
| 2172 | $ctext tag conf m14 -fore "#f0b070" | |
| 2173 | $ctext tag conf m15 -fore "#ff70b0" | |
| 712fcc08 | 2174 | $ctext tag conf mmax -fore darkgrey |
| b77b0278 | 2175 | set mergemax 16 |
| 9c311b32 PM |
2176 | $ctext tag conf mresult -font textfontbold |
| 2177 | $ctext tag conf msep -font textfontbold | |
| 712fcc08 | 2178 | $ctext tag conf found -back yellow |
| e5c2d856 | 2179 | |
| e9937d2a | 2180 | .pwbottom add .bleft |
| 9ca72f4f | 2181 | .pwbottom paneconfigure .bleft -width $geometry(botwidth) |
| e9937d2a JH |
2182 | |
| 2183 | # lower right | |
| 2184 | frame .bright | |
| 2185 | frame .bright.mode | |
| d990cedf | 2186 | radiobutton .bright.mode.patch -text [mc "Patch"] \ |
| f8b28a40 | 2187 | -command reselectline -variable cmitmode -value "patch" |
| d990cedf | 2188 | radiobutton .bright.mode.tree -text [mc "Tree"] \ |
| f8b28a40 | 2189 | -command reselectline -variable cmitmode -value "tree" |
| e9937d2a JH |
2190 | grid .bright.mode.patch .bright.mode.tree -sticky ew |
| 2191 | pack .bright.mode -side top -fill x | |
| 2192 | set cflist .bright.cfiles | |
| 9c311b32 | 2193 | set indent [font measure mainfont "nn"] |
| e9937d2a | 2194 | text $cflist \ |
| 60378c0c | 2195 | -selectbackground $selectbgcolor \ |
| f8a2c0d1 | 2196 | -background $bgcolor -foreground $fgcolor \ |
| 9c311b32 | 2197 | -font mainfont \ |
| 7fcceed7 | 2198 | -tabs [list $indent [expr {2 * $indent}]] \ |
| e9937d2a | 2199 | -yscrollcommand ".bright.sb set" \ |
| 7fcceed7 PM |
2200 | -cursor [. cget -cursor] \ |
| 2201 | -spacing1 1 -spacing3 1 | |
| f8a2c0d1 PM |
2202 | lappend bglist $cflist |
| 2203 | lappend fglist $cflist | |
| e9937d2a JH |
2204 | scrollbar .bright.sb -command "$cflist yview" |
| 2205 | pack .bright.sb -side right -fill y | |
| d2610d11 | 2206 | pack $cflist -side left -fill both -expand 1 |
| 89b11d3b PM |
2207 | $cflist tag configure highlight \ |
| 2208 | -background [$cflist cget -selectbackground] | |
| 9c311b32 | 2209 | $cflist tag configure bold -font mainfontbold |
| d2610d11 | 2210 | |
| e9937d2a JH |
2211 | .pwbottom add .bright |
| 2212 | .ctop add .pwbottom | |
| 1db95b00 | 2213 | |
| b9bee115 | 2214 | # restore window width & height if known |
| e9937d2a | 2215 | if {[info exists geometry(main)]} { |
| b9bee115 PM |
2216 | if {[scan $geometry(main) "%dx%d" w h] >= 2} { |
| 2217 | if {$w > [winfo screenwidth .]} { | |
| 2218 | set w [winfo screenwidth .] | |
| 2219 | } | |
| 2220 | if {$h > [winfo screenheight .]} { | |
| 2221 | set h [winfo screenheight .] | |
| 2222 | } | |
| 2223 | wm geometry . "${w}x$h" | |
| 2224 | } | |
| e9937d2a JH |
2225 | } |
| 2226 | ||
| d23d98d3 SP |
2227 | if {[tk windowingsystem] eq {aqua}} { |
| 2228 | set M1B M1 | |
| 2229 | } else { | |
| 2230 | set M1B Control | |
| 2231 | } | |
| 2232 | ||
| e9937d2a JH |
2233 | bind .pwbottom <Configure> {resizecdetpanes %W %w} |
| 2234 | pack .ctop -fill both -expand 1 | |
| c8dfbcf9 PM |
2235 | bindall <1> {selcanvline %W %x %y} |
| 2236 | #bindall <B1-Motion> {selcanvline %W %x %y} | |
| 314c3093 ML |
2237 | if {[tk windowingsystem] == "win32"} { |
| 2238 | bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D } | |
| 2239 | bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break } | |
| 2240 | } else { | |
| 2241 | bindall <ButtonRelease-4> "allcanvs yview scroll -5 units" | |
| 2242 | bindall <ButtonRelease-5> "allcanvs yview scroll 5 units" | |
| 5dd57d51 JS |
2243 | if {[tk windowingsystem] eq "aqua"} { |
| 2244 | bindall <MouseWheel> { | |
| 2245 | set delta [expr {- (%D)}] | |
| 2246 | allcanvs yview scroll $delta units | |
| 2247 | } | |
| 2248 | } | |
| 314c3093 | 2249 | } |
| be0cd098 PM |
2250 | bindall <2> "canvscan mark %W %x %y" |
| 2251 | bindall <B2-Motion> "canvscan dragto %W %x %y" | |
| 6e5f7203 RN |
2252 | bindkey <Home> selfirstline |
| 2253 | bindkey <End> sellastline | |
| 17386066 PM |
2254 | bind . <Key-Up> "selnextline -1" |
| 2255 | bind . <Key-Down> "selnextline 1" | |
| cca5d946 PM |
2256 | bind . <Shift-Key-Up> "dofind -1 0" |
| 2257 | bind . <Shift-Key-Down> "dofind 1 0" | |
| 6e5f7203 RN |
2258 | bindkey <Key-Right> "goforw" |
| 2259 | bindkey <Key-Left> "goback" | |
| 2260 | bind . <Key-Prior> "selnextpage -1" | |
| 2261 | bind . <Key-Next> "selnextpage 1" | |
| d23d98d3 SP |
2262 | bind . <$M1B-Home> "allcanvs yview moveto 0.0" |
| 2263 | bind . <$M1B-End> "allcanvs yview moveto 1.0" | |
| 2264 | bind . <$M1B-Key-Up> "allcanvs yview scroll -1 units" | |
| 2265 | bind . <$M1B-Key-Down> "allcanvs yview scroll 1 units" | |
| 2266 | bind . <$M1B-Key-Prior> "allcanvs yview scroll -1 pages" | |
| 2267 | bind . <$M1B-Key-Next> "allcanvs yview scroll 1 pages" | |
| cfb4563c PM |
2268 | bindkey <Key-Delete> "$ctext yview scroll -1 pages" |
| 2269 | bindkey <Key-BackSpace> "$ctext yview scroll -1 pages" | |
| 2270 | bindkey <Key-space> "$ctext yview scroll 1 pages" | |
| df3d83b1 PM |
2271 | bindkey p "selnextline -1" |
| 2272 | bindkey n "selnextline 1" | |
| 6e2dda35 RS |
2273 | bindkey z "goback" |
| 2274 | bindkey x "goforw" | |
| 2275 | bindkey i "selnextline -1" | |
| 2276 | bindkey k "selnextline 1" | |
| 2277 | bindkey j "goback" | |
| 2278 | bindkey l "goforw" | |
| f4c54b3c | 2279 | bindkey b prevfile |
| cfb4563c PM |
2280 | bindkey d "$ctext yview scroll 18 units" |
| 2281 | bindkey u "$ctext yview scroll -18 units" | |
| cca5d946 PM |
2282 | bindkey / {dofind 1 1} |
| 2283 | bindkey <Key-Return> {dofind 1 1} | |
| 2284 | bindkey ? {dofind -1 1} | |
| 39ad8570 | 2285 | bindkey f nextfile |
| cea07cf8 AG |
2286 | bind . <F5> updatecommits |
| 2287 | bind . <$M1B-F5> reloadcommits | |
| 2288 | bind . <F2> showrefs | |
| 2289 | bind . <Shift-F4> {newview 0} | |
| 2290 | catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} } | |
| 2291 | bind . <F4> edit_or_newview | |
| d23d98d3 | 2292 | bind . <$M1B-q> doquit |
| cca5d946 PM |
2293 | bind . <$M1B-f> {dofind 1 1} |
| 2294 | bind . <$M1B-g> {dofind 1 0} | |
| d23d98d3 SP |
2295 | bind . <$M1B-r> dosearchback |
| 2296 | bind . <$M1B-s> dosearch | |
| 2297 | bind . <$M1B-equal> {incrfont 1} | |
| 646f3a14 | 2298 | bind . <$M1B-plus> {incrfont 1} |
| d23d98d3 SP |
2299 | bind . <$M1B-KP_Add> {incrfont 1} |
| 2300 | bind . <$M1B-minus> {incrfont -1} | |
| 2301 | bind . <$M1B-KP_Subtract> {incrfont -1} | |
| b6047c5a | 2302 | wm protocol . WM_DELETE_WINDOW doquit |
| e2f90ee4 | 2303 | bind . <Destroy> {stop_backends} |
| df3d83b1 | 2304 | bind . <Button-1> "click %W" |
| cca5d946 | 2305 | bind $fstring <Key-Return> {dofind 1 1} |
| 968ce45c | 2306 | bind $sha1entry <Key-Return> {gotocommit; break} |
| ee3dc72e | 2307 | bind $sha1entry <<PasteSelection>> clearsha1 |
| 7fcceed7 PM |
2308 | bind $cflist <1> {sel_flist %W %x %y; break} |
| 2309 | bind $cflist <B1-Motion> {sel_flist %W %x %y; break} | |
| f8b28a40 | 2310 | bind $cflist <ButtonRelease-1> {treeclick %W %x %y} |
| d277e89f PM |
2311 | global ctxbut |
| 2312 | bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y} | |
| 7cdc3556 | 2313 | bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y} |
| ea13cba1 PM |
2314 | |
| 2315 | set maincursor [. cget -cursor] | |
| 2316 | set textcursor [$ctext cget -cursor] | |
| 94a2eede | 2317 | set curtextcursor $textcursor |
| 84ba7345 | 2318 | |
| c8dfbcf9 | 2319 | set rowctxmenu .rowctxmenu |
| f2d0bbbd | 2320 | makemenu $rowctxmenu { |
| 79056034 PM |
2321 | {mc "Diff this -> selected" command {diffvssel 0}} |
| 2322 | {mc "Diff selected -> this" command {diffvssel 1}} | |
| 2323 | {mc "Make patch" command mkpatch} | |
| 2324 | {mc "Create tag" command mktag} | |
| 2325 | {mc "Write commit to file" command writecommit} | |
| 2326 | {mc "Create new branch" command mkbranch} | |
| 2327 | {mc "Cherry-pick this commit" command cherrypick} | |
| 2328 | {mc "Reset HEAD branch to here" command resethead} | |
| f2d0bbbd PM |
2329 | } |
| 2330 | $rowctxmenu configure -tearoff 0 | |
| 10299152 | 2331 | |
| 219ea3a9 | 2332 | set fakerowmenu .fakerowmenu |
| f2d0bbbd | 2333 | makemenu $fakerowmenu { |
| 79056034 PM |
2334 | {mc "Diff this -> selected" command {diffvssel 0}} |
| 2335 | {mc "Diff selected -> this" command {diffvssel 1}} | |
| 2336 | {mc "Make patch" command mkpatch} | |
| f2d0bbbd PM |
2337 | } |
| 2338 | $fakerowmenu configure -tearoff 0 | |
| 219ea3a9 | 2339 | |
| 10299152 | 2340 | set headctxmenu .headctxmenu |
| f2d0bbbd | 2341 | makemenu $headctxmenu { |
| 79056034 PM |
2342 | {mc "Check out this branch" command cobranch} |
| 2343 | {mc "Remove this branch" command rmbranch} | |
| f2d0bbbd PM |
2344 | } |
| 2345 | $headctxmenu configure -tearoff 0 | |
| 3244729a PM |
2346 | |
| 2347 | global flist_menu | |
| 2348 | set flist_menu .flistctxmenu | |
| f2d0bbbd | 2349 | makemenu $flist_menu { |
| 79056034 PM |
2350 | {mc "Highlight this too" command {flist_hl 0}} |
| 2351 | {mc "Highlight this only" command {flist_hl 1}} | |
| 2352 | {mc "External diff" command {external_diff}} | |
| 2353 | {mc "Blame parent commit" command {external_blame 1}} | |
| f2d0bbbd PM |
2354 | } |
| 2355 | $flist_menu configure -tearoff 0 | |
| 7cdc3556 AG |
2356 | |
| 2357 | global diff_menu | |
| 2358 | set diff_menu .diffctxmenu | |
| 2359 | makemenu $diff_menu { | |
| 8a897742 | 2360 | {mc "Show origin of this line" command show_line_source} |
| 7cdc3556 AG |
2361 | {mc "Run git gui blame on this line" command {external_blame_diff}} |
| 2362 | } | |
| 2363 | $diff_menu configure -tearoff 0 | |
| df3d83b1 PM |
2364 | } |
| 2365 | ||
| 314c3093 ML |
2366 | # Windows sends all mouse wheel events to the current focused window, not |
| 2367 | # the one where the mouse hovers, so bind those events here and redirect | |
| 2368 | # to the correct window | |
| 2369 | proc windows_mousewheel_redirector {W X Y D} { | |
| 2370 | global canv canv2 canv3 | |
| 2371 | set w [winfo containing -displayof $W $X $Y] | |
| 2372 | if {$w ne ""} { | |
| 2373 | set u [expr {$D < 0 ? 5 : -5}] | |
| 2374 | if {$w == $canv || $w == $canv2 || $w == $canv3} { | |
| 2375 | allcanvs yview scroll $u units | |
| 2376 | } else { | |
| 2377 | catch { | |
| 2378 | $w yview scroll $u units | |
| 2379 | } | |
| 2380 | } | |
| 2381 | } | |
| 2382 | } | |
| 2383 | ||
| 6df7403a PM |
2384 | # Update row number label when selectedline changes |
| 2385 | proc selectedline_change {n1 n2 op} { | |
| 2386 | global selectedline rownumsel | |
| 2387 | ||
| 94b4a69f | 2388 | if {$selectedline eq {}} { |
| 6df7403a PM |
2389 | set rownumsel {} |
| 2390 | } else { | |
| 2391 | set rownumsel [expr {$selectedline + 1}] | |
| 2392 | } | |
| 2393 | } | |
| 2394 | ||
| be0cd098 PM |
2395 | # mouse-2 makes all windows scan vertically, but only the one |
| 2396 | # the cursor is in scans horizontally | |
| 2397 | proc canvscan {op w x y} { | |
| 2398 | global canv canv2 canv3 | |
| 2399 | foreach c [list $canv $canv2 $canv3] { | |
| 2400 | if {$c == $w} { | |
| 2401 | $c scan $op $x $y | |
| 2402 | } else { | |
| 2403 | $c scan $op 0 $y | |
| 2404 | } | |
| 2405 | } | |
| 2406 | } | |
| 2407 | ||
| 9f1afe05 PM |
2408 | proc scrollcanv {cscroll f0 f1} { |
| 2409 | $cscroll set $f0 $f1 | |
| 31c0eaa8 | 2410 | drawvisible |
| 908c3585 | 2411 | flushhighlights |
| 9f1afe05 PM |
2412 | } |
| 2413 | ||
| df3d83b1 PM |
2414 | # when we make a key binding for the toplevel, make sure |
| 2415 | # it doesn't get triggered when that key is pressed in the | |
| 2416 | # find string entry widget. | |
| 2417 | proc bindkey {ev script} { | |
| 887fe3c4 | 2418 | global entries |
| df3d83b1 PM |
2419 | bind . $ev $script |
| 2420 | set escript [bind Entry $ev] | |
| 2421 | if {$escript == {}} { | |
| 2422 | set escript [bind Entry <Key>] | |
| 2423 | } | |
| 887fe3c4 PM |
2424 | foreach e $entries { |
| 2425 | bind $e $ev "$escript; break" | |
| 2426 | } | |
| df3d83b1 PM |
2427 | } |
| 2428 | ||
| 2429 | # set the focus back to the toplevel for any click outside | |
| 887fe3c4 | 2430 | # the entry widgets |
| df3d83b1 | 2431 | proc click {w} { |
| bd441de4 ML |
2432 | global ctext entries |
| 2433 | foreach e [concat $entries $ctext] { | |
| 887fe3c4 | 2434 | if {$w == $e} return |
| df3d83b1 | 2435 | } |
| 887fe3c4 | 2436 | focus . |
| 0fba86b3 PM |
2437 | } |
| 2438 | ||
| bb3edc8b PM |
2439 | # Adjust the progress bar for a change in requested extent or canvas size |
| 2440 | proc adjustprogress {} { | |
| 2441 | global progresscanv progressitem progresscoords | |
| 2442 | global fprogitem fprogcoord lastprogupdate progupdatepending | |
| a137a90f | 2443 | global rprogitem rprogcoord |
| bb3edc8b PM |
2444 | |
| 2445 | set w [expr {[winfo width $progresscanv] - 4}] | |
| 2446 | set x0 [expr {$w * [lindex $progresscoords 0]}] | |
| 2447 | set x1 [expr {$w * [lindex $progresscoords 1]}] | |
| 2448 | set h [winfo height $progresscanv] | |
| 2449 | $progresscanv coords $progressitem $x0 0 $x1 $h | |
| 2450 | $progresscanv coords $fprogitem 0 0 [expr {$w * $fprogcoord}] $h | |
| a137a90f | 2451 | $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h |
| bb3edc8b PM |
2452 | set now [clock clicks -milliseconds] |
| 2453 | if {$now >= $lastprogupdate + 100} { | |
| 2454 | set progupdatepending 0 | |
| 2455 | update | |
| 2456 | } elseif {!$progupdatepending} { | |
| 2457 | set progupdatepending 1 | |
| 2458 | after [expr {$lastprogupdate + 100 - $now}] doprogupdate | |
| 2459 | } | |
| 2460 | } | |
| 2461 | ||
| 2462 | proc doprogupdate {} { | |
| 2463 | global lastprogupdate progupdatepending | |
| 2464 | ||
| 2465 | if {$progupdatepending} { | |
| 2466 | set progupdatepending 0 | |
| 2467 | set lastprogupdate [clock clicks -milliseconds] | |
| 2468 | update | |
| 2469 | } | |
| 2470 | } | |
| 2471 | ||
| 0fba86b3 | 2472 | proc savestuff {w} { |
| 32f1b3e4 | 2473 | global canv canv2 canv3 mainfont textfont uifont tabstop |
| 712fcc08 | 2474 | global stuffsaved findmergefiles maxgraphpct |
| 219ea3a9 | 2475 | global maxwidth showneartags showlocalchanges |
| 2d480856 | 2476 | global viewname viewfiles viewargs viewargscmd viewperm nextviewnum |
| 7a39a17a | 2477 | global cmitmode wrapcomment datetimeformat limitdiffs |
| 890fae70 | 2478 | global colors bgcolor fgcolor diffcolors diffcontext selectbgcolor |
| e3e901be | 2479 | global autoselect extdifftool perfile_attrs markbgcolor |
| 4ef17537 | 2480 | |
| 0fba86b3 | 2481 | if {$stuffsaved} return |
| df3d83b1 | 2482 | if {![winfo viewable .]} return |
| 0fba86b3 PM |
2483 | catch { |
| 2484 | set f [open "~/.gitk-new" w] | |
| f0654861 PM |
2485 | puts $f [list set mainfont $mainfont] |
| 2486 | puts $f [list set textfont $textfont] | |
| 4840be66 | 2487 | puts $f [list set uifont $uifont] |
| 7e12f1a6 | 2488 | puts $f [list set tabstop $tabstop] |
| f0654861 | 2489 | puts $f [list set findmergefiles $findmergefiles] |
| 8d858d1a | 2490 | puts $f [list set maxgraphpct $maxgraphpct] |
| 04c13d38 | 2491 | puts $f [list set maxwidth $maxwidth] |
| f8b28a40 | 2492 | puts $f [list set cmitmode $cmitmode] |
| f1b86294 | 2493 | puts $f [list set wrapcomment $wrapcomment] |
| 95293b58 | 2494 | puts $f [list set autoselect $autoselect] |
| b8ab2e17 | 2495 | puts $f [list set showneartags $showneartags] |
| 219ea3a9 | 2496 | puts $f [list set showlocalchanges $showlocalchanges] |
| e8b5f4be | 2497 | puts $f [list set datetimeformat $datetimeformat] |
| 7a39a17a | 2498 | puts $f [list set limitdiffs $limitdiffs] |
| f8a2c0d1 PM |
2499 | puts $f [list set bgcolor $bgcolor] |
| 2500 | puts $f [list set fgcolor $fgcolor] | |
| 2501 | puts $f [list set colors $colors] | |
| 2502 | puts $f [list set diffcolors $diffcolors] | |
| e3e901be | 2503 | puts $f [list set markbgcolor $markbgcolor] |
| 890fae70 | 2504 | puts $f [list set diffcontext $diffcontext] |
| 60378c0c | 2505 | puts $f [list set selectbgcolor $selectbgcolor] |
| 314f5de1 | 2506 | puts $f [list set extdifftool $extdifftool] |
| 39ee47ef | 2507 | puts $f [list set perfile_attrs $perfile_attrs] |
| e9937d2a | 2508 | |
| b6047c5a | 2509 | puts $f "set geometry(main) [wm geometry .]" |
| e9937d2a JH |
2510 | puts $f "set geometry(topwidth) [winfo width .tf]" |
| 2511 | puts $f "set geometry(topheight) [winfo height .tf]" | |
| 9ca72f4f ML |
2512 | puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\"" |
| 2513 | puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\"" | |
| e9937d2a JH |
2514 | puts $f "set geometry(botwidth) [winfo width .bleft]" |
| 2515 | puts $f "set geometry(botheight) [winfo height .bleft]" | |
| 2516 | ||
| a90a6d24 PM |
2517 | puts -nonewline $f "set permviews {" |
| 2518 | for {set v 0} {$v < $nextviewnum} {incr v} { | |
| 2519 | if {$viewperm($v)} { | |
| 2d480856 | 2520 | puts $f "{[list $viewname($v) $viewfiles($v) $viewargs($v) $viewargscmd($v)]}" |
| a90a6d24 PM |
2521 | } |
| 2522 | } | |
| 2523 | puts $f "}" | |
| 0fba86b3 PM |
2524 | close $f |
| 2525 | file rename -force "~/.gitk-new" "~/.gitk" | |
| 2526 | } | |
| 2527 | set stuffsaved 1 | |
| 1db95b00 PM |
2528 | } |
| 2529 | ||
| 43bddeb4 PM |
2530 | proc resizeclistpanes {win w} { |
| 2531 | global oldwidth | |
| 418c4c7b | 2532 | if {[info exists oldwidth($win)]} { |
| 43bddeb4 PM |
2533 | set s0 [$win sash coord 0] |
| 2534 | set s1 [$win sash coord 1] | |
| 2535 | if {$w < 60} { | |
| 2536 | set sash0 [expr {int($w/2 - 2)}] | |
| 2537 | set sash1 [expr {int($w*5/6 - 2)}] | |
| 2538 | } else { | |
| 2539 | set factor [expr {1.0 * $w / $oldwidth($win)}] | |
| 2540 | set sash0 [expr {int($factor * [lindex $s0 0])}] | |
| 2541 | set sash1 [expr {int($factor * [lindex $s1 0])}] | |
| 2542 | if {$sash0 < 30} { | |
| 2543 | set sash0 30 | |
| 2544 | } | |
| 2545 | if {$sash1 < $sash0 + 20} { | |
| 2ed49d54 | 2546 | set sash1 [expr {$sash0 + 20}] |
| 43bddeb4 PM |
2547 | } |
| 2548 | if {$sash1 > $w - 10} { | |
| 2ed49d54 | 2549 | set sash1 [expr {$w - 10}] |
| 43bddeb4 | 2550 | if {$sash0 > $sash1 - 20} { |
| 2ed49d54 | 2551 | set sash0 [expr {$sash1 - 20}] |
| 43bddeb4 PM |
2552 | } |
| 2553 | } | |
| 2554 | } | |
| 2555 | $win sash place 0 $sash0 [lindex $s0 1] | |
| 2556 | $win sash place 1 $sash1 [lindex $s1 1] | |
| 2557 | } | |
| 2558 | set oldwidth($win) $w | |
| 2559 | } | |
| 2560 | ||
| 2561 | proc resizecdetpanes {win w} { | |
| 2562 | global oldwidth | |
| 418c4c7b | 2563 | if {[info exists oldwidth($win)]} { |
| 43bddeb4 PM |
2564 | set s0 [$win sash coord 0] |
| 2565 | if {$w < 60} { | |
| 2566 | set sash0 [expr {int($w*3/4 - 2)}] | |
| 2567 | } else { | |
| 2568 | set factor [expr {1.0 * $w / $oldwidth($win)}] | |
| 2569 | set sash0 [expr {int($factor * [lindex $s0 0])}] | |
| 2570 | if {$sash0 < 45} { | |
| 2571 | set sash0 45 | |
| 2572 | } | |
| 2573 | if {$sash0 > $w - 15} { | |
| 2ed49d54 | 2574 | set sash0 [expr {$w - 15}] |
| 43bddeb4 PM |
2575 | } |
| 2576 | } | |
| 2577 | $win sash place 0 $sash0 [lindex $s0 1] | |
| 2578 | } | |
| 2579 | set oldwidth($win) $w | |
| 2580 | } | |
| 2581 | ||
| b5721c72 PM |
2582 | proc allcanvs args { |
| 2583 | global canv canv2 canv3 | |
| 2584 | eval $canv $args | |
| 2585 | eval $canv2 $args | |
| 2586 | eval $canv3 $args | |
| 2587 | } | |
| 2588 | ||
| 2589 | proc bindall {event action} { | |
| 2590 | global canv canv2 canv3 | |
| 2591 | bind $canv $event $action | |
| 2592 | bind $canv2 $event $action | |
| 2593 | bind $canv3 $event $action | |
| 2594 | } | |
| 2595 | ||
| 9a40c50c | 2596 | proc about {} { |
| d59c4b6f | 2597 | global uifont |
| 9a40c50c PM |
2598 | set w .about |
| 2599 | if {[winfo exists $w]} { | |
| 2600 | raise $w | |
| 2601 | return | |
| 2602 | } | |
| 2603 | toplevel $w | |
| d990cedf | 2604 | wm title $w [mc "About gitk"] |
| e7d64008 | 2605 | make_transient $w . |
| d990cedf | 2606 | message $w.m -text [mc " |
| 9f1afe05 | 2607 | Gitk - a commit viewer for git |
| 9a40c50c | 2608 | |
| ee66e089 | 2609 | Copyright © 2005-2008 Paul Mackerras |
| 9a40c50c | 2610 | |
| d990cedf | 2611 | Use and redistribute under the terms of the GNU General Public License"] \ |
| 3a950e9a ER |
2612 | -justify center -aspect 400 -border 2 -bg white -relief groove |
| 2613 | pack $w.m -side top -fill x -padx 2 -pady 2 | |
| d990cedf | 2614 | button $w.ok -text [mc "Close"] -command "destroy $w" -default active |
| 9a40c50c | 2615 | pack $w.ok -side bottom |
| 3a950e9a ER |
2616 | bind $w <Visibility> "focus $w.ok" |
| 2617 | bind $w <Key-Escape> "destroy $w" | |
| 2618 | bind $w <Key-Return> "destroy $w" | |
| 9a40c50c PM |
2619 | } |
| 2620 | ||
| 4e95e1f7 PM |
2621 | proc keys {} { |
| 2622 | set w .keys | |
| 2623 | if {[winfo exists $w]} { | |
| 2624 | raise $w | |
| 2625 | return | |
| 2626 | } | |
| d23d98d3 SP |
2627 | if {[tk windowingsystem] eq {aqua}} { |
| 2628 | set M1T Cmd | |
| 2629 | } else { | |
| 2630 | set M1T Ctrl | |
| 2631 | } | |
| 4e95e1f7 | 2632 | toplevel $w |
| d990cedf | 2633 | wm title $w [mc "Gitk key bindings"] |
| e7d64008 | 2634 | make_transient $w . |
| 3d2c998e MB |
2635 | message $w.m -text " |
| 2636 | [mc "Gitk key bindings:"] | |
| 2637 | ||
| 2638 | [mc "<%s-Q> Quit" $M1T] | |
| 2639 | [mc "<Home> Move to first commit"] | |
| 2640 | [mc "<End> Move to last commit"] | |
| 2641 | [mc "<Up>, p, i Move up one commit"] | |
| 2642 | [mc "<Down>, n, k Move down one commit"] | |
| 2643 | [mc "<Left>, z, j Go back in history list"] | |
| 2644 | [mc "<Right>, x, l Go forward in history list"] | |
| 2645 | [mc "<PageUp> Move up one page in commit list"] | |
| 2646 | [mc "<PageDown> Move down one page in commit list"] | |
| 2647 | [mc "<%s-Home> Scroll to top of commit list" $M1T] | |
| 2648 | [mc "<%s-End> Scroll to bottom of commit list" $M1T] | |
| 2649 | [mc "<%s-Up> Scroll commit list up one line" $M1T] | |
| 2650 | [mc "<%s-Down> Scroll commit list down one line" $M1T] | |
| 2651 | [mc "<%s-PageUp> Scroll commit list up one page" $M1T] | |
| 2652 | [mc "<%s-PageDown> Scroll commit list down one page" $M1T] | |
| 2653 | [mc "<Shift-Up> Find backwards (upwards, later commits)"] | |
| 2654 | [mc "<Shift-Down> Find forwards (downwards, earlier commits)"] | |
| 2655 | [mc "<Delete>, b Scroll diff view up one page"] | |
| 2656 | [mc "<Backspace> Scroll diff view up one page"] | |
| 2657 | [mc "<Space> Scroll diff view down one page"] | |
| 2658 | [mc "u Scroll diff view up 18 lines"] | |
| 2659 | [mc "d Scroll diff view down 18 lines"] | |
| 2660 | [mc "<%s-F> Find" $M1T] | |
| 2661 | [mc "<%s-G> Move to next find hit" $M1T] | |
| 2662 | [mc "<Return> Move to next find hit"] | |
| 2663 | [mc "/ Move to next find hit, or redo find"] | |
| 2664 | [mc "? Move to previous find hit"] | |
| 2665 | [mc "f Scroll diff view to next file"] | |
| 2666 | [mc "<%s-S> Search for next hit in diff view" $M1T] | |
| 2667 | [mc "<%s-R> Search for previous hit in diff view" $M1T] | |
| 2668 | [mc "<%s-KP+> Increase font size" $M1T] | |
| 2669 | [mc "<%s-plus> Increase font size" $M1T] | |
| 2670 | [mc "<%s-KP-> Decrease font size" $M1T] | |
| 2671 | [mc "<%s-minus> Decrease font size" $M1T] | |
| 2672 | [mc "<F5> Update"] | |
| 2673 | " \ | |
| 3a950e9a ER |
2674 | -justify left -bg white -border 2 -relief groove |
| 2675 | pack $w.m -side top -fill both -padx 2 -pady 2 | |
| d990cedf | 2676 | button $w.ok -text [mc "Close"] -command "destroy $w" -default active |
| 76f15947 | 2677 | bind $w <Key-Escape> [list destroy $w] |
| 4e95e1f7 | 2678 | pack $w.ok -side bottom |
| 3a950e9a ER |
2679 | bind $w <Visibility> "focus $w.ok" |
| 2680 | bind $w <Key-Escape> "destroy $w" | |
| 2681 | bind $w <Key-Return> "destroy $w" | |
| 4e95e1f7 PM |
2682 | } |
| 2683 | ||
| 7fcceed7 PM |
2684 | # Procedures for manipulating the file list window at the |
| 2685 | # bottom right of the overall window. | |
| f8b28a40 PM |
2686 | |
| 2687 | proc treeview {w l openlevs} { | |
| 2688 | global treecontents treediropen treeheight treeparent treeindex | |
| 2689 | ||
| 2690 | set ix 0 | |
| 2691 | set treeindex() 0 | |
| 2692 | set lev 0 | |
| 2693 | set prefix {} | |
| 2694 | set prefixend -1 | |
| 2695 | set prefendstack {} | |
| 2696 | set htstack {} | |
| 2697 | set ht 0 | |
| 2698 | set treecontents() {} | |
| 2699 | $w conf -state normal | |
| 2700 | foreach f $l { | |
| 2701 | while {[string range $f 0 $prefixend] ne $prefix} { | |
| 2702 | if {$lev <= $openlevs} { | |
| 2703 | $w mark set e:$treeindex($prefix) "end -1c" | |
| 2704 | $w mark gravity e:$treeindex($prefix) left | |
| 2705 | } | |
| 2706 | set treeheight($prefix) $ht | |
| 2707 | incr ht [lindex $htstack end] | |
| 2708 | set htstack [lreplace $htstack end end] | |
| 2709 | set prefixend [lindex $prefendstack end] | |
| 2710 | set prefendstack [lreplace $prefendstack end end] | |
| 2711 | set prefix [string range $prefix 0 $prefixend] | |
| 2712 | incr lev -1 | |
| 2713 | } | |
| 2714 | set tail [string range $f [expr {$prefixend+1}] end] | |
| 2715 | while {[set slash [string first "/" $tail]] >= 0} { | |
| 2716 | lappend htstack $ht | |
| 2717 | set ht 0 | |
| 2718 | lappend prefendstack $prefixend | |
| 2719 | incr prefixend [expr {$slash + 1}] | |
| 2720 | set d [string range $tail 0 $slash] | |
| 2721 | lappend treecontents($prefix) $d | |
| 2722 | set oldprefix $prefix | |
| 2723 | append prefix $d | |
| 2724 | set treecontents($prefix) {} | |
| 2725 | set treeindex($prefix) [incr ix] | |
| 2726 | set treeparent($prefix) $oldprefix | |
| 2727 | set tail [string range $tail [expr {$slash+1}] end] | |
| 2728 | if {$lev <= $openlevs} { | |
| 2729 | set ht 1 | |
| 2730 | set treediropen($prefix) [expr {$lev < $openlevs}] | |
| 2731 | set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}] | |
| 2732 | $w mark set d:$ix "end -1c" | |
| 2733 | $w mark gravity d:$ix left | |
| 2734 | set str "\n" | |
| 2735 | for {set i 0} {$i < $lev} {incr i} {append str "\t"} | |
| 2736 | $w insert end $str | |
| 2737 | $w image create end -align center -image $bm -padx 1 \ | |
| 2738 | -name a:$ix | |
| 45a9d505 | 2739 | $w insert end $d [highlight_tag $prefix] |
| f8b28a40 PM |
2740 | $w mark set s:$ix "end -1c" |
| 2741 | $w mark gravity s:$ix left | |
| 2742 | } | |
| 2743 | incr lev | |
| 2744 | } | |
| 2745 | if {$tail ne {}} { | |
| 2746 | if {$lev <= $openlevs} { | |
| 2747 | incr ht | |
| 2748 | set str "\n" | |
| 2749 | for {set i 0} {$i < $lev} {incr i} {append str "\t"} | |
| 2750 | $w insert end $str | |
| 45a9d505 | 2751 | $w insert end $tail [highlight_tag $f] |
| f8b28a40 PM |
2752 | } |
| 2753 | lappend treecontents($prefix) $tail | |
| 2754 | } | |
| 2755 | } | |
| 2756 | while {$htstack ne {}} { | |
| 2757 | set treeheight($prefix) $ht | |
| 2758 | incr ht [lindex $htstack end] | |
| 2759 | set htstack [lreplace $htstack end end] | |
| 096e96b4 BD |
2760 | set prefixend [lindex $prefendstack end] |
| 2761 | set prefendstack [lreplace $prefendstack end end] | |
| 2762 | set prefix [string range $prefix 0 $prefixend] | |
| f8b28a40 PM |
2763 | } |
| 2764 | $w conf -state disabled | |
| 2765 | } | |
| 2766 | ||
| 2767 | proc linetoelt {l} { | |
| 2768 | global treeheight treecontents | |
| 2769 | ||
| 2770 | set y 2 | |
| 2771 | set prefix {} | |
| 2772 | while {1} { | |
| 2773 | foreach e $treecontents($prefix) { | |
| 2774 | if {$y == $l} { | |
| 2775 | return "$prefix$e" | |
| 2776 | } | |
| 2777 | set n 1 | |
| 2778 | if {[string index $e end] eq "/"} { | |
| 2779 | set n $treeheight($prefix$e) | |
| 2780 | if {$y + $n > $l} { | |
| 2781 | append prefix $e | |
| 2782 | incr y | |
| 2783 | break | |
| 2784 | } | |
| 2785 | } | |
| 2786 | incr y $n | |
| 2787 | } | |
| 2788 | } | |
| 2789 | } | |
| 2790 | ||
| 45a9d505 PM |
2791 | proc highlight_tree {y prefix} { |
| 2792 | global treeheight treecontents cflist | |
| 2793 | ||
| 2794 | foreach e $treecontents($prefix) { | |
| 2795 | set path $prefix$e | |
| 2796 | if {[highlight_tag $path] ne {}} { | |
| 2797 | $cflist tag add bold $y.0 "$y.0 lineend" | |
| 2798 | } | |
| 2799 | incr y | |
| 2800 | if {[string index $e end] eq "/" && $treeheight($path) > 1} { | |
| 2801 | set y [highlight_tree $y $path] | |
| 2802 | } | |
| 2803 | } | |
| 2804 | return $y | |
| 2805 | } | |
| 2806 | ||
| f8b28a40 PM |
2807 | proc treeclosedir {w dir} { |
| 2808 | global treediropen treeheight treeparent treeindex | |
| 2809 | ||
| 2810 | set ix $treeindex($dir) | |
| 2811 | $w conf -state normal | |
| 2812 | $w delete s:$ix e:$ix | |
| 2813 | set treediropen($dir) 0 | |
| 2814 | $w image configure a:$ix -image tri-rt | |
| 2815 | $w conf -state disabled | |
| 2816 | set n [expr {1 - $treeheight($dir)}] | |
| 2817 | while {$dir ne {}} { | |
| 2818 | incr treeheight($dir) $n | |
| 2819 | set dir $treeparent($dir) | |
| 2820 | } | |
| 2821 | } | |
| 2822 | ||
| 2823 | proc treeopendir {w dir} { | |
| 2824 | global treediropen treeheight treeparent treecontents treeindex | |
| 2825 | ||
| 2826 | set ix $treeindex($dir) | |
| 2827 | $w conf -state normal | |
| 2828 | $w image configure a:$ix -image tri-dn | |
| 2829 | $w mark set e:$ix s:$ix | |
| 2830 | $w mark gravity e:$ix right | |
| 2831 | set lev 0 | |
| 2832 | set str "\n" | |
| 2833 | set n [llength $treecontents($dir)] | |
| 2834 | for {set x $dir} {$x ne {}} {set x $treeparent($x)} { | |
| 2835 | incr lev | |
| 2836 | append str "\t" | |
| 2837 | incr treeheight($x) $n | |
| 2838 | } | |
| 2839 | foreach e $treecontents($dir) { | |
| 45a9d505 | 2840 | set de $dir$e |
| f8b28a40 | 2841 | if {[string index $e end] eq "/"} { |
| f8b28a40 PM |
2842 | set iy $treeindex($de) |
| 2843 | $w mark set d:$iy e:$ix | |
| 2844 | $w mark gravity d:$iy left | |
| 2845 | $w insert e:$ix $str | |
| 2846 | set treediropen($de) 0 | |
| 2847 | $w image create e:$ix -align center -image tri-rt -padx 1 \ | |
| 2848 | -name a:$iy | |
| 45a9d505 | 2849 | $w insert e:$ix $e [highlight_tag $de] |
| f8b28a40 PM |
2850 | $w mark set s:$iy e:$ix |
| 2851 | $w mark gravity s:$iy left | |
| 2852 | set treeheight($de) 1 | |
| 2853 | } else { | |
| 2854 | $w insert e:$ix $str | |
| 45a9d505 | 2855 | $w insert e:$ix $e [highlight_tag $de] |
| f8b28a40 PM |
2856 | } |
| 2857 | } | |
| b8a640ee | 2858 | $w mark gravity e:$ix right |
| f8b28a40 PM |
2859 | $w conf -state disabled |
| 2860 | set treediropen($dir) 1 | |
| 2861 | set top [lindex [split [$w index @0,0] .] 0] | |
| 2862 | set ht [$w cget -height] | |
| 2863 | set l [lindex [split [$w index s:$ix] .] 0] | |
| 2864 | if {$l < $top} { | |
| 2865 | $w yview $l.0 | |
| 2866 | } elseif {$l + $n + 1 > $top + $ht} { | |
| 2867 | set top [expr {$l + $n + 2 - $ht}] | |
| 2868 | if {$l < $top} { | |
| 2869 | set top $l | |
| 2870 | } | |
| 2871 | $w yview $top.0 | |
| 2872 | } | |
| 2873 | } | |
| 2874 | ||
| 2875 | proc treeclick {w x y} { | |
| 2876 | global treediropen cmitmode ctext cflist cflist_top | |
| 2877 | ||
| 2878 | if {$cmitmode ne "tree"} return | |
| 2879 | if {![info exists cflist_top]} return | |
| 2880 | set l [lindex [split [$w index "@$x,$y"] "."] 0] | |
| 2881 | $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend" | |
| 2882 | $cflist tag add highlight $l.0 "$l.0 lineend" | |
| 2883 | set cflist_top $l | |
| 2884 | if {$l == 1} { | |
| 2885 | $ctext yview 1.0 | |
| 2886 | return | |
| 2887 | } | |
| 2888 | set e [linetoelt $l] | |
| 2889 | if {[string index $e end] ne "/"} { | |
| 2890 | showfile $e | |
| 2891 | } elseif {$treediropen($e)} { | |
| 2892 | treeclosedir $w $e | |
| 2893 | } else { | |
| 2894 | treeopendir $w $e | |
| 2895 | } | |
| 2896 | } | |
| 2897 | ||
| 2898 | proc setfilelist {id} { | |
| 8a897742 | 2899 | global treefilelist cflist jump_to_here |
| f8b28a40 PM |
2900 | |
| 2901 | treeview $cflist $treefilelist($id) 0 | |
| 8a897742 PM |
2902 | if {$jump_to_here ne {}} { |
| 2903 | set f [lindex $jump_to_here 0] | |
| 2904 | if {[lsearch -exact $treefilelist($id) $f] >= 0} { | |
| 2905 | showfile $f | |
| 2906 | } | |
| 2907 | } | |
| f8b28a40 PM |
2908 | } |
| 2909 | ||
| 2910 | image create bitmap tri-rt -background black -foreground blue -data { | |
| 2911 | #define tri-rt_width 13 | |
| 2912 | #define tri-rt_height 13 | |
| 2913 | static unsigned char tri-rt_bits[] = { | |
| 2914 | 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0xf0, 0x00, | |
| 2915 | 0xf0, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00, | |
| 2916 | 0x00, 0x00}; | |
| 2917 | } -maskdata { | |
| 2918 | #define tri-rt-mask_width 13 | |
| 2919 | #define tri-rt-mask_height 13 | |
| 2920 | static unsigned char tri-rt-mask_bits[] = { | |
| 2921 | 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00, 0xf8, 0x01, | |
| 2922 | 0xf8, 0x03, 0xf8, 0x01, 0xf8, 0x00, 0x78, 0x00, 0x38, 0x00, 0x18, 0x00, | |
| 2923 | 0x08, 0x00}; | |
| 2924 | } | |
| 2925 | image create bitmap tri-dn -background black -foreground blue -data { | |
| 2926 | #define tri-dn_width 13 | |
| 2927 | #define tri-dn_height 13 | |
| 2928 | static unsigned char tri-dn_bits[] = { | |
| 2929 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x07, 0xf8, 0x03, | |
| 2930 | 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | |
| 2931 | 0x00, 0x00}; | |
| 2932 | } -maskdata { | |
| 2933 | #define tri-dn-mask_width 13 | |
| 2934 | #define tri-dn-mask_height 13 | |
| 2935 | static unsigned char tri-dn-mask_bits[] = { | |
| 2936 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07, | |
| 2937 | 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, | |
| 2938 | 0x00, 0x00}; | |
| 2939 | } | |
| 2940 | ||
| 887c996e PM |
2941 | image create bitmap reficon-T -background black -foreground yellow -data { |
| 2942 | #define tagicon_width 13 | |
| 2943 | #define tagicon_height 9 | |
| 2944 | static unsigned char tagicon_bits[] = { | |
| 2945 | 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0xf8, 0x07, | |
| 2946 | 0xfc, 0x07, 0xf8, 0x07, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00}; | |
| 2947 | } -maskdata { | |
| 2948 | #define tagicon-mask_width 13 | |
| 2949 | #define tagicon-mask_height 9 | |
| 2950 | static unsigned char tagicon-mask_bits[] = { | |
| 2951 | 0x00, 0x00, 0xf0, 0x0f, 0xf8, 0x0f, 0xfc, 0x0f, | |
| 2952 | 0xfe, 0x0f, 0xfc, 0x0f, 0xf8, 0x0f, 0xf0, 0x0f, 0x00, 0x00}; | |
| 2953 | } | |
| 2954 | set rectdata { | |
| 2955 | #define headicon_width 13 | |
| 2956 | #define headicon_height 9 | |
| 2957 | static unsigned char headicon_bits[] = { | |
| 2958 | 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0xf8, 0x07, | |
| 2959 | 0xf8, 0x07, 0xf8, 0x07, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x00}; | |
| 2960 | } | |
| 2961 | set rectmask { | |
| 2962 | #define headicon-mask_width 13 | |
| 2963 | #define headicon-mask_height 9 | |
| 2964 | static unsigned char headicon-mask_bits[] = { | |
| 2965 | 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, | |
| 2966 | 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00}; | |
| 2967 | } | |
| 2968 | image create bitmap reficon-H -background black -foreground green \ | |
| 2969 | -data $rectdata -maskdata $rectmask | |
| 2970 | image create bitmap reficon-o -background black -foreground "#ddddff" \ | |
| 2971 | -data $rectdata -maskdata $rectmask | |
| 2972 | ||
| 7fcceed7 | 2973 | proc init_flist {first} { |
| 7fcc92bf | 2974 | global cflist cflist_top difffilestart |
| 7fcceed7 PM |
2975 | |
| 2976 | $cflist conf -state normal | |
| 2977 | $cflist delete 0.0 end | |
| 2978 | if {$first ne {}} { | |
| 2979 | $cflist insert end $first | |
| 2980 | set cflist_top 1 | |
| 7fcceed7 PM |
2981 | $cflist tag add highlight 1.0 "1.0 lineend" |
| 2982 | } else { | |
| 2983 | catch {unset cflist_top} | |
| 2984 | } | |
| 2985 | $cflist conf -state disabled | |
| 2986 | set difffilestart {} | |
| 2987 | } | |
| 2988 | ||
| 63b79191 PM |
2989 | proc highlight_tag {f} { |
| 2990 | global highlight_paths | |
| 2991 | ||
| 2992 | foreach p $highlight_paths { | |
| 2993 | if {[string match $p $f]} { | |
| 2994 | return "bold" | |
| 2995 | } | |
| 2996 | } | |
| 2997 | return {} | |
| 2998 | } | |
| 2999 | ||
| 3000 | proc highlight_filelist {} { | |
| 45a9d505 | 3001 | global cmitmode cflist |
| 63b79191 | 3002 | |
| 45a9d505 PM |
3003 | $cflist conf -state normal |
| 3004 | if {$cmitmode ne "tree"} { | |
| 63b79191 PM |
3005 | set end [lindex [split [$cflist index end] .] 0] |
| 3006 | for {set l 2} {$l < $end} {incr l} { | |
| 3007 | set line [$cflist get $l.0 "$l.0 lineend"] | |
| 3008 | if {[highlight_tag $line] ne {}} { | |
| 3009 | $cflist tag add bold $l.0 "$l.0 lineend" | |
| 3010 | } | |
| 3011 | } | |
| 45a9d505 PM |
3012 | } else { |
| 3013 | highlight_tree 2 {} | |
| 63b79191 | 3014 | } |
| 45a9d505 | 3015 | $cflist conf -state disabled |
| 63b79191 PM |
3016 | } |
| 3017 | ||
| 3018 | proc unhighlight_filelist {} { | |
| 45a9d505 | 3019 | global cflist |
| 63b79191 | 3020 | |
| 45a9d505 PM |
3021 | $cflist conf -state normal |
| 3022 | $cflist tag remove bold 1.0 end | |
| 3023 | $cflist conf -state disabled | |
| 63b79191 PM |
3024 | } |
| 3025 | ||
| f8b28a40 | 3026 | proc add_flist {fl} { |
| 45a9d505 | 3027 | global cflist |
| 7fcceed7 | 3028 | |
| 45a9d505 PM |
3029 | $cflist conf -state normal |
| 3030 | foreach f $fl { | |
| 3031 | $cflist insert end "\n" | |
| 3032 | $cflist insert end $f [highlight_tag $f] | |
| 7fcceed7 | 3033 | } |
| 45a9d505 | 3034 | $cflist conf -state disabled |
| 7fcceed7 PM |
3035 | } |
| 3036 | ||
| 3037 | proc sel_flist {w x y} { | |
| 45a9d505 | 3038 | global ctext difffilestart cflist cflist_top cmitmode |
| 7fcceed7 | 3039 | |
| f8b28a40 | 3040 | if {$cmitmode eq "tree"} return |
| 7fcceed7 PM |
3041 | if {![info exists cflist_top]} return |
| 3042 | set l [lindex [split [$w index "@$x,$y"] "."] 0] | |
| 89b11d3b PM |
3043 | $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend" |
| 3044 | $cflist tag add highlight $l.0 "$l.0 lineend" | |
| 3045 | set cflist_top $l | |
| f8b28a40 PM |
3046 | if {$l == 1} { |
| 3047 | $ctext yview 1.0 | |
| 3048 | } else { | |
| 3049 | catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]} | |
| 7fcceed7 | 3050 | } |
| 7fcceed7 PM |
3051 | } |
| 3052 | ||
| 3244729a PM |
3053 | proc pop_flist_menu {w X Y x y} { |
| 3054 | global ctext cflist cmitmode flist_menu flist_menu_file | |
| 3055 | global treediffs diffids | |
| 3056 | ||
| bb3edc8b | 3057 | stopfinding |
| 3244729a PM |
3058 | set l [lindex [split [$w index "@$x,$y"] "."] 0] |
| 3059 | if {$l <= 1} return | |
| 3060 | if {$cmitmode eq "tree"} { | |
| 3061 | set e [linetoelt $l] | |
| 3062 | if {[string index $e end] eq "/"} return | |
| 3063 | } else { | |
| 3064 | set e [lindex $treediffs($diffids) [expr {$l-2}]] | |
| 3065 | } | |
| 3066 | set flist_menu_file $e | |
| 314f5de1 TA |
3067 | set xdiffstate "normal" |
| 3068 | if {$cmitmode eq "tree"} { | |
| 3069 | set xdiffstate "disabled" | |
| 3070 | } | |
| 3071 | # Disable "External diff" item in tree mode | |
| 3072 | $flist_menu entryconf 2 -state $xdiffstate | |
| 3244729a PM |
3073 | tk_popup $flist_menu $X $Y |
| 3074 | } | |
| 3075 | ||
| 7cdc3556 AG |
3076 | proc find_ctext_fileinfo {line} { |
| 3077 | global ctext_file_names ctext_file_lines | |
| 3078 | ||
| 3079 | set ok [bsearch $ctext_file_lines $line] | |
| 3080 | set tline [lindex $ctext_file_lines $ok] | |
| 3081 | ||
| 3082 | if {$ok >= [llength $ctext_file_lines] || $line < $tline} { | |
| 3083 | return {} | |
| 3084 | } else { | |
| 3085 | return [list [lindex $ctext_file_names $ok] $tline] | |
| 3086 | } | |
| 3087 | } | |
| 3088 | ||
| 3089 | proc pop_diff_menu {w X Y x y} { | |
| 3090 | global ctext diff_menu flist_menu_file | |
| 3091 | global diff_menu_txtpos diff_menu_line | |
| 3092 | global diff_menu_filebase | |
| 3093 | ||
| 7cdc3556 AG |
3094 | set diff_menu_txtpos [split [$w index "@$x,$y"] "."] |
| 3095 | set diff_menu_line [lindex $diff_menu_txtpos 0] | |
| 190ec52c PM |
3096 | # don't pop up the menu on hunk-separator or file-separator lines |
| 3097 | if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} { | |
| 3098 | return | |
| 3099 | } | |
| 3100 | stopfinding | |
| 7cdc3556 AG |
3101 | set f [find_ctext_fileinfo $diff_menu_line] |
| 3102 | if {$f eq {}} return | |
| 3103 | set flist_menu_file [lindex $f 0] | |
| 3104 | set diff_menu_filebase [lindex $f 1] | |
| 3105 | tk_popup $diff_menu $X $Y | |
| 3106 | } | |
| 3107 | ||
| 3244729a | 3108 | proc flist_hl {only} { |
| bb3edc8b | 3109 | global flist_menu_file findstring gdttype |
| 3244729a PM |
3110 | |
| 3111 | set x [shellquote $flist_menu_file] | |
| b007ee20 | 3112 | if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} { |
| bb3edc8b | 3113 | set findstring $x |
| 3244729a | 3114 | } else { |
| bb3edc8b | 3115 | append findstring " " $x |
| 3244729a | 3116 | } |
| b007ee20 | 3117 | set gdttype [mc "touching paths:"] |
| 3244729a PM |
3118 | } |
| 3119 | ||
| 314f5de1 TA |
3120 | proc save_file_from_commit {filename output what} { |
| 3121 | global nullfile | |
| 3122 | ||
| 3123 | if {[catch {exec git show $filename -- > $output} err]} { | |
| 3124 | if {[string match "fatal: bad revision *" $err]} { | |
| 3125 | return $nullfile | |
| 3126 | } | |
| 3945d2c0 | 3127 | error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err" |
| 314f5de1 TA |
3128 | return {} |
| 3129 | } | |
| 3130 | return $output | |
| 3131 | } | |
| 3132 | ||
| 3133 | proc external_diff_get_one_file {diffid filename diffdir} { | |
| 3134 | global nullid nullid2 nullfile | |
| 3135 | global gitdir | |
| 3136 | ||
| 3137 | if {$diffid == $nullid} { | |
| 3138 | set difffile [file join [file dirname $gitdir] $filename] | |
| 3139 | if {[file exists $difffile]} { | |
| 3140 | return $difffile | |
| 3141 | } | |
| 3142 | return $nullfile | |
| 3143 | } | |
| 3144 | if {$diffid == $nullid2} { | |
| 3145 | set difffile [file join $diffdir "\[index\] [file tail $filename]"] | |
| 3146 | return [save_file_from_commit :$filename $difffile index] | |
| 3147 | } | |
| 3148 | set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"] | |
| 3149 | return [save_file_from_commit $diffid:$filename $difffile \ | |
| 3150 | "revision $diffid"] | |
| 3151 | } | |
| 3152 | ||
| 3153 | proc external_diff {} { | |
| 3154 | global gitktmpdir nullid nullid2 | |
| 3155 | global flist_menu_file | |
| 3156 | global diffids | |
| 3157 | global diffnum | |
| 3158 | global gitdir extdifftool | |
| 3159 | ||
| 3160 | if {[llength $diffids] == 1} { | |
| 3161 | # no reference commit given | |
| 3162 | set diffidto [lindex $diffids 0] | |
| 3163 | if {$diffidto eq $nullid} { | |
| 3164 | # diffing working copy with index | |
| 3165 | set diffidfrom $nullid2 | |
| 3166 | } elseif {$diffidto eq $nullid2} { | |
| 3167 | # diffing index with HEAD | |
| 3168 | set diffidfrom "HEAD" | |
| 3169 | } else { | |
| 3170 | # use first parent commit | |
| 3171 | global parentlist selectedline | |
| 3172 | set diffidfrom [lindex $parentlist $selectedline 0] | |
| 3173 | } | |
| 3174 | } else { | |
| 3175 | set diffidfrom [lindex $diffids 0] | |
| 3176 | set diffidto [lindex $diffids 1] | |
| 3177 | } | |
| 3178 | ||
| 3179 | # make sure that several diffs wont collide | |
| 3180 | if {![info exists gitktmpdir]} { | |
| 3181 | set gitktmpdir [file join [file dirname $gitdir] \ | |
| 3182 | [format ".gitk-tmp.%s" [pid]]] | |
| 3183 | if {[catch {file mkdir $gitktmpdir} err]} { | |
| 3945d2c0 | 3184 | error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err" |
| 314f5de1 TA |
3185 | unset gitktmpdir |
| 3186 | return | |
| 3187 | } | |
| 3188 | set diffnum 0 | |
| 3189 | } | |
| 3190 | incr diffnum | |
| 3191 | set diffdir [file join $gitktmpdir $diffnum] | |
| 3192 | if {[catch {file mkdir $diffdir} err]} { | |
| 3945d2c0 | 3193 | error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err" |
| 314f5de1 TA |
3194 | return |
| 3195 | } | |
| 3196 | ||
| 3197 | # gather files to diff | |
| 3198 | set difffromfile [external_diff_get_one_file $diffidfrom $flist_menu_file $diffdir] | |
| 3199 | set difftofile [external_diff_get_one_file $diffidto $flist_menu_file $diffdir] | |
| 3200 | ||
| 3201 | if {$difffromfile ne {} && $difftofile ne {}} { | |
| 3202 | set cmd [concat | [shellsplit $extdifftool] \ | |
| 3203 | [list $difffromfile $difftofile]] | |
| 3204 | if {[catch {set fl [open $cmd r]} err]} { | |
| 3205 | file delete -force $diffdir | |
| 3945d2c0 | 3206 | error_popup "$extdifftool: [mc "command failed:"] $err" |
| 314f5de1 TA |
3207 | } else { |
| 3208 | fconfigure $fl -blocking 0 | |
| 3209 | filerun $fl [list delete_at_eof $fl $diffdir] | |
| 3210 | } | |
| 3211 | } | |
| 3212 | } | |
| 3213 | ||
| 7cdc3556 AG |
3214 | proc find_hunk_blamespec {base line} { |
| 3215 | global ctext | |
| 3216 | ||
| 3217 | # Find and parse the hunk header | |
| 3218 | set s_lix [$ctext search -backwards -regexp ^@@ "$line.0 lineend" $base.0] | |
| 3219 | if {$s_lix eq {}} return | |
| 3220 | ||
| 3221 | set s_line [$ctext get $s_lix "$s_lix + 1 lines"] | |
| 3222 | if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \ | |
| 3223 | s_line old_specs osz osz1 new_line nsz]} { | |
| 3224 | return | |
| 3225 | } | |
| 3226 | ||
| 3227 | # base lines for the parents | |
| 3228 | set base_lines [list $new_line] | |
| 3229 | foreach old_spec [lrange [split $old_specs " "] 1 end] { | |
| 3230 | if {![regexp -- {-(\d+)(,\d+)?} $old_spec \ | |
| 3231 | old_spec old_line osz]} { | |
| 3232 | return | |
| 3233 | } | |
| 3234 | lappend base_lines $old_line | |
| 3235 | } | |
| 3236 | ||
| 3237 | # Now scan the lines to determine offset within the hunk | |
| 7cdc3556 AG |
3238 | set max_parent [expr {[llength $base_lines]-2}] |
| 3239 | set dline 0 | |
| 3240 | set s_lno [lindex [split $s_lix "."] 0] | |
| 3241 | ||
| 190ec52c PM |
3242 | # Determine if the line is removed |
| 3243 | set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"] | |
| 3244 | if {[string match {[-+ ]*} $chunk]} { | |
| 7cdc3556 AG |
3245 | set removed_idx [string first "-" $chunk] |
| 3246 | # Choose a parent index | |
| 190ec52c PM |
3247 | if {$removed_idx >= 0} { |
| 3248 | set parent $removed_idx | |
| 3249 | } else { | |
| 3250 | set unchanged_idx [string first " " $chunk] | |
| 3251 | if {$unchanged_idx >= 0} { | |
| 3252 | set parent $unchanged_idx | |
| 7cdc3556 | 3253 | } else { |
| 190ec52c PM |
3254 | # blame the current commit |
| 3255 | set parent -1 | |
| 7cdc3556 AG |
3256 | } |
| 3257 | } | |
| 3258 | # then count other lines that belong to it | |
| 190ec52c PM |
3259 | for {set i $line} {[incr i -1] > $s_lno} {} { |
| 3260 | set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"] | |
| 3261 | # Determine if the line is removed | |
| 3262 | set removed_idx [string first "-" $chunk] | |
| 3263 | if {$parent >= 0} { | |
| 3264 | set code [string index $chunk $parent] | |
| 3265 | if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} { | |
| 3266 | incr dline | |
| 3267 | } | |
| 3268 | } else { | |
| 3269 | if {$removed_idx < 0} { | |
| 3270 | incr dline | |
| 3271 | } | |
| 7cdc3556 AG |
3272 | } |
| 3273 | } | |
| 190ec52c PM |
3274 | incr parent |
| 3275 | } else { | |
| 3276 | set parent 0 | |
| 7cdc3556 AG |
3277 | } |
| 3278 | ||
| 7cdc3556 AG |
3279 | incr dline [lindex $base_lines $parent] |
| 3280 | return [list $parent $dline] | |
| 3281 | } | |
| 3282 | ||
| 3283 | proc external_blame_diff {} { | |
| 8b07dca1 | 3284 | global currentid cmitmode |
| 7cdc3556 AG |
3285 | global diff_menu_txtpos diff_menu_line |
| 3286 | global diff_menu_filebase flist_menu_file | |
| 3287 | ||
| 3288 | if {$cmitmode eq "tree"} { | |
| 3289 | set parent_idx 0 | |
| 190ec52c | 3290 | set line [expr {$diff_menu_line - $diff_menu_filebase}] |
| 7cdc3556 AG |
3291 | } else { |
| 3292 | set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line] | |
| 3293 | if {$hinfo ne {}} { | |
| 3294 | set parent_idx [lindex $hinfo 0] | |
| 3295 | set line [lindex $hinfo 1] | |
| 3296 | } else { | |
| 3297 | set parent_idx 0 | |
| 3298 | set line 0 | |
| 3299 | } | |
| 3300 | } | |
| 3301 | ||
| 3302 | external_blame $parent_idx $line | |
| 3303 | } | |
| 3304 | ||
| fc4977e1 PM |
3305 | # Find the SHA1 ID of the blob for file $fname in the index |
| 3306 | # at stage 0 or 2 | |
| 3307 | proc index_sha1 {fname} { | |
| 3308 | set f [open [list | git ls-files -s $fname] r] | |
| 3309 | while {[gets $f line] >= 0} { | |
| 3310 | set info [lindex [split $line "\t"] 0] | |
| 3311 | set stage [lindex $info 2] | |
| 3312 | if {$stage eq "0" || $stage eq "2"} { | |
| 3313 | close $f | |
| 3314 | return [lindex $info 1] | |
| 3315 | } | |
| 3316 | } | |
| 3317 | close $f | |
| 3318 | return {} | |
| 3319 | } | |
| 3320 | ||
| 9712b81a PM |
3321 | # Turn an absolute path into one relative to the current directory |
| 3322 | proc make_relative {f} { | |
| 3323 | set elts [file split $f] | |
| 3324 | set here [file split [pwd]] | |
| 3325 | set ei 0 | |
| 3326 | set hi 0 | |
| 3327 | set res {} | |
| 3328 | foreach d $here { | |
| 3329 | if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} { | |
| 3330 | lappend res ".." | |
| 3331 | } else { | |
| 3332 | incr ei | |
| 3333 | } | |
| 3334 | incr hi | |
| 3335 | } | |
| 3336 | set elts [concat $res [lrange $elts $ei end]] | |
| 3337 | return [eval file join $elts] | |
| 3338 | } | |
| 3339 | ||
| 7cdc3556 | 3340 | proc external_blame {parent_idx {line {}}} { |
| 9712b81a | 3341 | global flist_menu_file gitdir |
| 77aa0ae8 AG |
3342 | global nullid nullid2 |
| 3343 | global parentlist selectedline currentid | |
| 3344 | ||
| 3345 | if {$parent_idx > 0} { | |
| 3346 | set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]] | |
| 3347 | } else { | |
| 3348 | set base_commit $currentid | |
| 3349 | } | |
| 3350 | ||
| 3351 | if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} { | |
| 3352 | error_popup [mc "No such commit"] | |
| 3353 | return | |
| 3354 | } | |
| 3355 | ||
| 7cdc3556 AG |
3356 | set cmdline [list git gui blame] |
| 3357 | if {$line ne {} && $line > 1} { | |
| 3358 | lappend cmdline "--line=$line" | |
| 3359 | } | |
| 9712b81a PM |
3360 | set f [file join [file dirname $gitdir] $flist_menu_file] |
| 3361 | # Unfortunately it seems git gui blame doesn't like | |
| 3362 | # being given an absolute path... | |
| 3363 | set f [make_relative $f] | |
| 3364 | lappend cmdline $base_commit $f | |
| 3365 | puts "cmdline={$cmdline}" | |
| 7cdc3556 | 3366 | if {[catch {eval exec $cmdline &} err]} { |
| 3945d2c0 | 3367 | error_popup "[mc "git gui blame: command failed:"] $err" |
| 77aa0ae8 AG |
3368 | } |
| 3369 | } | |
| 3370 | ||
| 8a897742 PM |
3371 | proc show_line_source {} { |
| 3372 | global cmitmode currentid parents curview blamestuff blameinst | |
| 3373 | global diff_menu_line diff_menu_filebase flist_menu_file | |
| fc4977e1 | 3374 | global nullid nullid2 gitdir |
| 8a897742 | 3375 | |
| fc4977e1 | 3376 | set from_index {} |
| 8a897742 PM |
3377 | if {$cmitmode eq "tree"} { |
| 3378 | set id $currentid | |
| 3379 | set line [expr {$diff_menu_line - $diff_menu_filebase}] | |
| 3380 | } else { | |
| 3381 | set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line] | |
| 3382 | if {$h eq {}} return | |
| 3383 | set pi [lindex $h 0] | |
| 3384 | if {$pi == 0} { | |
| 3385 | mark_ctext_line $diff_menu_line | |
| 3386 | return | |
| 3387 | } | |
| fc4977e1 PM |
3388 | incr pi -1 |
| 3389 | if {$currentid eq $nullid} { | |
| 3390 | if {$pi > 0} { | |
| 3391 | # must be a merge in progress... | |
| 3392 | if {[catch { | |
| 3393 | # get the last line from .git/MERGE_HEAD | |
| 3394 | set f [open [file join $gitdir MERGE_HEAD] r] | |
| 3395 | set id [lindex [split [read $f] "\n"] end-1] | |
| 3396 | close $f | |
| 3397 | } err]} { | |
| 3398 | error_popup [mc "Couldn't read merge head: %s" $err] | |
| 3399 | return | |
| 3400 | } | |
| 3401 | } elseif {$parents($curview,$currentid) eq $nullid2} { | |
| 3402 | # need to do the blame from the index | |
| 3403 | if {[catch { | |
| 3404 | set from_index [index_sha1 $flist_menu_file] | |
| 3405 | } err]} { | |
| 3406 | error_popup [mc "Error reading index: %s" $err] | |
| 3407 | return | |
| 3408 | } | |
| 9712b81a PM |
3409 | } else { |
| 3410 | set id $parents($curview,$currentid) | |
| fc4977e1 PM |
3411 | } |
| 3412 | } else { | |
| 3413 | set id [lindex $parents($curview,$currentid) $pi] | |
| 3414 | } | |
| 8a897742 PM |
3415 | set line [lindex $h 1] |
| 3416 | } | |
| fc4977e1 PM |
3417 | set blameargs {} |
| 3418 | if {$from_index ne {}} { | |
| 3419 | lappend blameargs | git cat-file blob $from_index | |
| 3420 | } | |
| 3421 | lappend blameargs | git blame -p -L$line,+1 | |
| 3422 | if {$from_index ne {}} { | |
| 3423 | lappend blameargs --contents - | |
| 3424 | } else { | |
| 3425 | lappend blameargs $id | |
| 3426 | } | |
| 9712b81a | 3427 | lappend blameargs -- [file join [file dirname $gitdir] $flist_menu_file] |
| 8a897742 | 3428 | if {[catch { |
| fc4977e1 | 3429 | set f [open $blameargs r] |
| 8a897742 PM |
3430 | } err]} { |
| 3431 | error_popup [mc "Couldn't start git blame: %s" $err] | |
| 3432 | return | |
| 3433 | } | |
| f3413079 | 3434 | nowbusy blaming [mc "Searching"] |
| 8a897742 PM |
3435 | fconfigure $f -blocking 0 |
| 3436 | set i [reg_instance $f] | |
| 3437 | set blamestuff($i) {} | |
| 3438 | set blameinst $i | |
| 3439 | filerun $f [list read_line_source $f $i] | |
| 3440 | } | |
| 3441 | ||
| 3442 | proc stopblaming {} { | |
| 3443 | global blameinst | |
| 3444 | ||
| 3445 | if {[info exists blameinst]} { | |
| 3446 | stop_instance $blameinst | |
| 3447 | unset blameinst | |
| f3413079 | 3448 | notbusy blaming |
| 8a897742 PM |
3449 | } |
| 3450 | } | |
| 3451 | ||
| 3452 | proc read_line_source {fd inst} { | |
| fc4977e1 | 3453 | global blamestuff curview commfd blameinst nullid nullid2 |
| 8a897742 PM |
3454 | |
| 3455 | while {[gets $fd line] >= 0} { | |
| 3456 | lappend blamestuff($inst) $line | |
| 3457 | } | |
| 3458 | if {![eof $fd]} { | |
| 3459 | return 1 | |
| 3460 | } | |
| 3461 | unset commfd($inst) | |
| 3462 | unset blameinst | |
| f3413079 | 3463 | notbusy blaming |
| 8a897742 PM |
3464 | fconfigure $fd -blocking 1 |
| 3465 | if {[catch {close $fd} err]} { | |
| 3466 | error_popup [mc "Error running git blame: %s" $err] | |
| 3467 | return 0 | |
| 3468 | } | |
| 3469 | ||
| 3470 | set fname {} | |
| 3471 | set line [split [lindex $blamestuff($inst) 0] " "] | |
| 3472 | set id [lindex $line 0] | |
| 3473 | set lnum [lindex $line 1] | |
| 3474 | if {[string length $id] == 40 && [string is xdigit $id] && | |
| 3475 | [string is digit -strict $lnum]} { | |
| 3476 | # look for "filename" line | |
| 3477 | foreach l $blamestuff($inst) { | |
| 3478 | if {[string match "filename *" $l]} { | |
| 3479 | set fname [string range $l 9 end] | |
| 3480 | break | |
| 3481 | } | |
| 3482 | } | |
| 3483 | } | |
| 3484 | if {$fname ne {}} { | |
| 3485 | # all looks good, select it | |
| fc4977e1 PM |
3486 | if {$id eq $nullid} { |
| 3487 | # blame uses all-zeroes to mean not committed, | |
| 3488 | # which would mean a change in the index | |
| 3489 | set id $nullid2 | |
| 3490 | } | |
| 8a897742 PM |
3491 | if {[commitinview $id $curview]} { |
| 3492 | selectline [rowofcommit $id] 1 [list $fname $lnum] | |
| 3493 | } else { | |
| 3494 | error_popup [mc "That line comes from commit %s, \ | |
| 3495 | which is not in this view" [shortids $id]] | |
| 3496 | } | |
| 3497 | } else { | |
| 3498 | puts "oops couldn't parse git blame output" | |
| 3499 | } | |
| 3500 | return 0 | |
| 3501 | } | |
| 3502 | ||
| 314f5de1 TA |
3503 | # delete $dir when we see eof on $f (presumably because the child has exited) |
| 3504 | proc delete_at_eof {f dir} { | |
| 3505 | while {[gets $f line] >= 0} {} | |
| 3506 | if {[eof $f]} { | |
| 3507 | if {[catch {close $f} err]} { | |
| 3945d2c0 | 3508 | error_popup "[mc "External diff viewer failed:"] $err" |
| 314f5de1 TA |
3509 | } |
| 3510 | file delete -force $dir | |
| 3511 | return 0 | |
| 3512 | } | |
| 3513 | return 1 | |
| 3514 | } | |
| 3515 | ||
| 098dd8a3 PM |
3516 | # Functions for adding and removing shell-type quoting |
| 3517 | ||
| 3518 | proc shellquote {str} { | |
| 3519 | if {![string match "*\['\"\\ \t]*" $str]} { | |
| 3520 | return $str | |
| 3521 | } | |
| 3522 | if {![string match "*\['\"\\]*" $str]} { | |
| 3523 | return "\"$str\"" | |
| 3524 | } | |
| 3525 | if {![string match "*'*" $str]} { | |
| 3526 | return "'$str'" | |
| 3527 | } | |
| 3528 | return "\"[string map {\" \\\" \\ \\\\} $str]\"" | |
| 3529 | } | |
| 3530 | ||
| 3531 | proc shellarglist {l} { | |
| 3532 | set str {} | |
| 3533 | foreach a $l { | |
| 3534 | if {$str ne {}} { | |
| 3535 | append str " " | |
| 3536 | } | |
| 3537 | append str [shellquote $a] | |
| 3538 | } | |
| 3539 | return $str | |
| 3540 | } | |
| 3541 | ||
| 3542 | proc shelldequote {str} { | |
| 3543 | set ret {} | |
| 3544 | set used -1 | |
| 3545 | while {1} { | |
| 3546 | incr used | |
| 3547 | if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} { | |
| 3548 | append ret [string range $str $used end] | |
| 3549 | set used [string length $str] | |
| 3550 | break | |
| 3551 | } | |
| 3552 | set first [lindex $first 0] | |
| 3553 | set ch [string index $str $first] | |
| 3554 | if {$first > $used} { | |
| 3555 | append ret [string range $str $used [expr {$first - 1}]] | |
| 3556 | set used $first | |
| 3557 | } | |
| 3558 | if {$ch eq " " || $ch eq "\t"} break | |
| 3559 | incr used | |
| 3560 | if {$ch eq "'"} { | |
| 3561 | set first [string first "'" $str $used] | |
| 3562 | if {$first < 0} { | |
| 3563 | error "unmatched single-quote" | |
| 3564 | } | |
| 3565 | append ret [string range $str $used [expr {$first - 1}]] | |
| 3566 | set used $first | |
| 3567 | continue | |
| 3568 | } | |
| 3569 | if {$ch eq "\\"} { | |
| 3570 | if {$used >= [string length $str]} { | |
| 3571 | error "trailing backslash" | |
| 3572 | } | |
| 3573 | append ret [string index $str $used] | |
| 3574 | continue | |
| 3575 | } | |
| 3576 | # here ch == "\"" | |
| 3577 | while {1} { | |
| 3578 | if {![regexp -start $used -indices "\[\"\\\\]" $str first]} { | |
| 3579 | error "unmatched double-quote" | |
| 3580 | } | |
| 3581 | set first [lindex $first 0] | |
| 3582 | set ch [string index $str $first] | |
| 3583 | if {$first > $used} { | |
| 3584 | append ret [string range $str $used [expr {$first - 1}]] | |
| 3585 | set used $first | |
| 3586 | } | |
| 3587 | if {$ch eq "\""} break | |
| 3588 | incr used | |
| 3589 | append ret [string index $str $used] | |
| 3590 | incr used | |
| 3591 | } | |
| 3592 | } | |
| 3593 | return [list $used $ret] | |
| 3594 | } | |
| 3595 | ||
| 3596 | proc shellsplit {str} { | |
| 3597 | set l {} | |
| 3598 | while {1} { | |
| 3599 | set str [string trimleft $str] | |
| 3600 | if {$str eq {}} break | |
| 3601 | set dq [shelldequote $str] | |
| 3602 | set n [lindex $dq 0] | |
| 3603 | set word [lindex $dq 1] | |
| 3604 | set str [string range $str $n end] | |
| 3605 | lappend l $word | |
| 3606 | } | |
| 3607 | return $l | |
| 3608 | } | |
| 3609 | ||
| 7fcceed7 PM |
3610 | # Code to implement multiple views |
| 3611 | ||
| da7c24dd | 3612 | proc newview {ishighlight} { |
| 218a900b AG |
3613 | global nextviewnum newviewname newishighlight |
| 3614 | global revtreeargs viewargscmd newviewopts curview | |
| 50b44ece | 3615 | |
| da7c24dd | 3616 | set newishighlight $ishighlight |
| 50b44ece PM |
3617 | set top .gitkview |
| 3618 | if {[winfo exists $top]} { | |
| 3619 | raise $top | |
| 3620 | return | |
| 3621 | } | |
| a3a1f579 | 3622 | set newviewname($nextviewnum) "[mc "View"] $nextviewnum" |
| 218a900b AG |
3623 | set newviewopts($nextviewnum,perm) 0 |
| 3624 | set newviewopts($nextviewnum,cmd) $viewargscmd($curview) | |
| 3625 | decode_view_opts $nextviewnum $revtreeargs | |
| d990cedf | 3626 | vieweditor $top $nextviewnum [mc "Gitk view definition"] |
| d16c0812 PM |
3627 | } |
| 3628 | ||
| 218a900b AG |
3629 | set known_view_options { |
| 3630 | {perm b . {} {mc "Remember this view"}} | |
| 3631 | {args t50= + {} {mc "Commits to include (arguments to git log):"}} | |
| 3632 | {all b * "--all" {mc "Use all refs"}} | |
| 3633 | {dorder b . {"--date-order" "-d"} {mc "Strictly sort by date"}} | |
| 3634 | {lright b . "--left-right" {mc "Mark branch sides"}} | |
| 3635 | {since t15 + {"--since=*" "--after=*"} {mc "Since date:"}} | |
| 3636 | {until t15 . {"--until=*" "--before=*"} {mc "Until date:"}} | |
| 3637 | {limit t10 + "--max-count=*" {mc "Max count:"}} | |
| 3638 | {skip t10 . "--skip=*" {mc "Skip:"}} | |
| 3639 | {first b . "--first-parent" {mc "Limit to first parent"}} | |
| 3640 | {cmd t50= + {} {mc "Command to generate more commits to include:"}} | |
| 3641 | } | |
| 3642 | ||
| 3643 | proc encode_view_opts {n} { | |
| 3644 | global known_view_options newviewopts | |
| 3645 | ||
| 3646 | set rargs [list] | |
| 3647 | foreach opt $known_view_options { | |
| 3648 | set patterns [lindex $opt 3] | |
| 3649 | if {$patterns eq {}} continue | |
| 3650 | set pattern [lindex $patterns 0] | |
| 3651 | ||
| 3652 | set val $newviewopts($n,[lindex $opt 0]) | |
| 3653 | ||
| 3654 | if {[lindex $opt 1] eq "b"} { | |
| 3655 | if {$val} { | |
| 3656 | lappend rargs $pattern | |
| 3657 | } | |
| 3658 | } else { | |
| 3659 | set val [string trim $val] | |
| 3660 | if {$val ne {}} { | |
| 3661 | set pfix [string range $pattern 0 end-1] | |
| 3662 | lappend rargs $pfix$val | |
| 3663 | } | |
| 3664 | } | |
| 3665 | } | |
| 3666 | return [concat $rargs [shellsplit $newviewopts($n,args)]] | |
| 3667 | } | |
| 3668 | ||
| 3669 | proc decode_view_opts {n view_args} { | |
| 3670 | global known_view_options newviewopts | |
| 3671 | ||
| 3672 | foreach opt $known_view_options { | |
| 3673 | if {[lindex $opt 1] eq "b"} { | |
| 3674 | set val 0 | |
| 3675 | } else { | |
| 3676 | set val {} | |
| 3677 | } | |
| 3678 | set newviewopts($n,[lindex $opt 0]) $val | |
| 3679 | } | |
| 3680 | set oargs [list] | |
| 3681 | foreach arg $view_args { | |
| 3682 | if {[regexp -- {^-([0-9]+)$} $arg arg cnt] | |
| 3683 | && ![info exists found(limit)]} { | |
| 3684 | set newviewopts($n,limit) $cnt | |
| 3685 | set found(limit) 1 | |
| 3686 | continue | |
| 3687 | } | |
| 3688 | catch { unset val } | |
| 3689 | foreach opt $known_view_options { | |
| 3690 | set id [lindex $opt 0] | |
| 3691 | if {[info exists found($id)]} continue | |
| 3692 | foreach pattern [lindex $opt 3] { | |
| 3693 | if {![string match $pattern $arg]} continue | |
| 3694 | if {[lindex $opt 1] ne "b"} { | |
| 3695 | set size [string length $pattern] | |
| 3696 | set val [string range $arg [expr {$size-1}] end] | |
| 3697 | } else { | |
| 3698 | set val 1 | |
| 3699 | } | |
| 3700 | set newviewopts($n,$id) $val | |
| 3701 | set found($id) 1 | |
| 3702 | break | |
| 3703 | } | |
| 3704 | if {[info exists val]} break | |
| 3705 | } | |
| 3706 | if {[info exists val]} continue | |
| 3707 | lappend oargs $arg | |
| 3708 | } | |
| 3709 | set newviewopts($n,args) [shellarglist $oargs] | |
| 3710 | } | |
| 3711 | ||
| cea07cf8 AG |
3712 | proc edit_or_newview {} { |
| 3713 | global curview | |
| 3714 | ||
| 3715 | if {$curview > 0} { | |
| 3716 | editview | |
| 3717 | } else { | |
| 3718 | newview 0 | |
| 3719 | } | |
| 3720 | } | |
| 3721 | ||
| d16c0812 PM |
3722 | proc editview {} { |
| 3723 | global curview | |
| 218a900b AG |
3724 | global viewname viewperm newviewname newviewopts |
| 3725 | global viewargs viewargscmd | |
| d16c0812 PM |
3726 | |
| 3727 | set top .gitkvedit-$curview | |
| 3728 | if {[winfo exists $top]} { | |
| 3729 | raise $top | |
| 3730 | return | |
| 3731 | } | |
| 218a900b AG |
3732 | set newviewname($curview) $viewname($curview) |
| 3733 | set newviewopts($curview,perm) $viewperm($curview) | |
| 3734 | set newviewopts($curview,cmd) $viewargscmd($curview) | |
| 3735 | decode_view_opts $curview $viewargs($curview) | |
| d16c0812 PM |
3736 | vieweditor $top $curview "Gitk: edit view $viewname($curview)" |
| 3737 | } | |
| 3738 | ||
| 3739 | proc vieweditor {top n title} { | |
| 218a900b AG |
3740 | global newviewname newviewopts viewfiles bgcolor |
| 3741 | global known_view_options | |
| d16c0812 | 3742 | |
| 50b44ece | 3743 | toplevel $top |
| d16c0812 | 3744 | wm title $top $title |
| e7d64008 | 3745 | make_transient $top . |
| 218a900b AG |
3746 | |
| 3747 | # View name | |
| 3748 | frame $top.nfr | |
| b039f0a6 PM |
3749 | label $top.nl -text [mc "Name"] |
| 3750 | entry $top.name -width 20 -textvariable newviewname($n) | |
| 218a900b AG |
3751 | pack $top.nfr -in $top -fill x -pady 5 -padx 3 |
| 3752 | pack $top.nl -in $top.nfr -side left -padx {0 30} | |
| 3753 | pack $top.name -in $top.nfr -side left | |
| 3754 | ||
| 3755 | # View options | |
| 3756 | set cframe $top.nfr | |
| 3757 | set cexpand 0 | |
| 3758 | set cnt 0 | |
| 3759 | foreach opt $known_view_options { | |
| 3760 | set id [lindex $opt 0] | |
| 3761 | set type [lindex $opt 1] | |
| 3762 | set flags [lindex $opt 2] | |
| 3763 | set title [eval [lindex $opt 4]] | |
| 3764 | set lxpad 0 | |
| 3765 | ||
| 3766 | if {$flags eq "+" || $flags eq "*"} { | |
| 3767 | set cframe $top.fr$cnt | |
| 3768 | incr cnt | |
| 3769 | frame $cframe | |
| 3770 | pack $cframe -in $top -fill x -pady 3 -padx 3 | |
| 3771 | set cexpand [expr {$flags eq "*"}] | |
| 3772 | } else { | |
| 3773 | set lxpad 5 | |
| 3774 | } | |
| 3775 | ||
| 3776 | if {$type eq "b"} { | |
| 3777 | checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id) | |
| 3778 | pack $cframe.c_$id -in $cframe -side left \ | |
| 3779 | -padx [list $lxpad 0] -expand $cexpand -anchor w | |
| 3780 | } elseif {[regexp {^t(\d+)$} $type type sz]} { | |
| 3781 | message $cframe.l_$id -aspect 1500 -text $title | |
| 3782 | entry $cframe.e_$id -width $sz -background $bgcolor \ | |
| 3783 | -textvariable newviewopts($n,$id) | |
| 3784 | pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0] | |
| 3785 | pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x | |
| 3786 | } elseif {[regexp {^t(\d+)=$} $type type sz]} { | |
| 3787 | message $cframe.l_$id -aspect 1500 -text $title | |
| 3788 | entry $cframe.e_$id -width $sz -background $bgcolor \ | |
| 3789 | -textvariable newviewopts($n,$id) | |
| 3790 | pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w | |
| 3791 | pack $cframe.e_$id -in $cframe -side top -fill x | |
| 3792 | } | |
| 3793 | } | |
| 3794 | ||
| 3795 | # Path list | |
| 3796 | message $top.l -aspect 1500 \ | |
| d990cedf | 3797 | -text [mc "Enter files and directories to include, one per line:"] |
| 218a900b AG |
3798 | pack $top.l -in $top -side top -pady [list 7 0] -anchor w -padx 3 |
| 3799 | text $top.t -width 40 -height 5 -background $bgcolor -font uifont | |
| d16c0812 PM |
3800 | if {[info exists viewfiles($n)]} { |
| 3801 | foreach f $viewfiles($n) { | |
| 3802 | $top.t insert end $f | |
| 3803 | $top.t insert end "\n" | |
| 3804 | } | |
| 3805 | $top.t delete {end - 1c} end | |
| 3806 | $top.t mark set insert 0.0 | |
| 3807 | } | |
| 218a900b | 3808 | pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3 |
| 50b44ece | 3809 | frame $top.buts |
| b039f0a6 | 3810 | button $top.buts.ok -text [mc "OK"] -command [list newviewok $top $n] |
| 218a900b | 3811 | button $top.buts.apply -text [mc "Apply (F5)"] -command [list newviewok $top $n 1] |
| b039f0a6 | 3812 | button $top.buts.can -text [mc "Cancel"] -command [list destroy $top] |
| 218a900b AG |
3813 | bind $top <Control-Return> [list newviewok $top $n] |
| 3814 | bind $top <F5> [list newviewok $top $n 1] | |
| 76f15947 | 3815 | bind $top <Escape> [list destroy $top] |
| 218a900b | 3816 | grid $top.buts.ok $top.buts.apply $top.buts.can |
| 50b44ece PM |
3817 | grid columnconfigure $top.buts 0 -weight 1 -uniform a |
| 3818 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 218a900b AG |
3819 | grid columnconfigure $top.buts 2 -weight 1 -uniform a |
| 3820 | pack $top.buts -in $top -side top -fill x | |
| 50b44ece PM |
3821 | focus $top.t |
| 3822 | } | |
| 3823 | ||
| 908c3585 | 3824 | proc doviewmenu {m first cmd op argv} { |
| da7c24dd PM |
3825 | set nmenu [$m index end] |
| 3826 | for {set i $first} {$i <= $nmenu} {incr i} { | |
| 3827 | if {[$m entrycget $i -command] eq $cmd} { | |
| 908c3585 | 3828 | eval $m $op $i $argv |
| da7c24dd | 3829 | break |
| d16c0812 PM |
3830 | } |
| 3831 | } | |
| da7c24dd PM |
3832 | } |
| 3833 | ||
| 3834 | proc allviewmenus {n op args} { | |
| 687c8765 | 3835 | # global viewhlmenu |
| 908c3585 | 3836 | |
| 3cd204e5 | 3837 | doviewmenu .bar.view 5 [list showview $n] $op $args |
| 687c8765 | 3838 | # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args |
| d16c0812 PM |
3839 | } |
| 3840 | ||
| 218a900b | 3841 | proc newviewok {top n {apply 0}} { |
| da7c24dd | 3842 | global nextviewnum newviewperm newviewname newishighlight |
| d16c0812 | 3843 | global viewname viewfiles viewperm selectedview curview |
| 218a900b | 3844 | global viewargs viewargscmd newviewopts viewhlmenu |
| 50b44ece | 3845 | |
| 098dd8a3 | 3846 | if {[catch { |
| 218a900b | 3847 | set newargs [encode_view_opts $n] |
| 098dd8a3 | 3848 | } err]} { |
| 84a76f18 | 3849 | error_popup "[mc "Error in commit selection arguments:"] $err" $top |
| 098dd8a3 PM |
3850 | return |
| 3851 | } | |
| 50b44ece | 3852 | set files {} |
| d16c0812 | 3853 | foreach f [split [$top.t get 0.0 end] "\n"] { |
| 50b44ece PM |
3854 | set ft [string trim $f] |
| 3855 | if {$ft ne {}} { | |
| 3856 | lappend files $ft | |
| 3857 | } | |
| 3858 | } | |
| d16c0812 PM |
3859 | if {![info exists viewfiles($n)]} { |
| 3860 | # creating a new view | |
| 3861 | incr nextviewnum | |
| 3862 | set viewname($n) $newviewname($n) | |
| 218a900b | 3863 | set viewperm($n) $newviewopts($n,perm) |
| d16c0812 | 3864 | set viewfiles($n) $files |
| 098dd8a3 | 3865 | set viewargs($n) $newargs |
| 218a900b | 3866 | set viewargscmd($n) $newviewopts($n,cmd) |
| da7c24dd PM |
3867 | addviewmenu $n |
| 3868 | if {!$newishighlight} { | |
| 7eb3cb9c | 3869 | run showview $n |
| da7c24dd | 3870 | } else { |
| 7eb3cb9c | 3871 | run addvhighlight $n |
| da7c24dd | 3872 | } |
| d16c0812 PM |
3873 | } else { |
| 3874 | # editing an existing view | |
| 218a900b | 3875 | set viewperm($n) $newviewopts($n,perm) |
| d16c0812 PM |
3876 | if {$newviewname($n) ne $viewname($n)} { |
| 3877 | set viewname($n) $newviewname($n) | |
| 3cd204e5 | 3878 | doviewmenu .bar.view 5 [list showview $n] \ |
| 908c3585 | 3879 | entryconf [list -label $viewname($n)] |
| 687c8765 PM |
3880 | # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \ |
| 3881 | # entryconf [list -label $viewname($n) -value $viewname($n)] | |
| d16c0812 | 3882 | } |
| 2d480856 | 3883 | if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \ |
| 218a900b | 3884 | $newviewopts($n,cmd) ne $viewargscmd($n)} { |
| d16c0812 | 3885 | set viewfiles($n) $files |
| 098dd8a3 | 3886 | set viewargs($n) $newargs |
| 218a900b | 3887 | set viewargscmd($n) $newviewopts($n,cmd) |
| d16c0812 | 3888 | if {$curview == $n} { |
| 7fcc92bf | 3889 | run reloadcommits |
| d16c0812 PM |
3890 | } |
| 3891 | } | |
| 3892 | } | |
| 218a900b | 3893 | if {$apply} return |
| d16c0812 | 3894 | catch {destroy $top} |
| 50b44ece PM |
3895 | } |
| 3896 | ||
| 3897 | proc delview {} { | |
| 7fcc92bf | 3898 | global curview viewperm hlview selectedhlview |
| 50b44ece PM |
3899 | |
| 3900 | if {$curview == 0} return | |
| 908c3585 | 3901 | if {[info exists hlview] && $hlview == $curview} { |
| b007ee20 | 3902 | set selectedhlview [mc "None"] |
| 908c3585 PM |
3903 | unset hlview |
| 3904 | } | |
| da7c24dd | 3905 | allviewmenus $curview delete |
| a90a6d24 | 3906 | set viewperm($curview) 0 |
| 50b44ece PM |
3907 | showview 0 |
| 3908 | } | |
| 3909 | ||
| da7c24dd | 3910 | proc addviewmenu {n} { |
| 908c3585 | 3911 | global viewname viewhlmenu |
| da7c24dd PM |
3912 | |
| 3913 | .bar.view add radiobutton -label $viewname($n) \ | |
| 3914 | -command [list showview $n] -variable selectedview -value $n | |
| 687c8765 PM |
3915 | #$viewhlmenu add radiobutton -label $viewname($n) \ |
| 3916 | # -command [list addvhighlight $n] -variable selectedhlview | |
| da7c24dd PM |
3917 | } |
| 3918 | ||
| 50b44ece | 3919 | proc showview {n} { |
| 3ed31a81 | 3920 | global curview cached_commitrow ordertok |
| f5f3c2e2 | 3921 | global displayorder parentlist rowidlist rowisopt rowfinal |
| 7fcc92bf PM |
3922 | global colormap rowtextx nextcolor canvxmax |
| 3923 | global numcommits viewcomplete | |
| 50b44ece | 3924 | global selectedline currentid canv canvy0 |
| 4fb0fa19 | 3925 | global treediffs |
| 3e76608d | 3926 | global pending_select mainheadid |
| 0380081c | 3927 | global commitidx |
| 3e76608d | 3928 | global selectedview |
| 97645683 | 3929 | global hlview selectedhlview commitinterest |
| 50b44ece PM |
3930 | |
| 3931 | if {$n == $curview} return | |
| 3932 | set selid {} | |
| 7fcc92bf PM |
3933 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 3934 | set span [$canv yview] | |
| 3935 | set ytop [expr {[lindex $span 0] * $ymax}] | |
| 3936 | set ybot [expr {[lindex $span 1] * $ymax}] | |
| 3937 | set yscreen [expr {($ybot - $ytop) / 2}] | |
| 94b4a69f | 3938 | if {$selectedline ne {}} { |
| 50b44ece PM |
3939 | set selid $currentid |
| 3940 | set y [yc $selectedline] | |
| 50b44ece PM |
3941 | if {$ytop < $y && $y < $ybot} { |
| 3942 | set yscreen [expr {$y - $ytop}] | |
| 50b44ece | 3943 | } |
| e507fd48 PM |
3944 | } elseif {[info exists pending_select]} { |
| 3945 | set selid $pending_select | |
| 3946 | unset pending_select | |
| 50b44ece PM |
3947 | } |
| 3948 | unselectline | |
| fdedbcfb | 3949 | normalline |
| 50b44ece PM |
3950 | catch {unset treediffs} |
| 3951 | clear_display | |
| 908c3585 PM |
3952 | if {[info exists hlview] && $hlview == $n} { |
| 3953 | unset hlview | |
| b007ee20 | 3954 | set selectedhlview [mc "None"] |
| 908c3585 | 3955 | } |
| 97645683 | 3956 | catch {unset commitinterest} |
| 7fcc92bf | 3957 | catch {unset cached_commitrow} |
| 9257d8f7 | 3958 | catch {unset ordertok} |
| 50b44ece PM |
3959 | |
| 3960 | set curview $n | |
| a90a6d24 | 3961 | set selectedview $n |
| f2d0bbbd PM |
3962 | .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}] |
| 3963 | .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}] | |
| 50b44ece | 3964 | |
| df904497 | 3965 | run refill_reflist |
| 7fcc92bf | 3966 | if {![info exists viewcomplete($n)]} { |
| 567c34e0 | 3967 | getcommits $selid |
| 50b44ece PM |
3968 | return |
| 3969 | } | |
| 3970 | ||
| 7fcc92bf PM |
3971 | set displayorder {} |
| 3972 | set parentlist {} | |
| 3973 | set rowidlist {} | |
| 3974 | set rowisopt {} | |
| 3975 | set rowfinal {} | |
| f5f3c2e2 | 3976 | set numcommits $commitidx($n) |
| 22626ef4 | 3977 | |
| 50b44ece PM |
3978 | catch {unset colormap} |
| 3979 | catch {unset rowtextx} | |
| da7c24dd PM |
3980 | set nextcolor 0 |
| 3981 | set canvxmax [$canv cget -width] | |
| 50b44ece PM |
3982 | set curview $n |
| 3983 | set row 0 | |
| 50b44ece PM |
3984 | setcanvscroll |
| 3985 | set yf 0 | |
| e507fd48 | 3986 | set row {} |
| 7fcc92bf PM |
3987 | if {$selid ne {} && [commitinview $selid $n]} { |
| 3988 | set row [rowofcommit $selid] | |
| 50b44ece PM |
3989 | # try to get the selected row in the same position on the screen |
| 3990 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 3991 | set ytop [expr {[yc $row] - $yscreen}] | |
| 3992 | if {$ytop < 0} { | |
| 3993 | set ytop 0 | |
| 3994 | } | |
| 3995 | set yf [expr {$ytop * 1.0 / $ymax}] | |
| 3996 | } | |
| 3997 | allcanvs yview moveto $yf | |
| 3998 | drawvisible | |
| e507fd48 PM |
3999 | if {$row ne {}} { |
| 4000 | selectline $row 0 | |
| 3e76608d | 4001 | } elseif {!$viewcomplete($n)} { |
| 567c34e0 | 4002 | reset_pending_select $selid |
| e507fd48 | 4003 | } else { |
| 835e62ae AG |
4004 | reset_pending_select {} |
| 4005 | ||
| 4006 | if {[commitinview $pending_select $curview]} { | |
| 4007 | selectline [rowofcommit $pending_select] 1 | |
| 4008 | } else { | |
| 4009 | set row [first_real_row] | |
| 4010 | if {$row < $numcommits} { | |
| 4011 | selectline $row 0 | |
| 4012 | } | |
| e507fd48 PM |
4013 | } |
| 4014 | } | |
| 7fcc92bf PM |
4015 | if {!$viewcomplete($n)} { |
| 4016 | if {$numcommits == 0} { | |
| d990cedf | 4017 | show_status [mc "Reading commits..."] |
| d16c0812 | 4018 | } |
| 098dd8a3 | 4019 | } elseif {$numcommits == 0} { |
| d990cedf | 4020 | show_status [mc "No commits selected"] |
| 2516dae2 | 4021 | } |
| 50b44ece PM |
4022 | } |
| 4023 | ||
| 908c3585 PM |
4024 | # Stuff relating to the highlighting facility |
| 4025 | ||
| 476ca63d | 4026 | proc ishighlighted {id} { |
| 164ff275 | 4027 | global vhighlights fhighlights nhighlights rhighlights |
| 908c3585 | 4028 | |
| 476ca63d PM |
4029 | if {[info exists nhighlights($id)] && $nhighlights($id) > 0} { |
| 4030 | return $nhighlights($id) | |
| 908c3585 | 4031 | } |
| 476ca63d PM |
4032 | if {[info exists vhighlights($id)] && $vhighlights($id) > 0} { |
| 4033 | return $vhighlights($id) | |
| 908c3585 | 4034 | } |
| 476ca63d PM |
4035 | if {[info exists fhighlights($id)] && $fhighlights($id) > 0} { |
| 4036 | return $fhighlights($id) | |
| 908c3585 | 4037 | } |
| 476ca63d PM |
4038 | if {[info exists rhighlights($id)] && $rhighlights($id) > 0} { |
| 4039 | return $rhighlights($id) | |
| 164ff275 | 4040 | } |
| 908c3585 PM |
4041 | return 0 |
| 4042 | } | |
| 4043 | ||
| 28593d3f PM |
4044 | proc bolden {id font} { |
| 4045 | global canv linehtag currentid boldids need_redisplay | |
| 908c3585 | 4046 | |
| d98d50e2 PM |
4047 | # need_redisplay = 1 means the display is stale and about to be redrawn |
| 4048 | if {$need_redisplay} return | |
| 28593d3f PM |
4049 | lappend boldids $id |
| 4050 | $canv itemconf $linehtag($id) -font $font | |
| 4051 | if {[info exists currentid] && $id eq $currentid} { | |
| 908c3585 | 4052 | $canv delete secsel |
| 28593d3f | 4053 | set t [eval $canv create rect [$canv bbox $linehtag($id)] \ |
| 908c3585 PM |
4054 | -outline {{}} -tags secsel \ |
| 4055 | -fill [$canv cget -selectbackground]] | |
| 4056 | $canv lower $t | |
| 4057 | } | |
| 4058 | } | |
| 4059 | ||
| 28593d3f PM |
4060 | proc bolden_name {id font} { |
| 4061 | global canv2 linentag currentid boldnameids need_redisplay | |
| 908c3585 | 4062 | |
| d98d50e2 | 4063 | if {$need_redisplay} return |
| 28593d3f PM |
4064 | lappend boldnameids $id |
| 4065 | $canv2 itemconf $linentag($id) -font $font | |
| 4066 | if {[info exists currentid] && $id eq $currentid} { | |
| 908c3585 | 4067 | $canv2 delete secsel |
| 28593d3f | 4068 | set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \ |
| 908c3585 PM |
4069 | -outline {{}} -tags secsel \ |
| 4070 | -fill [$canv2 cget -selectbackground]] | |
| 4071 | $canv2 lower $t | |
| 4072 | } | |
| 4073 | } | |
| 4074 | ||
| 4e7d6779 | 4075 | proc unbolden {} { |
| 28593d3f | 4076 | global boldids |
| 908c3585 | 4077 | |
| 4e7d6779 | 4078 | set stillbold {} |
| 28593d3f PM |
4079 | foreach id $boldids { |
| 4080 | if {![ishighlighted $id]} { | |
| 4081 | bolden $id mainfont | |
| 4e7d6779 | 4082 | } else { |
| 28593d3f | 4083 | lappend stillbold $id |
| 908c3585 PM |
4084 | } |
| 4085 | } | |
| 28593d3f | 4086 | set boldids $stillbold |
| 908c3585 PM |
4087 | } |
| 4088 | ||
| 4089 | proc addvhighlight {n} { | |
| 476ca63d | 4090 | global hlview viewcomplete curview vhl_done commitidx |
| da7c24dd PM |
4091 | |
| 4092 | if {[info exists hlview]} { | |
| 908c3585 | 4093 | delvhighlight |
| da7c24dd PM |
4094 | } |
| 4095 | set hlview $n | |
| 7fcc92bf | 4096 | if {$n != $curview && ![info exists viewcomplete($n)]} { |
| da7c24dd | 4097 | start_rev_list $n |
| 908c3585 PM |
4098 | } |
| 4099 | set vhl_done $commitidx($hlview) | |
| 4100 | if {$vhl_done > 0} { | |
| 4101 | drawvisible | |
| da7c24dd PM |
4102 | } |
| 4103 | } | |
| 4104 | ||
| 908c3585 PM |
4105 | proc delvhighlight {} { |
| 4106 | global hlview vhighlights | |
| da7c24dd PM |
4107 | |
| 4108 | if {![info exists hlview]} return | |
| 4109 | unset hlview | |
| 4e7d6779 PM |
4110 | catch {unset vhighlights} |
| 4111 | unbolden | |
| da7c24dd PM |
4112 | } |
| 4113 | ||
| 908c3585 | 4114 | proc vhighlightmore {} { |
| 7fcc92bf | 4115 | global hlview vhl_done commitidx vhighlights curview |
| da7c24dd | 4116 | |
| da7c24dd | 4117 | set max $commitidx($hlview) |
| 908c3585 PM |
4118 | set vr [visiblerows] |
| 4119 | set r0 [lindex $vr 0] | |
| 4120 | set r1 [lindex $vr 1] | |
| 4121 | for {set i $vhl_done} {$i < $max} {incr i} { | |
| 7fcc92bf PM |
4122 | set id [commitonrow $i $hlview] |
| 4123 | if {[commitinview $id $curview]} { | |
| 4124 | set row [rowofcommit $id] | |
| 908c3585 PM |
4125 | if {$r0 <= $row && $row <= $r1} { |
| 4126 | if {![highlighted $row]} { | |
| 28593d3f | 4127 | bolden $id mainfontbold |
| da7c24dd | 4128 | } |
| 476ca63d | 4129 | set vhighlights($id) 1 |
| da7c24dd PM |
4130 | } |
| 4131 | } | |
| 4132 | } | |
| 908c3585 | 4133 | set vhl_done $max |
| ac1276ab | 4134 | return 0 |
| 908c3585 PM |
4135 | } |
| 4136 | ||
| 4137 | proc askvhighlight {row id} { | |
| 7fcc92bf | 4138 | global hlview vhighlights iddrawn |
| 908c3585 | 4139 | |
| 7fcc92bf | 4140 | if {[commitinview $id $hlview]} { |
| 476ca63d | 4141 | if {[info exists iddrawn($id)] && ![ishighlighted $id]} { |
| 28593d3f | 4142 | bolden $id mainfontbold |
| 908c3585 | 4143 | } |
| 476ca63d | 4144 | set vhighlights($id) 1 |
| 908c3585 | 4145 | } else { |
| 476ca63d | 4146 | set vhighlights($id) 0 |
| 908c3585 PM |
4147 | } |
| 4148 | } | |
| 4149 | ||
| 687c8765 | 4150 | proc hfiles_change {} { |
| 908c3585 | 4151 | global highlight_files filehighlight fhighlights fh_serial |
| 8b39e04f | 4152 | global highlight_paths |
| 908c3585 PM |
4153 | |
| 4154 | if {[info exists filehighlight]} { | |
| 4155 | # delete previous highlights | |
| 4156 | catch {close $filehighlight} | |
| 4157 | unset filehighlight | |
| 4e7d6779 PM |
4158 | catch {unset fhighlights} |
| 4159 | unbolden | |
| 63b79191 | 4160 | unhighlight_filelist |
| 908c3585 | 4161 | } |
| 63b79191 | 4162 | set highlight_paths {} |
| 908c3585 PM |
4163 | after cancel do_file_hl $fh_serial |
| 4164 | incr fh_serial | |
| 4165 | if {$highlight_files ne {}} { | |
| 4166 | after 300 do_file_hl $fh_serial | |
| 4167 | } | |
| 4168 | } | |
| 4169 | ||
| 687c8765 PM |
4170 | proc gdttype_change {name ix op} { |
| 4171 | global gdttype highlight_files findstring findpattern | |
| 4172 | ||
| bb3edc8b | 4173 | stopfinding |
| 687c8765 | 4174 | if {$findstring ne {}} { |
| b007ee20 | 4175 | if {$gdttype eq [mc "containing:"]} { |
| 687c8765 PM |
4176 | if {$highlight_files ne {}} { |
| 4177 | set highlight_files {} | |
| 4178 | hfiles_change | |
| 4179 | } | |
| 4180 | findcom_change | |
| 4181 | } else { | |
| 4182 | if {$findpattern ne {}} { | |
| 4183 | set findpattern {} | |
| 4184 | findcom_change | |
| 4185 | } | |
| 4186 | set highlight_files $findstring | |
| 4187 | hfiles_change | |
| 4188 | } | |
| 4189 | drawvisible | |
| 4190 | } | |
| 4191 | # enable/disable findtype/findloc menus too | |
| 4192 | } | |
| 4193 | ||
| 4194 | proc find_change {name ix op} { | |
| 4195 | global gdttype findstring highlight_files | |
| 4196 | ||
| bb3edc8b | 4197 | stopfinding |
| b007ee20 | 4198 | if {$gdttype eq [mc "containing:"]} { |
| 687c8765 PM |
4199 | findcom_change |
| 4200 | } else { | |
| 4201 | if {$highlight_files ne $findstring} { | |
| 4202 | set highlight_files $findstring | |
| 4203 | hfiles_change | |
| 4204 | } | |
| 4205 | } | |
| 4206 | drawvisible | |
| 4207 | } | |
| 4208 | ||
| 64b5f146 | 4209 | proc findcom_change args { |
| 28593d3f | 4210 | global nhighlights boldnameids |
| 687c8765 PM |
4211 | global findpattern findtype findstring gdttype |
| 4212 | ||
| bb3edc8b | 4213 | stopfinding |
| 687c8765 | 4214 | # delete previous highlights, if any |
| 28593d3f PM |
4215 | foreach id $boldnameids { |
| 4216 | bolden_name $id mainfont | |
| 687c8765 | 4217 | } |
| 28593d3f | 4218 | set boldnameids {} |
| 687c8765 PM |
4219 | catch {unset nhighlights} |
| 4220 | unbolden | |
| 4221 | unmarkmatches | |
| b007ee20 | 4222 | if {$gdttype ne [mc "containing:"] || $findstring eq {}} { |
| 687c8765 | 4223 | set findpattern {} |
| b007ee20 | 4224 | } elseif {$findtype eq [mc "Regexp"]} { |
| 687c8765 PM |
4225 | set findpattern $findstring |
| 4226 | } else { | |
| 4227 | set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \ | |
| 4228 | $findstring] | |
| 4229 | set findpattern "*$e*" | |
| 4230 | } | |
| 4231 | } | |
| 4232 | ||
| 63b79191 PM |
4233 | proc makepatterns {l} { |
| 4234 | set ret {} | |
| 4235 | foreach e $l { | |
| 4236 | set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e] | |
| 4237 | if {[string index $ee end] eq "/"} { | |
| 4238 | lappend ret "$ee*" | |
| 4239 | } else { | |
| 4240 | lappend ret $ee | |
| 4241 | lappend ret "$ee/*" | |
| 4242 | } | |
| 4243 | } | |
| 4244 | return $ret | |
| 4245 | } | |
| 4246 | ||
| 908c3585 | 4247 | proc do_file_hl {serial} { |
| 4e7d6779 | 4248 | global highlight_files filehighlight highlight_paths gdttype fhl_list |
| 908c3585 | 4249 | |
| b007ee20 | 4250 | if {$gdttype eq [mc "touching paths:"]} { |
| 60f7a7dc PM |
4251 | if {[catch {set paths [shellsplit $highlight_files]}]} return |
| 4252 | set highlight_paths [makepatterns $paths] | |
| 4253 | highlight_filelist | |
| 4254 | set gdtargs [concat -- $paths] | |
| b007ee20 | 4255 | } elseif {$gdttype eq [mc "adding/removing string:"]} { |
| 60f7a7dc | 4256 | set gdtargs [list "-S$highlight_files"] |
| 687c8765 PM |
4257 | } else { |
| 4258 | # must be "containing:", i.e. we're searching commit info | |
| 4259 | return | |
| 60f7a7dc | 4260 | } |
| 1ce09dd6 | 4261 | set cmd [concat | git diff-tree -r -s --stdin $gdtargs] |
| 908c3585 PM |
4262 | set filehighlight [open $cmd r+] |
| 4263 | fconfigure $filehighlight -blocking 0 | |
| 7eb3cb9c | 4264 | filerun $filehighlight readfhighlight |
| 4e7d6779 | 4265 | set fhl_list {} |
| 908c3585 PM |
4266 | drawvisible |
| 4267 | flushhighlights | |
| 4268 | } | |
| 4269 | ||
| 4270 | proc flushhighlights {} { | |
| 4e7d6779 | 4271 | global filehighlight fhl_list |
| 908c3585 PM |
4272 | |
| 4273 | if {[info exists filehighlight]} { | |
| 4e7d6779 | 4274 | lappend fhl_list {} |
| 908c3585 PM |
4275 | puts $filehighlight "" |
| 4276 | flush $filehighlight | |
| 4277 | } | |
| 4278 | } | |
| 4279 | ||
| 4280 | proc askfilehighlight {row id} { | |
| 4e7d6779 | 4281 | global filehighlight fhighlights fhl_list |
| 908c3585 | 4282 | |
| 4e7d6779 | 4283 | lappend fhl_list $id |
| 476ca63d | 4284 | set fhighlights($id) -1 |
| 908c3585 PM |
4285 | puts $filehighlight $id |
| 4286 | } | |
| 4287 | ||
| 4288 | proc readfhighlight {} { | |
| 7fcc92bf | 4289 | global filehighlight fhighlights curview iddrawn |
| 687c8765 | 4290 | global fhl_list find_dirn |
| 4e7d6779 | 4291 | |
| 7eb3cb9c PM |
4292 | if {![info exists filehighlight]} { |
| 4293 | return 0 | |
| 4294 | } | |
| 4295 | set nr 0 | |
| 4296 | while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} { | |
| 4e7d6779 PM |
4297 | set line [string trim $line] |
| 4298 | set i [lsearch -exact $fhl_list $line] | |
| 4299 | if {$i < 0} continue | |
| 4300 | for {set j 0} {$j < $i} {incr j} { | |
| 4301 | set id [lindex $fhl_list $j] | |
| 476ca63d | 4302 | set fhighlights($id) 0 |
| 908c3585 | 4303 | } |
| 4e7d6779 PM |
4304 | set fhl_list [lrange $fhl_list [expr {$i+1}] end] |
| 4305 | if {$line eq {}} continue | |
| 7fcc92bf | 4306 | if {![commitinview $line $curview]} continue |
| 476ca63d | 4307 | if {[info exists iddrawn($line)] && ![ishighlighted $line]} { |
| 28593d3f | 4308 | bolden $line mainfontbold |
| 4e7d6779 | 4309 | } |
| 476ca63d | 4310 | set fhighlights($line) 1 |
| 908c3585 | 4311 | } |
| 4e7d6779 PM |
4312 | if {[eof $filehighlight]} { |
| 4313 | # strange... | |
| 1ce09dd6 | 4314 | puts "oops, git diff-tree died" |
| 4e7d6779 PM |
4315 | catch {close $filehighlight} |
| 4316 | unset filehighlight | |
| 7eb3cb9c | 4317 | return 0 |
| 908c3585 | 4318 | } |
| 687c8765 | 4319 | if {[info exists find_dirn]} { |
| cca5d946 | 4320 | run findmore |
| 908c3585 | 4321 | } |
| 687c8765 | 4322 | return 1 |
| 908c3585 PM |
4323 | } |
| 4324 | ||
| 4fb0fa19 | 4325 | proc doesmatch {f} { |
| 687c8765 | 4326 | global findtype findpattern |
| 4fb0fa19 | 4327 | |
| b007ee20 | 4328 | if {$findtype eq [mc "Regexp"]} { |
| 687c8765 | 4329 | return [regexp $findpattern $f] |
| b007ee20 | 4330 | } elseif {$findtype eq [mc "IgnCase"]} { |
| 4fb0fa19 PM |
4331 | return [string match -nocase $findpattern $f] |
| 4332 | } else { | |
| 4333 | return [string match $findpattern $f] | |
| 4334 | } | |
| 4335 | } | |
| 4336 | ||
| 60f7a7dc | 4337 | proc askfindhighlight {row id} { |
| 9c311b32 | 4338 | global nhighlights commitinfo iddrawn |
| 4fb0fa19 PM |
4339 | global findloc |
| 4340 | global markingmatches | |
| 908c3585 PM |
4341 | |
| 4342 | if {![info exists commitinfo($id)]} { | |
| 4343 | getcommit $id | |
| 4344 | } | |
| 60f7a7dc | 4345 | set info $commitinfo($id) |
| 908c3585 | 4346 | set isbold 0 |
| b007ee20 | 4347 | set fldtypes [list [mc Headline] [mc Author] [mc Date] [mc Committer] [mc CDate] [mc Comments]] |
| 60f7a7dc | 4348 | foreach f $info ty $fldtypes { |
| b007ee20 | 4349 | if {($findloc eq [mc "All fields"] || $findloc eq $ty) && |
| 4fb0fa19 | 4350 | [doesmatch $f]} { |
| b007ee20 | 4351 | if {$ty eq [mc "Author"]} { |
| 60f7a7dc | 4352 | set isbold 2 |
| 4fb0fa19 | 4353 | break |
| 60f7a7dc | 4354 | } |
| 4fb0fa19 | 4355 | set isbold 1 |
| 908c3585 PM |
4356 | } |
| 4357 | } | |
| 4fb0fa19 | 4358 | if {$isbold && [info exists iddrawn($id)]} { |
| 476ca63d | 4359 | if {![ishighlighted $id]} { |
| 28593d3f | 4360 | bolden $id mainfontbold |
| 4fb0fa19 | 4361 | if {$isbold > 1} { |
| 28593d3f | 4362 | bolden_name $id mainfontbold |
| 4fb0fa19 | 4363 | } |
| 908c3585 | 4364 | } |
| 4fb0fa19 | 4365 | if {$markingmatches} { |
| 005a2f4e | 4366 | markrowmatches $row $id |
| 908c3585 PM |
4367 | } |
| 4368 | } | |
| 476ca63d | 4369 | set nhighlights($id) $isbold |
| da7c24dd PM |
4370 | } |
| 4371 | ||
| 005a2f4e PM |
4372 | proc markrowmatches {row id} { |
| 4373 | global canv canv2 linehtag linentag commitinfo findloc | |
| 4fb0fa19 | 4374 | |
| 005a2f4e PM |
4375 | set headline [lindex $commitinfo($id) 0] |
| 4376 | set author [lindex $commitinfo($id) 1] | |
| 4fb0fa19 PM |
4377 | $canv delete match$row |
| 4378 | $canv2 delete match$row | |
| b007ee20 | 4379 | if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} { |
| 005a2f4e PM |
4380 | set m [findmatches $headline] |
| 4381 | if {$m ne {}} { | |
| 28593d3f PM |
4382 | markmatches $canv $row $headline $linehtag($id) $m \ |
| 4383 | [$canv itemcget $linehtag($id) -font] $row | |
| 005a2f4e | 4384 | } |
| 4fb0fa19 | 4385 | } |
| b007ee20 | 4386 | if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} { |
| 005a2f4e PM |
4387 | set m [findmatches $author] |
| 4388 | if {$m ne {}} { | |
| 28593d3f PM |
4389 | markmatches $canv2 $row $author $linentag($id) $m \ |
| 4390 | [$canv2 itemcget $linentag($id) -font] $row | |
| 005a2f4e | 4391 | } |
| 4fb0fa19 PM |
4392 | } |
| 4393 | } | |
| 4394 | ||
| 164ff275 PM |
4395 | proc vrel_change {name ix op} { |
| 4396 | global highlight_related | |
| 4397 | ||
| 4398 | rhighlight_none | |
| b007ee20 | 4399 | if {$highlight_related ne [mc "None"]} { |
| 7eb3cb9c | 4400 | run drawvisible |
| 164ff275 PM |
4401 | } |
| 4402 | } | |
| 4403 | ||
| 4404 | # prepare for testing whether commits are descendents or ancestors of a | |
| 4405 | proc rhighlight_sel {a} { | |
| 4406 | global descendent desc_todo ancestor anc_todo | |
| 476ca63d | 4407 | global highlight_related |
| 164ff275 PM |
4408 | |
| 4409 | catch {unset descendent} | |
| 4410 | set desc_todo [list $a] | |
| 4411 | catch {unset ancestor} | |
| 4412 | set anc_todo [list $a] | |
| b007ee20 | 4413 | if {$highlight_related ne [mc "None"]} { |
| 164ff275 | 4414 | rhighlight_none |
| 7eb3cb9c | 4415 | run drawvisible |
| 164ff275 PM |
4416 | } |
| 4417 | } | |
| 4418 | ||
| 4419 | proc rhighlight_none {} { | |
| 4420 | global rhighlights | |
| 4421 | ||
| 4e7d6779 PM |
4422 | catch {unset rhighlights} |
| 4423 | unbolden | |
| 164ff275 PM |
4424 | } |
| 4425 | ||
| 4426 | proc is_descendent {a} { | |
| 7fcc92bf | 4427 | global curview children descendent desc_todo |
| 164ff275 PM |
4428 | |
| 4429 | set v $curview | |
| 7fcc92bf | 4430 | set la [rowofcommit $a] |
| 164ff275 PM |
4431 | set todo $desc_todo |
| 4432 | set leftover {} | |
| 4433 | set done 0 | |
| 4434 | for {set i 0} {$i < [llength $todo]} {incr i} { | |
| 4435 | set do [lindex $todo $i] | |
| 7fcc92bf | 4436 | if {[rowofcommit $do] < $la} { |
| 164ff275 PM |
4437 | lappend leftover $do |
| 4438 | continue | |
| 4439 | } | |
| 4440 | foreach nk $children($v,$do) { | |
| 4441 | if {![info exists descendent($nk)]} { | |
| 4442 | set descendent($nk) 1 | |
| 4443 | lappend todo $nk | |
| 4444 | if {$nk eq $a} { | |
| 4445 | set done 1 | |
| 4446 | } | |
| 4447 | } | |
| 4448 | } | |
| 4449 | if {$done} { | |
| 4450 | set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]] | |
| 4451 | return | |
| 4452 | } | |
| 4453 | } | |
| 4454 | set descendent($a) 0 | |
| 4455 | set desc_todo $leftover | |
| 4456 | } | |
| 4457 | ||
| 4458 | proc is_ancestor {a} { | |
| 7fcc92bf | 4459 | global curview parents ancestor anc_todo |
| 164ff275 PM |
4460 | |
| 4461 | set v $curview | |
| 7fcc92bf | 4462 | set la [rowofcommit $a] |
| 164ff275 PM |
4463 | set todo $anc_todo |
| 4464 | set leftover {} | |
| 4465 | set done 0 | |
| 4466 | for {set i 0} {$i < [llength $todo]} {incr i} { | |
| 4467 | set do [lindex $todo $i] | |
| 7fcc92bf | 4468 | if {![commitinview $do $v] || [rowofcommit $do] > $la} { |
| 164ff275 PM |
4469 | lappend leftover $do |
| 4470 | continue | |
| 4471 | } | |
| 7fcc92bf | 4472 | foreach np $parents($v,$do) { |
| 164ff275 PM |
4473 | if {![info exists ancestor($np)]} { |
| 4474 | set ancestor($np) 1 | |
| 4475 | lappend todo $np | |
| 4476 | if {$np eq $a} { | |
| 4477 | set done 1 | |
| 4478 | } | |
| 4479 | } | |
| 4480 | } | |
| 4481 | if {$done} { | |
| 4482 | set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]] | |
| 4483 | return | |
| 4484 | } | |
| 4485 | } | |
| 4486 | set ancestor($a) 0 | |
| 4487 | set anc_todo $leftover | |
| 4488 | } | |
| 4489 | ||
| 4490 | proc askrelhighlight {row id} { | |
| 9c311b32 | 4491 | global descendent highlight_related iddrawn rhighlights |
| 164ff275 PM |
4492 | global selectedline ancestor |
| 4493 | ||
| 94b4a69f | 4494 | if {$selectedline eq {}} return |
| 164ff275 | 4495 | set isbold 0 |
| 55e34436 CS |
4496 | if {$highlight_related eq [mc "Descendant"] || |
| 4497 | $highlight_related eq [mc "Not descendant"]} { | |
| 164ff275 PM |
4498 | if {![info exists descendent($id)]} { |
| 4499 | is_descendent $id | |
| 4500 | } | |
| 55e34436 | 4501 | if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} { |
| 164ff275 PM |
4502 | set isbold 1 |
| 4503 | } | |
| b007ee20 CS |
4504 | } elseif {$highlight_related eq [mc "Ancestor"] || |
| 4505 | $highlight_related eq [mc "Not ancestor"]} { | |
| 164ff275 PM |
4506 | if {![info exists ancestor($id)]} { |
| 4507 | is_ancestor $id | |
| 4508 | } | |
| b007ee20 | 4509 | if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} { |
| 164ff275 PM |
4510 | set isbold 1 |
| 4511 | } | |
| 4512 | } | |
| 4513 | if {[info exists iddrawn($id)]} { | |
| 476ca63d | 4514 | if {$isbold && ![ishighlighted $id]} { |
| 28593d3f | 4515 | bolden $id mainfontbold |
| 164ff275 PM |
4516 | } |
| 4517 | } | |
| 476ca63d | 4518 | set rhighlights($id) $isbold |
| 164ff275 PM |
4519 | } |
| 4520 | ||
| da7c24dd PM |
4521 | # Graph layout functions |
| 4522 | ||
| 9f1afe05 PM |
4523 | proc shortids {ids} { |
| 4524 | set res {} | |
| 4525 | foreach id $ids { | |
| 4526 | if {[llength $id] > 1} { | |
| 4527 | lappend res [shortids $id] | |
| 4528 | } elseif {[regexp {^[0-9a-f]{40}$} $id]} { | |
| 4529 | lappend res [string range $id 0 7] | |
| 4530 | } else { | |
| 4531 | lappend res $id | |
| 4532 | } | |
| 4533 | } | |
| 4534 | return $res | |
| 4535 | } | |
| 4536 | ||
| 9f1afe05 PM |
4537 | proc ntimes {n o} { |
| 4538 | set ret {} | |
| 0380081c PM |
4539 | set o [list $o] |
| 4540 | for {set mask 1} {$mask <= $n} {incr mask $mask} { | |
| 4541 | if {($n & $mask) != 0} { | |
| 4542 | set ret [concat $ret $o] | |
| 9f1afe05 | 4543 | } |
| 0380081c | 4544 | set o [concat $o $o] |
| 9f1afe05 | 4545 | } |
| 0380081c | 4546 | return $ret |
| 9f1afe05 PM |
4547 | } |
| 4548 | ||
| 9257d8f7 PM |
4549 | proc ordertoken {id} { |
| 4550 | global ordertok curview varcid varcstart varctok curview parents children | |
| 4551 | global nullid nullid2 | |
| 4552 | ||
| 4553 | if {[info exists ordertok($id)]} { | |
| 4554 | return $ordertok($id) | |
| 4555 | } | |
| 4556 | set origid $id | |
| 4557 | set todo {} | |
| 4558 | while {1} { | |
| 4559 | if {[info exists varcid($curview,$id)]} { | |
| 4560 | set a $varcid($curview,$id) | |
| 4561 | set p [lindex $varcstart($curview) $a] | |
| 4562 | } else { | |
| 4563 | set p [lindex $children($curview,$id) 0] | |
| 4564 | } | |
| 4565 | if {[info exists ordertok($p)]} { | |
| 4566 | set tok $ordertok($p) | |
| 4567 | break | |
| 4568 | } | |
| c8c9f3d9 PM |
4569 | set id [first_real_child $curview,$p] |
| 4570 | if {$id eq {}} { | |
| 9257d8f7 | 4571 | # it's a root |
| 46308ea1 | 4572 | set tok [lindex $varctok($curview) $varcid($curview,$p)] |
| 9257d8f7 PM |
4573 | break |
| 4574 | } | |
| 9257d8f7 PM |
4575 | if {[llength $parents($curview,$id)] == 1} { |
| 4576 | lappend todo [list $p {}] | |
| 4577 | } else { | |
| 4578 | set j [lsearch -exact $parents($curview,$id) $p] | |
| 4579 | if {$j < 0} { | |
| 4580 | puts "oops didn't find [shortids $p] in parents of [shortids $id]" | |
| 4581 | } | |
| 4582 | lappend todo [list $p [strrep $j]] | |
| 4583 | } | |
| 4584 | } | |
| 4585 | for {set i [llength $todo]} {[incr i -1] >= 0} {} { | |
| 4586 | set p [lindex $todo $i 0] | |
| 4587 | append tok [lindex $todo $i 1] | |
| 4588 | set ordertok($p) $tok | |
| 4589 | } | |
| 4590 | set ordertok($origid) $tok | |
| 4591 | return $tok | |
| 4592 | } | |
| 4593 | ||
| 6e8c8707 PM |
4594 | # Work out where id should go in idlist so that order-token |
| 4595 | # values increase from left to right | |
| 4596 | proc idcol {idlist id {i 0}} { | |
| 9257d8f7 | 4597 | set t [ordertoken $id] |
| e5b37ac1 PM |
4598 | if {$i < 0} { |
| 4599 | set i 0 | |
| 4600 | } | |
| 9257d8f7 | 4601 | if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} { |
| 6e8c8707 PM |
4602 | if {$i > [llength $idlist]} { |
| 4603 | set i [llength $idlist] | |
| 9f1afe05 | 4604 | } |
| 9257d8f7 | 4605 | while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {} |
| 6e8c8707 PM |
4606 | incr i |
| 4607 | } else { | |
| 9257d8f7 | 4608 | if {$t > [ordertoken [lindex $idlist $i]]} { |
| 6e8c8707 | 4609 | while {[incr i] < [llength $idlist] && |
| 9257d8f7 | 4610 | $t >= [ordertoken [lindex $idlist $i]]} {} |
| 9f1afe05 | 4611 | } |
| 9f1afe05 | 4612 | } |
| 6e8c8707 | 4613 | return $i |
| 9f1afe05 PM |
4614 | } |
| 4615 | ||
| 4616 | proc initlayout {} { | |
| 7fcc92bf | 4617 | global rowidlist rowisopt rowfinal displayorder parentlist |
| da7c24dd | 4618 | global numcommits canvxmax canv |
| 8f7d0cec | 4619 | global nextcolor |
| da7c24dd | 4620 | global colormap rowtextx |
| 9f1afe05 | 4621 | |
| 8f7d0cec PM |
4622 | set numcommits 0 |
| 4623 | set displayorder {} | |
| 79b2c75e | 4624 | set parentlist {} |
| 8f7d0cec | 4625 | set nextcolor 0 |
| 0380081c PM |
4626 | set rowidlist {} |
| 4627 | set rowisopt {} | |
| f5f3c2e2 | 4628 | set rowfinal {} |
| be0cd098 | 4629 | set canvxmax [$canv cget -width] |
| 50b44ece PM |
4630 | catch {unset colormap} |
| 4631 | catch {unset rowtextx} | |
| ac1276ab | 4632 | setcanvscroll |
| be0cd098 PM |
4633 | } |
| 4634 | ||
| 4635 | proc setcanvscroll {} { | |
| 4636 | global canv canv2 canv3 numcommits linespc canvxmax canvy0 | |
| ac1276ab | 4637 | global lastscrollset lastscrollrows |
| be0cd098 PM |
4638 | |
| 4639 | set ymax [expr {$canvy0 + ($numcommits - 0.5) * $linespc + 2}] | |
| 4640 | $canv conf -scrollregion [list 0 0 $canvxmax $ymax] | |
| 4641 | $canv2 conf -scrollregion [list 0 0 0 $ymax] | |
| 4642 | $canv3 conf -scrollregion [list 0 0 0 $ymax] | |
| ac1276ab PM |
4643 | set lastscrollset [clock clicks -milliseconds] |
| 4644 | set lastscrollrows $numcommits | |
| 9f1afe05 PM |
4645 | } |
| 4646 | ||
| 4647 | proc visiblerows {} { | |
| 4648 | global canv numcommits linespc | |
| 4649 | ||
| 4650 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 4651 | if {$ymax eq {} || $ymax == 0} return | |
| 4652 | set f [$canv yview] | |
| 4653 | set y0 [expr {int([lindex $f 0] * $ymax)}] | |
| 4654 | set r0 [expr {int(($y0 - 3) / $linespc) - 1}] | |
| 4655 | if {$r0 < 0} { | |
| 4656 | set r0 0 | |
| 4657 | } | |
| 4658 | set y1 [expr {int([lindex $f 1] * $ymax)}] | |
| 4659 | set r1 [expr {int(($y1 - 3) / $linespc) + 1}] | |
| 4660 | if {$r1 >= $numcommits} { | |
| 4661 | set r1 [expr {$numcommits - 1}] | |
| 4662 | } | |
| 4663 | return [list $r0 $r1] | |
| 4664 | } | |
| 4665 | ||
| f5f3c2e2 | 4666 | proc layoutmore {} { |
| 38dfe939 | 4667 | global commitidx viewcomplete curview |
| 94b4a69f | 4668 | global numcommits pending_select curview |
| d375ef9b | 4669 | global lastscrollset lastscrollrows |
| ac1276ab PM |
4670 | |
| 4671 | if {$lastscrollrows < 100 || $viewcomplete($curview) || | |
| 4672 | [clock clicks -milliseconds] - $lastscrollset > 500} { | |
| a2c22362 PM |
4673 | setcanvscroll |
| 4674 | } | |
| d94f8cd6 | 4675 | if {[info exists pending_select] && |
| 7fcc92bf | 4676 | [commitinview $pending_select $curview]} { |
| 567c34e0 | 4677 | update |
| 7fcc92bf | 4678 | selectline [rowofcommit $pending_select] 1 |
| d94f8cd6 | 4679 | } |
| ac1276ab | 4680 | drawvisible |
| 219ea3a9 PM |
4681 | } |
| 4682 | ||
| cdc8429c PM |
4683 | # With path limiting, we mightn't get the actual HEAD commit, |
| 4684 | # so ask git rev-list what is the first ancestor of HEAD that | |
| 4685 | # touches a file in the path limit. | |
| 4686 | proc get_viewmainhead {view} { | |
| 4687 | global viewmainheadid vfilelimit viewinstances mainheadid | |
| 4688 | ||
| 4689 | catch { | |
| 4690 | set rfd [open [concat | git rev-list -1 $mainheadid \ | |
| 4691 | -- $vfilelimit($view)] r] | |
| 4692 | set j [reg_instance $rfd] | |
| 4693 | lappend viewinstances($view) $j | |
| 4694 | fconfigure $rfd -blocking 0 | |
| 4695 | filerun $rfd [list getviewhead $rfd $j $view] | |
| 4696 | set viewmainheadid($curview) {} | |
| 4697 | } | |
| 4698 | } | |
| 4699 | ||
| 4700 | # git rev-list should give us just 1 line to use as viewmainheadid($view) | |
| 4701 | proc getviewhead {fd inst view} { | |
| 4702 | global viewmainheadid commfd curview viewinstances showlocalchanges | |
| 4703 | ||
| 4704 | set id {} | |
| 4705 | if {[gets $fd line] < 0} { | |
| 4706 | if {![eof $fd]} { | |
| 4707 | return 1 | |
| 4708 | } | |
| 4709 | } elseif {[string length $line] == 40 && [string is xdigit $line]} { | |
| 4710 | set id $line | |
| 4711 | } | |
| 4712 | set viewmainheadid($view) $id | |
| 4713 | close $fd | |
| 4714 | unset commfd($inst) | |
| 4715 | set i [lsearch -exact $viewinstances($view) $inst] | |
| 4716 | if {$i >= 0} { | |
| 4717 | set viewinstances($view) [lreplace $viewinstances($view) $i $i] | |
| 4718 | } | |
| 4719 | if {$showlocalchanges && $id ne {} && $view == $curview} { | |
| 4720 | doshowlocalchanges | |
| 4721 | } | |
| 4722 | return 0 | |
| 4723 | } | |
| 4724 | ||
| 219ea3a9 | 4725 | proc doshowlocalchanges {} { |
| cdc8429c | 4726 | global curview viewmainheadid |
| 219ea3a9 | 4727 | |
| cdc8429c PM |
4728 | if {$viewmainheadid($curview) eq {}} return |
| 4729 | if {[commitinview $viewmainheadid($curview) $curview]} { | |
| 219ea3a9 | 4730 | dodiffindex |
| 38dfe939 | 4731 | } else { |
| cdc8429c | 4732 | interestedin $viewmainheadid($curview) dodiffindex |
| 219ea3a9 PM |
4733 | } |
| 4734 | } | |
| 4735 | ||
| 4736 | proc dohidelocalchanges {} { | |
| 7fcc92bf | 4737 | global nullid nullid2 lserial curview |
| 219ea3a9 | 4738 | |
| 7fcc92bf | 4739 | if {[commitinview $nullid $curview]} { |
| b8a938cf | 4740 | removefakerow $nullid |
| 8f489363 | 4741 | } |
| 7fcc92bf | 4742 | if {[commitinview $nullid2 $curview]} { |
| b8a938cf | 4743 | removefakerow $nullid2 |
| 219ea3a9 PM |
4744 | } |
| 4745 | incr lserial | |
| 4746 | } | |
| 4747 | ||
| 8f489363 | 4748 | # spawn off a process to do git diff-index --cached HEAD |
| 219ea3a9 | 4749 | proc dodiffindex {} { |
| cdc8429c | 4750 | global lserial showlocalchanges vfilelimit curview |
| cb8329aa | 4751 | global isworktree |
| 219ea3a9 | 4752 | |
| cb8329aa | 4753 | if {!$showlocalchanges || !$isworktree} return |
| 219ea3a9 | 4754 | incr lserial |
| cdc8429c PM |
4755 | set cmd "|git diff-index --cached HEAD" |
| 4756 | if {$vfilelimit($curview) ne {}} { | |
| 4757 | set cmd [concat $cmd -- $vfilelimit($curview)] | |
| 4758 | } | |
| 4759 | set fd [open $cmd r] | |
| 219ea3a9 | 4760 | fconfigure $fd -blocking 0 |
| e439e092 AG |
4761 | set i [reg_instance $fd] |
| 4762 | filerun $fd [list readdiffindex $fd $lserial $i] | |
| 219ea3a9 PM |
4763 | } |
| 4764 | ||
| e439e092 | 4765 | proc readdiffindex {fd serial inst} { |
| cdc8429c PM |
4766 | global viewmainheadid nullid nullid2 curview commitinfo commitdata lserial |
| 4767 | global vfilelimit | |
| 219ea3a9 | 4768 | |
| 8f489363 | 4769 | set isdiff 1 |
| 219ea3a9 | 4770 | if {[gets $fd line] < 0} { |
| 8f489363 PM |
4771 | if {![eof $fd]} { |
| 4772 | return 1 | |
| 219ea3a9 | 4773 | } |
| 8f489363 | 4774 | set isdiff 0 |
| 219ea3a9 PM |
4775 | } |
| 4776 | # we only need to see one line and we don't really care what it says... | |
| e439e092 | 4777 | stop_instance $inst |
| 219ea3a9 | 4778 | |
| 24f7a667 PM |
4779 | if {$serial != $lserial} { |
| 4780 | return 0 | |
| 8f489363 PM |
4781 | } |
| 4782 | ||
| 24f7a667 | 4783 | # now see if there are any local changes not checked in to the index |
| cdc8429c PM |
4784 | set cmd "|git diff-files" |
| 4785 | if {$vfilelimit($curview) ne {}} { | |
| 4786 | set cmd [concat $cmd -- $vfilelimit($curview)] | |
| 4787 | } | |
| 4788 | set fd [open $cmd r] | |
| 24f7a667 | 4789 | fconfigure $fd -blocking 0 |
| e439e092 AG |
4790 | set i [reg_instance $fd] |
| 4791 | filerun $fd [list readdifffiles $fd $serial $i] | |
| 24f7a667 PM |
4792 | |
| 4793 | if {$isdiff && ![commitinview $nullid2 $curview]} { | |
| 8f489363 | 4794 | # add the line for the changes in the index to the graph |
| d990cedf | 4795 | set hl [mc "Local changes checked in to index but not committed"] |
| 8f489363 PM |
4796 | set commitinfo($nullid2) [list $hl {} {} {} {} " $hl\n"] |
| 4797 | set commitdata($nullid2) "\n $hl\n" | |
| fc2a256f | 4798 | if {[commitinview $nullid $curview]} { |
| b8a938cf | 4799 | removefakerow $nullid |
| fc2a256f | 4800 | } |
| cdc8429c | 4801 | insertfakerow $nullid2 $viewmainheadid($curview) |
| 24f7a667 | 4802 | } elseif {!$isdiff && [commitinview $nullid2 $curview]} { |
| cdc8429c PM |
4803 | if {[commitinview $nullid $curview]} { |
| 4804 | removefakerow $nullid | |
| 4805 | } | |
| b8a938cf | 4806 | removefakerow $nullid2 |
| 8f489363 PM |
4807 | } |
| 4808 | return 0 | |
| 4809 | } | |
| 4810 | ||
| e439e092 | 4811 | proc readdifffiles {fd serial inst} { |
| cdc8429c | 4812 | global viewmainheadid nullid nullid2 curview |
| 8f489363 PM |
4813 | global commitinfo commitdata lserial |
| 4814 | ||
| 4815 | set isdiff 1 | |
| 4816 | if {[gets $fd line] < 0} { | |
| 4817 | if {![eof $fd]} { | |
| 4818 | return 1 | |
| 4819 | } | |
| 4820 | set isdiff 0 | |
| 4821 | } | |
| 4822 | # we only need to see one line and we don't really care what it says... | |
| e439e092 | 4823 | stop_instance $inst |
| 8f489363 | 4824 | |
| 24f7a667 PM |
4825 | if {$serial != $lserial} { |
| 4826 | return 0 | |
| 4827 | } | |
| 4828 | ||
| 4829 | if {$isdiff && ![commitinview $nullid $curview]} { | |
| 219ea3a9 | 4830 | # add the line for the local diff to the graph |
| d990cedf | 4831 | set hl [mc "Local uncommitted changes, not checked in to index"] |
| 219ea3a9 PM |
4832 | set commitinfo($nullid) [list $hl {} {} {} {} " $hl\n"] |
| 4833 | set commitdata($nullid) "\n $hl\n" | |
| 7fcc92bf PM |
4834 | if {[commitinview $nullid2 $curview]} { |
| 4835 | set p $nullid2 | |
| 4836 | } else { | |
| cdc8429c | 4837 | set p $viewmainheadid($curview) |
| 7fcc92bf | 4838 | } |
| b8a938cf | 4839 | insertfakerow $nullid $p |
| 24f7a667 | 4840 | } elseif {!$isdiff && [commitinview $nullid $curview]} { |
| b8a938cf | 4841 | removefakerow $nullid |
| 219ea3a9 PM |
4842 | } |
| 4843 | return 0 | |
| 9f1afe05 PM |
4844 | } |
| 4845 | ||
| 8f0bc7e9 | 4846 | proc nextuse {id row} { |
| 7fcc92bf | 4847 | global curview children |
| 9f1afe05 | 4848 | |
| 8f0bc7e9 PM |
4849 | if {[info exists children($curview,$id)]} { |
| 4850 | foreach kid $children($curview,$id) { | |
| 7fcc92bf | 4851 | if {![commitinview $kid $curview]} { |
| 0380081c PM |
4852 | return -1 |
| 4853 | } | |
| 7fcc92bf PM |
4854 | if {[rowofcommit $kid] > $row} { |
| 4855 | return [rowofcommit $kid] | |
| 9f1afe05 | 4856 | } |
| 9f1afe05 | 4857 | } |
| 8f0bc7e9 | 4858 | } |
| 7fcc92bf PM |
4859 | if {[commitinview $id $curview]} { |
| 4860 | return [rowofcommit $id] | |
| 8f0bc7e9 PM |
4861 | } |
| 4862 | return -1 | |
| 4863 | } | |
| 4864 | ||
| f5f3c2e2 | 4865 | proc prevuse {id row} { |
| 7fcc92bf | 4866 | global curview children |
| f5f3c2e2 PM |
4867 | |
| 4868 | set ret -1 | |
| 4869 | if {[info exists children($curview,$id)]} { | |
| 4870 | foreach kid $children($curview,$id) { | |
| 7fcc92bf PM |
4871 | if {![commitinview $kid $curview]} break |
| 4872 | if {[rowofcommit $kid] < $row} { | |
| 4873 | set ret [rowofcommit $kid] | |
| 7b459a1c | 4874 | } |
| 7b459a1c | 4875 | } |
| f5f3c2e2 PM |
4876 | } |
| 4877 | return $ret | |
| 4878 | } | |
| 4879 | ||
| 0380081c PM |
4880 | proc make_idlist {row} { |
| 4881 | global displayorder parentlist uparrowlen downarrowlen mingaplen | |
| 9257d8f7 | 4882 | global commitidx curview children |
| 9f1afe05 | 4883 | |
| 0380081c PM |
4884 | set r [expr {$row - $mingaplen - $downarrowlen - 1}] |
| 4885 | if {$r < 0} { | |
| 4886 | set r 0 | |
| 8f0bc7e9 | 4887 | } |
| 0380081c PM |
4888 | set ra [expr {$row - $downarrowlen}] |
| 4889 | if {$ra < 0} { | |
| 4890 | set ra 0 | |
| 4891 | } | |
| 4892 | set rb [expr {$row + $uparrowlen}] | |
| 4893 | if {$rb > $commitidx($curview)} { | |
| 4894 | set rb $commitidx($curview) | |
| 4895 | } | |
| 7fcc92bf | 4896 | make_disporder $r [expr {$rb + 1}] |
| 0380081c PM |
4897 | set ids {} |
| 4898 | for {} {$r < $ra} {incr r} { | |
| 4899 | set nextid [lindex $displayorder [expr {$r + 1}]] | |
| 4900 | foreach p [lindex $parentlist $r] { | |
| 4901 | if {$p eq $nextid} continue | |
| 4902 | set rn [nextuse $p $r] | |
| 4903 | if {$rn >= $row && | |
| 4904 | $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} { | |
| 9257d8f7 | 4905 | lappend ids [list [ordertoken $p] $p] |
| 9f1afe05 | 4906 | } |
| 9f1afe05 | 4907 | } |
| 0380081c PM |
4908 | } |
| 4909 | for {} {$r < $row} {incr r} { | |
| 4910 | set nextid [lindex $displayorder [expr {$r + 1}]] | |
| 4911 | foreach p [lindex $parentlist $r] { | |
| 4912 | if {$p eq $nextid} continue | |
| 4913 | set rn [nextuse $p $r] | |
| 4914 | if {$rn < 0 || $rn >= $row} { | |
| 9257d8f7 | 4915 | lappend ids [list [ordertoken $p] $p] |
| 9f1afe05 | 4916 | } |
| 9f1afe05 | 4917 | } |
| 0380081c PM |
4918 | } |
| 4919 | set id [lindex $displayorder $row] | |
| 9257d8f7 | 4920 | lappend ids [list [ordertoken $id] $id] |
| 0380081c PM |
4921 | while {$r < $rb} { |
| 4922 | foreach p [lindex $parentlist $r] { | |
| 4923 | set firstkid [lindex $children($curview,$p) 0] | |
| 7fcc92bf | 4924 | if {[rowofcommit $firstkid] < $row} { |
| 9257d8f7 | 4925 | lappend ids [list [ordertoken $p] $p] |
| 9f1afe05 | 4926 | } |
| 9f1afe05 | 4927 | } |
| 0380081c PM |
4928 | incr r |
| 4929 | set id [lindex $displayorder $r] | |
| 4930 | if {$id ne {}} { | |
| 4931 | set firstkid [lindex $children($curview,$id) 0] | |
| 7fcc92bf | 4932 | if {$firstkid ne {} && [rowofcommit $firstkid] < $row} { |
| 9257d8f7 | 4933 | lappend ids [list [ordertoken $id] $id] |
| 0380081c | 4934 | } |
| 9f1afe05 | 4935 | } |
| 9f1afe05 | 4936 | } |
| 0380081c PM |
4937 | set idlist {} |
| 4938 | foreach idx [lsort -unique $ids] { | |
| 4939 | lappend idlist [lindex $idx 1] | |
| 4940 | } | |
| 4941 | return $idlist | |
| 9f1afe05 PM |
4942 | } |
| 4943 | ||
| f5f3c2e2 PM |
4944 | proc rowsequal {a b} { |
| 4945 | while {[set i [lsearch -exact $a {}]] >= 0} { | |
| 4946 | set a [lreplace $a $i $i] | |
| 4947 | } | |
| 4948 | while {[set i [lsearch -exact $b {}]] >= 0} { | |
| 4949 | set b [lreplace $b $i $i] | |
| 4950 | } | |
| 4951 | return [expr {$a eq $b}] | |
| 9f1afe05 PM |
4952 | } |
| 4953 | ||
| f5f3c2e2 PM |
4954 | proc makeupline {id row rend col} { |
| 4955 | global rowidlist uparrowlen downarrowlen mingaplen | |
| 9f1afe05 | 4956 | |
| f5f3c2e2 PM |
4957 | for {set r $rend} {1} {set r $rstart} { |
| 4958 | set rstart [prevuse $id $r] | |
| 4959 | if {$rstart < 0} return | |
| 4960 | if {$rstart < $row} break | |
| 4961 | } | |
| 4962 | if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} { | |
| 4963 | set rstart [expr {$rend - $uparrowlen - 1}] | |
| 79b2c75e | 4964 | } |
| f5f3c2e2 PM |
4965 | for {set r $rstart} {[incr r] <= $row} {} { |
| 4966 | set idlist [lindex $rowidlist $r] | |
| 4967 | if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} { | |
| 4968 | set col [idcol $idlist $id $col] | |
| 4969 | lset rowidlist $r [linsert $idlist $col $id] | |
| 4970 | changedrow $r | |
| 4971 | } | |
| 9f1afe05 PM |
4972 | } |
| 4973 | } | |
| 4974 | ||
| 0380081c | 4975 | proc layoutrows {row endrow} { |
| f5f3c2e2 | 4976 | global rowidlist rowisopt rowfinal displayorder |
| 0380081c PM |
4977 | global uparrowlen downarrowlen maxwidth mingaplen |
| 4978 | global children parentlist | |
| 7fcc92bf | 4979 | global commitidx viewcomplete curview |
| 9f1afe05 | 4980 | |
| 7fcc92bf | 4981 | make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}] |
| 0380081c PM |
4982 | set idlist {} |
| 4983 | if {$row > 0} { | |
| f56782ae PM |
4984 | set rm1 [expr {$row - 1}] |
| 4985 | foreach id [lindex $rowidlist $rm1] { | |
| 0380081c PM |
4986 | if {$id ne {}} { |
| 4987 | lappend idlist $id | |
| 4988 | } | |
| 4989 | } | |
| f56782ae | 4990 | set final [lindex $rowfinal $rm1] |
| 79b2c75e | 4991 | } |
| 0380081c PM |
4992 | for {} {$row < $endrow} {incr row} { |
| 4993 | set rm1 [expr {$row - 1}] | |
| f56782ae | 4994 | if {$rm1 < 0 || $idlist eq {}} { |
| 0380081c | 4995 | set idlist [make_idlist $row] |
| f5f3c2e2 | 4996 | set final 1 |
| 0380081c PM |
4997 | } else { |
| 4998 | set id [lindex $displayorder $rm1] | |
| 4999 | set col [lsearch -exact $idlist $id] | |
| 5000 | set idlist [lreplace $idlist $col $col] | |
| 5001 | foreach p [lindex $parentlist $rm1] { | |
| 5002 | if {[lsearch -exact $idlist $p] < 0} { | |
| 5003 | set col [idcol $idlist $p $col] | |
| 5004 | set idlist [linsert $idlist $col $p] | |
| f5f3c2e2 PM |
5005 | # if not the first child, we have to insert a line going up |
| 5006 | if {$id ne [lindex $children($curview,$p) 0]} { | |
| 5007 | makeupline $p $rm1 $row $col | |
| 5008 | } | |
| 0380081c PM |
5009 | } |
| 5010 | } | |
| 5011 | set id [lindex $displayorder $row] | |
| 5012 | if {$row > $downarrowlen} { | |
| 5013 | set termrow [expr {$row - $downarrowlen - 1}] | |
| 5014 | foreach p [lindex $parentlist $termrow] { | |
| 5015 | set i [lsearch -exact $idlist $p] | |
| 5016 | if {$i < 0} continue | |
| 5017 | set nr [nextuse $p $termrow] | |
| 5018 | if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} { | |
| 5019 | set idlist [lreplace $idlist $i $i] | |
| 5020 | } | |
| 5021 | } | |
| 5022 | } | |
| 5023 | set col [lsearch -exact $idlist $id] | |
| 5024 | if {$col < 0} { | |
| 5025 | set col [idcol $idlist $id] | |
| 5026 | set idlist [linsert $idlist $col $id] | |
| f5f3c2e2 PM |
5027 | if {$children($curview,$id) ne {}} { |
| 5028 | makeupline $id $rm1 $row $col | |
| 5029 | } | |
| 0380081c PM |
5030 | } |
| 5031 | set r [expr {$row + $uparrowlen - 1}] | |
| 5032 | if {$r < $commitidx($curview)} { | |
| 5033 | set x $col | |
| 5034 | foreach p [lindex $parentlist $r] { | |
| 5035 | if {[lsearch -exact $idlist $p] >= 0} continue | |
| 5036 | set fk [lindex $children($curview,$p) 0] | |
| 7fcc92bf | 5037 | if {[rowofcommit $fk] < $row} { |
| 0380081c PM |
5038 | set x [idcol $idlist $p $x] |
| 5039 | set idlist [linsert $idlist $x $p] | |
| 5040 | } | |
| 5041 | } | |
| 5042 | if {[incr r] < $commitidx($curview)} { | |
| 5043 | set p [lindex $displayorder $r] | |
| 5044 | if {[lsearch -exact $idlist $p] < 0} { | |
| 5045 | set fk [lindex $children($curview,$p) 0] | |
| 7fcc92bf | 5046 | if {$fk ne {} && [rowofcommit $fk] < $row} { |
| 0380081c PM |
5047 | set x [idcol $idlist $p $x] |
| 5048 | set idlist [linsert $idlist $x $p] | |
| 5049 | } | |
| 5050 | } | |
| 5051 | } | |
| 5052 | } | |
| 5053 | } | |
| f5f3c2e2 PM |
5054 | if {$final && !$viewcomplete($curview) && |
| 5055 | $row + $uparrowlen + $mingaplen + $downarrowlen | |
| 5056 | >= $commitidx($curview)} { | |
| 5057 | set final 0 | |
| 5058 | } | |
| 0380081c PM |
5059 | set l [llength $rowidlist] |
| 5060 | if {$row == $l} { | |
| 5061 | lappend rowidlist $idlist | |
| 5062 | lappend rowisopt 0 | |
| f5f3c2e2 | 5063 | lappend rowfinal $final |
| 0380081c | 5064 | } elseif {$row < $l} { |
| f5f3c2e2 | 5065 | if {![rowsequal $idlist [lindex $rowidlist $row]]} { |
| 0380081c PM |
5066 | lset rowidlist $row $idlist |
| 5067 | changedrow $row | |
| 5068 | } | |
| f56782ae | 5069 | lset rowfinal $row $final |
| 0380081c | 5070 | } else { |
| f5f3c2e2 PM |
5071 | set pad [ntimes [expr {$row - $l}] {}] |
| 5072 | set rowidlist [concat $rowidlist $pad] | |
| 0380081c | 5073 | lappend rowidlist $idlist |
| f5f3c2e2 PM |
5074 | set rowfinal [concat $rowfinal $pad] |
| 5075 | lappend rowfinal $final | |
| 0380081c PM |
5076 | set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]] |
| 5077 | } | |
| 9f1afe05 | 5078 | } |
| 0380081c | 5079 | return $row |
| 9f1afe05 PM |
5080 | } |
| 5081 | ||
| 0380081c PM |
5082 | proc changedrow {row} { |
| 5083 | global displayorder iddrawn rowisopt need_redisplay | |
| 9f1afe05 | 5084 | |
| 0380081c PM |
5085 | set l [llength $rowisopt] |
| 5086 | if {$row < $l} { | |
| 5087 | lset rowisopt $row 0 | |
| 5088 | if {$row + 1 < $l} { | |
| 5089 | lset rowisopt [expr {$row + 1}] 0 | |
| 5090 | if {$row + 2 < $l} { | |
| 5091 | lset rowisopt [expr {$row + 2}] 0 | |
| 5092 | } | |
| 5093 | } | |
| 5094 | } | |
| 5095 | set id [lindex $displayorder $row] | |
| 5096 | if {[info exists iddrawn($id)]} { | |
| 5097 | set need_redisplay 1 | |
| 9f1afe05 PM |
5098 | } |
| 5099 | } | |
| 5100 | ||
| 5101 | proc insert_pad {row col npad} { | |
| 6e8c8707 | 5102 | global rowidlist |
| 9f1afe05 PM |
5103 | |
| 5104 | set pad [ntimes $npad {}] | |
| e341c06d PM |
5105 | set idlist [lindex $rowidlist $row] |
| 5106 | set bef [lrange $idlist 0 [expr {$col - 1}]] | |
| 5107 | set aft [lrange $idlist $col end] | |
| 5108 | set i [lsearch -exact $aft {}] | |
| 5109 | if {$i > 0} { | |
| 5110 | set aft [lreplace $aft $i $i] | |
| 5111 | } | |
| 5112 | lset rowidlist $row [concat $bef $pad $aft] | |
| 0380081c | 5113 | changedrow $row |
| 9f1afe05 PM |
5114 | } |
| 5115 | ||
| 5116 | proc optimize_rows {row col endrow} { | |
| 0380081c | 5117 | global rowidlist rowisopt displayorder curview children |
| 9f1afe05 | 5118 | |
| 6e8c8707 PM |
5119 | if {$row < 1} { |
| 5120 | set row 1 | |
| 5121 | } | |
| 0380081c PM |
5122 | for {} {$row < $endrow} {incr row; set col 0} { |
| 5123 | if {[lindex $rowisopt $row]} continue | |
| 9f1afe05 | 5124 | set haspad 0 |
| 6e8c8707 PM |
5125 | set y0 [expr {$row - 1}] |
| 5126 | set ym [expr {$row - 2}] | |
| 0380081c PM |
5127 | set idlist [lindex $rowidlist $row] |
| 5128 | set previdlist [lindex $rowidlist $y0] | |
| 5129 | if {$idlist eq {} || $previdlist eq {}} continue | |
| 5130 | if {$ym >= 0} { | |
| 5131 | set pprevidlist [lindex $rowidlist $ym] | |
| 5132 | if {$pprevidlist eq {}} continue | |
| 5133 | } else { | |
| 5134 | set pprevidlist {} | |
| 5135 | } | |
| 6e8c8707 PM |
5136 | set x0 -1 |
| 5137 | set xm -1 | |
| 5138 | for {} {$col < [llength $idlist]} {incr col} { | |
| 5139 | set id [lindex $idlist $col] | |
| 5140 | if {[lindex $previdlist $col] eq $id} continue | |
| 5141 | if {$id eq {}} { | |
| 9f1afe05 PM |
5142 | set haspad 1 |
| 5143 | continue | |
| 5144 | } | |
| 6e8c8707 PM |
5145 | set x0 [lsearch -exact $previdlist $id] |
| 5146 | if {$x0 < 0} continue | |
| 5147 | set z [expr {$x0 - $col}] | |
| 9f1afe05 | 5148 | set isarrow 0 |
| 6e8c8707 PM |
5149 | set z0 {} |
| 5150 | if {$ym >= 0} { | |
| 5151 | set xm [lsearch -exact $pprevidlist $id] | |
| 5152 | if {$xm >= 0} { | |
| 5153 | set z0 [expr {$xm - $x0}] | |
| 5154 | } | |
| 5155 | } | |
| 9f1afe05 | 5156 | if {$z0 eq {}} { |
| 92ed666f PM |
5157 | # if row y0 is the first child of $id then it's not an arrow |
| 5158 | if {[lindex $children($curview,$id) 0] ne | |
| 5159 | [lindex $displayorder $y0]} { | |
| 9f1afe05 PM |
5160 | set isarrow 1 |
| 5161 | } | |
| 5162 | } | |
| e341c06d PM |
5163 | if {!$isarrow && $id ne [lindex $displayorder $row] && |
| 5164 | [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} { | |
| 5165 | set isarrow 1 | |
| 5166 | } | |
| 3fc4279a PM |
5167 | # Looking at lines from this row to the previous row, |
| 5168 | # make them go straight up if they end in an arrow on | |
| 5169 | # the previous row; otherwise make them go straight up | |
| 5170 | # or at 45 degrees. | |
| 9f1afe05 | 5171 | if {$z < -1 || ($z < 0 && $isarrow)} { |
| 3fc4279a PM |
5172 | # Line currently goes left too much; |
| 5173 | # insert pads in the previous row, then optimize it | |
| 9f1afe05 | 5174 | set npad [expr {-1 - $z + $isarrow}] |
| 9f1afe05 PM |
5175 | insert_pad $y0 $x0 $npad |
| 5176 | if {$y0 > 0} { | |
| 5177 | optimize_rows $y0 $x0 $row | |
| 5178 | } | |
| 6e8c8707 PM |
5179 | set previdlist [lindex $rowidlist $y0] |
| 5180 | set x0 [lsearch -exact $previdlist $id] | |
| 5181 | set z [expr {$x0 - $col}] | |
| 5182 | if {$z0 ne {}} { | |
| 5183 | set pprevidlist [lindex $rowidlist $ym] | |
| 5184 | set xm [lsearch -exact $pprevidlist $id] | |
| 5185 | set z0 [expr {$xm - $x0}] | |
| 5186 | } | |
| 9f1afe05 | 5187 | } elseif {$z > 1 || ($z > 0 && $isarrow)} { |
| 3fc4279a | 5188 | # Line currently goes right too much; |
| 6e8c8707 | 5189 | # insert pads in this line |
| 9f1afe05 | 5190 | set npad [expr {$z - 1 + $isarrow}] |
| e341c06d PM |
5191 | insert_pad $row $col $npad |
| 5192 | set idlist [lindex $rowidlist $row] | |
| 9f1afe05 | 5193 | incr col $npad |
| 6e8c8707 | 5194 | set z [expr {$x0 - $col}] |
| 9f1afe05 PM |
5195 | set haspad 1 |
| 5196 | } | |
| 6e8c8707 | 5197 | if {$z0 eq {} && !$isarrow && $ym >= 0} { |
| eb447a12 | 5198 | # this line links to its first child on row $row-2 |
| 6e8c8707 PM |
5199 | set id [lindex $displayorder $ym] |
| 5200 | set xc [lsearch -exact $pprevidlist $id] | |
| eb447a12 PM |
5201 | if {$xc >= 0} { |
| 5202 | set z0 [expr {$xc - $x0}] | |
| 5203 | } | |
| 5204 | } | |
| 3fc4279a | 5205 | # avoid lines jigging left then immediately right |
| 9f1afe05 PM |
5206 | if {$z0 ne {} && $z < 0 && $z0 > 0} { |
| 5207 | insert_pad $y0 $x0 1 | |
| 6e8c8707 PM |
5208 | incr x0 |
| 5209 | optimize_rows $y0 $x0 $row | |
| 5210 | set previdlist [lindex $rowidlist $y0] | |
| 9f1afe05 PM |
5211 | } |
| 5212 | } | |
| 5213 | if {!$haspad} { | |
| 3fc4279a | 5214 | # Find the first column that doesn't have a line going right |
| 9f1afe05 | 5215 | for {set col [llength $idlist]} {[incr col -1] >= 0} {} { |
| 6e8c8707 PM |
5216 | set id [lindex $idlist $col] |
| 5217 | if {$id eq {}} break | |
| 5218 | set x0 [lsearch -exact $previdlist $id] | |
| 5219 | if {$x0 < 0} { | |
| eb447a12 | 5220 | # check if this is the link to the first child |
| 92ed666f PM |
5221 | set kid [lindex $displayorder $y0] |
| 5222 | if {[lindex $children($curview,$id) 0] eq $kid} { | |
| eb447a12 | 5223 | # it is, work out offset to child |
| 92ed666f | 5224 | set x0 [lsearch -exact $previdlist $kid] |
| eb447a12 PM |
5225 | } |
| 5226 | } | |
| 6e8c8707 | 5227 | if {$x0 <= $col} break |
| 9f1afe05 | 5228 | } |
| 3fc4279a | 5229 | # Insert a pad at that column as long as it has a line and |
| 6e8c8707 PM |
5230 | # isn't the last column |
| 5231 | if {$x0 >= 0 && [incr col] < [llength $idlist]} { | |
| 9f1afe05 | 5232 | set idlist [linsert $idlist $col {}] |
| 0380081c PM |
5233 | lset rowidlist $row $idlist |
| 5234 | changedrow $row | |
| 9f1afe05 PM |
5235 | } |
| 5236 | } | |
| 9f1afe05 PM |
5237 | } |
| 5238 | } | |
| 5239 | ||
| 5240 | proc xc {row col} { | |
| 5241 | global canvx0 linespc | |
| 5242 | return [expr {$canvx0 + $col * $linespc}] | |
| 5243 | } | |
| 5244 | ||
| 5245 | proc yc {row} { | |
| 5246 | global canvy0 linespc | |
| 5247 | return [expr {$canvy0 + $row * $linespc}] | |
| 5248 | } | |
| 5249 | ||
| c934a8a3 PM |
5250 | proc linewidth {id} { |
| 5251 | global thickerline lthickness | |
| 5252 | ||
| 5253 | set wid $lthickness | |
| 5254 | if {[info exists thickerline] && $id eq $thickerline} { | |
| 5255 | set wid [expr {2 * $lthickness}] | |
| 5256 | } | |
| 5257 | return $wid | |
| 5258 | } | |
| 5259 | ||
| 50b44ece | 5260 | proc rowranges {id} { |
| 7fcc92bf | 5261 | global curview children uparrowlen downarrowlen |
| 92ed666f | 5262 | global rowidlist |
| 50b44ece | 5263 | |
| 92ed666f PM |
5264 | set kids $children($curview,$id) |
| 5265 | if {$kids eq {}} { | |
| 5266 | return {} | |
| 66e46f37 | 5267 | } |
| 92ed666f PM |
5268 | set ret {} |
| 5269 | lappend kids $id | |
| 5270 | foreach child $kids { | |
| 7fcc92bf PM |
5271 | if {![commitinview $child $curview]} break |
| 5272 | set row [rowofcommit $child] | |
| 92ed666f PM |
5273 | if {![info exists prev]} { |
| 5274 | lappend ret [expr {$row + 1}] | |
| 322a8cc9 | 5275 | } else { |
| 92ed666f | 5276 | if {$row <= $prevrow} { |
| 7fcc92bf | 5277 | puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow" |
| 92ed666f PM |
5278 | } |
| 5279 | # see if the line extends the whole way from prevrow to row | |
| 5280 | if {$row > $prevrow + $uparrowlen + $downarrowlen && | |
| 5281 | [lsearch -exact [lindex $rowidlist \ | |
| 5282 | [expr {int(($row + $prevrow) / 2)}]] $id] < 0} { | |
| 5283 | # it doesn't, see where it ends | |
| 5284 | set r [expr {$prevrow + $downarrowlen}] | |
| 5285 | if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} { | |
| 5286 | while {[incr r -1] > $prevrow && | |
| 5287 | [lsearch -exact [lindex $rowidlist $r] $id] < 0} {} | |
| 5288 | } else { | |
| 5289 | while {[incr r] <= $row && | |
| 5290 | [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {} | |
| 5291 | incr r -1 | |
| 5292 | } | |
| 5293 | lappend ret $r | |
| 5294 | # see where it starts up again | |
| 5295 | set r [expr {$row - $uparrowlen}] | |
| 5296 | if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} { | |
| 5297 | while {[incr r] < $row && | |
| 5298 | [lsearch -exact [lindex $rowidlist $r] $id] < 0} {} | |
| 5299 | } else { | |
| 5300 | while {[incr r -1] >= $prevrow && | |
| 5301 | [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {} | |
| 5302 | incr r | |
| 5303 | } | |
| 5304 | lappend ret $r | |
| 5305 | } | |
| 5306 | } | |
| 5307 | if {$child eq $id} { | |
| 5308 | lappend ret $row | |
| 322a8cc9 | 5309 | } |
| 7fcc92bf | 5310 | set prev $child |
| 92ed666f | 5311 | set prevrow $row |
| 9f1afe05 | 5312 | } |
| 92ed666f | 5313 | return $ret |
| 322a8cc9 PM |
5314 | } |
| 5315 | ||
| 5316 | proc drawlineseg {id row endrow arrowlow} { | |
| 5317 | global rowidlist displayorder iddrawn linesegs | |
| e341c06d | 5318 | global canv colormap linespc curview maxlinelen parentlist |
| 322a8cc9 PM |
5319 | |
| 5320 | set cols [list [lsearch -exact [lindex $rowidlist $row] $id]] | |
| 5321 | set le [expr {$row + 1}] | |
| 5322 | set arrowhigh 1 | |
| 9f1afe05 | 5323 | while {1} { |
| 322a8cc9 PM |
5324 | set c [lsearch -exact [lindex $rowidlist $le] $id] |
| 5325 | if {$c < 0} { | |
| 5326 | incr le -1 | |
| 5327 | break | |
| 5328 | } | |
| 5329 | lappend cols $c | |
| 5330 | set x [lindex $displayorder $le] | |
| 5331 | if {$x eq $id} { | |
| 5332 | set arrowhigh 0 | |
| 5333 | break | |
| 9f1afe05 | 5334 | } |
| 322a8cc9 PM |
5335 | if {[info exists iddrawn($x)] || $le == $endrow} { |
| 5336 | set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id] | |
| 5337 | if {$c >= 0} { | |
| 5338 | lappend cols $c | |
| 5339 | set arrowhigh 0 | |
| 5340 | } | |
| 5341 | break | |
| 5342 | } | |
| 5343 | incr le | |
| 9f1afe05 | 5344 | } |
| 322a8cc9 PM |
5345 | if {$le <= $row} { |
| 5346 | return $row | |
| 5347 | } | |
| 5348 | ||
| 5349 | set lines {} | |
| 5350 | set i 0 | |
| 5351 | set joinhigh 0 | |
| 5352 | if {[info exists linesegs($id)]} { | |
| 5353 | set lines $linesegs($id) | |
| 5354 | foreach li $lines { | |
| 5355 | set r0 [lindex $li 0] | |
| 5356 | if {$r0 > $row} { | |
| 5357 | if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} { | |
| 5358 | set joinhigh 1 | |
| 5359 | } | |
| 5360 | break | |
| 5361 | } | |
| 5362 | incr i | |
| 5363 | } | |
| 5364 | } | |
| 5365 | set joinlow 0 | |
| 5366 | if {$i > 0} { | |
| 5367 | set li [lindex $lines [expr {$i-1}]] | |
| 5368 | set r1 [lindex $li 1] | |
| 5369 | if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} { | |
| 5370 | set joinlow 1 | |
| 5371 | } | |
| 5372 | } | |
| 5373 | ||
| 5374 | set x [lindex $cols [expr {$le - $row}]] | |
| 5375 | set xp [lindex $cols [expr {$le - 1 - $row}]] | |
| 5376 | set dir [expr {$xp - $x}] | |
| 5377 | if {$joinhigh} { | |
| 5378 | set ith [lindex $lines $i 2] | |
| 5379 | set coords [$canv coords $ith] | |
| 5380 | set ah [$canv itemcget $ith -arrow] | |
| 5381 | set arrowhigh [expr {$ah eq "first" || $ah eq "both"}] | |
| 5382 | set x2 [lindex $cols [expr {$le + 1 - $row}]] | |
| 5383 | if {$x2 ne {} && $x - $x2 == $dir} { | |
| 5384 | set coords [lrange $coords 0 end-2] | |
| 5385 | } | |
| 5386 | } else { | |
| 5387 | set coords [list [xc $le $x] [yc $le]] | |
| 5388 | } | |
| 5389 | if {$joinlow} { | |
| 5390 | set itl [lindex $lines [expr {$i-1}] 2] | |
| 5391 | set al [$canv itemcget $itl -arrow] | |
| 5392 | set arrowlow [expr {$al eq "last" || $al eq "both"}] | |
| e341c06d PM |
5393 | } elseif {$arrowlow} { |
| 5394 | if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 || | |
| 5395 | [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} { | |
| 5396 | set arrowlow 0 | |
| 5397 | } | |
| 322a8cc9 PM |
5398 | } |
| 5399 | set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]] | |
| 5400 | for {set y $le} {[incr y -1] > $row} {} { | |
| 5401 | set x $xp | |
| 5402 | set xp [lindex $cols [expr {$y - 1 - $row}]] | |
| 5403 | set ndir [expr {$xp - $x}] | |
| 5404 | if {$dir != $ndir || $xp < 0} { | |
| 5405 | lappend coords [xc $y $x] [yc $y] | |
| 5406 | } | |
| 5407 | set dir $ndir | |
| 5408 | } | |
| 5409 | if {!$joinlow} { | |
| 5410 | if {$xp < 0} { | |
| 5411 | # join parent line to first child | |
| 5412 | set ch [lindex $displayorder $row] | |
| 5413 | set xc [lsearch -exact [lindex $rowidlist $row] $ch] | |
| 5414 | if {$xc < 0} { | |
| 5415 | puts "oops: drawlineseg: child $ch not on row $row" | |
| e341c06d PM |
5416 | } elseif {$xc != $x} { |
| 5417 | if {($arrowhigh && $le == $row + 1) || $dir == 0} { | |
| 5418 | set d [expr {int(0.5 * $linespc)}] | |
| 5419 | set x1 [xc $row $x] | |
| 5420 | if {$xc < $x} { | |
| 5421 | set x2 [expr {$x1 - $d}] | |
| 5422 | } else { | |
| 5423 | set x2 [expr {$x1 + $d}] | |
| 5424 | } | |
| 5425 | set y2 [yc $row] | |
| 5426 | set y1 [expr {$y2 + $d}] | |
| 5427 | lappend coords $x1 $y1 $x2 $y2 | |
| 5428 | } elseif {$xc < $x - 1} { | |
| 322a8cc9 PM |
5429 | lappend coords [xc $row [expr {$x-1}]] [yc $row] |
| 5430 | } elseif {$xc > $x + 1} { | |
| 5431 | lappend coords [xc $row [expr {$x+1}]] [yc $row] | |
| 5432 | } | |
| 5433 | set x $xc | |
| eb447a12 | 5434 | } |
| 322a8cc9 PM |
5435 | lappend coords [xc $row $x] [yc $row] |
| 5436 | } else { | |
| 5437 | set xn [xc $row $xp] | |
| 5438 | set yn [yc $row] | |
| e341c06d | 5439 | lappend coords $xn $yn |
| 322a8cc9 PM |
5440 | } |
| 5441 | if {!$joinhigh} { | |
| 322a8cc9 PM |
5442 | assigncolor $id |
| 5443 | set t [$canv create line $coords -width [linewidth $id] \ | |
| 5444 | -fill $colormap($id) -tags lines.$id -arrow $arrow] | |
| 5445 | $canv lower $t | |
| 5446 | bindline $t $id | |
| 5447 | set lines [linsert $lines $i [list $row $le $t]] | |
| 5448 | } else { | |
| 5449 | $canv coords $ith $coords | |
| 5450 | if {$arrow ne $ah} { | |
| 5451 | $canv itemconf $ith -arrow $arrow | |
| 5452 | } | |
| 5453 | lset lines $i 0 $row | |
| 5454 | } | |
| 5455 | } else { | |
| 5456 | set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id] | |
| 5457 | set ndir [expr {$xo - $xp}] | |
| 5458 | set clow [$canv coords $itl] | |
| 5459 | if {$dir == $ndir} { | |
| 5460 | set clow [lrange $clow 2 end] | |
| 5461 | } | |
| 5462 | set coords [concat $coords $clow] | |
| 5463 | if {!$joinhigh} { | |
| 5464 | lset lines [expr {$i-1}] 1 $le | |
| 322a8cc9 PM |
5465 | } else { |
| 5466 | # coalesce two pieces | |
| 5467 | $canv delete $ith | |
| 5468 | set b [lindex $lines [expr {$i-1}] 0] | |
| 5469 | set e [lindex $lines $i 1] | |
| 5470 | set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]] | |
| 5471 | } | |
| 5472 | $canv coords $itl $coords | |
| 5473 | if {$arrow ne $al} { | |
| 5474 | $canv itemconf $itl -arrow $arrow | |
| 879e8b1a PM |
5475 | } |
| 5476 | } | |
| 322a8cc9 PM |
5477 | |
| 5478 | set linesegs($id) $lines | |
| 5479 | return $le | |
| 9f1afe05 PM |
5480 | } |
| 5481 | ||
| 322a8cc9 PM |
5482 | proc drawparentlinks {id row} { |
| 5483 | global rowidlist canv colormap curview parentlist | |
| 513a54dc | 5484 | global idpos linespc |
| 9f1afe05 | 5485 | |
| 322a8cc9 PM |
5486 | set rowids [lindex $rowidlist $row] |
| 5487 | set col [lsearch -exact $rowids $id] | |
| 5488 | if {$col < 0} return | |
| 5489 | set olds [lindex $parentlist $row] | |
| 9f1afe05 PM |
5490 | set row2 [expr {$row + 1}] |
| 5491 | set x [xc $row $col] | |
| 5492 | set y [yc $row] | |
| 5493 | set y2 [yc $row2] | |
| e341c06d | 5494 | set d [expr {int(0.5 * $linespc)}] |
| 513a54dc | 5495 | set ymid [expr {$y + $d}] |
| 8f7d0cec | 5496 | set ids [lindex $rowidlist $row2] |
| 9f1afe05 PM |
5497 | # rmx = right-most X coord used |
| 5498 | set rmx 0 | |
| 9f1afe05 | 5499 | foreach p $olds { |
| f3408449 PM |
5500 | set i [lsearch -exact $ids $p] |
| 5501 | if {$i < 0} { | |
| 5502 | puts "oops, parent $p of $id not in list" | |
| 5503 | continue | |
| 5504 | } | |
| 5505 | set x2 [xc $row2 $i] | |
| 5506 | if {$x2 > $rmx} { | |
| 5507 | set rmx $x2 | |
| 5508 | } | |
| 513a54dc PM |
5509 | set j [lsearch -exact $rowids $p] |
| 5510 | if {$j < 0} { | |
| eb447a12 PM |
5511 | # drawlineseg will do this one for us |
| 5512 | continue | |
| 5513 | } | |
| 9f1afe05 PM |
5514 | assigncolor $p |
| 5515 | # should handle duplicated parents here... | |
| 5516 | set coords [list $x $y] | |
| 513a54dc PM |
5517 | if {$i != $col} { |
| 5518 | # if attaching to a vertical segment, draw a smaller | |
| 5519 | # slant for visual distinctness | |
| 5520 | if {$i == $j} { | |
| 5521 | if {$i < $col} { | |
| 5522 | lappend coords [expr {$x2 + $d}] $y $x2 $ymid | |
| 5523 | } else { | |
| 5524 | lappend coords [expr {$x2 - $d}] $y $x2 $ymid | |
| 5525 | } | |
| 5526 | } elseif {$i < $col && $i < $j} { | |
| 5527 | # segment slants towards us already | |
| 5528 | lappend coords [xc $row $j] $y | |
| 5529 | } else { | |
| 5530 | if {$i < $col - 1} { | |
| 5531 | lappend coords [expr {$x2 + $linespc}] $y | |
| 5532 | } elseif {$i > $col + 1} { | |
| 5533 | lappend coords [expr {$x2 - $linespc}] $y | |
| 5534 | } | |
| 5535 | lappend coords $x2 $y2 | |
| 5536 | } | |
| 5537 | } else { | |
| 5538 | lappend coords $x2 $y2 | |
| 9f1afe05 | 5539 | } |
| c934a8a3 | 5540 | set t [$canv create line $coords -width [linewidth $p] \ |
| 9f1afe05 PM |
5541 | -fill $colormap($p) -tags lines.$p] |
| 5542 | $canv lower $t | |
| 5543 | bindline $t $p | |
| 5544 | } | |
| 322a8cc9 PM |
5545 | if {$rmx > [lindex $idpos($id) 1]} { |
| 5546 | lset idpos($id) 1 $rmx | |
| 5547 | redrawtags $id | |
| 5548 | } | |
| 9f1afe05 PM |
5549 | } |
| 5550 | ||
| c934a8a3 | 5551 | proc drawlines {id} { |
| 322a8cc9 | 5552 | global canv |
| 9f1afe05 | 5553 | |
| 322a8cc9 | 5554 | $canv itemconf lines.$id -width [linewidth $id] |
| 9f1afe05 PM |
5555 | } |
| 5556 | ||
| 322a8cc9 | 5557 | proc drawcmittext {id row col} { |
| 7fcc92bf PM |
5558 | global linespc canv canv2 canv3 fgcolor curview |
| 5559 | global cmitlisted commitinfo rowidlist parentlist | |
| 9f1afe05 | 5560 | global rowtextx idpos idtags idheads idotherrefs |
| 0380081c | 5561 | global linehtag linentag linedtag selectedline |
| 28593d3f | 5562 | global canvxmax boldids boldnameids fgcolor |
| d277e89f | 5563 | global mainheadid nullid nullid2 circleitem circlecolors ctxbut |
| 9f1afe05 | 5564 | |
| 1407ade9 | 5565 | # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right |
| 7fcc92bf | 5566 | set listed $cmitlisted($curview,$id) |
| 219ea3a9 PM |
5567 | if {$id eq $nullid} { |
| 5568 | set ofill red | |
| 8f489363 | 5569 | } elseif {$id eq $nullid2} { |
| ef3192b8 | 5570 | set ofill green |
| c11ff120 PM |
5571 | } elseif {$id eq $mainheadid} { |
| 5572 | set ofill yellow | |
| 219ea3a9 | 5573 | } else { |
| c11ff120 | 5574 | set ofill [lindex $circlecolors $listed] |
| 219ea3a9 | 5575 | } |
| 9f1afe05 PM |
5576 | set x [xc $row $col] |
| 5577 | set y [yc $row] | |
| 5578 | set orad [expr {$linespc / 3}] | |
| 1407ade9 | 5579 | if {$listed <= 2} { |
| c961b228 PM |
5580 | set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \ |
| 5581 | [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \ | |
| 5582 | -fill $ofill -outline $fgcolor -width 1 -tags circle] | |
| 1407ade9 | 5583 | } elseif {$listed == 3} { |
| c961b228 PM |
5584 | # triangle pointing left for left-side commits |
| 5585 | set t [$canv create polygon \ | |
| 5586 | [expr {$x - $orad}] $y \ | |
| 5587 | [expr {$x + $orad - 1}] [expr {$y - $orad}] \ | |
| 5588 | [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \ | |
| 5589 | -fill $ofill -outline $fgcolor -width 1 -tags circle] | |
| 5590 | } else { | |
| 5591 | # triangle pointing right for right-side commits | |
| 5592 | set t [$canv create polygon \ | |
| 5593 | [expr {$x + $orad - 1}] $y \ | |
| 5594 | [expr {$x - $orad}] [expr {$y - $orad}] \ | |
| 5595 | [expr {$x - $orad}] [expr {$y + $orad - 1}] \ | |
| 5596 | -fill $ofill -outline $fgcolor -width 1 -tags circle] | |
| 5597 | } | |
| c11ff120 | 5598 | set circleitem($row) $t |
| 9f1afe05 PM |
5599 | $canv raise $t |
| 5600 | $canv bind $t <1> {selcanvline {} %x %y} | |
| 322a8cc9 PM |
5601 | set rmx [llength [lindex $rowidlist $row]] |
| 5602 | set olds [lindex $parentlist $row] | |
| 5603 | if {$olds ne {}} { | |
| 5604 | set nextids [lindex $rowidlist [expr {$row + 1}]] | |
| 5605 | foreach p $olds { | |
| 5606 | set i [lsearch -exact $nextids $p] | |
| 5607 | if {$i > $rmx} { | |
| 5608 | set rmx $i | |
| 5609 | } | |
| 5610 | } | |
| 9f1afe05 | 5611 | } |
| 322a8cc9 | 5612 | set xt [xc $row $rmx] |
| 9f1afe05 PM |
5613 | set rowtextx($row) $xt |
| 5614 | set idpos($id) [list $x $xt $y] | |
| 5615 | if {[info exists idtags($id)] || [info exists idheads($id)] | |
| 5616 | || [info exists idotherrefs($id)]} { | |
| 5617 | set xt [drawtags $id $x $xt $y] | |
| 5618 | } | |
| 5619 | set headline [lindex $commitinfo($id) 0] | |
| 5620 | set name [lindex $commitinfo($id) 1] | |
| 5621 | set date [lindex $commitinfo($id) 2] | |
| 5622 | set date [formatdate $date] | |
| 9c311b32 PM |
5623 | set font mainfont |
| 5624 | set nfont mainfont | |
| 476ca63d | 5625 | set isbold [ishighlighted $id] |
| 908c3585 | 5626 | if {$isbold > 0} { |
| 28593d3f | 5627 | lappend boldids $id |
| 9c311b32 | 5628 | set font mainfontbold |
| 908c3585 | 5629 | if {$isbold > 1} { |
| 28593d3f | 5630 | lappend boldnameids $id |
| 9c311b32 | 5631 | set nfont mainfontbold |
| 908c3585 | 5632 | } |
| da7c24dd | 5633 | } |
| 28593d3f PM |
5634 | set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \ |
| 5635 | -text $headline -font $font -tags text] | |
| 5636 | $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id" | |
| 5637 | set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \ | |
| 5638 | -text $name -font $nfont -tags text] | |
| 5639 | set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \ | |
| 5640 | -text $date -font mainfont -tags text] | |
| 94b4a69f | 5641 | if {$selectedline == $row} { |
| 28593d3f | 5642 | make_secsel $id |
| 0380081c | 5643 | } |
| 9c311b32 | 5644 | set xr [expr {$xt + [font measure $font $headline]}] |
| be0cd098 PM |
5645 | if {$xr > $canvxmax} { |
| 5646 | set canvxmax $xr | |
| 5647 | setcanvscroll | |
| 5648 | } | |
| 9f1afe05 PM |
5649 | } |
| 5650 | ||
| 5651 | proc drawcmitrow {row} { | |
| 0380081c | 5652 | global displayorder rowidlist nrows_drawn |
| 005a2f4e | 5653 | global iddrawn markingmatches |
| 7fcc92bf | 5654 | global commitinfo numcommits |
| 687c8765 | 5655 | global filehighlight fhighlights findpattern nhighlights |
| 908c3585 | 5656 | global hlview vhighlights |
| 164ff275 | 5657 | global highlight_related rhighlights |
| 9f1afe05 | 5658 | |
| 8f7d0cec | 5659 | if {$row >= $numcommits} return |
| 9f1afe05 PM |
5660 | |
| 5661 | set id [lindex $displayorder $row] | |
| 476ca63d | 5662 | if {[info exists hlview] && ![info exists vhighlights($id)]} { |
| 908c3585 PM |
5663 | askvhighlight $row $id |
| 5664 | } | |
| 476ca63d | 5665 | if {[info exists filehighlight] && ![info exists fhighlights($id)]} { |
| 908c3585 PM |
5666 | askfilehighlight $row $id |
| 5667 | } | |
| 476ca63d | 5668 | if {$findpattern ne {} && ![info exists nhighlights($id)]} { |
| 60f7a7dc | 5669 | askfindhighlight $row $id |
| 908c3585 | 5670 | } |
| 476ca63d | 5671 | if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} { |
| 164ff275 PM |
5672 | askrelhighlight $row $id |
| 5673 | } | |
| 005a2f4e PM |
5674 | if {![info exists iddrawn($id)]} { |
| 5675 | set col [lsearch -exact [lindex $rowidlist $row] $id] | |
| 5676 | if {$col < 0} { | |
| 5677 | puts "oops, row $row id $id not in list" | |
| 5678 | return | |
| 5679 | } | |
| 5680 | if {![info exists commitinfo($id)]} { | |
| 5681 | getcommit $id | |
| 5682 | } | |
| 5683 | assigncolor $id | |
| 5684 | drawcmittext $id $row $col | |
| 5685 | set iddrawn($id) 1 | |
| 0380081c | 5686 | incr nrows_drawn |
| 9f1afe05 | 5687 | } |
| 005a2f4e PM |
5688 | if {$markingmatches} { |
| 5689 | markrowmatches $row $id | |
| 9f1afe05 | 5690 | } |
| 9f1afe05 PM |
5691 | } |
| 5692 | ||
| 322a8cc9 | 5693 | proc drawcommits {row {endrow {}}} { |
| 0380081c | 5694 | global numcommits iddrawn displayorder curview need_redisplay |
| f5f3c2e2 | 5695 | global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn |
| 9f1afe05 | 5696 | |
| 9f1afe05 PM |
5697 | if {$row < 0} { |
| 5698 | set row 0 | |
| 5699 | } | |
| 322a8cc9 PM |
5700 | if {$endrow eq {}} { |
| 5701 | set endrow $row | |
| 5702 | } | |
| 9f1afe05 PM |
5703 | if {$endrow >= $numcommits} { |
| 5704 | set endrow [expr {$numcommits - 1}] | |
| 5705 | } | |
| 322a8cc9 | 5706 | |
| 0380081c PM |
5707 | set rl1 [expr {$row - $downarrowlen - 3}] |
| 5708 | if {$rl1 < 0} { | |
| 5709 | set rl1 0 | |
| 5710 | } | |
| 5711 | set ro1 [expr {$row - 3}] | |
| 5712 | if {$ro1 < 0} { | |
| 5713 | set ro1 0 | |
| 5714 | } | |
| 5715 | set r2 [expr {$endrow + $uparrowlen + 3}] | |
| 5716 | if {$r2 > $numcommits} { | |
| 5717 | set r2 $numcommits | |
| 5718 | } | |
| 5719 | for {set r $rl1} {$r < $r2} {incr r} { | |
| f5f3c2e2 | 5720 | if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} { |
| 0380081c PM |
5721 | if {$rl1 < $r} { |
| 5722 | layoutrows $rl1 $r | |
| 5723 | } | |
| 5724 | set rl1 [expr {$r + 1}] | |
| 5725 | } | |
| 5726 | } | |
| 5727 | if {$rl1 < $r} { | |
| 5728 | layoutrows $rl1 $r | |
| 5729 | } | |
| 5730 | optimize_rows $ro1 0 $r2 | |
| 5731 | if {$need_redisplay || $nrows_drawn > 2000} { | |
| 5732 | clear_display | |
| 5733 | drawvisible | |
| 5734 | } | |
| 5735 | ||
| 322a8cc9 PM |
5736 | # make the lines join to already-drawn rows either side |
| 5737 | set r [expr {$row - 1}] | |
| 5738 | if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} { | |
| 5739 | set r $row | |
| 5740 | } | |
| 5741 | set er [expr {$endrow + 1}] | |
| 5742 | if {$er >= $numcommits || | |
| 5743 | ![info exists iddrawn([lindex $displayorder $er])]} { | |
| 5744 | set er $endrow | |
| 5745 | } | |
| 5746 | for {} {$r <= $er} {incr r} { | |
| 5747 | set id [lindex $displayorder $r] | |
| 5748 | set wasdrawn [info exists iddrawn($id)] | |
| 4fb0fa19 | 5749 | drawcmitrow $r |
| 322a8cc9 PM |
5750 | if {$r == $er} break |
| 5751 | set nextid [lindex $displayorder [expr {$r + 1}]] | |
| e5ef6f95 | 5752 | if {$wasdrawn && [info exists iddrawn($nextid)]} continue |
| 322a8cc9 PM |
5753 | drawparentlinks $id $r |
| 5754 | ||
| 322a8cc9 PM |
5755 | set rowids [lindex $rowidlist $r] |
| 5756 | foreach lid $rowids { | |
| 5757 | if {$lid eq {}} continue | |
| e5ef6f95 | 5758 | if {[info exists lineend($lid)] && $lineend($lid) > $r} continue |
| 322a8cc9 PM |
5759 | if {$lid eq $id} { |
| 5760 | # see if this is the first child of any of its parents | |
| 5761 | foreach p [lindex $parentlist $r] { | |
| 5762 | if {[lsearch -exact $rowids $p] < 0} { | |
| 5763 | # make this line extend up to the child | |
| e5ef6f95 | 5764 | set lineend($p) [drawlineseg $p $r $er 0] |
| 322a8cc9 PM |
5765 | } |
| 5766 | } | |
| e5ef6f95 PM |
5767 | } else { |
| 5768 | set lineend($lid) [drawlineseg $lid $r $er 1] | |
| 322a8cc9 PM |
5769 | } |
| 5770 | } | |
| 9f1afe05 PM |
5771 | } |
| 5772 | } | |
| 5773 | ||
| 7fcc92bf PM |
5774 | proc undolayout {row} { |
| 5775 | global uparrowlen mingaplen downarrowlen | |
| 5776 | global rowidlist rowisopt rowfinal need_redisplay | |
| 5777 | ||
| 5778 | set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}] | |
| 5779 | if {$r < 0} { | |
| 5780 | set r 0 | |
| 5781 | } | |
| 5782 | if {[llength $rowidlist] > $r} { | |
| 5783 | incr r -1 | |
| 5784 | set rowidlist [lrange $rowidlist 0 $r] | |
| 5785 | set rowfinal [lrange $rowfinal 0 $r] | |
| 5786 | set rowisopt [lrange $rowisopt 0 $r] | |
| 5787 | set need_redisplay 1 | |
| 5788 | run drawvisible | |
| 5789 | } | |
| 5790 | } | |
| 5791 | ||
| 31c0eaa8 PM |
5792 | proc drawvisible {} { |
| 5793 | global canv linespc curview vrowmod selectedline targetrow targetid | |
| 42a671fc | 5794 | global need_redisplay cscroll numcommits |
| 322a8cc9 | 5795 | |
| 31c0eaa8 | 5796 | set fs [$canv yview] |
| 322a8cc9 | 5797 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 5a7f577d | 5798 | if {$ymax eq {} || $ymax == 0 || $numcommits == 0} return |
| 31c0eaa8 PM |
5799 | set f0 [lindex $fs 0] |
| 5800 | set f1 [lindex $fs 1] | |
| 322a8cc9 | 5801 | set y0 [expr {int($f0 * $ymax)}] |
| 322a8cc9 | 5802 | set y1 [expr {int($f1 * $ymax)}] |
| 31c0eaa8 PM |
5803 | |
| 5804 | if {[info exists targetid]} { | |
| 42a671fc PM |
5805 | if {[commitinview $targetid $curview]} { |
| 5806 | set r [rowofcommit $targetid] | |
| 5807 | if {$r != $targetrow} { | |
| 5808 | # Fix up the scrollregion and change the scrolling position | |
| 5809 | # now that our target row has moved. | |
| 5810 | set diff [expr {($r - $targetrow) * $linespc}] | |
| 5811 | set targetrow $r | |
| 5812 | setcanvscroll | |
| 5813 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 5814 | incr y0 $diff | |
| 5815 | incr y1 $diff | |
| 5816 | set f0 [expr {$y0 / $ymax}] | |
| 5817 | set f1 [expr {$y1 / $ymax}] | |
| 5818 | allcanvs yview moveto $f0 | |
| 5819 | $cscroll set $f0 $f1 | |
| 5820 | set need_redisplay 1 | |
| 5821 | } | |
| 5822 | } else { | |
| 5823 | unset targetid | |
| 31c0eaa8 PM |
5824 | } |
| 5825 | } | |
| 5826 | ||
| 5827 | set row [expr {int(($y0 - 3) / $linespc) - 1}] | |
| 322a8cc9 | 5828 | set endrow [expr {int(($y1 - 3) / $linespc) + 1}] |
| 31c0eaa8 PM |
5829 | if {$endrow >= $vrowmod($curview)} { |
| 5830 | update_arcrows $curview | |
| 5831 | } | |
| 94b4a69f | 5832 | if {$selectedline ne {} && |
| 31c0eaa8 PM |
5833 | $row <= $selectedline && $selectedline <= $endrow} { |
| 5834 | set targetrow $selectedline | |
| ac1276ab | 5835 | } elseif {[info exists targetid]} { |
| 31c0eaa8 PM |
5836 | set targetrow [expr {int(($row + $endrow) / 2)}] |
| 5837 | } | |
| ac1276ab PM |
5838 | if {[info exists targetrow]} { |
| 5839 | if {$targetrow >= $numcommits} { | |
| 5840 | set targetrow [expr {$numcommits - 1}] | |
| 5841 | } | |
| 5842 | set targetid [commitonrow $targetrow] | |
| 42a671fc | 5843 | } |
| 322a8cc9 PM |
5844 | drawcommits $row $endrow |
| 5845 | } | |
| 5846 | ||
| 9f1afe05 | 5847 | proc clear_display {} { |
| 0380081c | 5848 | global iddrawn linesegs need_redisplay nrows_drawn |
| 164ff275 | 5849 | global vhighlights fhighlights nhighlights rhighlights |
| 28593d3f | 5850 | global linehtag linentag linedtag boldids boldnameids |
| 9f1afe05 PM |
5851 | |
| 5852 | allcanvs delete all | |
| 5853 | catch {unset iddrawn} | |
| 322a8cc9 | 5854 | catch {unset linesegs} |
| 94503a66 PM |
5855 | catch {unset linehtag} |
| 5856 | catch {unset linentag} | |
| 5857 | catch {unset linedtag} | |
| 28593d3f PM |
5858 | set boldids {} |
| 5859 | set boldnameids {} | |
| 908c3585 PM |
5860 | catch {unset vhighlights} |
| 5861 | catch {unset fhighlights} | |
| 5862 | catch {unset nhighlights} | |
| 164ff275 | 5863 | catch {unset rhighlights} |
| 0380081c PM |
5864 | set need_redisplay 0 |
| 5865 | set nrows_drawn 0 | |
| 9f1afe05 PM |
5866 | } |
| 5867 | ||
| 50b44ece | 5868 | proc findcrossings {id} { |
| 6e8c8707 | 5869 | global rowidlist parentlist numcommits displayorder |
| 50b44ece PM |
5870 | |
| 5871 | set cross {} | |
| 5872 | set ccross {} | |
| 5873 | foreach {s e} [rowranges $id] { | |
| 5874 | if {$e >= $numcommits} { | |
| 5875 | set e [expr {$numcommits - 1}] | |
| 50b44ece | 5876 | } |
| d94f8cd6 | 5877 | if {$e <= $s} continue |
| 50b44ece | 5878 | for {set row $e} {[incr row -1] >= $s} {} { |
| 6e8c8707 PM |
5879 | set x [lsearch -exact [lindex $rowidlist $row] $id] |
| 5880 | if {$x < 0} break | |
| 50b44ece PM |
5881 | set olds [lindex $parentlist $row] |
| 5882 | set kid [lindex $displayorder $row] | |
| 5883 | set kidx [lsearch -exact [lindex $rowidlist $row] $kid] | |
| 5884 | if {$kidx < 0} continue | |
| 5885 | set nextrow [lindex $rowidlist [expr {$row + 1}]] | |
| 5886 | foreach p $olds { | |
| 5887 | set px [lsearch -exact $nextrow $p] | |
| 5888 | if {$px < 0} continue | |
| 5889 | if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} { | |
| 5890 | if {[lsearch -exact $ccross $p] >= 0} continue | |
| 5891 | if {$x == $px + ($kidx < $px? -1: 1)} { | |
| 5892 | lappend ccross $p | |
| 5893 | } elseif {[lsearch -exact $cross $p] < 0} { | |
| 5894 | lappend cross $p | |
| 5895 | } | |
| 5896 | } | |
| 5897 | } | |
| 50b44ece PM |
5898 | } |
| 5899 | } | |
| 5900 | return [concat $ccross {{}} $cross] | |
| 5901 | } | |
| 5902 | ||
| e5c2d856 | 5903 | proc assigncolor {id} { |
| aa81d974 | 5904 | global colormap colors nextcolor |
| 7fcc92bf | 5905 | global parents children children curview |
| 6c20ff34 | 5906 | |
| 418c4c7b | 5907 | if {[info exists colormap($id)]} return |
| e5c2d856 | 5908 | set ncolors [llength $colors] |
| da7c24dd PM |
5909 | if {[info exists children($curview,$id)]} { |
| 5910 | set kids $children($curview,$id) | |
| 79b2c75e PM |
5911 | } else { |
| 5912 | set kids {} | |
| 5913 | } | |
| 5914 | if {[llength $kids] == 1} { | |
| 5915 | set child [lindex $kids 0] | |
| 9ccbdfbf | 5916 | if {[info exists colormap($child)] |
| 7fcc92bf | 5917 | && [llength $parents($curview,$child)] == 1} { |
| 9ccbdfbf PM |
5918 | set colormap($id) $colormap($child) |
| 5919 | return | |
| e5c2d856 | 5920 | } |
| 9ccbdfbf PM |
5921 | } |
| 5922 | set badcolors {} | |
| 50b44ece PM |
5923 | set origbad {} |
| 5924 | foreach x [findcrossings $id] { | |
| 5925 | if {$x eq {}} { | |
| 5926 | # delimiter between corner crossings and other crossings | |
| 5927 | if {[llength $badcolors] >= $ncolors - 1} break | |
| 5928 | set origbad $badcolors | |
| e5c2d856 | 5929 | } |
| 50b44ece PM |
5930 | if {[info exists colormap($x)] |
| 5931 | && [lsearch -exact $badcolors $colormap($x)] < 0} { | |
| 5932 | lappend badcolors $colormap($x) | |
| 6c20ff34 PM |
5933 | } |
| 5934 | } | |
| 50b44ece PM |
5935 | if {[llength $badcolors] >= $ncolors} { |
| 5936 | set badcolors $origbad | |
| 9ccbdfbf | 5937 | } |
| 50b44ece | 5938 | set origbad $badcolors |
| 6c20ff34 | 5939 | if {[llength $badcolors] < $ncolors - 1} { |
| 79b2c75e | 5940 | foreach child $kids { |
| 6c20ff34 PM |
5941 | if {[info exists colormap($child)] |
| 5942 | && [lsearch -exact $badcolors $colormap($child)] < 0} { | |
| 5943 | lappend badcolors $colormap($child) | |
| 5944 | } | |
| 7fcc92bf | 5945 | foreach p $parents($curview,$child) { |
| 79b2c75e PM |
5946 | if {[info exists colormap($p)] |
| 5947 | && [lsearch -exact $badcolors $colormap($p)] < 0} { | |
| 5948 | lappend badcolors $colormap($p) | |
| 6c20ff34 PM |
5949 | } |
| 5950 | } | |
| 5951 | } | |
| 5952 | if {[llength $badcolors] >= $ncolors} { | |
| 5953 | set badcolors $origbad | |
| 5954 | } | |
| 9ccbdfbf PM |
5955 | } |
| 5956 | for {set i 0} {$i <= $ncolors} {incr i} { | |
| 5957 | set c [lindex $colors $nextcolor] | |
| 5958 | if {[incr nextcolor] >= $ncolors} { | |
| 5959 | set nextcolor 0 | |
| e5c2d856 | 5960 | } |
| 9ccbdfbf | 5961 | if {[lsearch -exact $badcolors $c]} break |
| e5c2d856 | 5962 | } |
| 9ccbdfbf | 5963 | set colormap($id) $c |
| e5c2d856 PM |
5964 | } |
| 5965 | ||
| a823a911 PM |
5966 | proc bindline {t id} { |
| 5967 | global canv | |
| 5968 | ||
| a823a911 PM |
5969 | $canv bind $t <Enter> "lineenter %x %y $id" |
| 5970 | $canv bind $t <Motion> "linemotion %x %y $id" | |
| 5971 | $canv bind $t <Leave> "lineleave $id" | |
| fa4da7b3 | 5972 | $canv bind $t <Button-1> "lineclick %x %y $id 1" |
| a823a911 PM |
5973 | } |
| 5974 | ||
| bdbfbe3d | 5975 | proc drawtags {id x xt y1} { |
| 8a48571c | 5976 | global idtags idheads idotherrefs mainhead |
| bdbfbe3d | 5977 | global linespc lthickness |
| d277e89f | 5978 | global canv rowtextx curview fgcolor bgcolor ctxbut |
| bdbfbe3d PM |
5979 | |
| 5980 | set marks {} | |
| 5981 | set ntags 0 | |
| f1d83ba3 | 5982 | set nheads 0 |
| bdbfbe3d PM |
5983 | if {[info exists idtags($id)]} { |
| 5984 | set marks $idtags($id) | |
| 5985 | set ntags [llength $marks] | |
| 5986 | } | |
| 5987 | if {[info exists idheads($id)]} { | |
| 5988 | set marks [concat $marks $idheads($id)] | |
| f1d83ba3 PM |
5989 | set nheads [llength $idheads($id)] |
| 5990 | } | |
| 5991 | if {[info exists idotherrefs($id)]} { | |
| 5992 | set marks [concat $marks $idotherrefs($id)] | |
| bdbfbe3d PM |
5993 | } |
| 5994 | if {$marks eq {}} { | |
| 5995 | return $xt | |
| 5996 | } | |
| 5997 | ||
| 5998 | set delta [expr {int(0.5 * ($linespc - $lthickness))}] | |
| 2ed49d54 JH |
5999 | set yt [expr {$y1 - 0.5 * $linespc}] |
| 6000 | set yb [expr {$yt + $linespc - 1}] | |
| bdbfbe3d PM |
6001 | set xvals {} |
| 6002 | set wvals {} | |
| 8a48571c | 6003 | set i -1 |
| bdbfbe3d | 6004 | foreach tag $marks { |
| 8a48571c PM |
6005 | incr i |
| 6006 | if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} { | |
| 9c311b32 | 6007 | set wid [font measure mainfontbold $tag] |
| 8a48571c | 6008 | } else { |
| 9c311b32 | 6009 | set wid [font measure mainfont $tag] |
| 8a48571c | 6010 | } |
| bdbfbe3d PM |
6011 | lappend xvals $xt |
| 6012 | lappend wvals $wid | |
| 6013 | set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}] | |
| 6014 | } | |
| 6015 | set t [$canv create line $x $y1 [lindex $xvals end] $y1 \ | |
| 6016 | -width $lthickness -fill black -tags tag.$id] | |
| 6017 | $canv lower $t | |
| 6018 | foreach tag $marks x $xvals wid $wvals { | |
| 2ed49d54 JH |
6019 | set xl [expr {$x + $delta}] |
| 6020 | set xr [expr {$x + $delta + $wid + $lthickness}] | |
| 9c311b32 | 6021 | set font mainfont |
| bdbfbe3d PM |
6022 | if {[incr ntags -1] >= 0} { |
| 6023 | # draw a tag | |
| 2ed49d54 JH |
6024 | set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \ |
| 6025 | $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \ | |
| 106288cb PM |
6026 | -width 1 -outline black -fill yellow -tags tag.$id] |
| 6027 | $canv bind $t <1> [list showtag $tag 1] | |
| 7fcc92bf | 6028 | set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}] |
| bdbfbe3d | 6029 | } else { |
| f1d83ba3 PM |
6030 | # draw a head or other ref |
| 6031 | if {[incr nheads -1] >= 0} { | |
| 6032 | set col green | |
| 8a48571c | 6033 | if {$tag eq $mainhead} { |
| 9c311b32 | 6034 | set font mainfontbold |
| 8a48571c | 6035 | } |
| f1d83ba3 PM |
6036 | } else { |
| 6037 | set col "#ddddff" | |
| 6038 | } | |
| 2ed49d54 | 6039 | set xl [expr {$xl - $delta/2}] |
| bdbfbe3d | 6040 | $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \ |
| f1d83ba3 | 6041 | -width 1 -outline black -fill $col -tags tag.$id |
| a970fcf2 | 6042 | if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} { |
| 9c311b32 | 6043 | set rwid [font measure mainfont $remoteprefix] |
| a970fcf2 JW |
6044 | set xi [expr {$x + 1}] |
| 6045 | set yti [expr {$yt + 1}] | |
| 6046 | set xri [expr {$x + $rwid}] | |
| 6047 | $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \ | |
| 6048 | -width 0 -fill "#ffddaa" -tags tag.$id | |
| 6049 | } | |
| bdbfbe3d | 6050 | } |
| f8a2c0d1 | 6051 | set t [$canv create text $xl $y1 -anchor w -text $tag -fill $fgcolor \ |
| 8a48571c | 6052 | -font $font -tags [list tag.$id text]] |
| 106288cb PM |
6053 | if {$ntags >= 0} { |
| 6054 | $canv bind $t <1> [list showtag $tag 1] | |
| 10299152 | 6055 | } elseif {$nheads >= 0} { |
| d277e89f | 6056 | $canv bind $t $ctxbut [list headmenu %X %Y $id $tag] |
| 106288cb | 6057 | } |
| bdbfbe3d PM |
6058 | } |
| 6059 | return $xt | |
| 6060 | } | |
| 6061 | ||
| 8d858d1a PM |
6062 | proc xcoord {i level ln} { |
| 6063 | global canvx0 xspc1 xspc2 | |
| 6064 | ||
| 6065 | set x [expr {$canvx0 + $i * $xspc1($ln)}] | |
| 6066 | if {$i > 0 && $i == $level} { | |
| 6067 | set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}] | |
| 6068 | } elseif {$i > $level} { | |
| 6069 | set x [expr {$x + $xspc2 - $xspc1($ln)}] | |
| 6070 | } | |
| 6071 | return $x | |
| 6072 | } | |
| 9ccbdfbf | 6073 | |
| 098dd8a3 | 6074 | proc show_status {msg} { |
| 9c311b32 | 6075 | global canv fgcolor |
| 098dd8a3 PM |
6076 | |
| 6077 | clear_display | |
| 9c311b32 | 6078 | $canv create text 3 3 -anchor nw -text $msg -font mainfont \ |
| f8a2c0d1 | 6079 | -tags text -fill $fgcolor |
| 098dd8a3 PM |
6080 | } |
| 6081 | ||
| 94a2eede PM |
6082 | # Don't change the text pane cursor if it is currently the hand cursor, |
| 6083 | # showing that we are over a sha1 ID link. | |
| 6084 | proc settextcursor {c} { | |
| 6085 | global ctext curtextcursor | |
| 6086 | ||
| 6087 | if {[$ctext cget -cursor] == $curtextcursor} { | |
| 6088 | $ctext config -cursor $c | |
| 6089 | } | |
| 6090 | set curtextcursor $c | |
| 9ccbdfbf PM |
6091 | } |
| 6092 | ||
| a137a90f PM |
6093 | proc nowbusy {what {name {}}} { |
| 6094 | global isbusy busyname statusw | |
| da7c24dd PM |
6095 | |
| 6096 | if {[array names isbusy] eq {}} { | |
| 6097 | . config -cursor watch | |
| 6098 | settextcursor watch | |
| 6099 | } | |
| 6100 | set isbusy($what) 1 | |
| a137a90f PM |
6101 | set busyname($what) $name |
| 6102 | if {$name ne {}} { | |
| 6103 | $statusw conf -text $name | |
| 6104 | } | |
| da7c24dd PM |
6105 | } |
| 6106 | ||
| 6107 | proc notbusy {what} { | |
| a137a90f | 6108 | global isbusy maincursor textcursor busyname statusw |
| da7c24dd | 6109 | |
| a137a90f PM |
6110 | catch { |
| 6111 | unset isbusy($what) | |
| 6112 | if {$busyname($what) ne {} && | |
| 6113 | [$statusw cget -text] eq $busyname($what)} { | |
| 6114 | $statusw conf -text {} | |
| 6115 | } | |
| 6116 | } | |
| da7c24dd PM |
6117 | if {[array names isbusy] eq {}} { |
| 6118 | . config -cursor $maincursor | |
| 6119 | settextcursor $textcursor | |
| 6120 | } | |
| 6121 | } | |
| 6122 | ||
| df3d83b1 | 6123 | proc findmatches {f} { |
| 4fb0fa19 | 6124 | global findtype findstring |
| b007ee20 | 6125 | if {$findtype == [mc "Regexp"]} { |
| 4fb0fa19 | 6126 | set matches [regexp -indices -all -inline $findstring $f] |
| df3d83b1 | 6127 | } else { |
| 4fb0fa19 | 6128 | set fs $findstring |
| b007ee20 | 6129 | if {$findtype == [mc "IgnCase"]} { |
| 4fb0fa19 PM |
6130 | set f [string tolower $f] |
| 6131 | set fs [string tolower $fs] | |
| df3d83b1 PM |
6132 | } |
| 6133 | set matches {} | |
| 6134 | set i 0 | |
| 4fb0fa19 PM |
6135 | set l [string length $fs] |
| 6136 | while {[set j [string first $fs $f $i]] >= 0} { | |
| 6137 | lappend matches [list $j [expr {$j+$l-1}]] | |
| 6138 | set i [expr {$j + $l}] | |
| df3d83b1 PM |
6139 | } |
| 6140 | } | |
| 6141 | return $matches | |
| 6142 | } | |
| 6143 | ||
| cca5d946 | 6144 | proc dofind {{dirn 1} {wrap 1}} { |
| 4fb0fa19 | 6145 | global findstring findstartline findcurline selectedline numcommits |
| cca5d946 | 6146 | global gdttype filehighlight fh_serial find_dirn findallowwrap |
| b74fd579 | 6147 | |
| cca5d946 PM |
6148 | if {[info exists find_dirn]} { |
| 6149 | if {$find_dirn == $dirn} return | |
| 6150 | stopfinding | |
| 6151 | } | |
| df3d83b1 | 6152 | focus . |
| 4fb0fa19 | 6153 | if {$findstring eq {} || $numcommits == 0} return |
| 94b4a69f | 6154 | if {$selectedline eq {}} { |
| cca5d946 | 6155 | set findstartline [lindex [visiblerows] [expr {$dirn < 0}]] |
| 98f350e5 | 6156 | } else { |
| 4fb0fa19 | 6157 | set findstartline $selectedline |
| 98f350e5 | 6158 | } |
| 4fb0fa19 | 6159 | set findcurline $findstartline |
| b007ee20 CS |
6160 | nowbusy finding [mc "Searching"] |
| 6161 | if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} { | |
| 687c8765 PM |
6162 | after cancel do_file_hl $fh_serial |
| 6163 | do_file_hl $fh_serial | |
| 98f350e5 | 6164 | } |
| cca5d946 PM |
6165 | set find_dirn $dirn |
| 6166 | set findallowwrap $wrap | |
| 6167 | run findmore | |
| 4fb0fa19 PM |
6168 | } |
| 6169 | ||
| bb3edc8b PM |
6170 | proc stopfinding {} { |
| 6171 | global find_dirn findcurline fprogcoord | |
| 4fb0fa19 | 6172 | |
| bb3edc8b PM |
6173 | if {[info exists find_dirn]} { |
| 6174 | unset find_dirn | |
| 6175 | unset findcurline | |
| 6176 | notbusy finding | |
| 6177 | set fprogcoord 0 | |
| 6178 | adjustprogress | |
| 4fb0fa19 | 6179 | } |
| 8a897742 | 6180 | stopblaming |
| 4fb0fa19 PM |
6181 | } |
| 6182 | ||
| 6183 | proc findmore {} { | |
| 687c8765 | 6184 | global commitdata commitinfo numcommits findpattern findloc |
| 7fcc92bf | 6185 | global findstartline findcurline findallowwrap |
| bb3edc8b | 6186 | global find_dirn gdttype fhighlights fprogcoord |
| cd2bcae7 | 6187 | global curview varcorder vrownum varccommits vrowmod |
| 4fb0fa19 | 6188 | |
| bb3edc8b | 6189 | if {![info exists find_dirn]} { |
| 4fb0fa19 PM |
6190 | return 0 |
| 6191 | } | |
| b007ee20 | 6192 | set fldtypes [list [mc "Headline"] [mc "Author"] [mc "Date"] [mc "Committer"] [mc "CDate"] [mc "Comments"]] |
| 4fb0fa19 | 6193 | set l $findcurline |
| cca5d946 PM |
6194 | set moretodo 0 |
| 6195 | if {$find_dirn > 0} { | |
| 6196 | incr l | |
| 6197 | if {$l >= $numcommits} { | |
| 6198 | set l 0 | |
| 6199 | } | |
| 6200 | if {$l <= $findstartline} { | |
| 6201 | set lim [expr {$findstartline + 1}] | |
| 6202 | } else { | |
| 6203 | set lim $numcommits | |
| 6204 | set moretodo $findallowwrap | |
| 8ed16484 | 6205 | } |
| 4fb0fa19 | 6206 | } else { |
| cca5d946 PM |
6207 | if {$l == 0} { |
| 6208 | set l $numcommits | |
| 98f350e5 | 6209 | } |
| cca5d946 PM |
6210 | incr l -1 |
| 6211 | if {$l >= $findstartline} { | |
| 6212 | set lim [expr {$findstartline - 1}] | |
| bb3edc8b | 6213 | } else { |
| cca5d946 PM |
6214 | set lim -1 |
| 6215 | set moretodo $findallowwrap | |
| bb3edc8b | 6216 | } |
| 687c8765 | 6217 | } |
| cca5d946 PM |
6218 | set n [expr {($lim - $l) * $find_dirn}] |
| 6219 | if {$n > 500} { | |
| 6220 | set n 500 | |
| 6221 | set moretodo 1 | |
| 4fb0fa19 | 6222 | } |
| cd2bcae7 PM |
6223 | if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} { |
| 6224 | update_arcrows $curview | |
| 6225 | } | |
| 687c8765 PM |
6226 | set found 0 |
| 6227 | set domore 1 | |
| 7fcc92bf PM |
6228 | set ai [bsearch $vrownum($curview) $l] |
| 6229 | set a [lindex $varcorder($curview) $ai] | |
| 6230 | set arow [lindex $vrownum($curview) $ai] | |
| 6231 | set ids [lindex $varccommits($curview,$a)] | |
| 6232 | set arowend [expr {$arow + [llength $ids]}] | |
| b007ee20 | 6233 | if {$gdttype eq [mc "containing:"]} { |
| cca5d946 | 6234 | for {} {$n > 0} {incr n -1; incr l $find_dirn} { |
| 7fcc92bf PM |
6235 | if {$l < $arow || $l >= $arowend} { |
| 6236 | incr ai $find_dirn | |
| 6237 | set a [lindex $varcorder($curview) $ai] | |
| 6238 | set arow [lindex $vrownum($curview) $ai] | |
| 6239 | set ids [lindex $varccommits($curview,$a)] | |
| 6240 | set arowend [expr {$arow + [llength $ids]}] | |
| 6241 | } | |
| 6242 | set id [lindex $ids [expr {$l - $arow}]] | |
| cca5d946 | 6243 | # shouldn't happen unless git log doesn't give all the commits... |
| 7fcc92bf PM |
6244 | if {![info exists commitdata($id)] || |
| 6245 | ![doesmatch $commitdata($id)]} { | |
| 6246 | continue | |
| 6247 | } | |
| 687c8765 PM |
6248 | if {![info exists commitinfo($id)]} { |
| 6249 | getcommit $id | |
| 6250 | } | |
| 6251 | set info $commitinfo($id) | |
| 6252 | foreach f $info ty $fldtypes { | |
| b007ee20 | 6253 | if {($findloc eq [mc "All fields"] || $findloc eq $ty) && |
| 687c8765 PM |
6254 | [doesmatch $f]} { |
| 6255 | set found 1 | |
| 6256 | break | |
| 6257 | } | |
| 6258 | } | |
| 6259 | if {$found} break | |
| 4fb0fa19 | 6260 | } |
| 687c8765 | 6261 | } else { |
| cca5d946 | 6262 | for {} {$n > 0} {incr n -1; incr l $find_dirn} { |
| 7fcc92bf PM |
6263 | if {$l < $arow || $l >= $arowend} { |
| 6264 | incr ai $find_dirn | |
| 6265 | set a [lindex $varcorder($curview) $ai] | |
| 6266 | set arow [lindex $vrownum($curview) $ai] | |
| 6267 | set ids [lindex $varccommits($curview,$a)] | |
| 6268 | set arowend [expr {$arow + [llength $ids]}] | |
| 6269 | } | |
| 6270 | set id [lindex $ids [expr {$l - $arow}]] | |
| 476ca63d PM |
6271 | if {![info exists fhighlights($id)]} { |
| 6272 | # this sets fhighlights($id) to -1 | |
| 687c8765 | 6273 | askfilehighlight $l $id |
| cd2bcae7 | 6274 | } |
| 476ca63d | 6275 | if {$fhighlights($id) > 0} { |
| cd2bcae7 PM |
6276 | set found $domore |
| 6277 | break | |
| 6278 | } | |
| 476ca63d | 6279 | if {$fhighlights($id) < 0} { |
| 687c8765 PM |
6280 | if {$domore} { |
| 6281 | set domore 0 | |
| cca5d946 | 6282 | set findcurline [expr {$l - $find_dirn}] |
| 687c8765 | 6283 | } |
| 98f350e5 PM |
6284 | } |
| 6285 | } | |
| 6286 | } | |
| cca5d946 | 6287 | if {$found || ($domore && !$moretodo)} { |
| 4fb0fa19 | 6288 | unset findcurline |
| 687c8765 | 6289 | unset find_dirn |
| 4fb0fa19 | 6290 | notbusy finding |
| bb3edc8b PM |
6291 | set fprogcoord 0 |
| 6292 | adjustprogress | |
| 6293 | if {$found} { | |
| 6294 | findselectline $l | |
| 6295 | } else { | |
| 6296 | bell | |
| 6297 | } | |
| 4fb0fa19 | 6298 | return 0 |
| df3d83b1 | 6299 | } |
| 687c8765 PM |
6300 | if {!$domore} { |
| 6301 | flushhighlights | |
| bb3edc8b | 6302 | } else { |
| cca5d946 | 6303 | set findcurline [expr {$l - $find_dirn}] |
| 687c8765 | 6304 | } |
| cca5d946 | 6305 | set n [expr {($findcurline - $findstartline) * $find_dirn - 1}] |
| bb3edc8b PM |
6306 | if {$n < 0} { |
| 6307 | incr n $numcommits | |
| df3d83b1 | 6308 | } |
| bb3edc8b PM |
6309 | set fprogcoord [expr {$n * 1.0 / $numcommits}] |
| 6310 | adjustprogress | |
| 6311 | return $domore | |
| df3d83b1 PM |
6312 | } |
| 6313 | ||
| 6314 | proc findselectline {l} { | |
| 687c8765 | 6315 | global findloc commentend ctext findcurline markingmatches gdttype |
| 005a2f4e | 6316 | |
| 8b39e04f | 6317 | set markingmatches [expr {$gdttype eq [mc "containing:"]}] |
| 005a2f4e | 6318 | set findcurline $l |
| d698206c | 6319 | selectline $l 1 |
| 8b39e04f PM |
6320 | if {$markingmatches && |
| 6321 | ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} { | |
| df3d83b1 PM |
6322 | # highlight the matches in the comments |
| 6323 | set f [$ctext get 1.0 $commentend] | |
| 6324 | set matches [findmatches $f] | |
| 6325 | foreach match $matches { | |
| 6326 | set start [lindex $match 0] | |
| 2ed49d54 | 6327 | set end [expr {[lindex $match 1] + 1}] |
| df3d83b1 PM |
6328 | $ctext tag add found "1.0 + $start c" "1.0 + $end c" |
| 6329 | } | |
| 98f350e5 | 6330 | } |
| 005a2f4e | 6331 | drawvisible |
| 98f350e5 PM |
6332 | } |
| 6333 | ||
| 4fb0fa19 | 6334 | # mark the bits of a headline or author that match a find string |
| 005a2f4e PM |
6335 | proc markmatches {canv l str tag matches font row} { |
| 6336 | global selectedline | |
| 6337 | ||
| 98f350e5 PM |
6338 | set bbox [$canv bbox $tag] |
| 6339 | set x0 [lindex $bbox 0] | |
| 6340 | set y0 [lindex $bbox 1] | |
| 6341 | set y1 [lindex $bbox 3] | |
| 6342 | foreach match $matches { | |
| 6343 | set start [lindex $match 0] | |
| 6344 | set end [lindex $match 1] | |
| 6345 | if {$start > $end} continue | |
| 2ed49d54 JH |
6346 | set xoff [font measure $font [string range $str 0 [expr {$start-1}]]] |
| 6347 | set xlen [font measure $font [string range $str 0 [expr {$end}]]] | |
| 6348 | set t [$canv create rect [expr {$x0+$xoff}] $y0 \ | |
| 6349 | [expr {$x0+$xlen+2}] $y1 \ | |
| 4fb0fa19 | 6350 | -outline {} -tags [list match$l matches] -fill yellow] |
| 98f350e5 | 6351 | $canv lower $t |
| 94b4a69f | 6352 | if {$row == $selectedline} { |
| 005a2f4e PM |
6353 | $canv raise $t secsel |
| 6354 | } | |
| 98f350e5 PM |
6355 | } |
| 6356 | } | |
| 6357 | ||
| 6358 | proc unmarkmatches {} { | |
| bb3edc8b | 6359 | global markingmatches |
| 4fb0fa19 | 6360 | |
| 98f350e5 | 6361 | allcanvs delete matches |
| 4fb0fa19 | 6362 | set markingmatches 0 |
| bb3edc8b | 6363 | stopfinding |
| 98f350e5 PM |
6364 | } |
| 6365 | ||
| c8dfbcf9 | 6366 | proc selcanvline {w x y} { |
| fa4da7b3 | 6367 | global canv canvy0 ctext linespc |
| 9f1afe05 | 6368 | global rowtextx |
| 1db95b00 | 6369 | set ymax [lindex [$canv cget -scrollregion] 3] |
| cfb4563c | 6370 | if {$ymax == {}} return |
| 1db95b00 PM |
6371 | set yfrac [lindex [$canv yview] 0] |
| 6372 | set y [expr {$y + $yfrac * $ymax}] | |
| 6373 | set l [expr {int(($y - $canvy0) / $linespc + 0.5)}] | |
| 6374 | if {$l < 0} { | |
| 6375 | set l 0 | |
| 6376 | } | |
| c8dfbcf9 | 6377 | if {$w eq $canv} { |
| fc2a256f PM |
6378 | set xmax [lindex [$canv cget -scrollregion] 2] |
| 6379 | set xleft [expr {[lindex [$canv xview] 0] * $xmax}] | |
| 6380 | if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return | |
| c8dfbcf9 | 6381 | } |
| 98f350e5 | 6382 | unmarkmatches |
| d698206c | 6383 | selectline $l 1 |
| 5ad588de PM |
6384 | } |
| 6385 | ||
| b1ba39e7 LT |
6386 | proc commit_descriptor {p} { |
| 6387 | global commitinfo | |
| b0934489 PM |
6388 | if {![info exists commitinfo($p)]} { |
| 6389 | getcommit $p | |
| 6390 | } | |
| b1ba39e7 | 6391 | set l "..." |
| b0934489 | 6392 | if {[llength $commitinfo($p)] > 1} { |
| b1ba39e7 LT |
6393 | set l [lindex $commitinfo($p) 0] |
| 6394 | } | |
| b8ab2e17 | 6395 | return "$p ($l)\n" |
| b1ba39e7 LT |
6396 | } |
| 6397 | ||
| 106288cb PM |
6398 | # append some text to the ctext widget, and make any SHA1 ID |
| 6399 | # that we know about be a clickable link. | |
| f1b86294 | 6400 | proc appendwithlinks {text tags} { |
| d375ef9b | 6401 | global ctext linknum curview |
| 106288cb PM |
6402 | |
| 6403 | set start [$ctext index "end - 1c"] | |
| f1b86294 | 6404 | $ctext insert end $text $tags |
| d375ef9b | 6405 | set links [regexp -indices -all -inline {\m[0-9a-f]{6,40}\M} $text] |
| 106288cb PM |
6406 | foreach l $links { |
| 6407 | set s [lindex $l 0] | |
| 6408 | set e [lindex $l 1] | |
| 6409 | set linkid [string range $text $s $e] | |
| 106288cb | 6410 | incr e |
| c73adce2 | 6411 | $ctext tag delete link$linknum |
| 106288cb | 6412 | $ctext tag add link$linknum "$start + $s c" "$start + $e c" |
| 97645683 | 6413 | setlink $linkid link$linknum |
| 106288cb PM |
6414 | incr linknum |
| 6415 | } | |
| 97645683 PM |
6416 | } |
| 6417 | ||
| 6418 | proc setlink {id lk} { | |
| d375ef9b | 6419 | global curview ctext pendinglinks |
| 97645683 | 6420 | |
| d375ef9b PM |
6421 | set known 0 |
| 6422 | if {[string length $id] < 40} { | |
| 6423 | set matches [longid $id] | |
| 6424 | if {[llength $matches] > 0} { | |
| 6425 | if {[llength $matches] > 1} return | |
| 6426 | set known 1 | |
| 6427 | set id [lindex $matches 0] | |
| 6428 | } | |
| 6429 | } else { | |
| 6430 | set known [commitinview $id $curview] | |
| 6431 | } | |
| 6432 | if {$known} { | |
| 97645683 | 6433 | $ctext tag conf $lk -foreground blue -underline 1 |
| d375ef9b | 6434 | $ctext tag bind $lk <1> [list selbyid $id] |
| 97645683 PM |
6435 | $ctext tag bind $lk <Enter> {linkcursor %W 1} |
| 6436 | $ctext tag bind $lk <Leave> {linkcursor %W -1} | |
| 6437 | } else { | |
| 6438 | lappend pendinglinks($id) $lk | |
| d375ef9b | 6439 | interestedin $id {makelink %P} |
| 97645683 PM |
6440 | } |
| 6441 | } | |
| 6442 | ||
| 6443 | proc makelink {id} { | |
| 6444 | global pendinglinks | |
| 6445 | ||
| 6446 | if {![info exists pendinglinks($id)]} return | |
| 6447 | foreach lk $pendinglinks($id) { | |
| 6448 | setlink $id $lk | |
| 6449 | } | |
| 6450 | unset pendinglinks($id) | |
| 6451 | } | |
| 6452 | ||
| 6453 | proc linkcursor {w inc} { | |
| 6454 | global linkentercount curtextcursor | |
| 6455 | ||
| 6456 | if {[incr linkentercount $inc] > 0} { | |
| 6457 | $w configure -cursor hand2 | |
| 6458 | } else { | |
| 6459 | $w configure -cursor $curtextcursor | |
| 6460 | if {$linkentercount < 0} { | |
| 6461 | set linkentercount 0 | |
| 6462 | } | |
| 6463 | } | |
| 106288cb PM |
6464 | } |
| 6465 | ||
| 6e5f7203 RN |
6466 | proc viewnextline {dir} { |
| 6467 | global canv linespc | |
| 6468 | ||
| 6469 | $canv delete hover | |
| 6470 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 6471 | set wnow [$canv yview] | |
| 6472 | set wtop [expr {[lindex $wnow 0] * $ymax}] | |
| 6473 | set newtop [expr {$wtop + $dir * $linespc}] | |
| 6474 | if {$newtop < 0} { | |
| 6475 | set newtop 0 | |
| 6476 | } elseif {$newtop > $ymax} { | |
| 6477 | set newtop $ymax | |
| 6478 | } | |
| 6479 | allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}] | |
| 6480 | } | |
| 6481 | ||
| ef030b85 PM |
6482 | # add a list of tag or branch names at position pos |
| 6483 | # returns the number of names inserted | |
| e11f1233 | 6484 | proc appendrefs {pos ids var} { |
| 7fcc92bf | 6485 | global ctext linknum curview $var maxrefs |
| b8ab2e17 | 6486 | |
| ef030b85 PM |
6487 | if {[catch {$ctext index $pos}]} { |
| 6488 | return 0 | |
| 6489 | } | |
| e11f1233 PM |
6490 | $ctext conf -state normal |
| 6491 | $ctext delete $pos "$pos lineend" | |
| 6492 | set tags {} | |
| 6493 | foreach id $ids { | |
| 6494 | foreach tag [set $var\($id\)] { | |
| 6495 | lappend tags [list $tag $id] | |
| 6496 | } | |
| 6497 | } | |
| 0a4dd8b8 PM |
6498 | if {[llength $tags] > $maxrefs} { |
| 6499 | $ctext insert $pos "many ([llength $tags])" | |
| 6500 | } else { | |
| 6501 | set tags [lsort -index 0 -decreasing $tags] | |
| 6502 | set sep {} | |
| 6503 | foreach ti $tags { | |
| 6504 | set id [lindex $ti 1] | |
| 6505 | set lk link$linknum | |
| 6506 | incr linknum | |
| 6507 | $ctext tag delete $lk | |
| 6508 | $ctext insert $pos $sep | |
| 6509 | $ctext insert $pos [lindex $ti 0] $lk | |
| 97645683 | 6510 | setlink $id $lk |
| 0a4dd8b8 | 6511 | set sep ", " |
| b8ab2e17 | 6512 | } |
| b8ab2e17 | 6513 | } |
| e11f1233 | 6514 | $ctext conf -state disabled |
| ef030b85 | 6515 | return [llength $tags] |
| b8ab2e17 PM |
6516 | } |
| 6517 | ||
| e11f1233 PM |
6518 | # called when we have finished computing the nearby tags |
| 6519 | proc dispneartags {delay} { | |
| 6520 | global selectedline currentid showneartags tagphase | |
| ca6d8f58 | 6521 | |
| 94b4a69f | 6522 | if {$selectedline eq {} || !$showneartags} return |
| e11f1233 PM |
6523 | after cancel dispnexttag |
| 6524 | if {$delay} { | |
| 6525 | after 200 dispnexttag | |
| 6526 | set tagphase -1 | |
| 6527 | } else { | |
| 6528 | after idle dispnexttag | |
| 6529 | set tagphase 0 | |
| ca6d8f58 | 6530 | } |
| ca6d8f58 PM |
6531 | } |
| 6532 | ||
| e11f1233 PM |
6533 | proc dispnexttag {} { |
| 6534 | global selectedline currentid showneartags tagphase ctext | |
| b8ab2e17 | 6535 | |
| 94b4a69f | 6536 | if {$selectedline eq {} || !$showneartags} return |
| e11f1233 PM |
6537 | switch -- $tagphase { |
| 6538 | 0 { | |
| 6539 | set dtags [desctags $currentid] | |
| 6540 | if {$dtags ne {}} { | |
| 6541 | appendrefs precedes $dtags idtags | |
| 6542 | } | |
| 6543 | } | |
| 6544 | 1 { | |
| 6545 | set atags [anctags $currentid] | |
| 6546 | if {$atags ne {}} { | |
| 6547 | appendrefs follows $atags idtags | |
| 6548 | } | |
| 6549 | } | |
| 6550 | 2 { | |
| 6551 | set dheads [descheads $currentid] | |
| 6552 | if {$dheads ne {}} { | |
| 6553 | if {[appendrefs branch $dheads idheads] > 1 | |
| 6554 | && [$ctext get "branch -3c"] eq "h"} { | |
| 6555 | # turn "Branch" into "Branches" | |
| 6556 | $ctext conf -state normal | |
| 6557 | $ctext insert "branch -2c" "es" | |
| 6558 | $ctext conf -state disabled | |
| 6559 | } | |
| 6560 | } | |
| ef030b85 PM |
6561 | } |
| 6562 | } | |
| e11f1233 PM |
6563 | if {[incr tagphase] <= 2} { |
| 6564 | after idle dispnexttag | |
| b8ab2e17 | 6565 | } |
| b8ab2e17 PM |
6566 | } |
| 6567 | ||
| 28593d3f | 6568 | proc make_secsel {id} { |
| 0380081c PM |
6569 | global linehtag linentag linedtag canv canv2 canv3 |
| 6570 | ||
| 28593d3f | 6571 | if {![info exists linehtag($id)]} return |
| 0380081c | 6572 | $canv delete secsel |
| 28593d3f | 6573 | set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \ |
| 0380081c PM |
6574 | -tags secsel -fill [$canv cget -selectbackground]] |
| 6575 | $canv lower $t | |
| 6576 | $canv2 delete secsel | |
| 28593d3f | 6577 | set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \ |
| 0380081c PM |
6578 | -tags secsel -fill [$canv2 cget -selectbackground]] |
| 6579 | $canv2 lower $t | |
| 6580 | $canv3 delete secsel | |
| 28593d3f | 6581 | set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \ |
| 0380081c PM |
6582 | -tags secsel -fill [$canv3 cget -selectbackground]] |
| 6583 | $canv3 lower $t | |
| 6584 | } | |
| 6585 | ||
| 8a897742 | 6586 | proc selectline {l isnew {desired_loc {}}} { |
| 0380081c | 6587 | global canv ctext commitinfo selectedline |
| 7fcc92bf | 6588 | global canvy0 linespc parents children curview |
| 7fcceed7 | 6589 | global currentid sha1entry |
| 9f1afe05 | 6590 | global commentend idtags linknum |
| d94f8cd6 | 6591 | global mergemax numcommits pending_select |
| e11f1233 | 6592 | global cmitmode showneartags allcommits |
| c30acc77 | 6593 | global targetrow targetid lastscrollrows |
| 8a897742 | 6594 | global autoselect jump_to_here |
| d698206c | 6595 | |
| d94f8cd6 | 6596 | catch {unset pending_select} |
| 84ba7345 | 6597 | $canv delete hover |
| 9843c307 | 6598 | normalline |
| 887c996e | 6599 | unsel_reflist |
| bb3edc8b | 6600 | stopfinding |
| 8f7d0cec | 6601 | if {$l < 0 || $l >= $numcommits} return |
| ac1276ab PM |
6602 | set id [commitonrow $l] |
| 6603 | set targetid $id | |
| 6604 | set targetrow $l | |
| c30acc77 PM |
6605 | set selectedline $l |
| 6606 | set currentid $id | |
| 6607 | if {$lastscrollrows < $numcommits} { | |
| 6608 | setcanvscroll | |
| 6609 | } | |
| ac1276ab | 6610 | |
| 5ad588de | 6611 | set y [expr {$canvy0 + $l * $linespc}] |
| 17386066 | 6612 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 5842215e PM |
6613 | set ytop [expr {$y - $linespc - 1}] |
| 6614 | set ybot [expr {$y + $linespc + 1}] | |
| 5ad588de | 6615 | set wnow [$canv yview] |
| 2ed49d54 JH |
6616 | set wtop [expr {[lindex $wnow 0] * $ymax}] |
| 6617 | set wbot [expr {[lindex $wnow 1] * $ymax}] | |
| 5842215e PM |
6618 | set wh [expr {$wbot - $wtop}] |
| 6619 | set newtop $wtop | |
| 17386066 | 6620 | if {$ytop < $wtop} { |
| 5842215e PM |
6621 | if {$ybot < $wtop} { |
| 6622 | set newtop [expr {$y - $wh / 2.0}] | |
| 6623 | } else { | |
| 6624 | set newtop $ytop | |
| 6625 | if {$newtop > $wtop - $linespc} { | |
| 6626 | set newtop [expr {$wtop - $linespc}] | |
| 6627 | } | |
| 17386066 | 6628 | } |
| 5842215e PM |
6629 | } elseif {$ybot > $wbot} { |
| 6630 | if {$ytop > $wbot} { | |
| 6631 | set newtop [expr {$y - $wh / 2.0}] | |
| 6632 | } else { | |
| 6633 | set newtop [expr {$ybot - $wh}] | |
| 6634 | if {$newtop < $wtop + $linespc} { | |
| 6635 | set newtop [expr {$wtop + $linespc}] | |
| 6636 | } | |
| 17386066 | 6637 | } |
| 5842215e PM |
6638 | } |
| 6639 | if {$newtop != $wtop} { | |
| 6640 | if {$newtop < 0} { | |
| 6641 | set newtop 0 | |
| 6642 | } | |
| 2ed49d54 | 6643 | allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}] |
| 9f1afe05 | 6644 | drawvisible |
| 5ad588de | 6645 | } |
| d698206c | 6646 | |
| 28593d3f | 6647 | make_secsel $id |
| 9f1afe05 | 6648 | |
| fa4da7b3 | 6649 | if {$isnew} { |
| fc2a256f | 6650 | addtohistory [list selbyid $id] |
| d698206c PM |
6651 | } |
| 6652 | ||
| 98f350e5 PM |
6653 | $sha1entry delete 0 end |
| 6654 | $sha1entry insert 0 $id | |
| 95293b58 JK |
6655 | if {$autoselect} { |
| 6656 | $sha1entry selection from 0 | |
| 6657 | $sha1entry selection to end | |
| 6658 | } | |
| 164ff275 | 6659 | rhighlight_sel $id |
| 98f350e5 | 6660 | |
| 5ad588de | 6661 | $ctext conf -state normal |
| 3ea06f9f | 6662 | clear_ctext |
| 106288cb | 6663 | set linknum 0 |
| d76afb15 PM |
6664 | if {![info exists commitinfo($id)]} { |
| 6665 | getcommit $id | |
| 6666 | } | |
| 1db95b00 | 6667 | set info $commitinfo($id) |
| 232475d3 | 6668 | set date [formatdate [lindex $info 2]] |
| d990cedf | 6669 | $ctext insert end "[mc "Author"]: [lindex $info 1] $date\n" |
| 232475d3 | 6670 | set date [formatdate [lindex $info 4]] |
| d990cedf | 6671 | $ctext insert end "[mc "Committer"]: [lindex $info 3] $date\n" |
| 887fe3c4 | 6672 | if {[info exists idtags($id)]} { |
| d990cedf | 6673 | $ctext insert end [mc "Tags:"] |
| 887fe3c4 PM |
6674 | foreach tag $idtags($id) { |
| 6675 | $ctext insert end " $tag" | |
| 6676 | } | |
| 6677 | $ctext insert end "\n" | |
| 6678 | } | |
| 40b87ff8 | 6679 | |
| f1b86294 | 6680 | set headers {} |
| 7fcc92bf | 6681 | set olds $parents($curview,$id) |
| 79b2c75e | 6682 | if {[llength $olds] > 1} { |
| b77b0278 | 6683 | set np 0 |
| 79b2c75e | 6684 | foreach p $olds { |
| b77b0278 PM |
6685 | if {$np >= $mergemax} { |
| 6686 | set tag mmax | |
| 6687 | } else { | |
| 6688 | set tag m$np | |
| 6689 | } | |
| d990cedf | 6690 | $ctext insert end "[mc "Parent"]: " $tag |
| f1b86294 | 6691 | appendwithlinks [commit_descriptor $p] {} |
| b77b0278 PM |
6692 | incr np |
| 6693 | } | |
| 6694 | } else { | |
| 79b2c75e | 6695 | foreach p $olds { |
| d990cedf | 6696 | append headers "[mc "Parent"]: [commit_descriptor $p]" |
| b1ba39e7 LT |
6697 | } |
| 6698 | } | |
| b77b0278 | 6699 | |
| 6a90bff1 | 6700 | foreach c $children($curview,$id) { |
| d990cedf | 6701 | append headers "[mc "Child"]: [commit_descriptor $c]" |
| 8b192809 | 6702 | } |
| d698206c PM |
6703 | |
| 6704 | # make anything that looks like a SHA1 ID be a clickable link | |
| f1b86294 | 6705 | appendwithlinks $headers {} |
| b8ab2e17 PM |
6706 | if {$showneartags} { |
| 6707 | if {![info exists allcommits]} { | |
| 6708 | getallcommits | |
| 6709 | } | |
| d990cedf | 6710 | $ctext insert end "[mc "Branch"]: " |
| ef030b85 PM |
6711 | $ctext mark set branch "end -1c" |
| 6712 | $ctext mark gravity branch left | |
| d990cedf | 6713 | $ctext insert end "\n[mc "Follows"]: " |
| b8ab2e17 PM |
6714 | $ctext mark set follows "end -1c" |
| 6715 | $ctext mark gravity follows left | |
| d990cedf | 6716 | $ctext insert end "\n[mc "Precedes"]: " |
| b8ab2e17 PM |
6717 | $ctext mark set precedes "end -1c" |
| 6718 | $ctext mark gravity precedes left | |
| b8ab2e17 | 6719 | $ctext insert end "\n" |
| e11f1233 | 6720 | dispneartags 1 |
| b8ab2e17 PM |
6721 | } |
| 6722 | $ctext insert end "\n" | |
| 43c25074 PM |
6723 | set comment [lindex $info 5] |
| 6724 | if {[string first "\r" $comment] >= 0} { | |
| 6725 | set comment [string map {"\r" "\n "} $comment] | |
| 6726 | } | |
| 6727 | appendwithlinks $comment {comment} | |
| d698206c | 6728 | |
| df3d83b1 | 6729 | $ctext tag remove found 1.0 end |
| 5ad588de | 6730 | $ctext conf -state disabled |
| df3d83b1 | 6731 | set commentend [$ctext index "end - 1c"] |
| 5ad588de | 6732 | |
| 8a897742 | 6733 | set jump_to_here $desired_loc |
| b007ee20 | 6734 | init_flist [mc "Comments"] |
| f8b28a40 PM |
6735 | if {$cmitmode eq "tree"} { |
| 6736 | gettree $id | |
| 6737 | } elseif {[llength $olds] <= 1} { | |
| d327244a | 6738 | startdiff $id |
| 7b5ff7e7 | 6739 | } else { |
| 7fcc92bf | 6740 | mergediff $id |
| 3c461ffe PM |
6741 | } |
| 6742 | } | |
| 6743 | ||
| 6e5f7203 RN |
6744 | proc selfirstline {} { |
| 6745 | unmarkmatches | |
| 6746 | selectline 0 1 | |
| 6747 | } | |
| 6748 | ||
| 6749 | proc sellastline {} { | |
| 6750 | global numcommits | |
| 6751 | unmarkmatches | |
| 6752 | set l [expr {$numcommits - 1}] | |
| 6753 | selectline $l 1 | |
| 6754 | } | |
| 6755 | ||
| 3c461ffe PM |
6756 | proc selnextline {dir} { |
| 6757 | global selectedline | |
| bd441de4 | 6758 | focus . |
| 94b4a69f | 6759 | if {$selectedline eq {}} return |
| 2ed49d54 | 6760 | set l [expr {$selectedline + $dir}] |
| 3c461ffe | 6761 | unmarkmatches |
| d698206c PM |
6762 | selectline $l 1 |
| 6763 | } | |
| 6764 | ||
| 6e5f7203 RN |
6765 | proc selnextpage {dir} { |
| 6766 | global canv linespc selectedline numcommits | |
| 6767 | ||
| 6768 | set lpp [expr {([winfo height $canv] - 2) / $linespc}] | |
| 6769 | if {$lpp < 1} { | |
| 6770 | set lpp 1 | |
| 6771 | } | |
| 6772 | allcanvs yview scroll [expr {$dir * $lpp}] units | |
| e72ee5eb | 6773 | drawvisible |
| 94b4a69f | 6774 | if {$selectedline eq {}} return |
| 6e5f7203 RN |
6775 | set l [expr {$selectedline + $dir * $lpp}] |
| 6776 | if {$l < 0} { | |
| 6777 | set l 0 | |
| 6778 | } elseif {$l >= $numcommits} { | |
| 6779 | set l [expr $numcommits - 1] | |
| 6780 | } | |
| 6781 | unmarkmatches | |
| 40b87ff8 | 6782 | selectline $l 1 |
| 6e5f7203 RN |
6783 | } |
| 6784 | ||
| fa4da7b3 | 6785 | proc unselectline {} { |
| 50b44ece | 6786 | global selectedline currentid |
| fa4da7b3 | 6787 | |
| 94b4a69f | 6788 | set selectedline {} |
| 50b44ece | 6789 | catch {unset currentid} |
| fa4da7b3 | 6790 | allcanvs delete secsel |
| 164ff275 | 6791 | rhighlight_none |
| fa4da7b3 PM |
6792 | } |
| 6793 | ||
| f8b28a40 PM |
6794 | proc reselectline {} { |
| 6795 | global selectedline | |
| 6796 | ||
| 94b4a69f | 6797 | if {$selectedline ne {}} { |
| f8b28a40 PM |
6798 | selectline $selectedline 0 |
| 6799 | } | |
| 6800 | } | |
| 6801 | ||
| fa4da7b3 | 6802 | proc addtohistory {cmd} { |
| 2516dae2 | 6803 | global history historyindex curview |
| fa4da7b3 | 6804 | |
| 2516dae2 | 6805 | set elt [list $curview $cmd] |
| fa4da7b3 | 6806 | if {$historyindex > 0 |
| 2516dae2 | 6807 | && [lindex $history [expr {$historyindex - 1}]] == $elt} { |
| fa4da7b3 PM |
6808 | return |
| 6809 | } | |
| 6810 | ||
| 6811 | if {$historyindex < [llength $history]} { | |
| 2516dae2 | 6812 | set history [lreplace $history $historyindex end $elt] |
| fa4da7b3 | 6813 | } else { |
| 2516dae2 | 6814 | lappend history $elt |
| fa4da7b3 PM |
6815 | } |
| 6816 | incr historyindex | |
| 6817 | if {$historyindex > 1} { | |
| e9937d2a | 6818 | .tf.bar.leftbut conf -state normal |
| fa4da7b3 | 6819 | } else { |
| e9937d2a | 6820 | .tf.bar.leftbut conf -state disabled |
| fa4da7b3 | 6821 | } |
| e9937d2a | 6822 | .tf.bar.rightbut conf -state disabled |
| fa4da7b3 PM |
6823 | } |
| 6824 | ||
| 2516dae2 PM |
6825 | proc godo {elt} { |
| 6826 | global curview | |
| 6827 | ||
| 6828 | set view [lindex $elt 0] | |
| 6829 | set cmd [lindex $elt 1] | |
| 6830 | if {$curview != $view} { | |
| 6831 | showview $view | |
| 6832 | } | |
| 6833 | eval $cmd | |
| 6834 | } | |
| 6835 | ||
| d698206c PM |
6836 | proc goback {} { |
| 6837 | global history historyindex | |
| bd441de4 | 6838 | focus . |
| d698206c PM |
6839 | |
| 6840 | if {$historyindex > 1} { | |
| 6841 | incr historyindex -1 | |
| 2516dae2 | 6842 | godo [lindex $history [expr {$historyindex - 1}]] |
| e9937d2a | 6843 | .tf.bar.rightbut conf -state normal |
| d698206c PM |
6844 | } |
| 6845 | if {$historyindex <= 1} { | |
| e9937d2a | 6846 | .tf.bar.leftbut conf -state disabled |
| d698206c PM |
6847 | } |
| 6848 | } | |
| 6849 | ||
| 6850 | proc goforw {} { | |
| 6851 | global history historyindex | |
| bd441de4 | 6852 | focus . |
| d698206c PM |
6853 | |
| 6854 | if {$historyindex < [llength $history]} { | |
| fa4da7b3 | 6855 | set cmd [lindex $history $historyindex] |
| d698206c | 6856 | incr historyindex |
| 2516dae2 | 6857 | godo $cmd |
| e9937d2a | 6858 | .tf.bar.leftbut conf -state normal |
| d698206c PM |
6859 | } |
| 6860 | if {$historyindex >= [llength $history]} { | |
| e9937d2a | 6861 | .tf.bar.rightbut conf -state disabled |
| d698206c | 6862 | } |
| e2ed4324 PM |
6863 | } |
| 6864 | ||
| f8b28a40 | 6865 | proc gettree {id} { |
| 8f489363 PM |
6866 | global treefilelist treeidlist diffids diffmergeid treepending |
| 6867 | global nullid nullid2 | |
| f8b28a40 PM |
6868 | |
| 6869 | set diffids $id | |
| 6870 | catch {unset diffmergeid} | |
| 6871 | if {![info exists treefilelist($id)]} { | |
| 6872 | if {![info exists treepending]} { | |
| 8f489363 PM |
6873 | if {$id eq $nullid} { |
| 6874 | set cmd [list | git ls-files] | |
| 6875 | } elseif {$id eq $nullid2} { | |
| 6876 | set cmd [list | git ls-files --stage -t] | |
| 219ea3a9 | 6877 | } else { |
| 8f489363 | 6878 | set cmd [list | git ls-tree -r $id] |
| 219ea3a9 PM |
6879 | } |
| 6880 | if {[catch {set gtf [open $cmd r]}]} { | |
| f8b28a40 PM |
6881 | return |
| 6882 | } | |
| 6883 | set treepending $id | |
| 6884 | set treefilelist($id) {} | |
| 6885 | set treeidlist($id) {} | |
| 09c7029d | 6886 | fconfigure $gtf -blocking 0 -encoding binary |
| 7eb3cb9c | 6887 | filerun $gtf [list gettreeline $gtf $id] |
| f8b28a40 PM |
6888 | } |
| 6889 | } else { | |
| 6890 | setfilelist $id | |
| 6891 | } | |
| 6892 | } | |
| 6893 | ||
| 6894 | proc gettreeline {gtf id} { | |
| 8f489363 | 6895 | global treefilelist treeidlist treepending cmitmode diffids nullid nullid2 |
| f8b28a40 | 6896 | |
| 7eb3cb9c PM |
6897 | set nl 0 |
| 6898 | while {[incr nl] <= 1000 && [gets $gtf line] >= 0} { | |
| 8f489363 PM |
6899 | if {$diffids eq $nullid} { |
| 6900 | set fname $line | |
| 6901 | } else { | |
| 9396cd38 PM |
6902 | set i [string first "\t" $line] |
| 6903 | if {$i < 0} continue | |
| 9396cd38 | 6904 | set fname [string range $line [expr {$i+1}] end] |
| f31fa2c0 PM |
6905 | set line [string range $line 0 [expr {$i-1}]] |
| 6906 | if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue | |
| 6907 | set sha1 [lindex $line 2] | |
| 219ea3a9 | 6908 | lappend treeidlist($id) $sha1 |
| 219ea3a9 | 6909 | } |
| 09c7029d AG |
6910 | if {[string index $fname 0] eq "\""} { |
| 6911 | set fname [lindex $fname 0] | |
| 6912 | } | |
| 6913 | set fname [encoding convertfrom $fname] | |
| 7eb3cb9c PM |
6914 | lappend treefilelist($id) $fname |
| 6915 | } | |
| 6916 | if {![eof $gtf]} { | |
| 6917 | return [expr {$nl >= 1000? 2: 1}] | |
| f8b28a40 | 6918 | } |
| f8b28a40 PM |
6919 | close $gtf |
| 6920 | unset treepending | |
| 6921 | if {$cmitmode ne "tree"} { | |
| 6922 | if {![info exists diffmergeid]} { | |
| 6923 | gettreediffs $diffids | |
| 6924 | } | |
| 6925 | } elseif {$id ne $diffids} { | |
| 6926 | gettree $diffids | |
| 6927 | } else { | |
| 6928 | setfilelist $id | |
| 6929 | } | |
| 7eb3cb9c | 6930 | return 0 |
| f8b28a40 PM |
6931 | } |
| 6932 | ||
| 6933 | proc showfile {f} { | |
| 8f489363 | 6934 | global treefilelist treeidlist diffids nullid nullid2 |
| 7cdc3556 | 6935 | global ctext_file_names ctext_file_lines |
| f8b28a40 PM |
6936 | global ctext commentend |
| 6937 | ||
| 6938 | set i [lsearch -exact $treefilelist($diffids) $f] | |
| 6939 | if {$i < 0} { | |
| 6940 | puts "oops, $f not in list for id $diffids" | |
| 6941 | return | |
| 6942 | } | |
| 8f489363 PM |
6943 | if {$diffids eq $nullid} { |
| 6944 | if {[catch {set bf [open $f r]} err]} { | |
| 6945 | puts "oops, can't read $f: $err" | |
| 219ea3a9 PM |
6946 | return |
| 6947 | } | |
| 6948 | } else { | |
| 8f489363 PM |
6949 | set blob [lindex $treeidlist($diffids) $i] |
| 6950 | if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} { | |
| 6951 | puts "oops, error reading blob $blob: $err" | |
| 219ea3a9 PM |
6952 | return |
| 6953 | } | |
| f8b28a40 | 6954 | } |
| 09c7029d | 6955 | fconfigure $bf -blocking 0 -encoding [get_path_encoding $f] |
| 7eb3cb9c | 6956 | filerun $bf [list getblobline $bf $diffids] |
| f8b28a40 | 6957 | $ctext config -state normal |
| 3ea06f9f | 6958 | clear_ctext $commentend |
| 7cdc3556 AG |
6959 | lappend ctext_file_names $f |
| 6960 | lappend ctext_file_lines [lindex [split $commentend "."] 0] | |
| f8b28a40 PM |
6961 | $ctext insert end "\n" |
| 6962 | $ctext insert end "$f\n" filesep | |
| 6963 | $ctext config -state disabled | |
| 6964 | $ctext yview $commentend | |
| 32f1b3e4 | 6965 | settabs 0 |
| f8b28a40 PM |
6966 | } |
| 6967 | ||
| 6968 | proc getblobline {bf id} { | |
| 6969 | global diffids cmitmode ctext | |
| 6970 | ||
| 6971 | if {$id ne $diffids || $cmitmode ne "tree"} { | |
| 6972 | catch {close $bf} | |
| 7eb3cb9c | 6973 | return 0 |
| f8b28a40 PM |
6974 | } |
| 6975 | $ctext config -state normal | |
| 7eb3cb9c PM |
6976 | set nl 0 |
| 6977 | while {[incr nl] <= 1000 && [gets $bf line] >= 0} { | |
| f8b28a40 PM |
6978 | $ctext insert end "$line\n" |
| 6979 | } | |
| 6980 | if {[eof $bf]} { | |
| 8a897742 PM |
6981 | global jump_to_here ctext_file_names commentend |
| 6982 | ||
| f8b28a40 PM |
6983 | # delete last newline |
| 6984 | $ctext delete "end - 2c" "end - 1c" | |
| 6985 | close $bf | |
| 8a897742 PM |
6986 | if {$jump_to_here ne {} && |
| 6987 | [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} { | |
| 6988 | set lnum [expr {[lindex $jump_to_here 1] + | |
| 6989 | [lindex [split $commentend .] 0]}] | |
| 6990 | mark_ctext_line $lnum | |
| 6991 | } | |
| 7eb3cb9c | 6992 | return 0 |
| f8b28a40 PM |
6993 | } |
| 6994 | $ctext config -state disabled | |
| 7eb3cb9c | 6995 | return [expr {$nl >= 1000? 2: 1}] |
| f8b28a40 PM |
6996 | } |
| 6997 | ||
| 8a897742 | 6998 | proc mark_ctext_line {lnum} { |
| e3e901be | 6999 | global ctext markbgcolor |
| 8a897742 PM |
7000 | |
| 7001 | $ctext tag delete omark | |
| 7002 | $ctext tag add omark $lnum.0 "$lnum.0 + 1 line" | |
| e3e901be | 7003 | $ctext tag conf omark -background $markbgcolor |
| 8a897742 PM |
7004 | $ctext see $lnum.0 |
| 7005 | } | |
| 7006 | ||
| 7fcc92bf | 7007 | proc mergediff {id} { |
| 8b07dca1 | 7008 | global diffmergeid |
| 2df6442f | 7009 | global diffids treediffs |
| 8b07dca1 | 7010 | global parents curview |
| e2ed4324 | 7011 | |
| 3c461ffe | 7012 | set diffmergeid $id |
| 7a1d9d14 | 7013 | set diffids $id |
| 2df6442f | 7014 | set treediffs($id) {} |
| 7fcc92bf | 7015 | set np [llength $parents($curview,$id)] |
| 32f1b3e4 | 7016 | settabs $np |
| 8b07dca1 | 7017 | getblobdiffs $id |
| c8a4acbf PM |
7018 | } |
| 7019 | ||
| 3c461ffe | 7020 | proc startdiff {ids} { |
| 8f489363 | 7021 | global treediffs diffids treepending diffmergeid nullid nullid2 |
| c8dfbcf9 | 7022 | |
| 32f1b3e4 | 7023 | settabs 1 |
| 4f2c2642 | 7024 | set diffids $ids |
| 3c461ffe | 7025 | catch {unset diffmergeid} |
| 8f489363 PM |
7026 | if {![info exists treediffs($ids)] || |
| 7027 | [lsearch -exact $ids $nullid] >= 0 || | |
| 7028 | [lsearch -exact $ids $nullid2] >= 0} { | |
| c8dfbcf9 | 7029 | if {![info exists treepending]} { |
| 14c9dbd6 | 7030 | gettreediffs $ids |
| c8dfbcf9 PM |
7031 | } |
| 7032 | } else { | |
| 14c9dbd6 | 7033 | addtocflist $ids |
| c8dfbcf9 PM |
7034 | } |
| 7035 | } | |
| 7036 | ||
| 7a39a17a PM |
7037 | proc path_filter {filter name} { |
| 7038 | foreach p $filter { | |
| 7039 | set l [string length $p] | |
| 74a40c71 PM |
7040 | if {[string index $p end] eq "/"} { |
| 7041 | if {[string compare -length $l $p $name] == 0} { | |
| 7042 | return 1 | |
| 7043 | } | |
| 7044 | } else { | |
| 7045 | if {[string compare -length $l $p $name] == 0 && | |
| 7046 | ([string length $name] == $l || | |
| 7047 | [string index $name $l] eq "/")} { | |
| 7048 | return 1 | |
| 7049 | } | |
| 7a39a17a PM |
7050 | } |
| 7051 | } | |
| 7052 | return 0 | |
| 7053 | } | |
| 7054 | ||
| c8dfbcf9 | 7055 | proc addtocflist {ids} { |
| 74a40c71 | 7056 | global treediffs |
| 7a39a17a | 7057 | |
| 74a40c71 | 7058 | add_flist $treediffs($ids) |
| c8dfbcf9 | 7059 | getblobdiffs $ids |
| d2610d11 PM |
7060 | } |
| 7061 | ||
| 219ea3a9 | 7062 | proc diffcmd {ids flags} { |
| 8f489363 | 7063 | global nullid nullid2 |
| 219ea3a9 PM |
7064 | |
| 7065 | set i [lsearch -exact $ids $nullid] | |
| 8f489363 | 7066 | set j [lsearch -exact $ids $nullid2] |
| 219ea3a9 | 7067 | if {$i >= 0} { |
| 8f489363 PM |
7068 | if {[llength $ids] > 1 && $j < 0} { |
| 7069 | # comparing working directory with some specific revision | |
| 7070 | set cmd [concat | git diff-index $flags] | |
| 7071 | if {$i == 0} { | |
| 7072 | lappend cmd -R [lindex $ids 1] | |
| 7073 | } else { | |
| 7074 | lappend cmd [lindex $ids 0] | |
| 7075 | } | |
| 7076 | } else { | |
| 7077 | # comparing working directory with index | |
| 7078 | set cmd [concat | git diff-files $flags] | |
| 7079 | if {$j == 1} { | |
| 7080 | lappend cmd -R | |
| 7081 | } | |
| 7082 | } | |
| 7083 | } elseif {$j >= 0} { | |
| 7084 | set cmd [concat | git diff-index --cached $flags] | |
| 219ea3a9 | 7085 | if {[llength $ids] > 1} { |
| 8f489363 | 7086 | # comparing index with specific revision |
| 219ea3a9 PM |
7087 | if {$i == 0} { |
| 7088 | lappend cmd -R [lindex $ids 1] | |
| 7089 | } else { | |
| 7090 | lappend cmd [lindex $ids 0] | |
| 7091 | } | |
| 7092 | } else { | |
| 8f489363 | 7093 | # comparing index with HEAD |
| 219ea3a9 PM |
7094 | lappend cmd HEAD |
| 7095 | } | |
| 7096 | } else { | |
| 8f489363 | 7097 | set cmd [concat | git diff-tree -r $flags $ids] |
| 219ea3a9 PM |
7098 | } |
| 7099 | return $cmd | |
| 7100 | } | |
| 7101 | ||
| c8dfbcf9 | 7102 | proc gettreediffs {ids} { |
| 79b2c75e | 7103 | global treediff treepending |
| 219ea3a9 | 7104 | |
| 7272131b AG |
7105 | if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return |
| 7106 | ||
| c8dfbcf9 | 7107 | set treepending $ids |
| 3c461ffe | 7108 | set treediff {} |
| 09c7029d | 7109 | fconfigure $gdtf -blocking 0 -encoding binary |
| 7eb3cb9c | 7110 | filerun $gdtf [list gettreediffline $gdtf $ids] |
| d2610d11 PM |
7111 | } |
| 7112 | ||
| c8dfbcf9 | 7113 | proc gettreediffline {gdtf ids} { |
| 3c461ffe | 7114 | global treediff treediffs treepending diffids diffmergeid |
| 39ee47ef | 7115 | global cmitmode vfilelimit curview limitdiffs perfile_attrs |
| 3c461ffe | 7116 | |
| 7eb3cb9c | 7117 | set nr 0 |
| 4db09304 | 7118 | set sublist {} |
| 39ee47ef PM |
7119 | set max 1000 |
| 7120 | if {$perfile_attrs} { | |
| 7121 | # cache_gitattr is slow, and even slower on win32 where we | |
| 7122 | # have to invoke it for only about 30 paths at a time | |
| 7123 | set max 500 | |
| 7124 | if {[tk windowingsystem] == "win32"} { | |
| 7125 | set max 120 | |
| 7126 | } | |
| 7127 | } | |
| 7128 | while {[incr nr] <= $max && [gets $gdtf line] >= 0} { | |
| 9396cd38 PM |
7129 | set i [string first "\t" $line] |
| 7130 | if {$i >= 0} { | |
| 7131 | set file [string range $line [expr {$i+1}] end] | |
| 7132 | if {[string index $file 0] eq "\""} { | |
| 7133 | set file [lindex $file 0] | |
| 7134 | } | |
| 09c7029d | 7135 | set file [encoding convertfrom $file] |
| 48a81b7c PM |
7136 | if {$file ne [lindex $treediff end]} { |
| 7137 | lappend treediff $file | |
| 7138 | lappend sublist $file | |
| 7139 | } | |
| 9396cd38 | 7140 | } |
| 7eb3cb9c | 7141 | } |
| 39ee47ef PM |
7142 | if {$perfile_attrs} { |
| 7143 | cache_gitattr encoding $sublist | |
| 7144 | } | |
| 7eb3cb9c | 7145 | if {![eof $gdtf]} { |
| 39ee47ef | 7146 | return [expr {$nr >= $max? 2: 1}] |
| 7eb3cb9c PM |
7147 | } |
| 7148 | close $gdtf | |
| 3ed31a81 | 7149 | if {$limitdiffs && $vfilelimit($curview) ne {}} { |
| 74a40c71 PM |
7150 | set flist {} |
| 7151 | foreach f $treediff { | |
| 3ed31a81 | 7152 | if {[path_filter $vfilelimit($curview) $f]} { |
| 74a40c71 PM |
7153 | lappend flist $f |
| 7154 | } | |
| 7155 | } | |
| 7156 | set treediffs($ids) $flist | |
| 7157 | } else { | |
| 7158 | set treediffs($ids) $treediff | |
| 7159 | } | |
| 7eb3cb9c | 7160 | unset treepending |
| e1160138 | 7161 | if {$cmitmode eq "tree" && [llength $diffids] == 1} { |
| 7eb3cb9c PM |
7162 | gettree $diffids |
| 7163 | } elseif {$ids != $diffids} { | |
| 7164 | if {![info exists diffmergeid]} { | |
| 7165 | gettreediffs $diffids | |
| b74fd579 | 7166 | } |
| 7eb3cb9c PM |
7167 | } else { |
| 7168 | addtocflist $ids | |
| d2610d11 | 7169 | } |
| 7eb3cb9c | 7170 | return 0 |
| d2610d11 PM |
7171 | } |
| 7172 | ||
| 890fae70 SP |
7173 | # empty string or positive integer |
| 7174 | proc diffcontextvalidate {v} { | |
| 7175 | return [regexp {^(|[1-9][0-9]*)$} $v] | |
| 7176 | } | |
| 7177 | ||
| 7178 | proc diffcontextchange {n1 n2 op} { | |
| 7179 | global diffcontextstring diffcontext | |
| 7180 | ||
| 7181 | if {[string is integer -strict $diffcontextstring]} { | |
| 7182 | if {$diffcontextstring > 0} { | |
| 7183 | set diffcontext $diffcontextstring | |
| 7184 | reselectline | |
| 7185 | } | |
| 7186 | } | |
| 7187 | } | |
| 7188 | ||
| b9b86007 SP |
7189 | proc changeignorespace {} { |
| 7190 | reselectline | |
| 7191 | } | |
| 7192 | ||
| c8dfbcf9 | 7193 | proc getblobdiffs {ids} { |
| 8d73b242 | 7194 | global blobdifffd diffids env |
| 7eb3cb9c | 7195 | global diffinhdr treediffs |
| 890fae70 | 7196 | global diffcontext |
| b9b86007 | 7197 | global ignorespace |
| 3ed31a81 | 7198 | global limitdiffs vfilelimit curview |
| 8b07dca1 | 7199 | global diffencoding targetline diffnparents |
| c8dfbcf9 | 7200 | |
| 8b07dca1 | 7201 | set cmd [diffcmd $ids "-p -C --cc --no-commit-id -U$diffcontext"] |
| b9b86007 SP |
7202 | if {$ignorespace} { |
| 7203 | append cmd " -w" | |
| 7204 | } | |
| 3ed31a81 PM |
7205 | if {$limitdiffs && $vfilelimit($curview) ne {}} { |
| 7206 | set cmd [concat $cmd -- $vfilelimit($curview)] | |
| 7a39a17a PM |
7207 | } |
| 7208 | if {[catch {set bdf [open $cmd r]} err]} { | |
| 8b07dca1 | 7209 | error_popup [mc "Error getting diffs: %s" $err] |
| e5c2d856 PM |
7210 | return |
| 7211 | } | |
| 8a897742 | 7212 | set targetline {} |
| 8b07dca1 | 7213 | set diffnparents 0 |
| 4f2c2642 | 7214 | set diffinhdr 0 |
| 09c7029d AG |
7215 | set diffencoding [get_path_encoding {}] |
| 7216 | fconfigure $bdf -blocking 0 -encoding binary | |
| c8dfbcf9 | 7217 | set blobdifffd($ids) $bdf |
| 7eb3cb9c | 7218 | filerun $bdf [list getblobdiffline $bdf $diffids] |
| e5c2d856 PM |
7219 | } |
| 7220 | ||
| 89b11d3b PM |
7221 | proc setinlist {var i val} { |
| 7222 | global $var | |
| 7223 | ||
| 7224 | while {[llength [set $var]] < $i} { | |
| 7225 | lappend $var {} | |
| 7226 | } | |
| 7227 | if {[llength [set $var]] == $i} { | |
| 7228 | lappend $var $val | |
| 7229 | } else { | |
| 7230 | lset $var $i $val | |
| 7231 | } | |
| 7232 | } | |
| 7233 | ||
| 9396cd38 | 7234 | proc makediffhdr {fname ids} { |
| 8b07dca1 | 7235 | global ctext curdiffstart treediffs diffencoding |
| 8a897742 | 7236 | global ctext_file_names jump_to_here targetline diffline |
| 9396cd38 | 7237 | |
| 8b07dca1 PM |
7238 | set fname [encoding convertfrom $fname] |
| 7239 | set diffencoding [get_path_encoding $fname] | |
| 9396cd38 PM |
7240 | set i [lsearch -exact $treediffs($ids) $fname] |
| 7241 | if {$i >= 0} { | |
| 7242 | setinlist difffilestart $i $curdiffstart | |
| 7243 | } | |
| 48a81b7c | 7244 | lset ctext_file_names end $fname |
| 9396cd38 PM |
7245 | set l [expr {(78 - [string length $fname]) / 2}] |
| 7246 | set pad [string range "----------------------------------------" 1 $l] | |
| 7247 | $ctext insert $curdiffstart "$pad $fname $pad" filesep | |
| 8a897742 PM |
7248 | set targetline {} |
| 7249 | if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} { | |
| 7250 | set targetline [lindex $jump_to_here 1] | |
| 7251 | } | |
| 7252 | set diffline 0 | |
| 9396cd38 PM |
7253 | } |
| 7254 | ||
| c8dfbcf9 | 7255 | proc getblobdiffline {bdf ids} { |
| 9396cd38 | 7256 | global diffids blobdifffd ctext curdiffstart |
| 7eab2933 | 7257 | global diffnexthead diffnextnote difffilestart |
| 7cdc3556 | 7258 | global ctext_file_names ctext_file_lines |
| 8b07dca1 | 7259 | global diffinhdr treediffs mergemax diffnparents |
| 8a897742 | 7260 | global diffencoding jump_to_here targetline diffline |
| c8dfbcf9 | 7261 | |
| 7eb3cb9c | 7262 | set nr 0 |
| e5c2d856 | 7263 | $ctext conf -state normal |
| 7eb3cb9c PM |
7264 | while {[incr nr] <= 1000 && [gets $bdf line] >= 0} { |
| 7265 | if {$ids != $diffids || $bdf != $blobdifffd($ids)} { | |
| 7266 | close $bdf | |
| 7267 | return 0 | |
| 89b11d3b | 7268 | } |
| 8b07dca1 PM |
7269 | if {![string compare -length 5 "diff " $line]} { |
| 7270 | if {![regexp {^diff (--cc|--git) } $line m type]} { | |
| 7271 | set line [encoding convertfrom $line] | |
| 7272 | $ctext insert end "$line\n" hunksep | |
| 7273 | continue | |
| 7274 | } | |
| 7eb3cb9c | 7275 | # start of a new file |
| 8b07dca1 | 7276 | set diffinhdr 1 |
| 7eb3cb9c | 7277 | $ctext insert end "\n" |
| 9396cd38 | 7278 | set curdiffstart [$ctext index "end - 1c"] |
| 7cdc3556 AG |
7279 | lappend ctext_file_names "" |
| 7280 | lappend ctext_file_lines [lindex [split $curdiffstart "."] 0] | |
| 9396cd38 | 7281 | $ctext insert end "\n" filesep |
| 8b07dca1 PM |
7282 | |
| 7283 | if {$type eq "--cc"} { | |
| 7284 | # start of a new file in a merge diff | |
| 7285 | set fname [string range $line 10 end] | |
| 7286 | if {[lsearch -exact $treediffs($ids) $fname] < 0} { | |
| 7287 | lappend treediffs($ids) $fname | |
| 7288 | add_flist [list $fname] | |
| 7289 | } | |
| 7290 | ||
| 9396cd38 | 7291 | } else { |
| 8b07dca1 PM |
7292 | set line [string range $line 11 end] |
| 7293 | # If the name hasn't changed the length will be odd, | |
| 7294 | # the middle char will be a space, and the two bits either | |
| 7295 | # side will be a/name and b/name, or "a/name" and "b/name". | |
| 7296 | # If the name has changed we'll get "rename from" and | |
| 7297 | # "rename to" or "copy from" and "copy to" lines following | |
| 7298 | # this, and we'll use them to get the filenames. | |
| 7299 | # This complexity is necessary because spaces in the | |
| 7300 | # filename(s) don't get escaped. | |
| 7301 | set l [string length $line] | |
| 7302 | set i [expr {$l / 2}] | |
| 7303 | if {!(($l & 1) && [string index $line $i] eq " " && | |
| 7304 | [string range $line 2 [expr {$i - 1}]] eq \ | |
| 7305 | [string range $line [expr {$i + 3}] end])} { | |
| 7306 | continue | |
| 7307 | } | |
| 7308 | # unescape if quoted and chop off the a/ from the front | |
| 7309 | if {[string index $line 0] eq "\""} { | |
| 7310 | set fname [string range [lindex $line 0] 2 end] | |
| 7311 | } else { | |
| 7312 | set fname [string range $line 2 [expr {$i - 1}]] | |
| 7313 | } | |
| 7eb3cb9c | 7314 | } |
| 9396cd38 PM |
7315 | makediffhdr $fname $ids |
| 7316 | ||
| 48a81b7c PM |
7317 | } elseif {![string compare -length 16 "* Unmerged path " $line]} { |
| 7318 | set fname [encoding convertfrom [string range $line 16 end]] | |
| 7319 | $ctext insert end "\n" | |
| 7320 | set curdiffstart [$ctext index "end - 1c"] | |
| 7321 | lappend ctext_file_names $fname | |
| 7322 | lappend ctext_file_lines [lindex [split $curdiffstart "."] 0] | |
| 7323 | $ctext insert end "$line\n" filesep | |
| 7324 | set i [lsearch -exact $treediffs($ids) $fname] | |
| 7325 | if {$i >= 0} { | |
| 7326 | setinlist difffilestart $i $curdiffstart | |
| 7327 | } | |
| 7328 | ||
| 8b07dca1 PM |
7329 | } elseif {![string compare -length 2 "@@" $line]} { |
| 7330 | regexp {^@@+} $line ats | |
| 09c7029d | 7331 | set line [encoding convertfrom $diffencoding $line] |
| 7eb3cb9c | 7332 | $ctext insert end "$line\n" hunksep |
| 8b07dca1 PM |
7333 | if {[regexp { \+(\d+),\d+ @@} $line m nl]} { |
| 7334 | set diffline $nl | |
| 7335 | } | |
| 7336 | set diffnparents [expr {[string length $ats] - 1}] | |
| 7eb3cb9c | 7337 | set diffinhdr 0 |
| 9396cd38 PM |
7338 | |
| 7339 | } elseif {$diffinhdr} { | |
| 5e85ec4c | 7340 | if {![string compare -length 12 "rename from " $line]} { |
| d1cb298b | 7341 | set fname [string range $line [expr 6 + [string first " from " $line] ] end] |
| 9396cd38 PM |
7342 | if {[string index $fname 0] eq "\""} { |
| 7343 | set fname [lindex $fname 0] | |
| 7344 | } | |
| 09c7029d | 7345 | set fname [encoding convertfrom $fname] |
| 9396cd38 PM |
7346 | set i [lsearch -exact $treediffs($ids) $fname] |
| 7347 | if {$i >= 0} { | |
| 7348 | setinlist difffilestart $i $curdiffstart | |
| 7349 | } | |
| d1cb298b JS |
7350 | } elseif {![string compare -length 10 $line "rename to "] || |
| 7351 | ![string compare -length 8 $line "copy to "]} { | |
| 7352 | set fname [string range $line [expr 4 + [string first " to " $line] ] end] | |
| 9396cd38 PM |
7353 | if {[string index $fname 0] eq "\""} { |
| 7354 | set fname [lindex $fname 0] | |
| 7355 | } | |
| 7356 | makediffhdr $fname $ids | |
| 7357 | } elseif {[string compare -length 3 $line "---"] == 0} { | |
| 7358 | # do nothing | |
| 7359 | continue | |
| 7360 | } elseif {[string compare -length 3 $line "+++"] == 0} { | |
| 7361 | set diffinhdr 0 | |
| 7362 | continue | |
| 7363 | } | |
| 7364 | $ctext insert end "$line\n" filesep | |
| 7365 | ||
| e5c2d856 | 7366 | } else { |
| 09c7029d | 7367 | set line [encoding convertfrom $diffencoding $line] |
| 8b07dca1 PM |
7368 | # parse the prefix - one ' ', '-' or '+' for each parent |
| 7369 | set prefix [string range $line 0 [expr {$diffnparents - 1}]] | |
| 7370 | set tag [expr {$diffnparents > 1? "m": "d"}] | |
| 7371 | if {[string trim $prefix " -+"] eq {}} { | |
| 7372 | # prefix only has " ", "-" and "+" in it: normal diff line | |
| 7373 | set num [string first "-" $prefix] | |
| 7374 | if {$num >= 0} { | |
| 7375 | # removed line, first parent with line is $num | |
| 7376 | if {$num >= $mergemax} { | |
| 7377 | set num "max" | |
| 7378 | } | |
| 7379 | $ctext insert end "$line\n" $tag$num | |
| 7380 | } else { | |
| 7381 | set tags {} | |
| 7382 | if {[string first "+" $prefix] >= 0} { | |
| 7383 | # added line | |
| 7384 | lappend tags ${tag}result | |
| 7385 | if {$diffnparents > 1} { | |
| 7386 | set num [string first " " $prefix] | |
| 7387 | if {$num >= 0} { | |
| 7388 | if {$num >= $mergemax} { | |
| 7389 | set num "max" | |
| 7390 | } | |
| 7391 | lappend tags m$num | |
| 7392 | } | |
| 7393 | } | |
| 7394 | } | |
| 7395 | if {$targetline ne {}} { | |
| 7396 | if {$diffline == $targetline} { | |
| 7397 | set seehere [$ctext index "end - 1 chars"] | |
| 7398 | set targetline {} | |
| 7399 | } else { | |
| 7400 | incr diffline | |
| 7401 | } | |
| 7402 | } | |
| 7403 | $ctext insert end "$line\n" $tags | |
| 7404 | } | |
| 7eb3cb9c | 7405 | } else { |
| 9396cd38 PM |
7406 | # "\ No newline at end of file", |
| 7407 | # or something else we don't recognize | |
| 7408 | $ctext insert end "$line\n" hunksep | |
| e5c2d856 | 7409 | } |
| e5c2d856 PM |
7410 | } |
| 7411 | } | |
| 8b07dca1 PM |
7412 | if {[info exists seehere]} { |
| 7413 | mark_ctext_line [lindex [split $seehere .] 0] | |
| 7414 | } | |
| e5c2d856 | 7415 | $ctext conf -state disabled |
| 7eb3cb9c PM |
7416 | if {[eof $bdf]} { |
| 7417 | close $bdf | |
| 7eb3cb9c | 7418 | return 0 |
| c8dfbcf9 | 7419 | } |
| 7eb3cb9c | 7420 | return [expr {$nr >= 1000? 2: 1}] |
| e5c2d856 PM |
7421 | } |
| 7422 | ||
| a8d610a2 PM |
7423 | proc changediffdisp {} { |
| 7424 | global ctext diffelide | |
| 7425 | ||
| 7426 | $ctext tag conf d0 -elide [lindex $diffelide 0] | |
| 8b07dca1 | 7427 | $ctext tag conf dresult -elide [lindex $diffelide 1] |
| a8d610a2 PM |
7428 | } |
| 7429 | ||
| f4c54b3c PM |
7430 | proc highlightfile {loc cline} { |
| 7431 | global ctext cflist cflist_top | |
| 7432 | ||
| 7433 | $ctext yview $loc | |
| 7434 | $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend" | |
| 7435 | $cflist tag add highlight $cline.0 "$cline.0 lineend" | |
| 7436 | $cflist see $cline.0 | |
| 7437 | set cflist_top $cline | |
| 7438 | } | |
| 7439 | ||
| 67c22874 | 7440 | proc prevfile {} { |
| f4c54b3c PM |
7441 | global difffilestart ctext cmitmode |
| 7442 | ||
| 7443 | if {$cmitmode eq "tree"} return | |
| 7444 | set prev 0.0 | |
| 7445 | set prevline 1 | |
| 67c22874 OH |
7446 | set here [$ctext index @0,0] |
| 7447 | foreach loc $difffilestart { | |
| 7448 | if {[$ctext compare $loc >= $here]} { | |
| f4c54b3c | 7449 | highlightfile $prev $prevline |
| 67c22874 OH |
7450 | return |
| 7451 | } | |
| 7452 | set prev $loc | |
| f4c54b3c | 7453 | incr prevline |
| 67c22874 | 7454 | } |
| f4c54b3c | 7455 | highlightfile $prev $prevline |
| 67c22874 OH |
7456 | } |
| 7457 | ||
| 39ad8570 | 7458 | proc nextfile {} { |
| f4c54b3c PM |
7459 | global difffilestart ctext cmitmode |
| 7460 | ||
| 7461 | if {$cmitmode eq "tree"} return | |
| 39ad8570 | 7462 | set here [$ctext index @0,0] |
| f4c54b3c | 7463 | set line 1 |
| 7fcceed7 | 7464 | foreach loc $difffilestart { |
| f4c54b3c | 7465 | incr line |
| 7fcceed7 | 7466 | if {[$ctext compare $loc > $here]} { |
| f4c54b3c | 7467 | highlightfile $loc $line |
| 67c22874 | 7468 | return |
| 39ad8570 PM |
7469 | } |
| 7470 | } | |
| 1db95b00 PM |
7471 | } |
| 7472 | ||
| 3ea06f9f PM |
7473 | proc clear_ctext {{first 1.0}} { |
| 7474 | global ctext smarktop smarkbot | |
| 7cdc3556 | 7475 | global ctext_file_names ctext_file_lines |
| 97645683 | 7476 | global pendinglinks |
| 3ea06f9f | 7477 | |
| 1902c270 PM |
7478 | set l [lindex [split $first .] 0] |
| 7479 | if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} { | |
| 7480 | set smarktop $l | |
| 3ea06f9f | 7481 | } |
| 1902c270 PM |
7482 | if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} { |
| 7483 | set smarkbot $l | |
| 3ea06f9f PM |
7484 | } |
| 7485 | $ctext delete $first end | |
| 97645683 PM |
7486 | if {$first eq "1.0"} { |
| 7487 | catch {unset pendinglinks} | |
| 7488 | } | |
| 7cdc3556 AG |
7489 | set ctext_file_names {} |
| 7490 | set ctext_file_lines {} | |
| 3ea06f9f PM |
7491 | } |
| 7492 | ||
| 32f1b3e4 | 7493 | proc settabs {{firstab {}}} { |
| 9c311b32 | 7494 | global firsttabstop tabstop ctext have_tk85 |
| 32f1b3e4 PM |
7495 | |
| 7496 | if {$firstab ne {} && $have_tk85} { | |
| 7497 | set firsttabstop $firstab | |
| 7498 | } | |
| 9c311b32 | 7499 | set w [font measure textfont "0"] |
| 32f1b3e4 | 7500 | if {$firsttabstop != 0} { |
| 64b5f146 PM |
7501 | $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \ |
| 7502 | [expr {($firsttabstop + 2 * $tabstop) * $w}]] | |
| 32f1b3e4 PM |
7503 | } elseif {$have_tk85 || $tabstop != 8} { |
| 7504 | $ctext conf -tabs [expr {$tabstop * $w}] | |
| 7505 | } else { | |
| 7506 | $ctext conf -tabs {} | |
| 7507 | } | |
| 3ea06f9f PM |
7508 | } |
| 7509 | ||
| 7510 | proc incrsearch {name ix op} { | |
| 1902c270 | 7511 | global ctext searchstring searchdirn |
| 3ea06f9f PM |
7512 | |
| 7513 | $ctext tag remove found 1.0 end | |
| 1902c270 PM |
7514 | if {[catch {$ctext index anchor}]} { |
| 7515 | # no anchor set, use start of selection, or of visible area | |
| 7516 | set sel [$ctext tag ranges sel] | |
| 7517 | if {$sel ne {}} { | |
| 7518 | $ctext mark set anchor [lindex $sel 0] | |
| 7519 | } elseif {$searchdirn eq "-forwards"} { | |
| 7520 | $ctext mark set anchor @0,0 | |
| 7521 | } else { | |
| 7522 | $ctext mark set anchor @0,[winfo height $ctext] | |
| 7523 | } | |
| 7524 | } | |
| 3ea06f9f | 7525 | if {$searchstring ne {}} { |
| 1902c270 PM |
7526 | set here [$ctext search $searchdirn -- $searchstring anchor] |
| 7527 | if {$here ne {}} { | |
| 7528 | $ctext see $here | |
| 7529 | } | |
| 3ea06f9f PM |
7530 | searchmarkvisible 1 |
| 7531 | } | |
| 7532 | } | |
| 7533 | ||
| 7534 | proc dosearch {} { | |
| 1902c270 | 7535 | global sstring ctext searchstring searchdirn |
| 3ea06f9f PM |
7536 | |
| 7537 | focus $sstring | |
| 7538 | $sstring icursor end | |
| 1902c270 PM |
7539 | set searchdirn -forwards |
| 7540 | if {$searchstring ne {}} { | |
| 7541 | set sel [$ctext tag ranges sel] | |
| 7542 | if {$sel ne {}} { | |
| 7543 | set start "[lindex $sel 0] + 1c" | |
| 7544 | } elseif {[catch {set start [$ctext index anchor]}]} { | |
| 7545 | set start "@0,0" | |
| 7546 | } | |
| 7547 | set match [$ctext search -count mlen -- $searchstring $start] | |
| 7548 | $ctext tag remove sel 1.0 end | |
| 7549 | if {$match eq {}} { | |
| 7550 | bell | |
| 7551 | return | |
| 7552 | } | |
| 7553 | $ctext see $match | |
| 7554 | set mend "$match + $mlen c" | |
| 7555 | $ctext tag add sel $match $mend | |
| 7556 | $ctext mark unset anchor | |
| 7557 | } | |
| 7558 | } | |
| 7559 | ||
| 7560 | proc dosearchback {} { | |
| 7561 | global sstring ctext searchstring searchdirn | |
| 7562 | ||
| 7563 | focus $sstring | |
| 7564 | $sstring icursor end | |
| 7565 | set searchdirn -backwards | |
| 7566 | if {$searchstring ne {}} { | |
| 7567 | set sel [$ctext tag ranges sel] | |
| 7568 | if {$sel ne {}} { | |
| 7569 | set start [lindex $sel 0] | |
| 7570 | } elseif {[catch {set start [$ctext index anchor]}]} { | |
| 7571 | set start @0,[winfo height $ctext] | |
| 7572 | } | |
| 7573 | set match [$ctext search -backwards -count ml -- $searchstring $start] | |
| 7574 | $ctext tag remove sel 1.0 end | |
| 7575 | if {$match eq {}} { | |
| 7576 | bell | |
| 7577 | return | |
| 7578 | } | |
| 7579 | $ctext see $match | |
| 7580 | set mend "$match + $ml c" | |
| 7581 | $ctext tag add sel $match $mend | |
| 7582 | $ctext mark unset anchor | |
| 3ea06f9f | 7583 | } |
| 3ea06f9f PM |
7584 | } |
| 7585 | ||
| 7586 | proc searchmark {first last} { | |
| 7587 | global ctext searchstring | |
| 7588 | ||
| 7589 | set mend $first.0 | |
| 7590 | while {1} { | |
| 7591 | set match [$ctext search -count mlen -- $searchstring $mend $last.end] | |
| 7592 | if {$match eq {}} break | |
| 7593 | set mend "$match + $mlen c" | |
| 7594 | $ctext tag add found $match $mend | |
| 7595 | } | |
| 7596 | } | |
| 7597 | ||
| 7598 | proc searchmarkvisible {doall} { | |
| 7599 | global ctext smarktop smarkbot | |
| 7600 | ||
| 7601 | set topline [lindex [split [$ctext index @0,0] .] 0] | |
| 7602 | set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0] | |
| 7603 | if {$doall || $botline < $smarktop || $topline > $smarkbot} { | |
| 7604 | # no overlap with previous | |
| 7605 | searchmark $topline $botline | |
| 7606 | set smarktop $topline | |
| 7607 | set smarkbot $botline | |
| 7608 | } else { | |
| 7609 | if {$topline < $smarktop} { | |
| 7610 | searchmark $topline [expr {$smarktop-1}] | |
| 7611 | set smarktop $topline | |
| 7612 | } | |
| 7613 | if {$botline > $smarkbot} { | |
| 7614 | searchmark [expr {$smarkbot+1}] $botline | |
| 7615 | set smarkbot $botline | |
| 7616 | } | |
| 7617 | } | |
| 7618 | } | |
| 7619 | ||
| 7620 | proc scrolltext {f0 f1} { | |
| 1902c270 | 7621 | global searchstring |
| 3ea06f9f | 7622 | |
| 8809d691 | 7623 | .bleft.bottom.sb set $f0 $f1 |
| 3ea06f9f PM |
7624 | if {$searchstring ne {}} { |
| 7625 | searchmarkvisible 0 | |
| 7626 | } | |
| 7627 | } | |
| 7628 | ||
| 1d10f36d | 7629 | proc setcoords {} { |
| 9c311b32 | 7630 | global linespc charspc canvx0 canvy0 |
| f6075eba | 7631 | global xspc1 xspc2 lthickness |
| 8d858d1a | 7632 | |
| 9c311b32 PM |
7633 | set linespc [font metrics mainfont -linespace] |
| 7634 | set charspc [font measure mainfont "m"] | |
| 9f1afe05 PM |
7635 | set canvy0 [expr {int(3 + 0.5 * $linespc)}] |
| 7636 | set canvx0 [expr {int(3 + 0.5 * $linespc)}] | |
| f6075eba | 7637 | set lthickness [expr {int($linespc / 9) + 1}] |
| 8d858d1a PM |
7638 | set xspc1(0) $linespc |
| 7639 | set xspc2 $linespc | |
| 9a40c50c | 7640 | } |
| 1db95b00 | 7641 | |
| 1d10f36d | 7642 | proc redisplay {} { |
| be0cd098 | 7643 | global canv |
| 9f1afe05 PM |
7644 | global selectedline |
| 7645 | ||
| 7646 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 7647 | if {$ymax eq {} || $ymax == 0} return | |
| 7648 | set span [$canv yview] | |
| 7649 | clear_display | |
| be0cd098 | 7650 | setcanvscroll |
| 9f1afe05 PM |
7651 | allcanvs yview moveto [lindex $span 0] |
| 7652 | drawvisible | |
| 94b4a69f | 7653 | if {$selectedline ne {}} { |
| 9f1afe05 | 7654 | selectline $selectedline 0 |
| ca6d8f58 | 7655 | allcanvs yview moveto [lindex $span 0] |
| 1d10f36d PM |
7656 | } |
| 7657 | } | |
| 7658 | ||
| 0ed1dd3c PM |
7659 | proc parsefont {f n} { |
| 7660 | global fontattr | |
| 7661 | ||
| 7662 | set fontattr($f,family) [lindex $n 0] | |
| 7663 | set s [lindex $n 1] | |
| 7664 | if {$s eq {} || $s == 0} { | |
| 7665 | set s 10 | |
| 7666 | } elseif {$s < 0} { | |
| 7667 | set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}] | |
| 9c311b32 | 7668 | } |
| 0ed1dd3c PM |
7669 | set fontattr($f,size) $s |
| 7670 | set fontattr($f,weight) normal | |
| 7671 | set fontattr($f,slant) roman | |
| 7672 | foreach style [lrange $n 2 end] { | |
| 7673 | switch -- $style { | |
| 7674 | "normal" - | |
| 7675 | "bold" {set fontattr($f,weight) $style} | |
| 7676 | "roman" - | |
| 7677 | "italic" {set fontattr($f,slant) $style} | |
| 7678 | } | |
| 9c311b32 | 7679 | } |
| 0ed1dd3c PM |
7680 | } |
| 7681 | ||
| 7682 | proc fontflags {f {isbold 0}} { | |
| 7683 | global fontattr | |
| 7684 | ||
| 7685 | return [list -family $fontattr($f,family) -size $fontattr($f,size) \ | |
| 7686 | -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \ | |
| 7687 | -slant $fontattr($f,slant)] | |
| 7688 | } | |
| 7689 | ||
| 7690 | proc fontname {f} { | |
| 7691 | global fontattr | |
| 7692 | ||
| 7693 | set n [list $fontattr($f,family) $fontattr($f,size)] | |
| 7694 | if {$fontattr($f,weight) eq "bold"} { | |
| 7695 | lappend n "bold" | |
| 9c311b32 | 7696 | } |
| 0ed1dd3c PM |
7697 | if {$fontattr($f,slant) eq "italic"} { |
| 7698 | lappend n "italic" | |
| 9c311b32 | 7699 | } |
| 0ed1dd3c | 7700 | return $n |
| 9c311b32 PM |
7701 | } |
| 7702 | ||
| 1d10f36d | 7703 | proc incrfont {inc} { |
| 7fcc92bf | 7704 | global mainfont textfont ctext canv cflist showrefstop |
| 0ed1dd3c PM |
7705 | global stopped entries fontattr |
| 7706 | ||
| 1d10f36d | 7707 | unmarkmatches |
| 0ed1dd3c | 7708 | set s $fontattr(mainfont,size) |
| 9c311b32 PM |
7709 | incr s $inc |
| 7710 | if {$s < 1} { | |
| 7711 | set s 1 | |
| 7712 | } | |
| 0ed1dd3c | 7713 | set fontattr(mainfont,size) $s |
| 9c311b32 PM |
7714 | font config mainfont -size $s |
| 7715 | font config mainfontbold -size $s | |
| 0ed1dd3c PM |
7716 | set mainfont [fontname mainfont] |
| 7717 | set s $fontattr(textfont,size) | |
| 9c311b32 PM |
7718 | incr s $inc |
| 7719 | if {$s < 1} { | |
| 7720 | set s 1 | |
| 7721 | } | |
| 0ed1dd3c | 7722 | set fontattr(textfont,size) $s |
| 9c311b32 PM |
7723 | font config textfont -size $s |
| 7724 | font config textfontbold -size $s | |
| 0ed1dd3c | 7725 | set textfont [fontname textfont] |
| 1d10f36d | 7726 | setcoords |
| 32f1b3e4 | 7727 | settabs |
| 1d10f36d PM |
7728 | redisplay |
| 7729 | } | |
| 1db95b00 | 7730 | |
| ee3dc72e PM |
7731 | proc clearsha1 {} { |
| 7732 | global sha1entry sha1string | |
| 7733 | if {[string length $sha1string] == 40} { | |
| 7734 | $sha1entry delete 0 end | |
| 7735 | } | |
| 7736 | } | |
| 7737 | ||
| 887fe3c4 PM |
7738 | proc sha1change {n1 n2 op} { |
| 7739 | global sha1string currentid sha1but | |
| 7740 | if {$sha1string == {} | |
| 7741 | || ([info exists currentid] && $sha1string == $currentid)} { | |
| 7742 | set state disabled | |
| 7743 | } else { | |
| 7744 | set state normal | |
| 7745 | } | |
| 7746 | if {[$sha1but cget -state] == $state} return | |
| 7747 | if {$state == "normal"} { | |
| d990cedf | 7748 | $sha1but conf -state normal -relief raised -text "[mc "Goto:"] " |
| 887fe3c4 | 7749 | } else { |
| d990cedf | 7750 | $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] " |
| 887fe3c4 PM |
7751 | } |
| 7752 | } | |
| 7753 | ||
| 7754 | proc gotocommit {} { | |
| 7fcc92bf | 7755 | global sha1string tagids headids curview varcid |
| f3b8b3ce | 7756 | |
| 887fe3c4 PM |
7757 | if {$sha1string == {} |
| 7758 | || ([info exists currentid] && $sha1string == $currentid)} return | |
| 7759 | if {[info exists tagids($sha1string)]} { | |
| 7760 | set id $tagids($sha1string) | |
| e1007129 SR |
7761 | } elseif {[info exists headids($sha1string)]} { |
| 7762 | set id $headids($sha1string) | |
| 887fe3c4 PM |
7763 | } else { |
| 7764 | set id [string tolower $sha1string] | |
| f3b8b3ce | 7765 | if {[regexp {^[0-9a-f]{4,39}$} $id]} { |
| d375ef9b | 7766 | set matches [longid $id] |
| f3b8b3ce PM |
7767 | if {$matches ne {}} { |
| 7768 | if {[llength $matches] > 1} { | |
| d990cedf | 7769 | error_popup [mc "Short SHA1 id %s is ambiguous" $id] |
| f3b8b3ce PM |
7770 | return |
| 7771 | } | |
| d375ef9b | 7772 | set id [lindex $matches 0] |
| f3b8b3ce PM |
7773 | } |
| 7774 | } | |
| 887fe3c4 | 7775 | } |
| 7fcc92bf PM |
7776 | if {[commitinview $id $curview]} { |
| 7777 | selectline [rowofcommit $id] 1 | |
| 887fe3c4 PM |
7778 | return |
| 7779 | } | |
| f3b8b3ce | 7780 | if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} { |
| d990cedf | 7781 | set msg [mc "SHA1 id %s is not known" $sha1string] |
| 887fe3c4 | 7782 | } else { |
| d990cedf | 7783 | set msg [mc "Tag/Head %s is not known" $sha1string] |
| 887fe3c4 | 7784 | } |
| d990cedf | 7785 | error_popup $msg |
| 887fe3c4 PM |
7786 | } |
| 7787 | ||
| 84ba7345 PM |
7788 | proc lineenter {x y id} { |
| 7789 | global hoverx hovery hoverid hovertimer | |
| 7790 | global commitinfo canv | |
| 7791 | ||
| 8ed16484 | 7792 | if {![info exists commitinfo($id)] && ![getcommit $id]} return |
| 84ba7345 PM |
7793 | set hoverx $x |
| 7794 | set hovery $y | |
| 7795 | set hoverid $id | |
| 7796 | if {[info exists hovertimer]} { | |
| 7797 | after cancel $hovertimer | |
| 7798 | } | |
| 7799 | set hovertimer [after 500 linehover] | |
| 7800 | $canv delete hover | |
| 7801 | } | |
| 7802 | ||
| 7803 | proc linemotion {x y id} { | |
| 7804 | global hoverx hovery hoverid hovertimer | |
| 7805 | ||
| 7806 | if {[info exists hoverid] && $id == $hoverid} { | |
| 7807 | set hoverx $x | |
| 7808 | set hovery $y | |
| 7809 | if {[info exists hovertimer]} { | |
| 7810 | after cancel $hovertimer | |
| 7811 | } | |
| 7812 | set hovertimer [after 500 linehover] | |
| 7813 | } | |
| 7814 | } | |
| 7815 | ||
| 7816 | proc lineleave {id} { | |
| 7817 | global hoverid hovertimer canv | |
| 7818 | ||
| 7819 | if {[info exists hoverid] && $id == $hoverid} { | |
| 7820 | $canv delete hover | |
| 7821 | if {[info exists hovertimer]} { | |
| 7822 | after cancel $hovertimer | |
| 7823 | unset hovertimer | |
| 7824 | } | |
| 7825 | unset hoverid | |
| 7826 | } | |
| 7827 | } | |
| 7828 | ||
| 7829 | proc linehover {} { | |
| 7830 | global hoverx hovery hoverid hovertimer | |
| 7831 | global canv linespc lthickness | |
| 9c311b32 | 7832 | global commitinfo |
| 84ba7345 PM |
7833 | |
| 7834 | set text [lindex $commitinfo($hoverid) 0] | |
| 7835 | set ymax [lindex [$canv cget -scrollregion] 3] | |
| 7836 | if {$ymax == {}} return | |
| 7837 | set yfrac [lindex [$canv yview] 0] | |
| 7838 | set x [expr {$hoverx + 2 * $linespc}] | |
| 7839 | set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}] | |
| 7840 | set x0 [expr {$x - 2 * $lthickness}] | |
| 7841 | set y0 [expr {$y - 2 * $lthickness}] | |
| 9c311b32 | 7842 | set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}] |
| 84ba7345 PM |
7843 | set y1 [expr {$y + $linespc + 2 * $lthickness}] |
| 7844 | set t [$canv create rectangle $x0 $y0 $x1 $y1 \ | |
| 7845 | -fill \#ffff80 -outline black -width 1 -tags hover] | |
| 7846 | $canv raise $t | |
| f8a2c0d1 | 7847 | set t [$canv create text $x $y -anchor nw -text $text -tags hover \ |
| 9c311b32 | 7848 | -font mainfont] |
| 84ba7345 PM |
7849 | $canv raise $t |
| 7850 | } | |
| 7851 | ||
| 9843c307 | 7852 | proc clickisonarrow {id y} { |
| 50b44ece | 7853 | global lthickness |
| 9843c307 | 7854 | |
| 50b44ece | 7855 | set ranges [rowranges $id] |
| 9843c307 | 7856 | set thresh [expr {2 * $lthickness + 6}] |
| 50b44ece | 7857 | set n [expr {[llength $ranges] - 1}] |
| f6342480 | 7858 | for {set i 1} {$i < $n} {incr i} { |
| 50b44ece | 7859 | set row [lindex $ranges $i] |
| f6342480 PM |
7860 | if {abs([yc $row] - $y) < $thresh} { |
| 7861 | return $i | |
| 9843c307 PM |
7862 | } |
| 7863 | } | |
| 7864 | return {} | |
| 7865 | } | |
| 7866 | ||
| f6342480 | 7867 | proc arrowjump {id n y} { |
| 50b44ece | 7868 | global canv |
| 9843c307 | 7869 | |
| f6342480 PM |
7870 | # 1 <-> 2, 3 <-> 4, etc... |
| 7871 | set n [expr {(($n - 1) ^ 1) + 1}] | |
| 50b44ece | 7872 | set row [lindex [rowranges $id] $n] |
| f6342480 | 7873 | set yt [yc $row] |
| 9843c307 PM |
7874 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 7875 | if {$ymax eq {} || $ymax <= 0} return | |
| 7876 | set view [$canv yview] | |
| 7877 | set yspan [expr {[lindex $view 1] - [lindex $view 0]}] | |
| 7878 | set yfrac [expr {$yt / $ymax - $yspan / 2}] | |
| 7879 | if {$yfrac < 0} { | |
| 7880 | set yfrac 0 | |
| 7881 | } | |
| f6342480 | 7882 | allcanvs yview moveto $yfrac |
| 9843c307 PM |
7883 | } |
| 7884 | ||
| fa4da7b3 | 7885 | proc lineclick {x y id isnew} { |
| 7fcc92bf | 7886 | global ctext commitinfo children canv thickerline curview |
| c8dfbcf9 | 7887 | |
| 8ed16484 | 7888 | if {![info exists commitinfo($id)] && ![getcommit $id]} return |
| c8dfbcf9 | 7889 | unmarkmatches |
| fa4da7b3 | 7890 | unselectline |
| 9843c307 PM |
7891 | normalline |
| 7892 | $canv delete hover | |
| 7893 | # draw this line thicker than normal | |
| 9843c307 | 7894 | set thickerline $id |
| c934a8a3 | 7895 | drawlines $id |
| fa4da7b3 | 7896 | if {$isnew} { |
| 9843c307 PM |
7897 | set ymax [lindex [$canv cget -scrollregion] 3] |
| 7898 | if {$ymax eq {}} return | |
| 7899 | set yfrac [lindex [$canv yview] 0] | |
| 7900 | set y [expr {$y + $yfrac * $ymax}] | |
| 7901 | } | |
| 7902 | set dirn [clickisonarrow $id $y] | |
| 7903 | if {$dirn ne {}} { | |
| 7904 | arrowjump $id $dirn $y | |
| 7905 | return | |
| 7906 | } | |
| 7907 | ||
| 7908 | if {$isnew} { | |
| 7909 | addtohistory [list lineclick $x $y $id 0] | |
| fa4da7b3 | 7910 | } |
| c8dfbcf9 PM |
7911 | # fill the details pane with info about this line |
| 7912 | $ctext conf -state normal | |
| 3ea06f9f | 7913 | clear_ctext |
| 32f1b3e4 | 7914 | settabs 0 |
| d990cedf | 7915 | $ctext insert end "[mc "Parent"]:\t" |
| 97645683 PM |
7916 | $ctext insert end $id link0 |
| 7917 | setlink $id link0 | |
| c8dfbcf9 | 7918 | set info $commitinfo($id) |
| fa4da7b3 | 7919 | $ctext insert end "\n\t[lindex $info 0]\n" |
| d990cedf | 7920 | $ctext insert end "\t[mc "Author"]:\t[lindex $info 1]\n" |
| 232475d3 | 7921 | set date [formatdate [lindex $info 2]] |
| d990cedf | 7922 | $ctext insert end "\t[mc "Date"]:\t$date\n" |
| da7c24dd | 7923 | set kids $children($curview,$id) |
| 79b2c75e | 7924 | if {$kids ne {}} { |
| d990cedf | 7925 | $ctext insert end "\n[mc "Children"]:" |
| fa4da7b3 | 7926 | set i 0 |
| 79b2c75e | 7927 | foreach child $kids { |
| fa4da7b3 | 7928 | incr i |
| 8ed16484 | 7929 | if {![info exists commitinfo($child)] && ![getcommit $child]} continue |
| c8dfbcf9 | 7930 | set info $commitinfo($child) |
| fa4da7b3 | 7931 | $ctext insert end "\n\t" |
| 97645683 PM |
7932 | $ctext insert end $child link$i |
| 7933 | setlink $child link$i | |
| fa4da7b3 | 7934 | $ctext insert end "\n\t[lindex $info 0]" |
| d990cedf | 7935 | $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]" |
| 232475d3 | 7936 | set date [formatdate [lindex $info 2]] |
| d990cedf | 7937 | $ctext insert end "\n\t[mc "Date"]:\t$date\n" |
| c8dfbcf9 PM |
7938 | } |
| 7939 | } | |
| 7940 | $ctext conf -state disabled | |
| 7fcceed7 | 7941 | init_flist {} |
| c8dfbcf9 PM |
7942 | } |
| 7943 | ||
| 9843c307 PM |
7944 | proc normalline {} { |
| 7945 | global thickerline | |
| 7946 | if {[info exists thickerline]} { | |
| c934a8a3 | 7947 | set id $thickerline |
| 9843c307 | 7948 | unset thickerline |
| c934a8a3 | 7949 | drawlines $id |
| 9843c307 PM |
7950 | } |
| 7951 | } | |
| 7952 | ||
| c8dfbcf9 | 7953 | proc selbyid {id} { |
| 7fcc92bf PM |
7954 | global curview |
| 7955 | if {[commitinview $id $curview]} { | |
| 7956 | selectline [rowofcommit $id] 1 | |
| c8dfbcf9 PM |
7957 | } |
| 7958 | } | |
| 7959 | ||
| 7960 | proc mstime {} { | |
| 7961 | global startmstime | |
| 7962 | if {![info exists startmstime]} { | |
| 7963 | set startmstime [clock clicks -milliseconds] | |
| 7964 | } | |
| 7965 | return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]] | |
| 7966 | } | |
| 7967 | ||
| 7968 | proc rowmenu {x y id} { | |
| 7fcc92bf | 7969 | global rowctxmenu selectedline rowmenuid curview |
| 8f489363 | 7970 | global nullid nullid2 fakerowmenu mainhead |
| c8dfbcf9 | 7971 | |
| bb3edc8b | 7972 | stopfinding |
| 219ea3a9 | 7973 | set rowmenuid $id |
| 94b4a69f | 7974 | if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} { |
| c8dfbcf9 PM |
7975 | set state disabled |
| 7976 | } else { | |
| 7977 | set state normal | |
| 7978 | } | |
| 8f489363 | 7979 | if {$id ne $nullid && $id ne $nullid2} { |
| 219ea3a9 | 7980 | set menu $rowctxmenu |
| 5e3502da MB |
7981 | if {$mainhead ne {}} { |
| 7982 | $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead] | |
| 7983 | } else { | |
| 7984 | $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled | |
| 7985 | } | |
| 219ea3a9 PM |
7986 | } else { |
| 7987 | set menu $fakerowmenu | |
| 7988 | } | |
| f2d0bbbd PM |
7989 | $menu entryconfigure [mca "Diff this -> selected"] -state $state |
| 7990 | $menu entryconfigure [mca "Diff selected -> this"] -state $state | |
| 7991 | $menu entryconfigure [mca "Make patch"] -state $state | |
| 219ea3a9 | 7992 | tk_popup $menu $x $y |
| c8dfbcf9 PM |
7993 | } |
| 7994 | ||
| 7995 | proc diffvssel {dirn} { | |
| 7fcc92bf | 7996 | global rowmenuid selectedline |
| c8dfbcf9 | 7997 | |
| 94b4a69f | 7998 | if {$selectedline eq {}} return |
| c8dfbcf9 | 7999 | if {$dirn} { |
| 7fcc92bf | 8000 | set oldid [commitonrow $selectedline] |
| c8dfbcf9 PM |
8001 | set newid $rowmenuid |
| 8002 | } else { | |
| 8003 | set oldid $rowmenuid | |
| 7fcc92bf | 8004 | set newid [commitonrow $selectedline] |
| c8dfbcf9 | 8005 | } |
| fa4da7b3 PM |
8006 | addtohistory [list doseldiff $oldid $newid] |
| 8007 | doseldiff $oldid $newid | |
| 8008 | } | |
| 8009 | ||
| 8010 | proc doseldiff {oldid newid} { | |
| 7fcceed7 | 8011 | global ctext |
| fa4da7b3 PM |
8012 | global commitinfo |
| 8013 | ||
| c8dfbcf9 | 8014 | $ctext conf -state normal |
| 3ea06f9f | 8015 | clear_ctext |
| d990cedf CS |
8016 | init_flist [mc "Top"] |
| 8017 | $ctext insert end "[mc "From"] " | |
| 97645683 PM |
8018 | $ctext insert end $oldid link0 |
| 8019 | setlink $oldid link0 | |
| fa4da7b3 | 8020 | $ctext insert end "\n " |
| c8dfbcf9 | 8021 | $ctext insert end [lindex $commitinfo($oldid) 0] |
| d990cedf | 8022 | $ctext insert end "\n\n[mc "To"] " |
| 97645683 PM |
8023 | $ctext insert end $newid link1 |
| 8024 | setlink $newid link1 | |
| fa4da7b3 | 8025 | $ctext insert end "\n " |
| c8dfbcf9 PM |
8026 | $ctext insert end [lindex $commitinfo($newid) 0] |
| 8027 | $ctext insert end "\n" | |
| 8028 | $ctext conf -state disabled | |
| c8dfbcf9 | 8029 | $ctext tag remove found 1.0 end |
| d327244a | 8030 | startdiff [list $oldid $newid] |
| c8dfbcf9 PM |
8031 | } |
| 8032 | ||
| 74daedb6 PM |
8033 | proc mkpatch {} { |
| 8034 | global rowmenuid currentid commitinfo patchtop patchnum | |
| 8035 | ||
| 8036 | if {![info exists currentid]} return | |
| 8037 | set oldid $currentid | |
| 8038 | set oldhead [lindex $commitinfo($oldid) 0] | |
| 8039 | set newid $rowmenuid | |
| 8040 | set newhead [lindex $commitinfo($newid) 0] | |
| 8041 | set top .patch | |
| 8042 | set patchtop $top | |
| 8043 | catch {destroy $top} | |
| 8044 | toplevel $top | |
| e7d64008 | 8045 | make_transient $top . |
| d990cedf | 8046 | label $top.title -text [mc "Generate patch"] |
| 4a2139f5 | 8047 | grid $top.title - -pady 10 |
| d990cedf | 8048 | label $top.from -text [mc "From:"] |
| 4a2139f5 | 8049 | entry $top.fromsha1 -width 40 -relief flat |
| 74daedb6 PM |
8050 | $top.fromsha1 insert 0 $oldid |
| 8051 | $top.fromsha1 conf -state readonly | |
| 8052 | grid $top.from $top.fromsha1 -sticky w | |
| 4a2139f5 | 8053 | entry $top.fromhead -width 60 -relief flat |
| 74daedb6 PM |
8054 | $top.fromhead insert 0 $oldhead |
| 8055 | $top.fromhead conf -state readonly | |
| 8056 | grid x $top.fromhead -sticky w | |
| d990cedf | 8057 | label $top.to -text [mc "To:"] |
| 4a2139f5 | 8058 | entry $top.tosha1 -width 40 -relief flat |
| 74daedb6 PM |
8059 | $top.tosha1 insert 0 $newid |
| 8060 | $top.tosha1 conf -state readonly | |
| 8061 | grid $top.to $top.tosha1 -sticky w | |
| 4a2139f5 | 8062 | entry $top.tohead -width 60 -relief flat |
| 74daedb6 PM |
8063 | $top.tohead insert 0 $newhead |
| 8064 | $top.tohead conf -state readonly | |
| 8065 | grid x $top.tohead -sticky w | |
| d990cedf | 8066 | button $top.rev -text [mc "Reverse"] -command mkpatchrev -padx 5 |
| 74daedb6 | 8067 | grid $top.rev x -pady 10 |
| d990cedf | 8068 | label $top.flab -text [mc "Output file:"] |
| 74daedb6 PM |
8069 | entry $top.fname -width 60 |
| 8070 | $top.fname insert 0 [file normalize "patch$patchnum.patch"] | |
| 8071 | incr patchnum | |
| bdbfbe3d | 8072 | grid $top.flab $top.fname -sticky w |
| 74daedb6 | 8073 | frame $top.buts |
| d990cedf CS |
8074 | button $top.buts.gen -text [mc "Generate"] -command mkpatchgo |
| 8075 | button $top.buts.can -text [mc "Cancel"] -command mkpatchcan | |
| 76f15947 AG |
8076 | bind $top <Key-Return> mkpatchgo |
| 8077 | bind $top <Key-Escape> mkpatchcan | |
| 74daedb6 PM |
8078 | grid $top.buts.gen $top.buts.can |
| 8079 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 8080 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 8081 | grid $top.buts - -pady 10 -sticky ew | |
| bdbfbe3d | 8082 | focus $top.fname |
| 74daedb6 PM |
8083 | } |
| 8084 | ||
| 8085 | proc mkpatchrev {} { | |
| 8086 | global patchtop | |
| 8087 | ||
| 8088 | set oldid [$patchtop.fromsha1 get] | |
| 8089 | set oldhead [$patchtop.fromhead get] | |
| 8090 | set newid [$patchtop.tosha1 get] | |
| 8091 | set newhead [$patchtop.tohead get] | |
| 8092 | foreach e [list fromsha1 fromhead tosha1 tohead] \ | |
| 8093 | v [list $newid $newhead $oldid $oldhead] { | |
| 8094 | $patchtop.$e conf -state normal | |
| 8095 | $patchtop.$e delete 0 end | |
| 8096 | $patchtop.$e insert 0 $v | |
| 8097 | $patchtop.$e conf -state readonly | |
| 8098 | } | |
| 8099 | } | |
| 8100 | ||
| 8101 | proc mkpatchgo {} { | |
| 8f489363 | 8102 | global patchtop nullid nullid2 |
| 74daedb6 PM |
8103 | |
| 8104 | set oldid [$patchtop.fromsha1 get] | |
| 8105 | set newid [$patchtop.tosha1 get] | |
| 8106 | set fname [$patchtop.fname get] | |
| 8f489363 | 8107 | set cmd [diffcmd [list $oldid $newid] -p] |
| d372e216 PM |
8108 | # trim off the initial "|" |
| 8109 | set cmd [lrange $cmd 1 end] | |
| 219ea3a9 PM |
8110 | lappend cmd >$fname & |
| 8111 | if {[catch {eval exec $cmd} err]} { | |
| 84a76f18 | 8112 | error_popup "[mc "Error creating patch:"] $err" $patchtop |
| 74daedb6 PM |
8113 | } |
| 8114 | catch {destroy $patchtop} | |
| 8115 | unset patchtop | |
| 8116 | } | |
| 8117 | ||
| 8118 | proc mkpatchcan {} { | |
| 8119 | global patchtop | |
| 8120 | ||
| 8121 | catch {destroy $patchtop} | |
| 8122 | unset patchtop | |
| 8123 | } | |
| 8124 | ||
| bdbfbe3d PM |
8125 | proc mktag {} { |
| 8126 | global rowmenuid mktagtop commitinfo | |
| 8127 | ||
| 8128 | set top .maketag | |
| 8129 | set mktagtop $top | |
| 8130 | catch {destroy $top} | |
| 8131 | toplevel $top | |
| e7d64008 | 8132 | make_transient $top . |
| d990cedf | 8133 | label $top.title -text [mc "Create tag"] |
| 4a2139f5 | 8134 | grid $top.title - -pady 10 |
| d990cedf | 8135 | label $top.id -text [mc "ID:"] |
| 4a2139f5 | 8136 | entry $top.sha1 -width 40 -relief flat |
| bdbfbe3d PM |
8137 | $top.sha1 insert 0 $rowmenuid |
| 8138 | $top.sha1 conf -state readonly | |
| 8139 | grid $top.id $top.sha1 -sticky w | |
| 4a2139f5 | 8140 | entry $top.head -width 60 -relief flat |
| bdbfbe3d PM |
8141 | $top.head insert 0 [lindex $commitinfo($rowmenuid) 0] |
| 8142 | $top.head conf -state readonly | |
| 8143 | grid x $top.head -sticky w | |
| d990cedf | 8144 | label $top.tlab -text [mc "Tag name:"] |
| 4a2139f5 | 8145 | entry $top.tag -width 60 |
| bdbfbe3d PM |
8146 | grid $top.tlab $top.tag -sticky w |
| 8147 | frame $top.buts | |
| d990cedf CS |
8148 | button $top.buts.gen -text [mc "Create"] -command mktaggo |
| 8149 | button $top.buts.can -text [mc "Cancel"] -command mktagcan | |
| 76f15947 AG |
8150 | bind $top <Key-Return> mktaggo |
| 8151 | bind $top <Key-Escape> mktagcan | |
| bdbfbe3d PM |
8152 | grid $top.buts.gen $top.buts.can |
| 8153 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 8154 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 8155 | grid $top.buts - -pady 10 -sticky ew | |
| 8156 | focus $top.tag | |
| 8157 | } | |
| 8158 | ||
| 8159 | proc domktag {} { | |
| 8160 | global mktagtop env tagids idtags | |
| bdbfbe3d PM |
8161 | |
| 8162 | set id [$mktagtop.sha1 get] | |
| 8163 | set tag [$mktagtop.tag get] | |
| 8164 | if {$tag == {}} { | |
| 84a76f18 AG |
8165 | error_popup [mc "No tag name specified"] $mktagtop |
| 8166 | return 0 | |
| bdbfbe3d PM |
8167 | } |
| 8168 | if {[info exists tagids($tag)]} { | |
| 84a76f18 AG |
8169 | error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop |
| 8170 | return 0 | |
| bdbfbe3d PM |
8171 | } |
| 8172 | if {[catch { | |
| 48750d6a | 8173 | exec git tag $tag $id |
| bdbfbe3d | 8174 | } err]} { |
| 84a76f18 AG |
8175 | error_popup "[mc "Error creating tag:"] $err" $mktagtop |
| 8176 | return 0 | |
| bdbfbe3d PM |
8177 | } |
| 8178 | ||
| 8179 | set tagids($tag) $id | |
| 8180 | lappend idtags($id) $tag | |
| f1d83ba3 | 8181 | redrawtags $id |
| ceadfe90 | 8182 | addedtag $id |
| 887c996e PM |
8183 | dispneartags 0 |
| 8184 | run refill_reflist | |
| 84a76f18 | 8185 | return 1 |
| f1d83ba3 PM |
8186 | } |
| 8187 | ||
| 8188 | proc redrawtags {id} { | |
| c11ff120 PM |
8189 | global canv linehtag idpos currentid curview cmitlisted |
| 8190 | global canvxmax iddrawn circleitem mainheadid circlecolors | |
| f1d83ba3 | 8191 | |
| 7fcc92bf | 8192 | if {![commitinview $id $curview]} return |
| 322a8cc9 | 8193 | if {![info exists iddrawn($id)]} return |
| fc2a256f | 8194 | set row [rowofcommit $id] |
| c11ff120 PM |
8195 | if {$id eq $mainheadid} { |
| 8196 | set ofill yellow | |
| 8197 | } else { | |
| 8198 | set ofill [lindex $circlecolors $cmitlisted($curview,$id)] | |
| 8199 | } | |
| 8200 | $canv itemconf $circleitem($row) -fill $ofill | |
| bdbfbe3d PM |
8201 | $canv delete tag.$id |
| 8202 | set xt [eval drawtags $id $idpos($id)] | |
| 28593d3f PM |
8203 | $canv coords $linehtag($id) $xt [lindex $idpos($id) 2] |
| 8204 | set text [$canv itemcget $linehtag($id) -text] | |
| 8205 | set font [$canv itemcget $linehtag($id) -font] | |
| fc2a256f | 8206 | set xr [expr {$xt + [font measure $font $text]}] |
| b8ab2e17 PM |
8207 | if {$xr > $canvxmax} { |
| 8208 | set canvxmax $xr | |
| 8209 | setcanvscroll | |
| 8210 | } | |
| fc2a256f | 8211 | if {[info exists currentid] && $currentid == $id} { |
| 28593d3f | 8212 | make_secsel $id |
| bdbfbe3d PM |
8213 | } |
| 8214 | } | |
| 8215 | ||
| 8216 | proc mktagcan {} { | |
| 8217 | global mktagtop | |
| 8218 | ||
| 8219 | catch {destroy $mktagtop} | |
| 8220 | unset mktagtop | |
| 8221 | } | |
| 8222 | ||
| 8223 | proc mktaggo {} { | |
| 84a76f18 | 8224 | if {![domktag]} return |
| bdbfbe3d PM |
8225 | mktagcan |
| 8226 | } | |
| 8227 | ||
| 4a2139f5 PM |
8228 | proc writecommit {} { |
| 8229 | global rowmenuid wrcomtop commitinfo wrcomcmd | |
| 8230 | ||
| 8231 | set top .writecommit | |
| 8232 | set wrcomtop $top | |
| 8233 | catch {destroy $top} | |
| 8234 | toplevel $top | |
| e7d64008 | 8235 | make_transient $top . |
| d990cedf | 8236 | label $top.title -text [mc "Write commit to file"] |
| 4a2139f5 | 8237 | grid $top.title - -pady 10 |
| d990cedf | 8238 | label $top.id -text [mc "ID:"] |
| 4a2139f5 PM |
8239 | entry $top.sha1 -width 40 -relief flat |
| 8240 | $top.sha1 insert 0 $rowmenuid | |
| 8241 | $top.sha1 conf -state readonly | |
| 8242 | grid $top.id $top.sha1 -sticky w | |
| 8243 | entry $top.head -width 60 -relief flat | |
| 8244 | $top.head insert 0 [lindex $commitinfo($rowmenuid) 0] | |
| 8245 | $top.head conf -state readonly | |
| 8246 | grid x $top.head -sticky w | |
| d990cedf | 8247 | label $top.clab -text [mc "Command:"] |
| 4a2139f5 PM |
8248 | entry $top.cmd -width 60 -textvariable wrcomcmd |
| 8249 | grid $top.clab $top.cmd -sticky w -pady 10 | |
| d990cedf | 8250 | label $top.flab -text [mc "Output file:"] |
| 4a2139f5 PM |
8251 | entry $top.fname -width 60 |
| 8252 | $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"] | |
| 8253 | grid $top.flab $top.fname -sticky w | |
| 8254 | frame $top.buts | |
| d990cedf CS |
8255 | button $top.buts.gen -text [mc "Write"] -command wrcomgo |
| 8256 | button $top.buts.can -text [mc "Cancel"] -command wrcomcan | |
| 76f15947 AG |
8257 | bind $top <Key-Return> wrcomgo |
| 8258 | bind $top <Key-Escape> wrcomcan | |
| 4a2139f5 PM |
8259 | grid $top.buts.gen $top.buts.can |
| 8260 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 8261 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 8262 | grid $top.buts - -pady 10 -sticky ew | |
| 8263 | focus $top.fname | |
| 8264 | } | |
| 8265 | ||
| 8266 | proc wrcomgo {} { | |
| 8267 | global wrcomtop | |
| 8268 | ||
| 8269 | set id [$wrcomtop.sha1 get] | |
| 8270 | set cmd "echo $id | [$wrcomtop.cmd get]" | |
| 8271 | set fname [$wrcomtop.fname get] | |
| 8272 | if {[catch {exec sh -c $cmd >$fname &} err]} { | |
| 84a76f18 | 8273 | error_popup "[mc "Error writing commit:"] $err" $wrcomtop |
| 4a2139f5 PM |
8274 | } |
| 8275 | catch {destroy $wrcomtop} | |
| 8276 | unset wrcomtop | |
| 8277 | } | |
| 8278 | ||
| 8279 | proc wrcomcan {} { | |
| 8280 | global wrcomtop | |
| 8281 | ||
| 8282 | catch {destroy $wrcomtop} | |
| 8283 | unset wrcomtop | |
| 8284 | } | |
| 8285 | ||
| d6ac1a86 PM |
8286 | proc mkbranch {} { |
| 8287 | global rowmenuid mkbrtop | |
| 8288 | ||
| 8289 | set top .makebranch | |
| 8290 | catch {destroy $top} | |
| 8291 | toplevel $top | |
| e7d64008 | 8292 | make_transient $top . |
| d990cedf | 8293 | label $top.title -text [mc "Create new branch"] |
| d6ac1a86 | 8294 | grid $top.title - -pady 10 |
| d990cedf | 8295 | label $top.id -text [mc "ID:"] |
| d6ac1a86 PM |
8296 | entry $top.sha1 -width 40 -relief flat |
| 8297 | $top.sha1 insert 0 $rowmenuid | |
| 8298 | $top.sha1 conf -state readonly | |
| 8299 | grid $top.id $top.sha1 -sticky w | |
| d990cedf | 8300 | label $top.nlab -text [mc "Name:"] |
| d6ac1a86 PM |
8301 | entry $top.name -width 40 |
| 8302 | grid $top.nlab $top.name -sticky w | |
| 8303 | frame $top.buts | |
| d990cedf CS |
8304 | button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top] |
| 8305 | button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}" | |
| 76f15947 AG |
8306 | bind $top <Key-Return> [list mkbrgo $top] |
| 8307 | bind $top <Key-Escape> "catch {destroy $top}" | |
| d6ac1a86 PM |
8308 | grid $top.buts.go $top.buts.can |
| 8309 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 8310 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 8311 | grid $top.buts - -pady 10 -sticky ew | |
| 8312 | focus $top.name | |
| 8313 | } | |
| 8314 | ||
| 8315 | proc mkbrgo {top} { | |
| 8316 | global headids idheads | |
| 8317 | ||
| 8318 | set name [$top.name get] | |
| 8319 | set id [$top.sha1 get] | |
| bee866fa AG |
8320 | set cmdargs {} |
| 8321 | set old_id {} | |
| d6ac1a86 | 8322 | if {$name eq {}} { |
| 84a76f18 | 8323 | error_popup [mc "Please specify a name for the new branch"] $top |
| d6ac1a86 PM |
8324 | return |
| 8325 | } | |
| bee866fa AG |
8326 | if {[info exists headids($name)]} { |
| 8327 | if {![confirm_popup [mc \ | |
| 84a76f18 | 8328 | "Branch '%s' already exists. Overwrite?" $name] $top]} { |
| bee866fa AG |
8329 | return |
| 8330 | } | |
| 8331 | set old_id $headids($name) | |
| 8332 | lappend cmdargs -f | |
| 8333 | } | |
| d6ac1a86 | 8334 | catch {destroy $top} |
| bee866fa | 8335 | lappend cmdargs $name $id |
| d6ac1a86 PM |
8336 | nowbusy newbranch |
| 8337 | update | |
| 8338 | if {[catch { | |
| bee866fa | 8339 | eval exec git branch $cmdargs |
| d6ac1a86 PM |
8340 | } err]} { |
| 8341 | notbusy newbranch | |
| 8342 | error_popup $err | |
| 8343 | } else { | |
| d6ac1a86 | 8344 | notbusy newbranch |
| bee866fa AG |
8345 | if {$old_id ne {}} { |
| 8346 | movehead $id $name | |
| 8347 | movedhead $id $name | |
| 8348 | redrawtags $old_id | |
| 8349 | redrawtags $id | |
| 8350 | } else { | |
| 8351 | set headids($name) $id | |
| 8352 | lappend idheads($id) $name | |
| 8353 | addedhead $id $name | |
| 8354 | redrawtags $id | |
| 8355 | } | |
| e11f1233 | 8356 | dispneartags 0 |
| 887c996e | 8357 | run refill_reflist |
| d6ac1a86 PM |
8358 | } |
| 8359 | } | |
| 8360 | ||
| 15e35055 AG |
8361 | proc exec_citool {tool_args {baseid {}}} { |
| 8362 | global commitinfo env | |
| 8363 | ||
| 8364 | set save_env [array get env GIT_AUTHOR_*] | |
| 8365 | ||
| 8366 | if {$baseid ne {}} { | |
| 8367 | if {![info exists commitinfo($baseid)]} { | |
| 8368 | getcommit $baseid | |
| 8369 | } | |
| 8370 | set author [lindex $commitinfo($baseid) 1] | |
| 8371 | set date [lindex $commitinfo($baseid) 2] | |
| 8372 | if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \ | |
| 8373 | $author author name email] | |
| 8374 | && $date ne {}} { | |
| 8375 | set env(GIT_AUTHOR_NAME) $name | |
| 8376 | set env(GIT_AUTHOR_EMAIL) $email | |
| 8377 | set env(GIT_AUTHOR_DATE) $date | |
| 8378 | } | |
| 8379 | } | |
| 8380 | ||
| 8381 | eval exec git citool $tool_args & | |
| 8382 | ||
| 8383 | array unset env GIT_AUTHOR_* | |
| 8384 | array set env $save_env | |
| 8385 | } | |
| 8386 | ||
| ca6d8f58 | 8387 | proc cherrypick {} { |
| 468bcaed | 8388 | global rowmenuid curview |
| b8a938cf | 8389 | global mainhead mainheadid |
| ca6d8f58 | 8390 | |
| e11f1233 PM |
8391 | set oldhead [exec git rev-parse HEAD] |
| 8392 | set dheads [descheads $rowmenuid] | |
| 8393 | if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} { | |
| d990cedf CS |
8394 | set ok [confirm_popup [mc "Commit %s is already\ |
| 8395 | included in branch %s -- really re-apply it?" \ | |
| 8396 | [string range $rowmenuid 0 7] $mainhead]] | |
| ca6d8f58 PM |
8397 | if {!$ok} return |
| 8398 | } | |
| d990cedf | 8399 | nowbusy cherrypick [mc "Cherry-picking"] |
| ca6d8f58 | 8400 | update |
| ca6d8f58 PM |
8401 | # Unfortunately git-cherry-pick writes stuff to stderr even when |
| 8402 | # no error occurs, and exec takes that as an indication of error... | |
| 8403 | if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} { | |
| 8404 | notbusy cherrypick | |
| 15e35055 | 8405 | if {[regexp -line \ |
| 887a791f PM |
8406 | {Entry '(.*)' (would be overwritten by merge|not uptodate)} \ |
| 8407 | $err msg fname]} { | |
| 8408 | error_popup [mc "Cherry-pick failed because of local changes\ | |
| 8409 | to file '%s'.\nPlease commit, reset or stash\ | |
| 8410 | your changes and try again." $fname] | |
| 8411 | } elseif {[regexp -line \ | |
| 8412 | {^(CONFLICT \(.*\):|Automatic cherry-pick failed)} \ | |
| 8413 | $err]} { | |
| 8414 | if {[confirm_popup [mc "Cherry-pick failed because of merge\ | |
| 8415 | conflict.\nDo you wish to run git citool to\ | |
| 8416 | resolve it?"]]} { | |
| 8417 | # Force citool to read MERGE_MSG | |
| 8418 | file delete [file join [gitdir] "GITGUI_MSG"] | |
| 8419 | exec_citool {} $rowmenuid | |
| 8420 | } | |
| 15e35055 AG |
8421 | } else { |
| 8422 | error_popup $err | |
| 8423 | } | |
| 887a791f | 8424 | run updatecommits |
| ca6d8f58 PM |
8425 | return |
| 8426 | } | |
| 8427 | set newhead [exec git rev-parse HEAD] | |
| 8428 | if {$newhead eq $oldhead} { | |
| 8429 | notbusy cherrypick | |
| d990cedf | 8430 | error_popup [mc "No changes committed"] |
| ca6d8f58 PM |
8431 | return |
| 8432 | } | |
| e11f1233 | 8433 | addnewchild $newhead $oldhead |
| 7fcc92bf | 8434 | if {[commitinview $oldhead $curview]} { |
| cdc8429c | 8435 | # XXX this isn't right if we have a path limit... |
| 7fcc92bf | 8436 | insertrow $newhead $oldhead $curview |
| ca6d8f58 | 8437 | if {$mainhead ne {}} { |
| e11f1233 | 8438 | movehead $newhead $mainhead |
| ca6d8f58 PM |
8439 | movedhead $newhead $mainhead |
| 8440 | } | |
| c11ff120 | 8441 | set mainheadid $newhead |
| ca6d8f58 PM |
8442 | redrawtags $oldhead |
| 8443 | redrawtags $newhead | |
| 46308ea1 | 8444 | selbyid $newhead |
| ca6d8f58 PM |
8445 | } |
| 8446 | notbusy cherrypick | |
| 8447 | } | |
| 8448 | ||
| 6fb735ae | 8449 | proc resethead {} { |
| b8a938cf | 8450 | global mainhead rowmenuid confirm_ok resettype |
| 6fb735ae PM |
8451 | |
| 8452 | set confirm_ok 0 | |
| 8453 | set w ".confirmreset" | |
| 8454 | toplevel $w | |
| e7d64008 | 8455 | make_transient $w . |
| d990cedf | 8456 | wm title $w [mc "Confirm reset"] |
| 6fb735ae | 8457 | message $w.m -text \ |
| d990cedf | 8458 | [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]] \ |
| 6fb735ae PM |
8459 | -justify center -aspect 1000 |
| 8460 | pack $w.m -side top -fill x -padx 20 -pady 20 | |
| 8461 | frame $w.f -relief sunken -border 2 | |
| d990cedf | 8462 | message $w.f.rt -text [mc "Reset type:"] -aspect 1000 |
| 6fb735ae PM |
8463 | grid $w.f.rt -sticky w |
| 8464 | set resettype mixed | |
| 8465 | radiobutton $w.f.soft -value soft -variable resettype -justify left \ | |
| d990cedf | 8466 | -text [mc "Soft: Leave working tree and index untouched"] |
| 6fb735ae PM |
8467 | grid $w.f.soft -sticky w |
| 8468 | radiobutton $w.f.mixed -value mixed -variable resettype -justify left \ | |
| d990cedf | 8469 | -text [mc "Mixed: Leave working tree untouched, reset index"] |
| 6fb735ae PM |
8470 | grid $w.f.mixed -sticky w |
| 8471 | radiobutton $w.f.hard -value hard -variable resettype -justify left \ | |
| d990cedf | 8472 | -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"] |
| 6fb735ae PM |
8473 | grid $w.f.hard -sticky w |
| 8474 | pack $w.f -side top -fill x | |
| d990cedf | 8475 | button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w" |
| 6fb735ae | 8476 | pack $w.ok -side left -fill x -padx 20 -pady 20 |
| d990cedf | 8477 | button $w.cancel -text [mc Cancel] -command "destroy $w" |
| 76f15947 | 8478 | bind $w <Key-Escape> [list destroy $w] |
| 6fb735ae PM |
8479 | pack $w.cancel -side right -fill x -padx 20 -pady 20 |
| 8480 | bind $w <Visibility> "grab $w; focus $w" | |
| 8481 | tkwait window $w | |
| 8482 | if {!$confirm_ok} return | |
| 706d6c3e | 8483 | if {[catch {set fd [open \ |
| 08ba820f | 8484 | [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} { |
| 6fb735ae PM |
8485 | error_popup $err |
| 8486 | } else { | |
| 706d6c3e | 8487 | dohidelocalchanges |
| a137a90f | 8488 | filerun $fd [list readresetstat $fd] |
| d990cedf | 8489 | nowbusy reset [mc "Resetting"] |
| 46308ea1 | 8490 | selbyid $rowmenuid |
| 706d6c3e PM |
8491 | } |
| 8492 | } | |
| 8493 | ||
| a137a90f PM |
8494 | proc readresetstat {fd} { |
| 8495 | global mainhead mainheadid showlocalchanges rprogcoord | |
| 706d6c3e PM |
8496 | |
| 8497 | if {[gets $fd line] >= 0} { | |
| 8498 | if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} { | |
| a137a90f PM |
8499 | set rprogcoord [expr {1.0 * $m / $n}] |
| 8500 | adjustprogress | |
| 706d6c3e PM |
8501 | } |
| 8502 | return 1 | |
| 8503 | } | |
| a137a90f PM |
8504 | set rprogcoord 0 |
| 8505 | adjustprogress | |
| 706d6c3e PM |
8506 | notbusy reset |
| 8507 | if {[catch {close $fd} err]} { | |
| 8508 | error_popup $err | |
| 8509 | } | |
| 8510 | set oldhead $mainheadid | |
| 8511 | set newhead [exec git rev-parse HEAD] | |
| 8512 | if {$newhead ne $oldhead} { | |
| 8513 | movehead $newhead $mainhead | |
| 8514 | movedhead $newhead $mainhead | |
| 8515 | set mainheadid $newhead | |
| 6fb735ae | 8516 | redrawtags $oldhead |
| 706d6c3e | 8517 | redrawtags $newhead |
| 6fb735ae PM |
8518 | } |
| 8519 | if {$showlocalchanges} { | |
| 8520 | doshowlocalchanges | |
| 8521 | } | |
| 706d6c3e | 8522 | return 0 |
| 6fb735ae PM |
8523 | } |
| 8524 | ||
| 10299152 PM |
8525 | # context menu for a head |
| 8526 | proc headmenu {x y id head} { | |
| 00609463 | 8527 | global headmenuid headmenuhead headctxmenu mainhead |
| 10299152 | 8528 | |
| bb3edc8b | 8529 | stopfinding |
| 10299152 PM |
8530 | set headmenuid $id |
| 8531 | set headmenuhead $head | |
| 00609463 PM |
8532 | set state normal |
| 8533 | if {$head eq $mainhead} { | |
| 8534 | set state disabled | |
| 8535 | } | |
| 8536 | $headctxmenu entryconfigure 0 -state $state | |
| 8537 | $headctxmenu entryconfigure 1 -state $state | |
| 10299152 PM |
8538 | tk_popup $headctxmenu $x $y |
| 8539 | } | |
| 8540 | ||
| 8541 | proc cobranch {} { | |
| c11ff120 | 8542 | global headmenuid headmenuhead headids |
| cdc8429c | 8543 | global showlocalchanges |
| 10299152 PM |
8544 | |
| 8545 | # check the tree is clean first?? | |
| d990cedf | 8546 | nowbusy checkout [mc "Checking out"] |
| 10299152 | 8547 | update |
| 219ea3a9 | 8548 | dohidelocalchanges |
| 10299152 | 8549 | if {[catch { |
| 08ba820f | 8550 | set fd [open [list | git checkout $headmenuhead 2>@1] r] |
| 10299152 PM |
8551 | } err]} { |
| 8552 | notbusy checkout | |
| 8553 | error_popup $err | |
| 08ba820f PM |
8554 | if {$showlocalchanges} { |
| 8555 | dodiffindex | |
| 8556 | } | |
| 10299152 | 8557 | } else { |
| 08ba820f PM |
8558 | filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid] |
| 8559 | } | |
| 8560 | } | |
| 8561 | ||
| 8562 | proc readcheckoutstat {fd newhead newheadid} { | |
| 8563 | global mainhead mainheadid headids showlocalchanges progresscoords | |
| cdc8429c | 8564 | global viewmainheadid curview |
| 08ba820f PM |
8565 | |
| 8566 | if {[gets $fd line] >= 0} { | |
| 8567 | if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} { | |
| 8568 | set progresscoords [list 0 [expr {1.0 * $m / $n}]] | |
| 8569 | adjustprogress | |
| 10299152 | 8570 | } |
| 08ba820f PM |
8571 | return 1 |
| 8572 | } | |
| 8573 | set progresscoords {0 0} | |
| 8574 | adjustprogress | |
| 8575 | notbusy checkout | |
| 8576 | if {[catch {close $fd} err]} { | |
| 8577 | error_popup $err | |
| 8578 | } | |
| c11ff120 | 8579 | set oldmainid $mainheadid |
| 08ba820f PM |
8580 | set mainhead $newhead |
| 8581 | set mainheadid $newheadid | |
| cdc8429c | 8582 | set viewmainheadid($curview) $newheadid |
| c11ff120 | 8583 | redrawtags $oldmainid |
| 08ba820f PM |
8584 | redrawtags $newheadid |
| 8585 | selbyid $newheadid | |
| 6fb735ae PM |
8586 | if {$showlocalchanges} { |
| 8587 | dodiffindex | |
| 10299152 PM |
8588 | } |
| 8589 | } | |
| 8590 | ||
| 8591 | proc rmbranch {} { | |
| e11f1233 | 8592 | global headmenuid headmenuhead mainhead |
| b1054ac9 | 8593 | global idheads |
| 10299152 PM |
8594 | |
| 8595 | set head $headmenuhead | |
| 8596 | set id $headmenuid | |
| 00609463 | 8597 | # this check shouldn't be needed any more... |
| 10299152 | 8598 | if {$head eq $mainhead} { |
| d990cedf | 8599 | error_popup [mc "Cannot delete the currently checked-out branch"] |
| 10299152 PM |
8600 | return |
| 8601 | } | |
| e11f1233 | 8602 | set dheads [descheads $id] |
| d7b16113 | 8603 | if {[llength $dheads] == 1 && $idheads($dheads) eq $head} { |
| 10299152 | 8604 | # the stuff on this branch isn't on any other branch |
| d990cedf CS |
8605 | if {![confirm_popup [mc "The commits on branch %s aren't on any other\ |
| 8606 | branch.\nReally delete branch %s?" $head $head]]} return | |
| 10299152 PM |
8607 | } |
| 8608 | nowbusy rmbranch | |
| 8609 | update | |
| 8610 | if {[catch {exec git branch -D $head} err]} { | |
| 8611 | notbusy rmbranch | |
| 8612 | error_popup $err | |
| 8613 | return | |
| 8614 | } | |
| e11f1233 | 8615 | removehead $id $head |
| ca6d8f58 | 8616 | removedhead $id $head |
| 10299152 PM |
8617 | redrawtags $id |
| 8618 | notbusy rmbranch | |
| e11f1233 | 8619 | dispneartags 0 |
| 887c996e PM |
8620 | run refill_reflist |
| 8621 | } | |
| 8622 | ||
| 8623 | # Display a list of tags and heads | |
| 8624 | proc showrefs {} { | |
| 9c311b32 PM |
8625 | global showrefstop bgcolor fgcolor selectbgcolor |
| 8626 | global bglist fglist reflistfilter reflist maincursor | |
| 887c996e PM |
8627 | |
| 8628 | set top .showrefs | |
| 8629 | set showrefstop $top | |
| 8630 | if {[winfo exists $top]} { | |
| 8631 | raise $top | |
| 8632 | refill_reflist | |
| 8633 | return | |
| 8634 | } | |
| 8635 | toplevel $top | |
| d990cedf | 8636 | wm title $top [mc "Tags and heads: %s" [file tail [pwd]]] |
| e7d64008 | 8637 | make_transient $top . |
| 887c996e | 8638 | text $top.list -background $bgcolor -foreground $fgcolor \ |
| 9c311b32 | 8639 | -selectbackground $selectbgcolor -font mainfont \ |
| 887c996e PM |
8640 | -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \ |
| 8641 | -width 30 -height 20 -cursor $maincursor \ | |
| 8642 | -spacing1 1 -spacing3 1 -state disabled | |
| 8643 | $top.list tag configure highlight -background $selectbgcolor | |
| 8644 | lappend bglist $top.list | |
| 8645 | lappend fglist $top.list | |
| 8646 | scrollbar $top.ysb -command "$top.list yview" -orient vertical | |
| 8647 | scrollbar $top.xsb -command "$top.list xview" -orient horizontal | |
| 8648 | grid $top.list $top.ysb -sticky nsew | |
| 8649 | grid $top.xsb x -sticky ew | |
| 8650 | frame $top.f | |
| b039f0a6 PM |
8651 | label $top.f.l -text "[mc "Filter"]: " |
| 8652 | entry $top.f.e -width 20 -textvariable reflistfilter | |
| 887c996e PM |
8653 | set reflistfilter "*" |
| 8654 | trace add variable reflistfilter write reflistfilter_change | |
| 8655 | pack $top.f.e -side right -fill x -expand 1 | |
| 8656 | pack $top.f.l -side left | |
| 8657 | grid $top.f - -sticky ew -pady 2 | |
| b039f0a6 | 8658 | button $top.close -command [list destroy $top] -text [mc "Close"] |
| 76f15947 | 8659 | bind $top <Key-Escape> [list destroy $top] |
| 887c996e PM |
8660 | grid $top.close - |
| 8661 | grid columnconfigure $top 0 -weight 1 | |
| 8662 | grid rowconfigure $top 0 -weight 1 | |
| 8663 | bind $top.list <1> {break} | |
| 8664 | bind $top.list <B1-Motion> {break} | |
| 8665 | bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break} | |
| 8666 | set reflist {} | |
| 8667 | refill_reflist | |
| 8668 | } | |
| 8669 | ||
| 8670 | proc sel_reflist {w x y} { | |
| 8671 | global showrefstop reflist headids tagids otherrefids | |
| 8672 | ||
| 8673 | if {![winfo exists $showrefstop]} return | |
| 8674 | set l [lindex [split [$w index "@$x,$y"] "."] 0] | |
| 8675 | set ref [lindex $reflist [expr {$l-1}]] | |
| 8676 | set n [lindex $ref 0] | |
| 8677 | switch -- [lindex $ref 1] { | |
| 8678 | "H" {selbyid $headids($n)} | |
| 8679 | "T" {selbyid $tagids($n)} | |
| 8680 | "o" {selbyid $otherrefids($n)} | |
| 8681 | } | |
| 8682 | $showrefstop.list tag add highlight $l.0 "$l.0 lineend" | |
| 8683 | } | |
| 8684 | ||
| 8685 | proc unsel_reflist {} { | |
| 8686 | global showrefstop | |
| 8687 | ||
| 8688 | if {![info exists showrefstop] || ![winfo exists $showrefstop]} return | |
| 8689 | $showrefstop.list tag remove highlight 0.0 end | |
| 8690 | } | |
| 8691 | ||
| 8692 | proc reflistfilter_change {n1 n2 op} { | |
| 8693 | global reflistfilter | |
| 8694 | ||
| 8695 | after cancel refill_reflist | |
| 8696 | after 200 refill_reflist | |
| 8697 | } | |
| 8698 | ||
| 8699 | proc refill_reflist {} { | |
| 8700 | global reflist reflistfilter showrefstop headids tagids otherrefids | |
| d375ef9b | 8701 | global curview |
| 887c996e PM |
8702 | |
| 8703 | if {![info exists showrefstop] || ![winfo exists $showrefstop]} return | |
| 8704 | set refs {} | |
| 8705 | foreach n [array names headids] { | |
| 8706 | if {[string match $reflistfilter $n]} { | |
| 7fcc92bf | 8707 | if {[commitinview $headids($n) $curview]} { |
| 887c996e PM |
8708 | lappend refs [list $n H] |
| 8709 | } else { | |
| d375ef9b | 8710 | interestedin $headids($n) {run refill_reflist} |
| 887c996e PM |
8711 | } |
| 8712 | } | |
| 8713 | } | |
| 8714 | foreach n [array names tagids] { | |
| 8715 | if {[string match $reflistfilter $n]} { | |
| 7fcc92bf | 8716 | if {[commitinview $tagids($n) $curview]} { |
| 887c996e PM |
8717 | lappend refs [list $n T] |
| 8718 | } else { | |
| d375ef9b | 8719 | interestedin $tagids($n) {run refill_reflist} |
| 887c996e PM |
8720 | } |
| 8721 | } | |
| 8722 | } | |
| 8723 | foreach n [array names otherrefids] { | |
| 8724 | if {[string match $reflistfilter $n]} { | |
| 7fcc92bf | 8725 | if {[commitinview $otherrefids($n) $curview]} { |
| 887c996e PM |
8726 | lappend refs [list $n o] |
| 8727 | } else { | |
| d375ef9b | 8728 | interestedin $otherrefids($n) {run refill_reflist} |
| 887c996e PM |
8729 | } |
| 8730 | } | |
| 8731 | } | |
| 8732 | set refs [lsort -index 0 $refs] | |
| 8733 | if {$refs eq $reflist} return | |
| 8734 | ||
| 8735 | # Update the contents of $showrefstop.list according to the | |
| 8736 | # differences between $reflist (old) and $refs (new) | |
| 8737 | $showrefstop.list conf -state normal | |
| 8738 | $showrefstop.list insert end "\n" | |
| 8739 | set i 0 | |
| 8740 | set j 0 | |
| 8741 | while {$i < [llength $reflist] || $j < [llength $refs]} { | |
| 8742 | if {$i < [llength $reflist]} { | |
| 8743 | if {$j < [llength $refs]} { | |
| 8744 | set cmp [string compare [lindex $reflist $i 0] \ | |
| 8745 | [lindex $refs $j 0]] | |
| 8746 | if {$cmp == 0} { | |
| 8747 | set cmp [string compare [lindex $reflist $i 1] \ | |
| 8748 | [lindex $refs $j 1]] | |
| 8749 | } | |
| 8750 | } else { | |
| 8751 | set cmp -1 | |
| 8752 | } | |
| 8753 | } else { | |
| 8754 | set cmp 1 | |
| 8755 | } | |
| 8756 | switch -- $cmp { | |
| 8757 | -1 { | |
| 8758 | $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0" | |
| 8759 | incr i | |
| 8760 | } | |
| 8761 | 0 { | |
| 8762 | incr i | |
| 8763 | incr j | |
| 8764 | } | |
| 8765 | 1 { | |
| 8766 | set l [expr {$j + 1}] | |
| 8767 | $showrefstop.list image create $l.0 -align baseline \ | |
| 8768 | -image reficon-[lindex $refs $j 1] -padx 2 | |
| 8769 | $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n" | |
| 8770 | incr j | |
| 8771 | } | |
| 8772 | } | |
| 8773 | } | |
| 8774 | set reflist $refs | |
| 8775 | # delete last newline | |
| 8776 | $showrefstop.list delete end-2c end-1c | |
| 8777 | $showrefstop.list conf -state disabled | |
| 10299152 PM |
8778 | } |
| 8779 | ||
| b8ab2e17 PM |
8780 | # Stuff for finding nearby tags |
| 8781 | proc getallcommits {} { | |
| 5cd15b6b PM |
8782 | global allcommits nextarc seeds allccache allcwait cachedarcs allcupdate |
| 8783 | global idheads idtags idotherrefs allparents tagobjid | |
| f1d83ba3 | 8784 | |
| a69b2d1a | 8785 | if {![info exists allcommits]} { |
| a69b2d1a PM |
8786 | set nextarc 0 |
| 8787 | set allcommits 0 | |
| 8788 | set seeds {} | |
| 5cd15b6b PM |
8789 | set allcwait 0 |
| 8790 | set cachedarcs 0 | |
| 8791 | set allccache [file join [gitdir] "gitk.cache"] | |
| 8792 | if {![catch { | |
| 8793 | set f [open $allccache r] | |
| 8794 | set allcwait 1 | |
| 8795 | getcache $f | |
| 8796 | }]} return | |
| a69b2d1a | 8797 | } |
| 2d71bccc | 8798 | |
| 5cd15b6b PM |
8799 | if {$allcwait} { |
| 8800 | return | |
| 8801 | } | |
| 8802 | set cmd [list | git rev-list --parents] | |
| 8803 | set allcupdate [expr {$seeds ne {}}] | |
| 8804 | if {!$allcupdate} { | |
| 8805 | set ids "--all" | |
| 8806 | } else { | |
| 8807 | set refs [concat [array names idheads] [array names idtags] \ | |
| 8808 | [array names idotherrefs]] | |
| 8809 | set ids {} | |
| 8810 | set tagobjs {} | |
| 8811 | foreach name [array names tagobjid] { | |
| 8812 | lappend tagobjs $tagobjid($name) | |
| 8813 | } | |
| 8814 | foreach id [lsort -unique $refs] { | |
| 8815 | if {![info exists allparents($id)] && | |
| 8816 | [lsearch -exact $tagobjs $id] < 0} { | |
| 8817 | lappend ids $id | |
| 8818 | } | |
| 8819 | } | |
| 8820 | if {$ids ne {}} { | |
| 8821 | foreach id $seeds { | |
| 8822 | lappend ids "^$id" | |
| 8823 | } | |
| 8824 | } | |
| 8825 | } | |
| 8826 | if {$ids ne {}} { | |
| 8827 | set fd [open [concat $cmd $ids] r] | |
| 8828 | fconfigure $fd -blocking 0 | |
| 8829 | incr allcommits | |
| 8830 | nowbusy allcommits | |
| 8831 | filerun $fd [list getallclines $fd] | |
| 8832 | } else { | |
| 8833 | dispneartags 0 | |
| 2d71bccc | 8834 | } |
| e11f1233 PM |
8835 | } |
| 8836 | ||
| 8837 | # Since most commits have 1 parent and 1 child, we group strings of | |
| 8838 | # such commits into "arcs" joining branch/merge points (BMPs), which | |
| 8839 | # are commits that either don't have 1 parent or don't have 1 child. | |
| 8840 | # | |
| 8841 | # arcnos(id) - incoming arcs for BMP, arc we're on for other nodes | |
| 8842 | # arcout(id) - outgoing arcs for BMP | |
| 8843 | # arcids(a) - list of IDs on arc including end but not start | |
| 8844 | # arcstart(a) - BMP ID at start of arc | |
| 8845 | # arcend(a) - BMP ID at end of arc | |
| 8846 | # growing(a) - arc a is still growing | |
| 8847 | # arctags(a) - IDs out of arcids (excluding end) that have tags | |
| 8848 | # archeads(a) - IDs out of arcids (excluding end) that have heads | |
| 8849 | # The start of an arc is at the descendent end, so "incoming" means | |
| 8850 | # coming from descendents, and "outgoing" means going towards ancestors. | |
| 8851 | ||
| 8852 | proc getallclines {fd} { | |
| 5cd15b6b | 8853 | global allparents allchildren idtags idheads nextarc |
| e11f1233 | 8854 | global arcnos arcids arctags arcout arcend arcstart archeads growing |
| 5cd15b6b PM |
8855 | global seeds allcommits cachedarcs allcupdate |
| 8856 | ||
| e11f1233 | 8857 | set nid 0 |
| 7eb3cb9c | 8858 | while {[incr nid] <= 1000 && [gets $fd line] >= 0} { |
| e11f1233 PM |
8859 | set id [lindex $line 0] |
| 8860 | if {[info exists allparents($id)]} { | |
| 8861 | # seen it already | |
| 8862 | continue | |
| 8863 | } | |
| 5cd15b6b | 8864 | set cachedarcs 0 |
| e11f1233 PM |
8865 | set olds [lrange $line 1 end] |
| 8866 | set allparents($id) $olds | |
| 8867 | if {![info exists allchildren($id)]} { | |
| 8868 | set allchildren($id) {} | |
| 8869 | set arcnos($id) {} | |
| 8870 | lappend seeds $id | |
| 8871 | } else { | |
| 8872 | set a $arcnos($id) | |
| 8873 | if {[llength $olds] == 1 && [llength $a] == 1} { | |
| 8874 | lappend arcids($a) $id | |
| 8875 | if {[info exists idtags($id)]} { | |
| 8876 | lappend arctags($a) $id | |
| b8ab2e17 | 8877 | } |
| e11f1233 PM |
8878 | if {[info exists idheads($id)]} { |
| 8879 | lappend archeads($a) $id | |
| 8880 | } | |
| 8881 | if {[info exists allparents($olds)]} { | |
| 8882 | # seen parent already | |
| 8883 | if {![info exists arcout($olds)]} { | |
| 8884 | splitarc $olds | |
| 8885 | } | |
| 8886 | lappend arcids($a) $olds | |
| 8887 | set arcend($a) $olds | |
| 8888 | unset growing($a) | |
| 8889 | } | |
| 8890 | lappend allchildren($olds) $id | |
| 8891 | lappend arcnos($olds) $a | |
| 8892 | continue | |
| 8893 | } | |
| 8894 | } | |
| e11f1233 PM |
8895 | foreach a $arcnos($id) { |
| 8896 | lappend arcids($a) $id | |
| 8897 | set arcend($a) $id | |
| 8898 | unset growing($a) | |
| 8899 | } | |
| 8900 | ||
| 8901 | set ao {} | |
| 8902 | foreach p $olds { | |
| 8903 | lappend allchildren($p) $id | |
| 8904 | set a [incr nextarc] | |
| 8905 | set arcstart($a) $id | |
| 8906 | set archeads($a) {} | |
| 8907 | set arctags($a) {} | |
| 8908 | set archeads($a) {} | |
| 8909 | set arcids($a) {} | |
| 8910 | lappend ao $a | |
| 8911 | set growing($a) 1 | |
| 8912 | if {[info exists allparents($p)]} { | |
| 8913 | # seen it already, may need to make a new branch | |
| 8914 | if {![info exists arcout($p)]} { | |
| 8915 | splitarc $p | |
| 8916 | } | |
| 8917 | lappend arcids($a) $p | |
| 8918 | set arcend($a) $p | |
| 8919 | unset growing($a) | |
| 8920 | } | |
| 8921 | lappend arcnos($p) $a | |
| 8922 | } | |
| 8923 | set arcout($id) $ao | |
| f1d83ba3 | 8924 | } |
| f3326b66 PM |
8925 | if {$nid > 0} { |
| 8926 | global cached_dheads cached_dtags cached_atags | |
| 8927 | catch {unset cached_dheads} | |
| 8928 | catch {unset cached_dtags} | |
| 8929 | catch {unset cached_atags} | |
| 8930 | } | |
| 7eb3cb9c PM |
8931 | if {![eof $fd]} { |
| 8932 | return [expr {$nid >= 1000? 2: 1}] | |
| 8933 | } | |
| 5cd15b6b PM |
8934 | set cacheok 1 |
| 8935 | if {[catch { | |
| 8936 | fconfigure $fd -blocking 1 | |
| 8937 | close $fd | |
| 8938 | } err]} { | |
| 8939 | # got an error reading the list of commits | |
| 8940 | # if we were updating, try rereading the whole thing again | |
| 8941 | if {$allcupdate} { | |
| 8942 | incr allcommits -1 | |
| 8943 | dropcache $err | |
| 8944 | return | |
| 8945 | } | |
| d990cedf | 8946 | error_popup "[mc "Error reading commit topology information;\ |
| 5cd15b6b | 8947 | branch and preceding/following tag information\ |
| d990cedf | 8948 | will be incomplete."]\n($err)" |
| 5cd15b6b PM |
8949 | set cacheok 0 |
| 8950 | } | |
| e11f1233 PM |
8951 | if {[incr allcommits -1] == 0} { |
| 8952 | notbusy allcommits | |
| 5cd15b6b PM |
8953 | if {$cacheok} { |
| 8954 | run savecache | |
| 8955 | } | |
| e11f1233 PM |
8956 | } |
| 8957 | dispneartags 0 | |
| 7eb3cb9c | 8958 | return 0 |
| b8ab2e17 PM |
8959 | } |
| 8960 | ||
| e11f1233 PM |
8961 | proc recalcarc {a} { |
| 8962 | global arctags archeads arcids idtags idheads | |
| b8ab2e17 | 8963 | |
| e11f1233 PM |
8964 | set at {} |
| 8965 | set ah {} | |
| 8966 | foreach id [lrange $arcids($a) 0 end-1] { | |
| 8967 | if {[info exists idtags($id)]} { | |
| 8968 | lappend at $id | |
| 8969 | } | |
| 8970 | if {[info exists idheads($id)]} { | |
| 8971 | lappend ah $id | |
| b8ab2e17 | 8972 | } |
| f1d83ba3 | 8973 | } |
| e11f1233 PM |
8974 | set arctags($a) $at |
| 8975 | set archeads($a) $ah | |
| b8ab2e17 PM |
8976 | } |
| 8977 | ||
| e11f1233 | 8978 | proc splitarc {p} { |
| 5cd15b6b | 8979 | global arcnos arcids nextarc arctags archeads idtags idheads |
| e11f1233 | 8980 | global arcstart arcend arcout allparents growing |
| cec7bece | 8981 | |
| e11f1233 PM |
8982 | set a $arcnos($p) |
| 8983 | if {[llength $a] != 1} { | |
| 8984 | puts "oops splitarc called but [llength $a] arcs already" | |
| 8985 | return | |
| 8986 | } | |
| 8987 | set a [lindex $a 0] | |
| 8988 | set i [lsearch -exact $arcids($a) $p] | |
| 8989 | if {$i < 0} { | |
| 8990 | puts "oops splitarc $p not in arc $a" | |
| 8991 | return | |
| 8992 | } | |
| 8993 | set na [incr nextarc] | |
| 8994 | if {[info exists arcend($a)]} { | |
| 8995 | set arcend($na) $arcend($a) | |
| 8996 | } else { | |
| 8997 | set l [lindex $allparents([lindex $arcids($a) end]) 0] | |
| 8998 | set j [lsearch -exact $arcnos($l) $a] | |
| 8999 | set arcnos($l) [lreplace $arcnos($l) $j $j $na] | |
| 9000 | } | |
| 9001 | set tail [lrange $arcids($a) [expr {$i+1}] end] | |
| 9002 | set arcids($a) [lrange $arcids($a) 0 $i] | |
| 9003 | set arcend($a) $p | |
| 9004 | set arcstart($na) $p | |
| 9005 | set arcout($p) $na | |
| 9006 | set arcids($na) $tail | |
| 9007 | if {[info exists growing($a)]} { | |
| 9008 | set growing($na) 1 | |
| 9009 | unset growing($a) | |
| 9010 | } | |
| e11f1233 PM |
9011 | |
| 9012 | foreach id $tail { | |
| 9013 | if {[llength $arcnos($id)] == 1} { | |
| 9014 | set arcnos($id) $na | |
| cec7bece | 9015 | } else { |
| e11f1233 PM |
9016 | set j [lsearch -exact $arcnos($id) $a] |
| 9017 | set arcnos($id) [lreplace $arcnos($id) $j $j $na] | |
| cec7bece | 9018 | } |
| e11f1233 PM |
9019 | } |
| 9020 | ||
| 9021 | # reconstruct tags and heads lists | |
| 9022 | if {$arctags($a) ne {} || $archeads($a) ne {}} { | |
| 9023 | recalcarc $a | |
| 9024 | recalcarc $na | |
| 9025 | } else { | |
| 9026 | set arctags($na) {} | |
| 9027 | set archeads($na) {} | |
| 9028 | } | |
| 9029 | } | |
| 9030 | ||
| 9031 | # Update things for a new commit added that is a child of one | |
| 9032 | # existing commit. Used when cherry-picking. | |
| 9033 | proc addnewchild {id p} { | |
| 5cd15b6b | 9034 | global allparents allchildren idtags nextarc |
| e11f1233 | 9035 | global arcnos arcids arctags arcout arcend arcstart archeads growing |
| 719c2b9d | 9036 | global seeds allcommits |
| e11f1233 | 9037 | |
| 3ebba3c7 | 9038 | if {![info exists allcommits] || ![info exists arcnos($p)]} return |
| e11f1233 PM |
9039 | set allparents($id) [list $p] |
| 9040 | set allchildren($id) {} | |
| 9041 | set arcnos($id) {} | |
| 9042 | lappend seeds $id | |
| e11f1233 PM |
9043 | lappend allchildren($p) $id |
| 9044 | set a [incr nextarc] | |
| 9045 | set arcstart($a) $id | |
| 9046 | set archeads($a) {} | |
| 9047 | set arctags($a) {} | |
| 9048 | set arcids($a) [list $p] | |
| 9049 | set arcend($a) $p | |
| 9050 | if {![info exists arcout($p)]} { | |
| 9051 | splitarc $p | |
| 9052 | } | |
| 9053 | lappend arcnos($p) $a | |
| 9054 | set arcout($id) [list $a] | |
| 9055 | } | |
| 9056 | ||
| 5cd15b6b PM |
9057 | # This implements a cache for the topology information. |
| 9058 | # The cache saves, for each arc, the start and end of the arc, | |
| 9059 | # the ids on the arc, and the outgoing arcs from the end. | |
| 9060 | proc readcache {f} { | |
| 9061 | global arcnos arcids arcout arcstart arcend arctags archeads nextarc | |
| 9062 | global idtags idheads allparents cachedarcs possible_seeds seeds growing | |
| 9063 | global allcwait | |
| 9064 | ||
| 9065 | set a $nextarc | |
| 9066 | set lim $cachedarcs | |
| 9067 | if {$lim - $a > 500} { | |
| 9068 | set lim [expr {$a + 500}] | |
| 9069 | } | |
| 9070 | if {[catch { | |
| 9071 | if {$a == $lim} { | |
| 9072 | # finish reading the cache and setting up arctags, etc. | |
| 9073 | set line [gets $f] | |
| 9074 | if {$line ne "1"} {error "bad final version"} | |
| 9075 | close $f | |
| 9076 | foreach id [array names idtags] { | |
| 9077 | if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 && | |
| 9078 | [llength $allparents($id)] == 1} { | |
| 9079 | set a [lindex $arcnos($id) 0] | |
| 9080 | if {$arctags($a) eq {}} { | |
| 9081 | recalcarc $a | |
| 9082 | } | |
| 9083 | } | |
| 9084 | } | |
| 9085 | foreach id [array names idheads] { | |
| 9086 | if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 && | |
| 9087 | [llength $allparents($id)] == 1} { | |
| 9088 | set a [lindex $arcnos($id) 0] | |
| 9089 | if {$archeads($a) eq {}} { | |
| 9090 | recalcarc $a | |
| 9091 | } | |
| 9092 | } | |
| 9093 | } | |
| 9094 | foreach id [lsort -unique $possible_seeds] { | |
| 9095 | if {$arcnos($id) eq {}} { | |
| 9096 | lappend seeds $id | |
| 9097 | } | |
| 9098 | } | |
| 9099 | set allcwait 0 | |
| 9100 | } else { | |
| 9101 | while {[incr a] <= $lim} { | |
| 9102 | set line [gets $f] | |
| 9103 | if {[llength $line] != 3} {error "bad line"} | |
| 9104 | set s [lindex $line 0] | |
| 9105 | set arcstart($a) $s | |
| 9106 | lappend arcout($s) $a | |
| 9107 | if {![info exists arcnos($s)]} { | |
| 9108 | lappend possible_seeds $s | |
| 9109 | set arcnos($s) {} | |
| 9110 | } | |
| 9111 | set e [lindex $line 1] | |
| 9112 | if {$e eq {}} { | |
| 9113 | set growing($a) 1 | |
| 9114 | } else { | |
| 9115 | set arcend($a) $e | |
| 9116 | if {![info exists arcout($e)]} { | |
| 9117 | set arcout($e) {} | |
| 9118 | } | |
| 9119 | } | |
| 9120 | set arcids($a) [lindex $line 2] | |
| 9121 | foreach id $arcids($a) { | |
| 9122 | lappend allparents($s) $id | |
| 9123 | set s $id | |
| 9124 | lappend arcnos($id) $a | |
| 9125 | } | |
| 9126 | if {![info exists allparents($s)]} { | |
| 9127 | set allparents($s) {} | |
| 9128 | } | |
| 9129 | set arctags($a) {} | |
| 9130 | set archeads($a) {} | |
| 9131 | } | |
| 9132 | set nextarc [expr {$a - 1}] | |
| 9133 | } | |
| 9134 | } err]} { | |
| 9135 | dropcache $err | |
| 9136 | return 0 | |
| 9137 | } | |
| 9138 | if {!$allcwait} { | |
| 9139 | getallcommits | |
| 9140 | } | |
| 9141 | return $allcwait | |
| 9142 | } | |
| 9143 | ||
| 9144 | proc getcache {f} { | |
| 9145 | global nextarc cachedarcs possible_seeds | |
| 9146 | ||
| 9147 | if {[catch { | |
| 9148 | set line [gets $f] | |
| 9149 | if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"} | |
| 9150 | # make sure it's an integer | |
| 9151 | set cachedarcs [expr {int([lindex $line 1])}] | |
| 9152 | if {$cachedarcs < 0} {error "bad number of arcs"} | |
| 9153 | set nextarc 0 | |
| 9154 | set possible_seeds {} | |
| 9155 | run readcache $f | |
| 9156 | } err]} { | |
| 9157 | dropcache $err | |
| 9158 | } | |
| 9159 | return 0 | |
| 9160 | } | |
| 9161 | ||
| 9162 | proc dropcache {err} { | |
| 9163 | global allcwait nextarc cachedarcs seeds | |
| 9164 | ||
| 9165 | #puts "dropping cache ($err)" | |
| 9166 | foreach v {arcnos arcout arcids arcstart arcend growing \ | |
| 9167 | arctags archeads allparents allchildren} { | |
| 9168 | global $v | |
| 9169 | catch {unset $v} | |
| 9170 | } | |
| 9171 | set allcwait 0 | |
| 9172 | set nextarc 0 | |
| 9173 | set cachedarcs 0 | |
| 9174 | set seeds {} | |
| 9175 | getallcommits | |
| 9176 | } | |
| 9177 | ||
| 9178 | proc writecache {f} { | |
| 9179 | global cachearc cachedarcs allccache | |
| 9180 | global arcstart arcend arcnos arcids arcout | |
| 9181 | ||
| 9182 | set a $cachearc | |
| 9183 | set lim $cachedarcs | |
| 9184 | if {$lim - $a > 1000} { | |
| 9185 | set lim [expr {$a + 1000}] | |
| 9186 | } | |
| 9187 | if {[catch { | |
| 9188 | while {[incr a] <= $lim} { | |
| 9189 | if {[info exists arcend($a)]} { | |
| 9190 | puts $f [list $arcstart($a) $arcend($a) $arcids($a)] | |
| 9191 | } else { | |
| 9192 | puts $f [list $arcstart($a) {} $arcids($a)] | |
| 9193 | } | |
| 9194 | } | |
| 9195 | } err]} { | |
| 9196 | catch {close $f} | |
| 9197 | catch {file delete $allccache} | |
| 9198 | #puts "writing cache failed ($err)" | |
| 9199 | return 0 | |
| 9200 | } | |
| 9201 | set cachearc [expr {$a - 1}] | |
| 9202 | if {$a > $cachedarcs} { | |
| 9203 | puts $f "1" | |
| 9204 | close $f | |
| 9205 | return 0 | |
| 9206 | } | |
| 9207 | return 1 | |
| 9208 | } | |
| 9209 | ||
| 9210 | proc savecache {} { | |
| 9211 | global nextarc cachedarcs cachearc allccache | |
| 9212 | ||
| 9213 | if {$nextarc == $cachedarcs} return | |
| 9214 | set cachearc 0 | |
| 9215 | set cachedarcs $nextarc | |
| 9216 | catch { | |
| 9217 | set f [open $allccache w] | |
| 9218 | puts $f [list 1 $cachedarcs] | |
| 9219 | run writecache $f | |
| 9220 | } | |
| 9221 | } | |
| 9222 | ||
| e11f1233 PM |
9223 | # Returns 1 if a is an ancestor of b, -1 if b is an ancestor of a, |
| 9224 | # or 0 if neither is true. | |
| 9225 | proc anc_or_desc {a b} { | |
| 9226 | global arcout arcstart arcend arcnos cached_isanc | |
| 9227 | ||
| 9228 | if {$arcnos($a) eq $arcnos($b)} { | |
| 9229 | # Both are on the same arc(s); either both are the same BMP, | |
| 9230 | # or if one is not a BMP, the other is also not a BMP or is | |
| 9231 | # the BMP at end of the arc (and it only has 1 incoming arc). | |
| 69c0b5d2 PM |
9232 | # Or both can be BMPs with no incoming arcs. |
| 9233 | if {$a eq $b || $arcnos($a) eq {}} { | |
| e11f1233 | 9234 | return 0 |
| cec7bece | 9235 | } |
| e11f1233 PM |
9236 | # assert {[llength $arcnos($a)] == 1} |
| 9237 | set arc [lindex $arcnos($a) 0] | |
| 9238 | set i [lsearch -exact $arcids($arc) $a] | |
| 9239 | set j [lsearch -exact $arcids($arc) $b] | |
| 9240 | if {$i < 0 || $i > $j} { | |
| 9241 | return 1 | |
| 9242 | } else { | |
| 9243 | return -1 | |
| cec7bece PM |
9244 | } |
| 9245 | } | |
| e11f1233 PM |
9246 | |
| 9247 | if {![info exists arcout($a)]} { | |
| 9248 | set arc [lindex $arcnos($a) 0] | |
| 9249 | if {[info exists arcend($arc)]} { | |
| 9250 | set aend $arcend($arc) | |
| 9251 | } else { | |
| 9252 | set aend {} | |
| cec7bece | 9253 | } |
| e11f1233 PM |
9254 | set a $arcstart($arc) |
| 9255 | } else { | |
| 9256 | set aend $a | |
| 9257 | } | |
| 9258 | if {![info exists arcout($b)]} { | |
| 9259 | set arc [lindex $arcnos($b) 0] | |
| 9260 | if {[info exists arcend($arc)]} { | |
| 9261 | set bend $arcend($arc) | |
| 9262 | } else { | |
| 9263 | set bend {} | |
| cec7bece | 9264 | } |
| e11f1233 PM |
9265 | set b $arcstart($arc) |
| 9266 | } else { | |
| 9267 | set bend $b | |
| cec7bece | 9268 | } |
| e11f1233 PM |
9269 | if {$a eq $bend} { |
| 9270 | return 1 | |
| 9271 | } | |
| 9272 | if {$b eq $aend} { | |
| 9273 | return -1 | |
| 9274 | } | |
| 9275 | if {[info exists cached_isanc($a,$bend)]} { | |
| 9276 | if {$cached_isanc($a,$bend)} { | |
| 9277 | return 1 | |
| 9278 | } | |
| 9279 | } | |
| 9280 | if {[info exists cached_isanc($b,$aend)]} { | |
| 9281 | if {$cached_isanc($b,$aend)} { | |
| 9282 | return -1 | |
| 9283 | } | |
| 9284 | if {[info exists cached_isanc($a,$bend)]} { | |
| 9285 | return 0 | |
| 9286 | } | |
| cec7bece | 9287 | } |
| cec7bece | 9288 | |
| e11f1233 PM |
9289 | set todo [list $a $b] |
| 9290 | set anc($a) a | |
| 9291 | set anc($b) b | |
| 9292 | for {set i 0} {$i < [llength $todo]} {incr i} { | |
| 9293 | set x [lindex $todo $i] | |
| 9294 | if {$anc($x) eq {}} { | |
| 9295 | continue | |
| 9296 | } | |
| 9297 | foreach arc $arcnos($x) { | |
| 9298 | set xd $arcstart($arc) | |
| 9299 | if {$xd eq $bend} { | |
| 9300 | set cached_isanc($a,$bend) 1 | |
| 9301 | set cached_isanc($b,$aend) 0 | |
| 9302 | return 1 | |
| 9303 | } elseif {$xd eq $aend} { | |
| 9304 | set cached_isanc($b,$aend) 1 | |
| 9305 | set cached_isanc($a,$bend) 0 | |
| 9306 | return -1 | |
| 9307 | } | |
| 9308 | if {![info exists anc($xd)]} { | |
| 9309 | set anc($xd) $anc($x) | |
| 9310 | lappend todo $xd | |
| 9311 | } elseif {$anc($xd) ne $anc($x)} { | |
| 9312 | set anc($xd) {} | |
| 9313 | } | |
| 9314 | } | |
| 9315 | } | |
| 9316 | set cached_isanc($a,$bend) 0 | |
| 9317 | set cached_isanc($b,$aend) 0 | |
| 9318 | return 0 | |
| 9319 | } | |
| b8ab2e17 | 9320 | |
| e11f1233 PM |
9321 | # This identifies whether $desc has an ancestor that is |
| 9322 | # a growing tip of the graph and which is not an ancestor of $anc | |
| 9323 | # and returns 0 if so and 1 if not. | |
| 9324 | # If we subsequently discover a tag on such a growing tip, and that | |
| 9325 | # turns out to be a descendent of $anc (which it could, since we | |
| 9326 | # don't necessarily see children before parents), then $desc | |
| 9327 | # isn't a good choice to display as a descendent tag of | |
| 9328 | # $anc (since it is the descendent of another tag which is | |
| 9329 | # a descendent of $anc). Similarly, $anc isn't a good choice to | |
| 9330 | # display as a ancestor tag of $desc. | |
| 9331 | # | |
| 9332 | proc is_certain {desc anc} { | |
| 9333 | global arcnos arcout arcstart arcend growing problems | |
| 9334 | ||
| 9335 | set certain {} | |
| 9336 | if {[llength $arcnos($anc)] == 1} { | |
| 9337 | # tags on the same arc are certain | |
| 9338 | if {$arcnos($desc) eq $arcnos($anc)} { | |
| 9339 | return 1 | |
| b8ab2e17 | 9340 | } |
| e11f1233 PM |
9341 | if {![info exists arcout($anc)]} { |
| 9342 | # if $anc is partway along an arc, use the start of the arc instead | |
| 9343 | set a [lindex $arcnos($anc) 0] | |
| 9344 | set anc $arcstart($a) | |
| b8ab2e17 | 9345 | } |
| e11f1233 PM |
9346 | } |
| 9347 | if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} { | |
| 9348 | set x $desc | |
| 9349 | } else { | |
| 9350 | set a [lindex $arcnos($desc) 0] | |
| 9351 | set x $arcend($a) | |
| 9352 | } | |
| 9353 | if {$x == $anc} { | |
| 9354 | return 1 | |
| 9355 | } | |
| 9356 | set anclist [list $x] | |
| 9357 | set dl($x) 1 | |
| 9358 | set nnh 1 | |
| 9359 | set ngrowanc 0 | |
| 9360 | for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} { | |
| 9361 | set x [lindex $anclist $i] | |
| 9362 | if {$dl($x)} { | |
| 9363 | incr nnh -1 | |
| 9364 | } | |
| 9365 | set done($x) 1 | |
| 9366 | foreach a $arcout($x) { | |
| 9367 | if {[info exists growing($a)]} { | |
| 9368 | if {![info exists growanc($x)] && $dl($x)} { | |
| 9369 | set growanc($x) 1 | |
| 9370 | incr ngrowanc | |
| 9371 | } | |
| 9372 | } else { | |
| 9373 | set y $arcend($a) | |
| 9374 | if {[info exists dl($y)]} { | |
| 9375 | if {$dl($y)} { | |
| 9376 | if {!$dl($x)} { | |
| 9377 | set dl($y) 0 | |
| 9378 | if {![info exists done($y)]} { | |
| 9379 | incr nnh -1 | |
| 9380 | } | |
| 9381 | if {[info exists growanc($x)]} { | |
| 9382 | incr ngrowanc -1 | |
| 9383 | } | |
| 9384 | set xl [list $y] | |
| 9385 | for {set k 0} {$k < [llength $xl]} {incr k} { | |
| 9386 | set z [lindex $xl $k] | |
| 9387 | foreach c $arcout($z) { | |
| 9388 | if {[info exists arcend($c)]} { | |
| 9389 | set v $arcend($c) | |
| 9390 | if {[info exists dl($v)] && $dl($v)} { | |
| 9391 | set dl($v) 0 | |
| 9392 | if {![info exists done($v)]} { | |
| 9393 | incr nnh -1 | |
| 9394 | } | |
| 9395 | if {[info exists growanc($v)]} { | |
| 9396 | incr ngrowanc -1 | |
| 9397 | } | |
| 9398 | lappend xl $v | |
| 9399 | } | |
| 9400 | } | |
| 9401 | } | |
| 9402 | } | |
| 9403 | } | |
| 9404 | } | |
| 9405 | } elseif {$y eq $anc || !$dl($x)} { | |
| 9406 | set dl($y) 0 | |
| 9407 | lappend anclist $y | |
| 9408 | } else { | |
| 9409 | set dl($y) 1 | |
| 9410 | lappend anclist $y | |
| 9411 | incr nnh | |
| 9412 | } | |
| 9413 | } | |
| b8ab2e17 PM |
9414 | } |
| 9415 | } | |
| e11f1233 PM |
9416 | foreach x [array names growanc] { |
| 9417 | if {$dl($x)} { | |
| 9418 | return 0 | |
| b8ab2e17 | 9419 | } |
| 7eb3cb9c | 9420 | return 0 |
| b8ab2e17 | 9421 | } |
| e11f1233 | 9422 | return 1 |
| b8ab2e17 PM |
9423 | } |
| 9424 | ||
| e11f1233 PM |
9425 | proc validate_arctags {a} { |
| 9426 | global arctags idtags | |
| b8ab2e17 | 9427 | |
| e11f1233 PM |
9428 | set i -1 |
| 9429 | set na $arctags($a) | |
| 9430 | foreach id $arctags($a) { | |
| 9431 | incr i | |
| 9432 | if {![info exists idtags($id)]} { | |
| 9433 | set na [lreplace $na $i $i] | |
| 9434 | incr i -1 | |
| 9435 | } | |
| 9436 | } | |
| 9437 | set arctags($a) $na | |
| 9438 | } | |
| 9439 | ||
| 9440 | proc validate_archeads {a} { | |
| 9441 | global archeads idheads | |
| 9442 | ||
| 9443 | set i -1 | |
| 9444 | set na $archeads($a) | |
| 9445 | foreach id $archeads($a) { | |
| 9446 | incr i | |
| 9447 | if {![info exists idheads($id)]} { | |
| 9448 | set na [lreplace $na $i $i] | |
| 9449 | incr i -1 | |
| 9450 | } | |
| 9451 | } | |
| 9452 | set archeads($a) $na | |
| 9453 | } | |
| 9454 | ||
| 9455 | # Return the list of IDs that have tags that are descendents of id, | |
| 9456 | # ignoring IDs that are descendents of IDs already reported. | |
| 9457 | proc desctags {id} { | |
| 9458 | global arcnos arcstart arcids arctags idtags allparents | |
| 9459 | global growing cached_dtags | |
| 9460 | ||
| 9461 | if {![info exists allparents($id)]} { | |
| 9462 | return {} | |
| 9463 | } | |
| 9464 | set t1 [clock clicks -milliseconds] | |
| 9465 | set argid $id | |
| 9466 | if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} { | |
| 9467 | # part-way along an arc; check that arc first | |
| 9468 | set a [lindex $arcnos($id) 0] | |
| 9469 | if {$arctags($a) ne {}} { | |
| 9470 | validate_arctags $a | |
| 9471 | set i [lsearch -exact $arcids($a) $id] | |
| 9472 | set tid {} | |
| 9473 | foreach t $arctags($a) { | |
| 9474 | set j [lsearch -exact $arcids($a) $t] | |
| 9475 | if {$j >= $i} break | |
| 9476 | set tid $t | |
| b8ab2e17 | 9477 | } |
| e11f1233 PM |
9478 | if {$tid ne {}} { |
| 9479 | return $tid | |
| b8ab2e17 PM |
9480 | } |
| 9481 | } | |
| e11f1233 PM |
9482 | set id $arcstart($a) |
| 9483 | if {[info exists idtags($id)]} { | |
| 9484 | return $id | |
| 9485 | } | |
| 9486 | } | |
| 9487 | if {[info exists cached_dtags($id)]} { | |
| 9488 | return $cached_dtags($id) | |
| 9489 | } | |
| 9490 | ||
| 9491 | set origid $id | |
| 9492 | set todo [list $id] | |
| 9493 | set queued($id) 1 | |
| 9494 | set nc 1 | |
| 9495 | for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} { | |
| 9496 | set id [lindex $todo $i] | |
| 9497 | set done($id) 1 | |
| 9498 | set ta [info exists hastaggedancestor($id)] | |
| 9499 | if {!$ta} { | |
| 9500 | incr nc -1 | |
| 9501 | } | |
| 9502 | # ignore tags on starting node | |
| 9503 | if {!$ta && $i > 0} { | |
| 9504 | if {[info exists idtags($id)]} { | |
| 9505 | set tagloc($id) $id | |
| 9506 | set ta 1 | |
| 9507 | } elseif {[info exists cached_dtags($id)]} { | |
| 9508 | set tagloc($id) $cached_dtags($id) | |
| 9509 | set ta 1 | |
| 9510 | } | |
| 9511 | } | |
| 9512 | foreach a $arcnos($id) { | |
| 9513 | set d $arcstart($a) | |
| 9514 | if {!$ta && $arctags($a) ne {}} { | |
| 9515 | validate_arctags $a | |
| 9516 | if {$arctags($a) ne {}} { | |
| 9517 | lappend tagloc($id) [lindex $arctags($a) end] | |
| 9518 | } | |
| 9519 | } | |
| 9520 | if {$ta || $arctags($a) ne {}} { | |
| 9521 | set tomark [list $d] | |
| 9522 | for {set j 0} {$j < [llength $tomark]} {incr j} { | |
| 9523 | set dd [lindex $tomark $j] | |
| 9524 | if {![info exists hastaggedancestor($dd)]} { | |
| 9525 | if {[info exists done($dd)]} { | |
| 9526 | foreach b $arcnos($dd) { | |
| 9527 | lappend tomark $arcstart($b) | |
| 9528 | } | |
| 9529 | if {[info exists tagloc($dd)]} { | |
| 9530 | unset tagloc($dd) | |
| 9531 | } | |
| 9532 | } elseif {[info exists queued($dd)]} { | |
| 9533 | incr nc -1 | |
| 9534 | } | |
| 9535 | set hastaggedancestor($dd) 1 | |
| 9536 | } | |
| 9537 | } | |
| 9538 | } | |
| 9539 | if {![info exists queued($d)]} { | |
| 9540 | lappend todo $d | |
| 9541 | set queued($d) 1 | |
| 9542 | if {![info exists hastaggedancestor($d)]} { | |
| 9543 | incr nc | |
| 9544 | } | |
| 9545 | } | |
| b8ab2e17 | 9546 | } |
| f1d83ba3 | 9547 | } |
| e11f1233 PM |
9548 | set tags {} |
| 9549 | foreach id [array names tagloc] { | |
| 9550 | if {![info exists hastaggedancestor($id)]} { | |
| 9551 | foreach t $tagloc($id) { | |
| 9552 | if {[lsearch -exact $tags $t] < 0} { | |
| 9553 | lappend tags $t | |
| 9554 | } | |
| 9555 | } | |
| 9556 | } | |
| 9557 | } | |
| 9558 | set t2 [clock clicks -milliseconds] | |
| 9559 | set loopix $i | |
| f1d83ba3 | 9560 | |
| e11f1233 PM |
9561 | # remove tags that are descendents of other tags |
| 9562 | for {set i 0} {$i < [llength $tags]} {incr i} { | |
| 9563 | set a [lindex $tags $i] | |
| 9564 | for {set j 0} {$j < $i} {incr j} { | |
| 9565 | set b [lindex $tags $j] | |
| 9566 | set r [anc_or_desc $a $b] | |
| 9567 | if {$r == 1} { | |
| 9568 | set tags [lreplace $tags $j $j] | |
| 9569 | incr j -1 | |
| 9570 | incr i -1 | |
| 9571 | } elseif {$r == -1} { | |
| 9572 | set tags [lreplace $tags $i $i] | |
| 9573 | incr i -1 | |
| 9574 | break | |
| ceadfe90 PM |
9575 | } |
| 9576 | } | |
| 9577 | } | |
| 9578 | ||
| e11f1233 PM |
9579 | if {[array names growing] ne {}} { |
| 9580 | # graph isn't finished, need to check if any tag could get | |
| 9581 | # eclipsed by another tag coming later. Simply ignore any | |
| 9582 | # tags that could later get eclipsed. | |
| 9583 | set ctags {} | |
| 9584 | foreach t $tags { | |
| 9585 | if {[is_certain $t $origid]} { | |
| 9586 | lappend ctags $t | |
| 9587 | } | |
| ceadfe90 | 9588 | } |
| e11f1233 PM |
9589 | if {$tags eq $ctags} { |
| 9590 | set cached_dtags($origid) $tags | |
| 9591 | } else { | |
| 9592 | set tags $ctags | |
| ceadfe90 | 9593 | } |
| e11f1233 PM |
9594 | } else { |
| 9595 | set cached_dtags($origid) $tags | |
| 9596 | } | |
| 9597 | set t3 [clock clicks -milliseconds] | |
| 9598 | if {0 && $t3 - $t1 >= 100} { | |
| 9599 | puts "iterating descendents ($loopix/[llength $todo] nodes) took\ | |
| 9600 | [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left" | |
| ceadfe90 | 9601 | } |
| e11f1233 PM |
9602 | return $tags |
| 9603 | } | |
| ceadfe90 | 9604 | |
| e11f1233 PM |
9605 | proc anctags {id} { |
| 9606 | global arcnos arcids arcout arcend arctags idtags allparents | |
| 9607 | global growing cached_atags | |
| 9608 | ||
| 9609 | if {![info exists allparents($id)]} { | |
| 9610 | return {} | |
| 9611 | } | |
| 9612 | set t1 [clock clicks -milliseconds] | |
| 9613 | set argid $id | |
| 9614 | if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} { | |
| 9615 | # part-way along an arc; check that arc first | |
| 9616 | set a [lindex $arcnos($id) 0] | |
| 9617 | if {$arctags($a) ne {}} { | |
| 9618 | validate_arctags $a | |
| 9619 | set i [lsearch -exact $arcids($a) $id] | |
| 9620 | foreach t $arctags($a) { | |
| 9621 | set j [lsearch -exact $arcids($a) $t] | |
| 9622 | if {$j > $i} { | |
| 9623 | return $t | |
| 9624 | } | |
| 9625 | } | |
| ceadfe90 | 9626 | } |
| e11f1233 PM |
9627 | if {![info exists arcend($a)]} { |
| 9628 | return {} | |
| 9629 | } | |
| 9630 | set id $arcend($a) | |
| 9631 | if {[info exists idtags($id)]} { | |
| 9632 | return $id | |
| 9633 | } | |
| 9634 | } | |
| 9635 | if {[info exists cached_atags($id)]} { | |
| 9636 | return $cached_atags($id) | |
| 9637 | } | |
| 9638 | ||
| 9639 | set origid $id | |
| 9640 | set todo [list $id] | |
| 9641 | set queued($id) 1 | |
| 9642 | set taglist {} | |
| 9643 | set nc 1 | |
| 9644 | for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} { | |
| 9645 | set id [lindex $todo $i] | |
| 9646 | set done($id) 1 | |
| 9647 | set td [info exists hastaggeddescendent($id)] | |
| 9648 | if {!$td} { | |
| 9649 | incr nc -1 | |
| 9650 | } | |
| 9651 | # ignore tags on starting node | |
| 9652 | if {!$td && $i > 0} { | |
| 9653 | if {[info exists idtags($id)]} { | |
| 9654 | set tagloc($id) $id | |
| 9655 | set td 1 | |
| 9656 | } elseif {[info exists cached_atags($id)]} { | |
| 9657 | set tagloc($id) $cached_atags($id) | |
| 9658 | set td 1 | |
| 9659 | } | |
| 9660 | } | |
| 9661 | foreach a $arcout($id) { | |
| 9662 | if {!$td && $arctags($a) ne {}} { | |
| 9663 | validate_arctags $a | |
| 9664 | if {$arctags($a) ne {}} { | |
| 9665 | lappend tagloc($id) [lindex $arctags($a) 0] | |
| 9666 | } | |
| 9667 | } | |
| 9668 | if {![info exists arcend($a)]} continue | |
| 9669 | set d $arcend($a) | |
| 9670 | if {$td || $arctags($a) ne {}} { | |
| 9671 | set tomark [list $d] | |
| 9672 | for {set j 0} {$j < [llength $tomark]} {incr j} { | |
| 9673 | set dd [lindex $tomark $j] | |
| 9674 | if {![info exists hastaggeddescendent($dd)]} { | |
| 9675 | if {[info exists done($dd)]} { | |
| 9676 | foreach b $arcout($dd) { | |
| 9677 | if {[info exists arcend($b)]} { | |
| 9678 | lappend tomark $arcend($b) | |
| 9679 | } | |
| 9680 | } | |
| 9681 | if {[info exists tagloc($dd)]} { | |
| 9682 | unset tagloc($dd) | |
| 9683 | } | |
| 9684 | } elseif {[info exists queued($dd)]} { | |
| 9685 | incr nc -1 | |
| 9686 | } | |
| 9687 | set hastaggeddescendent($dd) 1 | |
| 9688 | } | |
| 9689 | } | |
| 9690 | } | |
| 9691 | if {![info exists queued($d)]} { | |
| 9692 | lappend todo $d | |
| 9693 | set queued($d) 1 | |
| 9694 | if {![info exists hastaggeddescendent($d)]} { | |
| 9695 | incr nc | |
| 9696 | } | |
| 9697 | } | |
| 9698 | } | |
| 9699 | } | |
| 9700 | set t2 [clock clicks -milliseconds] | |
| 9701 | set loopix $i | |
| 9702 | set tags {} | |
| 9703 | foreach id [array names tagloc] { | |
| 9704 | if {![info exists hastaggeddescendent($id)]} { | |
| 9705 | foreach t $tagloc($id) { | |
| 9706 | if {[lsearch -exact $tags $t] < 0} { | |
| 9707 | lappend tags $t | |
| 9708 | } | |
| 9709 | } | |
| ceadfe90 PM |
9710 | } |
| 9711 | } | |
| ceadfe90 | 9712 | |
| e11f1233 PM |
9713 | # remove tags that are ancestors of other tags |
| 9714 | for {set i 0} {$i < [llength $tags]} {incr i} { | |
| 9715 | set a [lindex $tags $i] | |
| 9716 | for {set j 0} {$j < $i} {incr j} { | |
| 9717 | set b [lindex $tags $j] | |
| 9718 | set r [anc_or_desc $a $b] | |
| 9719 | if {$r == -1} { | |
| 9720 | set tags [lreplace $tags $j $j] | |
| 9721 | incr j -1 | |
| 9722 | incr i -1 | |
| 9723 | } elseif {$r == 1} { | |
| 9724 | set tags [lreplace $tags $i $i] | |
| 9725 | incr i -1 | |
| 9726 | break | |
| 9727 | } | |
| 9728 | } | |
| 9729 | } | |
| 9730 | ||
| 9731 | if {[array names growing] ne {}} { | |
| 9732 | # graph isn't finished, need to check if any tag could get | |
| 9733 | # eclipsed by another tag coming later. Simply ignore any | |
| 9734 | # tags that could later get eclipsed. | |
| 9735 | set ctags {} | |
| 9736 | foreach t $tags { | |
| 9737 | if {[is_certain $origid $t]} { | |
| 9738 | lappend ctags $t | |
| 9739 | } | |
| 9740 | } | |
| 9741 | if {$tags eq $ctags} { | |
| 9742 | set cached_atags($origid) $tags | |
| 9743 | } else { | |
| 9744 | set tags $ctags | |
| d6ac1a86 | 9745 | } |
| e11f1233 PM |
9746 | } else { |
| 9747 | set cached_atags($origid) $tags | |
| 9748 | } | |
| 9749 | set t3 [clock clicks -milliseconds] | |
| 9750 | if {0 && $t3 - $t1 >= 100} { | |
| 9751 | puts "iterating ancestors ($loopix/[llength $todo] nodes) took\ | |
| 9752 | [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left" | |
| d6ac1a86 | 9753 | } |
| e11f1233 | 9754 | return $tags |
| d6ac1a86 PM |
9755 | } |
| 9756 | ||
| e11f1233 PM |
9757 | # Return the list of IDs that have heads that are descendents of id, |
| 9758 | # including id itself if it has a head. | |
| 9759 | proc descheads {id} { | |
| 9760 | global arcnos arcstart arcids archeads idheads cached_dheads | |
| 9761 | global allparents | |
| ca6d8f58 | 9762 | |
| e11f1233 PM |
9763 | if {![info exists allparents($id)]} { |
| 9764 | return {} | |
| 9765 | } | |
| f3326b66 | 9766 | set aret {} |
| e11f1233 PM |
9767 | if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} { |
| 9768 | # part-way along an arc; check it first | |
| 9769 | set a [lindex $arcnos($id) 0] | |
| 9770 | if {$archeads($a) ne {}} { | |
| 9771 | validate_archeads $a | |
| 9772 | set i [lsearch -exact $arcids($a) $id] | |
| 9773 | foreach t $archeads($a) { | |
| 9774 | set j [lsearch -exact $arcids($a) $t] | |
| 9775 | if {$j > $i} break | |
| f3326b66 | 9776 | lappend aret $t |
| e11f1233 | 9777 | } |
| ca6d8f58 | 9778 | } |
| e11f1233 | 9779 | set id $arcstart($a) |
| ca6d8f58 | 9780 | } |
| e11f1233 PM |
9781 | set origid $id |
| 9782 | set todo [list $id] | |
| 9783 | set seen($id) 1 | |
| f3326b66 | 9784 | set ret {} |
| e11f1233 PM |
9785 | for {set i 0} {$i < [llength $todo]} {incr i} { |
| 9786 | set id [lindex $todo $i] | |
| 9787 | if {[info exists cached_dheads($id)]} { | |
| 9788 | set ret [concat $ret $cached_dheads($id)] | |
| 9789 | } else { | |
| 9790 | if {[info exists idheads($id)]} { | |
| 9791 | lappend ret $id | |
| 9792 | } | |
| 9793 | foreach a $arcnos($id) { | |
| 9794 | if {$archeads($a) ne {}} { | |
| 706d6c3e PM |
9795 | validate_archeads $a |
| 9796 | if {$archeads($a) ne {}} { | |
| 9797 | set ret [concat $ret $archeads($a)] | |
| 9798 | } | |
| e11f1233 PM |
9799 | } |
| 9800 | set d $arcstart($a) | |
| 9801 | if {![info exists seen($d)]} { | |
| 9802 | lappend todo $d | |
| 9803 | set seen($d) 1 | |
| 9804 | } | |
| 9805 | } | |
| 10299152 | 9806 | } |
| 10299152 | 9807 | } |
| e11f1233 PM |
9808 | set ret [lsort -unique $ret] |
| 9809 | set cached_dheads($origid) $ret | |
| f3326b66 | 9810 | return [concat $ret $aret] |
| 10299152 PM |
9811 | } |
| 9812 | ||
| e11f1233 PM |
9813 | proc addedtag {id} { |
| 9814 | global arcnos arcout cached_dtags cached_atags | |
| ca6d8f58 | 9815 | |
| e11f1233 PM |
9816 | if {![info exists arcnos($id)]} return |
| 9817 | if {![info exists arcout($id)]} { | |
| 9818 | recalcarc [lindex $arcnos($id) 0] | |
| ca6d8f58 | 9819 | } |
| e11f1233 PM |
9820 | catch {unset cached_dtags} |
| 9821 | catch {unset cached_atags} | |
| ca6d8f58 PM |
9822 | } |
| 9823 | ||
| e11f1233 PM |
9824 | proc addedhead {hid head} { |
| 9825 | global arcnos arcout cached_dheads | |
| 9826 | ||
| 9827 | if {![info exists arcnos($hid)]} return | |
| 9828 | if {![info exists arcout($hid)]} { | |
| 9829 | recalcarc [lindex $arcnos($hid) 0] | |
| 9830 | } | |
| 9831 | catch {unset cached_dheads} | |
| 9832 | } | |
| 9833 | ||
| 9834 | proc removedhead {hid head} { | |
| 9835 | global cached_dheads | |
| 9836 | ||
| 9837 | catch {unset cached_dheads} | |
| 9838 | } | |
| 9839 | ||
| 9840 | proc movedhead {hid head} { | |
| 9841 | global arcnos arcout cached_dheads | |
| cec7bece | 9842 | |
| e11f1233 PM |
9843 | if {![info exists arcnos($hid)]} return |
| 9844 | if {![info exists arcout($hid)]} { | |
| 9845 | recalcarc [lindex $arcnos($hid) 0] | |
| cec7bece | 9846 | } |
| e11f1233 PM |
9847 | catch {unset cached_dheads} |
| 9848 | } | |
| 9849 | ||
| 9850 | proc changedrefs {} { | |
| 9851 | global cached_dheads cached_dtags cached_atags | |
| 9852 | global arctags archeads arcnos arcout idheads idtags | |
| 9853 | ||
| 9854 | foreach id [concat [array names idheads] [array names idtags]] { | |
| 9855 | if {[info exists arcnos($id)] && ![info exists arcout($id)]} { | |
| 9856 | set a [lindex $arcnos($id) 0] | |
| 9857 | if {![info exists donearc($a)]} { | |
| 9858 | recalcarc $a | |
| 9859 | set donearc($a) 1 | |
| 9860 | } | |
| cec7bece PM |
9861 | } |
| 9862 | } | |
| e11f1233 PM |
9863 | catch {unset cached_dtags} |
| 9864 | catch {unset cached_atags} | |
| 9865 | catch {unset cached_dheads} | |
| cec7bece PM |
9866 | } |
| 9867 | ||
| f1d83ba3 | 9868 | proc rereadrefs {} { |
| fc2a256f | 9869 | global idtags idheads idotherrefs mainheadid |
| f1d83ba3 PM |
9870 | |
| 9871 | set refids [concat [array names idtags] \ | |
| 9872 | [array names idheads] [array names idotherrefs]] | |
| 9873 | foreach id $refids { | |
| 9874 | if {![info exists ref($id)]} { | |
| 9875 | set ref($id) [listrefs $id] | |
| 9876 | } | |
| 9877 | } | |
| fc2a256f | 9878 | set oldmainhead $mainheadid |
| f1d83ba3 | 9879 | readrefs |
| cec7bece | 9880 | changedrefs |
| f1d83ba3 PM |
9881 | set refids [lsort -unique [concat $refids [array names idtags] \ |
| 9882 | [array names idheads] [array names idotherrefs]]] | |
| 9883 | foreach id $refids { | |
| 9884 | set v [listrefs $id] | |
| c11ff120 | 9885 | if {![info exists ref($id)] || $ref($id) != $v} { |
| f1d83ba3 PM |
9886 | redrawtags $id |
| 9887 | } | |
| 9888 | } | |
| c11ff120 PM |
9889 | if {$oldmainhead ne $mainheadid} { |
| 9890 | redrawtags $oldmainhead | |
| 9891 | redrawtags $mainheadid | |
| 9892 | } | |
| 887c996e | 9893 | run refill_reflist |
| f1d83ba3 PM |
9894 | } |
| 9895 | ||
| 2e1ded44 JH |
9896 | proc listrefs {id} { |
| 9897 | global idtags idheads idotherrefs | |
| 9898 | ||
| 9899 | set x {} | |
| 9900 | if {[info exists idtags($id)]} { | |
| 9901 | set x $idtags($id) | |
| 9902 | } | |
| 9903 | set y {} | |
| 9904 | if {[info exists idheads($id)]} { | |
| 9905 | set y $idheads($id) | |
| 9906 | } | |
| 9907 | set z {} | |
| 9908 | if {[info exists idotherrefs($id)]} { | |
| 9909 | set z $idotherrefs($id) | |
| 9910 | } | |
| 9911 | return [list $x $y $z] | |
| 9912 | } | |
| 9913 | ||
| 106288cb | 9914 | proc showtag {tag isnew} { |
| 62d3ea65 | 9915 | global ctext tagcontents tagids linknum tagobjid |
| 106288cb PM |
9916 | |
| 9917 | if {$isnew} { | |
| 9918 | addtohistory [list showtag $tag 0] | |
| 9919 | } | |
| 9920 | $ctext conf -state normal | |
| 3ea06f9f | 9921 | clear_ctext |
| 32f1b3e4 | 9922 | settabs 0 |
| 106288cb | 9923 | set linknum 0 |
| 62d3ea65 PM |
9924 | if {![info exists tagcontents($tag)]} { |
| 9925 | catch { | |
| 9926 | set tagcontents($tag) [exec git cat-file tag $tagobjid($tag)] | |
| 9927 | } | |
| 9928 | } | |
| 106288cb PM |
9929 | if {[info exists tagcontents($tag)]} { |
| 9930 | set text $tagcontents($tag) | |
| 9931 | } else { | |
| d990cedf | 9932 | set text "[mc "Tag"]: $tag\n[mc "Id"]: $tagids($tag)" |
| 106288cb | 9933 | } |
| f1b86294 | 9934 | appendwithlinks $text {} |
| 106288cb | 9935 | $ctext conf -state disabled |
| 7fcceed7 | 9936 | init_flist {} |
| 106288cb PM |
9937 | } |
| 9938 | ||
| 1d10f36d PM |
9939 | proc doquit {} { |
| 9940 | global stopped | |
| 314f5de1 TA |
9941 | global gitktmpdir |
| 9942 | ||
| 1d10f36d | 9943 | set stopped 100 |
| b6047c5a | 9944 | savestuff . |
| 1d10f36d | 9945 | destroy . |
| 314f5de1 TA |
9946 | |
| 9947 | if {[info exists gitktmpdir]} { | |
| 9948 | catch {file delete -force $gitktmpdir} | |
| 9949 | } | |
| 1d10f36d | 9950 | } |
| 1db95b00 | 9951 | |
| 9a7558f3 PM |
9952 | proc mkfontdisp {font top which} { |
| 9953 | global fontattr fontpref $font | |
| 9954 | ||
| 9955 | set fontpref($font) [set $font] | |
| 9956 | button $top.${font}but -text $which -font optionfont \ | |
| 9957 | -command [list choosefont $font $which] | |
| 9958 | label $top.$font -relief flat -font $font \ | |
| 9959 | -text $fontattr($font,family) -justify left | |
| 9960 | grid x $top.${font}but $top.$font -sticky w | |
| 9961 | } | |
| 9962 | ||
| 9963 | proc choosefont {font which} { | |
| 9964 | global fontparam fontlist fonttop fontattr | |
| 84a76f18 | 9965 | global prefstop |
| 9a7558f3 PM |
9966 | |
| 9967 | set fontparam(which) $which | |
| 9968 | set fontparam(font) $font | |
| 9969 | set fontparam(family) [font actual $font -family] | |
| 9970 | set fontparam(size) $fontattr($font,size) | |
| 9971 | set fontparam(weight) $fontattr($font,weight) | |
| 9972 | set fontparam(slant) $fontattr($font,slant) | |
| 9973 | set top .gitkfont | |
| 9974 | set fonttop $top | |
| 9975 | if {![winfo exists $top]} { | |
| 9976 | font create sample | |
| 9977 | eval font config sample [font actual $font] | |
| 9978 | toplevel $top | |
| e7d64008 | 9979 | make_transient $top $prefstop |
| d990cedf | 9980 | wm title $top [mc "Gitk font chooser"] |
| b039f0a6 | 9981 | label $top.l -textvariable fontparam(which) |
| 9a7558f3 PM |
9982 | pack $top.l -side top |
| 9983 | set fontlist [lsort [font families]] | |
| 9984 | frame $top.f | |
| 9985 | listbox $top.f.fam -listvariable fontlist \ | |
| 9986 | -yscrollcommand [list $top.f.sb set] | |
| 9987 | bind $top.f.fam <<ListboxSelect>> selfontfam | |
| 9988 | scrollbar $top.f.sb -command [list $top.f.fam yview] | |
| 9989 | pack $top.f.sb -side right -fill y | |
| 9990 | pack $top.f.fam -side left -fill both -expand 1 | |
| 9991 | pack $top.f -side top -fill both -expand 1 | |
| 9992 | frame $top.g | |
| 9993 | spinbox $top.g.size -from 4 -to 40 -width 4 \ | |
| 9994 | -textvariable fontparam(size) \ | |
| 9995 | -validatecommand {string is integer -strict %s} | |
| 9996 | checkbutton $top.g.bold -padx 5 \ | |
| d990cedf | 9997 | -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \ |
| 9a7558f3 PM |
9998 | -variable fontparam(weight) -onvalue bold -offvalue normal |
| 9999 | checkbutton $top.g.ital -padx 5 \ | |
| d990cedf | 10000 | -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0 \ |
| 9a7558f3 PM |
10001 | -variable fontparam(slant) -onvalue italic -offvalue roman |
| 10002 | pack $top.g.size $top.g.bold $top.g.ital -side left | |
| 10003 | pack $top.g -side top | |
| 10004 | canvas $top.c -width 150 -height 50 -border 2 -relief sunk \ | |
| 10005 | -background white | |
| 10006 | $top.c create text 100 25 -anchor center -text $which -font sample \ | |
| 10007 | -fill black -tags text | |
| 10008 | bind $top.c <Configure> [list centertext $top.c] | |
| 10009 | pack $top.c -side top -fill x | |
| 10010 | frame $top.buts | |
| b039f0a6 PM |
10011 | button $top.buts.ok -text [mc "OK"] -command fontok -default active |
| 10012 | button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal | |
| 76f15947 AG |
10013 | bind $top <Key-Return> fontok |
| 10014 | bind $top <Key-Escape> fontcan | |
| 9a7558f3 PM |
10015 | grid $top.buts.ok $top.buts.can |
| 10016 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 10017 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 10018 | pack $top.buts -side bottom -fill x | |
| 10019 | trace add variable fontparam write chg_fontparam | |
| 10020 | } else { | |
| 10021 | raise $top | |
| 10022 | $top.c itemconf text -text $which | |
| 10023 | } | |
| 10024 | set i [lsearch -exact $fontlist $fontparam(family)] | |
| 10025 | if {$i >= 0} { | |
| 10026 | $top.f.fam selection set $i | |
| 10027 | $top.f.fam see $i | |
| 10028 | } | |
| 10029 | } | |
| 10030 | ||
| 10031 | proc centertext {w} { | |
| 10032 | $w coords text [expr {[winfo width $w] / 2}] [expr {[winfo height $w] / 2}] | |
| 10033 | } | |
| 10034 | ||
| 10035 | proc fontok {} { | |
| 10036 | global fontparam fontpref prefstop | |
| 10037 | ||
| 10038 | set f $fontparam(font) | |
| 10039 | set fontpref($f) [list $fontparam(family) $fontparam(size)] | |
| 10040 | if {$fontparam(weight) eq "bold"} { | |
| 10041 | lappend fontpref($f) "bold" | |
| 10042 | } | |
| 10043 | if {$fontparam(slant) eq "italic"} { | |
| 10044 | lappend fontpref($f) "italic" | |
| 10045 | } | |
| 10046 | set w $prefstop.$f | |
| 10047 | $w conf -text $fontparam(family) -font $fontpref($f) | |
| 10048 | ||
| 10049 | fontcan | |
| 10050 | } | |
| 10051 | ||
| 10052 | proc fontcan {} { | |
| 10053 | global fonttop fontparam | |
| 10054 | ||
| 10055 | if {[info exists fonttop]} { | |
| 10056 | catch {destroy $fonttop} | |
| 10057 | catch {font delete sample} | |
| 10058 | unset fonttop | |
| 10059 | unset fontparam | |
| 10060 | } | |
| 10061 | } | |
| 10062 | ||
| 10063 | proc selfontfam {} { | |
| 10064 | global fonttop fontparam | |
| 10065 | ||
| 10066 | set i [$fonttop.f.fam curselection] | |
| 10067 | if {$i ne {}} { | |
| 10068 | set fontparam(family) [$fonttop.f.fam get $i] | |
| 10069 | } | |
| 10070 | } | |
| 10071 | ||
| 10072 | proc chg_fontparam {v sub op} { | |
| 10073 | global fontparam | |
| 10074 | ||
| 10075 | font config sample -$sub $fontparam($sub) | |
| 10076 | } | |
| 10077 | ||
| 712fcc08 | 10078 | proc doprefs {} { |
| 8d73b242 | 10079 | global maxwidth maxgraphpct |
| 219ea3a9 | 10080 | global oldprefs prefstop showneartags showlocalchanges |
| e3e901be | 10081 | global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor |
| 39ee47ef | 10082 | global tabstop limitdiffs autoselect extdifftool perfile_attrs |
| 232475d3 | 10083 | |
| 712fcc08 PM |
10084 | set top .gitkprefs |
| 10085 | set prefstop $top | |
| 10086 | if {[winfo exists $top]} { | |
| 10087 | raise $top | |
| 10088 | return | |
| 757f17bc | 10089 | } |
| 3de07118 | 10090 | foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ |
| 39ee47ef | 10091 | limitdiffs tabstop perfile_attrs} { |
| 712fcc08 | 10092 | set oldprefs($v) [set $v] |
| 232475d3 | 10093 | } |
| 712fcc08 | 10094 | toplevel $top |
| d990cedf | 10095 | wm title $top [mc "Gitk preferences"] |
| e7d64008 | 10096 | make_transient $top . |
| d990cedf | 10097 | label $top.ldisp -text [mc "Commit list display options"] |
| 712fcc08 PM |
10098 | grid $top.ldisp - -sticky w -pady 10 |
| 10099 | label $top.spacer -text " " | |
| d990cedf | 10100 | label $top.maxwidthl -text [mc "Maximum graph width (lines)"] \ |
| 712fcc08 PM |
10101 | -font optionfont |
| 10102 | spinbox $top.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth | |
| 10103 | grid $top.spacer $top.maxwidthl $top.maxwidth -sticky w | |
| d990cedf | 10104 | label $top.maxpctl -text [mc "Maximum graph width (% of pane)"] \ |
| 712fcc08 PM |
10105 | -font optionfont |
| 10106 | spinbox $top.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct | |
| 10107 | grid x $top.maxpctl $top.maxpct -sticky w | |
| 219ea3a9 | 10108 | frame $top.showlocal |
| d990cedf | 10109 | label $top.showlocal.l -text [mc "Show local changes"] -font optionfont |
| 219ea3a9 PM |
10110 | checkbutton $top.showlocal.b -variable showlocalchanges |
| 10111 | pack $top.showlocal.b $top.showlocal.l -side left | |
| 10112 | grid x $top.showlocal -sticky w | |
| 95293b58 JK |
10113 | frame $top.autoselect |
| 10114 | label $top.autoselect.l -text [mc "Auto-select SHA1"] -font optionfont | |
| 10115 | checkbutton $top.autoselect.b -variable autoselect | |
| 10116 | pack $top.autoselect.b $top.autoselect.l -side left | |
| 10117 | grid x $top.autoselect -sticky w | |
| f8a2c0d1 | 10118 | |
| d990cedf | 10119 | label $top.ddisp -text [mc "Diff display options"] |
| 712fcc08 | 10120 | grid $top.ddisp - -sticky w -pady 10 |
| d990cedf | 10121 | label $top.tabstopl -text [mc "Tab spacing"] -font optionfont |
| 94503918 PM |
10122 | spinbox $top.tabstop -from 1 -to 20 -width 4 -textvariable tabstop |
| 10123 | grid x $top.tabstopl $top.tabstop -sticky w | |
| b8ab2e17 | 10124 | frame $top.ntag |
| d990cedf | 10125 | label $top.ntag.l -text [mc "Display nearby tags"] -font optionfont |
| b8ab2e17 PM |
10126 | checkbutton $top.ntag.b -variable showneartags |
| 10127 | pack $top.ntag.b $top.ntag.l -side left | |
| 10128 | grid x $top.ntag -sticky w | |
| 7a39a17a | 10129 | frame $top.ldiff |
| d990cedf | 10130 | label $top.ldiff.l -text [mc "Limit diffs to listed paths"] -font optionfont |
| 7a39a17a PM |
10131 | checkbutton $top.ldiff.b -variable limitdiffs |
| 10132 | pack $top.ldiff.b $top.ldiff.l -side left | |
| 10133 | grid x $top.ldiff -sticky w | |
| 39ee47ef PM |
10134 | frame $top.lattr |
| 10135 | label $top.lattr.l -text [mc "Support per-file encodings"] -font optionfont | |
| 10136 | checkbutton $top.lattr.b -variable perfile_attrs | |
| 10137 | pack $top.lattr.b $top.lattr.l -side left | |
| 10138 | grid x $top.lattr -sticky w | |
| f8a2c0d1 | 10139 | |
| 314f5de1 TA |
10140 | entry $top.extdifft -textvariable extdifftool |
| 10141 | frame $top.extdifff | |
| 10142 | label $top.extdifff.l -text [mc "External diff tool" ] -font optionfont \ | |
| 10143 | -padx 10 | |
| 10144 | button $top.extdifff.b -text [mc "Choose..."] -font optionfont \ | |
| 10145 | -command choose_extdiff | |
| 10146 | pack $top.extdifff.l $top.extdifff.b -side left | |
| 10147 | grid x $top.extdifff $top.extdifft -sticky w | |
| 10148 | ||
| d990cedf | 10149 | label $top.cdisp -text [mc "Colors: press to choose"] |
| f8a2c0d1 PM |
10150 | grid $top.cdisp - -sticky w -pady 10 |
| 10151 | label $top.bg -padx 40 -relief sunk -background $bgcolor | |
| d990cedf | 10152 | button $top.bgbut -text [mc "Background"] -font optionfont \ |
| 80dd7b44 | 10153 | -command [list choosecolor bgcolor {} $top.bg background setbg] |
| f8a2c0d1 PM |
10154 | grid x $top.bgbut $top.bg -sticky w |
| 10155 | label $top.fg -padx 40 -relief sunk -background $fgcolor | |
| d990cedf | 10156 | button $top.fgbut -text [mc "Foreground"] -font optionfont \ |
| 80dd7b44 | 10157 | -command [list choosecolor fgcolor {} $top.fg foreground setfg] |
| f8a2c0d1 PM |
10158 | grid x $top.fgbut $top.fg -sticky w |
| 10159 | label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0] | |
| d990cedf | 10160 | button $top.diffoldbut -text [mc "Diff: old lines"] -font optionfont \ |
| f8a2c0d1 PM |
10161 | -command [list choosecolor diffcolors 0 $top.diffold "diff old lines" \ |
| 10162 | [list $ctext tag conf d0 -foreground]] | |
| 10163 | grid x $top.diffoldbut $top.diffold -sticky w | |
| 10164 | label $top.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1] | |
| d990cedf | 10165 | button $top.diffnewbut -text [mc "Diff: new lines"] -font optionfont \ |
| f8a2c0d1 | 10166 | -command [list choosecolor diffcolors 1 $top.diffnew "diff new lines" \ |
| 8b07dca1 | 10167 | [list $ctext tag conf dresult -foreground]] |
| f8a2c0d1 PM |
10168 | grid x $top.diffnewbut $top.diffnew -sticky w |
| 10169 | label $top.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2] | |
| d990cedf | 10170 | button $top.hunksepbut -text [mc "Diff: hunk header"] -font optionfont \ |
| f8a2c0d1 PM |
10171 | -command [list choosecolor diffcolors 2 $top.hunksep \ |
| 10172 | "diff hunk header" \ | |
| 10173 | [list $ctext tag conf hunksep -foreground]] | |
| 10174 | grid x $top.hunksepbut $top.hunksep -sticky w | |
| e3e901be PM |
10175 | label $top.markbgsep -padx 40 -relief sunk -background $markbgcolor |
| 10176 | button $top.markbgbut -text [mc "Marked line bg"] -font optionfont \ | |
| 10177 | -command [list choosecolor markbgcolor {} $top.markbgsep \ | |
| 10178 | [mc "marked line background"] \ | |
| 10179 | [list $ctext tag conf omark -background]] | |
| 10180 | grid x $top.markbgbut $top.markbgsep -sticky w | |
| 60378c0c | 10181 | label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor |
| d990cedf | 10182 | button $top.selbgbut -text [mc "Select bg"] -font optionfont \ |
| 80dd7b44 | 10183 | -command [list choosecolor selectbgcolor {} $top.selbgsep background setselbg] |
| 60378c0c | 10184 | grid x $top.selbgbut $top.selbgsep -sticky w |
| f8a2c0d1 | 10185 | |
| d990cedf | 10186 | label $top.cfont -text [mc "Fonts: press to choose"] |
| 9a7558f3 | 10187 | grid $top.cfont - -sticky w -pady 10 |
| d990cedf CS |
10188 | mkfontdisp mainfont $top [mc "Main font"] |
| 10189 | mkfontdisp textfont $top [mc "Diff display font"] | |
| 10190 | mkfontdisp uifont $top [mc "User interface font"] | |
| 9a7558f3 | 10191 | |
| 712fcc08 | 10192 | frame $top.buts |
| d990cedf | 10193 | button $top.buts.ok -text [mc "OK"] -command prefsok -default active |
| d990cedf | 10194 | button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal |
| 76f15947 AG |
10195 | bind $top <Key-Return> prefsok |
| 10196 | bind $top <Key-Escape> prefscan | |
| 712fcc08 PM |
10197 | grid $top.buts.ok $top.buts.can |
| 10198 | grid columnconfigure $top.buts 0 -weight 1 -uniform a | |
| 10199 | grid columnconfigure $top.buts 1 -weight 1 -uniform a | |
| 10200 | grid $top.buts - - -pady 10 -sticky ew | |
| 3a950e9a | 10201 | bind $top <Visibility> "focus $top.buts.ok" |
| 712fcc08 PM |
10202 | } |
| 10203 | ||
| 314f5de1 TA |
10204 | proc choose_extdiff {} { |
| 10205 | global extdifftool | |
| 10206 | ||
| 10207 | set prog [tk_getOpenFile -title "External diff tool" -multiple false] | |
| 10208 | if {$prog ne {}} { | |
| 10209 | set extdifftool $prog | |
| 10210 | } | |
| 10211 | } | |
| 10212 | ||
| f8a2c0d1 PM |
10213 | proc choosecolor {v vi w x cmd} { |
| 10214 | global $v | |
| 10215 | ||
| 10216 | set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \ | |
| d990cedf | 10217 | -title [mc "Gitk: choose color for %s" $x]] |
| f8a2c0d1 PM |
10218 | if {$c eq {}} return |
| 10219 | $w conf -background $c | |
| 10220 | lset $v $vi $c | |
| 10221 | eval $cmd $c | |
| 10222 | } | |
| 10223 | ||
| 60378c0c ML |
10224 | proc setselbg {c} { |
| 10225 | global bglist cflist | |
| 10226 | foreach w $bglist { | |
| 10227 | $w configure -selectbackground $c | |
| 10228 | } | |
| 10229 | $cflist tag configure highlight \ | |
| 10230 | -background [$cflist cget -selectbackground] | |
| 10231 | allcanvs itemconf secsel -fill $c | |
| 10232 | } | |
| 10233 | ||
| f8a2c0d1 PM |
10234 | proc setbg {c} { |
| 10235 | global bglist | |
| 10236 | ||
| 10237 | foreach w $bglist { | |
| 10238 | $w conf -background $c | |
| 10239 | } | |
| 10240 | } | |
| 10241 | ||
| 10242 | proc setfg {c} { | |
| 10243 | global fglist canv | |
| 10244 | ||
| 10245 | foreach w $fglist { | |
| 10246 | $w conf -foreground $c | |
| 10247 | } | |
| 10248 | allcanvs itemconf text -fill $c | |
| 10249 | $canv itemconf circle -outline $c | |
| 10250 | } | |
| 10251 | ||
| 712fcc08 | 10252 | proc prefscan {} { |
| 94503918 | 10253 | global oldprefs prefstop |
| 712fcc08 | 10254 | |
| 3de07118 | 10255 | foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ |
| 39ee47ef | 10256 | limitdiffs tabstop perfile_attrs} { |
| 94503918 | 10257 | global $v |
| 712fcc08 PM |
10258 | set $v $oldprefs($v) |
| 10259 | } | |
| 10260 | catch {destroy $prefstop} | |
| 10261 | unset prefstop | |
| 9a7558f3 | 10262 | fontcan |
| 712fcc08 PM |
10263 | } |
| 10264 | ||
| 10265 | proc prefsok {} { | |
| 10266 | global maxwidth maxgraphpct | |
| 219ea3a9 | 10267 | global oldprefs prefstop showneartags showlocalchanges |
| 9a7558f3 | 10268 | global fontpref mainfont textfont uifont |
| 39ee47ef | 10269 | global limitdiffs treediffs perfile_attrs |
| 712fcc08 PM |
10270 | |
| 10271 | catch {destroy $prefstop} | |
| 10272 | unset prefstop | |
| 9a7558f3 PM |
10273 | fontcan |
| 10274 | set fontchanged 0 | |
| 10275 | if {$mainfont ne $fontpref(mainfont)} { | |
| 10276 | set mainfont $fontpref(mainfont) | |
| 10277 | parsefont mainfont $mainfont | |
| 10278 | eval font configure mainfont [fontflags mainfont] | |
| 10279 | eval font configure mainfontbold [fontflags mainfont 1] | |
| 10280 | setcoords | |
| 10281 | set fontchanged 1 | |
| 10282 | } | |
| 10283 | if {$textfont ne $fontpref(textfont)} { | |
| 10284 | set textfont $fontpref(textfont) | |
| 10285 | parsefont textfont $textfont | |
| 10286 | eval font configure textfont [fontflags textfont] | |
| 10287 | eval font configure textfontbold [fontflags textfont 1] | |
| 10288 | } | |
| 10289 | if {$uifont ne $fontpref(uifont)} { | |
| 10290 | set uifont $fontpref(uifont) | |
| 10291 | parsefont uifont $uifont | |
| 10292 | eval font configure uifont [fontflags uifont] | |
| 10293 | } | |
| 32f1b3e4 | 10294 | settabs |
| 219ea3a9 PM |
10295 | if {$showlocalchanges != $oldprefs(showlocalchanges)} { |
| 10296 | if {$showlocalchanges} { | |
| 10297 | doshowlocalchanges | |
| 10298 | } else { | |
| 10299 | dohidelocalchanges | |
| 10300 | } | |
| 10301 | } | |
| 39ee47ef PM |
10302 | if {$limitdiffs != $oldprefs(limitdiffs) || |
| 10303 | ($perfile_attrs && !$oldprefs(perfile_attrs))} { | |
| 10304 | # treediffs elements are limited by path; | |
| 10305 | # won't have encodings cached if perfile_attrs was just turned on | |
| 74a40c71 PM |
10306 | catch {unset treediffs} |
| 10307 | } | |
| 9a7558f3 | 10308 | if {$fontchanged || $maxwidth != $oldprefs(maxwidth) |
| 712fcc08 PM |
10309 | || $maxgraphpct != $oldprefs(maxgraphpct)} { |
| 10310 | redisplay | |
| 7a39a17a PM |
10311 | } elseif {$showneartags != $oldprefs(showneartags) || |
| 10312 | $limitdiffs != $oldprefs(limitdiffs)} { | |
| b8ab2e17 | 10313 | reselectline |
| 712fcc08 PM |
10314 | } |
| 10315 | } | |
| 10316 | ||
| 10317 | proc formatdate {d} { | |
| e8b5f4be | 10318 | global datetimeformat |
| 219ea3a9 | 10319 | if {$d ne {}} { |
| e8b5f4be | 10320 | set d [clock format $d -format $datetimeformat] |
| 219ea3a9 PM |
10321 | } |
| 10322 | return $d | |
| 232475d3 PM |
10323 | } |
| 10324 | ||
| fd8ccbec PM |
10325 | # This list of encoding names and aliases is distilled from |
| 10326 | # http://www.iana.org/assignments/character-sets. | |
| 10327 | # Not all of them are supported by Tcl. | |
| 10328 | set encoding_aliases { | |
| 10329 | { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII | |
| 10330 | ISO646-US US-ASCII us IBM367 cp367 csASCII } | |
| 10331 | { ISO-10646-UTF-1 csISO10646UTF1 } | |
| 10332 | { ISO_646.basic:1983 ref csISO646basic1983 } | |
| 10333 | { INVARIANT csINVARIANT } | |
| 10334 | { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion } | |
| 10335 | { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom } | |
| 10336 | { NATS-SEFI iso-ir-8-1 csNATSSEFI } | |
| 10337 | { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD } | |
| 10338 | { NATS-DANO iso-ir-9-1 csNATSDANO } | |
| 10339 | { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD } | |
| 10340 | { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish } | |
| 10341 | { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames } | |
| 10342 | { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 } | |
| 10343 | { ISO-2022-KR csISO2022KR } | |
| 10344 | { EUC-KR csEUCKR } | |
| 10345 | { ISO-2022-JP csISO2022JP } | |
| 10346 | { ISO-2022-JP-2 csISO2022JP2 } | |
| 10347 | { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7 | |
| 10348 | csISO13JISC6220jp } | |
| 10349 | { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro } | |
| 10350 | { IT iso-ir-15 ISO646-IT csISO15Italian } | |
| 10351 | { PT iso-ir-16 ISO646-PT csISO16Portuguese } | |
| 10352 | { ES iso-ir-17 ISO646-ES csISO17Spanish } | |
| 10353 | { greek7-old iso-ir-18 csISO18Greek7Old } | |
| 10354 | { latin-greek iso-ir-19 csISO19LatinGreek } | |
| 10355 | { DIN_66003 iso-ir-21 de ISO646-DE csISO21German } | |
| 10356 | { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French } | |
| 10357 | { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 } | |
| 10358 | { ISO_5427 iso-ir-37 csISO5427Cyrillic } | |
| 10359 | { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 } | |
| 10360 | { BS_viewdata iso-ir-47 csISO47BSViewdata } | |
| 10361 | { INIS iso-ir-49 csISO49INIS } | |
| 10362 | { INIS-8 iso-ir-50 csISO50INIS8 } | |
| 10363 | { INIS-cyrillic iso-ir-51 csISO51INISCyrillic } | |
| 10364 | { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 } | |
| 10365 | { ISO_5428:1980 iso-ir-55 csISO5428Greek } | |
| 10366 | { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 } | |
| 10367 | { GB_2312-80 iso-ir-58 chinese csISO58GB231280 } | |
| 10368 | { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian | |
| 10369 | csISO60Norwegian1 } | |
| 10370 | { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 } | |
| 10371 | { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French } | |
| 10372 | { videotex-suppl iso-ir-70 csISO70VideotexSupp1 } | |
| 10373 | { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 } | |
| 10374 | { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 } | |
| 10375 | { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian } | |
| 10376 | { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 } | |
| 10377 | { greek7 iso-ir-88 csISO88Greek7 } | |
| 10378 | { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 } | |
| 10379 | { iso-ir-90 csISO90 } | |
| 10380 | { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a } | |
| 10381 | { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b | |
| 10382 | csISO92JISC62991984b } | |
| 10383 | { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd } | |
| 10384 | { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand } | |
| 10385 | { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add | |
| 10386 | csISO95JIS62291984handadd } | |
| 10387 | { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana } | |
| 10388 | { ISO_2033-1983 iso-ir-98 e13b csISO2033 } | |
| 10389 | { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS } | |
| 10390 | { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819 | |
| 10391 | CP819 csISOLatin1 } | |
| 10392 | { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 } | |
| 10393 | { T.61-7bit iso-ir-102 csISO102T617bit } | |
| 10394 | { T.61-8bit T.61 iso-ir-103 csISO103T618bit } | |
| 10395 | { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 } | |
| 10396 | { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 } | |
| 10397 | { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic } | |
| 10398 | { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 } | |
| 10399 | { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 } | |
| 10400 | { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr } | |
| 10401 | { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708 | |
| 10402 | arabic csISOLatinArabic } | |
| 10403 | { ISO_8859-6-E csISO88596E ISO-8859-6-E } | |
| 10404 | { ISO_8859-6-I csISO88596I ISO-8859-6-I } | |
| 10405 | { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118 | |
| 10406 | greek greek8 csISOLatinGreek } | |
| 10407 | { T.101-G2 iso-ir-128 csISO128T101G2 } | |
| 10408 | { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew | |
| 10409 | csISOLatinHebrew } | |
| 10410 | { ISO_8859-8-E csISO88598E ISO-8859-8-E } | |
| 10411 | { ISO_8859-8-I csISO88598I ISO-8859-8-I } | |
| 10412 | { CSN_369103 iso-ir-139 csISO139CSN369103 } | |
| 10413 | { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 } | |
| 10414 | { ISO_6937-2-add iso-ir-142 csISOTextComm } | |
| 10415 | { IEC_P27-1 iso-ir-143 csISO143IECP271 } | |
| 10416 | { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic | |
| 10417 | csISOLatinCyrillic } | |
| 10418 | { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian } | |
| 10419 | { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian } | |
| 10420 | { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 } | |
| 10421 | { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT } | |
| 10422 | { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba } | |
| 10423 | { ISO_6937-2-25 iso-ir-152 csISO6937Add } | |
| 10424 | { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 } | |
| 10425 | { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp } | |
| 10426 | { ISO_10367-box iso-ir-155 csISO10367Box } | |
| 10427 | { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 } | |
| 10428 | { latin-lap lap iso-ir-158 csISO158Lap } | |
| 10429 | { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 } | |
| 10430 | { DS_2089 DS2089 ISO646-DK dk csISO646Danish } | |
| 10431 | { us-dk csUSDK } | |
| 10432 | { dk-us csDKUS } | |
| 10433 | { JIS_X0201 X0201 csHalfWidthKatakana } | |
| 10434 | { KSC5636 ISO646-KR csKSC5636 } | |
| 10435 | { ISO-10646-UCS-2 csUnicode } | |
| 10436 | { ISO-10646-UCS-4 csUCS4 } | |
| 10437 | { DEC-MCS dec csDECMCS } | |
| 10438 | { hp-roman8 roman8 r8 csHPRoman8 } | |
| 10439 | { macintosh mac csMacintosh } | |
| 10440 | { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl | |
| 10441 | csIBM037 } | |
| 10442 | { IBM038 EBCDIC-INT cp038 csIBM038 } | |
| 10443 | { IBM273 CP273 csIBM273 } | |
| 10444 | { IBM274 EBCDIC-BE CP274 csIBM274 } | |
| 10445 | { IBM275 EBCDIC-BR cp275 csIBM275 } | |
| 10446 | { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 } | |
| 10447 | { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 } | |
| 10448 | { IBM280 CP280 ebcdic-cp-it csIBM280 } | |
| 10449 | { IBM281 EBCDIC-JP-E cp281 csIBM281 } | |
| 10450 | { IBM284 CP284 ebcdic-cp-es csIBM284 } | |
| 10451 | { IBM285 CP285 ebcdic-cp-gb csIBM285 } | |
| 10452 | { IBM290 cp290 EBCDIC-JP-kana csIBM290 } | |
| 10453 | { IBM297 cp297 ebcdic-cp-fr csIBM297 } | |
| 10454 | { IBM420 cp420 ebcdic-cp-ar1 csIBM420 } | |
| 10455 | { IBM423 cp423 ebcdic-cp-gr csIBM423 } | |
| 10456 | { IBM424 cp424 ebcdic-cp-he csIBM424 } | |
| 10457 | { IBM437 cp437 437 csPC8CodePage437 } | |
| 10458 | { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 } | |
| 10459 | { IBM775 cp775 csPC775Baltic } | |
| 10460 | { IBM850 cp850 850 csPC850Multilingual } | |
| 10461 | { IBM851 cp851 851 csIBM851 } | |
| 10462 | { IBM852 cp852 852 csPCp852 } | |
| 10463 | { IBM855 cp855 855 csIBM855 } | |
| 10464 | { IBM857 cp857 857 csIBM857 } | |
| 10465 | { IBM860 cp860 860 csIBM860 } | |
| 10466 | { IBM861 cp861 861 cp-is csIBM861 } | |
| 10467 | { IBM862 cp862 862 csPC862LatinHebrew } | |
| 10468 | { IBM863 cp863 863 csIBM863 } | |
| 10469 | { IBM864 cp864 csIBM864 } | |
| 10470 | { IBM865 cp865 865 csIBM865 } | |
| 10471 | { IBM866 cp866 866 csIBM866 } | |
| 10472 | { IBM868 CP868 cp-ar csIBM868 } | |
| 10473 | { IBM869 cp869 869 cp-gr csIBM869 } | |
| 10474 | { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 } | |
| 10475 | { IBM871 CP871 ebcdic-cp-is csIBM871 } | |
| 10476 | { IBM880 cp880 EBCDIC-Cyrillic csIBM880 } | |
| 10477 | { IBM891 cp891 csIBM891 } | |
| 10478 | { IBM903 cp903 csIBM903 } | |
| 10479 | { IBM904 cp904 904 csIBBM904 } | |
| 10480 | { IBM905 CP905 ebcdic-cp-tr csIBM905 } | |
| 10481 | { IBM918 CP918 ebcdic-cp-ar2 csIBM918 } | |
| 10482 | { IBM1026 CP1026 csIBM1026 } | |
| 10483 | { EBCDIC-AT-DE csIBMEBCDICATDE } | |
| 10484 | { EBCDIC-AT-DE-A csEBCDICATDEA } | |
| 10485 | { EBCDIC-CA-FR csEBCDICCAFR } | |
| 10486 | { EBCDIC-DK-NO csEBCDICDKNO } | |
| 10487 | { EBCDIC-DK-NO-A csEBCDICDKNOA } | |
| 10488 | { EBCDIC-FI-SE csEBCDICFISE } | |
| 10489 | { EBCDIC-FI-SE-A csEBCDICFISEA } | |
| 10490 | { EBCDIC-FR csEBCDICFR } | |
| 10491 | { EBCDIC-IT csEBCDICIT } | |
| 10492 | { EBCDIC-PT csEBCDICPT } | |
| 10493 | { EBCDIC-ES csEBCDICES } | |
| 10494 | { EBCDIC-ES-A csEBCDICESA } | |
| 10495 | { EBCDIC-ES-S csEBCDICESS } | |
| 10496 | { EBCDIC-UK csEBCDICUK } | |
| 10497 | { EBCDIC-US csEBCDICUS } | |
| 10498 | { UNKNOWN-8BIT csUnknown8BiT } | |
| 10499 | { MNEMONIC csMnemonic } | |
| 10500 | { MNEM csMnem } | |
| 10501 | { VISCII csVISCII } | |
| 10502 | { VIQR csVIQR } | |
| 10503 | { KOI8-R csKOI8R } | |
| 10504 | { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro } | |
| 10505 | { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro } | |
| 10506 | { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro } | |
| 10507 | { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro } | |
| 10508 | { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro } | |
| 10509 | { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro } | |
| 10510 | { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro } | |
| 10511 | { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro } | |
| 10512 | { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro } | |
| 10513 | { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro } | |
| 10514 | { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro } | |
| 10515 | { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro } | |
| 10516 | { IBM1047 IBM-1047 } | |
| 10517 | { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian } | |
| 10518 | { Amiga-1251 Ami1251 Amiga1251 Ami-1251 } | |
| 10519 | { UNICODE-1-1 csUnicode11 } | |
| 10520 | { CESU-8 csCESU-8 } | |
| 10521 | { BOCU-1 csBOCU-1 } | |
| 10522 | { UNICODE-1-1-UTF-7 csUnicode11UTF7 } | |
| 10523 | { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic | |
| 10524 | l8 } | |
| 10525 | { ISO-8859-15 ISO_8859-15 Latin-9 } | |
| 10526 | { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 } | |
| 10527 | { GBK CP936 MS936 windows-936 } | |
| 10528 | { JIS_Encoding csJISEncoding } | |
| 09c7029d | 10529 | { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS } |
| fd8ccbec PM |
10530 | { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese |
| 10531 | EUC-JP } | |
| 10532 | { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese } | |
| 10533 | { ISO-10646-UCS-Basic csUnicodeASCII } | |
| 10534 | { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 } | |
| 10535 | { ISO-Unicode-IBM-1261 csUnicodeIBM1261 } | |
| 10536 | { ISO-Unicode-IBM-1268 csUnicodeIBM1268 } | |
| 10537 | { ISO-Unicode-IBM-1276 csUnicodeIBM1276 } | |
| 10538 | { ISO-Unicode-IBM-1264 csUnicodeIBM1264 } | |
| 10539 | { ISO-Unicode-IBM-1265 csUnicodeIBM1265 } | |
| 10540 | { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 } | |
| 10541 | { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 } | |
| 10542 | { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 } | |
| 10543 | { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 } | |
| 10544 | { Adobe-Standard-Encoding csAdobeStandardEncoding } | |
| 10545 | { Ventura-US csVenturaUS } | |
| 10546 | { Ventura-International csVenturaInternational } | |
| 10547 | { PC8-Danish-Norwegian csPC8DanishNorwegian } | |
| 10548 | { PC8-Turkish csPC8Turkish } | |
| 10549 | { IBM-Symbols csIBMSymbols } | |
| 10550 | { IBM-Thai csIBMThai } | |
| 10551 | { HP-Legal csHPLegal } | |
| 10552 | { HP-Pi-font csHPPiFont } | |
| 10553 | { HP-Math8 csHPMath8 } | |
| 10554 | { Adobe-Symbol-Encoding csHPPSMath } | |
| 10555 | { HP-DeskTop csHPDesktop } | |
| 10556 | { Ventura-Math csVenturaMath } | |
| 10557 | { Microsoft-Publishing csMicrosoftPublishing } | |
| 10558 | { Windows-31J csWindows31J } | |
| 10559 | { GB2312 csGB2312 } | |
| 10560 | { Big5 csBig5 } | |
| 10561 | } | |
| 10562 | ||
| 10563 | proc tcl_encoding {enc} { | |
| 39ee47ef PM |
10564 | global encoding_aliases tcl_encoding_cache |
| 10565 | if {[info exists tcl_encoding_cache($enc)]} { | |
| 10566 | return $tcl_encoding_cache($enc) | |
| 10567 | } | |
| fd8ccbec PM |
10568 | set names [encoding names] |
| 10569 | set lcnames [string tolower $names] | |
| 10570 | set enc [string tolower $enc] | |
| 10571 | set i [lsearch -exact $lcnames $enc] | |
| 10572 | if {$i < 0} { | |
| 10573 | # look for "isonnn" instead of "iso-nnn" or "iso_nnn" | |
| 09c7029d | 10574 | if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} { |
| fd8ccbec PM |
10575 | set i [lsearch -exact $lcnames $encx] |
| 10576 | } | |
| 10577 | } | |
| 10578 | if {$i < 0} { | |
| 10579 | foreach l $encoding_aliases { | |
| 10580 | set ll [string tolower $l] | |
| 10581 | if {[lsearch -exact $ll $enc] < 0} continue | |
| 10582 | # look through the aliases for one that tcl knows about | |
| 10583 | foreach e $ll { | |
| 10584 | set i [lsearch -exact $lcnames $e] | |
| 10585 | if {$i < 0} { | |
| 09c7029d | 10586 | if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} { |
| fd8ccbec PM |
10587 | set i [lsearch -exact $lcnames $ex] |
| 10588 | } | |
| 10589 | } | |
| 10590 | if {$i >= 0} break | |
| 10591 | } | |
| 10592 | break | |
| 10593 | } | |
| 10594 | } | |
| 39ee47ef | 10595 | set tclenc {} |
| fd8ccbec | 10596 | if {$i >= 0} { |
| 39ee47ef | 10597 | set tclenc [lindex $names $i] |
| fd8ccbec | 10598 | } |
| 39ee47ef PM |
10599 | set tcl_encoding_cache($enc) $tclenc |
| 10600 | return $tclenc | |
| fd8ccbec PM |
10601 | } |
| 10602 | ||
| 09c7029d | 10603 | proc gitattr {path attr default} { |
| 39ee47ef PM |
10604 | global path_attr_cache |
| 10605 | if {[info exists path_attr_cache($attr,$path)]} { | |
| 10606 | set r $path_attr_cache($attr,$path) | |
| 10607 | } else { | |
| 10608 | set r "unspecified" | |
| 10609 | if {![catch {set line [exec git check-attr $attr -- $path]}]} { | |
| 10610 | regexp "(.*): encoding: (.*)" $line m f r | |
| 09c7029d | 10611 | } |
| 4db09304 | 10612 | set path_attr_cache($attr,$path) $r |
| 39ee47ef PM |
10613 | } |
| 10614 | if {$r eq "unspecified"} { | |
| 10615 | return $default | |
| 10616 | } | |
| 10617 | return $r | |
| 09c7029d AG |
10618 | } |
| 10619 | ||
| 4db09304 | 10620 | proc cache_gitattr {attr pathlist} { |
| 39ee47ef PM |
10621 | global path_attr_cache |
| 10622 | set newlist {} | |
| 10623 | foreach path $pathlist { | |
| 10624 | if {![info exists path_attr_cache($attr,$path)]} { | |
| 10625 | lappend newlist $path | |
| 10626 | } | |
| 10627 | } | |
| 10628 | set lim 1000 | |
| 10629 | if {[tk windowingsystem] == "win32"} { | |
| 10630 | # windows has a 32k limit on the arguments to a command... | |
| 10631 | set lim 30 | |
| 10632 | } | |
| 10633 | while {$newlist ne {}} { | |
| 10634 | set head [lrange $newlist 0 [expr {$lim - 1}]] | |
| 10635 | set newlist [lrange $newlist $lim end] | |
| 10636 | if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} { | |
| 10637 | foreach row [split $rlist "\n"] { | |
| 10638 | if {[regexp "(.*): encoding: (.*)" $row m path value]} { | |
| 10639 | if {[string index $path 0] eq "\""} { | |
| 10640 | set path [encoding convertfrom [lindex $path 0]] | |
| 10641 | } | |
| 10642 | set path_attr_cache($attr,$path) $value | |
| 4db09304 | 10643 | } |
| 39ee47ef | 10644 | } |
| 4db09304 | 10645 | } |
| 39ee47ef | 10646 | } |
| 4db09304 AG |
10647 | } |
| 10648 | ||
| 09c7029d | 10649 | proc get_path_encoding {path} { |
| 39ee47ef PM |
10650 | global gui_encoding perfile_attrs |
| 10651 | set tcl_enc $gui_encoding | |
| 10652 | if {$path ne {} && $perfile_attrs} { | |
| 10653 | set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]] | |
| 10654 | if {$enc2 ne {}} { | |
| 10655 | set tcl_enc $enc2 | |
| 09c7029d | 10656 | } |
| 39ee47ef PM |
10657 | } |
| 10658 | return $tcl_enc | |
| 09c7029d AG |
10659 | } |
| 10660 | ||
| 5d7589d4 PM |
10661 | # First check that Tcl/Tk is recent enough |
| 10662 | if {[catch {package require Tk 8.4} err]} { | |
| d990cedf CS |
10663 | show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\ |
| 10664 | Gitk requires at least Tcl/Tk 8.4."] | |
| 5d7589d4 PM |
10665 | exit 1 |
| 10666 | } | |
| 10667 | ||
| 1d10f36d | 10668 | # defaults... |
| 8974c6f9 | 10669 | set wrcomcmd "git diff-tree --stdin -p --pretty" |
| 671bc153 | 10670 | |
| fd8ccbec | 10671 | set gitencoding {} |
| 671bc153 | 10672 | catch { |
| 27cb61ca | 10673 | set gitencoding [exec git config --get i18n.commitencoding] |
| 671bc153 | 10674 | } |
| 590915da AG |
10675 | catch { |
| 10676 | set gitencoding [exec git config --get i18n.logoutputencoding] | |
| 10677 | } | |
| 671bc153 | 10678 | if {$gitencoding == ""} { |
| fd8ccbec PM |
10679 | set gitencoding "utf-8" |
| 10680 | } | |
| 10681 | set tclencoding [tcl_encoding $gitencoding] | |
| 10682 | if {$tclencoding == {}} { | |
| 10683 | puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk" | |
| 671bc153 | 10684 | } |
| 1db95b00 | 10685 | |
| 09c7029d AG |
10686 | set gui_encoding [encoding system] |
| 10687 | catch { | |
| 39ee47ef PM |
10688 | set enc [exec git config --get gui.encoding] |
| 10689 | if {$enc ne {}} { | |
| 10690 | set tclenc [tcl_encoding $enc] | |
| 10691 | if {$tclenc ne {}} { | |
| 10692 | set gui_encoding $tclenc | |
| 10693 | } else { | |
| 10694 | puts stderr "Warning: encoding $enc is not supported by Tcl/Tk" | |
| 10695 | } | |
| 10696 | } | |
| 09c7029d AG |
10697 | } |
| 10698 | ||
| 1d10f36d | 10699 | set mainfont {Helvetica 9} |
| 1d10f36d | 10700 | set textfont {Courier 9} |
| 4840be66 | 10701 | set uifont {Helvetica 9 bold} |
| 7e12f1a6 | 10702 | set tabstop 8 |
| b74fd579 | 10703 | set findmergefiles 0 |
| 8d858d1a | 10704 | set maxgraphpct 50 |
| f6075eba | 10705 | set maxwidth 16 |
| 232475d3 | 10706 | set revlistorder 0 |
| 757f17bc | 10707 | set fastdate 0 |
| 6e8c8707 PM |
10708 | set uparrowlen 5 |
| 10709 | set downarrowlen 5 | |
| 10710 | set mingaplen 100 | |
| f8b28a40 | 10711 | set cmitmode "patch" |
| f1b86294 | 10712 | set wrapcomment "none" |
| b8ab2e17 | 10713 | set showneartags 1 |
| 0a4dd8b8 | 10714 | set maxrefs 20 |
| 322a8cc9 | 10715 | set maxlinelen 200 |
| 219ea3a9 | 10716 | set showlocalchanges 1 |
| 7a39a17a | 10717 | set limitdiffs 1 |
| e8b5f4be | 10718 | set datetimeformat "%Y-%m-%d %H:%M:%S" |
| 95293b58 | 10719 | set autoselect 1 |
| 39ee47ef | 10720 | set perfile_attrs 0 |
| 1d10f36d | 10721 | |
| 314f5de1 TA |
10722 | set extdifftool "meld" |
| 10723 | ||
| 1d10f36d | 10724 | set colors {green red blue magenta darkgrey brown orange} |
| f8a2c0d1 PM |
10725 | set bgcolor white |
| 10726 | set fgcolor black | |
| 10727 | set diffcolors {red "#00a000" blue} | |
| 890fae70 | 10728 | set diffcontext 3 |
| b9b86007 | 10729 | set ignorespace 0 |
| 60378c0c | 10730 | set selectbgcolor gray85 |
| e3e901be | 10731 | set markbgcolor "#e0e0ff" |
| 1d10f36d | 10732 | |
| c11ff120 PM |
10733 | set circlecolors {white blue gray blue blue} |
| 10734 | ||
| d277e89f PM |
10735 | # button for popping up context menus |
| 10736 | if {[tk windowingsystem] eq "aqua"} { | |
| 10737 | set ctxbut <Button-2> | |
| 10738 | } else { | |
| 10739 | set ctxbut <Button-3> | |
| 10740 | } | |
| 10741 | ||
| 663c3aa9 CS |
10742 | ## For msgcat loading, first locate the installation location. |
| 10743 | if { [info exists ::env(GITK_MSGSDIR)] } { | |
| 10744 | ## Msgsdir was manually set in the environment. | |
| 10745 | set gitk_msgsdir $::env(GITK_MSGSDIR) | |
| 10746 | } else { | |
| 10747 | ## Let's guess the prefix from argv0. | |
| 10748 | set gitk_prefix [file dirname [file dirname [file normalize $argv0]]] | |
| 10749 | set gitk_libdir [file join $gitk_prefix share gitk lib] | |
| 10750 | set gitk_msgsdir [file join $gitk_libdir msgs] | |
| 10751 | unset gitk_prefix | |
| 10752 | } | |
| 10753 | ||
| 10754 | ## Internationalization (i18n) through msgcat and gettext. See | |
| 10755 | ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html | |
| 10756 | package require msgcat | |
| 10757 | namespace import ::msgcat::mc | |
| 10758 | ## And eventually load the actual message catalog | |
| 10759 | ::msgcat::mcload $gitk_msgsdir | |
| 10760 | ||
| 1d10f36d PM |
10761 | catch {source ~/.gitk} |
| 10762 | ||
| 712fcc08 | 10763 | font create optionfont -family sans-serif -size -12 |
| 17386066 | 10764 | |
| 0ed1dd3c PM |
10765 | parsefont mainfont $mainfont |
| 10766 | eval font create mainfont [fontflags mainfont] | |
| 10767 | eval font create mainfontbold [fontflags mainfont 1] | |
| 10768 | ||
| 10769 | parsefont textfont $textfont | |
| 10770 | eval font create textfont [fontflags textfont] | |
| 10771 | eval font create textfontbold [fontflags textfont 1] | |
| 10772 | ||
| 10773 | parsefont uifont $uifont | |
| 10774 | eval font create uifont [fontflags uifont] | |
| 17386066 | 10775 | |
| b039f0a6 PM |
10776 | setoptions |
| 10777 | ||
| cdaee5db | 10778 | # check that we can find a .git directory somewhere... |
| 6c87d60c | 10779 | if {[catch {set gitdir [gitdir]}]} { |
| d990cedf | 10780 | show_error {} . [mc "Cannot find a git repository here."] |
| 6c87d60c AR |
10781 | exit 1 |
| 10782 | } | |
| cdaee5db | 10783 | if {![file isdirectory $gitdir]} { |
| d990cedf | 10784 | show_error {} . [mc "Cannot find the git directory \"%s\"." $gitdir] |
| cdaee5db PM |
10785 | exit 1 |
| 10786 | } | |
| 10787 | ||
| 39816d60 AG |
10788 | set selecthead {} |
| 10789 | set selectheadid {} | |
| 10790 | ||
| 1d10f36d | 10791 | set revtreeargs {} |
| cdaee5db PM |
10792 | set cmdline_files {} |
| 10793 | set i 0 | |
| 2d480856 | 10794 | set revtreeargscmd {} |
| 1d10f36d | 10795 | foreach arg $argv { |
| 2d480856 | 10796 | switch -glob -- $arg { |
| 6ebedabf | 10797 | "" { } |
| cdaee5db PM |
10798 | "--" { |
| 10799 | set cmdline_files [lrange $argv [expr {$i + 1}] end] | |
| 10800 | break | |
| 10801 | } | |
| 39816d60 AG |
10802 | "--select-commit=*" { |
| 10803 | set selecthead [string range $arg 16 end] | |
| 10804 | } | |
| 2d480856 YD |
10805 | "--argscmd=*" { |
| 10806 | set revtreeargscmd [string range $arg 10 end] | |
| 10807 | } | |
| 1d10f36d PM |
10808 | default { |
| 10809 | lappend revtreeargs $arg | |
| 10810 | } | |
| 10811 | } | |
| cdaee5db | 10812 | incr i |
| 1db95b00 | 10813 | } |
| 1d10f36d | 10814 | |
| 39816d60 AG |
10815 | if {$selecthead eq "HEAD"} { |
| 10816 | set selecthead {} | |
| 10817 | } | |
| 10818 | ||
| cdaee5db | 10819 | if {$i >= [llength $argv] && $revtreeargs ne {}} { |
| 3ed31a81 | 10820 | # no -- on command line, but some arguments (other than --argscmd) |
| 098dd8a3 | 10821 | if {[catch { |
| 8974c6f9 | 10822 | set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs] |
| 098dd8a3 PM |
10823 | set cmdline_files [split $f "\n"] |
| 10824 | set n [llength $cmdline_files] | |
| 10825 | set revtreeargs [lrange $revtreeargs 0 end-$n] | |
| cdaee5db PM |
10826 | # Unfortunately git rev-parse doesn't produce an error when |
| 10827 | # something is both a revision and a filename. To be consistent | |
| 10828 | # with git log and git rev-list, check revtreeargs for filenames. | |
| 10829 | foreach arg $revtreeargs { | |
| 10830 | if {[file exists $arg]} { | |
| d990cedf CS |
10831 | show_error {} . [mc "Ambiguous argument '%s': both revision\ |
| 10832 | and filename" $arg] | |
| cdaee5db PM |
10833 | exit 1 |
| 10834 | } | |
| 10835 | } | |
| 098dd8a3 PM |
10836 | } err]} { |
| 10837 | # unfortunately we get both stdout and stderr in $err, | |
| 10838 | # so look for "fatal:". | |
| 10839 | set i [string first "fatal:" $err] | |
| 10840 | if {$i > 0} { | |
| b5e09633 | 10841 | set err [string range $err [expr {$i + 6}] end] |
| 098dd8a3 | 10842 | } |
| d990cedf | 10843 | show_error {} . "[mc "Bad arguments to gitk:"]\n$err" |
| 098dd8a3 PM |
10844 | exit 1 |
| 10845 | } | |
| 10846 | } | |
| 10847 | ||
| 219ea3a9 | 10848 | set nullid "0000000000000000000000000000000000000000" |
| 8f489363 | 10849 | set nullid2 "0000000000000000000000000000000000000001" |
| 314f5de1 | 10850 | set nullfile "/dev/null" |
| 8f489363 | 10851 | |
| 32f1b3e4 | 10852 | set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}] |
| 219ea3a9 | 10853 | |
| 7eb3cb9c | 10854 | set runq {} |
| d698206c PM |
10855 | set history {} |
| 10856 | set historyindex 0 | |
| 908c3585 | 10857 | set fh_serial 0 |
| 908c3585 | 10858 | set nhl_names {} |
| 63b79191 | 10859 | set highlight_paths {} |
| 687c8765 | 10860 | set findpattern {} |
| 1902c270 | 10861 | set searchdirn -forwards |
| 28593d3f PM |
10862 | set boldids {} |
| 10863 | set boldnameids {} | |
| a8d610a2 | 10864 | set diffelide {0 0} |
| 4fb0fa19 | 10865 | set markingmatches 0 |
| 97645683 | 10866 | set linkentercount 0 |
| 0380081c PM |
10867 | set need_redisplay 0 |
| 10868 | set nrows_drawn 0 | |
| 32f1b3e4 | 10869 | set firsttabstop 0 |
| 9f1afe05 | 10870 | |
| 50b44ece PM |
10871 | set nextviewnum 1 |
| 10872 | set curview 0 | |
| a90a6d24 | 10873 | set selectedview 0 |
| b007ee20 CS |
10874 | set selectedhlview [mc "None"] |
| 10875 | set highlight_related [mc "None"] | |
| 687c8765 | 10876 | set highlight_files {} |
| 50b44ece | 10877 | set viewfiles(0) {} |
| a90a6d24 | 10878 | set viewperm(0) 0 |
| 098dd8a3 | 10879 | set viewargs(0) {} |
| 2d480856 | 10880 | set viewargscmd(0) {} |
| 50b44ece | 10881 | |
| 94b4a69f | 10882 | set selectedline {} |
| 6df7403a | 10883 | set numcommits 0 |
| 7fcc92bf | 10884 | set loginstance 0 |
| 098dd8a3 | 10885 | set cmdlineok 0 |
| 1d10f36d | 10886 | set stopped 0 |
| 0fba86b3 | 10887 | set stuffsaved 0 |
| 74daedb6 | 10888 | set patchnum 0 |
| 219ea3a9 | 10889 | set lserial 0 |
| cb8329aa | 10890 | set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}] |
| 1d10f36d | 10891 | setcoords |
| d94f8cd6 | 10892 | makewindow |
| 0eafba14 PM |
10893 | # wait for the window to become visible |
| 10894 | tkwait visibility . | |
| 6c283328 | 10895 | wm title . "[file tail $argv0]: [file tail [pwd]]" |
| 887fe3c4 | 10896 | readrefs |
| a8aaf19c | 10897 | |
| 2d480856 | 10898 | if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} { |
| 50b44ece PM |
10899 | # create a view for the files/dirs specified on the command line |
| 10900 | set curview 1 | |
| a90a6d24 | 10901 | set selectedview 1 |
| 50b44ece | 10902 | set nextviewnum 2 |
| d990cedf | 10903 | set viewname(1) [mc "Command line"] |
| 50b44ece | 10904 | set viewfiles(1) $cmdline_files |
| 098dd8a3 | 10905 | set viewargs(1) $revtreeargs |
| 2d480856 | 10906 | set viewargscmd(1) $revtreeargscmd |
| a90a6d24 | 10907 | set viewperm(1) 0 |
| 3ed31a81 | 10908 | set vdatemode(1) 0 |
| da7c24dd | 10909 | addviewmenu 1 |
| f2d0bbbd PM |
10910 | .bar.view entryconf [mca "Edit view..."] -state normal |
| 10911 | .bar.view entryconf [mca "Delete view"] -state normal | |
| 50b44ece | 10912 | } |
| a90a6d24 PM |
10913 | |
| 10914 | if {[info exists permviews]} { | |
| 10915 | foreach v $permviews { | |
| 10916 | set n $nextviewnum | |
| 10917 | incr nextviewnum | |
| 10918 | set viewname($n) [lindex $v 0] | |
| 10919 | set viewfiles($n) [lindex $v 1] | |
| 098dd8a3 | 10920 | set viewargs($n) [lindex $v 2] |
| 2d480856 | 10921 | set viewargscmd($n) [lindex $v 3] |
| a90a6d24 | 10922 | set viewperm($n) 1 |
| da7c24dd | 10923 | addviewmenu $n |
| a90a6d24 PM |
10924 | } |
| 10925 | } | |
| 567c34e0 | 10926 | getcommits {} |