Mercurial > hg > mercurial-crew-with-dirclash
comparison contrib/hgk @ 274:5da941efbb52
[PATCH] hgk should parse dates in the diff output
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] hgk should parse dates in the diff output
hgk doesn't deal well with the difflib style diffs, it expects the filename
to be the last thing on the line. This patch fixes the regexp to stop
reading the filename at the first tab.
Signed-off-by: Chris Mason <mason@suse.com>
manifest hash: 9c5bcf427455dcf306ab6f91b1986723caa83f36
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpl/HywK+sNU5EO8RAgAjAKCOuZsRtJDbdurTQry+7krtLTtRQQCfXLuN
LZEFkcOGS0jiAC6vci/RLJ0=
=jkr1
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 07 Jun 2005 19:02:31 -0800 |
parents | 497aa6d276d2 |
children | a69c3b2957d1 |
comparison
equal
deleted
inserted
replaced
273:4f8174389001 | 274:5da941efbb52 |
---|---|
1179 unset treepending | 1179 unset treepending |
1180 addtocflist $id | 1180 addtocflist $id |
1181 return | 1181 return |
1182 } | 1182 } |
1183 set file [lindex $line 5] | 1183 set file [lindex $line 5] |
1184 puts stderr "line $file\n" | |
1185 lappend treediffs($id) $file | 1184 lappend treediffs($id) $file |
1186 } | 1185 } |
1187 | 1186 |
1188 proc getblobdiffs {id} { | 1187 proc getblobdiffs {id} { |
1189 global parents diffopts blobdifffd env curdifftag curtagstart | 1188 global parents diffopts blobdifffd env curdifftag curtagstart |
1219 } | 1218 } |
1220 if {$id != $currentid || $bdf != $blobdifffd($id)} { | 1219 if {$id != $currentid || $bdf != $blobdifffd($id)} { |
1221 return | 1220 return |
1222 } | 1221 } |
1223 $ctext conf -state normal | 1222 $ctext conf -state normal |
1224 if {[regexp {^---[ \t]+([^/])*/(.*)} $line match s1 fname]} { | 1223 if {[regexp {^---[ \t]+([^/])*/([^\t]*)} $line match s0 fname]} { |
1225 # start of a new file | 1224 # start of a new file |
1226 $ctext insert end "\n" | 1225 $ctext insert end "\n" |
1227 $ctext tag add $curdifftag $curtagstart end | 1226 $ctext tag add $curdifftag $curtagstart end |
1228 set seenfile($curdifftag) 1 | 1227 set seenfile($curdifftag) 1 |
1229 set curtagstart [$ctext index "end - 1c"] | 1228 set curtagstart [$ctext index "end - 1c"] |