graph view does not show lines with ---

Fabian Kreutz project+hg at fabian-kreutz.de
Wed Dec 2 09:35:19 CST 2009


Moi!

Here the patch.
There is only a single rather general test case for hgk and it does not
test the tcl gui at all. So sorry, no test for this one.

Bye, Fabian

PS: Sorry about the mercurial version thing. Arch linux has it as:
Pakete (1): mercurial-1.4-2  
So I assumed it to be 1.4.2.
-------------- next part --------------
# HG changeset patch
# User Fabian Kreutz <project+hg at fabian-kreutz.de>
# Date 1259757039 -7200
# Node ID 7830c9c47fb357d6e56cf660474741be16aa5009
# Parent  57949bfec718c467f02bd4e9c2bfb8e24d001a5b
fix hgk (tcl script): do not ignore ---/+++ lines in diff

diff -r 57949bfec718 -r 7830c9c47fb3 contrib/hgk
--- a/contrib/hgk	Mon Nov 16 14:50:30 2009 -0600
+++ b/contrib/hgk	Wed Dec 02 14:30:39 2009 +0200
@@ -3154,8 +3154,8 @@
 	set pad [string range "----------------------------------------" 1 $l]
 	$ctext insert end "$pad $header $pad\n" filesep
 	set diffinhdr 1
-    } elseif {[regexp {^(---|\+\+\+)} $line]} {
-	set diffinhdr 0
+    } elseif {[regexp {^(---|\+\+\+) } $line] && $diffinhdr} {
+	set diffinhdr 1
     } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \
 		   $line match f1l f1c f2l f2c rest]} {
 	if {$gaudydiff} {


More information about the Mercurial-devel mailing list