hg/pyhgsh: contrib/hgk annotate

annotate contrib/hgk @ 1340:faa62c7685fb

hgk is a wish script --- mercurial-0.7.orig/contrib/hgk 2005-09-23 11:02:21.000000000 +0200 +++ mercurial-0.7/contrib/hgk 2005-09-23 11:07:57.000000000 +0200 @@ -1,6 +1,4 @@ -#!/bin/sh -# Tcl ignores the next line -*- tcl -*- \ -exec wish "$0" -- "${1+$@}" +#!/usr/bin/wish # Copyright (C) 2005 Paul Mackerras. All rights reserved. # This program is free software; it may be used, copied, modified

author	Vincent Danjean
date	Fri, 23 Sep 2005 18:58:57 -0700
parents	2073e5a71008
children	f6d73b26dbdb

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

Mercurial > hg > pyhgsh

annotate contrib/hgk @ 1340:faa62c7685fb