##// END OF EJS Templates
hgk: added -selectbackground grey to canvases
Bela Babik -
r4501:b2338c0c default
parent child Browse files
Show More
@@ -1,3679 +1,3679 b''
1 1 #!/usr/bin/env wish
2 2
3 3 # Copyright (C) 2005 Paul Mackerras. All rights reserved.
4 4 # This program is free software; it may be used, copied, modified
5 5 # and distributed under the terms of the GNU General Public Licence,
6 6 # either version 2, or (at your option) any later version.
7 7
8 8 proc gitdir {} {
9 9 global env
10 10 if {[info exists env(GIT_DIR)]} {
11 11 return $env(GIT_DIR)
12 12 } else {
13 13 return ".hg"
14 14 }
15 15 }
16 16
17 17 proc getcommits {rargs} {
18 18 global commits commfd phase canv mainfont env
19 19 global startmsecs nextupdate ncmupdate
20 20 global ctext maincursor textcursor leftover
21 21
22 22 # check that we can find a .git directory somewhere...
23 23 set gitdir [gitdir]
24 24 if {![file isdirectory $gitdir]} {
25 25 error_popup "Cannot find the git directory \"$gitdir\"."
26 26 exit 1
27 27 }
28 28 set commits {}
29 29 set phase getcommits
30 30 set startmsecs [clock clicks -milliseconds]
31 31 set nextupdate [expr $startmsecs + 100]
32 32 set ncmupdate 1
33 33 set limit 0
34 34 set revargs {}
35 35 for {set i 0} {$i < [llength $rargs]} {incr i} {
36 36 set opt [lindex $rargs $i]
37 37 if {$opt == "--limit"} {
38 38 incr i
39 39 set limit [lindex $rargs $i]
40 40 } else {
41 41 lappend revargs $opt
42 42 }
43 43 }
44 44 if [catch {
45 45 set parse_args [concat --default HEAD $revargs]
46 46 set parse_temp [eval exec hg debug-rev-parse $parse_args]
47 47 regsub -all "\r\n" $parse_temp "\n" parse_temp
48 48 set parsed_args [split $parse_temp "\n"]
49 49 } err] {
50 50 # if git-rev-parse failed for some reason...
51 51 if {$rargs == {}} {
52 52 set revargs HEAD
53 53 }
54 54 set parsed_args $revargs
55 55 }
56 56 if {$limit > 0} {
57 57 set parsed_args [concat -n $limit $parsed_args]
58 58 }
59 59 if [catch {
60 60 set commfd [open "|hg debug-rev-list --header --topo-order --parents $parsed_args" r]
61 61 } err] {
62 62 puts stderr "Error executing hg debug-rev-list: $err"
63 63 exit 1
64 64 }
65 65 set leftover {}
66 66 fconfigure $commfd -blocking 0 -translation lf
67 67 fileevent $commfd readable [list getcommitlines $commfd]
68 68 $canv delete all
69 69 $canv create text 3 3 -anchor nw -text "Reading commits..." \
70 70 -font $mainfont -tags textitems
71 71 . config -cursor watch
72 72 settextcursor watch
73 73 }
74 74
75 75 proc getcommitlines {commfd} {
76 76 global commits parents cdate children
77 77 global commitlisted phase commitinfo nextupdate
78 78 global stopped redisplaying leftover
79 79
80 80 set stuff [read $commfd]
81 81 if {$stuff == {}} {
82 82 if {![eof $commfd]} return
83 83 # set it blocking so we wait for the process to terminate
84 84 fconfigure $commfd -blocking 1
85 85 if {![catch {close $commfd} err]} {
86 86 after idle finishcommits
87 87 return
88 88 }
89 89 if {[string range $err 0 4] == "usage"} {
90 90 set err \
91 91 {Gitk: error reading commits: bad arguments to git-rev-list.
92 92 (Note: arguments to gitk are passed to git-rev-list
93 93 to allow selection of commits to be displayed.)}
94 94 } else {
95 95 set err "Error reading commits: $err"
96 96 }
97 97 error_popup $err
98 98 exit 1
99 99 }
100 100 set start 0
101 101 while 1 {
102 102 set i [string first "\0" $stuff $start]
103 103 if {$i < 0} {
104 104 append leftover [string range $stuff $start end]
105 105 return
106 106 }
107 107 set cmit [string range $stuff $start [expr {$i - 1}]]
108 108 if {$start == 0} {
109 109 set cmit "$leftover$cmit"
110 110 set leftover {}
111 111 }
112 112 set start [expr {$i + 1}]
113 113 regsub -all "\r\n" $cmit "\n" cmit
114 114 set j [string first "\n" $cmit]
115 115 set ok 0
116 116 if {$j >= 0} {
117 117 set ids [string range $cmit 0 [expr {$j - 1}]]
118 118 set ok 1
119 119 foreach id $ids {
120 120 if {![regexp {^[0-9a-f]{12}$} $id]} {
121 121 set ok 0
122 122 break
123 123 }
124 124 }
125 125 }
126 126 if {!$ok} {
127 127 set shortcmit $cmit
128 128 if {[string length $shortcmit] > 80} {
129 129 set shortcmit "[string range $shortcmit 0 80]..."
130 130 }
131 131 error_popup "Can't parse hg debug-rev-list output: {$shortcmit}"
132 132 exit 1
133 133 }
134 134 set id [lindex $ids 0]
135 135 set olds [lrange $ids 1 end]
136 136 set cmit [string range $cmit [expr {$j + 1}] end]
137 137 lappend commits $id
138 138 set commitlisted($id) 1
139 139 parsecommit $id $cmit 1 [lrange $ids 1 end]
140 140 drawcommit $id
141 141 if {[clock clicks -milliseconds] >= $nextupdate} {
142 142 doupdate 1
143 143 }
144 144 while {$redisplaying} {
145 145 set redisplaying 0
146 146 if {$stopped == 1} {
147 147 set stopped 0
148 148 set phase "getcommits"
149 149 foreach id $commits {
150 150 drawcommit $id
151 151 if {$stopped} break
152 152 if {[clock clicks -milliseconds] >= $nextupdate} {
153 153 doupdate 1
154 154 }
155 155 }
156 156 }
157 157 }
158 158 }
159 159 }
160 160
161 161 proc doupdate {reading} {
162 162 global commfd nextupdate numcommits ncmupdate
163 163
164 164 if {$reading} {
165 165 fileevent $commfd readable {}
166 166 }
167 167 update
168 168 set nextupdate [expr {[clock clicks -milliseconds] + 100}]
169 169 if {$numcommits < 100} {
170 170 set ncmupdate [expr {$numcommits + 1}]
171 171 } elseif {$numcommits < 10000} {
172 172 set ncmupdate [expr {$numcommits + 10}]
173 173 } else {
174 174 set ncmupdate [expr {$numcommits + 100}]
175 175 }
176 176 if {$reading} {
177 177 fileevent $commfd readable [list getcommitlines $commfd]
178 178 }
179 179 }
180 180
181 181 proc readcommit {id} {
182 182 if [catch {set contents [exec hg debug-cat-file commit $id]}] return
183 183 parsecommit $id $contents 0 {}
184 184 }
185 185
186 186 proc parsecommit {id contents listed olds} {
187 187 global commitinfo children nchildren parents nparents cdate ncleft
188 188
189 189 set inhdr 1
190 190 set comment {}
191 191 set headline {}
192 192 set auname {}
193 193 set audate {}
194 194 set comname {}
195 195 set comdate {}
196 196 set rev {}
197 197 if {![info exists nchildren($id)]} {
198 198 set children($id) {}
199 199 set nchildren($id) 0
200 200 set ncleft($id) 0
201 201 }
202 202 set parents($id) $olds
203 203 set nparents($id) [llength $olds]
204 204 foreach p $olds {
205 205 if {![info exists nchildren($p)]} {
206 206 set children($p) [list $id]
207 207 set nchildren($p) 1
208 208 set ncleft($p) 1
209 209 } elseif {[lsearch -exact $children($p) $id] < 0} {
210 210 lappend children($p) $id
211 211 incr nchildren($p)
212 212 incr ncleft($p)
213 213 }
214 214 }
215 215 regsub -all "\r\n" $contents "\n" contents
216 216 foreach line [split $contents "\n"] {
217 217 if {$inhdr} {
218 218 set line [split $line]
219 219 if {$line == {}} {
220 220 set inhdr 0
221 221 } else {
222 222 set tag [lindex $line 0]
223 223 if {$tag == "author"} {
224 224 set x [expr {[llength $line] - 2}]
225 225 set audate [lindex $line $x]
226 226 set auname [join [lrange $line 1 [expr {$x - 1}]]]
227 227 } elseif {$tag == "committer"} {
228 228 set x [expr {[llength $line] - 2}]
229 229 set comdate [lindex $line $x]
230 230 set comname [join [lrange $line 1 [expr {$x - 1}]]]
231 231 } elseif {$tag == "revision"} {
232 232 set rev [lindex $line 1]
233 233 }
234 234 }
235 235 } else {
236 236 if {$comment == {}} {
237 237 set headline [string trim $line]
238 238 } else {
239 239 append comment "\n"
240 240 }
241 241 if {!$listed} {
242 242 # git-rev-list indents the comment by 4 spaces;
243 243 # if we got this via git-cat-file, add the indentation
244 244 append comment " "
245 245 }
246 246 append comment $line
247 247 }
248 248 }
249 249 if {$audate != {}} {
250 250 set audate [clock format $audate -format "%Y-%m-%d %H:%M:%S"]
251 251 }
252 252 if {$comdate != {}} {
253 253 set cdate($id) $comdate
254 254 set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"]
255 255 }
256 256 set commitinfo($id) [list $headline $auname $audate \
257 257 $comname $comdate $comment $rev]
258 258 }
259 259
260 260 proc readrefs {} {
261 261 global tagids idtags headids idheads tagcontents
262 262
263 263 set tags [exec hg tags]
264 264 regsub -all "\r\n" $tags "\n" tags
265 265 set lines [split $tags "\n"]
266 266 foreach f $lines {
267 267 set f [regexp -all -inline {\S+} $f]
268 268 set direct [lindex $f 0]
269 269 set full [lindex $f 1]
270 270 set sha [split $full ':']
271 271 set tag [lindex $sha 1]
272 272 lappend tagids($direct) $tag
273 273 lappend idtags($tag) $direct
274 274 }
275 275 }
276 276
277 277 proc readotherrefs {base dname excl} {
278 278 global otherrefids idotherrefs
279 279
280 280 set git [gitdir]
281 281 set files [glob -nocomplain -types f [file join $git $base *]]
282 282 foreach f $files {
283 283 catch {
284 284 set fd [open $f r]
285 285 set line [read $fd 40]
286 286 if {[regexp {^[0-9a-f]{12}} $line id]} {
287 287 set name "$dname[file tail $f]"
288 288 set otherrefids($name) $id
289 289 lappend idotherrefs($id) $name
290 290 }
291 291 close $fd
292 292 }
293 293 }
294 294 set dirs [glob -nocomplain -types d [file join $git $base *]]
295 295 foreach d $dirs {
296 296 set dir [file tail $d]
297 297 if {[lsearch -exact $excl $dir] >= 0} continue
298 298 readotherrefs [file join $base $dir] "$dname$dir/" {}
299 299 }
300 300 }
301 301
302 302 proc error_popup msg {
303 303 set w .error
304 304 toplevel $w
305 305 wm transient $w .
306 306 message $w.m -text $msg -justify center -aspect 400
307 307 pack $w.m -side top -fill x -padx 20 -pady 20
308 308 button $w.ok -text OK -command "destroy $w"
309 309 pack $w.ok -side bottom -fill x
310 310 bind $w <Visibility> "grab $w; focus $w"
311 311 tkwait window $w
312 312 }
313 313
314 314 proc makewindow {} {
315 315 global canv canv2 canv3 linespc charspc ctext cflist textfont
316 316 global findtype findtypemenu findloc findstring fstring geometry
317 317 global entries sha1entry sha1string sha1but
318 318 global maincursor textcursor curtextcursor
319 319 global rowctxmenu gaudydiff mergemax
320 320
321 321 menu .bar
322 322 .bar add cascade -label "File" -menu .bar.file
323 323 menu .bar.file
324 324 .bar.file add command -label "Reread references" -command rereadrefs
325 325 .bar.file add command -label "Quit" -command doquit
326 326 menu .bar.help
327 327 .bar add cascade -label "Help" -menu .bar.help
328 328 .bar.help add command -label "About gitk" -command about
329 329 . configure -menu .bar
330 330
331 331 if {![info exists geometry(canv1)]} {
332 332 set geometry(canv1) [expr 45 * $charspc]
333 333 set geometry(canv2) [expr 30 * $charspc]
334 334 set geometry(canv3) [expr 15 * $charspc]
335 335 set geometry(canvh) [expr 25 * $linespc + 4]
336 336 set geometry(ctextw) 80
337 337 set geometry(ctexth) 30
338 338 set geometry(cflistw) 30
339 339 }
340 340 panedwindow .ctop -orient vertical
341 341 if {[info exists geometry(width)]} {
342 342 .ctop conf -width $geometry(width) -height $geometry(height)
343 343 set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
344 344 set geometry(ctexth) [expr {($texth - 8) /
345 345 [font metrics $textfont -linespace]}]
346 346 }
347 347 frame .ctop.top
348 348 frame .ctop.top.bar
349 349 pack .ctop.top.bar -side bottom -fill x
350 350 set cscroll .ctop.top.csb
351 351 scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0
352 352 pack $cscroll -side right -fill y
353 353 panedwindow .ctop.top.clist -orient horizontal -sashpad 0 -handlesize 4
354 354 pack .ctop.top.clist -side top -fill both -expand 1
355 355 .ctop add .ctop.top
356 356 set canv .ctop.top.clist.canv
357 357 canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
358 358 -bg white -bd 0 \
359 -yscrollincr $linespc -yscrollcommand "$cscroll set"
359 -yscrollincr $linespc -yscrollcommand "$cscroll set" -selectbackground grey
360 360 .ctop.top.clist add $canv
361 361 set canv2 .ctop.top.clist.canv2
362 362 canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
363 -bg white -bd 0 -yscrollincr $linespc
363 -bg white -bd 0 -yscrollincr $linespc -selectbackground grey
364 364 .ctop.top.clist add $canv2
365 365 set canv3 .ctop.top.clist.canv3
366 366 canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
367 -bg white -bd 0 -yscrollincr $linespc
367 -bg white -bd 0 -yscrollincr $linespc -selectbackground grey
368 368 .ctop.top.clist add $canv3
369 369 bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
370 370
371 371 set sha1entry .ctop.top.bar.sha1
372 372 set entries $sha1entry
373 373 set sha1but .ctop.top.bar.sha1label
374 374 button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
375 375 -command gotocommit -width 8
376 376 $sha1but conf -disabledforeground [$sha1but cget -foreground]
377 377 pack .ctop.top.bar.sha1label -side left
378 378 entry $sha1entry -width 40 -font $textfont -textvariable sha1string
379 379 trace add variable sha1string write sha1change
380 380 pack $sha1entry -side left -pady 2
381 381
382 382 image create bitmap bm-left -data {
383 383 #define left_width 16
384 384 #define left_height 16
385 385 static unsigned char left_bits[] = {
386 386 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
387 387 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
388 388 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
389 389 }
390 390 image create bitmap bm-right -data {
391 391 #define right_width 16
392 392 #define right_height 16
393 393 static unsigned char right_bits[] = {
394 394 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
395 395 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
396 396 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
397 397 }
398 398 button .ctop.top.bar.leftbut -image bm-left -command goback \
399 399 -state disabled -width 26
400 400 pack .ctop.top.bar.leftbut -side left -fill y
401 401 button .ctop.top.bar.rightbut -image bm-right -command goforw \
402 402 -state disabled -width 26
403 403 pack .ctop.top.bar.rightbut -side left -fill y
404 404
405 405 button .ctop.top.bar.findbut -text "Find" -command dofind
406 406 pack .ctop.top.bar.findbut -side left
407 407 set findstring {}
408 408 set fstring .ctop.top.bar.findstring
409 409 lappend entries $fstring
410 410 entry $fstring -width 30 -font $textfont -textvariable findstring
411 411 pack $fstring -side left -expand 1 -fill x
412 412 set findtype Exact
413 413 set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
414 414 findtype Exact IgnCase Regexp]
415 415 set findloc "All fields"
416 416 tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
417 417 Comments Author Committer Files Pickaxe
418 418 pack .ctop.top.bar.findloc -side right
419 419 pack .ctop.top.bar.findtype -side right
420 420 # for making sure type==Exact whenever loc==Pickaxe
421 421 trace add variable findloc write findlocchange
422 422
423 423 panedwindow .ctop.cdet -orient horizontal
424 424 .ctop add .ctop.cdet
425 425 frame .ctop.cdet.left
426 426 set ctext .ctop.cdet.left.ctext
427 427 text $ctext -bg white -state disabled -font $textfont \
428 428 -width $geometry(ctextw) -height $geometry(ctexth) \
429 429 -yscrollcommand ".ctop.cdet.left.sb set" \
430 430 -xscrollcommand ".ctop.cdet.left.hb set" -wrap none
431 431 scrollbar .ctop.cdet.left.sb -command "$ctext yview"
432 432 scrollbar .ctop.cdet.left.hb -orient horizontal -command "$ctext xview"
433 433 pack .ctop.cdet.left.sb -side right -fill y
434 434 pack .ctop.cdet.left.hb -side bottom -fill x
435 435 pack $ctext -side left -fill both -expand 1
436 436 .ctop.cdet add .ctop.cdet.left
437 437
438 438 $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
439 439 if {$gaudydiff} {
440 440 $ctext tag conf hunksep -back blue -fore white
441 441 $ctext tag conf d0 -back "#ff8080"
442 442 $ctext tag conf d1 -back green
443 443 } else {
444 444 $ctext tag conf hunksep -fore blue
445 445 $ctext tag conf d0 -fore red
446 446 $ctext tag conf d1 -fore "#00a000"
447 447 $ctext tag conf m0 -fore red
448 448 $ctext tag conf m1 -fore blue
449 449 $ctext tag conf m2 -fore green
450 450 $ctext tag conf m3 -fore purple
451 451 $ctext tag conf m4 -fore brown
452 452 $ctext tag conf mmax -fore darkgrey
453 453 set mergemax 5
454 454 $ctext tag conf mresult -font [concat $textfont bold]
455 455 $ctext tag conf msep -font [concat $textfont bold]
456 456 $ctext tag conf found -back yellow
457 457 }
458 458
459 459 frame .ctop.cdet.right
460 460 set cflist .ctop.cdet.right.cfiles
461 461 listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
462 462 -yscrollcommand ".ctop.cdet.right.sb set"
463 463 scrollbar .ctop.cdet.right.sb -command "$cflist yview"
464 464 pack .ctop.cdet.right.sb -side right -fill y
465 465 pack $cflist -side left -fill both -expand 1
466 466 .ctop.cdet add .ctop.cdet.right
467 467 bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
468 468
469 469 pack .ctop -side top -fill both -expand 1
470 470
471 471 bindall <1> {selcanvline %W %x %y}
472 472 #bindall <B1-Motion> {selcanvline %W %x %y}
473 473 bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
474 474 bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
475 475 bindall <2> "allcanvs scan mark 0 %y"
476 476 bindall <B2-Motion> "allcanvs scan dragto 0 %y"
477 477 bind . <Key-Up> "selnextline -1"
478 478 bind . <Key-Down> "selnextline 1"
479 479 bind . <Key-Prior> "allcanvs yview scroll -1 pages"
480 480 bind . <Key-Next> "allcanvs yview scroll 1 pages"
481 481 bindkey <Key-Delete> "$ctext yview scroll -1 pages"
482 482 bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
483 483 bindkey <Key-space> "$ctext yview scroll 1 pages"
484 484 bindkey p "selnextline -1"
485 485 bindkey n "selnextline 1"
486 486 bindkey b "$ctext yview scroll -1 pages"
487 487 bindkey d "$ctext yview scroll 18 units"
488 488 bindkey u "$ctext yview scroll -18 units"
489 489 bindkey / {findnext 1}
490 490 bindkey <Key-Return> {findnext 0}
491 491 bindkey ? findprev
492 492 bindkey f nextfile
493 493 bind . <Control-q> doquit
494 494 bind . <Control-w> doquit
495 495 bind . <Control-f> dofind
496 496 bind . <Control-g> {findnext 0}
497 497 bind . <Control-r> findprev
498 498 bind . <Control-equal> {incrfont 1}
499 499 bind . <Control-KP_Add> {incrfont 1}
500 500 bind . <Control-minus> {incrfont -1}
501 501 bind . <Control-KP_Subtract> {incrfont -1}
502 502 bind $cflist <<ListboxSelect>> listboxsel
503 503 bind . <Destroy> {savestuff %W}
504 504 bind . <Button-1> "click %W"
505 505 bind $fstring <Key-Return> dofind
506 506 bind $sha1entry <Key-Return> gotocommit
507 507 bind $sha1entry <<PasteSelection>> clearsha1
508 508
509 509 set maincursor [. cget -cursor]
510 510 set textcursor [$ctext cget -cursor]
511 511 set curtextcursor $textcursor
512 512
513 513 set rowctxmenu .rowctxmenu
514 514 menu $rowctxmenu -tearoff 0
515 515 $rowctxmenu add command -label "Diff this -> selected" \
516 516 -command {diffvssel 0}
517 517 $rowctxmenu add command -label "Diff selected -> this" \
518 518 -command {diffvssel 1}
519 519 $rowctxmenu add command -label "Make patch" -command mkpatch
520 520 $rowctxmenu add command -label "Create tag" -command mktag
521 521 $rowctxmenu add command -label "Write commit to file" -command writecommit
522 522 }
523 523
524 524 # when we make a key binding for the toplevel, make sure
525 525 # it doesn't get triggered when that key is pressed in the
526 526 # find string entry widget.
527 527 proc bindkey {ev script} {
528 528 global entries
529 529 bind . $ev $script
530 530 set escript [bind Entry $ev]
531 531 if {$escript == {}} {
532 532 set escript [bind Entry <Key>]
533 533 }
534 534 foreach e $entries {
535 535 bind $e $ev "$escript; break"
536 536 }
537 537 }
538 538
539 539 # set the focus back to the toplevel for any click outside
540 540 # the entry widgets
541 541 proc click {w} {
542 542 global entries
543 543 foreach e $entries {
544 544 if {$w == $e} return
545 545 }
546 546 focus .
547 547 }
548 548
549 549 proc savestuff {w} {
550 550 global canv canv2 canv3 ctext cflist mainfont textfont
551 551 global stuffsaved findmergefiles gaudydiff maxgraphpct
552 552 global maxwidth
553 553
554 554 if {$stuffsaved} return
555 555 if {![winfo viewable .]} return
556 556 catch {
557 557 set f [open "~/.gitk-new" w]
558 558 puts $f [list set mainfont $mainfont]
559 559 puts $f [list set textfont $textfont]
560 560 puts $f [list set findmergefiles $findmergefiles]
561 561 puts $f [list set gaudydiff $gaudydiff]
562 562 puts $f [list set maxgraphpct $maxgraphpct]
563 563 puts $f [list set maxwidth $maxwidth]
564 564 puts $f "set geometry(width) [winfo width .ctop]"
565 565 puts $f "set geometry(height) [winfo height .ctop]"
566 566 puts $f "set geometry(canv1) [expr [winfo width $canv]-2]"
567 567 puts $f "set geometry(canv2) [expr [winfo width $canv2]-2]"
568 568 puts $f "set geometry(canv3) [expr [winfo width $canv3]-2]"
569 569 puts $f "set geometry(canvh) [expr [winfo height $canv]-2]"
570 570 set wid [expr {([winfo width $ctext] - 8) \
571 571 / [font measure $textfont "0"]}]
572 572 puts $f "set geometry(ctextw) $wid"
573 573 set wid [expr {([winfo width $cflist] - 11) \
574 574 / [font measure [$cflist cget -font] "0"]}]
575 575 puts $f "set geometry(cflistw) $wid"
576 576 close $f
577 577 file rename -force "~/.gitk-new" "~/.gitk"
578 578 }
579 579 set stuffsaved 1
580 580 }
581 581
582 582 proc resizeclistpanes {win w} {
583 583 global oldwidth
584 584 if [info exists oldwidth($win)] {
585 585 set s0 [$win sash coord 0]
586 586 set s1 [$win sash coord 1]
587 587 if {$w < 60} {
588 588 set sash0 [expr {int($w/2 - 2)}]
589 589 set sash1 [expr {int($w*5/6 - 2)}]
590 590 } else {
591 591 set factor [expr {1.0 * $w / $oldwidth($win)}]
592 592 set sash0 [expr {int($factor * [lindex $s0 0])}]
593 593 set sash1 [expr {int($factor * [lindex $s1 0])}]
594 594 if {$sash0 < 30} {
595 595 set sash0 30
596 596 }
597 597 if {$sash1 < $sash0 + 20} {
598 598 set sash1 [expr $sash0 + 20]
599 599 }
600 600 if {$sash1 > $w - 10} {
601 601 set sash1 [expr $w - 10]
602 602 if {$sash0 > $sash1 - 20} {
603 603 set sash0 [expr $sash1 - 20]
604 604 }
605 605 }
606 606 }
607 607 $win sash place 0 $sash0 [lindex $s0 1]
608 608 $win sash place 1 $sash1 [lindex $s1 1]
609 609 }
610 610 set oldwidth($win) $w
611 611 }
612 612
613 613 proc resizecdetpanes {win w} {
614 614 global oldwidth
615 615 if [info exists oldwidth($win)] {
616 616 set s0 [$win sash coord 0]
617 617 if {$w < 60} {
618 618 set sash0 [expr {int($w*3/4 - 2)}]
619 619 } else {
620 620 set factor [expr {1.0 * $w / $oldwidth($win)}]
621 621 set sash0 [expr {int($factor * [lindex $s0 0])}]
622 622 if {$sash0 < 45} {
623 623 set sash0 45
624 624 }
625 625 if {$sash0 > $w - 15} {
626 626 set sash0 [expr $w - 15]
627 627 }
628 628 }
629 629 $win sash place 0 $sash0 [lindex $s0 1]
630 630 }
631 631 set oldwidth($win) $w
632 632 }
633 633
634 634 proc allcanvs args {
635 635 global canv canv2 canv3
636 636 eval $canv $args
637 637 eval $canv2 $args
638 638 eval $canv3 $args
639 639 }
640 640
641 641 proc bindall {event action} {
642 642 global canv canv2 canv3
643 643 bind $canv $event $action
644 644 bind $canv2 $event $action
645 645 bind $canv3 $event $action
646 646 }
647 647
648 648 proc about {} {
649 649 set w .about
650 650 if {[winfo exists $w]} {
651 651 raise $w
652 652 return
653 653 }
654 654 toplevel $w
655 655 wm title $w "About gitk"
656 656 message $w.m -text {
657 657 Gitk version 1.2
658 658
659 659 Copyright οΏ½ 2005 Paul Mackerras
660 660
661 661 Use and redistribute under the terms of the GNU General Public License} \
662 662 -justify center -aspect 400
663 663 pack $w.m -side top -fill x -padx 20 -pady 20
664 664 button $w.ok -text Close -command "destroy $w"
665 665 pack $w.ok -side bottom
666 666 }
667 667
668 668 proc assigncolor {id} {
669 669 global commitinfo colormap commcolors colors nextcolor
670 670 global parents nparents children nchildren
671 671 global cornercrossings crossings
672 672
673 673 if [info exists colormap($id)] return
674 674 set ncolors [llength $colors]
675 675 if {$nparents($id) <= 1 && $nchildren($id) == 1} {
676 676 set child [lindex $children($id) 0]
677 677 if {[info exists colormap($child)]
678 678 && $nparents($child) == 1} {
679 679 set colormap($id) $colormap($child)
680 680 return
681 681 }
682 682 }
683 683 set badcolors {}
684 684 if {[info exists cornercrossings($id)]} {
685 685 foreach x $cornercrossings($id) {
686 686 if {[info exists colormap($x)]
687 687 && [lsearch -exact $badcolors $colormap($x)] < 0} {
688 688 lappend badcolors $colormap($x)
689 689 }
690 690 }
691 691 if {[llength $badcolors] >= $ncolors} {
692 692 set badcolors {}
693 693 }
694 694 }
695 695 set origbad $badcolors
696 696 if {[llength $badcolors] < $ncolors - 1} {
697 697 if {[info exists crossings($id)]} {
698 698 foreach x $crossings($id) {
699 699 if {[info exists colormap($x)]
700 700 && [lsearch -exact $badcolors $colormap($x)] < 0} {
701 701 lappend badcolors $colormap($x)
702 702 }
703 703 }
704 704 if {[llength $badcolors] >= $ncolors} {
705 705 set badcolors $origbad
706 706 }
707 707 }
708 708 set origbad $badcolors
709 709 }
710 710 if {[llength $badcolors] < $ncolors - 1} {
711 711 foreach child $children($id) {
712 712 if {[info exists colormap($child)]
713 713 && [lsearch -exact $badcolors $colormap($child)] < 0} {
714 714 lappend badcolors $colormap($child)
715 715 }
716 716 if {[info exists parents($child)]} {
717 717 foreach p $parents($child) {
718 718 if {[info exists colormap($p)]
719 719 && [lsearch -exact $badcolors $colormap($p)] < 0} {
720 720 lappend badcolors $colormap($p)
721 721 }
722 722 }
723 723 }
724 724 }
725 725 if {[llength $badcolors] >= $ncolors} {
726 726 set badcolors $origbad
727 727 }
728 728 }
729 729 for {set i 0} {$i <= $ncolors} {incr i} {
730 730 set c [lindex $colors $nextcolor]
731 731 if {[incr nextcolor] >= $ncolors} {
732 732 set nextcolor 0
733 733 }
734 734 if {[lsearch -exact $badcolors $c]} break
735 735 }
736 736 set colormap($id) $c
737 737 }
738 738
739 739 proc initgraph {} {
740 740 global canvy canvy0 lineno numcommits nextcolor linespc
741 741 global mainline mainlinearrow sidelines
742 742 global nchildren ncleft
743 743 global displist nhyperspace
744 744
745 745 allcanvs delete all
746 746 set nextcolor 0
747 747 set canvy $canvy0
748 748 set lineno -1
749 749 set numcommits 0
750 750 catch {unset mainline}
751 751 catch {unset mainlinearrow}
752 752 catch {unset sidelines}
753 753 foreach id [array names nchildren] {
754 754 set ncleft($id) $nchildren($id)
755 755 }
756 756 set displist {}
757 757 set nhyperspace 0
758 758 }
759 759
760 760 proc bindline {t id} {
761 761 global canv
762 762
763 763 $canv bind $t <Enter> "lineenter %x %y $id"
764 764 $canv bind $t <Motion> "linemotion %x %y $id"
765 765 $canv bind $t <Leave> "lineleave $id"
766 766 $canv bind $t <Button-1> "lineclick %x %y $id 1"
767 767 }
768 768
769 769 proc drawlines {id xtra} {
770 770 global mainline mainlinearrow sidelines lthickness colormap canv
771 771
772 772 $canv delete lines.$id
773 773 if {[info exists mainline($id)]} {
774 774 set t [$canv create line $mainline($id) \
775 775 -width [expr {($xtra + 1) * $lthickness}] \
776 776 -fill $colormap($id) -tags lines.$id \
777 777 -arrow $mainlinearrow($id)]
778 778 $canv lower $t
779 779 bindline $t $id
780 780 }
781 781 if {[info exists sidelines($id)]} {
782 782 foreach ls $sidelines($id) {
783 783 set coords [lindex $ls 0]
784 784 set thick [lindex $ls 1]
785 785 set arrow [lindex $ls 2]
786 786 set t [$canv create line $coords -fill $colormap($id) \
787 787 -width [expr {($thick + $xtra) * $lthickness}] \
788 788 -arrow $arrow -tags lines.$id]
789 789 $canv lower $t
790 790 bindline $t $id
791 791 }
792 792 }
793 793 }
794 794
795 795 # level here is an index in displist
796 796 proc drawcommitline {level} {
797 797 global parents children nparents displist
798 798 global canv canv2 canv3 mainfont namefont canvy linespc
799 799 global lineid linehtag linentag linedtag commitinfo
800 800 global colormap numcommits currentparents dupparents
801 801 global idtags idline idheads idotherrefs
802 802 global lineno lthickness mainline mainlinearrow sidelines
803 803 global commitlisted rowtextx idpos lastuse displist
804 804 global oldnlines olddlevel olddisplist
805 805
806 806 incr numcommits
807 807 incr lineno
808 808 set id [lindex $displist $level]
809 809 set lastuse($id) $lineno
810 810 set lineid($lineno) $id
811 811 set idline($id) $lineno
812 812 set ofill [expr {[info exists commitlisted($id)]? "blue": "white"}]
813 813 if {![info exists commitinfo($id)]} {
814 814 readcommit $id
815 815 if {![info exists commitinfo($id)]} {
816 816 set commitinfo($id) {"No commit information available"}
817 817 set nparents($id) 0
818 818 }
819 819 }
820 820 assigncolor $id
821 821 set currentparents {}
822 822 set dupparents {}
823 823 if {[info exists commitlisted($id)] && [info exists parents($id)]} {
824 824 foreach p $parents($id) {
825 825 if {[lsearch -exact $currentparents $p] < 0} {
826 826 lappend currentparents $p
827 827 } else {
828 828 # remember that this parent was listed twice
829 829 lappend dupparents $p
830 830 }
831 831 }
832 832 }
833 833 set x [xcoord $level $level $lineno]
834 834 set y1 $canvy
835 835 set canvy [expr $canvy + $linespc]
836 836 allcanvs conf -scrollregion \
837 837 [list 0 0 0 [expr $y1 + 0.5 * $linespc + 2]]
838 838 if {[info exists mainline($id)]} {
839 839 lappend mainline($id) $x $y1
840 840 if {$mainlinearrow($id) ne "none"} {
841 841 set mainline($id) [trimdiagstart $mainline($id)]
842 842 }
843 843 }
844 844 drawlines $id 0
845 845 set orad [expr {$linespc / 3}]
846 846 set t [$canv create oval [expr $x - $orad] [expr $y1 - $orad] \
847 847 [expr $x + $orad - 1] [expr $y1 + $orad - 1] \
848 848 -fill $ofill -outline black -width 1]
849 849 $canv raise $t
850 850 $canv bind $t <1> {selcanvline {} %x %y}
851 851 set xt [xcoord [llength $displist] $level $lineno]
852 852 if {[llength $currentparents] > 2} {
853 853 set xt [expr {$xt + ([llength $currentparents] - 2) * $linespc}]
854 854 }
855 855 set rowtextx($lineno) $xt
856 856 set idpos($id) [list $x $xt $y1]
857 857 if {[info exists idtags($id)] || [info exists idheads($id)]
858 858 || [info exists idotherrefs($id)]} {
859 859 set xt [drawtags $id $x $xt $y1]
860 860 }
861 861 set headline [lindex $commitinfo($id) 0]
862 862 set name [lindex $commitinfo($id) 1]
863 863 set date [lindex $commitinfo($id) 2]
864 864 set linehtag($lineno) [$canv create text $xt $y1 -anchor w \
865 865 -text $headline -font $mainfont ]
866 866 $canv bind $linehtag($lineno) <Button-3> "rowmenu %X %Y $id"
867 867 set linentag($lineno) [$canv2 create text 3 $y1 -anchor w \
868 868 -text $name -font $namefont]
869 869 set linedtag($lineno) [$canv3 create text 3 $y1 -anchor w \
870 870 -text $date -font $mainfont]
871 871
872 872 set olddlevel $level
873 873 set olddisplist $displist
874 874 set oldnlines [llength $displist]
875 875 }
876 876
877 877 proc drawtags {id x xt y1} {
878 878 global idtags idheads idotherrefs
879 879 global linespc lthickness
880 880 global canv mainfont idline rowtextx
881 881
882 882 set marks {}
883 883 set ntags 0
884 884 set nheads 0
885 885 if {[info exists idtags($id)]} {
886 886 set marks $idtags($id)
887 887 set ntags [llength $marks]
888 888 }
889 889 if {[info exists idheads($id)]} {
890 890 set marks [concat $marks $idheads($id)]
891 891 set nheads [llength $idheads($id)]
892 892 }
893 893 if {[info exists idotherrefs($id)]} {
894 894 set marks [concat $marks $idotherrefs($id)]
895 895 }
896 896 if {$marks eq {}} {
897 897 return $xt
898 898 }
899 899
900 900 set delta [expr {int(0.5 * ($linespc - $lthickness))}]
901 901 set yt [expr $y1 - 0.5 * $linespc]
902 902 set yb [expr $yt + $linespc - 1]
903 903 set xvals {}
904 904 set wvals {}
905 905 foreach tag $marks {
906 906 set wid [font measure $mainfont $tag]
907 907 lappend xvals $xt
908 908 lappend wvals $wid
909 909 set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
910 910 }
911 911 set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
912 912 -width $lthickness -fill black -tags tag.$id]
913 913 $canv lower $t
914 914 foreach tag $marks x $xvals wid $wvals {
915 915 set xl [expr $x + $delta]
916 916 set xr [expr $x + $delta + $wid + $lthickness]
917 917 if {[incr ntags -1] >= 0} {
918 918 # draw a tag
919 919 set t [$canv create polygon $x [expr $yt + $delta] $xl $yt \
920 920 $xr $yt $xr $yb $xl $yb $x [expr $yb - $delta] \
921 921 -width 1 -outline black -fill yellow -tags tag.$id]
922 922 $canv bind $t <1> [list showtag $tag 1]
923 923 set rowtextx($idline($id)) [expr {$xr + $linespc}]
924 924 } else {
925 925 # draw a head or other ref
926 926 if {[incr nheads -1] >= 0} {
927 927 set col green
928 928 } else {
929 929 set col "#ddddff"
930 930 }
931 931 set xl [expr $xl - $delta/2]
932 932 $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
933 933 -width 1 -outline black -fill $col -tags tag.$id
934 934 }
935 935 set t [$canv create text $xl $y1 -anchor w -text $tag \
936 936 -font $mainfont -tags tag.$id]
937 937 if {$ntags >= 0} {
938 938 $canv bind $t <1> [list showtag $tag 1]
939 939 }
940 940 }
941 941 return $xt
942 942 }
943 943
944 944 proc notecrossings {id lo hi corner} {
945 945 global olddisplist crossings cornercrossings
946 946
947 947 for {set i $lo} {[incr i] < $hi} {} {
948 948 set p [lindex $olddisplist $i]
949 949 if {$p == {}} continue
950 950 if {$i == $corner} {
951 951 if {![info exists cornercrossings($id)]
952 952 || [lsearch -exact $cornercrossings($id) $p] < 0} {
953 953 lappend cornercrossings($id) $p
954 954 }
955 955 if {![info exists cornercrossings($p)]
956 956 || [lsearch -exact $cornercrossings($p) $id] < 0} {
957 957 lappend cornercrossings($p) $id
958 958 }
959 959 } else {
960 960 if {![info exists crossings($id)]
961 961 || [lsearch -exact $crossings($id) $p] < 0} {
962 962 lappend crossings($id) $p
963 963 }
964 964 if {![info exists crossings($p)]
965 965 || [lsearch -exact $crossings($p) $id] < 0} {
966 966 lappend crossings($p) $id
967 967 }
968 968 }
969 969 }
970 970 }
971 971
972 972 proc xcoord {i level ln} {
973 973 global canvx0 xspc1 xspc2
974 974
975 975 set x [expr {$canvx0 + $i * $xspc1($ln)}]
976 976 if {$i > 0 && $i == $level} {
977 977 set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
978 978 } elseif {$i > $level} {
979 979 set x [expr {$x + $xspc2 - $xspc1($ln)}]
980 980 }
981 981 return $x
982 982 }
983 983
984 984 # it seems Tk can't draw arrows on the end of diagonal line segments...
985 985 proc trimdiagend {line} {
986 986 while {[llength $line] > 4} {
987 987 set x1 [lindex $line end-3]
988 988 set y1 [lindex $line end-2]
989 989 set x2 [lindex $line end-1]
990 990 set y2 [lindex $line end]
991 991 if {($x1 == $x2) != ($y1 == $y2)} break
992 992 set line [lreplace $line end-1 end]
993 993 }
994 994 return $line
995 995 }
996 996
997 997 proc trimdiagstart {line} {
998 998 while {[llength $line] > 4} {
999 999 set x1 [lindex $line 0]
1000 1000 set y1 [lindex $line 1]
1001 1001 set x2 [lindex $line 2]
1002 1002 set y2 [lindex $line 3]
1003 1003 if {($x1 == $x2) != ($y1 == $y2)} break
1004 1004 set line [lreplace $line 0 1]
1005 1005 }
1006 1006 return $line
1007 1007 }
1008 1008
1009 1009 proc drawslants {id needonscreen nohs} {
1010 1010 global canv mainline mainlinearrow sidelines
1011 1011 global canvx0 canvy xspc1 xspc2 lthickness
1012 1012 global currentparents dupparents
1013 1013 global lthickness linespc canvy colormap lineno geometry
1014 1014 global maxgraphpct maxwidth
1015 1015 global displist onscreen lastuse
1016 1016 global parents commitlisted
1017 1017 global oldnlines olddlevel olddisplist
1018 1018 global nhyperspace numcommits nnewparents
1019 1019
1020 1020 if {$lineno < 0} {
1021 1021 lappend displist $id
1022 1022 set onscreen($id) 1
1023 1023 return 0
1024 1024 }
1025 1025
1026 1026 set y1 [expr {$canvy - $linespc}]
1027 1027 set y2 $canvy
1028 1028
1029 1029 # work out what we need to get back on screen
1030 1030 set reins {}
1031 1031 if {$onscreen($id) < 0} {
1032 1032 # next to do isn't displayed, better get it on screen...
1033 1033 lappend reins [list $id 0]
1034 1034 }
1035 1035 # make sure all the previous commits's parents are on the screen
1036 1036 foreach p $currentparents {
1037 1037 if {$onscreen($p) < 0} {
1038 1038 lappend reins [list $p 0]
1039 1039 }
1040 1040 }
1041 1041 # bring back anything requested by caller
1042 1042 if {$needonscreen ne {}} {
1043 1043 lappend reins $needonscreen
1044 1044 }
1045 1045
1046 1046 # try the shortcut
1047 1047 if {$currentparents == $id && $onscreen($id) == 0 && $reins eq {}} {
1048 1048 set dlevel $olddlevel
1049 1049 set x [xcoord $dlevel $dlevel $lineno]
1050 1050 set mainline($id) [list $x $y1]
1051 1051 set mainlinearrow($id) none
1052 1052 set lastuse($id) $lineno
1053 1053 set displist [lreplace $displist $dlevel $dlevel $id]
1054 1054 set onscreen($id) 1
1055 1055 set xspc1([expr {$lineno + 1}]) $xspc1($lineno)
1056 1056 return $dlevel
1057 1057 }
1058 1058
1059 1059 # update displist
1060 1060 set displist [lreplace $displist $olddlevel $olddlevel]
1061 1061 set j $olddlevel
1062 1062 foreach p $currentparents {
1063 1063 set lastuse($p) $lineno
1064 1064 if {$onscreen($p) == 0} {
1065 1065 set displist [linsert $displist $j $p]
1066 1066 set onscreen($p) 1
1067 1067 incr j
1068 1068 }
1069 1069 }
1070 1070 if {$onscreen($id) == 0} {
1071 1071 lappend displist $id
1072 1072 set onscreen($id) 1
1073 1073 }
1074 1074
1075 1075 # remove the null entry if present
1076 1076 set nullentry [lsearch -exact $displist {}]
1077 1077 if {$nullentry >= 0} {
1078 1078 set displist [lreplace $displist $nullentry $nullentry]
1079 1079 }
1080 1080
1081 1081 # bring back the ones we need now (if we did it earlier
1082 1082 # it would change displist and invalidate olddlevel)
1083 1083 foreach pi $reins {
1084 1084 # test again in case of duplicates in reins
1085 1085 set p [lindex $pi 0]
1086 1086 if {$onscreen($p) < 0} {
1087 1087 set onscreen($p) 1
1088 1088 set lastuse($p) $lineno
1089 1089 set displist [linsert $displist [lindex $pi 1] $p]
1090 1090 incr nhyperspace -1
1091 1091 }
1092 1092 }
1093 1093
1094 1094 set lastuse($id) $lineno
1095 1095
1096 1096 # see if we need to make any lines jump off into hyperspace
1097 1097 set displ [llength $displist]
1098 1098 if {$displ > $maxwidth} {
1099 1099 set ages {}
1100 1100 foreach x $displist {
1101 1101 lappend ages [list $lastuse($x) $x]
1102 1102 }
1103 1103 set ages [lsort -integer -index 0 $ages]
1104 1104 set k 0
1105 1105 while {$displ > $maxwidth} {
1106 1106 set use [lindex $ages $k 0]
1107 1107 set victim [lindex $ages $k 1]
1108 1108 if {$use >= $lineno - 5} break
1109 1109 incr k
1110 1110 if {[lsearch -exact $nohs $victim] >= 0} continue
1111 1111 set i [lsearch -exact $displist $victim]
1112 1112 set displist [lreplace $displist $i $i]
1113 1113 set onscreen($victim) -1
1114 1114 incr nhyperspace
1115 1115 incr displ -1
1116 1116 if {$i < $nullentry} {
1117 1117 incr nullentry -1
1118 1118 }
1119 1119 set x [lindex $mainline($victim) end-1]
1120 1120 lappend mainline($victim) $x $y1
1121 1121 set line [trimdiagend $mainline($victim)]
1122 1122 set arrow "last"
1123 1123 if {$mainlinearrow($victim) ne "none"} {
1124 1124 set line [trimdiagstart $line]
1125 1125 set arrow "both"
1126 1126 }
1127 1127 lappend sidelines($victim) [list $line 1 $arrow]
1128 1128 unset mainline($victim)
1129 1129 }
1130 1130 }
1131 1131
1132 1132 set dlevel [lsearch -exact $displist $id]
1133 1133
1134 1134 # If we are reducing, put in a null entry
1135 1135 if {$displ < $oldnlines} {
1136 1136 # does the next line look like a merge?
1137 1137 # i.e. does it have > 1 new parent?
1138 1138 if {$nnewparents($id) > 1} {
1139 1139 set i [expr {$dlevel + 1}]
1140 1140 } elseif {$nnewparents([lindex $olddisplist $olddlevel]) == 0} {
1141 1141 set i $olddlevel
1142 1142 if {$nullentry >= 0 && $nullentry < $i} {
1143 1143 incr i -1
1144 1144 }
1145 1145 } elseif {$nullentry >= 0} {
1146 1146 set i $nullentry
1147 1147 while {$i < $displ
1148 1148 && [lindex $olddisplist $i] == [lindex $displist $i]} {
1149 1149 incr i
1150 1150 }
1151 1151 } else {
1152 1152 set i $olddlevel
1153 1153 if {$dlevel >= $i} {
1154 1154 incr i
1155 1155 }
1156 1156 }
1157 1157 if {$i < $displ} {
1158 1158 set displist [linsert $displist $i {}]
1159 1159 incr displ
1160 1160 if {$dlevel >= $i} {
1161 1161 incr dlevel
1162 1162 }
1163 1163 }
1164 1164 }
1165 1165
1166 1166 # decide on the line spacing for the next line
1167 1167 set lj [expr {$lineno + 1}]
1168 1168 set maxw [expr {$maxgraphpct * $geometry(canv1) / 100}]
1169 1169 if {$displ <= 1 || $canvx0 + $displ * $xspc2 <= $maxw} {
1170 1170 set xspc1($lj) $xspc2
1171 1171 } else {
1172 1172 set xspc1($lj) [expr {($maxw - $canvx0 - $xspc2) / ($displ - 1)}]
1173 1173 if {$xspc1($lj) < $lthickness} {
1174 1174 set xspc1($lj) $lthickness
1175 1175 }
1176 1176 }
1177 1177
1178 1178 foreach idi $reins {
1179 1179 set id [lindex $idi 0]
1180 1180 set j [lsearch -exact $displist $id]
1181 1181 set xj [xcoord $j $dlevel $lj]
1182 1182 set mainline($id) [list $xj $y2]
1183 1183 set mainlinearrow($id) first
1184 1184 }
1185 1185
1186 1186 set i -1
1187 1187 foreach id $olddisplist {
1188 1188 incr i
1189 1189 if {$id == {}} continue
1190 1190 if {$onscreen($id) <= 0} continue
1191 1191 set xi [xcoord $i $olddlevel $lineno]
1192 1192 if {$i == $olddlevel} {
1193 1193 foreach p $currentparents {
1194 1194 set j [lsearch -exact $displist $p]
1195 1195 set coords [list $xi $y1]
1196 1196 set xj [xcoord $j $dlevel $lj]
1197 1197 if {$xj < $xi - $linespc} {
1198 1198 lappend coords [expr {$xj + $linespc}] $y1
1199 1199 notecrossings $p $j $i [expr {$j + 1}]
1200 1200 } elseif {$xj > $xi + $linespc} {
1201 1201 lappend coords [expr {$xj - $linespc}] $y1
1202 1202 notecrossings $p $i $j [expr {$j - 1}]
1203 1203 }
1204 1204 if {[lsearch -exact $dupparents $p] >= 0} {
1205 1205 # draw a double-width line to indicate the doubled parent
1206 1206 lappend coords $xj $y2
1207 1207 lappend sidelines($p) [list $coords 2 none]
1208 1208 if {![info exists mainline($p)]} {
1209 1209 set mainline($p) [list $xj $y2]
1210 1210 set mainlinearrow($p) none
1211 1211 }
1212 1212 } else {
1213 1213 # normal case, no parent duplicated
1214 1214 set yb $y2
1215 1215 set dx [expr {abs($xi - $xj)}]
1216 1216 if {0 && $dx < $linespc} {
1217 1217 set yb [expr {$y1 + $dx}]
1218 1218 }
1219 1219 if {![info exists mainline($p)]} {
1220 1220 if {$xi != $xj} {
1221 1221 lappend coords $xj $yb
1222 1222 }
1223 1223 set mainline($p) $coords
1224 1224 set mainlinearrow($p) none
1225 1225 } else {
1226 1226 lappend coords $xj $yb
1227 1227 if {$yb < $y2} {
1228 1228 lappend coords $xj $y2
1229 1229 }
1230 1230 lappend sidelines($p) [list $coords 1 none]
1231 1231 }
1232 1232 }
1233 1233 }
1234 1234 } else {
1235 1235 set j $i
1236 1236 if {[lindex $displist $i] != $id} {
1237 1237 set j [lsearch -exact $displist $id]
1238 1238 }
1239 1239 if {$j != $i || $xspc1($lineno) != $xspc1($lj)
1240 1240 || ($olddlevel < $i && $i < $dlevel)
1241 1241 || ($dlevel < $i && $i < $olddlevel)} {
1242 1242 set xj [xcoord $j $dlevel $lj]
1243 1243 lappend mainline($id) $xi $y1 $xj $y2
1244 1244 }
1245 1245 }
1246 1246 }
1247 1247 return $dlevel
1248 1248 }
1249 1249
1250 1250 # search for x in a list of lists
1251 1251 proc llsearch {llist x} {
1252 1252 set i 0
1253 1253 foreach l $llist {
1254 1254 if {$l == $x || [lsearch -exact $l $x] >= 0} {
1255 1255 return $i
1256 1256 }
1257 1257 incr i
1258 1258 }
1259 1259 return -1
1260 1260 }
1261 1261
1262 1262 proc drawmore {reading} {
1263 1263 global displayorder numcommits ncmupdate nextupdate
1264 1264 global stopped nhyperspace parents commitlisted
1265 1265 global maxwidth onscreen displist currentparents olddlevel
1266 1266
1267 1267 set n [llength $displayorder]
1268 1268 while {$numcommits < $n} {
1269 1269 set id [lindex $displayorder $numcommits]
1270 1270 set ctxend [expr {$numcommits + 10}]
1271 1271 if {!$reading && $ctxend > $n} {
1272 1272 set ctxend $n
1273 1273 }
1274 1274 set dlist {}
1275 1275 if {$numcommits > 0} {
1276 1276 set dlist [lreplace $displist $olddlevel $olddlevel]
1277 1277 set i $olddlevel
1278 1278 foreach p $currentparents {
1279 1279 if {$onscreen($p) == 0} {
1280 1280 set dlist [linsert $dlist $i $p]
1281 1281 incr i
1282 1282 }
1283 1283 }
1284 1284 }
1285 1285 set nohs {}
1286 1286 set reins {}
1287 1287 set isfat [expr {[llength $dlist] > $maxwidth}]
1288 1288 if {$nhyperspace > 0 || $isfat} {
1289 1289 if {$ctxend > $n} break
1290 1290 # work out what to bring back and
1291 1291 # what we want to don't want to send into hyperspace
1292 1292 set room 1
1293 1293 for {set k $numcommits} {$k < $ctxend} {incr k} {
1294 1294 set x [lindex $displayorder $k]
1295 1295 set i [llsearch $dlist $x]
1296 1296 if {$i < 0} {
1297 1297 set i [llength $dlist]
1298 1298 lappend dlist $x
1299 1299 }
1300 1300 if {[lsearch -exact $nohs $x] < 0} {
1301 1301 lappend nohs $x
1302 1302 }
1303 1303 if {$reins eq {} && $onscreen($x) < 0 && $room} {
1304 1304 set reins [list $x $i]
1305 1305 }
1306 1306 set newp {}
1307 1307 if {[info exists commitlisted($x)]} {
1308 1308 set right 0
1309 1309 foreach p $parents($x) {
1310 1310 if {[llsearch $dlist $p] < 0} {
1311 1311 lappend newp $p
1312 1312 if {[lsearch -exact $nohs $p] < 0} {
1313 1313 lappend nohs $p
1314 1314 }
1315 1315 if {$reins eq {} && $onscreen($p) < 0 && $room} {
1316 1316 set reins [list $p [expr {$i + $right}]]
1317 1317 }
1318 1318 }
1319 1319 set right 1
1320 1320 }
1321 1321 }
1322 1322 set l [lindex $dlist $i]
1323 1323 if {[llength $l] == 1} {
1324 1324 set l $newp
1325 1325 } else {
1326 1326 set j [lsearch -exact $l $x]
1327 1327 set l [concat [lreplace $l $j $j] $newp]
1328 1328 }
1329 1329 set dlist [lreplace $dlist $i $i $l]
1330 1330 if {$room && $isfat && [llength $newp] <= 1} {
1331 1331 set room 0
1332 1332 }
1333 1333 }
1334 1334 }
1335 1335
1336 1336 set dlevel [drawslants $id $reins $nohs]
1337 1337 drawcommitline $dlevel
1338 1338 if {[clock clicks -milliseconds] >= $nextupdate
1339 1339 && $numcommits >= $ncmupdate} {
1340 1340 doupdate $reading
1341 1341 if {$stopped} break
1342 1342 }
1343 1343 }
1344 1344 }
1345 1345
1346 1346 # level here is an index in todo
1347 1347 proc updatetodo {level noshortcut} {
1348 1348 global ncleft todo nnewparents
1349 1349 global commitlisted parents onscreen
1350 1350
1351 1351 set id [lindex $todo $level]
1352 1352 set olds {}
1353 1353 if {[info exists commitlisted($id)]} {
1354 1354 foreach p $parents($id) {
1355 1355 if {[lsearch -exact $olds $p] < 0} {
1356 1356 lappend olds $p
1357 1357 }
1358 1358 }
1359 1359 }
1360 1360 if {!$noshortcut && [llength $olds] == 1} {
1361 1361 set p [lindex $olds 0]
1362 1362 if {$ncleft($p) == 1 && [lsearch -exact $todo $p] < 0} {
1363 1363 set ncleft($p) 0
1364 1364 set todo [lreplace $todo $level $level $p]
1365 1365 set onscreen($p) 0
1366 1366 set nnewparents($id) 1
1367 1367 return 0
1368 1368 }
1369 1369 }
1370 1370
1371 1371 set todo [lreplace $todo $level $level]
1372 1372 set i $level
1373 1373 set n 0
1374 1374 foreach p $olds {
1375 1375 incr ncleft($p) -1
1376 1376 set k [lsearch -exact $todo $p]
1377 1377 if {$k < 0} {
1378 1378 set todo [linsert $todo $i $p]
1379 1379 set onscreen($p) 0
1380 1380 incr i
1381 1381 incr n
1382 1382 }
1383 1383 }
1384 1384 set nnewparents($id) $n
1385 1385
1386 1386 return 1
1387 1387 }
1388 1388
1389 1389 proc decidenext {{noread 0}} {
1390 1390 global ncleft todo
1391 1391 global datemode cdate
1392 1392 global commitinfo
1393 1393
1394 1394 # choose which one to do next time around
1395 1395 set todol [llength $todo]
1396 1396 set level -1
1397 1397 set latest {}
1398 1398 for {set k $todol} {[incr k -1] >= 0} {} {
1399 1399 set p [lindex $todo $k]
1400 1400 if {$ncleft($p) == 0} {
1401 1401 if {$datemode} {
1402 1402 if {![info exists commitinfo($p)]} {
1403 1403 if {$noread} {
1404 1404 return {}
1405 1405 }
1406 1406 readcommit $p
1407 1407 }
1408 1408 if {$latest == {} || $cdate($p) > $latest} {
1409 1409 set level $k
1410 1410 set latest $cdate($p)
1411 1411 }
1412 1412 } else {
1413 1413 set level $k
1414 1414 break
1415 1415 }
1416 1416 }
1417 1417 }
1418 1418 if {$level < 0} {
1419 1419 if {$todo != {}} {
1420 1420 puts "ERROR: none of the pending commits can be done yet:"
1421 1421 foreach p $todo {
1422 1422 puts " $p ($ncleft($p))"
1423 1423 }
1424 1424 }
1425 1425 return -1
1426 1426 }
1427 1427
1428 1428 return $level
1429 1429 }
1430 1430
1431 1431 proc drawcommit {id} {
1432 1432 global phase todo nchildren datemode nextupdate
1433 1433 global numcommits ncmupdate displayorder todo onscreen
1434 1434
1435 1435 if {$phase != "incrdraw"} {
1436 1436 set phase incrdraw
1437 1437 set displayorder {}
1438 1438 set todo {}
1439 1439 initgraph
1440 1440 }
1441 1441 if {$nchildren($id) == 0} {
1442 1442 lappend todo $id
1443 1443 set onscreen($id) 0
1444 1444 }
1445 1445 set level [decidenext 1]
1446 1446 if {$level == {} || $id != [lindex $todo $level]} {
1447 1447 return
1448 1448 }
1449 1449 while 1 {
1450 1450 lappend displayorder [lindex $todo $level]
1451 1451 if {[updatetodo $level $datemode]} {
1452 1452 set level [decidenext 1]
1453 1453 if {$level == {}} break
1454 1454 }
1455 1455 set id [lindex $todo $level]
1456 1456 if {![info exists commitlisted($id)]} {
1457 1457 break
1458 1458 }
1459 1459 }
1460 1460 drawmore 1
1461 1461 }
1462 1462
1463 1463 proc finishcommits {} {
1464 1464 global phase
1465 1465 global canv mainfont ctext maincursor textcursor
1466 1466
1467 1467 if {$phase != "incrdraw"} {
1468 1468 $canv delete all
1469 1469 $canv create text 3 3 -anchor nw -text "No commits selected" \
1470 1470 -font $mainfont -tags textitems
1471 1471 set phase {}
1472 1472 } else {
1473 1473 drawrest
1474 1474 }
1475 1475 . config -cursor $maincursor
1476 1476 settextcursor $textcursor
1477 1477 }
1478 1478
1479 1479 # Don't change the text pane cursor if it is currently the hand cursor,
1480 1480 # showing that we are over a sha1 ID link.
1481 1481 proc settextcursor {c} {
1482 1482 global ctext curtextcursor
1483 1483
1484 1484 if {[$ctext cget -cursor] == $curtextcursor} {
1485 1485 $ctext config -cursor $c
1486 1486 }
1487 1487 set curtextcursor $c
1488 1488 }
1489 1489
1490 1490 proc drawgraph {} {
1491 1491 global nextupdate startmsecs ncmupdate
1492 1492 global displayorder onscreen
1493 1493
1494 1494 if {$displayorder == {}} return
1495 1495 set startmsecs [clock clicks -milliseconds]
1496 1496 set nextupdate [expr $startmsecs + 100]
1497 1497 set ncmupdate 1
1498 1498 initgraph
1499 1499 foreach id $displayorder {
1500 1500 set onscreen($id) 0
1501 1501 }
1502 1502 drawmore 0
1503 1503 }
1504 1504
1505 1505 proc drawrest {} {
1506 1506 global phase stopped redisplaying selectedline
1507 1507 global datemode todo displayorder
1508 1508 global numcommits ncmupdate
1509 1509 global nextupdate startmsecs
1510 1510
1511 1511 set level [decidenext]
1512 1512 if {$level >= 0} {
1513 1513 set phase drawgraph
1514 1514 while 1 {
1515 1515 lappend displayorder [lindex $todo $level]
1516 1516 set hard [updatetodo $level $datemode]
1517 1517 if {$hard} {
1518 1518 set level [decidenext]
1519 1519 if {$level < 0} break
1520 1520 }
1521 1521 }
1522 1522 drawmore 0
1523 1523 }
1524 1524 set phase {}
1525 1525 set drawmsecs [expr [clock clicks -milliseconds] - $startmsecs]
1526 1526 #puts "overall $drawmsecs ms for $numcommits commits"
1527 1527 if {$redisplaying} {
1528 1528 if {$stopped == 0 && [info exists selectedline]} {
1529 1529 selectline $selectedline 0
1530 1530 }
1531 1531 if {$stopped == 1} {
1532 1532 set stopped 0
1533 1533 after idle drawgraph
1534 1534 } else {
1535 1535 set redisplaying 0
1536 1536 }
1537 1537 }
1538 1538 }
1539 1539
1540 1540 proc findmatches {f} {
1541 1541 global findtype foundstring foundstrlen
1542 1542 if {$findtype == "Regexp"} {
1543 1543 set matches [regexp -indices -all -inline $foundstring $f]
1544 1544 } else {
1545 1545 if {$findtype == "IgnCase"} {
1546 1546 set str [string tolower $f]
1547 1547 } else {
1548 1548 set str $f
1549 1549 }
1550 1550 set matches {}
1551 1551 set i 0
1552 1552 while {[set j [string first $foundstring $str $i]] >= 0} {
1553 1553 lappend matches [list $j [expr $j+$foundstrlen-1]]
1554 1554 set i [expr $j + $foundstrlen]
1555 1555 }
1556 1556 }
1557 1557 return $matches
1558 1558 }
1559 1559
1560 1560 proc dofind {} {
1561 1561 global findtype findloc findstring markedmatches commitinfo
1562 1562 global numcommits lineid linehtag linentag linedtag
1563 1563 global mainfont namefont canv canv2 canv3 selectedline
1564 1564 global matchinglines foundstring foundstrlen
1565 1565
1566 1566 stopfindproc
1567 1567 unmarkmatches
1568 1568 focus .
1569 1569 set matchinglines {}
1570 1570 if {$findloc == "Pickaxe"} {
1571 1571 findpatches
1572 1572 return
1573 1573 }
1574 1574 if {$findtype == "IgnCase"} {
1575 1575 set foundstring [string tolower $findstring]
1576 1576 } else {
1577 1577 set foundstring $findstring
1578 1578 }
1579 1579 set foundstrlen [string length $findstring]
1580 1580 if {$foundstrlen == 0} return
1581 1581 if {$findloc == "Files"} {
1582 1582 findfiles
1583 1583 return
1584 1584 }
1585 1585 if {![info exists selectedline]} {
1586 1586 set oldsel -1
1587 1587 } else {
1588 1588 set oldsel $selectedline
1589 1589 }
1590 1590 set didsel 0
1591 1591 set fldtypes {Headline Author Date Committer CDate Comment}
1592 1592 for {set l 0} {$l < $numcommits} {incr l} {
1593 1593 set id $lineid($l)
1594 1594 set info $commitinfo($id)
1595 1595 set doesmatch 0
1596 1596 foreach f $info ty $fldtypes {
1597 1597 if {$findloc != "All fields" && $findloc != $ty} {
1598 1598 continue
1599 1599 }
1600 1600 set matches [findmatches $f]
1601 1601 if {$matches == {}} continue
1602 1602 set doesmatch 1
1603 1603 if {$ty == "Headline"} {
1604 1604 markmatches $canv $l $f $linehtag($l) $matches $mainfont
1605 1605 } elseif {$ty == "Author"} {
1606 1606 markmatches $canv2 $l $f $linentag($l) $matches $namefont
1607 1607 } elseif {$ty == "Date"} {
1608 1608 markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
1609 1609 }
1610 1610 }
1611 1611 if {$doesmatch} {
1612 1612 lappend matchinglines $l
1613 1613 if {!$didsel && $l > $oldsel} {
1614 1614 findselectline $l
1615 1615 set didsel 1
1616 1616 }
1617 1617 }
1618 1618 }
1619 1619 if {$matchinglines == {}} {
1620 1620 bell
1621 1621 } elseif {!$didsel} {
1622 1622 findselectline [lindex $matchinglines 0]
1623 1623 }
1624 1624 }
1625 1625
1626 1626 proc findselectline {l} {
1627 1627 global findloc commentend ctext
1628 1628 selectline $l 1
1629 1629 if {$findloc == "All fields" || $findloc == "Comments"} {
1630 1630 # highlight the matches in the comments
1631 1631 set f [$ctext get 1.0 $commentend]
1632 1632 set matches [findmatches $f]
1633 1633 foreach match $matches {
1634 1634 set start [lindex $match 0]
1635 1635 set end [expr [lindex $match 1] + 1]
1636 1636 $ctext tag add found "1.0 + $start c" "1.0 + $end c"
1637 1637 }
1638 1638 }
1639 1639 }
1640 1640
1641 1641 proc findnext {restart} {
1642 1642 global matchinglines selectedline
1643 1643 if {![info exists matchinglines]} {
1644 1644 if {$restart} {
1645 1645 dofind
1646 1646 }
1647 1647 return
1648 1648 }
1649 1649 if {![info exists selectedline]} return
1650 1650 foreach l $matchinglines {
1651 1651 if {$l > $selectedline} {
1652 1652 findselectline $l
1653 1653 return
1654 1654 }
1655 1655 }
1656 1656 bell
1657 1657 }
1658 1658
1659 1659 proc findprev {} {
1660 1660 global matchinglines selectedline
1661 1661 if {![info exists matchinglines]} {
1662 1662 dofind
1663 1663 return
1664 1664 }
1665 1665 if {![info exists selectedline]} return
1666 1666 set prev {}
1667 1667 foreach l $matchinglines {
1668 1668 if {$l >= $selectedline} break
1669 1669 set prev $l
1670 1670 }
1671 1671 if {$prev != {}} {
1672 1672 findselectline $prev
1673 1673 } else {
1674 1674 bell
1675 1675 }
1676 1676 }
1677 1677
1678 1678 proc findlocchange {name ix op} {
1679 1679 global findloc findtype findtypemenu
1680 1680 if {$findloc == "Pickaxe"} {
1681 1681 set findtype Exact
1682 1682 set state disabled
1683 1683 } else {
1684 1684 set state normal
1685 1685 }
1686 1686 $findtypemenu entryconf 1 -state $state
1687 1687 $findtypemenu entryconf 2 -state $state
1688 1688 }
1689 1689
1690 1690 proc stopfindproc {{done 0}} {
1691 1691 global findprocpid findprocfile findids
1692 1692 global ctext findoldcursor phase maincursor textcursor
1693 1693 global findinprogress
1694 1694
1695 1695 catch {unset findids}
1696 1696 if {[info exists findprocpid]} {
1697 1697 if {!$done} {
1698 1698 catch {exec kill $findprocpid}
1699 1699 }
1700 1700 catch {close $findprocfile}
1701 1701 unset findprocpid
1702 1702 }
1703 1703 if {[info exists findinprogress]} {
1704 1704 unset findinprogress
1705 1705 if {$phase != "incrdraw"} {
1706 1706 . config -cursor $maincursor
1707 1707 settextcursor $textcursor
1708 1708 }
1709 1709 }
1710 1710 }
1711 1711
1712 1712 proc findpatches {} {
1713 1713 global findstring selectedline numcommits
1714 1714 global findprocpid findprocfile
1715 1715 global finddidsel ctext lineid findinprogress
1716 1716 global findinsertpos
1717 1717
1718 1718 if {$numcommits == 0} return
1719 1719
1720 1720 # make a list of all the ids to search, starting at the one
1721 1721 # after the selected line (if any)
1722 1722 if {[info exists selectedline]} {
1723 1723 set l $selectedline
1724 1724 } else {
1725 1725 set l -1
1726 1726 }
1727 1727 set inputids {}
1728 1728 for {set i 0} {$i < $numcommits} {incr i} {
1729 1729 if {[incr l] >= $numcommits} {
1730 1730 set l 0
1731 1731 }
1732 1732 append inputids $lineid($l) "\n"
1733 1733 }
1734 1734
1735 1735 if {[catch {
1736 1736 set f [open [list | hg debug-diff-tree --stdin -s -r -S$findstring \
1737 1737 << $inputids] r]
1738 1738 } err]} {
1739 1739 error_popup "Error starting search process: $err"
1740 1740 return
1741 1741 }
1742 1742
1743 1743 set findinsertpos end
1744 1744 set findprocfile $f
1745 1745 set findprocpid [pid $f]
1746 1746 fconfigure $f -blocking 0
1747 1747 fileevent $f readable readfindproc
1748 1748 set finddidsel 0
1749 1749 . config -cursor watch
1750 1750 settextcursor watch
1751 1751 set findinprogress 1
1752 1752 }
1753 1753
1754 1754 proc readfindproc {} {
1755 1755 global findprocfile finddidsel
1756 1756 global idline matchinglines findinsertpos
1757 1757
1758 1758 set n [gets $findprocfile line]
1759 1759 if {$n < 0} {
1760 1760 if {[eof $findprocfile]} {
1761 1761 stopfindproc 1
1762 1762 if {!$finddidsel} {
1763 1763 bell
1764 1764 }
1765 1765 }
1766 1766 return
1767 1767 }
1768 1768 if {![regexp {^[0-9a-f]{12}} $line id]} {
1769 1769 error_popup "Can't parse git-diff-tree output: $line"
1770 1770 stopfindproc
1771 1771 return
1772 1772 }
1773 1773 if {![info exists idline($id)]} {
1774 1774 puts stderr "spurious id: $id"
1775 1775 return
1776 1776 }
1777 1777 set l $idline($id)
1778 1778 insertmatch $l $id
1779 1779 }
1780 1780
1781 1781 proc insertmatch {l id} {
1782 1782 global matchinglines findinsertpos finddidsel
1783 1783
1784 1784 if {$findinsertpos == "end"} {
1785 1785 if {$matchinglines != {} && $l < [lindex $matchinglines 0]} {
1786 1786 set matchinglines [linsert $matchinglines 0 $l]
1787 1787 set findinsertpos 1
1788 1788 } else {
1789 1789 lappend matchinglines $l
1790 1790 }
1791 1791 } else {
1792 1792 set matchinglines [linsert $matchinglines $findinsertpos $l]
1793 1793 incr findinsertpos
1794 1794 }
1795 1795 markheadline $l $id
1796 1796 if {!$finddidsel} {
1797 1797 findselectline $l
1798 1798 set finddidsel 1
1799 1799 }
1800 1800 }
1801 1801
1802 1802 proc findfiles {} {
1803 1803 global selectedline numcommits lineid ctext
1804 1804 global ffileline finddidsel parents nparents
1805 1805 global findinprogress findstartline findinsertpos
1806 1806 global treediffs fdiffids fdiffsneeded fdiffpos
1807 1807 global findmergefiles
1808 1808
1809 1809 if {$numcommits == 0} return
1810 1810
1811 1811 if {[info exists selectedline]} {
1812 1812 set l [expr {$selectedline + 1}]
1813 1813 } else {
1814 1814 set l 0
1815 1815 }
1816 1816 set ffileline $l
1817 1817 set findstartline $l
1818 1818 set diffsneeded {}
1819 1819 set fdiffsneeded {}
1820 1820 while 1 {
1821 1821 set id $lineid($l)
1822 1822 if {$findmergefiles || $nparents($id) == 1} {
1823 1823 foreach p $parents($id) {
1824 1824 if {![info exists treediffs([list $id $p])]} {
1825 1825 append diffsneeded "$id $p\n"
1826 1826 lappend fdiffsneeded [list $id $p]
1827 1827 }
1828 1828 }
1829 1829 }
1830 1830 if {[incr l] >= $numcommits} {
1831 1831 set l 0
1832 1832 }
1833 1833 if {$l == $findstartline} break
1834 1834 }
1835 1835
1836 1836 # start off a git-diff-tree process if needed
1837 1837 if {$diffsneeded ne {}} {
1838 1838 if {[catch {
1839 1839 set df [open [list | hg debug-diff-tree -r --stdin << $diffsneeded] r]
1840 1840 } err ]} {
1841 1841 error_popup "Error starting search process: $err"
1842 1842 return
1843 1843 }
1844 1844 catch {unset fdiffids}
1845 1845 set fdiffpos 0
1846 1846 fconfigure $df -blocking 0
1847 1847 fileevent $df readable [list readfilediffs $df]
1848 1848 }
1849 1849
1850 1850 set finddidsel 0
1851 1851 set findinsertpos end
1852 1852 set id $lineid($l)
1853 1853 set p [lindex $parents($id) 0]
1854 1854 . config -cursor watch
1855 1855 settextcursor watch
1856 1856 set findinprogress 1
1857 1857 findcont [list $id $p]
1858 1858 update
1859 1859 }
1860 1860
1861 1861 proc readfilediffs {df} {
1862 1862 global findids fdiffids fdiffs
1863 1863
1864 1864 set n [gets $df line]
1865 1865 if {$n < 0} {
1866 1866 if {[eof $df]} {
1867 1867 donefilediff
1868 1868 if {[catch {close $df} err]} {
1869 1869 stopfindproc
1870 1870 bell
1871 1871 error_popup "Error in hg debug-diff-tree: $err"
1872 1872 } elseif {[info exists findids]} {
1873 1873 set ids $findids
1874 1874 stopfindproc
1875 1875 bell
1876 1876 error_popup "Couldn't find diffs for {$ids}"
1877 1877 }
1878 1878 }
1879 1879 return
1880 1880 }
1881 1881 if {[regexp {^([0-9a-f]{12}) \(from ([0-9a-f]{12})\)} $line match id p]} {
1882 1882 # start of a new string of diffs
1883 1883 donefilediff
1884 1884 set fdiffids [list $id $p]
1885 1885 set fdiffs {}
1886 1886 } elseif {[string match ":*" $line]} {
1887 1887 lappend fdiffs [lindex $line 5]
1888 1888 }
1889 1889 }
1890 1890
1891 1891 proc donefilediff {} {
1892 1892 global fdiffids fdiffs treediffs findids
1893 1893 global fdiffsneeded fdiffpos
1894 1894
1895 1895 if {[info exists fdiffids]} {
1896 1896 while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffids
1897 1897 && $fdiffpos < [llength $fdiffsneeded]} {
1898 1898 # git-diff-tree doesn't output anything for a commit
1899 1899 # which doesn't change anything
1900 1900 set nullids [lindex $fdiffsneeded $fdiffpos]
1901 1901 set treediffs($nullids) {}
1902 1902 if {[info exists findids] && $nullids eq $findids} {
1903 1903 unset findids
1904 1904 findcont $nullids
1905 1905 }
1906 1906 incr fdiffpos
1907 1907 }
1908 1908 incr fdiffpos
1909 1909
1910 1910 if {![info exists treediffs($fdiffids)]} {
1911 1911 set treediffs($fdiffids) $fdiffs
1912 1912 }
1913 1913 if {[info exists findids] && $fdiffids eq $findids} {
1914 1914 unset findids
1915 1915 findcont $fdiffids
1916 1916 }
1917 1917 }
1918 1918 }
1919 1919
1920 1920 proc findcont {ids} {
1921 1921 global findids treediffs parents nparents
1922 1922 global ffileline findstartline finddidsel
1923 1923 global lineid numcommits matchinglines findinprogress
1924 1924 global findmergefiles
1925 1925
1926 1926 set id [lindex $ids 0]
1927 1927 set p [lindex $ids 1]
1928 1928 set pi [lsearch -exact $parents($id) $p]
1929 1929 set l $ffileline
1930 1930 while 1 {
1931 1931 if {$findmergefiles || $nparents($id) == 1} {
1932 1932 if {![info exists treediffs($ids)]} {
1933 1933 set findids $ids
1934 1934 set ffileline $l
1935 1935 return
1936 1936 }
1937 1937 set doesmatch 0
1938 1938 foreach f $treediffs($ids) {
1939 1939 set x [findmatches $f]
1940 1940 if {$x != {}} {
1941 1941 set doesmatch 1
1942 1942 break
1943 1943 }
1944 1944 }
1945 1945 if {$doesmatch} {
1946 1946 insertmatch $l $id
1947 1947 set pi $nparents($id)
1948 1948 }
1949 1949 } else {
1950 1950 set pi $nparents($id)
1951 1951 }
1952 1952 if {[incr pi] >= $nparents($id)} {
1953 1953 set pi 0
1954 1954 if {[incr l] >= $numcommits} {
1955 1955 set l 0
1956 1956 }
1957 1957 if {$l == $findstartline} break
1958 1958 set id $lineid($l)
1959 1959 }
1960 1960 set p [lindex $parents($id) $pi]
1961 1961 set ids [list $id $p]
1962 1962 }
1963 1963 stopfindproc
1964 1964 if {!$finddidsel} {
1965 1965 bell
1966 1966 }
1967 1967 }
1968 1968
1969 1969 # mark a commit as matching by putting a yellow background
1970 1970 # behind the headline
1971 1971 proc markheadline {l id} {
1972 1972 global canv mainfont linehtag commitinfo
1973 1973
1974 1974 set bbox [$canv bbox $linehtag($l)]
1975 1975 set t [$canv create rect $bbox -outline {} -tags matches -fill yellow]
1976 1976 $canv lower $t
1977 1977 }
1978 1978
1979 1979 # mark the bits of a headline, author or date that match a find string
1980 1980 proc markmatches {canv l str tag matches font} {
1981 1981 set bbox [$canv bbox $tag]
1982 1982 set x0 [lindex $bbox 0]
1983 1983 set y0 [lindex $bbox 1]
1984 1984 set y1 [lindex $bbox 3]
1985 1985 foreach match $matches {
1986 1986 set start [lindex $match 0]
1987 1987 set end [lindex $match 1]
1988 1988 if {$start > $end} continue
1989 1989 set xoff [font measure $font [string range $str 0 [expr $start-1]]]
1990 1990 set xlen [font measure $font [string range $str 0 [expr $end]]]
1991 1991 set t [$canv create rect [expr $x0+$xoff] $y0 [expr $x0+$xlen+2] $y1 \
1992 1992 -outline {} -tags matches -fill yellow]
1993 1993 $canv lower $t
1994 1994 }
1995 1995 }
1996 1996
1997 1997 proc unmarkmatches {} {
1998 1998 global matchinglines findids
1999 1999 allcanvs delete matches
2000 2000 catch {unset matchinglines}
2001 2001 catch {unset findids}
2002 2002 }
2003 2003
2004 2004 proc selcanvline {w x y} {
2005 2005 global canv canvy0 ctext linespc
2006 2006 global lineid linehtag linentag linedtag rowtextx
2007 2007 set ymax [lindex [$canv cget -scrollregion] 3]
2008 2008 if {$ymax == {}} return
2009 2009 set yfrac [lindex [$canv yview] 0]
2010 2010 set y [expr {$y + $yfrac * $ymax}]
2011 2011 set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
2012 2012 if {$l < 0} {
2013 2013 set l 0
2014 2014 }
2015 2015 if {$w eq $canv} {
2016 2016 if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
2017 2017 }
2018 2018 unmarkmatches
2019 2019 selectline $l 1
2020 2020 }
2021 2021
2022 2022 proc commit_descriptor {p} {
2023 2023 global commitinfo
2024 2024 set l "..."
2025 2025 if {[info exists commitinfo($p)]} {
2026 2026 set l [lindex $commitinfo($p) 0]
2027 2027 set r [lindex $commitinfo($p) 6]
2028 2028 }
2029 2029 return "$r:$p ($l)"
2030 2030 }
2031 2031
2032 2032 # append some text to the ctext widget, and make any SHA1 ID
2033 2033 # that we know about be a clickable link.
2034 2034 proc appendwithlinks {text} {
2035 2035 global ctext idline linknum
2036 2036
2037 2037 set start [$ctext index "end - 1c"]
2038 2038 $ctext insert end $text
2039 2039 $ctext insert end "\n"
2040 2040 set links [regexp -indices -all -inline {[0-9a-f]{12}} $text]
2041 2041 foreach l $links {
2042 2042 set s [lindex $l 0]
2043 2043 set e [lindex $l 1]
2044 2044 set linkid [string range $text $s $e]
2045 2045 if {![info exists idline($linkid)]} continue
2046 2046 incr e
2047 2047 $ctext tag add link "$start + $s c" "$start + $e c"
2048 2048 $ctext tag add link$linknum "$start + $s c" "$start + $e c"
2049 2049 $ctext tag bind link$linknum <1> [list selectline $idline($linkid) 1]
2050 2050 incr linknum
2051 2051 }
2052 2052 $ctext tag conf link -foreground blue -underline 1
2053 2053 $ctext tag bind link <Enter> { %W configure -cursor hand2 }
2054 2054 $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
2055 2055 }
2056 2056
2057 2057 proc selectline {l isnew} {
2058 2058 global canv canv2 canv3 ctext commitinfo selectedline
2059 2059 global lineid linehtag linentag linedtag
2060 2060 global canvy0 linespc parents nparents children
2061 2061 global cflist currentid sha1entry
2062 2062 global commentend idtags idline linknum
2063 2063
2064 2064 $canv delete hover
2065 2065 normalline
2066 2066 if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
2067 2067 $canv delete secsel
2068 2068 set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
2069 2069 -tags secsel -fill [$canv cget -selectbackground]]
2070 2070 $canv lower $t
2071 2071 $canv2 delete secsel
2072 2072 set t [eval $canv2 create rect [$canv2 bbox $linentag($l)] -outline {{}} \
2073 2073 -tags secsel -fill [$canv2 cget -selectbackground]]
2074 2074 $canv2 lower $t
2075 2075 $canv3 delete secsel
2076 2076 set t [eval $canv3 create rect [$canv3 bbox $linedtag($l)] -outline {{}} \
2077 2077 -tags secsel -fill [$canv3 cget -selectbackground]]
2078 2078 $canv3 lower $t
2079 2079 set y [expr {$canvy0 + $l * $linespc}]
2080 2080 set ymax [lindex [$canv cget -scrollregion] 3]
2081 2081 set ytop [expr {$y - $linespc - 1}]
2082 2082 set ybot [expr {$y + $linespc + 1}]
2083 2083 set wnow [$canv yview]
2084 2084 set wtop [expr [lindex $wnow 0] * $ymax]
2085 2085 set wbot [expr [lindex $wnow 1] * $ymax]
2086 2086 set wh [expr {$wbot - $wtop}]
2087 2087 set newtop $wtop
2088 2088 if {$ytop < $wtop} {
2089 2089 if {$ybot < $wtop} {
2090 2090 set newtop [expr {$y - $wh / 2.0}]
2091 2091 } else {
2092 2092 set newtop $ytop
2093 2093 if {$newtop > $wtop - $linespc} {
2094 2094 set newtop [expr {$wtop - $linespc}]
2095 2095 }
2096 2096 }
2097 2097 } elseif {$ybot > $wbot} {
2098 2098 if {$ytop > $wbot} {
2099 2099 set newtop [expr {$y - $wh / 2.0}]
2100 2100 } else {
2101 2101 set newtop [expr {$ybot - $wh}]
2102 2102 if {$newtop < $wtop + $linespc} {
2103 2103 set newtop [expr {$wtop + $linespc}]
2104 2104 }
2105 2105 }
2106 2106 }
2107 2107 if {$newtop != $wtop} {
2108 2108 if {$newtop < 0} {
2109 2109 set newtop 0
2110 2110 }
2111 2111 allcanvs yview moveto [expr $newtop * 1.0 / $ymax]
2112 2112 }
2113 2113
2114 2114 if {$isnew} {
2115 2115 addtohistory [list selectline $l 0]
2116 2116 }
2117 2117
2118 2118 set selectedline $l
2119 2119
2120 2120 set id $lineid($l)
2121 2121 set currentid $id
2122 2122 $sha1entry delete 0 end
2123 2123 $sha1entry insert 0 $id
2124 2124 $sha1entry selection from 0
2125 2125 $sha1entry selection to end
2126 2126
2127 2127 $ctext conf -state normal
2128 2128 $ctext delete 0.0 end
2129 2129 set linknum 0
2130 2130 $ctext mark set fmark.0 0.0
2131 2131 $ctext mark gravity fmark.0 left
2132 2132 set info $commitinfo($id)
2133 2133 $ctext insert end "Revision: [lindex $info 6]\n"
2134 2134 $ctext insert end "Author: [lindex $info 1] [lindex $info 2]\n"
2135 2135 $ctext insert end "Committer: [lindex $info 3] [lindex $info 4]\n"
2136 2136 if {[info exists idtags($id)]} {
2137 2137 $ctext insert end "Tags:"
2138 2138 foreach tag $idtags($id) {
2139 2139 $ctext insert end " $tag"
2140 2140 }
2141 2141 $ctext insert end "\n"
2142 2142 }
2143 2143
2144 2144 set comment {}
2145 2145 if {[info exists parents($id)]} {
2146 2146 foreach p $parents($id) {
2147 2147 append comment "Parent: [commit_descriptor $p]\n"
2148 2148 }
2149 2149 }
2150 2150 if {[info exists children($id)]} {
2151 2151 foreach c $children($id) {
2152 2152 append comment "Child: [commit_descriptor $c]\n"
2153 2153 }
2154 2154 }
2155 2155 append comment "\n"
2156 2156 append comment [lindex $info 5]
2157 2157
2158 2158 # make anything that looks like a SHA1 ID be a clickable link
2159 2159 appendwithlinks $comment
2160 2160
2161 2161 $ctext tag delete Comments
2162 2162 $ctext tag remove found 1.0 end
2163 2163 $ctext conf -state disabled
2164 2164 set commentend [$ctext index "end - 1c"]
2165 2165
2166 2166 $cflist delete 0 end
2167 2167 $cflist insert end "Comments"
2168 2168 if {$nparents($id) == 1} {
2169 2169 startdiff [concat $id $parents($id)]
2170 2170 } elseif {$nparents($id) > 1} {
2171 2171 mergediff $id
2172 2172 }
2173 2173 }
2174 2174
2175 2175 proc selnextline {dir} {
2176 2176 global selectedline
2177 2177 if {![info exists selectedline]} return
2178 2178 set l [expr $selectedline + $dir]
2179 2179 unmarkmatches
2180 2180 selectline $l 1
2181 2181 }
2182 2182
2183 2183 proc unselectline {} {
2184 2184 global selectedline
2185 2185
2186 2186 catch {unset selectedline}
2187 2187 allcanvs delete secsel
2188 2188 }
2189 2189
2190 2190 proc addtohistory {cmd} {
2191 2191 global history historyindex
2192 2192
2193 2193 if {$historyindex > 0
2194 2194 && [lindex $history [expr {$historyindex - 1}]] == $cmd} {
2195 2195 return
2196 2196 }
2197 2197
2198 2198 if {$historyindex < [llength $history]} {
2199 2199 set history [lreplace $history $historyindex end $cmd]
2200 2200 } else {
2201 2201 lappend history $cmd
2202 2202 }
2203 2203 incr historyindex
2204 2204 if {$historyindex > 1} {
2205 2205 .ctop.top.bar.leftbut conf -state normal
2206 2206 } else {
2207 2207 .ctop.top.bar.leftbut conf -state disabled
2208 2208 }
2209 2209 .ctop.top.bar.rightbut conf -state disabled
2210 2210 }
2211 2211
2212 2212 proc goback {} {
2213 2213 global history historyindex
2214 2214
2215 2215 if {$historyindex > 1} {
2216 2216 incr historyindex -1
2217 2217 set cmd [lindex $history [expr {$historyindex - 1}]]
2218 2218 eval $cmd
2219 2219 .ctop.top.bar.rightbut conf -state normal
2220 2220 }
2221 2221 if {$historyindex <= 1} {
2222 2222 .ctop.top.bar.leftbut conf -state disabled
2223 2223 }
2224 2224 }
2225 2225
2226 2226 proc goforw {} {
2227 2227 global history historyindex
2228 2228
2229 2229 if {$historyindex < [llength $history]} {
2230 2230 set cmd [lindex $history $historyindex]
2231 2231 incr historyindex
2232 2232 eval $cmd
2233 2233 .ctop.top.bar.leftbut conf -state normal
2234 2234 }
2235 2235 if {$historyindex >= [llength $history]} {
2236 2236 .ctop.top.bar.rightbut conf -state disabled
2237 2237 }
2238 2238 }
2239 2239
2240 2240 proc mergediff {id} {
2241 2241 global parents diffmergeid diffmergegca mergefilelist diffpindex
2242 2242
2243 2243 set diffmergeid $id
2244 2244 set diffpindex -1
2245 2245 set diffmergegca [findgca $parents($id)]
2246 2246 if {[info exists mergefilelist($id)]} {
2247 2247 if {$mergefilelist($id) ne {}} {
2248 2248 showmergediff
2249 2249 }
2250 2250 } else {
2251 2251 contmergediff {}
2252 2252 }
2253 2253 }
2254 2254
2255 2255 proc findgca {ids} {
2256 2256 set gca {}
2257 2257 foreach id $ids {
2258 2258 if {$gca eq {}} {
2259 2259 set gca $id
2260 2260 } else {
2261 2261 if {[catch {
2262 2262 set gca [exec hg debug-merge-base $gca $id]
2263 2263 } err]} {
2264 2264 return {}
2265 2265 }
2266 2266 }
2267 2267 }
2268 2268 return $gca
2269 2269 }
2270 2270
2271 2271 proc contmergediff {ids} {
2272 2272 global diffmergeid diffpindex parents nparents diffmergegca
2273 2273 global treediffs mergefilelist diffids treepending
2274 2274
2275 2275 # diff the child against each of the parents, and diff
2276 2276 # each of the parents against the GCA.
2277 2277 while 1 {
2278 2278 if {[lindex $ids 0] == $diffmergeid && $diffmergegca ne {}} {
2279 2279 set ids [list [lindex $ids 1] $diffmergegca]
2280 2280 } else {
2281 2281 if {[incr diffpindex] >= $nparents($diffmergeid)} break
2282 2282 set p [lindex $parents($diffmergeid) $diffpindex]
2283 2283 set ids [list $diffmergeid $p]
2284 2284 }
2285 2285 if {![info exists treediffs($ids)]} {
2286 2286 set diffids $ids
2287 2287 if {![info exists treepending]} {
2288 2288 gettreediffs $ids
2289 2289 }
2290 2290 return
2291 2291 }
2292 2292 }
2293 2293
2294 2294 # If a file in some parent is different from the child and also
2295 2295 # different from the GCA, then it's interesting.
2296 2296 # If we don't have a GCA, then a file is interesting if it is
2297 2297 # different from the child in all the parents.
2298 2298 if {$diffmergegca ne {}} {
2299 2299 set files {}
2300 2300 foreach p $parents($diffmergeid) {
2301 2301 set gcadiffs $treediffs([list $p $diffmergegca])
2302 2302 foreach f $treediffs([list $diffmergeid $p]) {
2303 2303 if {[lsearch -exact $files $f] < 0
2304 2304 && [lsearch -exact $gcadiffs $f] >= 0} {
2305 2305 lappend files $f
2306 2306 }
2307 2307 }
2308 2308 }
2309 2309 set files [lsort $files]
2310 2310 } else {
2311 2311 set p [lindex $parents($diffmergeid) 0]
2312 2312 set files $treediffs([list $diffmergeid $p])
2313 2313 for {set i 1} {$i < $nparents($diffmergeid) && $files ne {}} {incr i} {
2314 2314 set p [lindex $parents($diffmergeid) $i]
2315 2315 set df $treediffs([list $diffmergeid $p])
2316 2316 set nf {}
2317 2317 foreach f $files {
2318 2318 if {[lsearch -exact $df $f] >= 0} {
2319 2319 lappend nf $f
2320 2320 }
2321 2321 }
2322 2322 set files $nf
2323 2323 }
2324 2324 }
2325 2325
2326 2326 set mergefilelist($diffmergeid) $files
2327 2327 if {$files ne {}} {
2328 2328 showmergediff
2329 2329 }
2330 2330 }
2331 2331
2332 2332 proc showmergediff {} {
2333 2333 global cflist diffmergeid mergefilelist parents
2334 2334 global diffopts diffinhunk currentfile currenthunk filelines
2335 2335 global diffblocked groupfilelast mergefds groupfilenum grouphunks
2336 2336
2337 2337 set files $mergefilelist($diffmergeid)
2338 2338 foreach f $files {
2339 2339 $cflist insert end $f
2340 2340 }
2341 2341 set env(GIT_DIFF_OPTS) $diffopts
2342 2342 set flist {}
2343 2343 catch {unset currentfile}
2344 2344 catch {unset currenthunk}
2345 2345 catch {unset filelines}
2346 2346 catch {unset groupfilenum}
2347 2347 catch {unset grouphunks}
2348 2348 set groupfilelast -1
2349 2349 foreach p $parents($diffmergeid) {
2350 2350 set cmd [list | hg debug-diff-tree -p $p $diffmergeid]
2351 2351 set cmd [concat $cmd $mergefilelist($diffmergeid)]
2352 2352 if {[catch {set f [open $cmd r]} err]} {
2353 2353 error_popup "Error getting diffs: $err"
2354 2354 foreach f $flist {
2355 2355 catch {close $f}
2356 2356 }
2357 2357 return
2358 2358 }
2359 2359 lappend flist $f
2360 2360 set ids [list $diffmergeid $p]
2361 2361 set mergefds($ids) $f
2362 2362 set diffinhunk($ids) 0
2363 2363 set diffblocked($ids) 0
2364 2364 fconfigure $f -blocking 0
2365 2365 fileevent $f readable [list getmergediffline $f $ids $diffmergeid]
2366 2366 }
2367 2367 }
2368 2368
2369 2369 proc getmergediffline {f ids id} {
2370 2370 global diffmergeid diffinhunk diffoldlines diffnewlines
2371 2371 global currentfile currenthunk
2372 2372 global diffoldstart diffnewstart diffoldlno diffnewlno
2373 2373 global diffblocked mergefilelist
2374 2374 global noldlines nnewlines difflcounts filelines
2375 2375
2376 2376 set n [gets $f line]
2377 2377 if {$n < 0} {
2378 2378 if {![eof $f]} return
2379 2379 }
2380 2380
2381 2381 if {!([info exists diffmergeid] && $diffmergeid == $id)} {
2382 2382 if {$n < 0} {
2383 2383 close $f
2384 2384 }
2385 2385 return
2386 2386 }
2387 2387
2388 2388 if {$diffinhunk($ids) != 0} {
2389 2389 set fi $currentfile($ids)
2390 2390 if {$n > 0 && [regexp {^[-+ \\]} $line match]} {
2391 2391 # continuing an existing hunk
2392 2392 set line [string range $line 1 end]
2393 2393 set p [lindex $ids 1]
2394 2394 if {$match eq "-" || $match eq " "} {
2395 2395 set filelines($p,$fi,$diffoldlno($ids)) $line
2396 2396 incr diffoldlno($ids)
2397 2397 }
2398 2398 if {$match eq "+" || $match eq " "} {
2399 2399 set filelines($id,$fi,$diffnewlno($ids)) $line
2400 2400 incr diffnewlno($ids)
2401 2401 }
2402 2402 if {$match eq " "} {
2403 2403 if {$diffinhunk($ids) == 2} {
2404 2404 lappend difflcounts($ids) \
2405 2405 [list $noldlines($ids) $nnewlines($ids)]
2406 2406 set noldlines($ids) 0
2407 2407 set diffinhunk($ids) 1
2408 2408 }
2409 2409 incr noldlines($ids)
2410 2410 } elseif {$match eq "-" || $match eq "+"} {
2411 2411 if {$diffinhunk($ids) == 1} {
2412 2412 lappend difflcounts($ids) [list $noldlines($ids)]
2413 2413 set noldlines($ids) 0
2414 2414 set nnewlines($ids) 0
2415 2415 set diffinhunk($ids) 2
2416 2416 }
2417 2417 if {$match eq "-"} {
2418 2418 incr noldlines($ids)
2419 2419 } else {
2420 2420 incr nnewlines($ids)
2421 2421 }
2422 2422 }
2423 2423 # and if it's \ No newline at end of line, then what?
2424 2424 return
2425 2425 }
2426 2426 # end of a hunk
2427 2427 if {$diffinhunk($ids) == 1 && $noldlines($ids) != 0} {
2428 2428 lappend difflcounts($ids) [list $noldlines($ids)]
2429 2429 } elseif {$diffinhunk($ids) == 2
2430 2430 && ($noldlines($ids) != 0 || $nnewlines($ids) != 0)} {
2431 2431 lappend difflcounts($ids) [list $noldlines($ids) $nnewlines($ids)]
2432 2432 }
2433 2433 set currenthunk($ids) [list $currentfile($ids) \
2434 2434 $diffoldstart($ids) $diffnewstart($ids) \
2435 2435 $diffoldlno($ids) $diffnewlno($ids) \
2436 2436 $difflcounts($ids)]
2437 2437 set diffinhunk($ids) 0
2438 2438 # -1 = need to block, 0 = unblocked, 1 = is blocked
2439 2439 set diffblocked($ids) -1
2440 2440 processhunks
2441 2441 if {$diffblocked($ids) == -1} {
2442 2442 fileevent $f readable {}
2443 2443 set diffblocked($ids) 1
2444 2444 }
2445 2445 }
2446 2446
2447 2447 if {$n < 0} {
2448 2448 # eof
2449 2449 if {!$diffblocked($ids)} {
2450 2450 close $f
2451 2451 set currentfile($ids) [llength $mergefilelist($diffmergeid)]
2452 2452 set currenthunk($ids) [list $currentfile($ids) 0 0 0 0 {}]
2453 2453 processhunks
2454 2454 }
2455 2455 } elseif {[regexp {^diff --git a/(.*) b/} $line match fname]} {
2456 2456 # start of a new file
2457 2457 set currentfile($ids) \
2458 2458 [lsearch -exact $mergefilelist($diffmergeid) $fname]
2459 2459 } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
2460 2460 $line match f1l f1c f2l f2c rest]} {
2461 2461 if {[info exists currentfile($ids)] && $currentfile($ids) >= 0} {
2462 2462 # start of a new hunk
2463 2463 if {$f1l == 0 && $f1c == 0} {
2464 2464 set f1l 1
2465 2465 }
2466 2466 if {$f2l == 0 && $f2c == 0} {
2467 2467 set f2l 1
2468 2468 }
2469 2469 set diffinhunk($ids) 1
2470 2470 set diffoldstart($ids) $f1l
2471 2471 set diffnewstart($ids) $f2l
2472 2472 set diffoldlno($ids) $f1l
2473 2473 set diffnewlno($ids) $f2l
2474 2474 set difflcounts($ids) {}
2475 2475 set noldlines($ids) 0
2476 2476 set nnewlines($ids) 0
2477 2477 }
2478 2478 }
2479 2479 }
2480 2480
2481 2481 proc processhunks {} {
2482 2482 global diffmergeid parents nparents currenthunk
2483 2483 global mergefilelist diffblocked mergefds
2484 2484 global grouphunks grouplinestart grouplineend groupfilenum
2485 2485
2486 2486 set nfiles [llength $mergefilelist($diffmergeid)]
2487 2487 while 1 {
2488 2488 set fi $nfiles
2489 2489 set lno 0
2490 2490 # look for the earliest hunk
2491 2491 foreach p $parents($diffmergeid) {
2492 2492 set ids [list $diffmergeid $p]
2493 2493 if {![info exists currenthunk($ids)]} return
2494 2494 set i [lindex $currenthunk($ids) 0]
2495 2495 set l [lindex $currenthunk($ids) 2]
2496 2496 if {$i < $fi || ($i == $fi && $l < $lno)} {
2497 2497 set fi $i
2498 2498 set lno $l
2499 2499 set pi $p
2500 2500 }
2501 2501 }
2502 2502
2503 2503 if {$fi < $nfiles} {
2504 2504 set ids [list $diffmergeid $pi]
2505 2505 set hunk $currenthunk($ids)
2506 2506 unset currenthunk($ids)
2507 2507 if {$diffblocked($ids) > 0} {
2508 2508 fileevent $mergefds($ids) readable \
2509 2509 [list getmergediffline $mergefds($ids) $ids $diffmergeid]
2510 2510 }
2511 2511 set diffblocked($ids) 0
2512 2512
2513 2513 if {[info exists groupfilenum] && $groupfilenum == $fi
2514 2514 && $lno <= $grouplineend} {
2515 2515 # add this hunk to the pending group
2516 2516 lappend grouphunks($pi) $hunk
2517 2517 set endln [lindex $hunk 4]
2518 2518 if {$endln > $grouplineend} {
2519 2519 set grouplineend $endln
2520 2520 }
2521 2521 continue
2522 2522 }
2523 2523 }
2524 2524
2525 2525 # succeeding stuff doesn't belong in this group, so
2526 2526 # process the group now
2527 2527 if {[info exists groupfilenum]} {
2528 2528 processgroup
2529 2529 unset groupfilenum
2530 2530 unset grouphunks
2531 2531 }
2532 2532
2533 2533 if {$fi >= $nfiles} break
2534 2534
2535 2535 # start a new group
2536 2536 set groupfilenum $fi
2537 2537 set grouphunks($pi) [list $hunk]
2538 2538 set grouplinestart $lno
2539 2539 set grouplineend [lindex $hunk 4]
2540 2540 }
2541 2541 }
2542 2542
2543 2543 proc processgroup {} {
2544 2544 global groupfilelast groupfilenum difffilestart
2545 2545 global mergefilelist diffmergeid ctext filelines
2546 2546 global parents diffmergeid diffoffset
2547 2547 global grouphunks grouplinestart grouplineend nparents
2548 2548 global mergemax
2549 2549
2550 2550 $ctext conf -state normal
2551 2551 set id $diffmergeid
2552 2552 set f $groupfilenum
2553 2553 if {$groupfilelast != $f} {
2554 2554 $ctext insert end "\n"
2555 2555 set here [$ctext index "end - 1c"]
2556 2556 set difffilestart($f) $here
2557 2557 set mark fmark.[expr {$f + 1}]
2558 2558 $ctext mark set $mark $here
2559 2559 $ctext mark gravity $mark left
2560 2560 set header [lindex $mergefilelist($id) $f]
2561 2561 set l [expr {(78 - [string length $header]) / 2}]
2562 2562 set pad [string range "----------------------------------------" 1 $l]
2563 2563 $ctext insert end "$pad $header $pad\n" filesep
2564 2564 set groupfilelast $f
2565 2565 foreach p $parents($id) {
2566 2566 set diffoffset($p) 0
2567 2567 }
2568 2568 }
2569 2569
2570 2570 $ctext insert end "@@" msep
2571 2571 set nlines [expr {$grouplineend - $grouplinestart}]
2572 2572 set events {}
2573 2573 set pnum 0
2574 2574 foreach p $parents($id) {
2575 2575 set startline [expr {$grouplinestart + $diffoffset($p)}]
2576 2576 set ol $startline
2577 2577 set nl $grouplinestart
2578 2578 if {[info exists grouphunks($p)]} {
2579 2579 foreach h $grouphunks($p) {
2580 2580 set l [lindex $h 2]
2581 2581 if {$nl < $l} {
2582 2582 for {} {$nl < $l} {incr nl} {
2583 2583 set filelines($p,$f,$ol) $filelines($id,$f,$nl)
2584 2584 incr ol
2585 2585 }
2586 2586 }
2587 2587 foreach chunk [lindex $h 5] {
2588 2588 if {[llength $chunk] == 2} {
2589 2589 set olc [lindex $chunk 0]
2590 2590 set nlc [lindex $chunk 1]
2591 2591 set nnl [expr {$nl + $nlc}]
2592 2592 lappend events [list $nl $nnl $pnum $olc $nlc]
2593 2593 incr ol $olc
2594 2594 set nl $nnl
2595 2595 } else {
2596 2596 incr ol [lindex $chunk 0]
2597 2597 incr nl [lindex $chunk 0]
2598 2598 }
2599 2599 }
2600 2600 }
2601 2601 }
2602 2602 if {$nl < $grouplineend} {
2603 2603 for {} {$nl < $grouplineend} {incr nl} {
2604 2604 set filelines($p,$f,$ol) $filelines($id,$f,$nl)
2605 2605 incr ol
2606 2606 }
2607 2607 }
2608 2608 set nlines [expr {$ol - $startline}]
2609 2609 $ctext insert end " -$startline,$nlines" msep
2610 2610 incr pnum
2611 2611 }
2612 2612
2613 2613 set nlines [expr {$grouplineend - $grouplinestart}]
2614 2614 $ctext insert end " +$grouplinestart,$nlines @@\n" msep
2615 2615
2616 2616 set events [lsort -integer -index 0 $events]
2617 2617 set nevents [llength $events]
2618 2618 set nmerge $nparents($diffmergeid)
2619 2619 set l $grouplinestart
2620 2620 for {set i 0} {$i < $nevents} {set i $j} {
2621 2621 set nl [lindex $events $i 0]
2622 2622 while {$l < $nl} {
2623 2623 $ctext insert end " $filelines($id,$f,$l)\n"
2624 2624 incr l
2625 2625 }
2626 2626 set e [lindex $events $i]
2627 2627 set enl [lindex $e 1]
2628 2628 set j $i
2629 2629 set active {}
2630 2630 while 1 {
2631 2631 set pnum [lindex $e 2]
2632 2632 set olc [lindex $e 3]
2633 2633 set nlc [lindex $e 4]
2634 2634 if {![info exists delta($pnum)]} {
2635 2635 set delta($pnum) [expr {$olc - $nlc}]
2636 2636 lappend active $pnum
2637 2637 } else {
2638 2638 incr delta($pnum) [expr {$olc - $nlc}]
2639 2639 }
2640 2640 if {[incr j] >= $nevents} break
2641 2641 set e [lindex $events $j]
2642 2642 if {[lindex $e 0] >= $enl} break
2643 2643 if {[lindex $e 1] > $enl} {
2644 2644 set enl [lindex $e 1]
2645 2645 }
2646 2646 }
2647 2647 set nlc [expr {$enl - $l}]
2648 2648 set ncol mresult
2649 2649 set bestpn -1
2650 2650 if {[llength $active] == $nmerge - 1} {
2651 2651 # no diff for one of the parents, i.e. it's identical
2652 2652 for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
2653 2653 if {![info exists delta($pnum)]} {
2654 2654 if {$pnum < $mergemax} {
2655 2655 lappend ncol m$pnum
2656 2656 } else {
2657 2657 lappend ncol mmax
2658 2658 }
2659 2659 break
2660 2660 }
2661 2661 }
2662 2662 } elseif {[llength $active] == $nmerge} {
2663 2663 # all parents are different, see if one is very similar
2664 2664 set bestsim 30
2665 2665 for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
2666 2666 set sim [similarity $pnum $l $nlc $f \
2667 2667 [lrange $events $i [expr {$j-1}]]]
2668 2668 if {$sim > $bestsim} {
2669 2669 set bestsim $sim
2670 2670 set bestpn $pnum
2671 2671 }
2672 2672 }
2673 2673 if {$bestpn >= 0} {
2674 2674 lappend ncol m$bestpn
2675 2675 }
2676 2676 }
2677 2677 set pnum -1
2678 2678 foreach p $parents($id) {
2679 2679 incr pnum
2680 2680 if {![info exists delta($pnum)] || $pnum == $bestpn} continue
2681 2681 set olc [expr {$nlc + $delta($pnum)}]
2682 2682 set ol [expr {$l + $diffoffset($p)}]
2683 2683 incr diffoffset($p) $delta($pnum)
2684 2684 unset delta($pnum)
2685 2685 for {} {$olc > 0} {incr olc -1} {
2686 2686 $ctext insert end "-$filelines($p,$f,$ol)\n" m$pnum
2687 2687 incr ol
2688 2688 }
2689 2689 }
2690 2690 set endl [expr {$l + $nlc}]
2691 2691 if {$bestpn >= 0} {
2692 2692 # show this pretty much as a normal diff
2693 2693 set p [lindex $parents($id) $bestpn]
2694 2694 set ol [expr {$l + $diffoffset($p)}]
2695 2695 incr diffoffset($p) $delta($bestpn)
2696 2696 unset delta($bestpn)
2697 2697 for {set k $i} {$k < $j} {incr k} {
2698 2698 set e [lindex $events $k]
2699 2699 if {[lindex $e 2] != $bestpn} continue
2700 2700 set nl [lindex $e 0]
2701 2701 set ol [expr {$ol + $nl - $l}]
2702 2702 for {} {$l < $nl} {incr l} {
2703 2703 $ctext insert end "+$filelines($id,$f,$l)\n" $ncol
2704 2704 }
2705 2705 set c [lindex $e 3]
2706 2706 for {} {$c > 0} {incr c -1} {
2707 2707 $ctext insert end "-$filelines($p,$f,$ol)\n" m$bestpn
2708 2708 incr ol
2709 2709 }
2710 2710 set nl [lindex $e 1]
2711 2711 for {} {$l < $nl} {incr l} {
2712 2712 $ctext insert end "+$filelines($id,$f,$l)\n" mresult
2713 2713 }
2714 2714 }
2715 2715 }
2716 2716 for {} {$l < $endl} {incr l} {
2717 2717 $ctext insert end "+$filelines($id,$f,$l)\n" $ncol
2718 2718 }
2719 2719 }
2720 2720 while {$l < $grouplineend} {
2721 2721 $ctext insert end " $filelines($id,$f,$l)\n"
2722 2722 incr l
2723 2723 }
2724 2724 $ctext conf -state disabled
2725 2725 }
2726 2726
2727 2727 proc similarity {pnum l nlc f events} {
2728 2728 global diffmergeid parents diffoffset filelines
2729 2729
2730 2730 set id $diffmergeid
2731 2731 set p [lindex $parents($id) $pnum]
2732 2732 set ol [expr {$l + $diffoffset($p)}]
2733 2733 set endl [expr {$l + $nlc}]
2734 2734 set same 0
2735 2735 set diff 0
2736 2736 foreach e $events {
2737 2737 if {[lindex $e 2] != $pnum} continue
2738 2738 set nl [lindex $e 0]
2739 2739 set ol [expr {$ol + $nl - $l}]
2740 2740 for {} {$l < $nl} {incr l} {
2741 2741 incr same [string length $filelines($id,$f,$l)]
2742 2742 incr same
2743 2743 }
2744 2744 set oc [lindex $e 3]
2745 2745 for {} {$oc > 0} {incr oc -1} {
2746 2746 incr diff [string length $filelines($p,$f,$ol)]
2747 2747 incr diff
2748 2748 incr ol
2749 2749 }
2750 2750 set nl [lindex $e 1]
2751 2751 for {} {$l < $nl} {incr l} {
2752 2752 incr diff [string length $filelines($id,$f,$l)]
2753 2753 incr diff
2754 2754 }
2755 2755 }
2756 2756 for {} {$l < $endl} {incr l} {
2757 2757 incr same [string length $filelines($id,$f,$l)]
2758 2758 incr same
2759 2759 }
2760 2760 if {$same == 0} {
2761 2761 return 0
2762 2762 }
2763 2763 return [expr {200 * $same / (2 * $same + $diff)}]
2764 2764 }
2765 2765
2766 2766 proc startdiff {ids} {
2767 2767 global treediffs diffids treepending diffmergeid
2768 2768
2769 2769 set diffids $ids
2770 2770 catch {unset diffmergeid}
2771 2771 if {![info exists treediffs($ids)]} {
2772 2772 if {![info exists treepending]} {
2773 2773 gettreediffs $ids
2774 2774 }
2775 2775 } else {
2776 2776 addtocflist $ids
2777 2777 }
2778 2778 }
2779 2779
2780 2780 proc addtocflist {ids} {
2781 2781 global treediffs cflist
2782 2782 foreach f $treediffs($ids) {
2783 2783 $cflist insert end $f
2784 2784 }
2785 2785 getblobdiffs $ids
2786 2786 }
2787 2787
2788 2788 proc gettreediffs {ids} {
2789 2789 global treediff parents treepending
2790 2790 set treepending $ids
2791 2791 set treediff {}
2792 2792 set id [lindex $ids 0]
2793 2793 set p [lindex $ids 1]
2794 2794 if [catch {set gdtf [open "|hg debug-diff-tree -r $p $id" r]}] return
2795 2795 fconfigure $gdtf -blocking 0
2796 2796 fileevent $gdtf readable [list gettreediffline $gdtf $ids]
2797 2797 }
2798 2798
2799 2799 proc gettreediffline {gdtf ids} {
2800 2800 global treediff treediffs treepending diffids diffmergeid
2801 2801
2802 2802 set n [gets $gdtf line]
2803 2803 if {$n < 0} {
2804 2804 if {![eof $gdtf]} return
2805 2805 close $gdtf
2806 2806 set treediffs($ids) $treediff
2807 2807 unset treepending
2808 2808 if {$ids != $diffids} {
2809 2809 gettreediffs $diffids
2810 2810 } else {
2811 2811 if {[info exists diffmergeid]} {
2812 2812 contmergediff $ids
2813 2813 } else {
2814 2814 addtocflist $ids
2815 2815 }
2816 2816 }
2817 2817 return
2818 2818 }
2819 2819 set file [lindex $line 5]
2820 2820 lappend treediff $file
2821 2821 }
2822 2822
2823 2823 proc getblobdiffs {ids} {
2824 2824 global diffopts blobdifffd diffids env curdifftag curtagstart
2825 2825 global difffilestart nextupdate diffinhdr treediffs
2826 2826
2827 2827 set id [lindex $ids 0]
2828 2828 set p [lindex $ids 1]
2829 2829 set env(GIT_DIFF_OPTS) $diffopts
2830 2830 set cmd [list | hg debug-diff-tree -r -p -C $p $id]
2831 2831 if {[catch {set bdf [open $cmd r]} err]} {
2832 2832 puts "error getting diffs: $err"
2833 2833 return
2834 2834 }
2835 2835 set diffinhdr 0
2836 2836 fconfigure $bdf -blocking 0
2837 2837 set blobdifffd($ids) $bdf
2838 2838 set curdifftag Comments
2839 2839 set curtagstart 0.0
2840 2840 catch {unset difffilestart}
2841 2841 fileevent $bdf readable [list getblobdiffline $bdf $diffids]
2842 2842 set nextupdate [expr {[clock clicks -milliseconds] + 100}]
2843 2843 }
2844 2844
2845 2845 proc getblobdiffline {bdf ids} {
2846 2846 global diffids blobdifffd ctext curdifftag curtagstart
2847 2847 global diffnexthead diffnextnote difffilestart
2848 2848 global nextupdate diffinhdr treediffs
2849 2849 global gaudydiff
2850 2850
2851 2851 set n [gets $bdf line]
2852 2852 if {$n < 0} {
2853 2853 if {[eof $bdf]} {
2854 2854 close $bdf
2855 2855 if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
2856 2856 $ctext tag add $curdifftag $curtagstart end
2857 2857 }
2858 2858 }
2859 2859 return
2860 2860 }
2861 2861 if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
2862 2862 return
2863 2863 }
2864 2864 regsub -all "\r" $line "" line
2865 2865 $ctext conf -state normal
2866 2866 if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
2867 2867 # start of a new file
2868 2868 $ctext insert end "\n"
2869 2869 $ctext tag add $curdifftag $curtagstart end
2870 2870 set curtagstart [$ctext index "end - 1c"]
2871 2871 set header $newname
2872 2872 set here [$ctext index "end - 1c"]
2873 2873 set i [lsearch -exact $treediffs($diffids) $fname]
2874 2874 if {$i >= 0} {
2875 2875 set difffilestart($i) $here
2876 2876 incr i
2877 2877 $ctext mark set fmark.$i $here
2878 2878 $ctext mark gravity fmark.$i left
2879 2879 }
2880 2880 if {$newname != $fname} {
2881 2881 set i [lsearch -exact $treediffs($diffids) $newname]
2882 2882 if {$i >= 0} {
2883 2883 set difffilestart($i) $here
2884 2884 incr i
2885 2885 $ctext mark set fmark.$i $here
2886 2886 $ctext mark gravity fmark.$i left
2887 2887 }
2888 2888 }
2889 2889 set curdifftag "f:$fname"
2890 2890 $ctext tag delete $curdifftag
2891 2891 set l [expr {(78 - [string length $header]) / 2}]
2892 2892 set pad [string range "----------------------------------------" 1 $l]
2893 2893 $ctext insert end "$pad $header $pad\n" filesep
2894 2894 set diffinhdr 1
2895 2895 } elseif {[regexp {^(---|\+\+\+)} $line]} {
2896 2896 set diffinhdr 0
2897 2897 } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
2898 2898 $line match f1l f1c f2l f2c rest]} {
2899 2899 if {$gaudydiff} {
2900 2900 $ctext insert end "\t" hunksep
2901 2901 $ctext insert end " $f1l " d0 " $f2l " d1
2902 2902 $ctext insert end " $rest \n" hunksep
2903 2903 } else {
2904 2904 $ctext insert end "$line\n" hunksep
2905 2905 }
2906 2906 set diffinhdr 0
2907 2907 } else {
2908 2908 set x [string range $line 0 0]
2909 2909 if {$x == "-" || $x == "+"} {
2910 2910 set tag [expr {$x == "+"}]
2911 2911 if {$gaudydiff} {
2912 2912 set line [string range $line 1 end]
2913 2913 }
2914 2914 $ctext insert end "$line\n" d$tag
2915 2915 } elseif {$x == " "} {
2916 2916 if {$gaudydiff} {
2917 2917 set line [string range $line 1 end]
2918 2918 }
2919 2919 $ctext insert end "$line\n"
2920 2920 } elseif {$diffinhdr || $x == "\\"} {
2921 2921 # e.g. "\ No newline at end of file"
2922 2922 $ctext insert end "$line\n" filesep
2923 2923 } elseif {$line != ""} {
2924 2924 # Something else we don't recognize
2925 2925 if {$curdifftag != "Comments"} {
2926 2926 $ctext insert end "\n"
2927 2927 $ctext tag add $curdifftag $curtagstart end
2928 2928 set curtagstart [$ctext index "end - 1c"]
2929 2929 set curdifftag Comments
2930 2930 }
2931 2931 $ctext insert end "$line\n" filesep
2932 2932 }
2933 2933 }
2934 2934 $ctext conf -state disabled
2935 2935 if {[clock clicks -milliseconds] >= $nextupdate} {
2936 2936 incr nextupdate 100
2937 2937 fileevent $bdf readable {}
2938 2938 update
2939 2939 fileevent $bdf readable "getblobdiffline $bdf {$ids}"
2940 2940 }
2941 2941 }
2942 2942
2943 2943 proc nextfile {} {
2944 2944 global difffilestart ctext
2945 2945 set here [$ctext index @0,0]
2946 2946 for {set i 0} {[info exists difffilestart($i)]} {incr i} {
2947 2947 if {[$ctext compare $difffilestart($i) > $here]} {
2948 2948 if {![info exists pos]
2949 2949 || [$ctext compare $difffilestart($i) < $pos]} {
2950 2950 set pos $difffilestart($i)
2951 2951 }
2952 2952 }
2953 2953 }
2954 2954 if {[info exists pos]} {
2955 2955 $ctext yview $pos
2956 2956 }
2957 2957 }
2958 2958
2959 2959 proc listboxsel {} {
2960 2960 global ctext cflist currentid
2961 2961 if {![info exists currentid]} return
2962 2962 set sel [lsort [$cflist curselection]]
2963 2963 if {$sel eq {}} return
2964 2964 set first [lindex $sel 0]
2965 2965 catch {$ctext yview fmark.$first}
2966 2966 }
2967 2967
2968 2968 proc setcoords {} {
2969 2969 global linespc charspc canvx0 canvy0 mainfont
2970 2970 global xspc1 xspc2 lthickness
2971 2971
2972 2972 set linespc [font metrics $mainfont -linespace]
2973 2973 set charspc [font measure $mainfont "m"]
2974 2974 set canvy0 [expr 3 + 0.5 * $linespc]
2975 2975 set canvx0 [expr 3 + 0.5 * $linespc]
2976 2976 set lthickness [expr {int($linespc / 9) + 1}]
2977 2977 set xspc1(0) $linespc
2978 2978 set xspc2 $linespc
2979 2979 }
2980 2980
2981 2981 proc redisplay {} {
2982 2982 global stopped redisplaying phase
2983 2983 if {$stopped > 1} return
2984 2984 if {$phase == "getcommits"} return
2985 2985 set redisplaying 1
2986 2986 if {$phase == "drawgraph" || $phase == "incrdraw"} {
2987 2987 set stopped 1
2988 2988 } else {
2989 2989 drawgraph
2990 2990 }
2991 2991 }
2992 2992
2993 2993 proc incrfont {inc} {
2994 2994 global mainfont namefont textfont ctext canv phase
2995 2995 global stopped entries
2996 2996 unmarkmatches
2997 2997 set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
2998 2998 set namefont [lreplace $namefont 1 1 [expr {[lindex $namefont 1] + $inc}]]
2999 2999 set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
3000 3000 setcoords
3001 3001 $ctext conf -font $textfont
3002 3002 $ctext tag conf filesep -font [concat $textfont bold]
3003 3003 foreach e $entries {
3004 3004 $e conf -font $mainfont
3005 3005 }
3006 3006 if {$phase == "getcommits"} {
3007 3007 $canv itemconf textitems -font $mainfont
3008 3008 }
3009 3009 redisplay
3010 3010 }
3011 3011
3012 3012 proc clearsha1 {} {
3013 3013 global sha1entry sha1string
3014 3014 if {[string length $sha1string] == 40} {
3015 3015 $sha1entry delete 0 end
3016 3016 }
3017 3017 }
3018 3018
3019 3019 proc sha1change {n1 n2 op} {
3020 3020 global sha1string currentid sha1but
3021 3021 if {$sha1string == {}
3022 3022 || ([info exists currentid] && $sha1string == $currentid)} {
3023 3023 set state disabled
3024 3024 } else {
3025 3025 set state normal
3026 3026 }
3027 3027 if {[$sha1but cget -state] == $state} return
3028 3028 if {$state == "normal"} {
3029 3029 $sha1but conf -state normal -relief raised -text "Goto: "
3030 3030 } else {
3031 3031 $sha1but conf -state disabled -relief flat -text "SHA1 ID: "
3032 3032 }
3033 3033 }
3034 3034
3035 3035 proc gotocommit {} {
3036 3036 global sha1string currentid idline tagids
3037 3037 global lineid numcommits
3038 3038
3039 3039 if {$sha1string == {}
3040 3040 || ([info exists currentid] && $sha1string == $currentid)} return
3041 3041 if {[info exists tagids($sha1string)]} {
3042 3042 set id $tagids($sha1string)
3043 3043 } else {
3044 3044 set id [string tolower $sha1string]
3045 3045 if {[regexp {^[0-9a-f]{4,39}$} $id]} {
3046 3046 set matches {}
3047 3047 for {set l 0} {$l < $numcommits} {incr l} {
3048 3048 if {[string match $id* $lineid($l)]} {
3049 3049 lappend matches $lineid($l)
3050 3050 }
3051 3051 }
3052 3052 if {$matches ne {}} {
3053 3053 if {[llength $matches] > 1} {
3054 3054 error_popup "Short SHA1 id $id is ambiguous"
3055 3055 return
3056 3056 }
3057 3057 set id [lindex $matches 0]
3058 3058 }
3059 3059 }
3060 3060 }
3061 3061 if {[info exists idline($id)]} {
3062 3062 selectline $idline($id) 1
3063 3063 return
3064 3064 }
3065 3065 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
3066 3066 set type "SHA1 id"
3067 3067 } else {
3068 3068 set type "Tag"
3069 3069 }
3070 3070 error_popup "$type $sha1string is not known"
3071 3071 }
3072 3072
3073 3073 proc lineenter {x y id} {
3074 3074 global hoverx hovery hoverid hovertimer
3075 3075 global commitinfo canv
3076 3076
3077 3077 if {![info exists commitinfo($id)]} return
3078 3078 set hoverx $x
3079 3079 set hovery $y
3080 3080 set hoverid $id
3081 3081 if {[info exists hovertimer]} {
3082 3082 after cancel $hovertimer
3083 3083 }
3084 3084 set hovertimer [after 500 linehover]
3085 3085 $canv delete hover
3086 3086 }
3087 3087
3088 3088 proc linemotion {x y id} {
3089 3089 global hoverx hovery hoverid hovertimer
3090 3090
3091 3091 if {[info exists hoverid] && $id == $hoverid} {
3092 3092 set hoverx $x
3093 3093 set hovery $y
3094 3094 if {[info exists hovertimer]} {
3095 3095 after cancel $hovertimer
3096 3096 }
3097 3097 set hovertimer [after 500 linehover]
3098 3098 }
3099 3099 }
3100 3100
3101 3101 proc lineleave {id} {
3102 3102 global hoverid hovertimer canv
3103 3103
3104 3104 if {[info exists hoverid] && $id == $hoverid} {
3105 3105 $canv delete hover
3106 3106 if {[info exists hovertimer]} {
3107 3107 after cancel $hovertimer
3108 3108 unset hovertimer
3109 3109 }
3110 3110 unset hoverid
3111 3111 }
3112 3112 }
3113 3113
3114 3114 proc linehover {} {
3115 3115 global hoverx hovery hoverid hovertimer
3116 3116 global canv linespc lthickness
3117 3117 global commitinfo mainfont
3118 3118
3119 3119 set text [lindex $commitinfo($hoverid) 0]
3120 3120 set ymax [lindex [$canv cget -scrollregion] 3]
3121 3121 if {$ymax == {}} return
3122 3122 set yfrac [lindex [$canv yview] 0]
3123 3123 set x [expr {$hoverx + 2 * $linespc}]
3124 3124 set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
3125 3125 set x0 [expr {$x - 2 * $lthickness}]
3126 3126 set y0 [expr {$y - 2 * $lthickness}]
3127 3127 set x1 [expr {$x + [font measure $mainfont $text] + 2 * $lthickness}]
3128 3128 set y1 [expr {$y + $linespc + 2 * $lthickness}]
3129 3129 set t [$canv create rectangle $x0 $y0 $x1 $y1 \
3130 3130 -fill \#ffff80 -outline black -width 1 -tags hover]
3131 3131 $canv raise $t
3132 3132 set t [$canv create text $x $y -anchor nw -text $text -tags hover]
3133 3133 $canv raise $t
3134 3134 }
3135 3135
3136 3136 proc clickisonarrow {id y} {
3137 3137 global mainline mainlinearrow sidelines lthickness
3138 3138
3139 3139 set thresh [expr {2 * $lthickness + 6}]
3140 3140 if {[info exists mainline($id)]} {
3141 3141 if {$mainlinearrow($id) ne "none"} {
3142 3142 if {abs([lindex $mainline($id) 1] - $y) < $thresh} {
3143 3143 return "up"
3144 3144 }
3145 3145 }
3146 3146 }
3147 3147 if {[info exists sidelines($id)]} {
3148 3148 foreach ls $sidelines($id) {
3149 3149 set coords [lindex $ls 0]
3150 3150 set arrow [lindex $ls 2]
3151 3151 if {$arrow eq "first" || $arrow eq "both"} {
3152 3152 if {abs([lindex $coords 1] - $y) < $thresh} {
3153 3153 return "up"
3154 3154 }
3155 3155 }
3156 3156 if {$arrow eq "last" || $arrow eq "both"} {
3157 3157 if {abs([lindex $coords end] - $y) < $thresh} {
3158 3158 return "down"
3159 3159 }
3160 3160 }
3161 3161 }
3162 3162 }
3163 3163 return {}
3164 3164 }
3165 3165
3166 3166 proc arrowjump {id dirn y} {
3167 3167 global mainline sidelines canv
3168 3168
3169 3169 set yt {}
3170 3170 if {$dirn eq "down"} {
3171 3171 if {[info exists mainline($id)]} {
3172 3172 set y1 [lindex $mainline($id) 1]
3173 3173 if {$y1 > $y} {
3174 3174 set yt $y1
3175 3175 }
3176 3176 }
3177 3177 if {[info exists sidelines($id)]} {
3178 3178 foreach ls $sidelines($id) {
3179 3179 set y1 [lindex $ls 0 1]
3180 3180 if {$y1 > $y && ($yt eq {} || $y1 < $yt)} {
3181 3181 set yt $y1
3182 3182 }
3183 3183 }
3184 3184 }
3185 3185 } else {
3186 3186 if {[info exists sidelines($id)]} {
3187 3187 foreach ls $sidelines($id) {
3188 3188 set y1 [lindex $ls 0 end]
3189 3189 if {$y1 < $y && ($yt eq {} || $y1 > $yt)} {
3190 3190 set yt $y1
3191 3191 }
3192 3192 }
3193 3193 }
3194 3194 }
3195 3195 if {$yt eq {}} return
3196 3196 set ymax [lindex [$canv cget -scrollregion] 3]
3197 3197 if {$ymax eq {} || $ymax <= 0} return
3198 3198 set view [$canv yview]
3199 3199 set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
3200 3200 set yfrac [expr {$yt / $ymax - $yspan / 2}]
3201 3201 if {$yfrac < 0} {
3202 3202 set yfrac 0
3203 3203 }
3204 3204 $canv yview moveto $yfrac
3205 3205 }
3206 3206
3207 3207 proc lineclick {x y id isnew} {
3208 3208 global ctext commitinfo children cflist canv thickerline
3209 3209
3210 3210 unmarkmatches
3211 3211 unselectline
3212 3212 normalline
3213 3213 $canv delete hover
3214 3214 # draw this line thicker than normal
3215 3215 drawlines $id 1
3216 3216 set thickerline $id
3217 3217 if {$isnew} {
3218 3218 set ymax [lindex [$canv cget -scrollregion] 3]
3219 3219 if {$ymax eq {}} return
3220 3220 set yfrac [lindex [$canv yview] 0]
3221 3221 set y [expr {$y + $yfrac * $ymax}]
3222 3222 }
3223 3223 set dirn [clickisonarrow $id $y]
3224 3224 if {$dirn ne {}} {
3225 3225 arrowjump $id $dirn $y
3226 3226 return
3227 3227 }
3228 3228
3229 3229 if {$isnew} {
3230 3230 addtohistory [list lineclick $x $y $id 0]
3231 3231 }
3232 3232 # fill the details pane with info about this line
3233 3233 $ctext conf -state normal
3234 3234 $ctext delete 0.0 end
3235 3235 $ctext tag conf link -foreground blue -underline 1
3236 3236 $ctext tag bind link <Enter> { %W configure -cursor hand2 }
3237 3237 $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
3238 3238 $ctext insert end "Parent:\t"
3239 3239 $ctext insert end $id [list link link0]
3240 3240 $ctext tag bind link0 <1> [list selbyid $id]
3241 3241 set info $commitinfo($id)
3242 3242 $ctext insert end "\n\t[lindex $info 0]\n"
3243 3243 $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
3244 3244 $ctext insert end "\tDate:\t[lindex $info 2]\n"
3245 3245 if {[info exists children($id)]} {
3246 3246 $ctext insert end "\nChildren:"
3247 3247 set i 0
3248 3248 foreach child $children($id) {
3249 3249 incr i
3250 3250 set info $commitinfo($child)
3251 3251 $ctext insert end "\n\t"
3252 3252 $ctext insert end $child [list link link$i]
3253 3253 $ctext tag bind link$i <1> [list selbyid $child]
3254 3254 $ctext insert end "\n\t[lindex $info 0]"
3255 3255 $ctext insert end "\n\tAuthor:\t[lindex $info 1]"
3256 3256 $ctext insert end "\n\tDate:\t[lindex $info 2]\n"
3257 3257 }
3258 3258 }
3259 3259 $ctext conf -state disabled
3260 3260
3261 3261 $cflist delete 0 end
3262 3262 }
3263 3263
3264 3264 proc normalline {} {
3265 3265 global thickerline
3266 3266 if {[info exists thickerline]} {
3267 3267 drawlines $thickerline 0
3268 3268 unset thickerline
3269 3269 }
3270 3270 }
3271 3271
3272 3272 proc selbyid {id} {
3273 3273 global idline
3274 3274 if {[info exists idline($id)]} {
3275 3275 selectline $idline($id) 1
3276 3276 }
3277 3277 }
3278 3278
3279 3279 proc mstime {} {
3280 3280 global startmstime
3281 3281 if {![info exists startmstime]} {
3282 3282 set startmstime [clock clicks -milliseconds]
3283 3283 }
3284 3284 return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
3285 3285 }
3286 3286
3287 3287 proc rowmenu {x y id} {
3288 3288 global rowctxmenu idline selectedline rowmenuid
3289 3289
3290 3290 if {![info exists selectedline] || $idline($id) eq $selectedline} {
3291 3291 set state disabled
3292 3292 } else {
3293 3293 set state normal
3294 3294 }
3295 3295 $rowctxmenu entryconfigure 0 -state $state
3296 3296 $rowctxmenu entryconfigure 1 -state $state
3297 3297 $rowctxmenu entryconfigure 2 -state $state
3298 3298 set rowmenuid $id
3299 3299 tk_popup $rowctxmenu $x $y
3300 3300 }
3301 3301
3302 3302 proc diffvssel {dirn} {
3303 3303 global rowmenuid selectedline lineid
3304 3304
3305 3305 if {![info exists selectedline]} return
3306 3306 if {$dirn} {
3307 3307 set oldid $lineid($selectedline)
3308 3308 set newid $rowmenuid
3309 3309 } else {
3310 3310 set oldid $rowmenuid
3311 3311 set newid $lineid($selectedline)
3312 3312 }
3313 3313 addtohistory [list doseldiff $oldid $newid]
3314 3314 doseldiff $oldid $newid
3315 3315 }
3316 3316
3317 3317 proc doseldiff {oldid newid} {
3318 3318 global ctext cflist
3319 3319 global commitinfo
3320 3320
3321 3321 $ctext conf -state normal
3322 3322 $ctext delete 0.0 end
3323 3323 $ctext mark set fmark.0 0.0
3324 3324 $ctext mark gravity fmark.0 left
3325 3325 $cflist delete 0 end
3326 3326 $cflist insert end "Top"
3327 3327 $ctext insert end "From "
3328 3328 $ctext tag conf link -foreground blue -underline 1
3329 3329 $ctext tag bind link <Enter> { %W configure -cursor hand2 }
3330 3330 $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
3331 3331 $ctext tag bind link0 <1> [list selbyid $oldid]
3332 3332 $ctext insert end $oldid [list link link0]
3333 3333 $ctext insert end "\n "
3334 3334 $ctext insert end [lindex $commitinfo($oldid) 0]
3335 3335 $ctext insert end "\n\nTo "
3336 3336 $ctext tag bind link1 <1> [list selbyid $newid]
3337 3337 $ctext insert end $newid [list link link1]
3338 3338 $ctext insert end "\n "
3339 3339 $ctext insert end [lindex $commitinfo($newid) 0]
3340 3340 $ctext insert end "\n"
3341 3341 $ctext conf -state disabled
3342 3342 $ctext tag delete Comments
3343 3343 $ctext tag remove found 1.0 end
3344 3344 startdiff [list $newid $oldid]
3345 3345 }
3346 3346
3347 3347 proc mkpatch {} {
3348 3348 global rowmenuid currentid commitinfo patchtop patchnum
3349 3349
3350 3350 if {![info exists currentid]} return
3351 3351 set oldid $currentid
3352 3352 set oldhead [lindex $commitinfo($oldid) 0]
3353 3353 set newid $rowmenuid
3354 3354 set newhead [lindex $commitinfo($newid) 0]
3355 3355 set top .patch
3356 3356 set patchtop $top
3357 3357 catch {destroy $top}
3358 3358 toplevel $top
3359 3359 label $top.title -text "Generate patch"
3360 3360 grid $top.title - -pady 10
3361 3361 label $top.from -text "From:"
3362 3362 entry $top.fromsha1 -width 40 -relief flat
3363 3363 $top.fromsha1 insert 0 $oldid
3364 3364 $top.fromsha1 conf -state readonly
3365 3365 grid $top.from $top.fromsha1 -sticky w
3366 3366 entry $top.fromhead -width 60 -relief flat
3367 3367 $top.fromhead insert 0 $oldhead
3368 3368 $top.fromhead conf -state readonly
3369 3369 grid x $top.fromhead -sticky w
3370 3370 label $top.to -text "To:"
3371 3371 entry $top.tosha1 -width 40 -relief flat
3372 3372 $top.tosha1 insert 0 $newid
3373 3373 $top.tosha1 conf -state readonly
3374 3374 grid $top.to $top.tosha1 -sticky w
3375 3375 entry $top.tohead -width 60 -relief flat
3376 3376 $top.tohead insert 0 $newhead
3377 3377 $top.tohead conf -state readonly
3378 3378 grid x $top.tohead -sticky w
3379 3379 button $top.rev -text "Reverse" -command mkpatchrev -padx 5
3380 3380 grid $top.rev x -pady 10
3381 3381 label $top.flab -text "Output file:"
3382 3382 entry $top.fname -width 60
3383 3383 $top.fname insert 0 [file normalize "patch$patchnum.patch"]
3384 3384 incr patchnum
3385 3385 grid $top.flab $top.fname -sticky w
3386 3386 frame $top.buts
3387 3387 button $top.buts.gen -text "Generate" -command mkpatchgo
3388 3388 button $top.buts.can -text "Cancel" -command mkpatchcan
3389 3389 grid $top.buts.gen $top.buts.can
3390 3390 grid columnconfigure $top.buts 0 -weight 1 -uniform a
3391 3391 grid columnconfigure $top.buts 1 -weight 1 -uniform a
3392 3392 grid $top.buts - -pady 10 -sticky ew
3393 3393 focus $top.fname
3394 3394 }
3395 3395
3396 3396 proc mkpatchrev {} {
3397 3397 global patchtop
3398 3398
3399 3399 set oldid [$patchtop.fromsha1 get]
3400 3400 set oldhead [$patchtop.fromhead get]
3401 3401 set newid [$patchtop.tosha1 get]
3402 3402 set newhead [$patchtop.tohead get]
3403 3403 foreach e [list fromsha1 fromhead tosha1 tohead] \
3404 3404 v [list $newid $newhead $oldid $oldhead] {
3405 3405 $patchtop.$e conf -state normal
3406 3406 $patchtop.$e delete 0 end
3407 3407 $patchtop.$e insert 0 $v
3408 3408 $patchtop.$e conf -state readonly
3409 3409 }
3410 3410 }
3411 3411
3412 3412 proc mkpatchgo {} {
3413 3413 global patchtop
3414 3414
3415 3415 set oldid [$patchtop.fromsha1 get]
3416 3416 set newid [$patchtop.tosha1 get]
3417 3417 set fname [$patchtop.fname get]
3418 3418 if {[catch {exec hg debug-diff-tree -p $oldid $newid >$fname &} err]} {
3419 3419 error_popup "Error creating patch: $err"
3420 3420 }
3421 3421 catch {destroy $patchtop}
3422 3422 unset patchtop
3423 3423 }
3424 3424
3425 3425 proc mkpatchcan {} {
3426 3426 global patchtop
3427 3427
3428 3428 catch {destroy $patchtop}
3429 3429 unset patchtop
3430 3430 }
3431 3431
3432 3432 proc mktag {} {
3433 3433 global rowmenuid mktagtop commitinfo
3434 3434
3435 3435 set top .maketag
3436 3436 set mktagtop $top
3437 3437 catch {destroy $top}
3438 3438 toplevel $top
3439 3439 label $top.title -text "Create tag"
3440 3440 grid $top.title - -pady 10
3441 3441 label $top.id -text "ID:"
3442 3442 entry $top.sha1 -width 40 -relief flat
3443 3443 $top.sha1 insert 0 $rowmenuid
3444 3444 $top.sha1 conf -state readonly
3445 3445 grid $top.id $top.sha1 -sticky w
3446 3446 entry $top.head -width 60 -relief flat
3447 3447 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
3448 3448 $top.head conf -state readonly
3449 3449 grid x $top.head -sticky w
3450 3450 label $top.tlab -text "Tag name:"
3451 3451 entry $top.tag -width 60
3452 3452 grid $top.tlab $top.tag -sticky w
3453 3453 frame $top.buts
3454 3454 button $top.buts.gen -text "Create" -command mktaggo
3455 3455 button $top.buts.can -text "Cancel" -command mktagcan
3456 3456 grid $top.buts.gen $top.buts.can
3457 3457 grid columnconfigure $top.buts 0 -weight 1 -uniform a
3458 3458 grid columnconfigure $top.buts 1 -weight 1 -uniform a
3459 3459 grid $top.buts - -pady 10 -sticky ew
3460 3460 focus $top.tag
3461 3461 }
3462 3462
3463 3463 proc domktag {} {
3464 3464 global mktagtop env tagids idtags
3465 3465
3466 3466 set id [$mktagtop.sha1 get]
3467 3467 set tag [$mktagtop.tag get]
3468 3468 if {$tag == {}} {
3469 3469 error_popup "No tag name specified"
3470 3470 return
3471 3471 }
3472 3472 if {[info exists tagids($tag)]} {
3473 3473 error_popup "Tag \"$tag\" already exists"
3474 3474 return
3475 3475 }
3476 3476 if {[catch {
3477 3477 set out [exec hg tag -r $id $tag]
3478 3478 } err]} {
3479 3479 error_popup "Error creating tag: $err"
3480 3480 return
3481 3481 }
3482 3482
3483 3483 set tagids($tag) $id
3484 3484 lappend idtags($id) $tag
3485 3485 redrawtags $id
3486 3486 }
3487 3487
3488 3488 proc redrawtags {id} {
3489 3489 global canv linehtag idline idpos selectedline
3490 3490
3491 3491 if {![info exists idline($id)]} return
3492 3492 $canv delete tag.$id
3493 3493 set xt [eval drawtags $id $idpos($id)]
3494 3494 $canv coords $linehtag($idline($id)) $xt [lindex $idpos($id) 2]
3495 3495 if {[info exists selectedline] && $selectedline == $idline($id)} {
3496 3496 selectline $selectedline 0
3497 3497 }
3498 3498 }
3499 3499
3500 3500 proc mktagcan {} {
3501 3501 global mktagtop
3502 3502
3503 3503 catch {destroy $mktagtop}
3504 3504 unset mktagtop
3505 3505 }
3506 3506
3507 3507 proc mktaggo {} {
3508 3508 domktag
3509 3509 mktagcan
3510 3510 }
3511 3511
3512 3512 proc writecommit {} {
3513 3513 global rowmenuid wrcomtop commitinfo wrcomcmd
3514 3514
3515 3515 set top .writecommit
3516 3516 set wrcomtop $top
3517 3517 catch {destroy $top}
3518 3518 toplevel $top
3519 3519 label $top.title -text "Write commit to file"
3520 3520 grid $top.title - -pady 10
3521 3521 label $top.id -text "ID:"
3522 3522 entry $top.sha1 -width 40 -relief flat
3523 3523 $top.sha1 insert 0 $rowmenuid
3524 3524 $top.sha1 conf -state readonly
3525 3525 grid $top.id $top.sha1 -sticky w
3526 3526 entry $top.head -width 60 -relief flat
3527 3527 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
3528 3528 $top.head conf -state readonly
3529 3529 grid x $top.head -sticky w
3530 3530 label $top.clab -text "Command:"
3531 3531 entry $top.cmd -width 60 -textvariable wrcomcmd
3532 3532 grid $top.clab $top.cmd -sticky w -pady 10
3533 3533 label $top.flab -text "Output file:"
3534 3534 entry $top.fname -width 60
3535 3535 $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
3536 3536 grid $top.flab $top.fname -sticky w
3537 3537 frame $top.buts
3538 3538 button $top.buts.gen -text "Write" -command wrcomgo
3539 3539 button $top.buts.can -text "Cancel" -command wrcomcan
3540 3540 grid $top.buts.gen $top.buts.can
3541 3541 grid columnconfigure $top.buts 0 -weight 1 -uniform a
3542 3542 grid columnconfigure $top.buts 1 -weight 1 -uniform a
3543 3543 grid $top.buts - -pady 10 -sticky ew
3544 3544 focus $top.fname
3545 3545 }
3546 3546
3547 3547 proc wrcomgo {} {
3548 3548 global wrcomtop
3549 3549
3550 3550 set id [$wrcomtop.sha1 get]
3551 3551 set cmd "echo $id | [$wrcomtop.cmd get]"
3552 3552 set fname [$wrcomtop.fname get]
3553 3553 if {[catch {exec sh -c $cmd >$fname &} err]} {
3554 3554 error_popup "Error writing commit: $err"
3555 3555 }
3556 3556 catch {destroy $wrcomtop}
3557 3557 unset wrcomtop
3558 3558 }
3559 3559
3560 3560 proc wrcomcan {} {
3561 3561 global wrcomtop
3562 3562
3563 3563 catch {destroy $wrcomtop}
3564 3564 unset wrcomtop
3565 3565 }
3566 3566
3567 3567 proc listrefs {id} {
3568 3568 global idtags idheads idotherrefs
3569 3569
3570 3570 set x {}
3571 3571 if {[info exists idtags($id)]} {
3572 3572 set x $idtags($id)
3573 3573 }
3574 3574 set y {}
3575 3575 if {[info exists idheads($id)]} {
3576 3576 set y $idheads($id)
3577 3577 }
3578 3578 set z {}
3579 3579 if {[info exists idotherrefs($id)]} {
3580 3580 set z $idotherrefs($id)
3581 3581 }
3582 3582 return [list $x $y $z]
3583 3583 }
3584 3584
3585 3585 proc rereadrefs {} {
3586 3586 global idtags idheads idotherrefs
3587 3587 global tagids headids otherrefids
3588 3588
3589 3589 set refids [concat [array names idtags] \
3590 3590 [array names idheads] [array names idotherrefs]]
3591 3591 foreach id $refids {
3592 3592 if {![info exists ref($id)]} {
3593 3593 set ref($id) [listrefs $id]
3594 3594 }
3595 3595 }
3596 3596 foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
3597 3597 catch {unset $v}
3598 3598 }
3599 3599 readrefs
3600 3600 set refids [lsort -unique [concat $refids [array names idtags] \
3601 3601 [array names idheads] [array names idotherrefs]]]
3602 3602 foreach id $refids {
3603 3603 set v [listrefs $id]
3604 3604 if {![info exists ref($id)] || $ref($id) != $v} {
3605 3605 redrawtags $id
3606 3606 }
3607 3607 }
3608 3608 }
3609 3609
3610 3610 proc showtag {tag isnew} {
3611 3611 global ctext cflist tagcontents tagids linknum
3612 3612
3613 3613 if {$isnew} {
3614 3614 addtohistory [list showtag $tag 0]
3615 3615 }
3616 3616 $ctext conf -state normal
3617 3617 $ctext delete 0.0 end
3618 3618 set linknum 0
3619 3619 if {[info exists tagcontents($tag)]} {
3620 3620 set text $tagcontents($tag)
3621 3621 } else {
3622 3622 set text "Tag: $tag\nId: $tagids($tag)"
3623 3623 }
3624 3624 appendwithlinks $text
3625 3625 $ctext conf -state disabled
3626 3626 $cflist delete 0 end
3627 3627 }
3628 3628
3629 3629 proc doquit {} {
3630 3630 global stopped
3631 3631 set stopped 100
3632 3632 destroy .
3633 3633 }
3634 3634
3635 3635 # defaults...
3636 3636 set datemode 0
3637 3637 set boldnames 0
3638 3638 set diffopts "-U 5 -p"
3639 3639 set wrcomcmd "hg debug-diff-tree --stdin -p --pretty"
3640 3640
3641 3641 set mainfont {Helvetica 9}
3642 3642 set textfont {Courier 9}
3643 3643 set findmergefiles 0
3644 3644 set gaudydiff 0
3645 3645 set maxgraphpct 50
3646 3646 set maxwidth 16
3647 3647
3648 3648 set colors {green red blue magenta darkgrey brown orange}
3649 3649
3650 3650 catch {source ~/.gitk}
3651 3651
3652 3652 set namefont $mainfont
3653 3653 if {$boldnames} {
3654 3654 lappend namefont bold
3655 3655 }
3656 3656
3657 3657 set revtreeargs {}
3658 3658 foreach arg $argv {
3659 3659 switch -regexp -- $arg {
3660 3660 "^$" { }
3661 3661 "^-b" { set boldnames 1 }
3662 3662 "^-d" { set datemode 1 }
3663 3663 default {
3664 3664 lappend revtreeargs $arg
3665 3665 }
3666 3666 }
3667 3667 }
3668 3668
3669 3669 set history {}
3670 3670 set historyindex 0
3671 3671
3672 3672 set stopped 0
3673 3673 set redisplaying 0
3674 3674 set stuffsaved 0
3675 3675 set patchnum 0
3676 3676 setcoords
3677 3677 makewindow
3678 3678 readrefs
3679 3679 getcommits $revtreeargs
General Comments 0
You need to be logged in to leave comments. Login now