##// END OF EJS Templates
revlog: make sure we never use sparserevlog without general delta (issue6056)...
revlog: make sure we never use sparserevlog without general delta (issue6056) We are getting user report where the delta code tries to use `sparse-revlog` logic on repository where `generaldelta` is disabled. This can't work so we ensure the two booleans have a consistent value. Creating this kind of repository is not expected to be possible the current bug report point at a clonebundle related bug that is still to be properly isolated (Yuya Nishihara seems to a have done it). Corrupting a repository to reproduce the issue is possible. A test using this method is included in this fix.

File last commit:

r24604:ce8dd4fd default
r41525:189e06b2 stable
Show More
hgk
4155 lines | 110.5 KiB | text/plain | TextLexer
TK Soh
contrib/hgk: remove hardcoded path to Wish
r1361 #!/usr/bin/env wish
mpm@selenic.com
Initial import of hgit and hgk...
r267
# Copyright (C) 2005 Paul Mackerras. All rights reserved.
# This program is free software; it may be used, copied, modified
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.
Patrick Mezard
hgk: add basic usage and configuration documentation
r5395 #
# See hgk.py for extension usage and configuration.
mpm@selenic.com
Initial import of hgit and hgk...
r267
Patrick Mezard
hgk: enable mouse wheel under Windows....
r4969
# Modified version of Tip 171:
# http://www.tcl.tk/cgi-bin/tct/tip/171.html
#
# The in_mousewheel global was added to fix strange reentrancy issues.
# The whole snipped is activated only under windows, mouse wheel
# bindings working already under MacOSX and Linux.
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 if {[catch {package require Ttk}]} {
# use a shim
namespace eval ttk {
proc style args {}
proc entry args {
eval [linsert $args 0 ::entry] -relief flat
}
}
interp alias {} ttk::button {} button
interp alias {} ttk::frame {} frame
interp alias {} ttk::label {} label
interp alias {} ttk::scrollbar {} scrollbar
interp alias {} ttk::optionMenu {} tk_optionMenu
Andrew Shadura
hgk: update backgroud colour when Ttk is available...
r18805
proc updatepalette {} {}
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 } else {
proc ::ttk::optionMenu {w varName firstValue args} {
upvar #0 $varName var
if {![info exists var]} {
set var $firstValue
}
ttk::menubutton $w -textvariable $varName -menu $w.menu \
-direction flush
menu $w.menu -tearoff 0
$w.menu add radiobutton -label $firstValue -variable $varName
foreach i $args {
$w.menu add radiobutton -label $i -variable $varName
}
return $w.menu
}
Andrew Shadura
hgk: update backgroud colour when Ttk is available...
r18805 proc updatepalette {} {
catch {
tk_setPalette background [ttk::style lookup client -background]
}
}
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 }
Patrick Mezard
hgk: enable mouse wheel under Windows....
r4969 if {[tk windowingsystem] eq "win32"} {
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::style theme use xpnative
Patrick Mezard
hgk: enable mouse wheel under Windows....
r4969 set mw_classes [list Text Listbox Table TreeCtrl]
foreach class $mw_classes { bind $class <MouseWheel> {} }
set in_mousewheel 0
proc ::tk::MouseWheel {wFired X Y D {shifted 0}} {
global in_mousewheel
if { $in_mousewheel != 0 } { return }
# Set event to check based on call
set evt "<[expr {$shifted?{Shift-}:{}}]MouseWheel>"
# do not double-fire in case the class already has a binding
if {[bind [winfo class $wFired] $evt] ne ""} { return }
# obtain the window the mouse is over
set w [winfo containing $X $Y]
# if we are outside the app, try and scroll the focus widget
if {![winfo exists $w]} { catch {set w [focus]} }
if {[winfo exists $w]} {
Thomas Arendsen Hein
Remove trailing spaces, fix indentation
r5143
Patrick Mezard
hgk: enable mouse wheel under Windows....
r4969 if {[bind $w $evt] ne ""} {
# Awkward ... this widget has a MouseWheel binding, but to
# trigger successfully in it, we must give it focus.
catch {focus} old
if {$w ne $old} { focus $w }
set in_mousewheel 1
event generate $w $evt -rootx $X -rooty $Y -delta $D
set in_mousewheel 0
if {$w ne $old} { focus $old }
return
}
# aqua and x11/win32 have different delta handling
if {[tk windowingsystem] ne "aqua"} {
set delta [expr {- ($D / 30)}]
} else {
set delta [expr {- ($D)}]
}
# scrollbars have different call conventions
if {[string match "*Scrollbar" [winfo class $w]]} {
catch {tk::ScrollByUnits $w \
[string index [$w cget -orient] 0] $delta}
} else {
set cmd [list $w [expr {$shifted ? "xview" : "yview"}] \
scroll $delta units]
# Walking up to find the proper widget (handles cases like
# embedded widgets in a canvas)
while {[catch $cmd] && [winfo toplevel $w] ne $w} {
set w [winfo parent $w]
}
}
}
}
bind all <MouseWheel> [list ::tk::MouseWheel %W %X %Y %D 0]
# end of win32 section
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 } else {
Andrew Shadura
hgk: support the old way of getting the current Ttk theme (issue3808)...
r18561 if {[catch {
set theme [ttk::style theme use]
}]} {
set theme $::ttk::currentTheme
}
if {$theme eq "default"} {
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::style theme use clam
}
Thomas Arendsen Hein
Remove trailing spaces, fix indentation
r5143 }
Patrick Mezard
hgk: enable mouse wheel under Windows....
r4969
Andrew Shadura
hgk: update backgroud colour when Ttk is available...
r18805 updatepalette
Patrick Mezard
hgk: enable mouse wheel under Windows....
r4969
Patrick Mezard
hgk: fix right-mouse button handling under macosx
r5392 # Unify right mouse button handling.
# See "mouse buttons on macintosh" thread on comp.lang.tcl
if {[tk windowingsystem] eq "aqua"} {
event add <<B3>> <Control-ButtonPress-1>
event add <<B3>> <Button-2>
} else {
event add <<B3>> <Button-3>
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc gitdir {} {
global env
if {[info exists env(GIT_DIR)]} {
return $env(GIT_DIR)
} else {
return ".hg"
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
Andrew Shadura
hgk: fix pop-up windows...
r18804 proc popupify {w} {
wm resizable $w 0 0
wm withdraw $w
update
set x [expr {([winfo screenwidth .]-[winfo reqwidth $w])/2}]
set y [expr {([winfo screenheight .]-[winfo reqheight $w])/2}]
wm geometry $w +$x+$y
wm transient $w .
wm deiconify $w
wm resizable $w 1 1
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc getcommits {rargs} {
global commits commfd phase canv mainfont env
global startmsecs nextupdate ncmupdate
global ctext maincursor textcursor leftover
# check that we can find a .git directory somewhere...
set gitdir [gitdir]
if {![file isdirectory $gitdir]} {
error_popup "Cannot find the git directory \"$gitdir\"."
mpm@selenic.com
Initial import of hgit and hgk...
r267 exit 1
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set commits {}
set phase getcommits
set startmsecs [clock clicks -milliseconds]
set nextupdate [expr $startmsecs + 100]
set ncmupdate 1
Brendan Cully
hgk: add --limit, and revranges
r3093 set limit 0
set revargs {}
Andrew Shadura
hgk: pass --hidden switch to hg subprocesses when needed
r24512 set showhidden no
Brendan Cully
hgk: add --limit, and revranges
r3093 for {set i 0} {$i < [llength $rargs]} {incr i} {
set opt [lindex $rargs $i]
Andrew Shadura
hgk: pass --hidden switch to hg subprocesses when needed
r24512 switch -- $opt --limit {
Brendan Cully
hgk: add --limit, and revranges
r3093 incr i
set limit [lindex $rargs $i]
Andrew Shadura
hgk: pass --hidden switch to hg subprocesses when needed
r24512 } --hidden {
set showhidden yes
} default {
Brendan Cully
hgk: add --limit, and revranges
r3093 lappend revargs $opt
}
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if [catch {
Andrew Shadura
hgk: remove no longer needed debug-rev-parse command
r24515 set parse_args [concat tip $revargs]
set parse_temp [eval exec {$env(HG)} --config ui.report_untrusted=false log --template '{node}\n' $parse_args]
"Andrei Vermel "
hgk - fix CR issues on windows
r3940 regsub -all "\r\n" $parse_temp "\n" parse_temp
set parsed_args [split $parse_temp "\n"]
Brendan Cully
hgk: add --limit, and revranges
r3093 } err] {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 # if git-rev-parse failed for some reason...
if {$rargs == {}} {
Brendan Cully
hgk: add --limit, and revranges
r3093 set revargs HEAD
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
Brendan Cully
hgk: add --limit, and revranges
r3093 set parsed_args $revargs
}
if {$limit > 0} {
set parsed_args [concat -n $limit $parsed_args]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
Andrew Shadura
hgk: pass --hidden switch to hg subprocesses when needed
r24512 if {$showhidden} {
append parsed_args --hidden
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if [catch {
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 set commfd [open "|{$env(HG)} --config ui.report_untrusted=false debug-rev-list --header --topo-order --parents $parsed_args" r]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 } err] {
mpm@selenic.com
hgit -> hgk.py...
r1278 puts stderr "Error executing hg debug-rev-list: $err"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 exit 1
}
set leftover {}
Andrew Shadura
hgk: ignore ctrl-z as EOF on windows...
r20763 fconfigure $commfd -blocking 0 -translation lf -eofchar {}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 fileevent $commfd readable [list getcommitlines $commfd]
mpm@selenic.com
Initial import of hgit and hgk...
r267 $canv delete all
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $canv create text 3 3 -anchor nw -text "Reading commits..." \
mpm@selenic.com
Initial import of hgit and hgk...
r267 -font $mainfont -tags textitems
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 . config -cursor watch
settextcursor watch
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc getcommitlines {commfd} {
global commits parents cdate children
global commitlisted phase commitinfo nextupdate
global stopped redisplaying leftover
set stuff [read $commfd]
if {$stuff == {}} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {![eof $commfd]} return
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 # set it blocking so we wait for the process to terminate
mpm@selenic.com
Initial import of hgit and hgk...
r267 fconfigure $commfd -blocking 1
if {![catch {close $commfd} err]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 after idle finishcommits
mpm@selenic.com
Initial import of hgit and hgk...
r267 return
}
if {[string range $err 0 4] == "usage"} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set err \
{Gitk: error reading commits: bad arguments to git-rev-list.
(Note: arguments to gitk are passed to git-rev-list
to allow selection of commits to be displayed.)}
mpm@selenic.com
Initial import of hgit and hgk...
r267 } else {
set err "Error reading commits: $err"
}
error_popup $err
exit 1
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set start 0
while 1 {
set i [string first "\0" $stuff $start]
if {$i < 0} {
append leftover [string range $stuff $start end]
return
}
set cmit [string range $stuff $start [expr {$i - 1}]]
if {$start == 0} {
set cmit "$leftover$cmit"
set leftover {}
}
set start [expr {$i + 1}]
"Andrei Vermel "
hgk - fix CR issues on windows
r3940 regsub -all "\r\n" $cmit "\n" cmit
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set j [string first "\n" $cmit]
set ok 0
if {$j >= 0} {
set ids [string range $cmit 0 [expr {$j - 1}]]
set ok 1
foreach id $ids {
TK Soh
hgk: use short changeset hashes...
r3059 if {![regexp {^[0-9a-f]{12}$} $id]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set ok 0
break
}
}
}
if {!$ok} {
set shortcmit $cmit
if {[string length $shortcmit] > 80} {
set shortcmit "[string range $shortcmit 0 80]..."
}
mpm@selenic.com
hgit -> hgk.py...
r1278 error_popup "Can't parse hg debug-rev-list output: {$shortcmit}"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 exit 1
}
set id [lindex $ids 0]
set olds [lrange $ids 1 end]
set cmit [string range $cmit [expr {$j + 1}] end]
lappend commits $id
set commitlisted($id) 1
parsecommit $id $cmit 1 [lrange $ids 1 end]
drawcommit $id
if {[clock clicks -milliseconds] >= $nextupdate} {
doupdate 1
}
while {$redisplaying} {
set redisplaying 0
if {$stopped == 1} {
set stopped 0
set phase "getcommits"
foreach id $commits {
drawcommit $id
if {$stopped} break
if {[clock clicks -milliseconds] >= $nextupdate} {
doupdate 1
}
}
}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc doupdate {reading} {
global commfd nextupdate numcommits ncmupdate
if {$reading} {
fileevent $commfd readable {}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 update
set nextupdate [expr {[clock clicks -milliseconds] + 100}]
if {$numcommits < 100} {
set ncmupdate [expr {$numcommits + 1}]
} elseif {$numcommits < 10000} {
set ncmupdate [expr {$numcommits + 10}]
} else {
set ncmupdate [expr {$numcommits + 100}]
}
if {$reading} {
fileevent $commfd readable [list getcommitlines $commfd]
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc readcommit {id} {
Thomas Arendsen Hein
hgk: Use $HG instead of hg (see 849f011dbf79)
r4688 global env
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 if [catch {set contents [exec $env(HG) --config ui.report_untrusted=false debug-cat-file commit $id]}] return
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 parsecommit $id $contents 0 {}
}
proc parsecommit {id contents listed olds} {
global commitinfo children nchildren parents nparents cdate ncleft
Andrew Shadura
hgk: display obsolete changesets in darkgrey
r24513 global firstparents obsolete
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
mpm@selenic.com
Initial import of hgit and hgk...
r267 set inhdr 1
set comment {}
set headline {}
set auname {}
set audate {}
set comname {}
set comdate {}
Brendan Cully
hgk: add revision numbers
r3092 set rev {}
Patrick Mezard
hgk: display branch name in diff header
r5859 set branch {}
David Soria Parra
hgk: read bookmarks
r13461 set bookmark {}
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {![info exists nchildren($id)]} {
set children($id) {}
set nchildren($id) 0
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set ncleft($id) 0
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set parents($id) $olds
set nparents($id) [llength $olds]
foreach p $olds {
if {![info exists nchildren($p)]} {
set children($p) [list $id]
set nchildren($p) 1
set ncleft($p) 1
} elseif {[lsearch -exact $children($p) $id] < 0} {
lappend children($p) $id
incr nchildren($p)
incr ncleft($p)
}
}
"Andrei Vermel "
hgk - fix CR issues on windows
r3940 regsub -all "\r\n" $contents "\n" contents
mpm@selenic.com
Initial import of hgit and hgk...
r267 foreach line [split $contents "\n"] {
if {$inhdr} {
Thomas Arendsen Hein
Fix hg view if author's name contains unmatched quotes. (issue248)...
r2297 set line [split $line]
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {$line == {}} {
set inhdr 0
} else {
set tag [lindex $line 0]
Andrew Shadura
hgk: use switch instead of a less efficient if/elseif/if
r24531 switch -- $tag "author" {
mpm@selenic.com
Initial import of hgit and hgk...
r267 set x [expr {[llength $line] - 2}]
set audate [lindex $line $x]
Thomas Arendsen Hein
Fix hg view if author's name contains unmatched quotes. (issue248)...
r2297 set auname [join [lrange $line 1 [expr {$x - 1}]]]
Andrew Shadura
hgk: use switch instead of a less efficient if/elseif/if
r24531 } "committer" {
mpm@selenic.com
Initial import of hgit and hgk...
r267 set x [expr {[llength $line] - 2}]
set comdate [lindex $line $x]
Thomas Arendsen Hein
Fix hg view if author's name contains unmatched quotes. (issue248)...
r2297 set comname [join [lrange $line 1 [expr {$x - 1}]]]
Andrew Shadura
hgk: use switch instead of a less efficient if/elseif/if
r24531 } "revision" {
Brendan Cully
hgk: add revision numbers
r3092 set rev [lindex $line 1]
Andrew Shadura
hgk: use switch instead of a less efficient if/elseif/if
r24531 } "branch" {
Patrick Mezard
hgk: display branch name in diff header
r5859 set branch [join [lrange $line 1 end]]
Andrew Shadura
hgk: use switch instead of a less efficient if/elseif/if
r24531 } "bookmark" {
David Soria Parra
hgk: read bookmarks
r13461 set bookmark [join [lrange $line 1 end]]
Andrew Shadura
hgk: use switch instead of a less efficient if/elseif/if
r24531 } "obsolete" {
Andrew Shadura
hgk: display obsolete changesets in darkgrey
r24513 set obsolete($id) ""
Andrew Shadura
hgk: use switch instead of a less efficient if/elseif/if
r24531 } "phase" {
Andrew Shadura
hgk: show secret changesets differently (shape and label)
r24529 set phase [lindex $line 1 end]
Andrew Shadura
hgk: use switch instead of a less efficient if/elseif/if
r24531 }
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
} else {
if {$comment == {}} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set headline [string trim $line]
mpm@selenic.com
Initial import of hgit and hgk...
r267 } else {
append comment "\n"
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {!$listed} {
# git-rev-list indents the comment by 4 spaces;
# if we got this via git-cat-file, add the indentation
append comment " "
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 append comment $line
}
}
if {$audate != {}} {
Andrew Shadura
hgk: don't use fixed format for dates...
r18803 set audate [clock format $audate]
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
if {$comdate != {}} {
set cdate($id) $comdate
Andrew Shadura
hgk: don't use fixed format for dates...
r18803 set comdate [clock format $comdate]
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
set commitinfo($id) [list $headline $auname $audate \
Andrew Shadura
hgk: show secret changesets differently (shape and label)
r24529 $comname $comdate $comment $rev $branch $bookmark $phase]
Martin Geisler
hgk: select first changeset at startup (issue1382)
r7776
if {[info exists firstparents]} {
set i [lsearch $firstparents $id]
if {$i != -1} {
# remove the parent from firstparents, possible building
# an empty list
set firstparents [concat \
[lrange $firstparents 0 [expr $i - 1]] \
[lrange $firstparents [expr $i + 1] end]]
if {$firstparents eq {}} {
# we have found all parents of the first changeset
# which means that we can safely select the first line
after idle {
selectline 0 0
}
}
}
} else {
# this is the first changeset, save the parents
set firstparents $olds
if {$firstparents eq {}} {
# a repository with a single changeset
after idle {
selectline 0 0
}
}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc readrefs {} {
David Soria Parra
hgk: read bookmarks
r13461 global bookmarkcurrent bookmarkids tagids idtags idbookmarks headids idheads tagcontents env curid
Thomas Arendsen Hein
Removed trailing spaces from everything except test output
r6210
Dennis Schoen
hgk: don't exit if mercurial commands only print warnings
r6322 set status [catch {exec $env(HG) --config ui.report_untrusted=false id} curid]
if { $status != 0 } {
puts $::errorInfo
if { ![string equal $::errorCode NONE] } {
exit 2
}
}
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 regexp -- {[[:xdigit:]]+} $curid curid
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
Dennis Schoen
hgk: don't exit if mercurial commands only print warnings
r6322 set status [catch {exec $env(HG) --config ui.report_untrusted=false tags} tags]
if { $status != 0 } {
puts $::errorInfo
if { ![string equal $::errorCode NONE] } {
exit 2
}
}
Andrew Shadura
hgk: simplify tags parser...
r18808
Andrew Shadura
hgk: fix tag list parser (issue4101)...
r20154 foreach {- tag rev id} [regexp -inline -all -line {^(.+\S)\s+(\d+):(\S+)} $tags] {
Andrew Shadura
hgk: simplify tags parser...
r18808 # we use foreach as Tcl8.4 doesn't support lassign
Andrew Shadura
hgk: fix tag list parser (issue4101)...
r20154 lappend tagids($tag) $id
lappend idtags($id) $tag
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
Michael Sommerville
hgk: Display branch name for each head (issue 740)...
r7039
set status [catch {exec $env(HG) --config ui.report_untrusted=false heads} heads]
if { $status != 0 } {
puts $::errorInfo
if { ![string equal $::errorCode NONE] } {
exit 2
}
}
Andrew Shadura
hgk: remove regsub, split on \r instead...
r18809
set lines [split $heads \r\n]
Michael Sommerville
hgk: Display branch name for each head (issue 740)...
r7039 foreach f $lines {
set match ""
regexp {changeset:\s+(\S+):(\S+)$} $f match id sha
if {$match != ""} {
lappend idheads($sha) $id
}
}
David Soria Parra
hgk: read bookmarks
r13461 set status [catch {exec $env(HG) --config ui.report_untrusted=false bookmarks} bookmarks]
if { $status != 0 } {
puts $::errorInfo
if { ![string equal $::errorCode NONE] } {
exit 2
}
}
set lines [split $bookmarks "\n"]
set bookmarkcurrent 0
foreach f $lines {
regexp {(\S+)$} $f full
regsub {\s+(\S+)$} $f "" direct
set sha [split $full ':']
set bookmark [lindex $sha 1]
set current [string first " * " $direct)]
regsub {^\s(\*|\s)\s} $direct "" direct
lappend bookmarkids($direct) $bookmark
lappend idbookmarks($bookmark) $direct
if {$current >= 0} {
set bookmarkcurrent $direct
}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc readotherrefs {base dname excl} {
global otherrefids idotherrefs
mpm@selenic.com
Initial import of hgit and hgk...
r267
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set git [gitdir]
set files [glob -nocomplain -types f [file join $git $base *]]
foreach f $files {
mpm@selenic.com
Initial import of hgit and hgk...
r267 catch {
set fd [open $f r]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set line [read $fd 40]
TK Soh
hgk: use short changeset hashes...
r3059 if {[regexp {^[0-9a-f]{12}} $line id]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set name "$dname[file tail $f]"
set otherrefids($name) $id
lappend idotherrefs($id) $name
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 close $fd
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set dirs [glob -nocomplain -types d [file join $git $base *]]
foreach d $dirs {
set dir [file tail $d]
if {[lsearch -exact $excl $dir] >= 0} continue
readotherrefs [file join $base $dir] "$dname$dir/" {}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
Patrick Mezard
hgk: enable mouse wheel on MouseWheel events....
r4968 proc allcansmousewheel {delta} {
set delta [expr -5*(int($delta)/abs($delta))]
allcanvs yview scroll $delta units
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 proc error_popup msg {
set w .error
toplevel $w
wm transient $w .
message $w.m -text $msg -justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::button $w.ok -text OK -command "destroy $w"
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack $w.ok -side bottom -fill x
bind $w <Visibility> "grab $w; focus $w"
Andrew Shadura
hgk: fix pop-up windows...
r18804 popupify $w
mpm@selenic.com
Initial import of hgit and hgk...
r267 tkwait window $w
}
proc makewindow {} {
global canv canv2 canv3 linespc charspc ctext cflist textfont
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global findtype findtypemenu findloc findstring fstring geometry
mpm@selenic.com
Initial import of hgit and hgk...
r267 global entries sha1entry sha1string sha1but
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global maincursor textcursor curtextcursor
global rowctxmenu gaudydiff mergemax
Robert Bauck Hamar
hgk: added colour settings for different colours in diff view
r7746 global hgvdiff bgcolor fgcolor diffremcolor diffaddcolor diffmerge1color
global diffmerge2color hunksepcolor
Eduard-Cristian Stefan
hgk: remember main window position
r12634 global posx posy
if {[info exists posx]} {
wm geometry . +$posx+$posy
}
Mads Kiilerich
codingstyle: remove trailing spaces in various text files...
r19023
mpm@selenic.com
Initial import of hgit and hgk...
r267 menu .bar
.bar add cascade -label "File" -menu .bar.file
menu .bar.file
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 .bar.file add command -label "Reread references" -command rereadrefs
mpm@selenic.com
Initial import of hgit and hgk...
r267 .bar.file add command -label "Quit" -command doquit
menu .bar.help
.bar add cascade -label "Help" -menu .bar.help
Javi Merino
hgk: gitk->hgk in About... menu
r13380 .bar.help add command -label "About hgk" -command about
mpm@selenic.com
Initial import of hgit and hgk...
r267 . configure -menu .bar
if {![info exists geometry(canv1)]} {
set geometry(canv1) [expr 45 * $charspc]
set geometry(canv2) [expr 30 * $charspc]
set geometry(canv3) [expr 15 * $charspc]
set geometry(canvh) [expr 25 * $linespc + 4]
set geometry(ctextw) 80
set geometry(ctexth) 30
set geometry(cflistw) 30
}
panedwindow .ctop -orient vertical
if {[info exists geometry(width)]} {
.ctop conf -width $geometry(width) -height $geometry(height)
set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
set geometry(ctexth) [expr {($texth - 8) /
[font metrics $textfont -linespace]}]
}
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::frame .ctop.top
ttk::frame .ctop.top.bar
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack .ctop.top.bar -side bottom -fill x
set cscroll .ctop.top.csb
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::scrollbar $cscroll -command {allcanvs yview}
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack $cscroll -side right -fill y
panedwindow .ctop.top.clist -orient horizontal -sashpad 0 -handlesize 4
pack .ctop.top.clist -side top -fill both -expand 1
.ctop add .ctop.top
set canv .ctop.top.clist.canv
canvas $canv -height $geometry(canvh) -width $geometry(canv1) \
Robert Bauck Hamar
hgk: Add background colour setting...
r7738 -bg $bgcolor -bd 0 \
Andrew Shadura
hgk: specify some colours explicitly in hex...
r17960 -yscrollincr $linespc -yscrollcommand "$cscroll set" -selectbackground "#c0c0c0"
mpm@selenic.com
Initial import of hgit and hgk...
r267 .ctop.top.clist add $canv
set canv2 .ctop.top.clist.canv2
canvas $canv2 -height $geometry(canvh) -width $geometry(canv2) \
Andrew Shadura
hgk: specify some colours explicitly in hex...
r17960 -bg $bgcolor -bd 0 -yscrollincr $linespc -selectbackground "#c0c0c0"
mpm@selenic.com
Initial import of hgit and hgk...
r267 .ctop.top.clist add $canv2
set canv3 .ctop.top.clist.canv3
canvas $canv3 -height $geometry(canvh) -width $geometry(canv3) \
Andrew Shadura
hgk: specify some colours explicitly in hex...
r17960 -bg $bgcolor -bd 0 -yscrollincr $linespc -selectbackground "#c0c0c0"
mpm@selenic.com
Initial import of hgit and hgk...
r267 .ctop.top.clist add $canv3
bind .ctop.top.clist <Configure> {resizeclistpanes %W %w}
set sha1entry .ctop.top.bar.sha1
set entries $sha1entry
set sha1but .ctop.top.bar.sha1label
button $sha1but -text "SHA1 ID: " -state disabled -relief flat \
-command gotocommit -width 8
$sha1but conf -disabledforeground [$sha1but cget -foreground]
pack .ctop.top.bar.sha1label -side left
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::entry $sha1entry -width 40 -font $textfont -textvariable sha1string
mpm@selenic.com
Initial import of hgit and hgk...
r267 trace add variable sha1string write sha1change
pack $sha1entry -side left -pady 2
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
image create bitmap bm-left -data {
#define left_width 16
#define left_height 16
static unsigned char left_bits[] = {
0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
}
image create bitmap bm-right -data {
#define right_width 16
#define right_height 16
static unsigned char right_bits[] = {
0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
}
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::button .ctop.top.bar.leftbut -image bm-left -command goback \
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 -state disabled -width 26
pack .ctop.top.bar.leftbut -side left -fill y
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::button .ctop.top.bar.rightbut -image bm-right -command goforw \
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 -state disabled -width 26
pack .ctop.top.bar.rightbut -side left -fill y
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::button .ctop.top.bar.findbut -text "Find" -command dofind
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack .ctop.top.bar.findbut -side left
set findstring {}
set fstring .ctop.top.bar.findstring
lappend entries $fstring
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::entry $fstring -width 30 -font $textfont -textvariable findstring
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack $fstring -side left -expand 1 -fill x
set findtype Exact
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 set findtypemenu [ttk::optionMenu .ctop.top.bar.findtype \
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 findtype Exact IgnCase Regexp]
mpm@selenic.com
Initial import of hgit and hgk...
r267 set findloc "All fields"
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::optionMenu .ctop.top.bar.findloc findloc "All fields" Headline \
Andrew Shadura
hgk: drop committer field from the UI...
r18801 Comments Author Files Pickaxe
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack .ctop.top.bar.findloc -side right
pack .ctop.top.bar.findtype -side right
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 # for making sure type==Exact whenever loc==Pickaxe
trace add variable findloc write findlocchange
mpm@selenic.com
Initial import of hgit and hgk...
r267
panedwindow .ctop.cdet -orient horizontal
.ctop add .ctop.cdet
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::frame .ctop.cdet.left
mpm@selenic.com
Initial import of hgit and hgk...
r267 set ctext .ctop.cdet.left.ctext
Robert Bauck Hamar
hgk: added setting of foreground colour...
r7745 text $ctext -fg $fgcolor -bg $bgcolor -state disabled -font $textfont \
mpm@selenic.com
Initial import of hgit and hgk...
r267 -width $geometry(ctextw) -height $geometry(ctexth) \
TK Soh
hgk: add horizontal scrollbar to patch window
r1430 -yscrollcommand ".ctop.cdet.left.sb set" \
-xscrollcommand ".ctop.cdet.left.hb set" -wrap none
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::scrollbar .ctop.cdet.left.sb -command "$ctext yview"
ttk::scrollbar .ctop.cdet.left.hb -orient horizontal -command "$ctext xview"
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack .ctop.cdet.left.sb -side right -fill y
TK Soh
hgk: add horizontal scrollbar to patch window
r1430 pack .ctop.cdet.left.hb -side bottom -fill x
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack $ctext -side left -fill both -expand 1
.ctop.cdet add .ctop.cdet.left
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $ctext tag conf filesep -font [concat $textfont bold] -back "#aaaaaa"
if {$gaudydiff} {
$ctext tag conf hunksep -back blue -fore white
$ctext tag conf d0 -back "#ff8080"
$ctext tag conf d1 -back green
} else {
Robert Bauck Hamar
hgk: added colour settings for different colours in diff view
r7746 $ctext tag conf hunksep -fore $hunksepcolor
$ctext tag conf d0 -fore $diffremcolor
$ctext tag conf d1 -fore $diffaddcolor
# The mX colours seem to be used in merge changesets, where m0
# is first parent, m1 is second parent and so on. Git can have
# several parents, Hg cannot, so I think the m2..mmax would be
# unused.
$ctext tag conf m0 -fore $diffmerge1color
$ctext tag conf m1 -fore $diffmerge2color
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $ctext tag conf m2 -fore green
$ctext tag conf m3 -fore purple
$ctext tag conf m4 -fore brown
$ctext tag conf mmax -fore darkgrey
set mergemax 5
$ctext tag conf mresult -font [concat $textfont bold]
$ctext tag conf msep -font [concat $textfont bold]
$ctext tag conf found -back yellow
}
mpm@selenic.com
Initial import of hgit and hgk...
r267
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::frame .ctop.cdet.right
mpm@selenic.com
Initial import of hgit and hgk...
r267 set cflist .ctop.cdet.right.cfiles
Robert Bauck Hamar
hgk: added setting of foreground colour...
r7745 listbox $cflist -fg $fgcolor -bg $bgcolor \
-selectmode extended -width $geometry(cflistw) \
mpm@selenic.com
Initial import of hgit and hgk...
r267 -yscrollcommand ".ctop.cdet.right.sb set"
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::scrollbar .ctop.cdet.right.sb -command "$cflist yview"
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack .ctop.cdet.right.sb -side right -fill y
pack $cflist -side left -fill both -expand 1
.ctop.cdet add .ctop.cdet.right
bind .ctop.cdet <Configure> {resizecdetpanes %W %w}
pack .ctop -side top -fill both -expand 1
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 bindall <1> {selcanvline %W %x %y}
#bindall <B1-Motion> {selcanvline %W %x %y}
Patrick Mezard
hgk: enable mouse wheel on MouseWheel events....
r4968 bindall <MouseWheel> "allcansmousewheel %D"
mpm@selenic.com
Initial import of hgit and hgk...
r267 bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
bindall <2> "allcanvs scan mark 0 %y"
bindall <B2-Motion> "allcanvs scan dragto 0 %y"
bind . <Key-Up> "selnextline -1"
bind . <Key-Down> "selnextline 1"
bind . <Key-Prior> "allcanvs yview scroll -1 pages"
bind . <Key-Next> "allcanvs yview scroll 1 pages"
bindkey <Key-Delete> "$ctext yview scroll -1 pages"
bindkey <Key-BackSpace> "$ctext yview scroll -1 pages"
bindkey <Key-space> "$ctext yview scroll 1 pages"
bindkey p "selnextline -1"
bindkey n "selnextline 1"
bindkey b "$ctext yview scroll -1 pages"
bindkey d "$ctext yview scroll 18 units"
bindkey u "$ctext yview scroll -18 units"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 bindkey / {findnext 1}
bindkey <Key-Return> {findnext 0}
mpm@selenic.com
Initial import of hgit and hgk...
r267 bindkey ? findprev
bindkey f nextfile
bind . <Control-q> doquit
Eric Bloodworth
Add control-w key binding to quit hgk.
r1429 bind . <Control-w> doquit
mpm@selenic.com
Initial import of hgit and hgk...
r267 bind . <Control-f> dofind
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 bind . <Control-g> {findnext 0}
mpm@selenic.com
Initial import of hgit and hgk...
r267 bind . <Control-r> findprev
bind . <Control-equal> {incrfont 1}
bind . <Control-KP_Add> {incrfont 1}
bind . <Control-minus> {incrfont -1}
bind . <Control-KP_Subtract> {incrfont -1}
bind $cflist <<ListboxSelect>> listboxsel
bind . <Destroy> {savestuff %W}
bind . <Button-1> "click %W"
bind $fstring <Key-Return> dofind
bind $sha1entry <Key-Return> gotocommit
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 bind $sha1entry <<PasteSelection>> clearsha1
set maincursor [. cget -cursor]
set textcursor [$ctext cget -cursor]
set curtextcursor $textcursor
set rowctxmenu .rowctxmenu
menu $rowctxmenu -tearoff 0
$rowctxmenu add command -label "Diff this -> selected" \
-command {diffvssel 0}
$rowctxmenu add command -label "Diff selected -> this" \
-command {diffvssel 1}
$rowctxmenu add command -label "Make patch" -command mkpatch
$rowctxmenu add command -label "Create tag" -command mktag
$rowctxmenu add command -label "Write commit to file" -command writecommit
Patrick Mezard
hgk: add context menu visual diff action...
r5394 if { $hgvdiff ne "" } {
$rowctxmenu add command -label "Visual diff with parent" \
-command {vdiff 1}
$rowctxmenu add command -label "Visual diff with selected" \
-command {vdiff 0}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
# when we make a key binding for the toplevel, make sure
# it doesn't get triggered when that key is pressed in the
# find string entry widget.
proc bindkey {ev script} {
global entries
bind . $ev $script
set escript [bind Entry $ev]
if {$escript == {}} {
set escript [bind Entry <Key>]
}
foreach e $entries {
bind $e $ev "$escript; break"
}
}
# set the focus back to the toplevel for any click outside
# the entry widgets
proc click {w} {
Andrew Shadura
hgk: enable selected patch text on Windows...
r20764 global ctext entries
foreach e [concat $entries $ctext] {
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {$w == $e} return
}
focus .
}
proc savestuff {w} {
global canv canv2 canv3 ctext cflist mainfont textfont
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global stuffsaved findmergefiles gaudydiff maxgraphpct
Robert Bauck Hamar
hgk: added setting of foreground colour...
r7745 global maxwidth authorcolors curidfont bgcolor fgcolor
Robert Bauck Hamar
hgk: added colour settings for different colours in diff view
r7746 global diffremcolor diffaddcolor hunksepcolor
global diffmerge1color diffmerge2color
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {$stuffsaved} return
if {![winfo viewable .]} return
catch {
bdowning@lavos.net
hgk: change config file from .gitk to .hgk...
r5506 set f [open "~/.hgk-new" w]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 puts $f [list set mainfont $mainfont]
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 puts $f [list set curidfont $curidfont]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 puts $f [list set textfont $textfont]
puts $f [list set findmergefiles $findmergefiles]
puts $f [list set gaudydiff $gaudydiff]
puts $f [list set maxgraphpct $maxgraphpct]
puts $f [list set maxwidth $maxwidth]
mpm@selenic.com
Initial import of hgit and hgk...
r267 puts $f "set geometry(width) [winfo width .ctop]"
puts $f "set geometry(height) [winfo height .ctop]"
puts $f "set geometry(canv1) [expr [winfo width $canv]-2]"
puts $f "set geometry(canv2) [expr [winfo width $canv2]-2]"
puts $f "set geometry(canv3) [expr [winfo width $canv3]-2]"
puts $f "set geometry(canvh) [expr [winfo height $canv]-2]"
set wid [expr {([winfo width $ctext] - 8) \
/ [font measure $textfont "0"]}]
puts $f "set geometry(ctextw) $wid"
set wid [expr {([winfo width $cflist] - 11) \
/ [font measure [$cflist cget -font] "0"]}]
puts $f "set geometry(cflistw) $wid"
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 puts $f "#"
Eduard-Cristian Stefan
hgk: remember main window position
r12634 puts $f "# main window position:"
puts $f "set posx [winfo x .]"
puts $f "set posy [winfo y .]"
puts $f "#"
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 puts $f "# authorcolors format:"
puts $f "#"
puts $f "# zero or more sublists of"
puts $f "#"
puts $f "# { regex color }"
puts $f "#"
puts $f "# followed by a list of colors"
puts $f "#"
puts $f "# If the commit author matches a regex in a sublist,"
puts $f "# the commit will be colored by that color"
puts $f "# otherwise the next unused entry from the list of colors"
puts $f "# will be assigned to this commit and also all other commits"
puts $f "# of the same author. When the list of colors is exhausted,"
puts $f "# the last entry will be reused."
puts $f "#"
puts $f "set authorcolors {$authorcolors}"
Robert Bauck Hamar
hgk: added explanation to .hgk for background colour
r7747 puts $f "#"
puts $f "# The background color in the text windows"
Robert Bauck Hamar
hgk: Add background colour setting...
r7738 puts $f "set bgcolor $bgcolor"
Robert Bauck Hamar
hgk: added setting of foreground colour...
r7745 puts $f "#"
puts $f "# The text color used in the diff and file list view"
puts $f "set fgcolor $fgcolor"
Robert Bauck Hamar
hgk: added colour settings for different colours in diff view
r7746 puts $f "#"
puts $f "# Color to display + lines in diffs"
puts $f "set diffaddcolor $diffaddcolor"
puts $f "#"
puts $f "# Color to display - lines in diffs"
puts $f "set diffremcolor $diffremcolor"
puts $f "#"
puts $f "# Merge diffs: Color to signal lines from first parent"
puts $f "set diffmerge1color $diffmerge1color"
puts $f "#"
puts $f "# Merge diffs: Color to signal lines from second parent"
puts $f "set diffmerge2color $diffmerge2color"
puts $f "#"
puts $f "# Hunkseparator (@@ -lineno,lines +lineno,lines @@) color"
puts $f "set hunksepcolor $hunksepcolor"
mpm@selenic.com
Initial import of hgit and hgk...
r267 close $f
bdowning@lavos.net
hgk: change config file from .gitk to .hgk...
r5506 file rename -force "~/.hgk-new" "~/.hgk"
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
set stuffsaved 1
}
proc resizeclistpanes {win w} {
global oldwidth
if [info exists oldwidth($win)] {
set s0 [$win sash coord 0]
set s1 [$win sash coord 1]
if {$w < 60} {
set sash0 [expr {int($w/2 - 2)}]
set sash1 [expr {int($w*5/6 - 2)}]
} else {
set factor [expr {1.0 * $w / $oldwidth($win)}]
set sash0 [expr {int($factor * [lindex $s0 0])}]
set sash1 [expr {int($factor * [lindex $s1 0])}]
if {$sash0 < 30} {
set sash0 30
}
if {$sash1 < $sash0 + 20} {
set sash1 [expr $sash0 + 20]
}
if {$sash1 > $w - 10} {
set sash1 [expr $w - 10]
if {$sash0 > $sash1 - 20} {
set sash0 [expr $sash1 - 20]
}
}
}
$win sash place 0 $sash0 [lindex $s0 1]
$win sash place 1 $sash1 [lindex $s1 1]
}
set oldwidth($win) $w
}
proc resizecdetpanes {win w} {
global oldwidth
if [info exists oldwidth($win)] {
set s0 [$win sash coord 0]
if {$w < 60} {
set sash0 [expr {int($w*3/4 - 2)}]
} else {
set factor [expr {1.0 * $w / $oldwidth($win)}]
set sash0 [expr {int($factor * [lindex $s0 0])}]
if {$sash0 < 45} {
set sash0 45
}
if {$sash0 > $w - 15} {
set sash0 [expr $w - 15]
}
}
$win sash place 0 $sash0 [lindex $s0 1]
}
set oldwidth($win) $w
}
proc allcanvs args {
global canv canv2 canv3
eval $canv $args
eval $canv2 $args
eval $canv3 $args
}
proc bindall {event action} {
global canv canv2 canv3
bind $canv $event $action
bind $canv2 $event $action
bind $canv3 $event $action
}
proc about {} {
set w .about
if {[winfo exists $w]} {
raise $w
return
}
toplevel $w
Javi Merino
hgk: gitk->hgk in About... menu
r13380 wm title $w "About hgk"
mpm@selenic.com
Initial import of hgit and hgk...
r267 message $w.m -text {
Javi Merino
hgk: gitk->hgk in About... menu
r13380 Hgk version 1.2
mpm@selenic.com
Initial import of hgit and hgk...
r267
Copyright � 2005 Paul Mackerras
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 Use and redistribute under the terms of the GNU General Public License} \
mpm@selenic.com
Initial import of hgit and hgk...
r267 -justify center -aspect 400
pack $w.m -side top -fill x -padx 20 -pady 20
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::button $w.ok -text Close -command "destroy $w"
mpm@selenic.com
Initial import of hgit and hgk...
r267 pack $w.ok -side bottom
Andrew Shadura
hgk: fix pop-up windows...
r18804 popupify $w
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 set aunextcolor 0
proc assignauthorcolor {name} {
global authorcolors aucolormap aunextcolor
if [info exists aucolormap($name)] return
set randomcolors {black}
for {set i 0} {$i < [llength $authorcolors]} {incr i} {
set col [lindex $authorcolors $i]
if {[llength $col] > 1} {
set re [lindex $col 0]
set c [lindex $col 1]
if {[regexp -- $re $name]} {
set aucolormap($name) $c
return
}
} else {
set randomcolors [lrange $authorcolors $i end]
break
}
}
set ncolors [llength $randomcolors]
set c [lindex $randomcolors $aunextcolor]
if {[incr aunextcolor] >= $ncolors} {
incr aunextcolor -1
}
set aucolormap($name) $c
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 proc assigncolor {id} {
global commitinfo colormap commcolors colors nextcolor
global parents nparents children nchildren
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global cornercrossings crossings
mpm@selenic.com
Initial import of hgit and hgk...
r267 if [info exists colormap($id)] return
set ncolors [llength $colors]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$nparents($id) <= 1 && $nchildren($id) == 1} {
set child [lindex $children($id) 0]
if {[info exists colormap($child)]
&& $nparents($child) == 1} {
set colormap($id) $colormap($child)
return
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
set badcolors {}
if {[info exists cornercrossings($id)]} {
foreach x $cornercrossings($id) {
if {[info exists colormap($x)]
&& [lsearch -exact $badcolors $colormap($x)] < 0} {
lappend badcolors $colormap($x)
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {[llength $badcolors] >= $ncolors} {
set badcolors {}
}
}
set origbad $badcolors
if {[llength $badcolors] < $ncolors - 1} {
if {[info exists crossings($id)]} {
foreach x $crossings($id) {
if {[info exists colormap($x)]
&& [lsearch -exact $badcolors $colormap($x)] < 0} {
lappend badcolors $colormap($x)
}
}
if {[llength $badcolors] >= $ncolors} {
set badcolors $origbad
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set origbad $badcolors
}
if {[llength $badcolors] < $ncolors - 1} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 foreach child $children($id) {
if {[info exists colormap($child)]
&& [lsearch -exact $badcolors $colormap($child)] < 0} {
lappend badcolors $colormap($child)
}
if {[info exists parents($child)]} {
foreach p $parents($child) {
if {[info exists colormap($p)]
&& [lsearch -exact $badcolors $colormap($p)] < 0} {
lappend badcolors $colormap($p)
}
}
}
}
if {[llength $badcolors] >= $ncolors} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set badcolors $origbad
}
}
for {set i 0} {$i <= $ncolors} {incr i} {
set c [lindex $colors $nextcolor]
if {[incr nextcolor] >= $ncolors} {
set nextcolor 0
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {[lsearch -exact $badcolors $c]} break
}
set colormap($id) $c
}
proc initgraph {} {
global canvy canvy0 lineno numcommits nextcolor linespc
global mainline mainlinearrow sidelines
global nchildren ncleft
global displist nhyperspace
allcanvs delete all
set nextcolor 0
set canvy $canvy0
set lineno -1
set numcommits 0
catch {unset mainline}
catch {unset mainlinearrow}
catch {unset sidelines}
foreach id [array names nchildren] {
set ncleft($id) $nchildren($id)
}
set displist {}
set nhyperspace 0
}
proc bindline {t id} {
global canv
$canv bind $t <Enter> "lineenter %x %y $id"
$canv bind $t <Motion> "linemotion %x %y $id"
$canv bind $t <Leave> "lineleave $id"
$canv bind $t <Button-1> "lineclick %x %y $id 1"
}
proc drawlines {id xtra} {
global mainline mainlinearrow sidelines lthickness colormap canv
$canv delete lines.$id
if {[info exists mainline($id)]} {
set t [$canv create line $mainline($id) \
-width [expr {($xtra + 1) * $lthickness}] \
-fill $colormap($id) -tags lines.$id \
-arrow $mainlinearrow($id)]
$canv lower $t
bindline $t $id
}
if {[info exists sidelines($id)]} {
foreach ls $sidelines($id) {
set coords [lindex $ls 0]
set thick [lindex $ls 1]
set arrow [lindex $ls 2]
set t [$canv create line $coords -fill $colormap($id) \
-width [expr {($thick + $xtra) * $lthickness}] \
-arrow $arrow -tags lines.$id]
$canv lower $t
bindline $t $id
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 # level here is an index in displist
proc drawcommitline {level} {
global parents children nparents displist
global canv canv2 canv3 mainfont namefont canvy linespc
mpm@selenic.com
Initial import of hgit and hgk...
r267 global lineid linehtag linentag linedtag commitinfo
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global colormap numcommits currentparents dupparents
David Soria Parra
hgk: read bookmarks
r13461 global idtags idline idheads idotherrefs idbookmarks
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global lineno lthickness mainline mainlinearrow sidelines
global commitlisted rowtextx idpos lastuse displist
global oldnlines olddlevel olddisplist
Andrew Shadura
hgk: display obsolete changesets in darkgrey
r24513 global aucolormap curid curidfont obsolete
mpm@selenic.com
Initial import of hgit and hgk...
r267
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 incr numcommits
incr lineno
set id [lindex $displist $level]
set lastuse($id) $lineno
set lineid($lineno) $id
set idline($id) $lineno
Andrew Shadura
hgk: show secret changesets differently (shape and label)
r24529 set shape oval
Andrew Shadura
hgk: set distinct fill and outline colour for non-public and obsolete changesets
r24530 set outline #000080
set ofill [expr {[info exists commitlisted($id)]? "#7f7fff": "white"}]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {![info exists commitinfo($id)]} {
readcommit $id
if {![info exists commitinfo($id)]} {
set commitinfo($id) {"No commit information available"}
mpm@selenic.com
Initial import of hgit and hgk...
r267 set nparents($id) 0
}
Andrew Shadura
hgk: show secret changesets differently (shape and label)
r24529 } else {
Andrew Shadura
hgk: set distinct fill and outline colour for non-public and obsolete changesets
r24530 switch [lindex $commitinfo($id) 9] secret {
Andrew Shadura
hgk: show secret changesets differently (shape and label)
r24529 set shape rect
Andrew Shadura
hgk: set distinct fill and outline colour for non-public and obsolete changesets
r24530 } public {
set outline black
set ofill blue
Andrew Shadura
hgk: show secret changesets differently (shape and label)
r24529 }
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
Andrew Shadura
hgk: display obsolete changesets in darkgrey
r24513 if {[info exists obsolete($id)]} {
Andrew Shadura
hgk: set distinct fill and outline colour for non-public and obsolete changesets
r24530 set outline darkgrey
set ofill lightgrey
Andrew Shadura
hgk: display obsolete changesets in darkgrey
r24513 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 assigncolor $id
set currentparents {}
set dupparents {}
if {[info exists commitlisted($id)] && [info exists parents($id)]} {
foreach p $parents($id) {
if {[lsearch -exact $currentparents $p] < 0} {
lappend currentparents $p
} else {
# remember that this parent was listed twice
lappend dupparents $p
}
}
}
set x [xcoord $level $level $lineno]
set y1 $canvy
set canvy [expr $canvy + $linespc]
allcanvs conf -scrollregion \
[list 0 0 0 [expr $y1 + 0.5 * $linespc + 2]]
if {[info exists mainline($id)]} {
lappend mainline($id) $x $y1
if {$mainlinearrow($id) ne "none"} {
set mainline($id) [trimdiagstart $mainline($id)]
}
}
drawlines $id 0
set orad [expr {$linespc / 3}]
Andrew Shadura
hgk: show secret changesets differently (shape and label)
r24529 set t [$canv create $shape [expr $x - $orad] [expr $y1 - $orad] \
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 [expr $x + $orad - 1] [expr $y1 + $orad - 1] \
Andrew Shadura
hgk: set distinct fill and outline colour for non-public and obsolete changesets
r24530 -fill $ofill -outline $outline -width 1]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $canv raise $t
$canv bind $t <1> {selcanvline {} %x %y}
set xt [xcoord [llength $displist] $level $lineno]
if {[llength $currentparents] > 2} {
set xt [expr {$xt + ([llength $currentparents] - 2) * $linespc}]
}
set rowtextx($lineno) $xt
set idpos($id) [list $x $xt $y1]
if {[info exists idtags($id)] || [info exists idheads($id)]
David Soria Parra
hgk: read bookmarks
r13461 || [info exists idotherrefs($id)] || [info exists idbookmarks($id)]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set xt [drawtags $id $x $xt $y1]
}
set headline [lindex $commitinfo($id) 0]
set name [lindex $commitinfo($id) 1]
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 assignauthorcolor $name
set fg $aucolormap($name)
if {$id == $curid} {
set fn $curidfont
} else {
set fn $mainfont
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set date [lindex $commitinfo($id) 2]
set linehtag($lineno) [$canv create text $xt $y1 -anchor w \
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 -text $headline -font $fn \
-fill $fg]
Patrick Mezard
hgk: fix right-mouse button handling under macosx
r5392 $canv bind $linehtag($lineno) <<B3>> "rowmenu %X %Y $id"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set linentag($lineno) [$canv2 create text 3 $y1 -anchor w \
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 -text $name -font $namefont \
-fill $fg]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set linedtag($lineno) [$canv3 create text 3 $y1 -anchor w \
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 -text $date -font $mainfont \
-fill $fg]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
set olddlevel $level
set olddisplist $displist
set oldnlines [llength $displist]
}
proc drawtags {id x xt y1} {
David Soria Parra
hgk: display bookmarks as gray labels in the commitline
r13462 global bookmarkcurrent idtags idbookmarks idheads idotherrefs commitinfo
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global linespc lthickness
global canv mainfont idline rowtextx
set marks {}
David Soria Parra
hgk: display bookmarks as gray labels in the commitline
r13462 set nbookmarks 0
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set ntags 0
set nheads 0
if {[info exists idtags($id)]} {
set marks $idtags($id)
set ntags [llength $marks]
}
David Soria Parra
hgk: display bookmarks as gray labels in the commitline
r13462 if {[info exists idbookmarks($id)]} {
set marks [concat $marks $idbookmarks($id)]
set nbookmarks [llength $idbookmarks($id)]
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {[info exists idheads($id)]} {
Michael Sommerville
hgk: Display branch name for each head (issue 740)...
r7039 set headmark [lindex $commitinfo($id) 7]
if {$headmark ne "default"} {
lappend marks $headmark
set nheads 1
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
if {$marks eq {}} {
return $xt
}
set delta [expr {int(0.5 * ($linespc - $lthickness))}]
set yt [expr $y1 - 0.5 * $linespc]
set yb [expr $yt + $linespc - 1]
set xvals {}
set wvals {}
foreach tag $marks {
set wid [font measure $mainfont $tag]
lappend xvals $xt
lappend wvals $wid
set xt [expr {$xt + $delta + $wid + $lthickness + $linespc}]
}
set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
-width $lthickness -fill black -tags tag.$id]
$canv lower $t
foreach tag $marks x $xvals wid $wvals {
set xl [expr $x + $delta]
set xr [expr $x + $delta + $wid + $lthickness]
if {[incr ntags -1] >= 0} {
# draw a tag
set t [$canv create polygon $x [expr $yt + $delta] $xl $yt \
$xr $yt $xr $yb $xl $yb $x [expr $yb - $delta] \
-width 1 -outline black -fill yellow -tags tag.$id]
$canv bind $t <1> [list showtag $tag 1]
set rowtextx($idline($id)) [expr {$xr + $linespc}]
David Soria Parra
hgk: display bookmarks as gray labels in the commitline
r13462 } elseif {[incr nbookmarks -1] >= 0} {
# draw a tag
Andrew Shadura
hgk: define bookmark colour explicitly, as Tk 8.6 has changed their meaning
r22631 set col "#7f7f7f"
David Soria Parra
hgk: display bookmarks as gray labels in the commitline
r13462 if {[string compare $bookmarkcurrent $tag] == 0} {
Andrew Shadura
hgk: define bookmark colour explicitly, as Tk 8.6 has changed their meaning
r22631 set col "#bebebe"
David Soria Parra
hgk: display bookmarks as gray labels in the commitline
r13462 }
set xl [expr $xl - $delta/2]
$canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-width 1 -outline black -fill $col -tags tag.$id
} else {
# draw a head or other ref
if {[incr nheads -1] >= 0} {
Andrew Shadura
hgk: specify some colours explicitly in hex...
r17960 set col "#00ff00"
David Soria Parra
hgk: display bookmarks as gray labels in the commitline
r13462 } else {
set col "#ddddff"
}
set xl [expr $xl - $delta/2]
$canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-width 1 -outline black -fill $col -tags tag.$id
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
set t [$canv create text $xl $y1 -anchor w -text $tag \
-font $mainfont -tags tag.$id]
if {$ntags >= 0} {
$canv bind $t <1> [list showtag $tag 1]
}
}
return $xt
}
proc notecrossings {id lo hi corner} {
global olddisplist crossings cornercrossings
for {set i $lo} {[incr i] < $hi} {} {
set p [lindex $olddisplist $i]
if {$p == {}} continue
if {$i == $corner} {
if {![info exists cornercrossings($id)]
|| [lsearch -exact $cornercrossings($id) $p] < 0} {
lappend cornercrossings($id) $p
}
if {![info exists cornercrossings($p)]
|| [lsearch -exact $cornercrossings($p) $id] < 0} {
lappend cornercrossings($p) $id
}
} else {
if {![info exists crossings($id)]
|| [lsearch -exact $crossings($id) $p] < 0} {
lappend crossings($id) $p
}
if {![info exists crossings($p)]
|| [lsearch -exact $crossings($p) $id] < 0} {
lappend crossings($p) $id
}
}
}
}
proc xcoord {i level ln} {
global canvx0 xspc1 xspc2
set x [expr {$canvx0 + $i * $xspc1($ln)}]
if {$i > 0 && $i == $level} {
set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
} elseif {$i > $level} {
set x [expr {$x + $xspc2 - $xspc1($ln)}]
}
return $x
}
# it seems Tk can't draw arrows on the end of diagonal line segments...
proc trimdiagend {line} {
while {[llength $line] > 4} {
set x1 [lindex $line end-3]
set y1 [lindex $line end-2]
set x2 [lindex $line end-1]
set y2 [lindex $line end]
if {($x1 == $x2) != ($y1 == $y2)} break
set line [lreplace $line end-1 end]
}
return $line
}
proc trimdiagstart {line} {
while {[llength $line] > 4} {
set x1 [lindex $line 0]
set y1 [lindex $line 1]
set x2 [lindex $line 2]
set y2 [lindex $line 3]
if {($x1 == $x2) != ($y1 == $y2)} break
set line [lreplace $line 0 1]
}
return $line
}
proc drawslants {id needonscreen nohs} {
global canv mainline mainlinearrow sidelines
global canvx0 canvy xspc1 xspc2 lthickness
global currentparents dupparents
global lthickness linespc canvy colormap lineno geometry
global maxgraphpct maxwidth
global displist onscreen lastuse
global parents commitlisted
global oldnlines olddlevel olddisplist
global nhyperspace numcommits nnewparents
if {$lineno < 0} {
lappend displist $id
set onscreen($id) 1
return 0
}
set y1 [expr {$canvy - $linespc}]
set y2 $canvy
# work out what we need to get back on screen
set reins {}
if {$onscreen($id) < 0} {
# next to do isn't displayed, better get it on screen...
lappend reins [list $id 0]
}
# make sure all the previous commits's parents are on the screen
foreach p $currentparents {
if {$onscreen($p) < 0} {
lappend reins [list $p 0]
}
}
# bring back anything requested by caller
if {$needonscreen ne {}} {
lappend reins $needonscreen
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 # try the shortcut
if {$currentparents == $id && $onscreen($id) == 0 && $reins eq {}} {
set dlevel $olddlevel
set x [xcoord $dlevel $dlevel $lineno]
set mainline($id) [list $x $y1]
set mainlinearrow($id) none
set lastuse($id) $lineno
set displist [lreplace $displist $dlevel $dlevel $id]
set onscreen($id) 1
set xspc1([expr {$lineno + 1}]) $xspc1($lineno)
return $dlevel
}
# update displist
set displist [lreplace $displist $olddlevel $olddlevel]
set j $olddlevel
foreach p $currentparents {
set lastuse($p) $lineno
if {$onscreen($p) == 0} {
set displist [linsert $displist $j $p]
set onscreen($p) 1
incr j
}
}
if {$onscreen($id) == 0} {
lappend displist $id
set onscreen($id) 1
}
# remove the null entry if present
set nullentry [lsearch -exact $displist {}]
if {$nullentry >= 0} {
set displist [lreplace $displist $nullentry $nullentry]
}
# bring back the ones we need now (if we did it earlier
# it would change displist and invalidate olddlevel)
foreach pi $reins {
# test again in case of duplicates in reins
set p [lindex $pi 0]
if {$onscreen($p) < 0} {
set onscreen($p) 1
set lastuse($p) $lineno
set displist [linsert $displist [lindex $pi 1] $p]
incr nhyperspace -1
}
}
set lastuse($id) $lineno
# see if we need to make any lines jump off into hyperspace
set displ [llength $displist]
if {$displ > $maxwidth} {
set ages {}
foreach x $displist {
lappend ages [list $lastuse($x) $x]
}
set ages [lsort -integer -index 0 $ages]
set k 0
while {$displ > $maxwidth} {
set use [lindex $ages $k 0]
set victim [lindex $ages $k 1]
if {$use >= $lineno - 5} break
incr k
if {[lsearch -exact $nohs $victim] >= 0} continue
set i [lsearch -exact $displist $victim]
set displist [lreplace $displist $i $i]
set onscreen($victim) -1
incr nhyperspace
incr displ -1
if {$i < $nullentry} {
incr nullentry -1
}
set x [lindex $mainline($victim) end-1]
lappend mainline($victim) $x $y1
set line [trimdiagend $mainline($victim)]
set arrow "last"
if {$mainlinearrow($victim) ne "none"} {
set line [trimdiagstart $line]
set arrow "both"
}
lappend sidelines($victim) [list $line 1 $arrow]
unset mainline($victim)
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
set dlevel [lsearch -exact $displist $id]
# If we are reducing, put in a null entry
if {$displ < $oldnlines} {
# does the next line look like a merge?
# i.e. does it have > 1 new parent?
if {$nnewparents($id) > 1} {
set i [expr {$dlevel + 1}]
} elseif {$nnewparents([lindex $olddisplist $olddlevel]) == 0} {
set i $olddlevel
if {$nullentry >= 0 && $nullentry < $i} {
incr i -1
}
} elseif {$nullentry >= 0} {
set i $nullentry
while {$i < $displ
&& [lindex $olddisplist $i] == [lindex $displist $i]} {
incr i
}
} else {
set i $olddlevel
if {$dlevel >= $i} {
incr i
}
}
if {$i < $displ} {
set displist [linsert $displist $i {}]
incr displ
if {$dlevel >= $i} {
incr dlevel
}
}
}
# decide on the line spacing for the next line
set lj [expr {$lineno + 1}]
set maxw [expr {$maxgraphpct * $geometry(canv1) / 100}]
if {$displ <= 1 || $canvx0 + $displ * $xspc2 <= $maxw} {
set xspc1($lj) $xspc2
} else {
set xspc1($lj) [expr {($maxw - $canvx0 - $xspc2) / ($displ - 1)}]
if {$xspc1($lj) < $lthickness} {
set xspc1($lj) $lthickness
}
}
foreach idi $reins {
set id [lindex $idi 0]
set j [lsearch -exact $displist $id]
set xj [xcoord $j $dlevel $lj]
set mainline($id) [list $xj $y2]
set mainlinearrow($id) first
}
set i -1
foreach id $olddisplist {
incr i
if {$id == {}} continue
if {$onscreen($id) <= 0} continue
set xi [xcoord $i $olddlevel $lineno]
if {$i == $olddlevel} {
foreach p $currentparents {
set j [lsearch -exact $displist $p]
set coords [list $xi $y1]
set xj [xcoord $j $dlevel $lj]
if {$xj < $xi - $linespc} {
lappend coords [expr {$xj + $linespc}] $y1
notecrossings $p $j $i [expr {$j + 1}]
} elseif {$xj > $xi + $linespc} {
lappend coords [expr {$xj - $linespc}] $y1
notecrossings $p $i $j [expr {$j - 1}]
}
if {[lsearch -exact $dupparents $p] >= 0} {
# draw a double-width line to indicate the doubled parent
lappend coords $xj $y2
lappend sidelines($p) [list $coords 2 none]
if {![info exists mainline($p)]} {
set mainline($p) [list $xj $y2]
set mainlinearrow($p) none
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 } else {
# normal case, no parent duplicated
set yb $y2
set dx [expr {abs($xi - $xj)}]
if {0 && $dx < $linespc} {
set yb [expr {$y1 + $dx}]
}
if {![info exists mainline($p)]} {
if {$xi != $xj} {
lappend coords $xj $yb
}
set mainline($p) $coords
set mainlinearrow($p) none
} else {
lappend coords $xj $yb
if {$yb < $y2} {
lappend coords $xj $y2
}
lappend sidelines($p) [list $coords 1 none]
}
}
}
} else {
set j $i
if {[lindex $displist $i] != $id} {
set j [lsearch -exact $displist $id]
}
if {$j != $i || $xspc1($lineno) != $xspc1($lj)
|| ($olddlevel < $i && $i < $dlevel)
|| ($dlevel < $i && $i < $olddlevel)} {
set xj [xcoord $j $dlevel $lj]
lappend mainline($id) $xi $y1 $xj $y2
}
}
}
return $dlevel
}
# search for x in a list of lists
proc llsearch {llist x} {
set i 0
foreach l $llist {
if {$l == $x || [lsearch -exact $l $x] >= 0} {
return $i
}
incr i
}
return -1
}
proc drawmore {reading} {
global displayorder numcommits ncmupdate nextupdate
global stopped nhyperspace parents commitlisted
global maxwidth onscreen displist currentparents olddlevel
set n [llength $displayorder]
while {$numcommits < $n} {
set id [lindex $displayorder $numcommits]
set ctxend [expr {$numcommits + 10}]
if {!$reading && $ctxend > $n} {
set ctxend $n
}
set dlist {}
if {$numcommits > 0} {
set dlist [lreplace $displist $olddlevel $olddlevel]
set i $olddlevel
foreach p $currentparents {
if {$onscreen($p) == 0} {
set dlist [linsert $dlist $i $p]
incr i
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set nohs {}
set reins {}
set isfat [expr {[llength $dlist] > $maxwidth}]
if {$nhyperspace > 0 || $isfat} {
if {$ctxend > $n} break
# work out what to bring back and
# what we want to don't want to send into hyperspace
set room 1
for {set k $numcommits} {$k < $ctxend} {incr k} {
set x [lindex $displayorder $k]
set i [llsearch $dlist $x]
if {$i < 0} {
set i [llength $dlist]
lappend dlist $x
}
if {[lsearch -exact $nohs $x] < 0} {
lappend nohs $x
}
if {$reins eq {} && $onscreen($x) < 0 && $room} {
set reins [list $x $i]
}
set newp {}
if {[info exists commitlisted($x)]} {
set right 0
foreach p $parents($x) {
if {[llsearch $dlist $p] < 0} {
lappend newp $p
if {[lsearch -exact $nohs $p] < 0} {
lappend nohs $p
}
if {$reins eq {} && $onscreen($p) < 0 && $room} {
set reins [list $p [expr {$i + $right}]]
}
}
set right 1
}
}
set l [lindex $dlist $i]
if {[llength $l] == 1} {
set l $newp
} else {
set j [lsearch -exact $l $x]
set l [concat [lreplace $l $j $j] $newp]
}
set dlist [lreplace $dlist $i $i $l]
if {$room && $isfat && [llength $newp] <= 1} {
set room 0
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set dlevel [drawslants $id $reins $nohs]
drawcommitline $dlevel
if {[clock clicks -milliseconds] >= $nextupdate
&& $numcommits >= $ncmupdate} {
doupdate $reading
if {$stopped} break
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
}
mpm@selenic.com
Initial import of hgit and hgk...
r267
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 # level here is an index in todo
proc updatetodo {level noshortcut} {
global ncleft todo nnewparents
global commitlisted parents onscreen
set id [lindex $todo $level]
set olds {}
if {[info exists commitlisted($id)]} {
foreach p $parents($id) {
if {[lsearch -exact $olds $p] < 0} {
lappend olds $p
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
if {!$noshortcut && [llength $olds] == 1} {
set p [lindex $olds 0]
if {$ncleft($p) == 1 && [lsearch -exact $todo $p] < 0} {
set ncleft($p) 0
set todo [lreplace $todo $level $level $p]
set onscreen($p) 0
set nnewparents($id) 1
return 0
}
}
set todo [lreplace $todo $level $level]
set i $level
set n 0
foreach p $olds {
incr ncleft($p) -1
set k [lsearch -exact $todo $p]
if {$k < 0} {
set todo [linsert $todo $i $p]
set onscreen($p) 0
incr i
incr n
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
set nnewparents($id) $n
mpm@selenic.com
Initial import of hgit and hgk...
r267
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 return 1
}
proc decidenext {{noread 0}} {
global ncleft todo
global datemode cdate
global commitinfo
# choose which one to do next time around
set todol [llength $todo]
set level -1
set latest {}
for {set k $todol} {[incr k -1] >= 0} {} {
set p [lindex $todo $k]
if {$ncleft($p) == 0} {
if {$datemode} {
if {![info exists commitinfo($p)]} {
if {$noread} {
return {}
}
readcommit $p
}
if {$latest == {} || $cdate($p) > $latest} {
set level $k
set latest $cdate($p)
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
} else {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set level $k
break
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$level < 0} {
if {$todo != {}} {
puts "ERROR: none of the pending commits can be done yet:"
foreach p $todo {
puts " $p ($ncleft($p))"
}
}
return -1
}
return $level
}
proc drawcommit {id} {
global phase todo nchildren datemode nextupdate
global numcommits ncmupdate displayorder todo onscreen
if {$phase != "incrdraw"} {
set phase incrdraw
set displayorder {}
set todo {}
initgraph
}
if {$nchildren($id) == 0} {
lappend todo $id
set onscreen($id) 0
}
set level [decidenext 1]
if {$level == {} || $id != [lindex $todo $level]} {
return
}
while 1 {
lappend displayorder [lindex $todo $level]
if {[updatetodo $level $datemode]} {
set level [decidenext 1]
if {$level == {}} break
}
set id [lindex $todo $level]
if {![info exists commitlisted($id)]} {
break
}
}
drawmore 1
}
proc finishcommits {} {
global phase
global canv mainfont ctext maincursor textcursor
if {$phase != "incrdraw"} {
$canv delete all
$canv create text 3 3 -anchor nw -text "No commits selected" \
-font $mainfont -tags textitems
set phase {}
} else {
drawrest
}
. config -cursor $maincursor
settextcursor $textcursor
}
# Don't change the text pane cursor if it is currently the hand cursor,
# showing that we are over a sha1 ID link.
proc settextcursor {c} {
global ctext curtextcursor
if {[$ctext cget -cursor] == $curtextcursor} {
$ctext config -cursor $c
}
set curtextcursor $c
}
proc drawgraph {} {
global nextupdate startmsecs ncmupdate
global displayorder onscreen
if {$displayorder == {}} return
set startmsecs [clock clicks -milliseconds]
set nextupdate [expr $startmsecs + 100]
set ncmupdate 1
initgraph
foreach id $displayorder {
set onscreen($id) 0
}
drawmore 0
}
proc drawrest {} {
global phase stopped redisplaying selectedline
global datemode todo displayorder
global numcommits ncmupdate
global nextupdate startmsecs
set level [decidenext]
if {$level >= 0} {
set phase drawgraph
while 1 {
lappend displayorder [lindex $todo $level]
set hard [updatetodo $level $datemode]
if {$hard} {
set level [decidenext]
if {$level < 0} break
}
}
drawmore 0
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 set phase {}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set drawmsecs [expr [clock clicks -milliseconds] - $startmsecs]
#puts "overall $drawmsecs ms for $numcommits commits"
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {$redisplaying} {
if {$stopped == 0 && [info exists selectedline]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 selectline $selectedline 0
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
if {$stopped == 1} {
set stopped 0
after idle drawgraph
} else {
set redisplaying 0
}
}
}
proc findmatches {f} {
global findtype foundstring foundstrlen
if {$findtype == "Regexp"} {
set matches [regexp -indices -all -inline $foundstring $f]
} else {
if {$findtype == "IgnCase"} {
set str [string tolower $f]
} else {
set str $f
}
set matches {}
set i 0
while {[set j [string first $foundstring $str $i]] >= 0} {
lappend matches [list $j [expr $j+$foundstrlen-1]]
set i [expr $j + $foundstrlen]
}
}
return $matches
}
proc dofind {} {
global findtype findloc findstring markedmatches commitinfo
global numcommits lineid linehtag linentag linedtag
global mainfont namefont canv canv2 canv3 selectedline
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global matchinglines foundstring foundstrlen
stopfindproc
mpm@selenic.com
Initial import of hgit and hgk...
r267 unmarkmatches
focus .
set matchinglines {}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$findloc == "Pickaxe"} {
findpatches
return
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {$findtype == "IgnCase"} {
set foundstring [string tolower $findstring]
} else {
set foundstring $findstring
}
set foundstrlen [string length $findstring]
if {$foundstrlen == 0} return
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$findloc == "Files"} {
findfiles
return
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {![info exists selectedline]} {
set oldsel -1
} else {
set oldsel $selectedline
}
set didsel 0
Andrew Shadura
hgk: drop committer field from the UI...
r18801 set fldtypes {Headline Author Date CDate Comment}
mpm@selenic.com
Initial import of hgit and hgk...
r267 for {set l 0} {$l < $numcommits} {incr l} {
set id $lineid($l)
set info $commitinfo($id)
set doesmatch 0
foreach f $info ty $fldtypes {
if {$findloc != "All fields" && $findloc != $ty} {
continue
}
set matches [findmatches $f]
if {$matches == {}} continue
set doesmatch 1
if {$ty == "Headline"} {
markmatches $canv $l $f $linehtag($l) $matches $mainfont
} elseif {$ty == "Author"} {
markmatches $canv2 $l $f $linentag($l) $matches $namefont
} elseif {$ty == "Date"} {
markmatches $canv3 $l $f $linedtag($l) $matches $mainfont
}
}
if {$doesmatch} {
lappend matchinglines $l
if {!$didsel && $l > $oldsel} {
findselectline $l
set didsel 1
}
}
}
if {$matchinglines == {}} {
bell
} elseif {!$didsel} {
findselectline [lindex $matchinglines 0]
}
}
proc findselectline {l} {
global findloc commentend ctext
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 selectline $l 1
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {$findloc == "All fields" || $findloc == "Comments"} {
# highlight the matches in the comments
set f [$ctext get 1.0 $commentend]
set matches [findmatches $f]
foreach match $matches {
set start [lindex $match 0]
set end [expr [lindex $match 1] + 1]
$ctext tag add found "1.0 + $start c" "1.0 + $end c"
}
}
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc findnext {restart} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 global matchinglines selectedline
if {![info exists matchinglines]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$restart} {
dofind
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 return
}
if {![info exists selectedline]} return
foreach l $matchinglines {
if {$l > $selectedline} {
findselectline $l
return
}
}
bell
}
proc findprev {} {
global matchinglines selectedline
if {![info exists matchinglines]} {
dofind
return
}
if {![info exists selectedline]} return
set prev {}
foreach l $matchinglines {
if {$l >= $selectedline} break
set prev $l
}
if {$prev != {}} {
findselectline $prev
} else {
bell
}
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc findlocchange {name ix op} {
global findloc findtype findtypemenu
if {$findloc == "Pickaxe"} {
set findtype Exact
set state disabled
} else {
set state normal
}
$findtypemenu entryconf 1 -state $state
$findtypemenu entryconf 2 -state $state
}
proc stopfindproc {{done 0}} {
global findprocpid findprocfile findids
global ctext findoldcursor phase maincursor textcursor
global findinprogress
catch {unset findids}
if {[info exists findprocpid]} {
if {!$done} {
catch {exec kill $findprocpid}
}
catch {close $findprocfile}
unset findprocpid
}
if {[info exists findinprogress]} {
unset findinprogress
if {$phase != "incrdraw"} {
. config -cursor $maincursor
settextcursor $textcursor
}
}
}
proc findpatches {} {
global findstring selectedline numcommits
global findprocpid findprocfile
global finddidsel ctext lineid findinprogress
global findinsertpos
Thomas Arendsen Hein
hgk: Use $HG instead of hg (see 849f011dbf79)
r4688 global env
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
if {$numcommits == 0} return
# make a list of all the ids to search, starting at the one
# after the selected line (if any)
if {[info exists selectedline]} {
set l $selectedline
} else {
set l -1
}
set inputids {}
for {set i 0} {$i < $numcommits} {incr i} {
if {[incr l] >= $numcommits} {
set l 0
}
append inputids $lineid($l) "\n"
}
if {[catch {
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 set f [open [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree --stdin -s -r -S$findstring << $inputids] r]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 } err]} {
error_popup "Error starting search process: $err"
return
}
set findinsertpos end
set findprocfile $f
set findprocpid [pid $f]
fconfigure $f -blocking 0
fileevent $f readable readfindproc
set finddidsel 0
. config -cursor watch
settextcursor watch
set findinprogress 1
}
proc readfindproc {} {
global findprocfile finddidsel
global idline matchinglines findinsertpos
set n [gets $findprocfile line]
if {$n < 0} {
if {[eof $findprocfile]} {
stopfindproc 1
if {!$finddidsel} {
bell
}
}
return
}
TK Soh
hgk: use short changeset hashes...
r3059 if {![regexp {^[0-9a-f]{12}} $line id]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 error_popup "Can't parse git-diff-tree output: $line"
stopfindproc
return
}
if {![info exists idline($id)]} {
puts stderr "spurious id: $id"
return
}
set l $idline($id)
insertmatch $l $id
}
proc insertmatch {l id} {
global matchinglines findinsertpos finddidsel
if {$findinsertpos == "end"} {
if {$matchinglines != {} && $l < [lindex $matchinglines 0]} {
set matchinglines [linsert $matchinglines 0 $l]
set findinsertpos 1
} else {
lappend matchinglines $l
}
} else {
set matchinglines [linsert $matchinglines $findinsertpos $l]
incr findinsertpos
}
markheadline $l $id
if {!$finddidsel} {
findselectline $l
set finddidsel 1
}
}
proc findfiles {} {
global selectedline numcommits lineid ctext
global ffileline finddidsel parents nparents
global findinprogress findstartline findinsertpos
global treediffs fdiffids fdiffsneeded fdiffpos
global findmergefiles
Thomas Arendsen Hein
hgk: Use $HG instead of hg (see 849f011dbf79)
r4688 global env
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
if {$numcommits == 0} return
if {[info exists selectedline]} {
set l [expr {$selectedline + 1}]
} else {
set l 0
}
set ffileline $l
set findstartline $l
set diffsneeded {}
set fdiffsneeded {}
while 1 {
set id $lineid($l)
if {$findmergefiles || $nparents($id) == 1} {
foreach p $parents($id) {
if {![info exists treediffs([list $id $p])]} {
append diffsneeded "$id $p\n"
lappend fdiffsneeded [list $id $p]
}
}
}
if {[incr l] >= $numcommits} {
set l 0
}
if {$l == $findstartline} break
}
# start off a git-diff-tree process if needed
if {$diffsneeded ne {}} {
if {[catch {
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 set df [open [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree -r --stdin << $diffsneeded] r]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 } err ]} {
error_popup "Error starting search process: $err"
return
}
catch {unset fdiffids}
set fdiffpos 0
fconfigure $df -blocking 0
fileevent $df readable [list readfilediffs $df]
}
set finddidsel 0
set findinsertpos end
set id $lineid($l)
set p [lindex $parents($id) 0]
. config -cursor watch
settextcursor watch
set findinprogress 1
findcont [list $id $p]
update
}
proc readfilediffs {df} {
global findids fdiffids fdiffs
set n [gets $df line]
if {$n < 0} {
if {[eof $df]} {
donefilediff
if {[catch {close $df} err]} {
stopfindproc
bell
mpm@selenic.com
hgit -> hgk.py...
r1278 error_popup "Error in hg debug-diff-tree: $err"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 } elseif {[info exists findids]} {
set ids $findids
stopfindproc
bell
error_popup "Couldn't find diffs for {$ids}"
}
}
return
}
TK Soh
hgk: use short changeset hashes...
r3059 if {[regexp {^([0-9a-f]{12}) \(from ([0-9a-f]{12})\)} $line match id p]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 # start of a new string of diffs
donefilediff
set fdiffids [list $id $p]
set fdiffs {}
} elseif {[string match ":*" $line]} {
lappend fdiffs [lindex $line 5]
}
}
proc donefilediff {} {
global fdiffids fdiffs treediffs findids
global fdiffsneeded fdiffpos
if {[info exists fdiffids]} {
while {[lindex $fdiffsneeded $fdiffpos] ne $fdiffids
&& $fdiffpos < [llength $fdiffsneeded]} {
# git-diff-tree doesn't output anything for a commit
# which doesn't change anything
set nullids [lindex $fdiffsneeded $fdiffpos]
set treediffs($nullids) {}
if {[info exists findids] && $nullids eq $findids} {
unset findids
findcont $nullids
}
incr fdiffpos
}
incr fdiffpos
if {![info exists treediffs($fdiffids)]} {
set treediffs($fdiffids) $fdiffs
}
if {[info exists findids] && $fdiffids eq $findids} {
unset findids
findcont $fdiffids
}
}
}
proc findcont {ids} {
global findids treediffs parents nparents
global ffileline findstartline finddidsel
global lineid numcommits matchinglines findinprogress
global findmergefiles
set id [lindex $ids 0]
set p [lindex $ids 1]
set pi [lsearch -exact $parents($id) $p]
set l $ffileline
while 1 {
if {$findmergefiles || $nparents($id) == 1} {
if {![info exists treediffs($ids)]} {
set findids $ids
set ffileline $l
return
}
set doesmatch 0
foreach f $treediffs($ids) {
set x [findmatches $f]
if {$x != {}} {
set doesmatch 1
break
}
}
if {$doesmatch} {
insertmatch $l $id
set pi $nparents($id)
}
} else {
set pi $nparents($id)
}
if {[incr pi] >= $nparents($id)} {
set pi 0
if {[incr l] >= $numcommits} {
set l 0
}
if {$l == $findstartline} break
set id $lineid($l)
}
set p [lindex $parents($id) $pi]
set ids [list $id $p]
}
stopfindproc
if {!$finddidsel} {
bell
}
}
# mark a commit as matching by putting a yellow background
# behind the headline
proc markheadline {l id} {
global canv mainfont linehtag commitinfo
set bbox [$canv bbox $linehtag($l)]
set t [$canv create rect $bbox -outline {} -tags matches -fill yellow]
$canv lower $t
}
# mark the bits of a headline, author or date that match a find string
mpm@selenic.com
Initial import of hgit and hgk...
r267 proc markmatches {canv l str tag matches font} {
set bbox [$canv bbox $tag]
set x0 [lindex $bbox 0]
set y0 [lindex $bbox 1]
set y1 [lindex $bbox 3]
foreach match $matches {
set start [lindex $match 0]
set end [lindex $match 1]
if {$start > $end} continue
set xoff [font measure $font [string range $str 0 [expr $start-1]]]
set xlen [font measure $font [string range $str 0 [expr $end]]]
set t [$canv create rect [expr $x0+$xoff] $y0 [expr $x0+$xlen+2] $y1 \
-outline {} -tags matches -fill yellow]
$canv lower $t
}
}
proc unmarkmatches {} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global matchinglines findids
mpm@selenic.com
Initial import of hgit and hgk...
r267 allcanvs delete matches
catch {unset matchinglines}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 catch {unset findids}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc selcanvline {w x y} {
global canv canvy0 ctext linespc
global lineid linehtag linentag linedtag rowtextx
mpm@selenic.com
Initial import of hgit and hgk...
r267 set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax == {}} return
set yfrac [lindex [$canv yview] 0]
set y [expr {$y + $yfrac * $ymax}]
set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
if {$l < 0} {
set l 0
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$w eq $canv} {
if {![info exists rowtextx($l)] || $x < $rowtextx($l)} return
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 unmarkmatches
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 selectline $l 1
}
proc commit_descriptor {p} {
global commitinfo
set l "..."
if {[info exists commitinfo($p)]} {
set l [lindex $commitinfo($p) 0]
Brendan Cully
hgk: add revision numbers
r3092 set r [lindex $commitinfo($p) 6]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
Brendan Cully
hgk: add revision numbers
r3092 return "$r:$p ($l)"
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 # append some text to the ctext widget, and make any SHA1 ID
# that we know about be a clickable link.
proc appendwithlinks {text} {
global ctext idline linknum
set start [$ctext index "end - 1c"]
$ctext insert end $text
$ctext insert end "\n"
TK Soh
hgk: use short changeset hashes...
r3059 set links [regexp -indices -all -inline {[0-9a-f]{12}} $text]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 foreach l $links {
set s [lindex $l 0]
set e [lindex $l 1]
set linkid [string range $text $s $e]
if {![info exists idline($linkid)]} continue
incr e
$ctext tag add link "$start + $s c" "$start + $e c"
$ctext tag add link$linknum "$start + $s c" "$start + $e c"
$ctext tag bind link$linknum <1> [list selectline $idline($linkid) 1]
incr linknum
}
$ctext tag conf link -foreground blue -underline 1
$ctext tag bind link <Enter> { %W configure -cursor hand2 }
$ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
}
proc selectline {l isnew} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 global canv canv2 canv3 ctext commitinfo selectedline
global lineid linehtag linentag linedtag
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global canvy0 linespc parents nparents children
global cflist currentid sha1entry
David Soria Parra
hgk: display bookmark in commit diff window
r13463 global commentend idtags idbookmarks idline linknum
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
$canv delete hover
normalline
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {![info exists lineid($l)] || ![info exists linehtag($l)]} return
$canv delete secsel
set t [eval $canv create rect [$canv bbox $linehtag($l)] -outline {{}} \
-tags secsel -fill [$canv cget -selectbackground]]
$canv lower $t
$canv2 delete secsel
set t [eval $canv2 create rect [$canv2 bbox $linentag($l)] -outline {{}} \
-tags secsel -fill [$canv2 cget -selectbackground]]
$canv2 lower $t
$canv3 delete secsel
set t [eval $canv3 create rect [$canv3 bbox $linedtag($l)] -outline {{}} \
-tags secsel -fill [$canv3 cget -selectbackground]]
$canv3 lower $t
set y [expr {$canvy0 + $l * $linespc}]
set ymax [lindex [$canv cget -scrollregion] 3]
set ytop [expr {$y - $linespc - 1}]
set ybot [expr {$y + $linespc + 1}]
set wnow [$canv yview]
set wtop [expr [lindex $wnow 0] * $ymax]
set wbot [expr [lindex $wnow 1] * $ymax]
set wh [expr {$wbot - $wtop}]
set newtop $wtop
if {$ytop < $wtop} {
if {$ybot < $wtop} {
set newtop [expr {$y - $wh / 2.0}]
} else {
set newtop $ytop
if {$newtop > $wtop - $linespc} {
set newtop [expr {$wtop - $linespc}]
}
}
} elseif {$ybot > $wbot} {
if {$ytop > $wbot} {
set newtop [expr {$y - $wh / 2.0}]
} else {
set newtop [expr {$ybot - $wh}]
if {$newtop < $wtop + $linespc} {
set newtop [expr {$wtop + $linespc}]
}
}
}
if {$newtop != $wtop} {
if {$newtop < 0} {
set newtop 0
}
allcanvs yview moveto [expr $newtop * 1.0 / $ymax]
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
if {$isnew} {
addtohistory [list selectline $l 0]
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 set selectedline $l
set id $lineid($l)
set currentid $id
$sha1entry delete 0 end
$sha1entry insert 0 $id
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 $sha1entry selection range 0 end
mpm@selenic.com
Initial import of hgit and hgk...
r267
$ctext conf -state normal
$ctext delete 0.0 end
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set linknum 0
$ctext mark set fmark.0 0.0
$ctext mark gravity fmark.0 left
mpm@selenic.com
Initial import of hgit and hgk...
r267 set info $commitinfo($id)
Andrew Shadura
hgk: reformat changsets fields...
r18802 $ctext insert end "Changeset: [lindex $info 6]\n"
Patrick Mezard
hgk: display branch name in diff header
r5859 if {[llength [lindex $info 7]] > 0} {
$ctext insert end "Branch: [lindex $info 7]\n"
}
Andrew Shadura
hgk: reformat changsets fields...
r18802 $ctext insert end "User: [lindex $info 1]\n"
$ctext insert end "Date: [lindex $info 2]\n"
Andrew Shadura
hgk: display committer name when set by hg-git
r24604 if {[lindex $info 3] ne ""} {
$ctext insert end "Committer: [lindex $info 3]\n"
}
David Soria Parra
hgk: display bookmark in commit diff window
r13463 if {[info exists idbookmarks($id)]} {
$ctext insert end "Bookmarks:"
foreach bookmark $idbookmarks($id) {
$ctext insert end " $bookmark"
}
$ctext insert end "\n"
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {[info exists idtags($id)]} {
$ctext insert end "Tags:"
foreach tag $idtags($id) {
$ctext insert end " $tag"
}
$ctext insert end "\n"
}
Thomas Arendsen Hein
Cleanup of tabs and trailing spaces.
r1308
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set comment {}
if {[info exists parents($id)]} {
foreach p $parents($id) {
append comment "Parent: [commit_descriptor $p]\n"
}
}
if {[info exists children($id)]} {
foreach c $children($id) {
append comment "Child: [commit_descriptor $c]\n"
}
}
Andrew Shadura
hgk: show secret changesets differently (shape and label)
r24529
if {[lindex $info 9] eq "secret"} {
# for now, display phase for secret changesets only
append comment "Phase: [lindex $info 9]\n"
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 append comment "\n"
append comment [lindex $info 5]
# make anything that looks like a SHA1 ID be a clickable link
appendwithlinks $comment
mpm@selenic.com
Initial import of hgit and hgk...
r267 $ctext tag delete Comments
$ctext tag remove found 1.0 end
$ctext conf -state disabled
set commentend [$ctext index "end - 1c"]
$cflist delete 0 end
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $cflist insert end "Comments"
Patrick Mezard
hgk: display orphan revisions content (issue 1041)
r6361 if {$nparents($id) <= 1} {
set parent "null"
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {$nparents($id) == 1} {
Patrick Mezard
hgk: display orphan revisions content (issue 1041)
r6361 set parent $parents($id)
}
startdiff [concat $id $parent]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 } elseif {$nparents($id) > 1} {
mergediff $id
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
proc selnextline {dir} {
global selectedline
Andrew Shadura
hgk: enable selected patch text on Windows...
r20764 focus .
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {![info exists selectedline]} return
set l [expr $selectedline + $dir]
unmarkmatches
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 selectline $l 1
}
proc unselectline {} {
global selectedline
catch {unset selectedline}
allcanvs delete secsel
}
proc addtohistory {cmd} {
global history historyindex
if {$historyindex > 0
&& [lindex $history [expr {$historyindex - 1}]] == $cmd} {
return
}
if {$historyindex < [llength $history]} {
set history [lreplace $history $historyindex end $cmd]
} else {
lappend history $cmd
}
incr historyindex
if {$historyindex > 1} {
.ctop.top.bar.leftbut conf -state normal
} else {
.ctop.top.bar.leftbut conf -state disabled
}
.ctop.top.bar.rightbut conf -state disabled
}
proc goback {} {
global history historyindex
Andrew Shadura
hgk: enable selected patch text on Windows...
r20764 focus .
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
if {$historyindex > 1} {
incr historyindex -1
set cmd [lindex $history [expr {$historyindex - 1}]]
eval $cmd
.ctop.top.bar.rightbut conf -state normal
}
if {$historyindex <= 1} {
.ctop.top.bar.leftbut conf -state disabled
}
}
proc goforw {} {
global history historyindex
Andrew Shadura
hgk: enable selected patch text on Windows...
r20764 focus .
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
if {$historyindex < [llength $history]} {
set cmd [lindex $history $historyindex]
incr historyindex
eval $cmd
.ctop.top.bar.leftbut conf -state normal
}
if {$historyindex >= [llength $history]} {
.ctop.top.bar.rightbut conf -state disabled
}
}
proc mergediff {id} {
global parents diffmergeid diffmergegca mergefilelist diffpindex
set diffmergeid $id
set diffpindex -1
set diffmergegca [findgca $parents($id)]
if {[info exists mergefilelist($id)]} {
if {$mergefilelist($id) ne {}} {
showmergediff
}
} else {
contmergediff {}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc findgca {ids} {
Thomas Arendsen Hein
hgk: Use $HG instead of hg (see 849f011dbf79)
r4688 global env
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set gca {}
foreach id $ids {
if {$gca eq {}} {
set gca $id
} else {
if {[catch {
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 set gca [exec $env(HG) --config ui.report_untrusted=false debug-merge-base $gca $id]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 } err]} {
return {}
}
}
}
return $gca
}
proc contmergediff {ids} {
global diffmergeid diffpindex parents nparents diffmergegca
global treediffs mergefilelist diffids treepending
# diff the child against each of the parents, and diff
# each of the parents against the GCA.
while 1 {
if {[lindex $ids 0] == $diffmergeid && $diffmergegca ne {}} {
set ids [list [lindex $ids 1] $diffmergegca]
} else {
if {[incr diffpindex] >= $nparents($diffmergeid)} break
set p [lindex $parents($diffmergeid) $diffpindex]
set ids [list $diffmergeid $p]
}
if {![info exists treediffs($ids)]} {
set diffids $ids
if {![info exists treepending]} {
gettreediffs $ids
}
return
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
# If a file in some parent is different from the child and also
# different from the GCA, then it's interesting.
# If we don't have a GCA, then a file is interesting if it is
# different from the child in all the parents.
if {$diffmergegca ne {}} {
set files {}
foreach p $parents($diffmergeid) {
set gcadiffs $treediffs([list $p $diffmergegca])
foreach f $treediffs([list $diffmergeid $p]) {
if {[lsearch -exact $files $f] < 0
&& [lsearch -exact $gcadiffs $f] >= 0} {
lappend files $f
}
}
}
set files [lsort $files]
} else {
set p [lindex $parents($diffmergeid) 0]
set files $treediffs([list $diffmergeid $p])
for {set i 1} {$i < $nparents($diffmergeid) && $files ne {}} {incr i} {
set p [lindex $parents($diffmergeid) $i]
set df $treediffs([list $diffmergeid $p])
set nf {}
foreach f $files {
if {[lsearch -exact $df $f] >= 0} {
lappend nf $f
}
}
set files $nf
}
}
set mergefilelist($diffmergeid) $files
if {$files ne {}} {
showmergediff
}
}
proc showmergediff {} {
global cflist diffmergeid mergefilelist parents
global diffopts diffinhunk currentfile currenthunk filelines
global diffblocked groupfilelast mergefds groupfilenum grouphunks
Thomas Arendsen Hein
hgk: Use $HG instead of hg (see 849f011dbf79)
r4688 global env
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
set files $mergefilelist($diffmergeid)
foreach f $files {
mpm@selenic.com
Initial import of hgit and hgk...
r267 $cflist insert end $f
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set env(GIT_DIFF_OPTS) $diffopts
set flist {}
catch {unset currentfile}
catch {unset currenthunk}
catch {unset filelines}
catch {unset groupfilenum}
catch {unset grouphunks}
set groupfilelast -1
foreach p $parents($diffmergeid) {
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 set cmd [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree -p $p $diffmergeid]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set cmd [concat $cmd $mergefilelist($diffmergeid)]
if {[catch {set f [open $cmd r]} err]} {
error_popup "Error getting diffs: $err"
foreach f $flist {
catch {close $f}
}
return
}
lappend flist $f
set ids [list $diffmergeid $p]
set mergefds($ids) $f
set diffinhunk($ids) 0
set diffblocked($ids) 0
fconfigure $f -blocking 0
fileevent $f readable [list getmergediffline $f $ids $diffmergeid]
}
}
proc getmergediffline {f ids id} {
global diffmergeid diffinhunk diffoldlines diffnewlines
global currentfile currenthunk
global diffoldstart diffnewstart diffoldlno diffnewlno
global diffblocked mergefilelist
global noldlines nnewlines difflcounts filelines
set n [gets $f line]
if {$n < 0} {
if {![eof $f]} return
}
if {!([info exists diffmergeid] && $diffmergeid == $id)} {
if {$n < 0} {
close $f
}
return
}
if {$diffinhunk($ids) != 0} {
set fi $currentfile($ids)
if {$n > 0 && [regexp {^[-+ \\]} $line match]} {
# continuing an existing hunk
set line [string range $line 1 end]
set p [lindex $ids 1]
if {$match eq "-" || $match eq " "} {
set filelines($p,$fi,$diffoldlno($ids)) $line
incr diffoldlno($ids)
}
if {$match eq "+" || $match eq " "} {
set filelines($id,$fi,$diffnewlno($ids)) $line
incr diffnewlno($ids)
}
if {$match eq " "} {
if {$diffinhunk($ids) == 2} {
lappend difflcounts($ids) \
[list $noldlines($ids) $nnewlines($ids)]
set noldlines($ids) 0
set diffinhunk($ids) 1
}
incr noldlines($ids)
} elseif {$match eq "-" || $match eq "+"} {
if {$diffinhunk($ids) == 1} {
lappend difflcounts($ids) [list $noldlines($ids)]
set noldlines($ids) 0
set nnewlines($ids) 0
set diffinhunk($ids) 2
}
if {$match eq "-"} {
incr noldlines($ids)
} else {
incr nnewlines($ids)
}
}
# and if it's \ No newline at end of line, then what?
return
}
# end of a hunk
if {$diffinhunk($ids) == 1 && $noldlines($ids) != 0} {
lappend difflcounts($ids) [list $noldlines($ids)]
} elseif {$diffinhunk($ids) == 2
&& ($noldlines($ids) != 0 || $nnewlines($ids) != 0)} {
lappend difflcounts($ids) [list $noldlines($ids) $nnewlines($ids)]
}
set currenthunk($ids) [list $currentfile($ids) \
$diffoldstart($ids) $diffnewstart($ids) \
$diffoldlno($ids) $diffnewlno($ids) \
$difflcounts($ids)]
set diffinhunk($ids) 0
# -1 = need to block, 0 = unblocked, 1 = is blocked
set diffblocked($ids) -1
processhunks
if {$diffblocked($ids) == -1} {
fileevent $f readable {}
set diffblocked($ids) 1
}
}
if {$n < 0} {
# eof
if {!$diffblocked($ids)} {
close $f
set currentfile($ids) [llength $mergefilelist($diffmergeid)]
set currenthunk($ids) [list $currentfile($ids) 0 0 0 0 {}]
processhunks
}
} elseif {[regexp {^diff --git a/(.*) b/} $line match fname]} {
# start of a new file
set currentfile($ids) \
[lsearch -exact $mergefilelist($diffmergeid) $fname]
} elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
$line match f1l f1c f2l f2c rest]} {
if {[info exists currentfile($ids)] && $currentfile($ids) >= 0} {
# start of a new hunk
if {$f1l == 0 && $f1c == 0} {
set f1l 1
}
if {$f2l == 0 && $f2c == 0} {
set f2l 1
}
set diffinhunk($ids) 1
set diffoldstart($ids) $f1l
set diffnewstart($ids) $f2l
set diffoldlno($ids) $f1l
set diffnewlno($ids) $f2l
set difflcounts($ids) {}
set noldlines($ids) 0
set nnewlines($ids) 0
}
}
}
proc processhunks {} {
global diffmergeid parents nparents currenthunk
global mergefilelist diffblocked mergefds
global grouphunks grouplinestart grouplineend groupfilenum
set nfiles [llength $mergefilelist($diffmergeid)]
while 1 {
set fi $nfiles
set lno 0
# look for the earliest hunk
foreach p $parents($diffmergeid) {
set ids [list $diffmergeid $p]
if {![info exists currenthunk($ids)]} return
set i [lindex $currenthunk($ids) 0]
set l [lindex $currenthunk($ids) 2]
if {$i < $fi || ($i == $fi && $l < $lno)} {
set fi $i
set lno $l
set pi $p
}
}
if {$fi < $nfiles} {
set ids [list $diffmergeid $pi]
set hunk $currenthunk($ids)
unset currenthunk($ids)
if {$diffblocked($ids) > 0} {
fileevent $mergefds($ids) readable \
[list getmergediffline $mergefds($ids) $ids $diffmergeid]
}
set diffblocked($ids) 0
if {[info exists groupfilenum] && $groupfilenum == $fi
&& $lno <= $grouplineend} {
# add this hunk to the pending group
lappend grouphunks($pi) $hunk
set endln [lindex $hunk 4]
if {$endln > $grouplineend} {
set grouplineend $endln
}
continue
}
}
# succeeding stuff doesn't belong in this group, so
# process the group now
if {[info exists groupfilenum]} {
processgroup
unset groupfilenum
unset grouphunks
}
if {$fi >= $nfiles} break
# start a new group
set groupfilenum $fi
set grouphunks($pi) [list $hunk]
set grouplinestart $lno
set grouplineend [lindex $hunk 4]
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc processgroup {} {
global groupfilelast groupfilenum difffilestart
global mergefilelist diffmergeid ctext filelines
global parents diffmergeid diffoffset
global grouphunks grouplinestart grouplineend nparents
global mergemax
$ctext conf -state normal
set id $diffmergeid
set f $groupfilenum
if {$groupfilelast != $f} {
$ctext insert end "\n"
set here [$ctext index "end - 1c"]
set difffilestart($f) $here
set mark fmark.[expr {$f + 1}]
$ctext mark set $mark $here
$ctext mark gravity $mark left
set header [lindex $mergefilelist($id) $f]
set l [expr {(78 - [string length $header]) / 2}]
set pad [string range "----------------------------------------" 1 $l]
$ctext insert end "$pad $header $pad\n" filesep
set groupfilelast $f
foreach p $parents($id) {
set diffoffset($p) 0
}
}
$ctext insert end "@@" msep
set nlines [expr {$grouplineend - $grouplinestart}]
set events {}
set pnum 0
foreach p $parents($id) {
set startline [expr {$grouplinestart + $diffoffset($p)}]
set ol $startline
set nl $grouplinestart
if {[info exists grouphunks($p)]} {
foreach h $grouphunks($p) {
set l [lindex $h 2]
if {$nl < $l} {
for {} {$nl < $l} {incr nl} {
set filelines($p,$f,$ol) $filelines($id,$f,$nl)
incr ol
}
}
foreach chunk [lindex $h 5] {
if {[llength $chunk] == 2} {
set olc [lindex $chunk 0]
set nlc [lindex $chunk 1]
set nnl [expr {$nl + $nlc}]
lappend events [list $nl $nnl $pnum $olc $nlc]
incr ol $olc
set nl $nnl
} else {
incr ol [lindex $chunk 0]
incr nl [lindex $chunk 0]
}
}
}
}
if {$nl < $grouplineend} {
for {} {$nl < $grouplineend} {incr nl} {
set filelines($p,$f,$ol) $filelines($id,$f,$nl)
incr ol
}
}
set nlines [expr {$ol - $startline}]
$ctext insert end " -$startline,$nlines" msep
incr pnum
}
set nlines [expr {$grouplineend - $grouplinestart}]
$ctext insert end " +$grouplinestart,$nlines @@\n" msep
set events [lsort -integer -index 0 $events]
set nevents [llength $events]
set nmerge $nparents($diffmergeid)
set l $grouplinestart
for {set i 0} {$i < $nevents} {set i $j} {
set nl [lindex $events $i 0]
while {$l < $nl} {
$ctext insert end " $filelines($id,$f,$l)\n"
incr l
}
set e [lindex $events $i]
set enl [lindex $e 1]
set j $i
set active {}
while 1 {
set pnum [lindex $e 2]
set olc [lindex $e 3]
set nlc [lindex $e 4]
if {![info exists delta($pnum)]} {
set delta($pnum) [expr {$olc - $nlc}]
lappend active $pnum
} else {
incr delta($pnum) [expr {$olc - $nlc}]
}
if {[incr j] >= $nevents} break
set e [lindex $events $j]
if {[lindex $e 0] >= $enl} break
if {[lindex $e 1] > $enl} {
set enl [lindex $e 1]
}
}
set nlc [expr {$enl - $l}]
set ncol mresult
set bestpn -1
if {[llength $active] == $nmerge - 1} {
# no diff for one of the parents, i.e. it's identical
for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
if {![info exists delta($pnum)]} {
if {$pnum < $mergemax} {
lappend ncol m$pnum
} else {
lappend ncol mmax
}
break
}
}
} elseif {[llength $active] == $nmerge} {
# all parents are different, see if one is very similar
set bestsim 30
for {set pnum 0} {$pnum < $nmerge} {incr pnum} {
set sim [similarity $pnum $l $nlc $f \
[lrange $events $i [expr {$j-1}]]]
if {$sim > $bestsim} {
set bestsim $sim
set bestpn $pnum
}
}
if {$bestpn >= 0} {
lappend ncol m$bestpn
}
}
set pnum -1
foreach p $parents($id) {
incr pnum
if {![info exists delta($pnum)] || $pnum == $bestpn} continue
set olc [expr {$nlc + $delta($pnum)}]
set ol [expr {$l + $diffoffset($p)}]
incr diffoffset($p) $delta($pnum)
unset delta($pnum)
for {} {$olc > 0} {incr olc -1} {
$ctext insert end "-$filelines($p,$f,$ol)\n" m$pnum
incr ol
}
}
set endl [expr {$l + $nlc}]
if {$bestpn >= 0} {
# show this pretty much as a normal diff
set p [lindex $parents($id) $bestpn]
set ol [expr {$l + $diffoffset($p)}]
incr diffoffset($p) $delta($bestpn)
unset delta($bestpn)
for {set k $i} {$k < $j} {incr k} {
set e [lindex $events $k]
if {[lindex $e 2] != $bestpn} continue
set nl [lindex $e 0]
set ol [expr {$ol + $nl - $l}]
for {} {$l < $nl} {incr l} {
$ctext insert end "+$filelines($id,$f,$l)\n" $ncol
}
set c [lindex $e 3]
for {} {$c > 0} {incr c -1} {
$ctext insert end "-$filelines($p,$f,$ol)\n" m$bestpn
incr ol
}
set nl [lindex $e 1]
for {} {$l < $nl} {incr l} {
$ctext insert end "+$filelines($id,$f,$l)\n" mresult
}
}
}
for {} {$l < $endl} {incr l} {
$ctext insert end "+$filelines($id,$f,$l)\n" $ncol
}
}
while {$l < $grouplineend} {
$ctext insert end " $filelines($id,$f,$l)\n"
incr l
}
$ctext conf -state disabled
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc similarity {pnum l nlc f events} {
global diffmergeid parents diffoffset filelines
set id $diffmergeid
set p [lindex $parents($id) $pnum]
set ol [expr {$l + $diffoffset($p)}]
set endl [expr {$l + $nlc}]
set same 0
set diff 0
foreach e $events {
if {[lindex $e 2] != $pnum} continue
set nl [lindex $e 0]
set ol [expr {$ol + $nl - $l}]
for {} {$l < $nl} {incr l} {
incr same [string length $filelines($id,$f,$l)]
incr same
}
set oc [lindex $e 3]
for {} {$oc > 0} {incr oc -1} {
incr diff [string length $filelines($p,$f,$ol)]
incr diff
incr ol
}
set nl [lindex $e 1]
for {} {$l < $nl} {incr l} {
incr diff [string length $filelines($id,$f,$l)]
incr diff
}
}
for {} {$l < $endl} {incr l} {
incr same [string length $filelines($id,$f,$l)]
incr same
}
if {$same == 0} {
return 0
}
return [expr {200 * $same / (2 * $same + $diff)}]
}
proc startdiff {ids} {
global treediffs diffids treepending diffmergeid
set diffids $ids
catch {unset diffmergeid}
if {![info exists treediffs($ids)]} {
if {![info exists treepending]} {
gettreediffs $ids
}
} else {
addtocflist $ids
}
}
proc addtocflist {ids} {
global treediffs cflist
foreach f $treediffs($ids) {
$cflist insert end $f
}
getblobdiffs $ids
}
proc gettreediffs {ids} {
Thomas Arendsen Hein
hgk: Use $HG instead of hg (see 849f011dbf79)
r4688 global treediff parents treepending env
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set treepending $ids
set treediff {}
set id [lindex $ids 0]
set p [lindex $ids 1]
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 if [catch {set gdtf [open "|{$env(HG)} --config ui.report_untrusted=false debug-diff-tree -r $p $id" r]}] return
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 fconfigure $gdtf -blocking 0
fileevent $gdtf readable [list gettreediffline $gdtf $ids]
}
proc gettreediffline {gdtf ids} {
global treediff treediffs treepending diffids diffmergeid
mpm@selenic.com
Initial import of hgit and hgk...
r267 set n [gets $gdtf line]
if {$n < 0} {
if {![eof $gdtf]} return
close $gdtf
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set treediffs($ids) $treediff
mpm@selenic.com
Initial import of hgit and hgk...
r267 unset treepending
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$ids != $diffids} {
gettreediffs $diffids
} else {
if {[info exists diffmergeid]} {
contmergediff $ids
} else {
addtocflist $ids
}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 return
}
Thomas Arendsen Hein
Make hgk handle filenames with spaces (issue49)
r4741 set tab1 [expr [string first "\t" $line] + 1]
set tab2 [expr [string first "\t" $line $tab1] - 1]
set file [string range $line $tab1 $tab2]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 lappend treediff $file
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc getblobdiffs {ids} {
global diffopts blobdifffd diffids env curdifftag curtagstart
global difffilestart nextupdate diffinhdr treediffs
set id [lindex $ids 0]
set p [lindex $ids 1]
mpm@selenic.com
Initial import of hgit and hgk...
r267 set env(GIT_DIFF_OPTS) $diffopts
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 set cmd [list | $env(HG) --config ui.report_untrusted=false debug-diff-tree -r -p -C $p $id]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {[catch {set bdf [open $cmd r]} err]} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 puts "error getting diffs: $err"
return
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set diffinhdr 0
mpm@selenic.com
Initial import of hgit and hgk...
r267 fconfigure $bdf -blocking 0
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set blobdifffd($ids) $bdf
mpm@selenic.com
Initial import of hgit and hgk...
r267 set curdifftag Comments
set curtagstart 0.0
catch {unset difffilestart}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 fileevent $bdf readable [list getblobdiffline $bdf $diffids]
set nextupdate [expr {[clock clicks -milliseconds] + 100}]
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc getblobdiffline {bdf ids} {
global diffids blobdifffd ctext curdifftag curtagstart
global diffnexthead diffnextnote difffilestart
global nextupdate diffinhdr treediffs
global gaudydiff
mpm@selenic.com
Initial import of hgit and hgk...
r267 set n [gets $bdf line]
if {$n < 0} {
if {[eof $bdf]} {
close $bdf
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$ids == $diffids && $bdf == $blobdifffd($ids)} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 $ctext tag add $curdifftag $curtagstart end
}
}
return
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 return
}
"Andrei Vermel "
hgk - fix CR issues on windows
r3940 regsub -all "\r" $line "" line
mpm@selenic.com
Initial import of hgit and hgk...
r267 $ctext conf -state normal
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {[regexp {^diff --git a/(.*) b/(.*)} $line match fname newname]} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 # start of a new file
$ctext insert end "\n"
$ctext tag add $curdifftag $curtagstart end
set curtagstart [$ctext index "end - 1c"]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set header $newname
set here [$ctext index "end - 1c"]
set i [lsearch -exact $treediffs($diffids) $fname]
if {$i >= 0} {
set difffilestart($i) $here
incr i
$ctext mark set fmark.$i $here
$ctext mark gravity fmark.$i left
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$newname != $fname} {
set i [lsearch -exact $treediffs($diffids) $newname]
if {$i >= 0} {
set difffilestart($i) $here
incr i
$ctext mark set fmark.$i $here
$ctext mark gravity fmark.$i left
}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 set curdifftag "f:$fname"
$ctext tag delete $curdifftag
set l [expr {(78 - [string length $header]) / 2}]
set pad [string range "----------------------------------------" 1 $l]
$ctext insert end "$pad $header $pad\n" filesep
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set diffinhdr 1
Fabian Kreutz
hgk: do not ignore ---/+++ lines in diff
r9989 } elseif {[regexp {^(---|\+\+\+) } $line] && $diffinhdr} {
set diffinhdr 1
mpm@selenic.com
Initial import of hgit and hgk...
r267 } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
$line match f1l f1c f2l f2c rest]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$gaudydiff} {
$ctext insert end "\t" hunksep
$ctext insert end " $f1l " d0 " $f2l " d1
$ctext insert end " $rest \n" hunksep
} else {
$ctext insert end "$line\n" hunksep
}
set diffinhdr 0
mpm@selenic.com
Initial import of hgit and hgk...
r267 } else {
set x [string range $line 0 0]
if {$x == "-" || $x == "+"} {
set tag [expr {$x == "+"}]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$gaudydiff} {
set line [string range $line 1 end]
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 $ctext insert end "$line\n" d$tag
} elseif {$x == " "} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$gaudydiff} {
set line [string range $line 1 end]
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 $ctext insert end "$line\n"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 } elseif {$diffinhdr || $x == "\\"} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 # e.g. "\ No newline at end of file"
$ctext insert end "$line\n" filesep
"Andrei Vermel "
hgk - fix CR issues on windows
r3940 } elseif {$line != ""} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 # Something else we don't recognize
if {$curdifftag != "Comments"} {
$ctext insert end "\n"
$ctext tag add $curdifftag $curtagstart end
set curtagstart [$ctext index "end - 1c"]
set curdifftag Comments
}
$ctext insert end "$line\n" filesep
}
}
$ctext conf -state disabled
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {[clock clicks -milliseconds] >= $nextupdate} {
incr nextupdate 100
fileevent $bdf readable {}
update
fileevent $bdf readable "getblobdiffline $bdf {$ids}"
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
proc nextfile {} {
global difffilestart ctext
set here [$ctext index @0,0]
for {set i 0} {[info exists difffilestart($i)]} {incr i} {
if {[$ctext compare $difffilestart($i) > $here]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {![info exists pos]
|| [$ctext compare $difffilestart($i) < $pos]} {
set pos $difffilestart($i)
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {[info exists pos]} {
$ctext yview $pos
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
proc listboxsel {} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global ctext cflist currentid
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {![info exists currentid]} return
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set sel [lsort [$cflist curselection]]
if {$sel eq {}} return
set first [lindex $sel 0]
catch {$ctext yview fmark.$first}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
proc setcoords {} {
global linespc charspc canvx0 canvy0 mainfont
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global xspc1 xspc2 lthickness
mpm@selenic.com
Initial import of hgit and hgk...
r267 set linespc [font metrics $mainfont -linespace]
set charspc [font measure $mainfont "m"]
set canvy0 [expr 3 + 0.5 * $linespc]
set canvx0 [expr 3 + 0.5 * $linespc]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set lthickness [expr {int($linespc / 9) + 1}]
set xspc1(0) $linespc
set xspc2 $linespc
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
proc redisplay {} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global stopped redisplaying phase
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {$stopped > 1} return
if {$phase == "getcommits"} return
set redisplaying 1
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {$phase == "drawgraph" || $phase == "incrdraw"} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 set stopped 1
} else {
drawgraph
}
}
proc incrfont {inc} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global mainfont namefont textfont ctext canv phase
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 global stopped entries curidfont
mpm@selenic.com
Initial import of hgit and hgk...
r267 unmarkmatches
set mainfont [lreplace $mainfont 1 1 [expr {[lindex $mainfont 1] + $inc}]]
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 set curidfont [lreplace $curidfont 1 1 [expr {[lindex $curidfont 1] + $inc}]]
mpm@selenic.com
Initial import of hgit and hgk...
r267 set namefont [lreplace $namefont 1 1 [expr {[lindex $namefont 1] + $inc}]]
set textfont [lreplace $textfont 1 1 [expr {[lindex $textfont 1] + $inc}]]
setcoords
$ctext conf -font $textfont
$ctext tag conf filesep -font [concat $textfont bold]
foreach e $entries {
$e conf -font $mainfont
}
if {$phase == "getcommits"} {
$canv itemconf textitems -font $mainfont
}
redisplay
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc clearsha1 {} {
global sha1entry sha1string
if {[string length $sha1string] == 40} {
$sha1entry delete 0 end
}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 proc sha1change {n1 n2 op} {
global sha1string currentid sha1but
if {$sha1string == {}
|| ([info exists currentid] && $sha1string == $currentid)} {
set state disabled
} else {
set state normal
}
if {[$sha1but cget -state] == $state} return
if {$state == "normal"} {
$sha1but conf -state normal -relief raised -text "Goto: "
} else {
$sha1but conf -state disabled -relief flat -text "SHA1 ID: "
}
}
proc gotocommit {} {
global sha1string currentid idline tagids
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 global lineid numcommits
mpm@selenic.com
Initial import of hgit and hgk...
r267 if {$sha1string == {}
|| ([info exists currentid] && $sha1string == $currentid)} return
if {[info exists tagids($sha1string)]} {
set id $tagids($sha1string)
} else {
set id [string tolower $sha1string]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {[regexp {^[0-9a-f]{4,39}$} $id]} {
set matches {}
for {set l 0} {$l < $numcommits} {incr l} {
if {[string match $id* $lineid($l)]} {
lappend matches $lineid($l)
}
}
if {$matches ne {}} {
if {[llength $matches] > 1} {
error_popup "Short SHA1 id $id is ambiguous"
return
}
set id [lindex $matches 0]
}
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 }
if {[info exists idline($id)]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 selectline $idline($id) 1
mpm@selenic.com
Initial import of hgit and hgk...
r267 return
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
mpm@selenic.com
Initial import of hgit and hgk...
r267 set type "SHA1 id"
} else {
set type "Tag"
}
error_popup "$type $sha1string is not known"
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc lineenter {x y id} {
global hoverx hovery hoverid hovertimer
global commitinfo canv
if {![info exists commitinfo($id)]} return
set hoverx $x
set hovery $y
set hoverid $id
if {[info exists hovertimer]} {
after cancel $hovertimer
}
set hovertimer [after 500 linehover]
$canv delete hover
}
proc linemotion {x y id} {
global hoverx hovery hoverid hovertimer
if {[info exists hoverid] && $id == $hoverid} {
set hoverx $x
set hovery $y
if {[info exists hovertimer]} {
after cancel $hovertimer
}
set hovertimer [after 500 linehover]
}
}
proc lineleave {id} {
global hoverid hovertimer canv
if {[info exists hoverid] && $id == $hoverid} {
$canv delete hover
if {[info exists hovertimer]} {
after cancel $hovertimer
unset hovertimer
}
unset hoverid
}
}
proc linehover {} {
global hoverx hovery hoverid hovertimer
global canv linespc lthickness
global commitinfo mainfont
set text [lindex $commitinfo($hoverid) 0]
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax == {}} return
set yfrac [lindex [$canv yview] 0]
set x [expr {$hoverx + 2 * $linespc}]
set y [expr {$hovery + $yfrac * $ymax - $linespc / 2}]
set x0 [expr {$x - 2 * $lthickness}]
set y0 [expr {$y - 2 * $lthickness}]
set x1 [expr {$x + [font measure $mainfont $text] + 2 * $lthickness}]
set y1 [expr {$y + $linespc + 2 * $lthickness}]
set t [$canv create rectangle $x0 $y0 $x1 $y1 \
-fill \#ffff80 -outline black -width 1 -tags hover]
$canv raise $t
set t [$canv create text $x $y -anchor nw -text $text -tags hover]
$canv raise $t
}
proc clickisonarrow {id y} {
global mainline mainlinearrow sidelines lthickness
set thresh [expr {2 * $lthickness + 6}]
if {[info exists mainline($id)]} {
if {$mainlinearrow($id) ne "none"} {
if {abs([lindex $mainline($id) 1] - $y) < $thresh} {
return "up"
}
}
}
if {[info exists sidelines($id)]} {
foreach ls $sidelines($id) {
set coords [lindex $ls 0]
set arrow [lindex $ls 2]
if {$arrow eq "first" || $arrow eq "both"} {
if {abs([lindex $coords 1] - $y) < $thresh} {
return "up"
}
}
if {$arrow eq "last" || $arrow eq "both"} {
if {abs([lindex $coords end] - $y) < $thresh} {
return "down"
}
}
}
}
return {}
}
proc arrowjump {id dirn y} {
global mainline sidelines canv
set yt {}
if {$dirn eq "down"} {
if {[info exists mainline($id)]} {
set y1 [lindex $mainline($id) 1]
if {$y1 > $y} {
set yt $y1
}
}
if {[info exists sidelines($id)]} {
foreach ls $sidelines($id) {
set y1 [lindex $ls 0 1]
if {$y1 > $y && ($yt eq {} || $y1 < $yt)} {
set yt $y1
}
}
}
} else {
if {[info exists sidelines($id)]} {
foreach ls $sidelines($id) {
set y1 [lindex $ls 0 end]
if {$y1 < $y && ($yt eq {} || $y1 > $yt)} {
set yt $y1
}
}
}
}
if {$yt eq {}} return
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax eq {} || $ymax <= 0} return
set view [$canv yview]
set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
set yfrac [expr {$yt / $ymax - $yspan / 2}]
if {$yfrac < 0} {
set yfrac 0
}
$canv yview moveto $yfrac
}
proc lineclick {x y id isnew} {
global ctext commitinfo children cflist canv thickerline
unmarkmatches
unselectline
normalline
$canv delete hover
# draw this line thicker than normal
drawlines $id 1
set thickerline $id
if {$isnew} {
set ymax [lindex [$canv cget -scrollregion] 3]
if {$ymax eq {}} return
set yfrac [lindex [$canv yview] 0]
set y [expr {$y + $yfrac * $ymax}]
}
set dirn [clickisonarrow $id $y]
if {$dirn ne {}} {
arrowjump $id $dirn $y
return
}
if {$isnew} {
addtohistory [list lineclick $x $y $id 0]
}
# fill the details pane with info about this line
$ctext conf -state normal
$ctext delete 0.0 end
$ctext tag conf link -foreground blue -underline 1
$ctext tag bind link <Enter> { %W configure -cursor hand2 }
$ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
$ctext insert end "Parent:\t"
$ctext insert end $id [list link link0]
$ctext tag bind link0 <1> [list selbyid $id]
set info $commitinfo($id)
$ctext insert end "\n\t[lindex $info 0]\n"
Andrew Shadura
hgk: reformat changsets fields...
r18802 $ctext insert end "\tUser:\t[lindex $info 1]\n"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $ctext insert end "\tDate:\t[lindex $info 2]\n"
if {[info exists children($id)]} {
$ctext insert end "\nChildren:"
set i 0
foreach child $children($id) {
incr i
set info $commitinfo($child)
$ctext insert end "\n\t"
$ctext insert end $child [list link link$i]
$ctext tag bind link$i <1> [list selbyid $child]
$ctext insert end "\n\t[lindex $info 0]"
Andrew Shadura
hgk: reformat changsets fields...
r18802 $ctext insert end "\n\tUser:\t[lindex $info 1]"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $ctext insert end "\n\tDate:\t[lindex $info 2]\n"
}
}
$ctext conf -state disabled
$cflist delete 0 end
}
proc normalline {} {
global thickerline
if {[info exists thickerline]} {
drawlines $thickerline 0
unset thickerline
}
}
proc selbyid {id} {
global idline
if {[info exists idline($id)]} {
selectline $idline($id) 1
}
}
proc mstime {} {
global startmstime
if {![info exists startmstime]} {
set startmstime [clock clicks -milliseconds]
}
return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
}
proc rowmenu {x y id} {
Patrick Mezard
hgk: add context menu visual diff action...
r5394 global rowctxmenu idline selectedline rowmenuid hgvdiff
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
if {![info exists selectedline] || $idline($id) eq $selectedline} {
set state disabled
} else {
set state normal
}
$rowctxmenu entryconfigure 0 -state $state
$rowctxmenu entryconfigure 1 -state $state
$rowctxmenu entryconfigure 2 -state $state
Patrick Mezard
hgk: add context menu visual diff action...
r5394 if { $hgvdiff ne "" } {
$rowctxmenu entryconfigure 6 -state $state
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set rowmenuid $id
tk_popup $rowctxmenu $x $y
}
proc diffvssel {dirn} {
global rowmenuid selectedline lineid
if {![info exists selectedline]} return
if {$dirn} {
set oldid $lineid($selectedline)
set newid $rowmenuid
} else {
set oldid $rowmenuid
set newid $lineid($selectedline)
}
addtohistory [list doseldiff $oldid $newid]
doseldiff $oldid $newid
}
proc doseldiff {oldid newid} {
global ctext cflist
global commitinfo
$ctext conf -state normal
$ctext delete 0.0 end
$ctext mark set fmark.0 0.0
$ctext mark gravity fmark.0 left
$cflist delete 0 end
$cflist insert end "Top"
$ctext insert end "From "
$ctext tag conf link -foreground blue -underline 1
$ctext tag bind link <Enter> { %W configure -cursor hand2 }
$ctext tag bind link <Leave> { %W configure -cursor $curtextcursor }
$ctext tag bind link0 <1> [list selbyid $oldid]
$ctext insert end $oldid [list link link0]
$ctext insert end "\n "
$ctext insert end [lindex $commitinfo($oldid) 0]
$ctext insert end "\n\nTo "
$ctext tag bind link1 <1> [list selbyid $newid]
$ctext insert end $newid [list link link1]
$ctext insert end "\n "
$ctext insert end [lindex $commitinfo($newid) 0]
$ctext insert end "\n"
$ctext conf -state disabled
$ctext tag delete Comments
$ctext tag remove found 1.0 end
startdiff [list $newid $oldid]
}
proc mkpatch {} {
global rowmenuid currentid commitinfo patchtop patchnum
if {![info exists currentid]} return
set oldid $currentid
set oldhead [lindex $commitinfo($oldid) 0]
set newid $rowmenuid
set newhead [lindex $commitinfo($newid) 0]
set top .patch
set patchtop $top
catch {destroy $top}
toplevel $top
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::label $top.from -text "From:"
ttk::entry $top.fromsha1 -width 40
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $top.fromsha1 insert 0 $oldid
$top.fromsha1 conf -state readonly
Andrew Shadura
hgk: in popups, replace labels with window titles...
r18806 grid $top.from $top.fromsha1 -sticky w -pady {10 0}
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::entry $top.fromhead -width 60
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $top.fromhead insert 0 $oldhead
$top.fromhead conf -state readonly
grid x $top.fromhead -sticky w
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::label $top.to -text "To:"
ttk::entry $top.tosha1 -width 40
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $top.tosha1 insert 0 $newid
$top.tosha1 conf -state readonly
grid $top.to $top.tosha1 -sticky w
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::entry $top.tohead -width 60
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $top.tohead insert 0 $newhead
$top.tohead conf -state readonly
grid x $top.tohead -sticky w
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::button $top.rev -text "Reverse" -command mkpatchrev
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 grid $top.rev x -pady 10
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::label $top.flab -text "Output file:"
ttk::entry $top.fname -width 60
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $top.fname insert 0 [file normalize "patch$patchnum.patch"]
incr patchnum
grid $top.flab $top.fname -sticky w
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::frame $top.buts
ttk::button $top.buts.gen -text "Generate" -command mkpatchgo
ttk::button $top.buts.can -text "Cancel" -command mkpatchcan
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 grid $top.buts.gen $top.buts.can
grid columnconfigure $top.buts 0 -weight 1 -uniform a
grid columnconfigure $top.buts 1 -weight 1 -uniform a
grid $top.buts - -pady 10 -sticky ew
focus $top.fname
Andrew Shadura
hgk: fix pop-up windows...
r18804 popupify $top
Andrew Shadura
hgk: in popups, replace labels with window titles...
r18806 wm title $top "Generate a patch"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
proc mkpatchrev {} {
global patchtop
set oldid [$patchtop.fromsha1 get]
set oldhead [$patchtop.fromhead get]
set newid [$patchtop.tosha1 get]
set newhead [$patchtop.tohead get]
foreach e [list fromsha1 fromhead tosha1 tohead] \
v [list $newid $newhead $oldid $oldhead] {
$patchtop.$e conf -state normal
$patchtop.$e delete 0 end
$patchtop.$e insert 0 $v
$patchtop.$e conf -state readonly
}
}
proc mkpatchgo {} {
Thomas Arendsen Hein
hgk: Use $HG instead of hg (see 849f011dbf79)
r4688 global patchtop env
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
set oldid [$patchtop.fromsha1 get]
set newid [$patchtop.tosha1 get]
set fname [$patchtop.fname get]
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 if {[catch {exec $env(HG) --config ui.report_untrusted=false debug-diff-tree -p $oldid $newid >$fname &} err]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 error_popup "Error creating patch: $err"
}
catch {destroy $patchtop}
unset patchtop
}
proc mkpatchcan {} {
global patchtop
catch {destroy $patchtop}
unset patchtop
}
proc mktag {} {
global rowmenuid mktagtop commitinfo
set top .maketag
set mktagtop $top
catch {destroy $top}
toplevel $top
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::label $top.id -text "ID:"
ttk::entry $top.sha1 -width 40
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $top.sha1 insert 0 $rowmenuid
$top.sha1 conf -state readonly
Andrew Shadura
hgk: in popups, replace labels with window titles...
r18806 grid $top.id $top.sha1 -sticky w -pady {10 0}
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::entry $top.head -width 60
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
$top.head conf -state readonly
grid x $top.head -sticky w
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::label $top.tlab -text "Tag name:"
ttk::entry $top.tag -width 60
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 grid $top.tlab $top.tag -sticky w
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::frame $top.buts
ttk::button $top.buts.gen -text "Create" -command mktaggo
ttk::button $top.buts.can -text "Cancel" -command mktagcan
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 grid $top.buts.gen $top.buts.can
grid columnconfigure $top.buts 0 -weight 1 -uniform a
grid columnconfigure $top.buts 1 -weight 1 -uniform a
grid $top.buts - -pady 10 -sticky ew
focus $top.tag
Andrew Shadura
hgk: fix pop-up windows...
r18804 popupify $top
Andrew Shadura
hgk: in popups, replace labels with window titles...
r18806 wm title $top "Create a tag"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
proc domktag {} {
global mktagtop env tagids idtags
set id [$mktagtop.sha1 get]
set tag [$mktagtop.tag get]
if {$tag == {}} {
error_popup "No tag name specified"
return
}
if {[info exists tagids($tag)]} {
error_popup "Tag \"$tag\" already exists"
return
}
if {[catch {
Thomas Arendsen Hein
Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523....
r4740 set out [exec $env(HG) --config ui.report_untrusted=false tag -r $id $tag]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 } err]} {
error_popup "Error creating tag: $err"
return
}
set tagids($tag) $id
lappend idtags($id) $tag
redrawtags $id
}
proc redrawtags {id} {
global canv linehtag idline idpos selectedline
if {![info exists idline($id)]} return
$canv delete tag.$id
set xt [eval drawtags $id $idpos($id)]
$canv coords $linehtag($idline($id)) $xt [lindex $idpos($id) 2]
if {[info exists selectedline] && $selectedline == $idline($id)} {
selectline $selectedline 0
}
}
proc mktagcan {} {
global mktagtop
catch {destroy $mktagtop}
unset mktagtop
}
proc mktaggo {} {
domktag
mktagcan
}
proc writecommit {} {
Andrew Shadura
hgk: use hg export to write commits...
r20935 global rowmenuid wrcomtop commitinfo
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
set top .writecommit
set wrcomtop $top
catch {destroy $top}
toplevel $top
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::label $top.id -text "ID:"
ttk::entry $top.sha1 -width 40
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $top.sha1 insert 0 $rowmenuid
$top.sha1 conf -state readonly
Andrew Shadura
hgk: in popups, replace labels with window titles...
r18806 grid $top.id $top.sha1 -sticky w -pady {10 0}
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::entry $top.head -width 60
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 $top.head insert 0 [lindex $commitinfo($rowmenuid) 0]
$top.head conf -state readonly
grid x $top.head -sticky w
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::label $top.flab -text "Output file:"
ttk::entry $top.fname -width 60
Andrew Shadura
hgk: add .diff extension when exporting commits...
r20934 $top.fname insert 0 [file normalize "commit-[string range $rowmenuid 0 6].diff"]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 grid $top.flab $top.fname -sticky w
Andrew Shadura
hgk: use Ttk instead of plain Tk...
r17958 ttk::frame $top.buts
ttk::button $top.buts.gen -text "Write" -command wrcomgo
ttk::button $top.buts.can -text "Cancel" -command wrcomcan
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 grid $top.buts.gen $top.buts.can
grid columnconfigure $top.buts 0 -weight 1 -uniform a
grid columnconfigure $top.buts 1 -weight 1 -uniform a
grid $top.buts - -pady 10 -sticky ew
focus $top.fname
Andrew Shadura
hgk: fix pop-up windows...
r18804 popupify $top
Andrew Shadura
hgk: in popups, replace labels with window titles...
r18806 wm title $top "Write commit to a file"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
proc wrcomgo {} {
global wrcomtop
set id [$wrcomtop.sha1 get]
set fname [$wrcomtop.fname get]
Andrew Shadura
hgk: use hg export to write commits...
r20935 if {[catch {exec $::env(HG) --config ui.report_untrusted=false export --git -o [string map {% %%} $fname] $id} err]} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 error_popup "Error writing commit: $err"
}
catch {destroy $wrcomtop}
unset wrcomtop
}
proc wrcomcan {} {
global wrcomtop
catch {destroy $wrcomtop}
unset wrcomtop
}
proc listrefs {id} {
David Soria Parra
hgk: read bookmarks
r13461 global idtags idheads idotherrefs idbookmarks
set w {}
if {[info exists idbookmarks($id)]} {
set w $idbookmarks($id)
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set x {}
if {[info exists idtags($id)]} {
set x $idtags($id)
}
set y {}
if {[info exists idheads($id)]} {
set y $idheads($id)
}
set z {}
if {[info exists idotherrefs($id)]} {
set z $idotherrefs($id)
}
David Soria Parra
hgk: read bookmarks
r13461 return [list $w $x $y $z]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 }
proc rereadrefs {} {
David Soria Parra
hgk: read bookmarks
r13461 global idbookmarks idtags idheads idotherrefs
global bookmarkids tagids headids otherrefids
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240
set refids [concat [array names idtags] \
David Soria Parra
hgk: read bookmarks
r13461 [array names idheads] [array names idotherrefs] \
[array names idbookmarks]]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 foreach id $refids {
if {![info exists ref($id)]} {
set ref($id) [listrefs $id]
}
}
David Soria Parra
hgk: read bookmarks
r13461 foreach v {tagids idtags headids idheads otherrefids idotherrefs \
bookmarkids idbookmarks} {
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 catch {unset $v}
}
readrefs
set refids [lsort -unique [concat $refids [array names idtags] \
David Soria Parra
hgk: read bookmarks
r13461 [array names idheads] [array names idotherrefs] \
[array names idbookmarks]]]
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 foreach id $refids {
set v [listrefs $id]
if {![info exists ref($id)] || $ref($id) != $v} {
redrawtags $id
}
}
}
Patrick Mezard
hgk: add context menu visual diff action...
r5394 proc vdiff {withparent} {
TK Soh
hgk: allow any extdiff command for visual diff
r5417 global env rowmenuid selectedline lineid hgvdiff
Patrick Mezard
hgk: add context menu visual diff action...
r5394
if {![info exists rowmenuid]} return
set curid $rowmenuid
if {$withparent} {
set parents [exec $env(HG) --config ui.report_untrusted=false parents --rev $curid --template "{node}\n"]
set firstparent [lindex [split $parents "\n"] 0]
set otherid $firstparent
} else {
if {![info exists selectedline]} return
set otherid $lineid($selectedline)
}
set range "$otherid:$curid"
TK Soh
hgk: allow any extdiff command for visual diff
r5417 if {[catch {exec $env(HG) --config ui.report_untrusted=false $hgvdiff -r $range} err]} {
Patrick Mezard
hgk: add context menu visual diff action...
r5394 # Ignore errors, this is just visualization
}
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 proc showtag {tag isnew} {
global ctext cflist tagcontents tagids linknum
if {$isnew} {
addtohistory [list showtag $tag 0]
}
$ctext conf -state normal
$ctext delete 0.0 end
set linknum 0
if {[info exists tagcontents($tag)]} {
set text $tagcontents($tag)
} else {
set text "Tag: $tag\nId: $tagids($tag)"
}
appendwithlinks $text
$ctext conf -state disabled
$cflist delete 0 end
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 proc doquit {} {
global stopped
set stopped 100
destroy .
}
Patrick Mezard
hgk: add debug-config command to pass configuration options
r5393 proc getconfig {} {
global env
set config {}
Andrew Shadura
hgk: remove no longer needed debug-config command
r24514
set lines [exec $env(HG) debugconfig]
foreach line [split $lines \n] {
set line [string trimright $line \r]
if {[string match hgk.* $line]} {
regexp {(.*)=(.*)} $line - k v
lappend config $k $v
}
Patrick Mezard
hgk: add debug-config command to pass configuration options
r5393 }
return $config
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 # defaults...
set datemode 0
set boldnames 0
set diffopts "-U 5 -p"
set mainfont {Helvetica 9}
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 set curidfont {}
mpm@selenic.com
Initial import of hgit and hgk...
r267 set textfont {Courier 9}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set findmergefiles 0
set gaudydiff 0
set maxgraphpct 50
set maxwidth 16
mpm@selenic.com
Initial import of hgit and hgk...
r267
set colors {green red blue magenta darkgrey brown orange}
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 set authorcolors {
Steve Borho
hgk: add black and blue as preferred colors
r5662 black blue deeppink mediumorchid blue burlywood4 goldenrod slateblue red2 navy dimgrey
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 }
Robert Bauck Hamar
hgk: Add background colour setting...
r7738 set bgcolor white
mpm@selenic.com
Initial import of hgit and hgk...
r267
Robert Bauck Hamar
hgk: added setting of foreground colour...
r7745 # This color should probably be some system color (provided by tk),
# but as the bgcolor has always been set to white, I choose to ignore
set fgcolor black
Robert Bauck Hamar
hgk: added colour settings for different colours in diff view
r7746 set diffaddcolor "#00a000"
set diffremcolor red
set diffmerge1color red
set diffmerge2color blue
set hunksepcolor blue
Robert Bauck Hamar
hgk: added setting of foreground colour...
r7745
bdowning@lavos.net
hgk: change config file from .gitk to .hgk...
r5506 catch {source ~/.hgk}
mpm@selenic.com
Initial import of hgit and hgk...
r267
Georg.Koltermann@mscsoftware.com
hgk: colorize commits by authors...
r5464 if {$curidfont == ""} { # initialize late based on current mainfont
set curidfont "$mainfont bold italic underline"
}
mpm@selenic.com
Initial import of hgit and hgk...
r267 set namefont $mainfont
if {$boldnames} {
lappend namefont bold
}
set revtreeargs {}
foreach arg $argv {
switch -regexp -- $arg {
"^$" { }
"^-b" { set boldnames 1 }
"^-d" { set datemode 1 }
default {
lappend revtreeargs $arg
}
}
}
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set history {}
set historyindex 0
mpm@selenic.com
Initial import of hgit and hgk...
r267 set stopped 0
set redisplaying 0
set stuffsaved 0
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 set patchnum 0
Patrick Mezard
hgk: add context menu visual diff action...
r5394
Andrew Shadura
hgk: remove no longer needed debug-config command
r24514 set config(hgk.vdiff) ""
Patrick Mezard
hgk: add context menu visual diff action...
r5394 array set config [getconfig]
Andrew Shadura
hgk: remove no longer needed debug-config command
r24514 set hgvdiff $config(hgk.vdiff)
mpm@selenic.com
Initial import of hgit and hgk...
r267 setcoords
makewindow
readrefs
Steve Borho
hgk: add repo root to window title
r5284 set hgroot [exec $env(HG) root]
wm title . "hgk $hgroot"
mason@suse.com
Convert hgk to use the hgit extension, and upate to the latest gitk
r1240 getcommits $revtreeargs