Eskil

Check-in [9313711f6a]
Login

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

Overview
Comment:Detect and display annotation in patches. E.g. when using -p with diff.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9313711f6ac75886b0e7f2ca7bfbf1f158749dcd
User & Date: peter 2009-11-02 20:52:29.000
Context
2009-11-02
20:55
Polish check-in: ad0a47e0b1 user: peter tags: trunk
20:52
Detect and display annotation in patches. E.g. when using -p with diff. check-in: 9313711f6a user: peter tags: trunk
2009-10-16
22:19
Return in rev field does a redo diff. [FR 4649] Allow zero lines of context to only show diffs. check-in: 9bb4874b85 user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Changes. 



1
2
3
4
5
6
7




2009-10-17
 Return in rev field does a redo diff. [FR 4649]
 Allow zero lines of context to only show diffs.

2009-02-12
 Allow stepping down in directory diff.
 Require 8.5. Misc cleanup to use that fact.

>
>
>








1
2
3
4
5
6
7
8
9
10

2009-11-02
 Detect and display annotation in patches. E.g. when using -p with diff.

2009-10-17
 Return in rev field does a redo diff. [FR 4649]
 Allow zero lines of context to only show diffs.

2009-02-12
 Allow stepping down in directory diff.
 Require 8.5. Misc cleanup to use that fact.
︙︙
Changes to src/eskil.tcl.
︙︙
987
988
989
990
991
992
993








994
995
996
997
998
999
1000
1001
1002
1003
1004
1005








1006
1007
1008
1009
1010
1011
1012

            continue
        }
        # A new section in a -u style diff
        if {[regexp {^@@\s+-(\d+),\d+\s+\+(\d+),} $line -> sub1 sub2]} {
            if {$state eq "both"} {
                displayOnePatch $top $leftLines $rightLines \
                        $leftLine $rightLine








            }
            set state both
            set leftLine $sub1
            set rightLine $sub2
            set leftLines {}
            set rightLines {}
            continue
        }
        # A new section in a -c style diff
        if {[regexp {^\*\*\*\*\*} $line]} {
            if {$state eq "right"} {
                displayOnePatch $top $leftLines $rightLines $leftLine $rightLine








            }
            set leftLines {}
            set rightLines {}
            set state left
            continue
        }
        # We are in the left part of a -c style diff








>
>
>
>
>
>
>
>












>
>
>
>
>
>
>
>








987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028

            continue
        }
        # A new section in a -u style diff
        if {[regexp {^@@\s+-(\d+),\d+\s+\+(\d+),} $line -> sub1 sub2]} {
            if {$state eq "both"} {
                displayOnePatch $top $leftLines $rightLines \
                        $leftLine $rightLine
            }
            # Look for c function annotation in -u style
            if {[regexp {^@@.*@@(.*)$} $line -> cfun]} {
                set cfun [string trim $cfun]
                if {$cfun ne ""} {
                    insertLine $top 1 "" $cfun     patch
                    insertLine $top 2 "" $cfun     patch
                }
            }
            set state both
            set leftLine $sub1
            set rightLine $sub2
            set leftLines {}
            set rightLines {}
            continue
        }
        # A new section in a -c style diff
        if {[regexp {^\*\*\*\*\*} $line]} {
            if {$state eq "right"} {
                displayOnePatch $top $leftLines $rightLines $leftLine $rightLine
            }
            # Look for c function annotation in -c style
            if {[regexp {^\*\*\*\*\*\S*\s+(.*)$} $line -> cfun]} {
                set cfun [string trim $cfun]
                if {$cfun ne ""} {
                    insertLine $top 1 "" $cfun     patch
                    insertLine $top 2 "" $cfun     patch
                }
            }
            set leftLines {}
            set rightLines {}
            set state left
            continue
        }
        # We are in the left part of a -c style diff
︙︙