Fossil Wrapper

Check-in [e36ec516ef]
Login

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

Overview
Comment:adjusted indent of `fancy_timeline' so that de-indentation works when `.fslrc' is first created.
Timelines: family | ancestors | descendants | both | dresden
Files: files | file ages | folders
SHA1: e36ec516efb7a34204af068e486f98b21a3a5078
User & Date: j 2013-07-24 11:28:09
Context
2013-07-24
13:03
further adjustment to timeline format. a further alias definition. check-in: 11ad9134d2 user: j tags: dresden
11:28
adjusted indent of `fancy_timeline' so that de-indentation works when `.fslrc' is first created. check-in: e36ec516ef user: j tags: dresden
11:24
start of another attempt at improved timeline output. check-in: a5391d6012 user: j tags: dresden
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to fsl.

98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
        if {[regexp "^=== .* ===" $line]} {
            coloured blue $line
        } else {
            regsub -all {\[[A-Fa-f0-9]+\]} $line [coloured yellow &]
        }
    }

   filter fancy_timeline {leaves timeline finfo} {
       #currently, addition of `finfo' has to be considered
       #tentative only since coloring (if it occurs) interferes
       #with `finfo -p' (although nowadays `cat' should be the
       #canonical command for this purpose). 
       #
       #the modified patterns, however, should not be a problem
       #modifications are:
       #
       # -- more specific `artifact_rx' to avoid unintentional hits
       # -- augmented `date_rx' to account for `finfo' output 
       # -- use (tags|branch)   to account for `finfo' output
       # -- add (artifact:)     to account for `finfo' output
       #
       # Expressions to match:
       set artifact_rx {\[([a-f\d]{4})([a-f\d]{6}\]*)\]}
       set date_rx     {(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d)}
       set current_rx  {\*CURRENT\*}
       set frkmrg_rx   {\*(FORK|MERGE|BRANCH)\*}
       # Colour the output (repeated substitutions on $line):
       set line [regsub -all $artifact_rx $line [format {[%s%s]} [coloured red {\1}] {\2}]]
       set line [regsub $date_rx    $line [coloured blue \\1]]
       set line [regsub $current_rx $line [display reversed &]]
       set line [regsub $frkmrg_rx  $line [display underscored &]]
       set line [regsub {(user: )([a-z][-_.a-z0-9]*)} $line [coloured yellow \\1][coloured green \\2]]
       set line [regsub {((tags|branch): )([a-z][-_,.a-z0-9 ]*)} $line [coloured yellow \\1][coloured green \\3]]
       regsub {(artifact: )} $line [coloured yellow \\1]
   }


    # Filter only on aliases of `diff' but not the original command so that 
    # the latter's output can be redirected to create patch files.
    filter diff {d di} {
        switch -regexp $line {
           {^-}       { coloured    red $line }







|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|







98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
        if {[regexp "^=== .* ===" $line]} {
            coloured blue $line
        } else {
            regsub -all {\[[A-Fa-f0-9]+\]} $line [coloured yellow &]
        }
    }

    filter fancy_timeline {leaves timeline finfo} {
        #currently, addition of `finfo' has to be considered
        #tentative only since coloring (if it occurs) interferes
        #with `finfo -p' (although nowadays `cat' should be the
        #canonical command for this purpose). 
        #
        #the modified patterns, however, should not be a problem
        #modifications are:
        #
        # -- more specific `artifact_rx' to avoid unintentional hits
        # -- augmented `date_rx' to account for `finfo' output 
        # -- use (tags|branch)   to account for `finfo' output
        # -- add (artifact:)     to account for `finfo' output
        #
        # Expressions to match:
        set artifact_rx {\[([a-f\d]{4})([a-f\d]{6}\]*)\]}
        set date_rx     {(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d)}
        set current_rx  {\*CURRENT\*}
        set frkmrg_rx   {\*(FORK|MERGE|BRANCH)\*}
        # Colour the output (repeated substitutions on $line):
        set line [regsub -all $artifact_rx $line [format {[%s%s]} [coloured red {\1}] {\2}]]
        set line [regsub $date_rx    $line [coloured blue \\1]]
        set line [regsub $current_rx $line [display reversed &]]
        set line [regsub $frkmrg_rx  $line [display underscored &]]
        set line [regsub {(user: )([a-z][-_.a-z0-9]*)} $line [coloured yellow \\1][coloured green \\2]]
        set line [regsub {((tags|branch): )([a-z][-_,.a-z0-9 ]*)} $line [coloured yellow \\1][coloured green \\3]]
        regsub {(artifact: )} $line [coloured yellow \\1]
    }


    # Filter only on aliases of `diff' but not the original command so that 
    # the latter's output can be redirected to create patch files.
    filter diff {d di} {
        switch -regexp $line {
           {^-}       { coloured    red $line }