Eskil

Check-in [af654f848b]
Login

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

Overview
Comment:More documentation
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: af654f848b63566b0e4a807e9148baf3ed39f025637ec5ec243709f87703a895
User & Date: peter 2018-06-17 21:33:34
Context
2018-06-17
22:11
More documentation check-in: 2211f9affc user: peter tags: trunk
21:33
More documentation check-in: af654f848b user: peter tags: trunk
21:22
More documentation check-in: 5e6abd5a47 user: peter tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.

132
133
134
135
136
137
138

139
140





141
142
143
144
145
146
147

src/TAGS: $(SRCFILES)
	etags -o src/TAGS --regex="/proc[ \t]+\([^ \t]+\)/\1/" $(SRCFILES) \
	eskil.vfs/lib/*/*.tcl

setup: links src/TAGS


# Use this to rebuild the toc when new wiki files are added.
toc:





	echo "<title>Documentation</title>\n" > htdocs/toc.wiki
	grep title htdocs/*.wiki | grep -v Documentation | \
	sed -e 's/htdocs/[./' -e 's/:<title>/|/' -e 's,</title>,],' | \
	awk '{print $0; print ""};' >> htdocs/toc.wiki
#----------------------------------------------------------------
# Testing
#----------------------------------------------------------------







>
|
|
>
>
>
>
>







132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153

src/TAGS: $(SRCFILES)
	etags -o src/TAGS --regex="/proc[ \t]+\([^ \t]+\)/\1/" $(SRCFILES) \
	eskil.vfs/lib/*/*.tcl

setup: links src/TAGS

# Use this to rebuild the docs when command line changes or
# new wiki files are added.
docs:
	echo "<title>Usage</title>\n" > htdocs/usage.wiki
	echo "<h1>Command Line Usage</h1>\n" >> htdocs/usage.wiki
	echo "<verbatim>" >> htdocs/usage.wiki
	$(TCLKIT_LINUX) eskil.vfs/main.tcl -help >> htdocs/usage.wiki
	echo "</verbatim>" >> htdocs/usage.wiki
	echo "<title>Documentation</title>\n" > htdocs/toc.wiki
	grep title htdocs/*.wiki | grep -v Documentation | \
	sed -e 's/htdocs/[./' -e 's/:<title>/|/' -e 's,</title>,],' | \
	awk '{print $0; print ""};' >> htdocs/toc.wiki
#----------------------------------------------------------------
# Testing
#----------------------------------------------------------------

Changes to htdocs/merge.wiki.

17
18
19
20
21
22
23
24
25
26
27
28
29
30
31


32

The status bar show basic info about the selected difference. A conflict
is marked with ***. Hover over the status line to get more info.

When saving, if no output file has been previously been selected, you get the
choise to overwrite either side or browse for another file.

From the The following command line parameters are merge related:

  -a <file> : Ancestor file for threeway merge.

  -o <file> : Output file for merge result.

  -fine     : Use fine grained chunks. Left/right choice is made per line instead of per chunk.



See also [./editmode.wiki|Edit Mode], and [./revision.wiki|Revision Control Support].







|







>
>

17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

The status bar show basic info about the selected difference. A conflict
is marked with ***. Hover over the status line to get more info.

When saving, if no output file has been previously been selected, you get the
choise to overwrite either side or browse for another file.

The following command line parameters are merge related:

  -a <file> : Ancestor file for threeway merge.

  -o <file> : Output file for merge result.

  -fine     : Use fine grained chunks. Left/right choice is made per line instead of per chunk.

  -conflict : Treat input file as a file with merge conflict markers.

See also [./editmode.wiki|Edit Mode], and [./revision.wiki|Revision Control Support].

Changes to htdocs/toc.wiki.

13
14
15
16
17
18
19
20


[./revision.wiki|Revision Control Support]

[./starkit.wiki|Starkit compare]

[./starpack.wiki|Starpack generation]

[./table.wiki|Table diff]











>
>
13
14
15
16
17
18
19
20
21
22
[./revision.wiki|Revision Control Support]

[./starkit.wiki|Starkit compare]

[./starpack.wiki|Starpack generation]

[./table.wiki|Table diff]

[./usage.wiki|Usage]

Added htdocs/usage.wiki.









































































































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
<title>Usage</title>

<h1>Command Line Usage</h1>

<verbatim>
Usage: eskil [options] [files...]
  [options]  See below.
  [files...] 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.
  If directories are given, Eskil starts in directory diff.

  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 -`/'

  Options:
-          : Read patch file from standard input, to allow pipes
-a <v>     : Give ancestor file for three way merge
-b         : Ignore space changes (default)
-block     : Full block analysis. This can be slow if there are large change
             blocks
-browse    : Automatically bring up file dialog after starting
-char      : Character based change view (default)
-clip      : Start in clip diff mode. Ignores other args
-close     : Close windows with no changes
-conflict  : Treat file as a merge conflict file and enter merge mode
-context <v> : Show only differences, with <n> lines of context
-cvs       : Detect CVS first, if multiple version systems are used
-debug     : Start in debug mode
-dir       : Start in directory diff mode. Ignores other args
-excludedir <v> : Exclude from directory diff
-excludefile <v> : Exclude from directory diff
-fine      : Use fine grained chunks. Useful for merging
-foreach   : Open one diff window per file listed
-fourway   : Start in fourway diff mode. Ignores other args
-gz        : Uncompress input files with gunzip
-i         : Ignore case changes
-limit <v> : Do not process more than <lines> lines
-line      : Line based block analysis
-maxwidth <v> : Limit column width in table mode
-nocase    : Ignore case changes
-nocdiff   : Disable C version of DiffUtil. For debug
-nodiff    : Do not run diff after startup
-nodigit   : Ignore digit changes
-noempty   : Ignore empty lines initially for matching
-noignore  : Don't ignore any whitespace
-nokeyword : In directory diff, ignore $ Keywords: $
-nonewline : Try to ignore newline changes
-nonewline+ : Try to ignore newline changes, and don't display
-noparse   : No block analysis
-o <v>     : Specify merge result output file
-patch     : View patch file
-pivot <v> : Pivot setting for diff algorithm (10)
-plugin <v> : Preprocess files using plugin
-pluginallow : Allow full access privilege for plugin
-plugindump <v> : Dump plugin source to stdout
-plugininfo <v> : Pass info to plugin (plugin specific)
-pluginlist : List known plugins
-prefix <v> : Care mainly about words starting with "str"
-preprocess <v> : TBW <pair>
-preprocessleft <v> : TBW <pair>
-preprocessright <v> : TBW <pair>
-print <v> : Generate PDF and exit.
-printCharsPerLine <v> : Adapt font size for this line length and wrap (80)
-printColorChange <v> : Color for change (1.0 0.7 0.7)
-printColorNew <v> : Color for new text (0.8 0.8 1.0)
-printColorOld <v> : Color for old text (0.7 1.0 0.7)
-printFont <v> : Select font to use in PDF, afm or ttf. If <fontfile> is given
                 as "Courier", PDF built in font is used
-printHeaderSize <v> : Font size for page header (10)
-printPaper <v> : Select paper size (a4)
-r <v>     : Version info for version control mode
-review    : View revision control tree as a patch.
-sep <v>   : See char <c> as separator between columns in files
-server    : Set up Eskil to be controllable from the outside
-smallblock : Do block analysis on small blocks (default)
-svn       : Detect SVN first, if multiple version systems are used
-table     : Run in table mode
-w         : Ignore all spaces
-word      : Word based change view
</verbatim>