Eskil

Check-in [52575a3437]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:No changes should show up in the scroll map when displaying a patch
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 52575a3437f2b2344b3b9df26562ee1899c85fba
User & Date: peter 2012-11-15 20:18:24.174
Context
2012-11-15
20:21
No changes should show up in the scroll map when displaying a patch check-in: 9fe49090fc user: peter tags: trunk
20:18
No changes should show up in the scroll map when displaying a patch check-in: 52575a3437 user: peter tags: trunk
20:17
Corrected etags call. check-in: d27b9bf4ff user: peter tags: trunk
Changes
Side-by-Side Diff Ignore Whitespace Patch
Changes to src/eskil.tcl.
︙
967
968
969
970
971
972
973

974
975
976
977
978
979
980

967
968
969
970
971
972
973
974
975
976
977
978
979
980
981








+








    clearTmp $::eskil($top,rightFile) $::eskil($top,leftFile)
    set ::eskil($top,rightFile) $::eskil($top,conflictFile)
    set ::eskil($top,leftFile) $::eskil($top,conflictFile)
}

# Display one chunk from a patch file
proc displayOnePatch {top leftLines rightLines leftLine rightLine} {
    mapNoChange $top 1
    emptyLine $top 1
    emptyLine $top 2

    set leftlen [llength $leftLines]
    set rightlen [llength $rightLines]

    set leftc 0
︙
1068
1069
1070
1071
1072
1073
1074

1075
1076
1077
1078
1079
1080
1081

1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083








+








    if {[llength $lblock] > 0 || [llength $rblock] > 0} {
        set ::doingLine1 $lblockl
        set ::doingLine2 $rblockl
        insertMatchingBlocks $top $lblock $rblock $lblockl $rblockl 0
        set lblock {}
        set rblock {}
    }
    mapNoChange $top 0
}

# Read a patch file and display it
proc displayPatch {top} {
    global Pref

    set ::eskil($top,leftLabel) "Patch $::eskil($top,patchFile): old"
︙
Changes to src/map.tcl.
︙
42
43
44
45
46
47
48

49
50
51





52
53

54
55
56
57
58
59
60

42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58

59
60
61
62
63
64
65
66








+



+
+
+
+
+

-
+









    return $w
}

proc clearMap {top} {
    set ::eskil($top,changes) {}
    set ::eskil($top,mapMax) 0
    set ::eskil($top,mapNoChange) 0
    drawMap $top -1
}

# Temporarily ignore changes added by addChange.
proc mapNoChange {top value} {
    set ::eskil($top,mapNoChange) $value
}

proc addChange {top n tag line1 n1 line2 n2} {
    if {$tag ne ""} {
    if {$tag ne "" && $::eskil($top,mapNoChange) == 0} {
        lappend ::eskil($top,changes) [list $::eskil($top,mapMax) $n \
                $tag $line1 $n1 $line2 $n2]
    }
    incr ::eskil($top,mapMax) $n
}

proc addMapLines {top n} {
︙