mercurial-crew-with-dirclash: contrib/hgk annotate

annotate contrib/hgk @ 5479:dd5ca84ed868

merge with crew-stable

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Thu, 25 Oct 2007 21:37:20 +0200
parents	7dafd9ab3979
children

rev	line source
1361 f6d73b26dbdb contrib/hgk: remove hardcoded path to Wish TK Soh <teekaysoh@yahoo.com> parents: 1340 diff changeset	1 #!/usr/bin/env wish
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3 # Copyright (C) 2005 Paul Mackerras. All rights reserved.
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	4 # This program is free software; it may be used, copied, modified
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	5 # and distributed under the terms of the GNU General Public Licence,
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	6 # either version 2, or (at your option) any later version.
5395 e73a83af7926 hgk: add basic usage and configuration documentation Patrick Mezard <pmezard@gmail.com> parents: 5394 diff changeset	7 #
e73a83af7926 hgk: add basic usage and configuration documentation Patrick Mezard <pmezard@gmail.com> parents: 5394 diff changeset	8 # See hgk.py for extension usage and configuration.
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	9
4969 b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	10
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	11 # Modified version of Tip 171:
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	12 # http://www.tcl.tk/cgi-bin/tct/tip/171.html
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	13 #
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	14 # The in_mousewheel global was added to fix strange reentrancy issues.
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	15 # The whole snipped is activated only under windows, mouse wheel
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	16 # bindings working already under MacOSX and Linux.
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	17
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	18 if {[tk windowingsystem] eq "win32"} {
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	19
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	20 set mw_classes [list Text Listbox Table TreeCtrl]
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	21 foreach class $mw_classes { bind $class <MouseWheel> {} }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	22
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	23 set in_mousewheel 0
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	24
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	25 proc ::tk::MouseWheel {wFired X Y D {shifted 0}} {
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	26 global in_mousewheel
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	27 if { $in_mousewheel != 0 } { return }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	28 # Set event to check based on call
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	29 set evt "<[expr {$shifted?{Shift-}:{}}]MouseWheel>"
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	30 # do not double-fire in case the class already has a binding
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	31 if {[bind [winfo class $wFired] $evt] ne ""} { return }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	32 # obtain the window the mouse is over
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	33 set w [winfo containing $X $Y]
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	34 # if we are outside the app, try and scroll the focus widget
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	35 if {![winfo exists $w]} { catch {set w [focus]} }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	36 if {[winfo exists $w]} {
5117 d4fa6bafc43a Remove trailing spaces, fix indentation Thomas Arendsen Hein <thomas@intevation.de> parents: 4969 diff changeset	37
4969 b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	38 if {[bind $w $evt] ne ""} {
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	39 # Awkward ... this widget has a MouseWheel binding, but to
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	40 # trigger successfully in it, we must give it focus.
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	41 catch {focus} old
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	42 if {$w ne $old} { focus $w }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	43 set in_mousewheel 1
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	44 event generate $w $evt -rootx $X -rooty $Y -delta $D
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	45 set in_mousewheel 0
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	46 if {$w ne $old} { focus $old }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	47 return
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	48 }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	49
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	50 # aqua and x11/win32 have different delta handling
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	51 if {[tk windowingsystem] ne "aqua"} {
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	52 set delta [expr {- ($D / 30)}]
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	53 } else {
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	54 set delta [expr {- ($D)}]
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	55 }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	56 # scrollbars have different call conventions
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	57 if {[string match "*Scrollbar" [winfo class $w]]} {
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	58 catch {tk::ScrollByUnits $w \
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	59 [string index [$w cget -orient] 0] $delta}
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	60 } else {
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	61 set cmd [list $w [expr {$shifted ? "xview" : "yview"}] \
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	62 scroll $delta units]
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	63 # Walking up to find the proper widget (handles cases like
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	64 # embedded widgets in a canvas)
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	65 while {[catch $cmd] && [winfo toplevel $w] ne $w} {
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	66 set w [winfo parent $w]
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	67 }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	68 }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	69 }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	70 }
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	71
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	72 bind all <MouseWheel> [list ::tk::MouseWheel %W %X %Y %D 0]
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	73
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	74 # end of win32 section
5117 d4fa6bafc43a Remove trailing spaces, fix indentation Thomas Arendsen Hein <thomas@intevation.de> parents: 4969 diff changeset	75 }
4969 b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	76
b43db44cd047 hgk: enable mouse wheel under Windows. Patrick Mezard <pmezard@gmail.com> parents: 4968 diff changeset	77
5392 66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	78 # Unify right mouse button handling.
66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	79 # See "mouse buttons on macintosh" thread on comp.lang.tcl
66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	80 if {[tk windowingsystem] eq "aqua"} {
66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	81 event add <<B3>> <Control-ButtonPress-1>
66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	82 event add <<B3>> <Button-2>
66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	83 } else {
66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	84 event add <<B3>> <Button-3>
66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	85 }
66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	86
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	87 proc gitdir {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	88 global env
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	89 if {[info exists env(GIT_DIR)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	90 return $env(GIT_DIR)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	91 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	92 return ".hg"
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	93 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	94 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	95
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	96 proc getcommits {rargs} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	97 global commits commfd phase canv mainfont env
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	98 global startmsecs nextupdate ncmupdate
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	99 global ctext maincursor textcursor leftover
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	100
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	101 # check that we can find a .git directory somewhere...
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	102 set gitdir [gitdir]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	103 if {![file isdirectory $gitdir]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	104 error_popup "Cannot find the git directory \"$gitdir\"."
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	105 exit 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	106 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	107 set commits {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	108 set phase getcommits
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	109 set startmsecs [clock clicks -milliseconds]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	110 set nextupdate [expr $startmsecs + 100]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	111 set ncmupdate 1
3090 edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	112 set limit 0
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	113 set revargs {}
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	114 for {set i 0} {$i < [llength $rargs]} {incr i} {
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	115 set opt [lindex $rargs $i]
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	116 if {$opt == "--limit"} {
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	117 incr i
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	118 set limit [lindex $rargs $i]
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	119 } else {
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	120 lappend revargs $opt
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	121 }
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	122 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	123 if [catch {
3090 edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	124 set parse_args [concat --default HEAD $revargs]
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	125 set parse_temp [eval exec {$env(HG)} --config ui.report_untrusted=false debug-rev-parse $parse_args]
3934 a33ddd20105c hgk - fix CR issues on windows "Andrei Vermel <avermel@mail.ru>" parents: 3090 diff changeset	126 regsub -all "\r\n" $parse_temp "\n" parse_temp
a33ddd20105c hgk - fix CR issues on windows "Andrei Vermel <avermel@mail.ru>" parents: 3090 diff changeset	127 set parsed_args [split $parse_temp "\n"]
3090 edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	128 } err] {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	129 # if git-rev-parse failed for some reason...
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	130 if {$rargs == {}} {
3090 edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	131 set revargs HEAD
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	132 }
3090 edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	133 set parsed_args $revargs
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	134 }
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	135 if {$limit > 0} {
edefbb3a3b08 hgk: add --limit, and revranges Brendan Cully <brendan@kublai.com> parents: 3089 diff changeset	136 set parsed_args [concat -n $limit $parsed_args]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	137 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	138 if [catch {
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	139 set commfd [open "\|{$env(HG)} --config ui.report_untrusted=false debug-rev-list --header --topo-order --parents $parsed_args" r]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	140 } err] {
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1240 diff changeset	141 puts stderr "Error executing hg debug-rev-list: $err"
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	142 exit 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	143 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	144 set leftover {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	145 fconfigure $commfd -blocking 0 -translation lf
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	146 fileevent $commfd readable [list getcommitlines $commfd]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	147 $canv delete all
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	148 $canv create text 3 3 -anchor nw -text "Reading commits..." \
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	149 -font $mainfont -tags textitems
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	150 . config -cursor watch
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	151 settextcursor watch
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	152 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	153
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	154 proc getcommitlines {commfd} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	155 global commits parents cdate children
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	156 global commitlisted phase commitinfo nextupdate
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	157 global stopped redisplaying leftover
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	158
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	159 set stuff [read $commfd]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	160 if {$stuff == {}} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	161 if {![eof $commfd]} return
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	162 # set it blocking so we wait for the process to terminate
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	163 fconfigure $commfd -blocking 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	164 if {![catch {close $commfd} err]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	165 after idle finishcommits
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	166 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	167 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	168 if {[string range $err 0 4] == "usage"} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	169 set err \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	170 {Gitk: error reading commits: bad arguments to git-rev-list.
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	171 (Note: arguments to gitk are passed to git-rev-list
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	172 to allow selection of commits to be displayed.)}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	173 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	174 set err "Error reading commits: $err"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	175 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	176 error_popup $err
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	177 exit 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	178 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	179 set start 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	180 while 1 {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	181 set i [string first "\0" $stuff $start]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	182 if {$i < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	183 append leftover [string range $stuff $start end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	184 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	185 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	186 set cmit [string range $stuff $start [expr {$i - 1}]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	187 if {$start == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	188 set cmit "$leftover$cmit"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	189 set leftover {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	190 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	191 set start [expr {$i + 1}]
3934 a33ddd20105c hgk - fix CR issues on windows "Andrei Vermel <avermel@mail.ru>" parents: 3090 diff changeset	192 regsub -all "\r\n" $cmit "\n" cmit
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	193 set j [string first "\n" $cmit]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	194 set ok 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	195 if {$j >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	196 set ids [string range $cmit 0 [expr {$j - 1}]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	197 set ok 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	198 foreach id $ids {
3056 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 2297 diff changeset	199 if {![regexp {^[0-9a-f]{12}$} $id]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	200 set ok 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	201 break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	202 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	203 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	204 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	205 if {!$ok} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	206 set shortcmit $cmit
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	207 if {[string length $shortcmit] > 80} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	208 set shortcmit "[string range $shortcmit 0 80]..."
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	209 }
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1240 diff changeset	210 error_popup "Can't parse hg debug-rev-list output: {$shortcmit}"
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	211 exit 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	212 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	213 set id [lindex $ids 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	214 set olds [lrange $ids 1 end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	215 set cmit [string range $cmit [expr {$j + 1}] end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	216 lappend commits $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	217 set commitlisted($id) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	218 parsecommit $id $cmit 1 [lrange $ids 1 end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	219 drawcommit $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	220 if {[clock clicks -milliseconds] >= $nextupdate} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	221 doupdate 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	222 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	223 while {$redisplaying} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	224 set redisplaying 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	225 if {$stopped == 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	226 set stopped 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	227 set phase "getcommits"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	228 foreach id $commits {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	229 drawcommit $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	230 if {$stopped} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	231 if {[clock clicks -milliseconds] >= $nextupdate} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	232 doupdate 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	233 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	234 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	235 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	236 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	237 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	238 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	239
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	240 proc doupdate {reading} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	241 global commfd nextupdate numcommits ncmupdate
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	242
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	243 if {$reading} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	244 fileevent $commfd readable {}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	245 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	246 update
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	247 set nextupdate [expr {[clock clicks -milliseconds] + 100}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	248 if {$numcommits < 100} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	249 set ncmupdate [expr {$numcommits + 1}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	250 } elseif {$numcommits < 10000} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	251 set ncmupdate [expr {$numcommits + 10}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	252 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	253 set ncmupdate [expr {$numcommits + 100}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	254 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	255 if {$reading} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	256 fileevent $commfd readable [list getcommitlines $commfd]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	257 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	258 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	259
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	260 proc readcommit {id} {
4686 39001f4b7d99 hgk: Use $HG instead of hg (see 849f011dbf79) Thomas Arendsen Hein <thomas@intevation.de> parents: 4502 diff changeset	261 global env
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	262 if [catch {set contents [exec $env(HG) --config ui.report_untrusted=false debug-cat-file commit $id]}] return
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	263 parsecommit $id $contents 0 {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	264 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	265
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	266 proc parsecommit {id contents listed olds} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	267 global commitinfo children nchildren parents nparents cdate ncleft
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	268
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	269 set inhdr 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	270 set comment {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	271 set headline {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	272 set auname {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	273 set audate {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	274 set comname {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	275 set comdate {}
3089 d0fcce3728d1 hgk: add revision numbers Brendan Cully <brendan@kublai.com> parents: 3056 diff changeset	276 set rev {}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	277 if {![info exists nchildren($id)]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	278 set children($id) {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	279 set nchildren($id) 0
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	280 set ncleft($id) 0
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	281 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	282 set parents($id) $olds
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	283 set nparents($id) [llength $olds]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	284 foreach p $olds {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	285 if {![info exists nchildren($p)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	286 set children($p) [list $id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	287 set nchildren($p) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	288 set ncleft($p) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	289 } elseif {[lsearch -exact $children($p) $id] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	290 lappend children($p) $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	291 incr nchildren($p)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	292 incr ncleft($p)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	293 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	294 }
3934 a33ddd20105c hgk - fix CR issues on windows "Andrei Vermel <avermel@mail.ru>" parents: 3090 diff changeset	295 regsub -all "\r\n" $contents "\n" contents
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	296 foreach line [split $contents "\n"] {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	297 if {$inhdr} {
2297 936b615eb44e Fix hg view if author's name contains unmatched quotes. (issue248) Thomas Arendsen Hein <thomas@intevation.de> parents: 2058 diff changeset	298 set line [split $line]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	299 if {$line == {}} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	300 set inhdr 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	301 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	302 set tag [lindex $line 0]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	303 if {$tag == "author"} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	304 set x [expr {[llength $line] - 2}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	305 set audate [lindex $line $x]
2297 936b615eb44e Fix hg view if author's name contains unmatched quotes. (issue248) Thomas Arendsen Hein <thomas@intevation.de> parents: 2058 diff changeset	306 set auname [join [lrange $line 1 [expr {$x - 1}]]]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	307 } elseif {$tag == "committer"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	308 set x [expr {[llength $line] - 2}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	309 set comdate [lindex $line $x]
2297 936b615eb44e Fix hg view if author's name contains unmatched quotes. (issue248) Thomas Arendsen Hein <thomas@intevation.de> parents: 2058 diff changeset	310 set comname [join [lrange $line 1 [expr {$x - 1}]]]
3089 d0fcce3728d1 hgk: add revision numbers Brendan Cully <brendan@kublai.com> parents: 3056 diff changeset	311 } elseif {$tag == "revision"} {
d0fcce3728d1 hgk: add revision numbers Brendan Cully <brendan@kublai.com> parents: 3056 diff changeset	312 set rev [lindex $line 1]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	313 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	314 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	315 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	316 if {$comment == {}} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	317 set headline [string trim $line]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	318 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	319 append comment "\n"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	320 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	321 if {!$listed} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	322 # git-rev-list indents the comment by 4 spaces;
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	323 # if we got this via git-cat-file, add the indentation
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	324 append comment " "
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	325 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	326 append comment $line
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	327 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	328 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	329 if {$audate != {}} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	330 set audate [clock format $audate -format "%Y-%m-%d %H:%M:%S"]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	331 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	332 if {$comdate != {}} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	333 set cdate($id) $comdate
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	334 set comdate [clock format $comdate -format "%Y-%m-%d %H:%M:%S"]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	335 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	336 set commitinfo($id) [list $headline $auname $audate \
3089 d0fcce3728d1 hgk: add revision numbers Brendan Cully <brendan@kublai.com> parents: 3056 diff changeset	337 $comname $comdate $comment $rev]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	338 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	339
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	340 proc readrefs {} {
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	341 global tagids idtags headids idheads tagcontents env curid
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	342
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	343 set curid [exec $env(HG) --config ui.report_untrusted=false id]
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	344 regexp -- {[[:xdigit:]]+} $curid curid
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	345
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	346 set tags [exec $env(HG) --config ui.report_untrusted=false tags]
3934 a33ddd20105c hgk - fix CR issues on windows "Andrei Vermel <avermel@mail.ru>" parents: 3090 diff changeset	347 regsub -all "\r\n" $tags "\n" tags
a33ddd20105c hgk - fix CR issues on windows "Andrei Vermel <avermel@mail.ru>" parents: 3090 diff changeset	348 set lines [split $tags "\n"]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	349 foreach f $lines {
4502 1774c037fbd2 hgk: display tags that contain spaces TK Soh <teekaysoh@yahoo.com> parents: 4501 diff changeset	350 regexp {(\S+)$} $f full
1774c037fbd2 hgk: display tags that contain spaces TK Soh <teekaysoh@yahoo.com> parents: 4501 diff changeset	351 regsub {\s+(\S+)$} $f "" direct
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	352 set sha [split $full ':']
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	353 set tag [lindex $sha 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	354 lappend tagids($direct) $tag
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	355 lappend idtags($tag) $direct
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	356 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	357 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	358
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	359 proc readotherrefs {base dname excl} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	360 global otherrefids idotherrefs
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	361
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	362 set git [gitdir]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	363 set files [glob -nocomplain -types f [file join $git $base *]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	364 foreach f $files {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	365 catch {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	366 set fd [open $f r]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	367 set line [read $fd 40]
3056 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 2297 diff changeset	368 if {[regexp {^[0-9a-f]{12}} $line id]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	369 set name "$dname[file tail $f]"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	370 set otherrefids($name) $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	371 lappend idotherrefs($id) $name
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	372 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	373 close $fd
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	374 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	375 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	376 set dirs [glob -nocomplain -types d [file join $git $base *]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	377 foreach d $dirs {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	378 set dir [file tail $d]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	379 if {[lsearch -exact $excl $dir] >= 0} continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	380 readotherrefs [file join $base $dir] "$dname$dir/" {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	381 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	382 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	383
4968 713426631adf hgk: enable mouse wheel on MouseWheel events. Patrick Mezard <pmezard@gmail.com> parents: 4750 diff changeset	384 proc allcansmousewheel {delta} {
713426631adf hgk: enable mouse wheel on MouseWheel events. Patrick Mezard <pmezard@gmail.com> parents: 4750 diff changeset	385 set delta [expr -5*(int($delta)/abs($delta))]
713426631adf hgk: enable mouse wheel on MouseWheel events. Patrick Mezard <pmezard@gmail.com> parents: 4750 diff changeset	386 allcanvs yview scroll $delta units
713426631adf hgk: enable mouse wheel on MouseWheel events. Patrick Mezard <pmezard@gmail.com> parents: 4750 diff changeset	387 }
713426631adf hgk: enable mouse wheel on MouseWheel events. Patrick Mezard <pmezard@gmail.com> parents: 4750 diff changeset	388
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	389 proc error_popup msg {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	390 set w .error
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	391 toplevel $w
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	392 wm transient $w .
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	393 message $w.m -text $msg -justify center -aspect 400
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	394 pack $w.m -side top -fill x -padx 20 -pady 20
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	395 button $w.ok -text OK -command "destroy $w"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	396 pack $w.ok -side bottom -fill x
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	397 bind $w <Visibility> "grab $w; focus $w"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	398 tkwait window $w
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	399 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	400
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	401 proc makewindow {} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	402 global canv canv2 canv3 linespc charspc ctext cflist textfont
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	403 global findtype findtypemenu findloc findstring fstring geometry
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	404 global entries sha1entry sha1string sha1but
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	405 global maincursor textcursor curtextcursor
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	406 global rowctxmenu gaudydiff mergemax
5394 0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	407 global hgvdiff
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	408
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	409 menu .bar
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	410 .bar add cascade -label "File" -menu .bar.file
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	411 menu .bar.file
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	412 .bar.file add command -label "Reread references" -command rereadrefs
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	413 .bar.file add command -label "Quit" -command doquit
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	414 menu .bar.help
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	415 .bar add cascade -label "Help" -menu .bar.help
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	416 .bar.help add command -label "About gitk" -command about
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	417 . configure -menu .bar
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	418
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	419 if {![info exists geometry(canv1)]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	420 set geometry(canv1) [expr 45 * $charspc]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	421 set geometry(canv2) [expr 30 * $charspc]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	422 set geometry(canv3) [expr 15 * $charspc]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	423 set geometry(canvh) [expr 25 * $linespc + 4]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	424 set geometry(ctextw) 80
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	425 set geometry(ctexth) 30
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	426 set geometry(cflistw) 30
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	427 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	428 panedwindow .ctop -orient vertical
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	429 if {[info exists geometry(width)]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	430 .ctop conf -width $geometry(width) -height $geometry(height)
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	431 set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	432 set geometry(ctexth) [expr {($texth - 8) /
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	433 [font metrics $textfont -linespace]}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	434 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	435 frame .ctop.top
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	436 frame .ctop.top.bar
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	437 pack .ctop.top.bar -side bottom -fill x
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	438 set cscroll .ctop.top.csb
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	439 scrollbar $cscroll -command {allcanvs yview} -highlightthickness 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	440 pack $cscroll -side right -fill y
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	441 panedwindow .ctop.top.clist -orient horizontal -sashpad 0 -handlesize 4
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	442 pack .ctop.top.clist -side top -fill both -expand 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	443 .ctop add .ctop.top
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	444 set canv .ctop.top.clist.canv
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	445 canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	446 -bg white -bd 0 \
4501 b2338c0cf468 hgk: added -selectbackground grey to canvases Bela Babik <teki321@gmail.com> parents: 3934 diff changeset	447 -yscrollincr $linespc -yscrollcommand "$cscroll set" -selectbackground grey
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	448 .ctop.top.clist add $canv
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	449 set canv2 .ctop.top.clist.canv2
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	450 canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
4501 b2338c0cf468 hgk: added -selectbackground grey to canvases Bela Babik <teki321@gmail.com> parents: 3934 diff changeset	451 -bg white -bd 0 -yscrollincr $linespc -selectbackground grey
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	452 .ctop.top.clist add $canv2
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	453 set canv3 .ctop.top.clist.canv3
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	454 canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
4501 b2338c0cf468 hgk: added -selectbackground grey to canvases Bela Babik <teki321@gmail.com> parents: 3934 diff changeset	455 -bg white -bd 0 -yscrollincr $linespc -selectbackground grey
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	456 .ctop.top.clist add $canv3
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	457 bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	458
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	459 set sha1entry .ctop.top.bar.sha1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	460 set entries $sha1entry
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	461 set sha1but .ctop.top.bar.sha1label
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	462 button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	463 -command gotocommit -width 8
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	464 $sha1but conf -disabledforeground [$sha1but cget -foreground]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	465 pack .ctop.top.bar.sha1label -side left
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	466 entry $sha1entry -width 40 -font $textfont -textvariable sha1string
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	467 trace add variable sha1string write sha1change
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	468 pack $sha1entry -side left -pady 2
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	469
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	470 image create bitmap bm-left -data {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	471 #define left_width 16
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	472 #define left_height 16
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	473 static unsigned char left_bits[] = {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	474 0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	475 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	476 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	477 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	478 image create bitmap bm-right -data {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	479 #define right_width 16
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	480 #define right_height 16
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	481 static unsigned char right_bits[] = {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	482 0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	483 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	484 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	485 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	486 button .ctop.top.bar.leftbut -image bm-left -command goback \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	487 -state disabled -width 26
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	488 pack .ctop.top.bar.leftbut -side left -fill y
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	489 button .ctop.top.bar.rightbut -image bm-right -command goforw \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	490 -state disabled -width 26
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	491 pack .ctop.top.bar.rightbut -side left -fill y
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	492
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	493 button .ctop.top.bar.findbut -text "Find" -command dofind
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	494 pack .ctop.top.bar.findbut -side left
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	495 set findstring {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	496 set fstring .ctop.top.bar.findstring
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	497 lappend entries $fstring
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	498 entry $fstring -width 30 -font $textfont -textvariable findstring
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	499 pack $fstring -side left -expand 1 -fill x
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	500 set findtype Exact
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	501 set findtypemenu [tk_optionMenu .ctop.top.bar.findtype \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	502 findtype Exact IgnCase Regexp]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	503 set findloc "All fields"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	504 tk_optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	505 Comments Author Committer Files Pickaxe
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	506 pack .ctop.top.bar.findloc -side right
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	507 pack .ctop.top.bar.findtype -side right
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	508 # for making sure type==Exact whenever loc==Pickaxe
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	509 trace add variable findloc write findlocchange
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	510
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	511 panedwindow .ctop.cdet -orient horizontal
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	512 .ctop add .ctop.cdet
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	513 frame .ctop.cdet.left
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	514 set ctext .ctop.cdet.left.ctext
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	515 text $ctext -bg white -state disabled -font $textfont \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	516 -width $geometry(ctextw) -height $geometry(ctexth) \
1430 c91966c3bbf5 hgk: add horizontal scrollbar to patch window TK Soh <teekaysoh@yahoo.com> parents: 1429 diff changeset	517 -yscrollcommand ".ctop.cdet.left.sb set" \
c91966c3bbf5 hgk: add horizontal scrollbar to patch window TK Soh <teekaysoh@yahoo.com> parents: 1429 diff changeset	518 -xscrollcommand ".ctop.cdet.left.hb set" -wrap none
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	519 scrollbar .ctop.cdet.left.sb -command "$ctext yview"
1430 c91966c3bbf5 hgk: add horizontal scrollbar to patch window TK Soh <teekaysoh@yahoo.com> parents: 1429 diff changeset	520 scrollbar .ctop.cdet.left.hb -orient horizontal -command "$ctext xview"
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	521 pack .ctop.cdet.left.sb -side right -fill y
1430 c91966c3bbf5 hgk: add horizontal scrollbar to patch window TK Soh <teekaysoh@yahoo.com> parents: 1429 diff changeset	522 pack .ctop.cdet.left.hb -side bottom -fill x
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	523 pack $ctext -side left -fill both -expand 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	524 .ctop.cdet add .ctop.cdet.left
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	525
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	526 $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	527 if {$gaudydiff} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	528 $ctext tag conf hunksep -back blue -fore white
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	529 $ctext tag conf d0 -back "#ff8080"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	530 $ctext tag conf d1 -back green
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	531 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	532 $ctext tag conf hunksep -fore blue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	533 $ctext tag conf d0 -fore red
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	534 $ctext tag conf d1 -fore "#00a000"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	535 $ctext tag conf m0 -fore red
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	536 $ctext tag conf m1 -fore blue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	537 $ctext tag conf m2 -fore green
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	538 $ctext tag conf m3 -fore purple
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	539 $ctext tag conf m4 -fore brown
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	540 $ctext tag conf mmax -fore darkgrey
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	541 set mergemax 5
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	542 $ctext tag conf mresult -font [concat $textfont bold]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	543 $ctext tag conf msep -font [concat $textfont bold]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	544 $ctext tag conf found -back yellow
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	545 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	546
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	547 frame .ctop.cdet.right
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	548 set cflist .ctop.cdet.right.cfiles
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	549 listbox $cflist -bg white -selectmode extended -width $geometry(cflistw) \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	550 -yscrollcommand ".ctop.cdet.right.sb set"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	551 scrollbar .ctop.cdet.right.sb -command "$cflist yview"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	552 pack .ctop.cdet.right.sb -side right -fill y
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	553 pack $cflist -side left -fill both -expand 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	554 .ctop.cdet add .ctop.cdet.right
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	555 bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	556
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	557 pack .ctop -side top -fill both -expand 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	558
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	559 bindall <1> {selcanvline %W %x %y}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	560 #bindall <B1-Motion> {selcanvline %W %x %y}
4968 713426631adf hgk: enable mouse wheel on MouseWheel events. Patrick Mezard <pmezard@gmail.com> parents: 4750 diff changeset	561 bindall <MouseWheel> "allcansmousewheel %D"
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	562 bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	563 bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	564 bindall <2> "allcanvs scan mark 0 %y"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	565 bindall <B2-Motion> "allcanvs scan dragto 0 %y"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	566 bind . <Key-Up> "selnextline -1"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	567 bind . <Key-Down> "selnextline 1"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	568 bind . <Key-Prior> "allcanvs yview scroll -1 pages"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	569 bind . <Key-Next> "allcanvs yview scroll 1 pages"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	570 bindkey <Key-Delete> "$ctext yview scroll -1 pages"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	571 bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	572 bindkey <Key-space> "$ctext yview scroll 1 pages"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	573 bindkey p "selnextline -1"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	574 bindkey n "selnextline 1"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	575 bindkey b "$ctext yview scroll -1 pages"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	576 bindkey d "$ctext yview scroll 18 units"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	577 bindkey u "$ctext yview scroll -18 units"
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	578 bindkey / {findnext 1}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	579 bindkey <Key-Return> {findnext 0}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	580 bindkey ? findprev
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	581 bindkey f nextfile
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	582 bind . <Control-q> doquit
1429 45bd7925dceb Add control-w key binding to quit hgk. Eric Bloodworth <ergosys@gmail.com> parents: 1361 diff changeset	583 bind . <Control-w> doquit
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	584 bind . <Control-f> dofind
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	585 bind . <Control-g> {findnext 0}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	586 bind . <Control-r> findprev
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	587 bind . <Control-equal> {incrfont 1}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	588 bind . <Control-KP_Add> {incrfont 1}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	589 bind . <Control-minus> {incrfont -1}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	590 bind . <Control-KP_Subtract> {incrfont -1}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	591 bind $cflist <<ListboxSelect>> listboxsel
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	592 bind . <Destroy> {savestuff %W}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	593 bind . <Button-1> "click %W"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	594 bind $fstring <Key-Return> dofind
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	595 bind $sha1entry <Key-Return> gotocommit
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	596 bind $sha1entry <<PasteSelection>> clearsha1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	597
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	598 set maincursor [. cget -cursor]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	599 set textcursor [$ctext cget -cursor]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	600 set curtextcursor $textcursor
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	601
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	602 set rowctxmenu .rowctxmenu
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	603 menu $rowctxmenu -tearoff 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	604 $rowctxmenu add command -label "Diff this -> selected" \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	605 -command {diffvssel 0}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	606 $rowctxmenu add command -label "Diff selected -> this" \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	607 -command {diffvssel 1}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	608 $rowctxmenu add command -label "Make patch" -command mkpatch
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	609 $rowctxmenu add command -label "Create tag" -command mktag
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	610 $rowctxmenu add command -label "Write commit to file" -command writecommit
5394 0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	611 if { $hgvdiff ne "" } {
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	612 $rowctxmenu add command -label "Visual diff with parent" \
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	613 -command {vdiff 1}
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	614 $rowctxmenu add command -label "Visual diff with selected" \
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	615 -command {vdiff 0}
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	616 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	617 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	618
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	619 # when we make a key binding for the toplevel, make sure
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	620 # it doesn't get triggered when that key is pressed in the
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	621 # find string entry widget.
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	622 proc bindkey {ev script} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	623 global entries
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	624 bind . $ev $script
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	625 set escript [bind Entry $ev]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	626 if {$escript == {}} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	627 set escript [bind Entry <Key>]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	628 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	629 foreach e $entries {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	630 bind $e $ev "$escript; break"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	631 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	632 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	633
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	634 # set the focus back to the toplevel for any click outside
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	635 # the entry widgets
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	636 proc click {w} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	637 global entries
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	638 foreach e $entries {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	639 if {$w == $e} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	640 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	641 focus .
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	642 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	643
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	644 proc savestuff {w} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	645 global canv canv2 canv3 ctext cflist mainfont textfont
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	646 global stuffsaved findmergefiles gaudydiff maxgraphpct
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	647 global maxwidth authorcolors curidfont
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	648
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	649 if {$stuffsaved} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	650 if {![winfo viewable .]} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	651 catch {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	652 set f [open "~/.gitk-new" w]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	653 puts $f [list set mainfont $mainfont]
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	654 puts $f [list set curidfont $curidfont]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	655 puts $f [list set textfont $textfont]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	656 puts $f [list set findmergefiles $findmergefiles]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	657 puts $f [list set gaudydiff $gaudydiff]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	658 puts $f [list set maxgraphpct $maxgraphpct]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	659 puts $f [list set maxwidth $maxwidth]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	660 puts $f "set geometry(width) [winfo width .ctop]"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	661 puts $f "set geometry(height) [winfo height .ctop]"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	662 puts $f "set geometry(canv1) [expr [winfo width $canv]-2]"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	663 puts $f "set geometry(canv2) [expr [winfo width $canv2]-2]"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	664 puts $f "set geometry(canv3) [expr [winfo width $canv3]-2]"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	665 puts $f "set geometry(canvh) [expr [winfo height $canv]-2]"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	666 set wid [expr {([winfo width $ctext] - 8) \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	667 / [font measure $textfont "0"]}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	668 puts $f "set geometry(ctextw) $wid"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	669 set wid [expr {([winfo width $cflist] - 11) \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	670 / [font measure [$cflist cget -font] "0"]}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	671 puts $f "set geometry(cflistw) $wid"
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	672 puts $f "#"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	673 puts $f "# authorcolors format:"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	674 puts $f "#"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	675 puts $f "# zero or more sublists of"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	676 puts $f "#"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	677 puts $f "# { regex color }"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	678 puts $f "#"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	679 puts $f "# followed by a list of colors"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	680 puts $f "#"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	681 puts $f "# If the commit author matches a regex in a sublist,"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	682 puts $f "# the commit will be colored by that color"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	683 puts $f "# otherwise the next unused entry from the list of colors"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	684 puts $f "# will be assigned to this commit and also all other commits"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	685 puts $f "# of the same author. When the list of colors is exhausted,"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	686 puts $f "# the last entry will be reused."
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	687 puts $f "#"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	688 puts $f "set authorcolors {$authorcolors}"
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	689 close $f
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	690 file rename -force "~/.gitk-new" "~/.gitk"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	691 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	692 set stuffsaved 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	693 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	694
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	695 proc resizeclistpanes {win w} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	696 global oldwidth
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	697 if [info exists oldwidth($win)] {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	698 set s0 [$win sash coord 0]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	699 set s1 [$win sash coord 1]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	700 if {$w < 60} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	701 set sash0 [expr {int($w/2 - 2)}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	702 set sash1 [expr {int($w*5/6 - 2)}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	703 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	704 set factor [expr {1.0 * $w / $oldwidth($win)}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	705 set sash0 [expr {int($factor * [lindex $s0 0])}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	706 set sash1 [expr {int($factor * [lindex $s1 0])}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	707 if {$sash0 < 30} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	708 set sash0 30
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	709 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	710 if {$sash1 < $sash0 + 20} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	711 set sash1 [expr $sash0 + 20]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	712 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	713 if {$sash1 > $w - 10} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	714 set sash1 [expr $w - 10]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	715 if {$sash0 > $sash1 - 20} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	716 set sash0 [expr $sash1 - 20]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	717 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	718 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	719 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	720 $win sash place 0 $sash0 [lindex $s0 1]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	721 $win sash place 1 $sash1 [lindex $s1 1]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	722 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	723 set oldwidth($win) $w
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	724 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	725
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	726 proc resizecdetpanes {win w} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	727 global oldwidth
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	728 if [info exists oldwidth($win)] {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	729 set s0 [$win sash coord 0]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	730 if {$w < 60} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	731 set sash0 [expr {int($w*3/4 - 2)}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	732 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	733 set factor [expr {1.0 * $w / $oldwidth($win)}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	734 set sash0 [expr {int($factor * [lindex $s0 0])}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	735 if {$sash0 < 45} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	736 set sash0 45
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	737 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	738 if {$sash0 > $w - 15} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	739 set sash0 [expr $w - 15]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	740 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	741 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	742 $win sash place 0 $sash0 [lindex $s0 1]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	743 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	744 set oldwidth($win) $w
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	745 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	746
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	747 proc allcanvs args {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	748 global canv canv2 canv3
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	749 eval $canv $args
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	750 eval $canv2 $args
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	751 eval $canv3 $args
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	752 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	753
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	754 proc bindall {event action} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	755 global canv canv2 canv3
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	756 bind $canv $event $action
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	757 bind $canv2 $event $action
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	758 bind $canv3 $event $action
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	759 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	760
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	761 proc about {} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	762 set w .about
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	763 if {[winfo exists $w]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	764 raise $w
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	765 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	766 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	767 toplevel $w
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	768 wm title $w "About gitk"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	769 message $w.m -text {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	770 Gitk version 1.2
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	771
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	772 Copyright � 2005 Paul Mackerras
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	773
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	774 Use and redistribute under the terms of the GNU General Public License} \
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	775 -justify center -aspect 400
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	776 pack $w.m -side top -fill x -padx 20 -pady 20
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	777 button $w.ok -text Close -command "destroy $w"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	778 pack $w.ok -side bottom
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	779 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	780
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	781 set aunextcolor 0
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	782 proc assignauthorcolor {name} {
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	783 global authorcolors aucolormap aunextcolor
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	784 if [info exists aucolormap($name)] return
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	785
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	786 set randomcolors {black}
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	787 for {set i 0} {$i < [llength $authorcolors]} {incr i} {
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	788 set col [lindex $authorcolors $i]
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	789 if {[llength $col] > 1} {
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	790 set re [lindex $col 0]
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	791 set c [lindex $col 1]
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	792 if {[regexp -- $re $name]} {
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	793 set aucolormap($name) $c
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	794 return
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	795 }
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	796 } else {
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	797 set randomcolors [lrange $authorcolors $i end]
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	798 break
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	799 }
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	800 }
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	801
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	802 set ncolors [llength $randomcolors]
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	803 set c [lindex $randomcolors $aunextcolor]
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	804 if {[incr aunextcolor] >= $ncolors} {
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	805 incr aunextcolor -1
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	806 }
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	807 set aucolormap($name) $c
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	808 }
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	809
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	810 proc assigncolor {id} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	811 global commitinfo colormap commcolors colors nextcolor
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	812 global parents nparents children nchildren
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	813 global cornercrossings crossings
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	814
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	815 if [info exists colormap($id)] return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	816 set ncolors [llength $colors]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	817 if {$nparents($id) <= 1 && $nchildren($id) == 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	818 set child [lindex $children($id) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	819 if {[info exists colormap($child)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	820 && $nparents($child) == 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	821 set colormap($id) $colormap($child)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	822 return
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	823 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	824 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	825 set badcolors {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	826 if {[info exists cornercrossings($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	827 foreach x $cornercrossings($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	828 if {[info exists colormap($x)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	829 && [lsearch -exact $badcolors $colormap($x)] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	830 lappend badcolors $colormap($x)
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	831 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	832 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	833 if {[llength $badcolors] >= $ncolors} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	834 set badcolors {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	835 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	836 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	837 set origbad $badcolors
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	838 if {[llength $badcolors] < $ncolors - 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	839 if {[info exists crossings($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	840 foreach x $crossings($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	841 if {[info exists colormap($x)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	842 && [lsearch -exact $badcolors $colormap($x)] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	843 lappend badcolors $colormap($x)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	844 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	845 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	846 if {[llength $badcolors] >= $ncolors} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	847 set badcolors $origbad
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	848 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	849 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	850 set origbad $badcolors
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	851 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	852 if {[llength $badcolors] < $ncolors - 1} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	853 foreach child $children($id) {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	854 if {[info exists colormap($child)]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	855 && [lsearch -exact $badcolors $colormap($child)] < 0} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	856 lappend badcolors $colormap($child)
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	857 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	858 if {[info exists parents($child)]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	859 foreach p $parents($child) {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	860 if {[info exists colormap($p)]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	861 && [lsearch -exact $badcolors $colormap($p)] < 0} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	862 lappend badcolors $colormap($p)
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	863 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	864 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	865 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	866 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	867 if {[llength $badcolors] >= $ncolors} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	868 set badcolors $origbad
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	869 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	870 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	871 for {set i 0} {$i <= $ncolors} {incr i} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	872 set c [lindex $colors $nextcolor]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	873 if {[incr nextcolor] >= $ncolors} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	874 set nextcolor 0
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	875 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	876 if {[lsearch -exact $badcolors $c]} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	877 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	878 set colormap($id) $c
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	879 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	880
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	881 proc initgraph {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	882 global canvy canvy0 lineno numcommits nextcolor linespc
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	883 global mainline mainlinearrow sidelines
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	884 global nchildren ncleft
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	885 global displist nhyperspace
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	886
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	887 allcanvs delete all
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	888 set nextcolor 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	889 set canvy $canvy0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	890 set lineno -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	891 set numcommits 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	892 catch {unset mainline}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	893 catch {unset mainlinearrow}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	894 catch {unset sidelines}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	895 foreach id [array names nchildren] {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	896 set ncleft($id) $nchildren($id)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	897 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	898 set displist {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	899 set nhyperspace 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	900 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	901
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	902 proc bindline {t id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	903 global canv
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	904
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	905 $canv bind $t <Enter> "lineenter %x %y $id"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	906 $canv bind $t <Motion> "linemotion %x %y $id"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	907 $canv bind $t <Leave> "lineleave $id"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	908 $canv bind $t <Button-1> "lineclick %x %y $id 1"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	909 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	910
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	911 proc drawlines {id xtra} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	912 global mainline mainlinearrow sidelines lthickness colormap canv
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	913
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	914 $canv delete lines.$id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	915 if {[info exists mainline($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	916 set t [$canv create line $mainline($id) \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	917 -width [expr {($xtra + 1) * $lthickness}] \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	918 -fill $colormap($id) -tags lines.$id \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	919 -arrow $mainlinearrow($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	920 $canv lower $t
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	921 bindline $t $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	922 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	923 if {[info exists sidelines($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	924 foreach ls $sidelines($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	925 set coords [lindex $ls 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	926 set thick [lindex $ls 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	927 set arrow [lindex $ls 2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	928 set t [$canv create line $coords -fill $colormap($id) \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	929 -width [expr {($thick + $xtra) * $lthickness}] \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	930 -arrow $arrow -tags lines.$id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	931 $canv lower $t
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	932 bindline $t $id
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	933 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	934 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	935 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	936
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	937 # level here is an index in displist
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	938 proc drawcommitline {level} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	939 global parents children nparents displist
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	940 global canv canv2 canv3 mainfont namefont canvy linespc
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	941 global lineid linehtag linentag linedtag commitinfo
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	942 global colormap numcommits currentparents dupparents
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	943 global idtags idline idheads idotherrefs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	944 global lineno lthickness mainline mainlinearrow sidelines
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	945 global commitlisted rowtextx idpos lastuse displist
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	946 global oldnlines olddlevel olddisplist
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	947 global aucolormap curid curidfont
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	948
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	949 incr numcommits
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	950 incr lineno
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	951 set id [lindex $displist $level]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	952 set lastuse($id) $lineno
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	953 set lineid($lineno) $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	954 set idline($id) $lineno
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	955 set ofill [expr {[info exists commitlisted($id)]? "blue": "white"}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	956 if {![info exists commitinfo($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	957 readcommit $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	958 if {![info exists commitinfo($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	959 set commitinfo($id) {"No commit information available"}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	960 set nparents($id) 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	961 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	962 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	963 assigncolor $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	964 set currentparents {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	965 set dupparents {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	966 if {[info exists commitlisted($id)] && [info exists parents($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	967 foreach p $parents($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	968 if {[lsearch -exact $currentparents $p] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	969 lappend currentparents $p
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	970 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	971 # remember that this parent was listed twice
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	972 lappend dupparents $p
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	973 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	974 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	975 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	976 set x [xcoord $level $level $lineno]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	977 set y1 $canvy
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	978 set canvy [expr $canvy + $linespc]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	979 allcanvs conf -scrollregion \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	980 [list 0 0 0 [expr $y1 + 0.5 * $linespc + 2]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	981 if {[info exists mainline($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	982 lappend mainline($id) $x $y1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	983 if {$mainlinearrow($id) ne "none"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	984 set mainline($id) [trimdiagstart $mainline($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	985 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	986 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	987 drawlines $id 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	988 set orad [expr {$linespc / 3}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	989 set t [$canv create oval [expr $x - $orad] [expr $y1 - $orad] \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	990 [expr $x + $orad - 1] [expr $y1 + $orad - 1] \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	991 -fill $ofill -outline black -width 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	992 $canv raise $t
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	993 $canv bind $t <1> {selcanvline {} %x %y}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	994 set xt [xcoord [llength $displist] $level $lineno]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	995 if {[llength $currentparents] > 2} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	996 set xt [expr {$xt + ([llength $currentparents] - 2) * $linespc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	997 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	998 set rowtextx($lineno) $xt
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	999 set idpos($id) [list $x $xt $y1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1000 if {[info exists idtags($id)] \|\| [info exists idheads($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1001 \|\| [info exists idotherrefs($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1002 set xt [drawtags $id $x $xt $y1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1003 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1004 set headline [lindex $commitinfo($id) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1005 set name [lindex $commitinfo($id) 1]
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1006 assignauthorcolor $name
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1007 set fg $aucolormap($name)
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1008 if {$id == $curid} {
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1009 set fn $curidfont
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1010 } else {
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1011 set fn $mainfont
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1012 }
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1013
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1014 set date [lindex $commitinfo($id) 2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1015 set linehtag($lineno) [$canv create text $xt $y1 -anchor w \
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1016 -text $headline -font $fn \
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1017 -fill $fg]
5392 66d7aabf5b41 hgk: fix right-mouse button handling under macosx Patrick Mezard <pmezard@gmail.com> parents: 5284 diff changeset	1018 $canv bind $linehtag($lineno) <<B3>> "rowmenu %X %Y $id"
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1019 set linentag($lineno) [$canv2 create text 3 $y1 -anchor w \
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1020 -text $name -font $namefont \
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1021 -fill $fg]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1022 set linedtag($lineno) [$canv3 create text 3 $y1 -anchor w \
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1023 -text $date -font $mainfont \
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	1024 -fill $fg]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1025
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1026 set olddlevel $level
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1027 set olddisplist $displist
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1028 set oldnlines [llength $displist]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1029 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1030
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1031 proc drawtags {id x xt y1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1032 global idtags idheads idotherrefs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1033 global linespc lthickness
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1034 global canv mainfont idline rowtextx
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1035
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1036 set marks {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1037 set ntags 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1038 set nheads 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1039 if {[info exists idtags($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1040 set marks $idtags($id)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1041 set ntags [llength $marks]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1042 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1043 if {[info exists idheads($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1044 set marks [concat $marks $idheads($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1045 set nheads [llength $idheads($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1046 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1047 if {[info exists idotherrefs($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1048 set marks [concat $marks $idotherrefs($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1049 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1050 if {$marks eq {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1051 return $xt
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1052 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1053
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1054 set delta [expr {int(0.5 * ($linespc - $lthickness))}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1055 set yt [expr $y1 - 0.5 * $linespc]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1056 set yb [expr $yt + $linespc - 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1057 set xvals {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1058 set wvals {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1059 foreach tag $marks {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1060 set wid [font measure $mainfont $tag]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1061 lappend xvals $xt
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1062 lappend wvals $wid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1063 set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1064 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1065 set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1066 -width $lthickness -fill black -tags tag.$id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1067 $canv lower $t
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1068 foreach tag $marks x $xvals wid $wvals {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1069 set xl [expr $x + $delta]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1070 set xr [expr $x + $delta + $wid + $lthickness]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1071 if {[incr ntags -1] >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1072 # draw a tag
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1073 set t [$canv create polygon $x [expr $yt + $delta] $xl $yt \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1074 $xr $yt $xr $yb $xl $yb $x [expr $yb - $delta] \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1075 -width 1 -outline black -fill yellow -tags tag.$id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1076 $canv bind $t <1> [list showtag $tag 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1077 set rowtextx($idline($id)) [expr {$xr + $linespc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1078 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1079 # draw a head or other ref
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1080 if {[incr nheads -1] >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1081 set col green
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1082 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1083 set col "#ddddff"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1084 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1085 set xl [expr $xl - $delta/2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1086 $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1087 -width 1 -outline black -fill $col -tags tag.$id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1088 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1089 set t [$canv create text $xl $y1 -anchor w -text $tag \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1090 -font $mainfont -tags tag.$id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1091 if {$ntags >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1092 $canv bind $t <1> [list showtag $tag 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1093 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1094 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1095 return $xt
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1096 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1097
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1098 proc notecrossings {id lo hi corner} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1099 global olddisplist crossings cornercrossings
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1100
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1101 for {set i $lo} {[incr i] < $hi} {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1102 set p [lindex $olddisplist $i]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1103 if {$p == {}} continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1104 if {$i == $corner} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1105 if {![info exists cornercrossings($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1106 \|\| [lsearch -exact $cornercrossings($id) $p] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1107 lappend cornercrossings($id) $p
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1108 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1109 if {![info exists cornercrossings($p)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1110 \|\| [lsearch -exact $cornercrossings($p) $id] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1111 lappend cornercrossings($p) $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1112 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1113 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1114 if {![info exists crossings($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1115 \|\| [lsearch -exact $crossings($id) $p] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1116 lappend crossings($id) $p
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1117 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1118 if {![info exists crossings($p)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1119 \|\| [lsearch -exact $crossings($p) $id] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1120 lappend crossings($p) $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1121 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1122 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1123 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1124 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1125
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1126 proc xcoord {i level ln} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1127 global canvx0 xspc1 xspc2
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1128
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1129 set x [expr {$canvx0 + $i * $xspc1($ln)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1130 if {$i > 0 && $i == $level} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1131 set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1132 } elseif {$i > $level} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1133 set x [expr {$x + $xspc2 - $xspc1($ln)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1134 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1135 return $x
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1136 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1137
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1138 # it seems Tk can't draw arrows on the end of diagonal line segments...
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1139 proc trimdiagend {line} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1140 while {[llength $line] > 4} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1141 set x1 [lindex $line end-3]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1142 set y1 [lindex $line end-2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1143 set x2 [lindex $line end-1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1144 set y2 [lindex $line end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1145 if {($x1 == $x2) != ($y1 == $y2)} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1146 set line [lreplace $line end-1 end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1147 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1148 return $line
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1149 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1150
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1151 proc trimdiagstart {line} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1152 while {[llength $line] > 4} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1153 set x1 [lindex $line 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1154 set y1 [lindex $line 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1155 set x2 [lindex $line 2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1156 set y2 [lindex $line 3]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1157 if {($x1 == $x2) != ($y1 == $y2)} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1158 set line [lreplace $line 0 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1159 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1160 return $line
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1161 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1162
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1163 proc drawslants {id needonscreen nohs} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1164 global canv mainline mainlinearrow sidelines
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1165 global canvx0 canvy xspc1 xspc2 lthickness
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1166 global currentparents dupparents
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1167 global lthickness linespc canvy colormap lineno geometry
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1168 global maxgraphpct maxwidth
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1169 global displist onscreen lastuse
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1170 global parents commitlisted
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1171 global oldnlines olddlevel olddisplist
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1172 global nhyperspace numcommits nnewparents
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1173
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1174 if {$lineno < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1175 lappend displist $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1176 set onscreen($id) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1177 return 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1178 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1179
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1180 set y1 [expr {$canvy - $linespc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1181 set y2 $canvy
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1182
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1183 # work out what we need to get back on screen
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1184 set reins {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1185 if {$onscreen($id) < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1186 # next to do isn't displayed, better get it on screen...
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1187 lappend reins [list $id 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1188 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1189 # make sure all the previous commits's parents are on the screen
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1190 foreach p $currentparents {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1191 if {$onscreen($p) < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1192 lappend reins [list $p 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1193 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1194 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1195 # bring back anything requested by caller
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1196 if {$needonscreen ne {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1197 lappend reins $needonscreen
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1198 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1199
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1200 # try the shortcut
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1201 if {$currentparents == $id && $onscreen($id) == 0 && $reins eq {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1202 set dlevel $olddlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1203 set x [xcoord $dlevel $dlevel $lineno]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1204 set mainline($id) [list $x $y1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1205 set mainlinearrow($id) none
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1206 set lastuse($id) $lineno
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1207 set displist [lreplace $displist $dlevel $dlevel $id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1208 set onscreen($id) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1209 set xspc1([expr {$lineno + 1}]) $xspc1($lineno)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1210 return $dlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1211 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1212
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1213 # update displist
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1214 set displist [lreplace $displist $olddlevel $olddlevel]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1215 set j $olddlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1216 foreach p $currentparents {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1217 set lastuse($p) $lineno
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1218 if {$onscreen($p) == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1219 set displist [linsert $displist $j $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1220 set onscreen($p) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1221 incr j
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1222 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1223 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1224 if {$onscreen($id) == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1225 lappend displist $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1226 set onscreen($id) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1227 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1228
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1229 # remove the null entry if present
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1230 set nullentry [lsearch -exact $displist {}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1231 if {$nullentry >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1232 set displist [lreplace $displist $nullentry $nullentry]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1233 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1234
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1235 # bring back the ones we need now (if we did it earlier
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1236 # it would change displist and invalidate olddlevel)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1237 foreach pi $reins {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1238 # test again in case of duplicates in reins
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1239 set p [lindex $pi 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1240 if {$onscreen($p) < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1241 set onscreen($p) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1242 set lastuse($p) $lineno
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1243 set displist [linsert $displist [lindex $pi 1] $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1244 incr nhyperspace -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1245 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1246 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1247
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1248 set lastuse($id) $lineno
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1249
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1250 # see if we need to make any lines jump off into hyperspace
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1251 set displ [llength $displist]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1252 if {$displ > $maxwidth} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1253 set ages {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1254 foreach x $displist {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1255 lappend ages [list $lastuse($x) $x]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1256 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1257 set ages [lsort -integer -index 0 $ages]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1258 set k 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1259 while {$displ > $maxwidth} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1260 set use [lindex $ages $k 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1261 set victim [lindex $ages $k 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1262 if {$use >= $lineno - 5} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1263 incr k
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1264 if {[lsearch -exact $nohs $victim] >= 0} continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1265 set i [lsearch -exact $displist $victim]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1266 set displist [lreplace $displist $i $i]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1267 set onscreen($victim) -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1268 incr nhyperspace
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1269 incr displ -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1270 if {$i < $nullentry} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1271 incr nullentry -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1272 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1273 set x [lindex $mainline($victim) end-1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1274 lappend mainline($victim) $x $y1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1275 set line [trimdiagend $mainline($victim)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1276 set arrow "last"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1277 if {$mainlinearrow($victim) ne "none"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1278 set line [trimdiagstart $line]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1279 set arrow "both"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1280 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1281 lappend sidelines($victim) [list $line 1 $arrow]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1282 unset mainline($victim)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1283 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1284 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1285
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1286 set dlevel [lsearch -exact $displist $id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1287
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1288 # If we are reducing, put in a null entry
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1289 if {$displ < $oldnlines} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1290 # does the next line look like a merge?
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1291 # i.e. does it have > 1 new parent?
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1292 if {$nnewparents($id) > 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1293 set i [expr {$dlevel + 1}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1294 } elseif {$nnewparents([lindex $olddisplist $olddlevel]) == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1295 set i $olddlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1296 if {$nullentry >= 0 && $nullentry < $i} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1297 incr i -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1298 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1299 } elseif {$nullentry >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1300 set i $nullentry
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1301 while {$i < $displ
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1302 && [lindex $olddisplist $i] == [lindex $displist $i]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1303 incr i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1304 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1305 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1306 set i $olddlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1307 if {$dlevel >= $i} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1308 incr i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1309 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1310 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1311 if {$i < $displ} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1312 set displist [linsert $displist $i {}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1313 incr displ
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1314 if {$dlevel >= $i} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1315 incr dlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1316 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1317 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1318 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1319
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1320 # decide on the line spacing for the next line
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1321 set lj [expr {$lineno + 1}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1322 set maxw [expr {$maxgraphpct * $geometry(canv1) / 100}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1323 if {$displ <= 1 \|\| $canvx0 + $displ * $xspc2 <= $maxw} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1324 set xspc1($lj) $xspc2
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1325 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1326 set xspc1($lj) [expr {($maxw - $canvx0 - $xspc2) / ($displ - 1)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1327 if {$xspc1($lj) < $lthickness} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1328 set xspc1($lj) $lthickness
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1329 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1330 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1331
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1332 foreach idi $reins {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1333 set id [lindex $idi 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1334 set j [lsearch -exact $displist $id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1335 set xj [xcoord $j $dlevel $lj]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1336 set mainline($id) [list $xj $y2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1337 set mainlinearrow($id) first
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1338 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1339
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1340 set i -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1341 foreach id $olddisplist {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1342 incr i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1343 if {$id == {}} continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1344 if {$onscreen($id) <= 0} continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1345 set xi [xcoord $i $olddlevel $lineno]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1346 if {$i == $olddlevel} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1347 foreach p $currentparents {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1348 set j [lsearch -exact $displist $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1349 set coords [list $xi $y1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1350 set xj [xcoord $j $dlevel $lj]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1351 if {$xj < $xi - $linespc} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1352 lappend coords [expr {$xj + $linespc}] $y1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1353 notecrossings $p $j $i [expr {$j + 1}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1354 } elseif {$xj > $xi + $linespc} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1355 lappend coords [expr {$xj - $linespc}] $y1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1356 notecrossings $p $i $j [expr {$j - 1}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1357 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1358 if {[lsearch -exact $dupparents $p] >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1359 # draw a double-width line to indicate the doubled parent
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1360 lappend coords $xj $y2
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1361 lappend sidelines($p) [list $coords 2 none]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1362 if {![info exists mainline($p)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1363 set mainline($p) [list $xj $y2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1364 set mainlinearrow($p) none
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1365 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1366 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1367 # normal case, no parent duplicated
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1368 set yb $y2
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1369 set dx [expr {abs($xi - $xj)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1370 if {0 && $dx < $linespc} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1371 set yb [expr {$y1 + $dx}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1372 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1373 if {![info exists mainline($p)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1374 if {$xi != $xj} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1375 lappend coords $xj $yb
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1376 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1377 set mainline($p) $coords
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1378 set mainlinearrow($p) none
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1379 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1380 lappend coords $xj $yb
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1381 if {$yb < $y2} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1382 lappend coords $xj $y2
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1383 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1384 lappend sidelines($p) [list $coords 1 none]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1385 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1386 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1387 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1388 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1389 set j $i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1390 if {[lindex $displist $i] != $id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1391 set j [lsearch -exact $displist $id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1392 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1393 if {$j != $i \|\| $xspc1($lineno) != $xspc1($lj)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1394 \|\| ($olddlevel < $i && $i < $dlevel)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1395 \|\| ($dlevel < $i && $i < $olddlevel)} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1396 set xj [xcoord $j $dlevel $lj]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1397 lappend mainline($id) $xi $y1 $xj $y2
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1398 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1399 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1400 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1401 return $dlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1402 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1403
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1404 # search for x in a list of lists
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1405 proc llsearch {llist x} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1406 set i 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1407 foreach l $llist {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1408 if {$l == $x \|\| [lsearch -exact $l $x] >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1409 return $i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1410 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1411 incr i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1412 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1413 return -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1414 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1415
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1416 proc drawmore {reading} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1417 global displayorder numcommits ncmupdate nextupdate
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1418 global stopped nhyperspace parents commitlisted
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1419 global maxwidth onscreen displist currentparents olddlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1420
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1421 set n [llength $displayorder]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1422 while {$numcommits < $n} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1423 set id [lindex $displayorder $numcommits]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1424 set ctxend [expr {$numcommits + 10}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1425 if {!$reading && $ctxend > $n} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1426 set ctxend $n
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1427 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1428 set dlist {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1429 if {$numcommits > 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1430 set dlist [lreplace $displist $olddlevel $olddlevel]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1431 set i $olddlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1432 foreach p $currentparents {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1433 if {$onscreen($p) == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1434 set dlist [linsert $dlist $i $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1435 incr i
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1436 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1437 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1438 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1439 set nohs {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1440 set reins {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1441 set isfat [expr {[llength $dlist] > $maxwidth}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1442 if {$nhyperspace > 0 \|\| $isfat} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1443 if {$ctxend > $n} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1444 # work out what to bring back and
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1445 # what we want to don't want to send into hyperspace
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1446 set room 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1447 for {set k $numcommits} {$k < $ctxend} {incr k} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1448 set x [lindex $displayorder $k]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1449 set i [llsearch $dlist $x]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1450 if {$i < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1451 set i [llength $dlist]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1452 lappend dlist $x
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1453 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1454 if {[lsearch -exact $nohs $x] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1455 lappend nohs $x
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1456 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1457 if {$reins eq {} && $onscreen($x) < 0 && $room} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1458 set reins [list $x $i]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1459 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1460 set newp {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1461 if {[info exists commitlisted($x)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1462 set right 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1463 foreach p $parents($x) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1464 if {[llsearch $dlist $p] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1465 lappend newp $p
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1466 if {[lsearch -exact $nohs $p] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1467 lappend nohs $p
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1468 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1469 if {$reins eq {} && $onscreen($p) < 0 && $room} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1470 set reins [list $p [expr {$i + $right}]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1471 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1472 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1473 set right 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1474 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1475 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1476 set l [lindex $dlist $i]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1477 if {[llength $l] == 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1478 set l $newp
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1479 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1480 set j [lsearch -exact $l $x]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1481 set l [concat [lreplace $l $j $j] $newp]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1482 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1483 set dlist [lreplace $dlist $i $i $l]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1484 if {$room && $isfat && [llength $newp] <= 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1485 set room 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1486 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1487 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1488 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1489
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1490 set dlevel [drawslants $id $reins $nohs]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1491 drawcommitline $dlevel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1492 if {[clock clicks -milliseconds] >= $nextupdate
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1493 && $numcommits >= $ncmupdate} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1494 doupdate $reading
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1495 if {$stopped} break
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1496 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1497 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1498 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1499
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1500 # level here is an index in todo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1501 proc updatetodo {level noshortcut} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1502 global ncleft todo nnewparents
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1503 global commitlisted parents onscreen
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1504
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1505 set id [lindex $todo $level]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1506 set olds {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1507 if {[info exists commitlisted($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1508 foreach p $parents($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1509 if {[lsearch -exact $olds $p] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1510 lappend olds $p
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1511 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1512 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1513 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1514 if {!$noshortcut && [llength $olds] == 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1515 set p [lindex $olds 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1516 if {$ncleft($p) == 1 && [lsearch -exact $todo $p] < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1517 set ncleft($p) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1518 set todo [lreplace $todo $level $level $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1519 set onscreen($p) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1520 set nnewparents($id) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1521 return 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1522 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1523 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1524
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1525 set todo [lreplace $todo $level $level]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1526 set i $level
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1527 set n 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1528 foreach p $olds {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1529 incr ncleft($p) -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1530 set k [lsearch -exact $todo $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1531 if {$k < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1532 set todo [linsert $todo $i $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1533 set onscreen($p) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1534 incr i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1535 incr n
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1536 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1537 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1538 set nnewparents($id) $n
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1539
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1540 return 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1541 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1542
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1543 proc decidenext {{noread 0}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1544 global ncleft todo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1545 global datemode cdate
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1546 global commitinfo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1547
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1548 # choose which one to do next time around
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1549 set todol [llength $todo]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1550 set level -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1551 set latest {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1552 for {set k $todol} {[incr k -1] >= 0} {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1553 set p [lindex $todo $k]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1554 if {$ncleft($p) == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1555 if {$datemode} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1556 if {![info exists commitinfo($p)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1557 if {$noread} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1558 return {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1559 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1560 readcommit $p
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1561 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1562 if {$latest == {} \|\| $cdate($p) > $latest} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1563 set level $k
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1564 set latest $cdate($p)
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1565 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1566 } else {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1567 set level $k
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1568 break
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1569 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1570 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1571 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1572 if {$level < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1573 if {$todo != {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1574 puts "ERROR: none of the pending commits can be done yet:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1575 foreach p $todo {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1576 puts " $p ($ncleft($p))"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1577 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1578 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1579 return -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1580 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1581
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1582 return $level
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1583 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1584
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1585 proc drawcommit {id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1586 global phase todo nchildren datemode nextupdate
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1587 global numcommits ncmupdate displayorder todo onscreen
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1588
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1589 if {$phase != "incrdraw"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1590 set phase incrdraw
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1591 set displayorder {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1592 set todo {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1593 initgraph
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1594 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1595 if {$nchildren($id) == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1596 lappend todo $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1597 set onscreen($id) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1598 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1599 set level [decidenext 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1600 if {$level == {} \|\| $id != [lindex $todo $level]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1601 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1602 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1603 while 1 {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1604 lappend displayorder [lindex $todo $level]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1605 if {[updatetodo $level $datemode]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1606 set level [decidenext 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1607 if {$level == {}} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1608 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1609 set id [lindex $todo $level]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1610 if {![info exists commitlisted($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1611 break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1612 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1613 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1614 drawmore 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1615 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1616
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1617 proc finishcommits {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1618 global phase
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1619 global canv mainfont ctext maincursor textcursor
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1620
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1621 if {$phase != "incrdraw"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1622 $canv delete all
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1623 $canv create text 3 3 -anchor nw -text "No commits selected" \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1624 -font $mainfont -tags textitems
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1625 set phase {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1626 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1627 drawrest
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1628 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1629 . config -cursor $maincursor
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1630 settextcursor $textcursor
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1631 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1632
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1633 # Don't change the text pane cursor if it is currently the hand cursor,
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1634 # showing that we are over a sha1 ID link.
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1635 proc settextcursor {c} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1636 global ctext curtextcursor
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1637
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1638 if {[$ctext cget -cursor] == $curtextcursor} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1639 $ctext config -cursor $c
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1640 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1641 set curtextcursor $c
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1642 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1643
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1644 proc drawgraph {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1645 global nextupdate startmsecs ncmupdate
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1646 global displayorder onscreen
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1647
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1648 if {$displayorder == {}} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1649 set startmsecs [clock clicks -milliseconds]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1650 set nextupdate [expr $startmsecs + 100]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1651 set ncmupdate 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1652 initgraph
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1653 foreach id $displayorder {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1654 set onscreen($id) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1655 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1656 drawmore 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1657 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1658
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1659 proc drawrest {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1660 global phase stopped redisplaying selectedline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1661 global datemode todo displayorder
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1662 global numcommits ncmupdate
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1663 global nextupdate startmsecs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1664
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1665 set level [decidenext]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1666 if {$level >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1667 set phase drawgraph
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1668 while 1 {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1669 lappend displayorder [lindex $todo $level]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1670 set hard [updatetodo $level $datemode]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1671 if {$hard} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1672 set level [decidenext]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1673 if {$level < 0} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1674 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1675 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1676 drawmore 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1677 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1678 set phase {}
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1679 set drawmsecs [expr [clock clicks -milliseconds] - $startmsecs]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1680 #puts "overall $drawmsecs ms for $numcommits commits"
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1681 if {$redisplaying} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1682 if {$stopped == 0 && [info exists selectedline]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1683 selectline $selectedline 0
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1684 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1685 if {$stopped == 1} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1686 set stopped 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1687 after idle drawgraph
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1688 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1689 set redisplaying 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1690 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1691 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1692 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1693
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1694 proc findmatches {f} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1695 global findtype foundstring foundstrlen
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1696 if {$findtype == "Regexp"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1697 set matches [regexp -indices -all -inline $foundstring $f]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1698 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1699 if {$findtype == "IgnCase"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1700 set str [string tolower $f]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1701 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1702 set str $f
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1703 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1704 set matches {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1705 set i 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1706 while {[set j [string first $foundstring $str $i]] >= 0} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1707 lappend matches [list $j [expr $j+$foundstrlen-1]]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1708 set i [expr $j + $foundstrlen]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1709 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1710 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1711 return $matches
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1712 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1713
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1714 proc dofind {} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1715 global findtype findloc findstring markedmatches commitinfo
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1716 global numcommits lineid linehtag linentag linedtag
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1717 global mainfont namefont canv canv2 canv3 selectedline
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1718 global matchinglines foundstring foundstrlen
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1719
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1720 stopfindproc
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1721 unmarkmatches
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1722 focus .
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1723 set matchinglines {}
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1724 if {$findloc == "Pickaxe"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1725 findpatches
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1726 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1727 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1728 if {$findtype == "IgnCase"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1729 set foundstring [string tolower $findstring]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1730 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1731 set foundstring $findstring
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1732 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1733 set foundstrlen [string length $findstring]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1734 if {$foundstrlen == 0} return
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1735 if {$findloc == "Files"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1736 findfiles
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1737 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1738 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1739 if {![info exists selectedline]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1740 set oldsel -1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1741 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1742 set oldsel $selectedline
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1743 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1744 set didsel 0
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1745 set fldtypes {Headline Author Date Committer CDate Comment}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1746 for {set l 0} {$l < $numcommits} {incr l} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1747 set id $lineid($l)
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1748 set info $commitinfo($id)
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1749 set doesmatch 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1750 foreach f $info ty $fldtypes {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1751 if {$findloc != "All fields" && $findloc != $ty} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1752 continue
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1753 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1754 set matches [findmatches $f]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1755 if {$matches == {}} continue
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1756 set doesmatch 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1757 if {$ty == "Headline"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1758 markmatches $canv $l $f $linehtag($l) $matches $mainfont
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1759 } elseif {$ty == "Author"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1760 markmatches $canv2 $l $f $linentag($l) $matches $namefont
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1761 } elseif {$ty == "Date"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1762 markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1763 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1764 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1765 if {$doesmatch} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1766 lappend matchinglines $l
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1767 if {!$didsel && $l > $oldsel} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1768 findselectline $l
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1769 set didsel 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1770 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1771 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1772 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1773 if {$matchinglines == {}} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1774 bell
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1775 } elseif {!$didsel} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1776 findselectline [lindex $matchinglines 0]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1777 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1778 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1779
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1780 proc findselectline {l} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1781 global findloc commentend ctext
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1782 selectline $l 1
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1783 if {$findloc == "All fields" \|\| $findloc == "Comments"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1784 # highlight the matches in the comments
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1785 set f [$ctext get 1.0 $commentend]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1786 set matches [findmatches $f]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1787 foreach match $matches {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1788 set start [lindex $match 0]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1789 set end [expr [lindex $match 1] + 1]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1790 $ctext tag add found "1.0 + $start c" "1.0 + $end c"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1791 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1792 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1793 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1794
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1795 proc findnext {restart} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1796 global matchinglines selectedline
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1797 if {![info exists matchinglines]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1798 if {$restart} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1799 dofind
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1800 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1801 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1802 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1803 if {![info exists selectedline]} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1804 foreach l $matchinglines {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1805 if {$l > $selectedline} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1806 findselectline $l
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1807 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1808 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1809 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1810 bell
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1811 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1812
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1813 proc findprev {} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1814 global matchinglines selectedline
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1815 if {![info exists matchinglines]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1816 dofind
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1817 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1818 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1819 if {![info exists selectedline]} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1820 set prev {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1821 foreach l $matchinglines {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1822 if {$l >= $selectedline} break
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1823 set prev $l
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1824 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1825 if {$prev != {}} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1826 findselectline $prev
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1827 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1828 bell
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1829 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1830 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	1831
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1832 proc findlocchange {name ix op} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1833 global findloc findtype findtypemenu
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1834 if {$findloc == "Pickaxe"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1835 set findtype Exact
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1836 set state disabled
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1837 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1838 set state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1839 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1840 $findtypemenu entryconf 1 -state $state
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1841 $findtypemenu entryconf 2 -state $state
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1842 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1843
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1844 proc stopfindproc {{done 0}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1845 global findprocpid findprocfile findids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1846 global ctext findoldcursor phase maincursor textcursor
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1847 global findinprogress
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1848
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1849 catch {unset findids}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1850 if {[info exists findprocpid]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1851 if {!$done} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1852 catch {exec kill $findprocpid}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1853 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1854 catch {close $findprocfile}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1855 unset findprocpid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1856 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1857 if {[info exists findinprogress]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1858 unset findinprogress
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1859 if {$phase != "incrdraw"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1860 . config -cursor $maincursor
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1861 settextcursor $textcursor
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1862 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1863 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1864 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1865
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1866 proc findpatches {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1867 global findstring selectedline numcommits
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1868 global findprocpid findprocfile
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1869 global finddidsel ctext lineid findinprogress
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1870 global findinsertpos
4686 39001f4b7d99 hgk: Use $HG instead of hg (see 849f011dbf79) Thomas Arendsen Hein <thomas@intevation.de> parents: 4502 diff changeset	1871 global env
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1872
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1873 if {$numcommits == 0} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1874
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1875 # make a list of all the ids to search, starting at the one
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1876 # after the selected line (if any)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1877 if {[info exists selectedline]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1878 set l $selectedline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1879 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1880 set l -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1881 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1882 set inputids {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1883 for {set i 0} {$i < $numcommits} {incr i} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1884 if {[incr l] >= $numcommits} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1885 set l 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1886 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1887 append inputids $lineid($l) "\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1888 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1889
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1890 if {[catch {
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	1891 set f [open [list \| $env(HG) --config ui.report_untrusted=false debug-diff-tree --stdin -s -r -S$findstring << $inputids] r]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1892 } err]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1893 error_popup "Error starting search process: $err"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1894 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1895 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1896
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1897 set findinsertpos end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1898 set findprocfile $f
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1899 set findprocpid [pid $f]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1900 fconfigure $f -blocking 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1901 fileevent $f readable readfindproc
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1902 set finddidsel 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1903 . config -cursor watch
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1904 settextcursor watch
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1905 set findinprogress 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1906 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1907
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1908 proc readfindproc {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1909 global findprocfile finddidsel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1910 global idline matchinglines findinsertpos
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1911
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1912 set n [gets $findprocfile line]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1913 if {$n < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1914 if {[eof $findprocfile]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1915 stopfindproc 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1916 if {!$finddidsel} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1917 bell
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1918 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1919 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1920 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1921 }
3056 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 2297 diff changeset	1922 if {![regexp {^[0-9a-f]{12}} $line id]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1923 error_popup "Can't parse git-diff-tree output: $line"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1924 stopfindproc
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1925 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1926 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1927 if {![info exists idline($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1928 puts stderr "spurious id: $id"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1929 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1930 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1931 set l $idline($id)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1932 insertmatch $l $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1933 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1934
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1935 proc insertmatch {l id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1936 global matchinglines findinsertpos finddidsel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1937
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1938 if {$findinsertpos == "end"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1939 if {$matchinglines != {} && $l < [lindex $matchinglines 0]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1940 set matchinglines [linsert $matchinglines 0 $l]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1941 set findinsertpos 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1942 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1943 lappend matchinglines $l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1944 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1945 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1946 set matchinglines [linsert $matchinglines $findinsertpos $l]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1947 incr findinsertpos
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1948 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1949 markheadline $l $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1950 if {!$finddidsel} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1951 findselectline $l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1952 set finddidsel 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1953 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1954 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1955
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1956 proc findfiles {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1957 global selectedline numcommits lineid ctext
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1958 global ffileline finddidsel parents nparents
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1959 global findinprogress findstartline findinsertpos
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1960 global treediffs fdiffids fdiffsneeded fdiffpos
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1961 global findmergefiles
4686 39001f4b7d99 hgk: Use $HG instead of hg (see 849f011dbf79) Thomas Arendsen Hein <thomas@intevation.de> parents: 4502 diff changeset	1962 global env
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1963
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1964 if {$numcommits == 0} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1965
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1966 if {[info exists selectedline]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1967 set l [expr {$selectedline + 1}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1968 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1969 set l 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1970 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1971 set ffileline $l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1972 set findstartline $l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1973 set diffsneeded {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1974 set fdiffsneeded {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1975 while 1 {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1976 set id $lineid($l)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1977 if {$findmergefiles \|\| $nparents($id) == 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1978 foreach p $parents($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1979 if {![info exists treediffs([list $id $p])]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1980 append diffsneeded "$id $p\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1981 lappend fdiffsneeded [list $id $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1982 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1983 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1984 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1985 if {[incr l] >= $numcommits} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1986 set l 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1987 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1988 if {$l == $findstartline} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1989 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1990
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1991 # start off a git-diff-tree process if needed
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1992 if {$diffsneeded ne {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1993 if {[catch {
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	1994 set df [open [list \| $env(HG) --config ui.report_untrusted=false debug-diff-tree -r --stdin << $diffsneeded] r]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1995 } err ]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1996 error_popup "Error starting search process: $err"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1997 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1998 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	1999 catch {unset fdiffids}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2000 set fdiffpos 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2001 fconfigure $df -blocking 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2002 fileevent $df readable [list readfilediffs $df]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2003 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2004
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2005 set finddidsel 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2006 set findinsertpos end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2007 set id $lineid($l)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2008 set p [lindex $parents($id) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2009 . config -cursor watch
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2010 settextcursor watch
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2011 set findinprogress 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2012 findcont [list $id $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2013 update
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2014 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2015
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2016 proc readfilediffs {df} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2017 global findids fdiffids fdiffs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2018
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2019 set n [gets $df line]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2020 if {$n < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2021 if {[eof $df]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2022 donefilediff
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2023 if {[catch {close $df} err]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2024 stopfindproc
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2025 bell
1278 6a0d373d3126 hgit -> hgk.py mpm@selenic.com parents: 1240 diff changeset	2026 error_popup "Error in hg debug-diff-tree: $err"
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2027 } elseif {[info exists findids]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2028 set ids $findids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2029 stopfindproc
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2030 bell
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2031 error_popup "Couldn't find diffs for {$ids}"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2032 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2033 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2034 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2035 }
3056 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 2297 diff changeset	2036 if {[regexp {^([0-9a-f]{12}) $from ([0-9a-f]{12})$} $line match id p]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2037 # start of a new string of diffs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2038 donefilediff
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2039 set fdiffids [list $id $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2040 set fdiffs {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2041 } elseif {[string match ":*" $line]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2042 lappend fdiffs [lindex $line 5]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2043 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2044 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2045
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2046 proc donefilediff {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2047 global fdiffids fdiffs treediffs findids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2048 global fdiffsneeded fdiffpos
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2049
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2050 if {[info exists fdiffids]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2051 while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2052 && $fdiffpos < [llength $fdiffsneeded]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2053 # git-diff-tree doesn't output anything for a commit
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2054 # which doesn't change anything
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2055 set nullids [lindex $fdiffsneeded $fdiffpos]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2056 set treediffs($nullids) {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2057 if {[info exists findids] && $nullids eq $findids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2058 unset findids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2059 findcont $nullids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2060 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2061 incr fdiffpos
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2062 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2063 incr fdiffpos
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2064
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2065 if {![info exists treediffs($fdiffids)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2066 set treediffs($fdiffids) $fdiffs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2067 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2068 if {[info exists findids] && $fdiffids eq $findids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2069 unset findids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2070 findcont $fdiffids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2071 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2072 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2073 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2074
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2075 proc findcont {ids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2076 global findids treediffs parents nparents
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2077 global ffileline findstartline finddidsel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2078 global lineid numcommits matchinglines findinprogress
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2079 global findmergefiles
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2080
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2081 set id [lindex $ids 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2082 set p [lindex $ids 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2083 set pi [lsearch -exact $parents($id) $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2084 set l $ffileline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2085 while 1 {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2086 if {$findmergefiles \|\| $nparents($id) == 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2087 if {![info exists treediffs($ids)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2088 set findids $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2089 set ffileline $l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2090 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2091 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2092 set doesmatch 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2093 foreach f $treediffs($ids) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2094 set x [findmatches $f]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2095 if {$x != {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2096 set doesmatch 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2097 break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2098 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2099 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2100 if {$doesmatch} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2101 insertmatch $l $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2102 set pi $nparents($id)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2103 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2104 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2105 set pi $nparents($id)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2106 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2107 if {[incr pi] >= $nparents($id)} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2108 set pi 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2109 if {[incr l] >= $numcommits} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2110 set l 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2111 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2112 if {$l == $findstartline} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2113 set id $lineid($l)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2114 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2115 set p [lindex $parents($id) $pi]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2116 set ids [list $id $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2117 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2118 stopfindproc
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2119 if {!$finddidsel} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2120 bell
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2121 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2122 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2123
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2124 # mark a commit as matching by putting a yellow background
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2125 # behind the headline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2126 proc markheadline {l id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2127 global canv mainfont linehtag commitinfo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2128
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2129 set bbox [$canv bbox $linehtag($l)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2130 set t [$canv create rect $bbox -outline {} -tags matches -fill yellow]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2131 $canv lower $t
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2132 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2133
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2134 # mark the bits of a headline, author or date that match a find string
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2135 proc markmatches {canv l str tag matches font} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2136 set bbox [$canv bbox $tag]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2137 set x0 [lindex $bbox 0]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2138 set y0 [lindex $bbox 1]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2139 set y1 [lindex $bbox 3]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2140 foreach match $matches {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2141 set start [lindex $match 0]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2142 set end [lindex $match 1]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2143 if {$start > $end} continue
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2144 set xoff [font measure $font [string range $str 0 [expr $start-1]]]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2145 set xlen [font measure $font [string range $str 0 [expr $end]]]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2146 set t [$canv create rect [expr $x0+$xoff] $y0 [expr $x0+$xlen+2] $y1 \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2147 -outline {} -tags matches -fill yellow]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2148 $canv lower $t
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2149 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2150 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2151
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2152 proc unmarkmatches {} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2153 global matchinglines findids
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2154 allcanvs delete matches
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2155 catch {unset matchinglines}
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2156 catch {unset findids}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2157 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2158
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2159 proc selcanvline {w x y} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2160 global canv canvy0 ctext linespc
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2161 global lineid linehtag linentag linedtag rowtextx
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2162 set ymax [lindex [$canv cget -scrollregion] 3]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2163 if {$ymax == {}} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2164 set yfrac [lindex [$canv yview] 0]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2165 set y [expr {$y + $yfrac * $ymax}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2166 set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2167 if {$l < 0} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2168 set l 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2169 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2170 if {$w eq $canv} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2171 if {![info exists rowtextx($l)] \|\| $x < $rowtextx($l)} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2172 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2173 unmarkmatches
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2174 selectline $l 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2175 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2176
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2177 proc commit_descriptor {p} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2178 global commitinfo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2179 set l "..."
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2180 if {[info exists commitinfo($p)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2181 set l [lindex $commitinfo($p) 0]
3089 d0fcce3728d1 hgk: add revision numbers Brendan Cully <brendan@kublai.com> parents: 3056 diff changeset	2182 set r [lindex $commitinfo($p) 6]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2183 }
3089 d0fcce3728d1 hgk: add revision numbers Brendan Cully <brendan@kublai.com> parents: 3056 diff changeset	2184 return "$r:$p ($l)"
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2185 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2186
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2187 # append some text to the ctext widget, and make any SHA1 ID
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2188 # that we know about be a clickable link.
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2189 proc appendwithlinks {text} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2190 global ctext idline linknum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2191
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2192 set start [$ctext index "end - 1c"]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2193 $ctext insert end $text
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2194 $ctext insert end "\n"
3056 3dab573a4330 hgk: use short changeset hashes TK Soh <teekaysoh@yahoo.com> parents: 2297 diff changeset	2195 set links [regexp -indices -all -inline {[0-9a-f]{12}} $text]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2196 foreach l $links {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2197 set s [lindex $l 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2198 set e [lindex $l 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2199 set linkid [string range $text $s $e]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2200 if {![info exists idline($linkid)]} continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2201 incr e
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2202 $ctext tag add link "$start + $s c" "$start + $e c"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2203 $ctext tag add link$linknum "$start + $s c" "$start + $e c"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2204 $ctext tag bind link$linknum <1> [list selectline $idline($linkid) 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2205 incr linknum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2206 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2207 $ctext tag conf link -foreground blue -underline 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2208 $ctext tag bind link <Enter> { %W configure -cursor hand2 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2209 $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2210 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2211
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2212 proc selectline {l isnew} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2213 global canv canv2 canv3 ctext commitinfo selectedline
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2214 global lineid linehtag linentag linedtag
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2215 global canvy0 linespc parents nparents children
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2216 global cflist currentid sha1entry
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2217 global commentend idtags idline linknum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2218
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2219 $canv delete hover
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2220 normalline
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2221 if {![info exists lineid($l)] \|\| ![info exists linehtag($l)]} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2222 $canv delete secsel
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2223 set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2224 -tags secsel -fill [$canv cget -selectbackground]]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2225 $canv lower $t
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2226 $canv2 delete secsel
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2227 set t [eval $canv2 create rect [$canv2 bbox $linentag($l)] -outline {{}} \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2228 -tags secsel -fill [$canv2 cget -selectbackground]]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2229 $canv2 lower $t
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2230 $canv3 delete secsel
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2231 set t [eval $canv3 create rect [$canv3 bbox $linedtag($l)] -outline {{}} \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2232 -tags secsel -fill [$canv3 cget -selectbackground]]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2233 $canv3 lower $t
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2234 set y [expr {$canvy0 + $l * $linespc}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2235 set ymax [lindex [$canv cget -scrollregion] 3]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2236 set ytop [expr {$y - $linespc - 1}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2237 set ybot [expr {$y + $linespc + 1}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2238 set wnow [$canv yview]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2239 set wtop [expr [lindex $wnow 0] * $ymax]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2240 set wbot [expr [lindex $wnow 1] * $ymax]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2241 set wh [expr {$wbot - $wtop}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2242 set newtop $wtop
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2243 if {$ytop < $wtop} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2244 if {$ybot < $wtop} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2245 set newtop [expr {$y - $wh / 2.0}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2246 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2247 set newtop $ytop
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2248 if {$newtop > $wtop - $linespc} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2249 set newtop [expr {$wtop - $linespc}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2250 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2251 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2252 } elseif {$ybot > $wbot} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2253 if {$ytop > $wbot} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2254 set newtop [expr {$y - $wh / 2.0}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2255 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2256 set newtop [expr {$ybot - $wh}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2257 if {$newtop < $wtop + $linespc} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2258 set newtop [expr {$wtop + $linespc}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2259 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2260 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2261 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2262 if {$newtop != $wtop} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2263 if {$newtop < 0} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2264 set newtop 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2265 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2266 allcanvs yview moveto [expr $newtop * 1.0 / $ymax]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2267 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2268
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2269 if {$isnew} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2270 addtohistory [list selectline $l 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2271 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2272
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2273 set selectedline $l
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2274
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2275 set id $lineid($l)
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2276 set currentid $id
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2277 $sha1entry delete 0 end
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2278 $sha1entry insert 0 $id
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2279 $sha1entry selection from 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2280 $sha1entry selection to end
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2281
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2282 $ctext conf -state normal
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2283 $ctext delete 0.0 end
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2284 set linknum 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2285 $ctext mark set fmark.0 0.0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2286 $ctext mark gravity fmark.0 left
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2287 set info $commitinfo($id)
3089 d0fcce3728d1 hgk: add revision numbers Brendan Cully <brendan@kublai.com> parents: 3056 diff changeset	2288 $ctext insert end "Revision: [lindex $info 6]\n"
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2289 $ctext insert end "Author: [lindex $info 1] [lindex $info 2]\n"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2290 $ctext insert end "Committer: [lindex $info 3] [lindex $info 4]\n"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2291 if {[info exists idtags($id)]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2292 $ctext insert end "Tags:"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2293 foreach tag $idtags($id) {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2294 $ctext insert end " $tag"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2295 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2296 $ctext insert end "\n"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2297 }
1308 2073e5a71008 Cleanup of tabs and trailing spaces. Thomas Arendsen Hein <thomas@intevation.de> parents: 1278 diff changeset	2298
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2299 set comment {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2300 if {[info exists parents($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2301 foreach p $parents($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2302 append comment "Parent: [commit_descriptor $p]\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2303 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2304 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2305 if {[info exists children($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2306 foreach c $children($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2307 append comment "Child: [commit_descriptor $c]\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2308 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2309 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2310 append comment "\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2311 append comment [lindex $info 5]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2312
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2313 # make anything that looks like a SHA1 ID be a clickable link
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2314 appendwithlinks $comment
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2315
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2316 $ctext tag delete Comments
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2317 $ctext tag remove found 1.0 end
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2318 $ctext conf -state disabled
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2319 set commentend [$ctext index "end - 1c"]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2320
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2321 $cflist delete 0 end
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2322 $cflist insert end "Comments"
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2323 if {$nparents($id) == 1} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2324 startdiff [concat $id $parents($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2325 } elseif {$nparents($id) > 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2326 mergediff $id
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2327 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2328 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2329
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2330 proc selnextline {dir} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2331 global selectedline
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2332 if {![info exists selectedline]} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2333 set l [expr $selectedline + $dir]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2334 unmarkmatches
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2335 selectline $l 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2336 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2337
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2338 proc unselectline {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2339 global selectedline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2340
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2341 catch {unset selectedline}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2342 allcanvs delete secsel
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2343 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2344
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2345 proc addtohistory {cmd} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2346 global history historyindex
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2347
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2348 if {$historyindex > 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2349 && [lindex $history [expr {$historyindex - 1}]] == $cmd} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2350 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2351 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2352
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2353 if {$historyindex < [llength $history]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2354 set history [lreplace $history $historyindex end $cmd]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2355 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2356 lappend history $cmd
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2357 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2358 incr historyindex
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2359 if {$historyindex > 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2360 .ctop.top.bar.leftbut conf -state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2361 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2362 .ctop.top.bar.leftbut conf -state disabled
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2363 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2364 .ctop.top.bar.rightbut conf -state disabled
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2365 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2366
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2367 proc goback {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2368 global history historyindex
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2369
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2370 if {$historyindex > 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2371 incr historyindex -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2372 set cmd [lindex $history [expr {$historyindex - 1}]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2373 eval $cmd
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2374 .ctop.top.bar.rightbut conf -state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2375 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2376 if {$historyindex <= 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2377 .ctop.top.bar.leftbut conf -state disabled
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2378 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2379 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2380
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2381 proc goforw {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2382 global history historyindex
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2383
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2384 if {$historyindex < [llength $history]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2385 set cmd [lindex $history $historyindex]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2386 incr historyindex
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2387 eval $cmd
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2388 .ctop.top.bar.leftbut conf -state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2389 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2390 if {$historyindex >= [llength $history]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2391 .ctop.top.bar.rightbut conf -state disabled
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2392 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2393 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2394
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2395 proc mergediff {id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2396 global parents diffmergeid diffmergegca mergefilelist diffpindex
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2397
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2398 set diffmergeid $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2399 set diffpindex -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2400 set diffmergegca [findgca $parents($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2401 if {[info exists mergefilelist($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2402 if {$mergefilelist($id) ne {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2403 showmergediff
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2404 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2405 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2406 contmergediff {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2407 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2408 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2409
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2410 proc findgca {ids} {
4686 39001f4b7d99 hgk: Use $HG instead of hg (see 849f011dbf79) Thomas Arendsen Hein <thomas@intevation.de> parents: 4502 diff changeset	2411 global env
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2412 set gca {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2413 foreach id $ids {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2414 if {$gca eq {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2415 set gca $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2416 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2417 if {[catch {
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	2418 set gca [exec $env(HG) --config ui.report_untrusted=false debug-merge-base $gca $id]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2419 } err]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2420 return {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2421 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2422 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2423 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2424 return $gca
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2425 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2426
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2427 proc contmergediff {ids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2428 global diffmergeid diffpindex parents nparents diffmergegca
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2429 global treediffs mergefilelist diffids treepending
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2430
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2431 # diff the child against each of the parents, and diff
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2432 # each of the parents against the GCA.
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2433 while 1 {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2434 if {[lindex $ids 0] == $diffmergeid && $diffmergegca ne {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2435 set ids [list [lindex $ids 1] $diffmergegca]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2436 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2437 if {[incr diffpindex] >= $nparents($diffmergeid)} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2438 set p [lindex $parents($diffmergeid) $diffpindex]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2439 set ids [list $diffmergeid $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2440 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2441 if {![info exists treediffs($ids)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2442 set diffids $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2443 if {![info exists treepending]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2444 gettreediffs $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2445 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2446 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2447 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2448 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2449
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2450 # If a file in some parent is different from the child and also
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2451 # different from the GCA, then it's interesting.
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2452 # If we don't have a GCA, then a file is interesting if it is
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2453 # different from the child in all the parents.
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2454 if {$diffmergegca ne {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2455 set files {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2456 foreach p $parents($diffmergeid) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2457 set gcadiffs $treediffs([list $p $diffmergegca])
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2458 foreach f $treediffs([list $diffmergeid $p]) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2459 if {[lsearch -exact $files $f] < 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2460 && [lsearch -exact $gcadiffs $f] >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2461 lappend files $f
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2462 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2463 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2464 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2465 set files [lsort $files]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2466 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2467 set p [lindex $parents($diffmergeid) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2468 set files $treediffs([list $diffmergeid $p])
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2469 for {set i 1} {$i < $nparents($diffmergeid) && $files ne {}} {incr i} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2470 set p [lindex $parents($diffmergeid) $i]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2471 set df $treediffs([list $diffmergeid $p])
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2472 set nf {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2473 foreach f $files {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2474 if {[lsearch -exact $df $f] >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2475 lappend nf $f
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2476 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2477 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2478 set files $nf
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2479 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2480 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2481
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2482 set mergefilelist($diffmergeid) $files
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2483 if {$files ne {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2484 showmergediff
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2485 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2486 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2487
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2488 proc showmergediff {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2489 global cflist diffmergeid mergefilelist parents
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2490 global diffopts diffinhunk currentfile currenthunk filelines
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2491 global diffblocked groupfilelast mergefds groupfilenum grouphunks
4686 39001f4b7d99 hgk: Use $HG instead of hg (see 849f011dbf79) Thomas Arendsen Hein <thomas@intevation.de> parents: 4502 diff changeset	2492 global env
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2493
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2494 set files $mergefilelist($diffmergeid)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2495 foreach f $files {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2496 $cflist insert end $f
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2497 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2498 set env(GIT_DIFF_OPTS) $diffopts
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2499 set flist {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2500 catch {unset currentfile}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2501 catch {unset currenthunk}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2502 catch {unset filelines}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2503 catch {unset groupfilenum}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2504 catch {unset grouphunks}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2505 set groupfilelast -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2506 foreach p $parents($diffmergeid) {
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	2507 set cmd [list \| $env(HG) --config ui.report_untrusted=false debug-diff-tree -p $p $diffmergeid]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2508 set cmd [concat $cmd $mergefilelist($diffmergeid)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2509 if {[catch {set f [open $cmd r]} err]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2510 error_popup "Error getting diffs: $err"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2511 foreach f $flist {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2512 catch {close $f}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2513 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2514 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2515 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2516 lappend flist $f
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2517 set ids [list $diffmergeid $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2518 set mergefds($ids) $f
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2519 set diffinhunk($ids) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2520 set diffblocked($ids) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2521 fconfigure $f -blocking 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2522 fileevent $f readable [list getmergediffline $f $ids $diffmergeid]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2523 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2524 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2525
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2526 proc getmergediffline {f ids id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2527 global diffmergeid diffinhunk diffoldlines diffnewlines
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2528 global currentfile currenthunk
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2529 global diffoldstart diffnewstart diffoldlno diffnewlno
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2530 global diffblocked mergefilelist
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2531 global noldlines nnewlines difflcounts filelines
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2532
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2533 set n [gets $f line]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2534 if {$n < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2535 if {![eof $f]} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2536 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2537
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2538 if {!([info exists diffmergeid] && $diffmergeid == $id)} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2539 if {$n < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2540 close $f
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2541 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2542 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2543 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2544
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2545 if {$diffinhunk($ids) != 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2546 set fi $currentfile($ids)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2547 if {$n > 0 && [regexp {^[-+ \\]} $line match]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2548 # continuing an existing hunk
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2549 set line [string range $line 1 end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2550 set p [lindex $ids 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2551 if {$match eq "-" \|\| $match eq " "} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2552 set filelines($p,$fi,$diffoldlno($ids)) $line
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2553 incr diffoldlno($ids)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2554 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2555 if {$match eq "+" \|\| $match eq " "} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2556 set filelines($id,$fi,$diffnewlno($ids)) $line
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2557 incr diffnewlno($ids)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2558 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2559 if {$match eq " "} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2560 if {$diffinhunk($ids) == 2} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2561 lappend difflcounts($ids) \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2562 [list $noldlines($ids) $nnewlines($ids)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2563 set noldlines($ids) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2564 set diffinhunk($ids) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2565 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2566 incr noldlines($ids)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2567 } elseif {$match eq "-" \|\| $match eq "+"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2568 if {$diffinhunk($ids) == 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2569 lappend difflcounts($ids) [list $noldlines($ids)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2570 set noldlines($ids) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2571 set nnewlines($ids) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2572 set diffinhunk($ids) 2
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2573 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2574 if {$match eq "-"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2575 incr noldlines($ids)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2576 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2577 incr nnewlines($ids)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2578 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2579 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2580 # and if it's \ No newline at end of line, then what?
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2581 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2582 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2583 # end of a hunk
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2584 if {$diffinhunk($ids) == 1 && $noldlines($ids) != 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2585 lappend difflcounts($ids) [list $noldlines($ids)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2586 } elseif {$diffinhunk($ids) == 2
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2587 && ($noldlines($ids) != 0 \|\| $nnewlines($ids) != 0)} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2588 lappend difflcounts($ids) [list $noldlines($ids) $nnewlines($ids)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2589 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2590 set currenthunk($ids) [list $currentfile($ids) \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2591 $diffoldstart($ids) $diffnewstart($ids) \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2592 $diffoldlno($ids) $diffnewlno($ids) \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2593 $difflcounts($ids)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2594 set diffinhunk($ids) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2595 # -1 = need to block, 0 = unblocked, 1 = is blocked
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2596 set diffblocked($ids) -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2597 processhunks
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2598 if {$diffblocked($ids) == -1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2599 fileevent $f readable {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2600 set diffblocked($ids) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2601 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2602 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2603
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2604 if {$n < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2605 # eof
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2606 if {!$diffblocked($ids)} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2607 close $f
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2608 set currentfile($ids) [llength $mergefilelist($diffmergeid)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2609 set currenthunk($ids) [list $currentfile($ids) 0 0 0 0 {}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2610 processhunks
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2611 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2612 } elseif {[regexp {^diff --git a/(.*) b/} $line match fname]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2613 # start of a new file
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2614 set currentfile($ids) \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2615 [lsearch -exact $mergefilelist($diffmergeid) $fname]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2616 } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2617 $line match f1l f1c f2l f2c rest]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2618 if {[info exists currentfile($ids)] && $currentfile($ids) >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2619 # start of a new hunk
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2620 if {$f1l == 0 && $f1c == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2621 set f1l 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2622 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2623 if {$f2l == 0 && $f2c == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2624 set f2l 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2625 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2626 set diffinhunk($ids) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2627 set diffoldstart($ids) $f1l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2628 set diffnewstart($ids) $f2l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2629 set diffoldlno($ids) $f1l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2630 set diffnewlno($ids) $f2l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2631 set difflcounts($ids) {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2632 set noldlines($ids) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2633 set nnewlines($ids) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2634 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2635 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2636 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2637
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2638 proc processhunks {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2639 global diffmergeid parents nparents currenthunk
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2640 global mergefilelist diffblocked mergefds
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2641 global grouphunks grouplinestart grouplineend groupfilenum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2642
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2643 set nfiles [llength $mergefilelist($diffmergeid)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2644 while 1 {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2645 set fi $nfiles
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2646 set lno 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2647 # look for the earliest hunk
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2648 foreach p $parents($diffmergeid) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2649 set ids [list $diffmergeid $p]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2650 if {![info exists currenthunk($ids)]} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2651 set i [lindex $currenthunk($ids) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2652 set l [lindex $currenthunk($ids) 2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2653 if {$i < $fi \|\| ($i == $fi && $l < $lno)} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2654 set fi $i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2655 set lno $l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2656 set pi $p
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2657 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2658 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2659
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2660 if {$fi < $nfiles} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2661 set ids [list $diffmergeid $pi]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2662 set hunk $currenthunk($ids)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2663 unset currenthunk($ids)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2664 if {$diffblocked($ids) > 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2665 fileevent $mergefds($ids) readable \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2666 [list getmergediffline $mergefds($ids) $ids $diffmergeid]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2667 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2668 set diffblocked($ids) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2669
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2670 if {[info exists groupfilenum] && $groupfilenum == $fi
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2671 && $lno <= $grouplineend} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2672 # add this hunk to the pending group
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2673 lappend grouphunks($pi) $hunk
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2674 set endln [lindex $hunk 4]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2675 if {$endln > $grouplineend} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2676 set grouplineend $endln
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2677 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2678 continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2679 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2680 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2681
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2682 # succeeding stuff doesn't belong in this group, so
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2683 # process the group now
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2684 if {[info exists groupfilenum]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2685 processgroup
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2686 unset groupfilenum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2687 unset grouphunks
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2688 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2689
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2690 if {$fi >= $nfiles} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2691
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2692 # start a new group
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2693 set groupfilenum $fi
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2694 set grouphunks($pi) [list $hunk]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2695 set grouplinestart $lno
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2696 set grouplineend [lindex $hunk 4]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2697 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2698 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2699
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2700 proc processgroup {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2701 global groupfilelast groupfilenum difffilestart
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2702 global mergefilelist diffmergeid ctext filelines
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2703 global parents diffmergeid diffoffset
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2704 global grouphunks grouplinestart grouplineend nparents
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2705 global mergemax
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2706
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2707 $ctext conf -state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2708 set id $diffmergeid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2709 set f $groupfilenum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2710 if {$groupfilelast != $f} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2711 $ctext insert end "\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2712 set here [$ctext index "end - 1c"]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2713 set difffilestart($f) $here
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2714 set mark fmark.[expr {$f + 1}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2715 $ctext mark set $mark $here
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2716 $ctext mark gravity $mark left
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2717 set header [lindex $mergefilelist($id) $f]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2718 set l [expr {(78 - [string length $header]) / 2}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2719 set pad [string range "----------------------------------------" 1 $l]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2720 $ctext insert end "$pad $header $pad\n" filesep
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2721 set groupfilelast $f
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2722 foreach p $parents($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2723 set diffoffset($p) 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2724 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2725 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2726
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2727 $ctext insert end "@@" msep
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2728 set nlines [expr {$grouplineend - $grouplinestart}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2729 set events {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2730 set pnum 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2731 foreach p $parents($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2732 set startline [expr {$grouplinestart + $diffoffset($p)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2733 set ol $startline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2734 set nl $grouplinestart
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2735 if {[info exists grouphunks($p)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2736 foreach h $grouphunks($p) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2737 set l [lindex $h 2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2738 if {$nl < $l} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2739 for {} {$nl < $l} {incr nl} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2740 set filelines($p,$f,$ol) $filelines($id,$f,$nl)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2741 incr ol
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2742 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2743 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2744 foreach chunk [lindex $h 5] {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2745 if {[llength $chunk] == 2} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2746 set olc [lindex $chunk 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2747 set nlc [lindex $chunk 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2748 set nnl [expr {$nl + $nlc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2749 lappend events [list $nl $nnl $pnum $olc $nlc]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2750 incr ol $olc
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2751 set nl $nnl
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2752 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2753 incr ol [lindex $chunk 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2754 incr nl [lindex $chunk 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2755 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2756 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2757 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2758 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2759 if {$nl < $grouplineend} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2760 for {} {$nl < $grouplineend} {incr nl} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2761 set filelines($p,$f,$ol) $filelines($id,$f,$nl)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2762 incr ol
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2763 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2764 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2765 set nlines [expr {$ol - $startline}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2766 $ctext insert end " -$startline,$nlines" msep
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2767 incr pnum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2768 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2769
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2770 set nlines [expr {$grouplineend - $grouplinestart}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2771 $ctext insert end " +$grouplinestart,$nlines @@\n" msep
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2772
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2773 set events [lsort -integer -index 0 $events]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2774 set nevents [llength $events]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2775 set nmerge $nparents($diffmergeid)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2776 set l $grouplinestart
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2777 for {set i 0} {$i < $nevents} {set i $j} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2778 set nl [lindex $events $i 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2779 while {$l < $nl} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2780 $ctext insert end " $filelines($id,$f,$l)\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2781 incr l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2782 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2783 set e [lindex $events $i]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2784 set enl [lindex $e 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2785 set j $i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2786 set active {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2787 while 1 {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2788 set pnum [lindex $e 2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2789 set olc [lindex $e 3]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2790 set nlc [lindex $e 4]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2791 if {![info exists delta($pnum)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2792 set delta($pnum) [expr {$olc - $nlc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2793 lappend active $pnum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2794 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2795 incr delta($pnum) [expr {$olc - $nlc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2796 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2797 if {[incr j] >= $nevents} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2798 set e [lindex $events $j]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2799 if {[lindex $e 0] >= $enl} break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2800 if {[lindex $e 1] > $enl} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2801 set enl [lindex $e 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2802 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2803 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2804 set nlc [expr {$enl - $l}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2805 set ncol mresult
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2806 set bestpn -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2807 if {[llength $active] == $nmerge - 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2808 # no diff for one of the parents, i.e. it's identical
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2809 for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2810 if {![info exists delta($pnum)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2811 if {$pnum < $mergemax} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2812 lappend ncol m$pnum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2813 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2814 lappend ncol mmax
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2815 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2816 break
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2817 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2818 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2819 } elseif {[llength $active] == $nmerge} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2820 # all parents are different, see if one is very similar
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2821 set bestsim 30
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2822 for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2823 set sim [similarity $pnum $l $nlc $f \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2824 [lrange $events $i [expr {$j-1}]]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2825 if {$sim > $bestsim} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2826 set bestsim $sim
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2827 set bestpn $pnum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2828 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2829 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2830 if {$bestpn >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2831 lappend ncol m$bestpn
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2832 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2833 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2834 set pnum -1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2835 foreach p $parents($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2836 incr pnum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2837 if {![info exists delta($pnum)] \|\| $pnum == $bestpn} continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2838 set olc [expr {$nlc + $delta($pnum)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2839 set ol [expr {$l + $diffoffset($p)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2840 incr diffoffset($p) $delta($pnum)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2841 unset delta($pnum)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2842 for {} {$olc > 0} {incr olc -1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2843 $ctext insert end "-$filelines($p,$f,$ol)\n" m$pnum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2844 incr ol
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2845 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2846 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2847 set endl [expr {$l + $nlc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2848 if {$bestpn >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2849 # show this pretty much as a normal diff
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2850 set p [lindex $parents($id) $bestpn]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2851 set ol [expr {$l + $diffoffset($p)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2852 incr diffoffset($p) $delta($bestpn)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2853 unset delta($bestpn)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2854 for {set k $i} {$k < $j} {incr k} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2855 set e [lindex $events $k]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2856 if {[lindex $e 2] != $bestpn} continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2857 set nl [lindex $e 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2858 set ol [expr {$ol + $nl - $l}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2859 for {} {$l < $nl} {incr l} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2860 $ctext insert end "+$filelines($id,$f,$l)\n" $ncol
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2861 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2862 set c [lindex $e 3]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2863 for {} {$c > 0} {incr c -1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2864 $ctext insert end "-$filelines($p,$f,$ol)\n" m$bestpn
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2865 incr ol
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2866 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2867 set nl [lindex $e 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2868 for {} {$l < $nl} {incr l} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2869 $ctext insert end "+$filelines($id,$f,$l)\n" mresult
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2870 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2871 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2872 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2873 for {} {$l < $endl} {incr l} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2874 $ctext insert end "+$filelines($id,$f,$l)\n" $ncol
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2875 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2876 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2877 while {$l < $grouplineend} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2878 $ctext insert end " $filelines($id,$f,$l)\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2879 incr l
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2880 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2881 $ctext conf -state disabled
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2882 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2883
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2884 proc similarity {pnum l nlc f events} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2885 global diffmergeid parents diffoffset filelines
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2886
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2887 set id $diffmergeid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2888 set p [lindex $parents($id) $pnum]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2889 set ol [expr {$l + $diffoffset($p)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2890 set endl [expr {$l + $nlc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2891 set same 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2892 set diff 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2893 foreach e $events {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2894 if {[lindex $e 2] != $pnum} continue
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2895 set nl [lindex $e 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2896 set ol [expr {$ol + $nl - $l}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2897 for {} {$l < $nl} {incr l} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2898 incr same [string length $filelines($id,$f,$l)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2899 incr same
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2900 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2901 set oc [lindex $e 3]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2902 for {} {$oc > 0} {incr oc -1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2903 incr diff [string length $filelines($p,$f,$ol)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2904 incr diff
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2905 incr ol
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2906 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2907 set nl [lindex $e 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2908 for {} {$l < $nl} {incr l} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2909 incr diff [string length $filelines($id,$f,$l)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2910 incr diff
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2911 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2912 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2913 for {} {$l < $endl} {incr l} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2914 incr same [string length $filelines($id,$f,$l)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2915 incr same
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2916 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2917 if {$same == 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2918 return 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2919 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2920 return [expr {200 * $same / (2 * $same + $diff)}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2921 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2922
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2923 proc startdiff {ids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2924 global treediffs diffids treepending diffmergeid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2925
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2926 set diffids $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2927 catch {unset diffmergeid}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2928 if {![info exists treediffs($ids)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2929 if {![info exists treepending]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2930 gettreediffs $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2931 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2932 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2933 addtocflist $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2934 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2935 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2936
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2937 proc addtocflist {ids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2938 global treediffs cflist
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2939 foreach f $treediffs($ids) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2940 $cflist insert end $f
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2941 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2942 getblobdiffs $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2943 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2944
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2945 proc gettreediffs {ids} {
4686 39001f4b7d99 hgk: Use $HG instead of hg (see 849f011dbf79) Thomas Arendsen Hein <thomas@intevation.de> parents: 4502 diff changeset	2946 global treediff parents treepending env
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2947 set treepending $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2948 set treediff {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2949 set id [lindex $ids 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2950 set p [lindex $ids 1]
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	2951 if [catch {set gdtf [open "\|{$env(HG)} --config ui.report_untrusted=false debug-diff-tree -r $p $id" r]}] return
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2952 fconfigure $gdtf -blocking 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2953 fileevent $gdtf readable [list gettreediffline $gdtf $ids]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2954 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2955
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2956 proc gettreediffline {gdtf ids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2957 global treediff treediffs treepending diffids diffmergeid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2958
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2959 set n [gets $gdtf line]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2960 if {$n < 0} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2961 if {![eof $gdtf]} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2962 close $gdtf
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2963 set treediffs($ids) $treediff
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2964 unset treepending
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2965 if {$ids != $diffids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2966 gettreediffs $diffids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2967 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2968 if {[info exists diffmergeid]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2969 contmergediff $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2970 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2971 addtocflist $ids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2972 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2973 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2974 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2975 }
4750 4a84f7421692 Make hgk handle filenames with spaces (issue49) Thomas Arendsen Hein <thomas@intevation.de> parents: 4749 diff changeset	2976 set tab1 [expr [string first "\t" $line] + 1]
4a84f7421692 Make hgk handle filenames with spaces (issue49) Thomas Arendsen Hein <thomas@intevation.de> parents: 4749 diff changeset	2977 set tab2 [expr [string first "\t" $line $tab1] - 1]
4a84f7421692 Make hgk handle filenames with spaces (issue49) Thomas Arendsen Hein <thomas@intevation.de> parents: 4749 diff changeset	2978 set file [string range $line $tab1 $tab2]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2979 lappend treediff $file
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2980 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2981
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2982 proc getblobdiffs {ids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2983 global diffopts blobdifffd diffids env curdifftag curtagstart
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2984 global difffilestart nextupdate diffinhdr treediffs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2985
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2986 set id [lindex $ids 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2987 set p [lindex $ids 1]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2988 set env(GIT_DIFF_OPTS) $diffopts
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	2989 set cmd [list \| $env(HG) --config ui.report_untrusted=false debug-diff-tree -r -p -C $p $id]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2990 if {[catch {set bdf [open $cmd r]} err]} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2991 puts "error getting diffs: $err"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2992 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2993 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2994 set diffinhdr 0
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2995 fconfigure $bdf -blocking 0
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	2996 set blobdifffd($ids) $bdf
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2997 set curdifftag Comments
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2998 set curtagstart 0.0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	2999 catch {unset difffilestart}
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3000 fileevent $bdf readable [list getblobdiffline $bdf $diffids]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3001 set nextupdate [expr {[clock clicks -milliseconds] + 100}]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3002 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3003
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3004 proc getblobdiffline {bdf ids} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3005 global diffids blobdifffd ctext curdifftag curtagstart
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3006 global diffnexthead diffnextnote difffilestart
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3007 global nextupdate diffinhdr treediffs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3008 global gaudydiff
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3009
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3010 set n [gets $bdf line]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3011 if {$n < 0} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3012 if {[eof $bdf]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3013 close $bdf
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3014 if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3015 $ctext tag add $curdifftag $curtagstart end
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3016 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3017 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3018 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3019 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3020 if {$ids != $diffids \|\| $bdf != $blobdifffd($ids)} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3021 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3022 }
3934 a33ddd20105c hgk - fix CR issues on windows "Andrei Vermel <avermel@mail.ru>" parents: 3090 diff changeset	3023 regsub -all "\r" $line "" line
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3024 $ctext conf -state normal
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3025 if {[regexp {^diff --git a/(.) b/(.)} $line match fname newname]} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3026 # start of a new file
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3027 $ctext insert end "\n"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3028 $ctext tag add $curdifftag $curtagstart end
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3029 set curtagstart [$ctext index "end - 1c"]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3030 set header $newname
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3031 set here [$ctext index "end - 1c"]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3032 set i [lsearch -exact $treediffs($diffids) $fname]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3033 if {$i >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3034 set difffilestart($i) $here
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3035 incr i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3036 $ctext mark set fmark.$i $here
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3037 $ctext mark gravity fmark.$i left
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3038 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3039 if {$newname != $fname} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3040 set i [lsearch -exact $treediffs($diffids) $newname]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3041 if {$i >= 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3042 set difffilestart($i) $here
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3043 incr i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3044 $ctext mark set fmark.$i $here
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3045 $ctext mark gravity fmark.$i left
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3046 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3047 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3048 set curdifftag "f:$fname"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3049 $ctext tag delete $curdifftag
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3050 set l [expr {(78 - [string length $header]) / 2}]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3051 set pad [string range "----------------------------------------" 1 $l]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3052 $ctext insert end "$pad $header $pad\n" filesep
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3053 set diffinhdr 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3054 } elseif {[regexp {^(---\|\+\+\+)} $line]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3055 set diffinhdr 0
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3056 } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3057 $line match f1l f1c f2l f2c rest]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3058 if {$gaudydiff} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3059 $ctext insert end "\t" hunksep
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3060 $ctext insert end " $f1l " d0 " $f2l " d1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3061 $ctext insert end " $rest \n" hunksep
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3062 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3063 $ctext insert end "$line\n" hunksep
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3064 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3065 set diffinhdr 0
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3066 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3067 set x [string range $line 0 0]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3068 if {$x == "-" \|\| $x == "+"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3069 set tag [expr {$x == "+"}]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3070 if {$gaudydiff} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3071 set line [string range $line 1 end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3072 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3073 $ctext insert end "$line\n" d$tag
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3074 } elseif {$x == " "} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3075 if {$gaudydiff} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3076 set line [string range $line 1 end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3077 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3078 $ctext insert end "$line\n"
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3079 } elseif {$diffinhdr \|\| $x == "\\"} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3080 # e.g. "\ No newline at end of file"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3081 $ctext insert end "$line\n" filesep
3934 a33ddd20105c hgk - fix CR issues on windows "Andrei Vermel <avermel@mail.ru>" parents: 3090 diff changeset	3082 } elseif {$line != ""} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3083 # Something else we don't recognize
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3084 if {$curdifftag != "Comments"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3085 $ctext insert end "\n"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3086 $ctext tag add $curdifftag $curtagstart end
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3087 set curtagstart [$ctext index "end - 1c"]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3088 set curdifftag Comments
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3089 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3090 $ctext insert end "$line\n" filesep
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3091 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3092 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3093 $ctext conf -state disabled
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3094 if {[clock clicks -milliseconds] >= $nextupdate} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3095 incr nextupdate 100
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3096 fileevent $bdf readable {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3097 update
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3098 fileevent $bdf readable "getblobdiffline $bdf {$ids}"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3099 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3100 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3101
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3102 proc nextfile {} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3103 global difffilestart ctext
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3104 set here [$ctext index @0,0]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3105 for {set i 0} {[info exists difffilestart($i)]} {incr i} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3106 if {[$ctext compare $difffilestart($i) > $here]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3107 if {![info exists pos]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3108 \|\| [$ctext compare $difffilestart($i) < $pos]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3109 set pos $difffilestart($i)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3110 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3111 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3112 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3113 if {[info exists pos]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3114 $ctext yview $pos
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3115 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3116 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3117
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3118 proc listboxsel {} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3119 global ctext cflist currentid
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3120 if {![info exists currentid]} return
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3121 set sel [lsort [$cflist curselection]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3122 if {$sel eq {}} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3123 set first [lindex $sel 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3124 catch {$ctext yview fmark.$first}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3125 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3126
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3127 proc setcoords {} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3128 global linespc charspc canvx0 canvy0 mainfont
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3129 global xspc1 xspc2 lthickness
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3130
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3131 set linespc [font metrics $mainfont -linespace]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3132 set charspc [font measure $mainfont "m"]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3133 set canvy0 [expr 3 + 0.5 * $linespc]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3134 set canvx0 [expr 3 + 0.5 * $linespc]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3135 set lthickness [expr {int($linespc / 9) + 1}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3136 set xspc1(0) $linespc
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3137 set xspc2 $linespc
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3138 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3139
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3140 proc redisplay {} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3141 global stopped redisplaying phase
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3142 if {$stopped > 1} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3143 if {$phase == "getcommits"} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3144 set redisplaying 1
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3145 if {$phase == "drawgraph" \|\| $phase == "incrdraw"} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3146 set stopped 1
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3147 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3148 drawgraph
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3149 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3150 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3151
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3152 proc incrfont {inc} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3153 global mainfont namefont textfont ctext canv phase
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3154 global stopped entries curidfont
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3155 unmarkmatches
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3156 set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3157 set curidfont [lreplace $curidfont 1 1 [expr {[lindex $curidfont 1] + $inc}]]
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3158 set namefont [lreplace $namefont 1 1 [expr {[lindex $namefont 1] + $inc}]]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3159 set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3160 setcoords
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3161 $ctext conf -font $textfont
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3162 $ctext tag conf filesep -font [concat $textfont bold]
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3163 foreach e $entries {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3164 $e conf -font $mainfont
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3165 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3166 if {$phase == "getcommits"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3167 $canv itemconf textitems -font $mainfont
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3168 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3169 redisplay
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3170 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3171
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3172 proc clearsha1 {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3173 global sha1entry sha1string
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3174 if {[string length $sha1string] == 40} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3175 $sha1entry delete 0 end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3176 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3177 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3178
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3179 proc sha1change {n1 n2 op} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3180 global sha1string currentid sha1but
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3181 if {$sha1string == {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3182 \|\| ([info exists currentid] && $sha1string == $currentid)} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3183 set state disabled
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3184 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3185 set state normal
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3186 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3187 if {[$sha1but cget -state] == $state} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3188 if {$state == "normal"} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3189 $sha1but conf -state normal -relief raised -text "Goto: "
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3190 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3191 $sha1but conf -state disabled -relief flat -text "SHA1 ID: "
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3192 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3193 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3194
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3195 proc gotocommit {} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3196 global sha1string currentid idline tagids
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3197 global lineid numcommits
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3198
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3199 if {$sha1string == {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3200 \|\| ([info exists currentid] && $sha1string == $currentid)} return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3201 if {[info exists tagids($sha1string)]} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3202 set id $tagids($sha1string)
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3203 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3204 set id [string tolower $sha1string]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3205 if {[regexp {^[0-9a-f]{4,39}$} $id]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3206 set matches {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3207 for {set l 0} {$l < $numcommits} {incr l} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3208 if {[string match $id* $lineid($l)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3209 lappend matches $lineid($l)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3210 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3211 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3212 if {$matches ne {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3213 if {[llength $matches] > 1} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3214 error_popup "Short SHA1 id $id is ambiguous"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3215 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3216 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3217 set id [lindex $matches 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3218 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3219 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3220 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3221 if {[info exists idline($id)]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3222 selectline $idline($id) 1
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3223 return
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3224 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3225 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3226 set type "SHA1 id"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3227 } else {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3228 set type "Tag"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3229 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3230 error_popup "$type $sha1string is not known"
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3231 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3232
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3233 proc lineenter {x y id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3234 global hoverx hovery hoverid hovertimer
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3235 global commitinfo canv
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3236
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3237 if {![info exists commitinfo($id)]} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3238 set hoverx $x
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3239 set hovery $y
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3240 set hoverid $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3241 if {[info exists hovertimer]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3242 after cancel $hovertimer
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3243 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3244 set hovertimer [after 500 linehover]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3245 $canv delete hover
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3246 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3247
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3248 proc linemotion {x y id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3249 global hoverx hovery hoverid hovertimer
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3250
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3251 if {[info exists hoverid] && $id == $hoverid} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3252 set hoverx $x
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3253 set hovery $y
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3254 if {[info exists hovertimer]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3255 after cancel $hovertimer
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3256 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3257 set hovertimer [after 500 linehover]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3258 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3259 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3260
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3261 proc lineleave {id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3262 global hoverid hovertimer canv
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3263
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3264 if {[info exists hoverid] && $id == $hoverid} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3265 $canv delete hover
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3266 if {[info exists hovertimer]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3267 after cancel $hovertimer
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3268 unset hovertimer
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3269 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3270 unset hoverid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3271 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3272 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3273
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3274 proc linehover {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3275 global hoverx hovery hoverid hovertimer
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3276 global canv linespc lthickness
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3277 global commitinfo mainfont
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3278
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3279 set text [lindex $commitinfo($hoverid) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3280 set ymax [lindex [$canv cget -scrollregion] 3]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3281 if {$ymax == {}} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3282 set yfrac [lindex [$canv yview] 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3283 set x [expr {$hoverx + 2 * $linespc}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3284 set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3285 set x0 [expr {$x - 2 * $lthickness}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3286 set y0 [expr {$y - 2 * $lthickness}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3287 set x1 [expr {$x + [font measure $mainfont $text] + 2 * $lthickness}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3288 set y1 [expr {$y + $linespc + 2 * $lthickness}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3289 set t [$canv create rectangle $x0 $y0 $x1 $y1 \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3290 -fill \#ffff80 -outline black -width 1 -tags hover]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3291 $canv raise $t
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3292 set t [$canv create text $x $y -anchor nw -text $text -tags hover]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3293 $canv raise $t
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3294 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3295
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3296 proc clickisonarrow {id y} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3297 global mainline mainlinearrow sidelines lthickness
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3298
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3299 set thresh [expr {2 * $lthickness + 6}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3300 if {[info exists mainline($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3301 if {$mainlinearrow($id) ne "none"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3302 if {abs([lindex $mainline($id) 1] - $y) < $thresh} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3303 return "up"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3304 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3305 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3306 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3307 if {[info exists sidelines($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3308 foreach ls $sidelines($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3309 set coords [lindex $ls 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3310 set arrow [lindex $ls 2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3311 if {$arrow eq "first" \|\| $arrow eq "both"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3312 if {abs([lindex $coords 1] - $y) < $thresh} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3313 return "up"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3314 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3315 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3316 if {$arrow eq "last" \|\| $arrow eq "both"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3317 if {abs([lindex $coords end] - $y) < $thresh} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3318 return "down"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3319 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3320 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3321 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3322 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3323 return {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3324 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3325
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3326 proc arrowjump {id dirn y} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3327 global mainline sidelines canv
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3328
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3329 set yt {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3330 if {$dirn eq "down"} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3331 if {[info exists mainline($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3332 set y1 [lindex $mainline($id) 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3333 if {$y1 > $y} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3334 set yt $y1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3335 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3336 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3337 if {[info exists sidelines($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3338 foreach ls $sidelines($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3339 set y1 [lindex $ls 0 1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3340 if {$y1 > $y && ($yt eq {} \|\| $y1 < $yt)} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3341 set yt $y1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3342 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3343 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3344 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3345 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3346 if {[info exists sidelines($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3347 foreach ls $sidelines($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3348 set y1 [lindex $ls 0 end]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3349 if {$y1 < $y && ($yt eq {} \|\| $y1 > $yt)} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3350 set yt $y1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3351 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3352 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3353 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3354 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3355 if {$yt eq {}} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3356 set ymax [lindex [$canv cget -scrollregion] 3]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3357 if {$ymax eq {} \|\| $ymax <= 0} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3358 set view [$canv yview]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3359 set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3360 set yfrac [expr {$yt / $ymax - $yspan / 2}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3361 if {$yfrac < 0} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3362 set yfrac 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3363 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3364 $canv yview moveto $yfrac
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3365 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3366
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3367 proc lineclick {x y id isnew} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3368 global ctext commitinfo children cflist canv thickerline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3369
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3370 unmarkmatches
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3371 unselectline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3372 normalline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3373 $canv delete hover
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3374 # draw this line thicker than normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3375 drawlines $id 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3376 set thickerline $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3377 if {$isnew} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3378 set ymax [lindex [$canv cget -scrollregion] 3]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3379 if {$ymax eq {}} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3380 set yfrac [lindex [$canv yview] 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3381 set y [expr {$y + $yfrac * $ymax}]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3382 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3383 set dirn [clickisonarrow $id $y]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3384 if {$dirn ne {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3385 arrowjump $id $dirn $y
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3386 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3387 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3388
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3389 if {$isnew} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3390 addtohistory [list lineclick $x $y $id 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3391 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3392 # fill the details pane with info about this line
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3393 $ctext conf -state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3394 $ctext delete 0.0 end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3395 $ctext tag conf link -foreground blue -underline 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3396 $ctext tag bind link <Enter> { %W configure -cursor hand2 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3397 $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3398 $ctext insert end "Parent:\t"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3399 $ctext insert end $id [list link link0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3400 $ctext tag bind link0 <1> [list selbyid $id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3401 set info $commitinfo($id)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3402 $ctext insert end "\n\t[lindex $info 0]\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3403 $ctext insert end "\tAuthor:\t[lindex $info 1]\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3404 $ctext insert end "\tDate:\t[lindex $info 2]\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3405 if {[info exists children($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3406 $ctext insert end "\nChildren:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3407 set i 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3408 foreach child $children($id) {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3409 incr i
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3410 set info $commitinfo($child)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3411 $ctext insert end "\n\t"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3412 $ctext insert end $child [list link link$i]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3413 $ctext tag bind link$i <1> [list selbyid $child]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3414 $ctext insert end "\n\t[lindex $info 0]"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3415 $ctext insert end "\n\tAuthor:\t[lindex $info 1]"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3416 $ctext insert end "\n\tDate:\t[lindex $info 2]\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3417 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3418 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3419 $ctext conf -state disabled
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3420
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3421 $cflist delete 0 end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3422 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3423
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3424 proc normalline {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3425 global thickerline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3426 if {[info exists thickerline]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3427 drawlines $thickerline 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3428 unset thickerline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3429 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3430 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3431
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3432 proc selbyid {id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3433 global idline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3434 if {[info exists idline($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3435 selectline $idline($id) 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3436 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3437 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3438
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3439 proc mstime {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3440 global startmstime
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3441 if {![info exists startmstime]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3442 set startmstime [clock clicks -milliseconds]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3443 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3444 return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3445 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3446
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3447 proc rowmenu {x y id} {
5394 0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3448 global rowctxmenu idline selectedline rowmenuid hgvdiff
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3449
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3450 if {![info exists selectedline] \|\| $idline($id) eq $selectedline} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3451 set state disabled
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3452 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3453 set state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3454 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3455 $rowctxmenu entryconfigure 0 -state $state
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3456 $rowctxmenu entryconfigure 1 -state $state
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3457 $rowctxmenu entryconfigure 2 -state $state
5394 0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3458 if { $hgvdiff ne "" } {
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3459 $rowctxmenu entryconfigure 6 -state $state
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3460 }
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3461 set rowmenuid $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3462 tk_popup $rowctxmenu $x $y
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3463 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3464
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3465 proc diffvssel {dirn} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3466 global rowmenuid selectedline lineid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3467
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3468 if {![info exists selectedline]} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3469 if {$dirn} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3470 set oldid $lineid($selectedline)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3471 set newid $rowmenuid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3472 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3473 set oldid $rowmenuid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3474 set newid $lineid($selectedline)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3475 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3476 addtohistory [list doseldiff $oldid $newid]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3477 doseldiff $oldid $newid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3478 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3479
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3480 proc doseldiff {oldid newid} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3481 global ctext cflist
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3482 global commitinfo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3483
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3484 $ctext conf -state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3485 $ctext delete 0.0 end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3486 $ctext mark set fmark.0 0.0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3487 $ctext mark gravity fmark.0 left
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3488 $cflist delete 0 end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3489 $cflist insert end "Top"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3490 $ctext insert end "From "
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3491 $ctext tag conf link -foreground blue -underline 1
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3492 $ctext tag bind link <Enter> { %W configure -cursor hand2 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3493 $ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3494 $ctext tag bind link0 <1> [list selbyid $oldid]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3495 $ctext insert end $oldid [list link link0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3496 $ctext insert end "\n "
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3497 $ctext insert end [lindex $commitinfo($oldid) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3498 $ctext insert end "\n\nTo "
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3499 $ctext tag bind link1 <1> [list selbyid $newid]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3500 $ctext insert end $newid [list link link1]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3501 $ctext insert end "\n "
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3502 $ctext insert end [lindex $commitinfo($newid) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3503 $ctext insert end "\n"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3504 $ctext conf -state disabled
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3505 $ctext tag delete Comments
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3506 $ctext tag remove found 1.0 end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3507 startdiff [list $newid $oldid]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3508 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3509
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3510 proc mkpatch {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3511 global rowmenuid currentid commitinfo patchtop patchnum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3512
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3513 if {![info exists currentid]} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3514 set oldid $currentid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3515 set oldhead [lindex $commitinfo($oldid) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3516 set newid $rowmenuid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3517 set newhead [lindex $commitinfo($newid) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3518 set top .patch
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3519 set patchtop $top
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3520 catch {destroy $top}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3521 toplevel $top
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3522 label $top.title -text "Generate patch"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3523 grid $top.title - -pady 10
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3524 label $top.from -text "From:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3525 entry $top.fromsha1 -width 40 -relief flat
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3526 $top.fromsha1 insert 0 $oldid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3527 $top.fromsha1 conf -state readonly
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3528 grid $top.from $top.fromsha1 -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3529 entry $top.fromhead -width 60 -relief flat
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3530 $top.fromhead insert 0 $oldhead
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3531 $top.fromhead conf -state readonly
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3532 grid x $top.fromhead -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3533 label $top.to -text "To:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3534 entry $top.tosha1 -width 40 -relief flat
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3535 $top.tosha1 insert 0 $newid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3536 $top.tosha1 conf -state readonly
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3537 grid $top.to $top.tosha1 -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3538 entry $top.tohead -width 60 -relief flat
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3539 $top.tohead insert 0 $newhead
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3540 $top.tohead conf -state readonly
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3541 grid x $top.tohead -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3542 button $top.rev -text "Reverse" -command mkpatchrev -padx 5
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3543 grid $top.rev x -pady 10
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3544 label $top.flab -text "Output file:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3545 entry $top.fname -width 60
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3546 $top.fname insert 0 [file normalize "patch$patchnum.patch"]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3547 incr patchnum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3548 grid $top.flab $top.fname -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3549 frame $top.buts
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3550 button $top.buts.gen -text "Generate" -command mkpatchgo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3551 button $top.buts.can -text "Cancel" -command mkpatchcan
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3552 grid $top.buts.gen $top.buts.can
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3553 grid columnconfigure $top.buts 0 -weight 1 -uniform a
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3554 grid columnconfigure $top.buts 1 -weight 1 -uniform a
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3555 grid $top.buts - -pady 10 -sticky ew
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3556 focus $top.fname
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3557 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3558
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3559 proc mkpatchrev {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3560 global patchtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3561
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3562 set oldid [$patchtop.fromsha1 get]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3563 set oldhead [$patchtop.fromhead get]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3564 set newid [$patchtop.tosha1 get]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3565 set newhead [$patchtop.tohead get]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3566 foreach e [list fromsha1 fromhead tosha1 tohead] \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3567 v [list $newid $newhead $oldid $oldhead] {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3568 $patchtop.$e conf -state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3569 $patchtop.$e delete 0 end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3570 $patchtop.$e insert 0 $v
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3571 $patchtop.$e conf -state readonly
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3572 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3573 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3574
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3575 proc mkpatchgo {} {
4686 39001f4b7d99 hgk: Use $HG instead of hg (see 849f011dbf79) Thomas Arendsen Hein <thomas@intevation.de> parents: 4502 diff changeset	3576 global patchtop env
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3577
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3578 set oldid [$patchtop.fromsha1 get]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3579 set newid [$patchtop.tosha1 get]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3580 set fname [$patchtop.fname get]
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	3581 if {[catch {exec $env(HG) --config ui.report_untrusted=false debug-diff-tree -p $oldid $newid >$fname &} err]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3582 error_popup "Error creating patch: $err"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3583 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3584 catch {destroy $patchtop}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3585 unset patchtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3586 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3587
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3588 proc mkpatchcan {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3589 global patchtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3590
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3591 catch {destroy $patchtop}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3592 unset patchtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3593 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3594
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3595 proc mktag {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3596 global rowmenuid mktagtop commitinfo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3597
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3598 set top .maketag
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3599 set mktagtop $top
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3600 catch {destroy $top}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3601 toplevel $top
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3602 label $top.title -text "Create tag"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3603 grid $top.title - -pady 10
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3604 label $top.id -text "ID:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3605 entry $top.sha1 -width 40 -relief flat
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3606 $top.sha1 insert 0 $rowmenuid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3607 $top.sha1 conf -state readonly
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3608 grid $top.id $top.sha1 -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3609 entry $top.head -width 60 -relief flat
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3610 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3611 $top.head conf -state readonly
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3612 grid x $top.head -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3613 label $top.tlab -text "Tag name:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3614 entry $top.tag -width 60
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3615 grid $top.tlab $top.tag -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3616 frame $top.buts
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3617 button $top.buts.gen -text "Create" -command mktaggo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3618 button $top.buts.can -text "Cancel" -command mktagcan
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3619 grid $top.buts.gen $top.buts.can
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3620 grid columnconfigure $top.buts 0 -weight 1 -uniform a
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3621 grid columnconfigure $top.buts 1 -weight 1 -uniform a
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3622 grid $top.buts - -pady 10 -sticky ew
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3623 focus $top.tag
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3624 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3625
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3626 proc domktag {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3627 global mktagtop env tagids idtags
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3628
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3629 set id [$mktagtop.sha1 get]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3630 set tag [$mktagtop.tag get]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3631 if {$tag == {}} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3632 error_popup "No tag name specified"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3633 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3634 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3635 if {[info exists tagids($tag)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3636 error_popup "Tag \"$tag\" already exists"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3637 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3638 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3639 if {[catch {
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	3640 set out [exec $env(HG) --config ui.report_untrusted=false tag -r $id $tag]
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3641 } err]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3642 error_popup "Error creating tag: $err"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3643 return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3644 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3645
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3646 set tagids($tag) $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3647 lappend idtags($id) $tag
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3648 redrawtags $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3649 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3650
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3651 proc redrawtags {id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3652 global canv linehtag idline idpos selectedline
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3653
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3654 if {![info exists idline($id)]} return
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3655 $canv delete tag.$id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3656 set xt [eval drawtags $id $idpos($id)]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3657 $canv coords $linehtag($idline($id)) $xt [lindex $idpos($id) 2]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3658 if {[info exists selectedline] && $selectedline == $idline($id)} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3659 selectline $selectedline 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3660 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3661 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3662
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3663 proc mktagcan {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3664 global mktagtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3665
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3666 catch {destroy $mktagtop}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3667 unset mktagtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3668 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3669
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3670 proc mktaggo {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3671 domktag
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3672 mktagcan
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3673 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3674
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3675 proc writecommit {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3676 global rowmenuid wrcomtop commitinfo wrcomcmd
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3677
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3678 set top .writecommit
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3679 set wrcomtop $top
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3680 catch {destroy $top}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3681 toplevel $top
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3682 label $top.title -text "Write commit to file"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3683 grid $top.title - -pady 10
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3684 label $top.id -text "ID:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3685 entry $top.sha1 -width 40 -relief flat
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3686 $top.sha1 insert 0 $rowmenuid
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3687 $top.sha1 conf -state readonly
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3688 grid $top.id $top.sha1 -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3689 entry $top.head -width 60 -relief flat
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3690 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3691 $top.head conf -state readonly
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3692 grid x $top.head -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3693 label $top.clab -text "Command:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3694 entry $top.cmd -width 60 -textvariable wrcomcmd
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3695 grid $top.clab $top.cmd -sticky w -pady 10
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3696 label $top.flab -text "Output file:"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3697 entry $top.fname -width 60
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3698 $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6]"]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3699 grid $top.flab $top.fname -sticky w
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3700 frame $top.buts
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3701 button $top.buts.gen -text "Write" -command wrcomgo
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3702 button $top.buts.can -text "Cancel" -command wrcomcan
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3703 grid $top.buts.gen $top.buts.can
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3704 grid columnconfigure $top.buts 0 -weight 1 -uniform a
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3705 grid columnconfigure $top.buts 1 -weight 1 -uniform a
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3706 grid $top.buts - -pady 10 -sticky ew
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3707 focus $top.fname
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3708 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3709
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3710 proc wrcomgo {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3711 global wrcomtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3712
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3713 set id [$wrcomtop.sha1 get]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3714 set cmd "echo $id \| [$wrcomtop.cmd get]"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3715 set fname [$wrcomtop.fname get]
4686 39001f4b7d99 hgk: Use $HG instead of hg (see 849f011dbf79) Thomas Arendsen Hein <thomas@intevation.de> parents: 4502 diff changeset	3716 if {[catch {exec sh -c $cmd > $fname &} err]} {
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3717 error_popup "Error writing commit: $err"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3718 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3719 catch {destroy $wrcomtop}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3720 unset wrcomtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3721 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3722
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3723 proc wrcomcan {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3724 global wrcomtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3725
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3726 catch {destroy $wrcomtop}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3727 unset wrcomtop
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3728 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3729
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3730 proc listrefs {id} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3731 global idtags idheads idotherrefs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3732
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3733 set x {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3734 if {[info exists idtags($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3735 set x $idtags($id)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3736 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3737 set y {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3738 if {[info exists idheads($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3739 set y $idheads($id)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3740 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3741 set z {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3742 if {[info exists idotherrefs($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3743 set z $idotherrefs($id)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3744 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3745 return [list $x $y $z]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3746 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3747
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3748 proc rereadrefs {} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3749 global idtags idheads idotherrefs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3750 global tagids headids otherrefids
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3751
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3752 set refids [concat [array names idtags] \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3753 [array names idheads] [array names idotherrefs]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3754 foreach id $refids {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3755 if {![info exists ref($id)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3756 set ref($id) [listrefs $id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3757 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3758 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3759 foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3760 catch {unset $v}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3761 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3762 readrefs
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3763 set refids [lsort -unique [concat $refids [array names idtags] \
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3764 [array names idheads] [array names idotherrefs]]]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3765 foreach id $refids {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3766 set v [listrefs $id]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3767 if {![info exists ref($id)] \|\| $ref($id) != $v} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3768 redrawtags $id
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3769 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3770 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3771 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3772
5394 0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3773 proc vdiff {withparent} {
5417 b8872655f951 hgk: allow any extdiff command for visual diff TK Soh <teekaysoh@yahoo.com> parents: 5395 diff changeset	3774 global env rowmenuid selectedline lineid hgvdiff
5394 0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3775
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3776 if {![info exists rowmenuid]} return
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3777 set curid $rowmenuid
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3778
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3779 if {$withparent} {
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3780 set parents [exec $env(HG) --config ui.report_untrusted=false parents --rev $curid --template "{node}\n"]
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3781 set firstparent [lindex [split $parents "\n"] 0]
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3782 set otherid $firstparent
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3783 } else {
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3784 if {![info exists selectedline]} return
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3785 set otherid $lineid($selectedline)
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3786 }
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3787 set range "$otherid:$curid"
5417 b8872655f951 hgk: allow any extdiff command for visual diff TK Soh <teekaysoh@yahoo.com> parents: 5395 diff changeset	3788 if {[catch {exec $env(HG) --config ui.report_untrusted=false $hgvdiff -r $range} err]} {
5394 0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3789 # Ignore errors, this is just visualization
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3790 }
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3791 }
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3792
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3793 proc showtag {tag isnew} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3794 global ctext cflist tagcontents tagids linknum
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3795
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3796 if {$isnew} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3797 addtohistory [list showtag $tag 0]
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3798 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3799 $ctext conf -state normal
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3800 $ctext delete 0.0 end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3801 set linknum 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3802 if {[info exists tagcontents($tag)]} {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3803 set text $tagcontents($tag)
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3804 } else {
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3805 set text "Tag: $tag\nId: $tagids($tag)"
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3806 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3807 appendwithlinks $text
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3808 $ctext conf -state disabled
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3809 $cflist delete 0 end
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3810 }
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3811
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3812 proc doquit {} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3813 global stopped
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3814 set stopped 100
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3815 destroy .
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3816 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3817
5393 c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3818 proc getconfig {} {
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3819 global env
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3820
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3821 set lines [exec $env(HG) debug-config]
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3822 regsub -all "\r\n" $lines "\n" config
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3823 set config {}
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3824 foreach line [split $lines "\n"] {
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3825 regsub "^(k\|v)=" $line "" line
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3826 lappend config $line
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3827 }
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3828 return $config
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3829 }
c2ad1890fc53 hgk: add debug-config command to pass configuration options Patrick Mezard <pmezard@gmail.com> parents: 5392 diff changeset	3830
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3831 # defaults...
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3832 set datemode 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3833 set boldnames 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3834 set diffopts "-U 5 -p"
4749 e1d1b22bab57 Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. Thomas Arendsen Hein <thomas@intevation.de> parents: 4686 diff changeset	3835 set wrcomcmd "\"\$HG\" --config ui.report_untrusted=false debug-diff-tree --stdin -p --pretty"
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3836
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3837 set mainfont {Helvetica 9}
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3838 set curidfont {}
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3839 set textfont {Courier 9}
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3840 set findmergefiles 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3841 set gaudydiff 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3842 set maxgraphpct 50
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3843 set maxwidth 16
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3844
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3845 set colors {green red blue magenta darkgrey brown orange}
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3846 set authorcolors {
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3847 deeppink mediumorchid blue burlywood4 goldenrod slateblue red2 navy dimgrey
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3848 }
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3849
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3850 catch {source ~/.gitk}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3851
5464 7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3852 if {$curidfont == ""} { # initialize late based on current mainfont
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3853 set curidfont "$mainfont bold italic underline"
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3854 }
7dafd9ab3979 hgk: colorize commits by authors Georg.Koltermann@mscsoftware.com parents: 5417 diff changeset	3855
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3856 set namefont $mainfont
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3857 if {$boldnames} {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3858 lappend namefont bold
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3859 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3860
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3861 set revtreeargs {}
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3862 foreach arg $argv {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3863 switch -regexp -- $arg {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3864 "^$" { }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3865 "^-b" { set boldnames 1 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3866 "^-d" { set datemode 1 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3867 default {
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3868 lappend revtreeargs $arg
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3869 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3870 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3871 }
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3872
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3873 set history {}
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3874 set historyindex 0
cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3875
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3876 set stopped 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3877 set redisplaying 0
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3878 set stuffsaved 0
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3879 set patchnum 0
5394 0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3880
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3881 array set config [getconfig]
0ad0e97345eb hgk: add context menu visual diff action Patrick Mezard <pmezard@gmail.com> parents: 5393 diff changeset	3882 set hgvdiff $config(vdiff)
267 497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3883 setcoords
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3884 makewindow
497aa6d276d2 Initial import of hgit and hgk mpm@selenic.com parents: diff changeset	3885 readrefs
5284 f8c36b215281 hgk: add repo root to window title Steve Borho <steve@borho.org> parents: 5117 diff changeset	3886 set hgroot [exec $env(HG) root]
f8c36b215281 hgk: add repo root to window title Steve Borho <steve@borho.org> parents: 5117 diff changeset	3887 wm title . "hgk $hgroot"
1240 cc756ffd4d04 Convert hgk to use the hgit extension, and upate to the latest gitk mason@suse.com parents: 283 diff changeset	3888 getcommits $revtreeargs

Mercurial > hg > mercurial-crew-with-dirclash

annotate contrib/hgk @ 5479:dd5ca84ed868