Eskil

Check-in [4a0f71fd51]
Login

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

Overview
Comment:Added
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4a0f71fd51adf2c1b538ee7067018705e3daf2d2
User & Date: peter 2007-02-23 05:30:46.000
Context
2007-02-24
21:03
Added ignorenewline. check-in: 61d3fb5962 user: peter tags: trunk
2007-02-23
05:30
Added check-in: 4a0f71fd51 user: peter tags: trunk
05:25
Correctly handle toolbars when windows are deleted. Added -close option to automatically close windows with no changes. check-in: 7485ffcb4f user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Added doc/cmdline.txt.




















































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
<b><ul>Command line usage</ul></b>

eskil [options] [file1] [file2]
  [options]              See below.
  [file1],[file2]        Files to be compared
                         If no files are given, the program is
                         started anyway and you can select files
                         from within.
                         If only one file is given, the program
                         looks for version control of the file, and 
                         if found, runs in version control mode.
  Options:

  -nodiff     : Normally, if there are enough information on the
                command line to run diff, Eskil will do so unless
                this option is specified.
  -dir        : Start in directory diff mode. Ignores other args.
  -clip       : Start in clip diff mode. Ignores other args.
  -patch      : View patch file.
  -context <n>: Show only differences, with <n> lines of context.
  -foreach    : Open one diff window per file listed.
  -close      : Close windows with no changes.

  -noparse    : Eskil can perform analysis of changed blocks to
  -line       : improve display. See online help for details.
  -smallblock : The default. Do block analysis on small blocks.
  -block      : Full block analysis. This can be slow if there
                are large change blocks.

  -char       : The analysis of changes can be done on either
  -word       : character or word basis. -char is the default.

  -noignore   : Don't ignore any whitespace.
  -b          : Ignore space changes. Default.
  -w          : Ignore all spaces.
  -nocase     : Ignore case changes.
  -nodigit    : Ignore digit changes.
  -nokeyword  : In directory diff, ignore $ Keywords: $

  -prefix <str> : Care mainly about words starting with "str".
  -preprocess <pair> : TBW

  -r <ver>    : Version info for version control mode.

  -conflict   : Treat file as a merge conflict file and enter merge
                mode.
  -o <file>   : Specify merge result output file.

  -browse     : Automatically bring up file dialog after starting.
  -server     : Set up Eskil to be controllable from the outside.

  -print <file> : Generate postscript and exit.

  -limit <lines> : Do not process more than <lines> lines.}

To list all options matching a prefix, run 'eskil --query prefix'.
In tcsh use this line to get option completion:
complete eskil 'C/-/`eskil --query -`/'
Added examples/dir1/casechange.








>
>
>
>
1
2
3
4
This little line went to market.
This little line stayed at home.
This little line had a case change.
This little line had none.
Added examples/dir1/enum.c.














































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
#include "someotherfile.h"

const int Table[] = {
    10, /* Apa1  */
    20, /* Apa2  */
    30, /* Apa3  */
    40, /* Apa4  */
    50, /* Apa5  */
    60, /* Apa6  */
    70, /* Apa7  */
    80, /* Apa8  */
    90, /* Apa9  */
    15, /* Apa10 */
    25, /* Apa11 */
    35, /* Apa12 */
    30, /* Apa13 */
    40, /* Apa14 */
    50, /* Apa15 */
    60, /* Apa16 */
    70, /* Apa17 */
    80, /* Apa18 */
    90, /* Apa19 */
    15, /* Apa20 */
    25, /* Apa21 */
    35, /* Apa22 */
    30, /* Apa23 */
    40, /* Apa24 */
    50, /* Apa25 */
    60, /* Apa26 */
    70, /* Apa27 */
    80, /* Apa28 */
    90, /* Apa29 */
    15, /* Apa30 */
    25, /* Apa31 */
    35, /* Apa32 */
    30, /* Apa33 */
    40, /* Apa34 */
    50, /* Apa35 */
};
Added examples/dir1/nets.










>
>
>
>
>
1
2
3
4
5
NET '/I$1/N$1454' IC2-15 IC5-7
NET '/I$1/N$1455' IC2-14 IC6-8
NET '/I$1/N$1456' IC2-13 IC2-12
NET '/I$1/N$1457' IC2-11 IC6-7
NET '/I$1/N$1458' IC2-10
Added examples/dir2/casechange.








>
>
>
>
1
2
3
4
This Little lIne went to market
This little line Stayed at home
This little line had a Case Change.
This little line had none.
Added examples/dir2/enum.c.
















































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
typedef enum
{
    Apa1,
    Apa2,
    Apa3,
    Apa4,
    Apa5,
    Apa6,
    Apa7,
    Apa8,
    Apa9,
    Apa10,
    Apa11,
    Apa12,
    Apa13,
    Apa14,
    Apa15,
    Apa16,
    Apa17,
    Apa18,
    Apa19,
    Apa20,
    Apa21,
    Apa22,
    Apa23,
    Apa24,
    Apa25,
    Apa26,
    Apa27,
    Apa28,
    Apa29,
    Apa30,
    Apa31,
    Apa32,
    Apa33,
    Apa34,
    Apa35
} Apa_T;

#define ApaSize 35
Added examples/dir2/nets.








>
>
>
>
1
2
3
4
NET '/I$1/N$1454' IC1-4 IC2-15 IC5-2 IC5-7
NET '/I$1/N$1456' IC2-12
NET '/I$1/N$1457' IC2-11 IC6-7
NET '/I$1/N$1458' IC2-9