Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch trunk
Through [d859cf57c8]
Excluding Merge-Ins
This is equivalent to a diff from
1cdf7d5e95
to d859cf57c8
|
2011-11-03
| | |
| 00:25 |
|
check-in: c38d2982b8 user: peter tags: trunk
|
|
2011-11-01
| | |
| 22:16 |
|
check-in: d859cf57c8 user: peter tags: trunk, version-2.6.1
|
| 22:12 |
|
check-in: 00878f4ffb user: peter tags: trunk
|
|
2011-05-09
| | |
| 00:08 |
|
check-in: ddfc1ceec8 user: peter.spjuth@gmail.com tags: trunk
|
|
2011-05-08
| | |
| 22:49 |
|
Closed-Leaf
check-in: 1cdf7d5e95 user: peter.spjuth@gmail.com tags: table-list
|
|
2011-05-07
| | |
| 00:37 |
|
check-in: eb61cb3ca6 user: peter.spjuth@gmail.com tags: table-list
|
| | |
Changes to Changes.
1
2
3
4
5
6
7
|
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
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
Release 2.6.1
2011-11-01
Fixed bug where copy button in directory diff picked the wrong file.
Use a custom Toolbutton layout to get a small toolbutton in directory diff.
Release 2.6
2011-10-27
Rebuilt rev-detection to handle any dir depth.
Detect .fos as fossil indicator.
2011-10-15
Added Show in plugin dialog. Added sort plugin. [FR 3735]
2011-10-15
Added procedure editor to debug menu.
2011-10-15
Corrected search of plugins to find them in VFS. [Bug 18395]
2011-10-05
Respect block parse setting when showing a patch. [Bug 18147]
2011-10-04
Fall back to Tcl-dialog when accessing a vfs. [Bug 18371]
2011-05-09
Use mouse dragging to set alignment.
2011-05-09
Rewritten directory diff to use tablelist.
Redesigned appearance of directory diff.
2011-04-30
Improved three-way merge.
Highlight conflicts and navigate directly between conflicts.
Include status for each merge chunk to see the descision made.
Added Goto menu in merge window to get fewer toolbar buttons.
Autodetect line endings in ancestor file to select merge output.
|
| ︙ | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
Deleted Eskil.html.
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
85
86
87
88
89
90
91
92
93
94
95
96
97
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
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
|
|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
|
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>Eskil - A graphical frontend to Diff</title>
<meta http-equiv="content-type"
content="text/html; charset=ISO-8859-1">
</head>
<body>
<a href="http://developer.berlios.de" title="BerliOS Developer"> <img src="http://developer.berlios.de/bslogo.php?group_id=6563" width="124px" height="32px" border="0" alt="BerliOS Developer Logo"></a>
<p>
<h3>Bug tracker and mailing list can be found at the
<b><a href="https://developer.berlios.de/projects/eskil/">Project page</a>
</b></h3><p>
<h1>Eskil: A graphical frontend to Diff</h1>
<a href="#EskilDownload">Download</a>
<a href="#EskilFeatures">Features</a>
<a href="#EskilScreenshots">Screenshots</a>
<a href="#EskilChanges">Changes</a>
<p>
<h3>About Eskil</h3>
The first major application I wrote in Tcl/Tk was this tool (somewhere around
1997). Writing it is what made me learn and enjoy Tcl. (I already liked Tk
but still found Tcl annoying at the time.)<br>
I have used it a lot during the years and lately it has received enough
polish to grant a public release.
<p>
Pronunciation: The E is short, like in "set", the rest is like "skill".
<p>
Any feedback, good or bad, can be sent to
<peter <i>dot</i> spjuth <i>at</i> gmail <i>dot</i> com>
<p>
It is similar but unrelated to <a href="http://wiki.tcl.tk/tkdiff">TkDiff</a>.
<a name="EskilFeatures"></a><h3>Features</h3>
<ul>
<li>Highlights changes within a line.</li>
<li>Matches similar lines within a changed block to better show changed
lines that are adjacent to added/removed lines.</li>
<li>Directory diff.</li>
<li>CVS/RCS/ClearCase/GIT/SVN/BZR/HG/Perforce/Fossil diff. Conflict merge.</li>
<li>Commit changes directly from Eskil.</li>
<li>View patch, from file or clipboard.</li>
<li>Print to PDF.</li>
<li>"Clip diff"</li>
<li>Plugins for preprocessing files.</li>
<li>Alignment and block diff functions for tricky diffs.</li>
<li>Edit and Save file from diff window.</li>
<li><a href="http://wiki.tcl.tk/starkit">Starkit</a> browsing.</li>
</ul>
<a name="EskilDownload"></a><h3>Download</h3>
Version 2.5:<br>
Is available from the
<a href="https://developer.berlios.de/projects/eskil/">Project page</a>
both as a Starkit and as Starpacks for Windows, Linux and Solaris.
<p>
The license for the application source is GPL but the bundled packages
are under the same license as Tcl.
<p>More information about <a href="http://wiki.tcl.tk/starkit">Starkits</a>
and <a href="http://wiki.tcl.tk/starpack">Starpacks</a>.
<a name="EskilScreenshots"></a><h3>Screenshots</h3>
<img src="eskil/eskil1.png">
<p>
A "zoom" feature for long lines.<p>
<img src="eskil/eskil2.png"><br>
<a name="EskilChanges"></a><h3>Changes</h3>
Changes in v2.5 (2011-04-01):<br>
<ul>
<li> Requires Tcl 8.5.</li>
<li> Plugins: Added dump, better documentation.</li>
<li> Dir diff: Added step down.</li>
<li> Dir diff: Redesigned to display less.</li>
<li> Support for Perforce and Fossil.</li>
<li> Allow zero lines of context.</li>
<li> Detect and display annotation in patch view.</li>
<li> Select colors for PDF print. Command line options for PDF.</li>
<li> Removed support for Postscript output.</li>
<li> Support File Drop with TkDnd.</li>
<li> Handle line endings in conflict and merge.</li>
</ul>
Changes in v2.4 (2009-01-08):<br>
<ul>
<li> Completely redesigned directory diff.</li>
<li> Added a log viewer in revision mode.</li>
<li> Added color option for unchanged text.</li>
<li> Plugins support.</li>
<li> Support for Subversion, Mercurial and Bazaar.</li>
<li> Support commit in Subversion.</li>
<li> Added -review for displaying all changes in a tree.</li>
<li> Support command line "-" to read a patch from std input.</li>
</ul>
Changes in v2.3 (2007-12-05):<br>
<ul>
<li> Added -printpdf command line option.</li>
<li> Fixed line numbering in PDF with big line numbers.</li>
<li> Started on GIT support.</li>
<li> Anything on the command line is checked for a starkit.
Kits are mounted and treated as directories.</li>
</ul>
Changes in v2.2 (2007-04-05):<br>
<ul>
<li> Added experimental -nonewline command option.</li>
<li> Added -close command option.</li>
<li> Added experimental PDF print.</li>
<li> Added dirdiff preferences and filters.</li>
<li> Smarter save in merge. [FR 2957]</li>
<li> Added commit button for CVS. [FR 2780]</li>
<li> Bug fixes include: Kits are mounted readonly,
fixed dir diff window menu,
improved patch file parsing.</li>
</ul>
<br>
Changes in v2.1 (2006-06-02):<br>
<ul>
<li> Added -preprocess command line option.</li>
<li> Added -foreach command line option.</li>
<li> Added -context command line option.</li>
<li> Handle starkits as directories in dir diff.</li>
<li> Support relative -r with CVS.</li>
</ul>
<br>
Changes in v2.0.7 (2004-12-14):<br>
<ul>
<li> Added regsub preprocessing option.</li>
<li> Added -prefix command line option.</li>
<li> Improved merge window.</li>
<li> Added ignore keyword option to directory diff.</li>
</ul>
<br>
Changes in v2.0.6 (2004-10-19):<br>
<ul>
<li> Added Ignore Digit option.</li>
<li> Fixed bug in -r for ClearCase.</li>
<li> Edit Mode made more robust.</li>
</ul>
<br>
Changes in v2.0.5 (2004-08-20):<br>
<ul>
<li> Option -r can now be used with ClearCase diff.</li>
<li> Edit Mode allows simple editing in the diff display and saving.</li>
</ul>
<br>
Changes in v2.0.4 (2004-06-17):<br>
<ul>
<li> Added ignore case option.</li>
<li> Improved alignment function.</li>
</ul>
<br>
Changes in v2.0.3 (2004-05-26):<br>
<ul>
<li> Added context options for "Diffs only" mode.</li>
<li> Rewrote how "Separate Diff" and "Align" works. The latter now only happens after a "Redo Diff".</li>
<li> Added scroll map and some more context menu options in Directory Diff.</li>
</ul>
<br>
Changes in v2.0.2 (2004-05-03):<br>
<ul>
<li> Fixed a bug in ClearCase support.</li>
<li> Improved enscipt usage in print command.</li>
<li> Added "mark file" in dirdiff context menu.</li>
</ul>
<br>
Changes in v2.0.1 (2004-02-10):<br>
<ul>
<li> Added preference for width and height.</li>
<li> Added Tools menu to directory diff window.</li>
<li> Made it simpler to save a conflict in the same file.</li>
</ul>
<br>
First public release v2.0 (2004-01-30):<br>
<br>
</body>
</html>
|
Changes to Makefile.
1
2
3
4
5
6
7
8
9
10
11
12
|
1
2
3
4
5
6
7
8
9
10
11
12
|
-
+
|
#----------------------------------------------------------------------
# Make file for Eskil
#----------------------------------------------------------------------
VERSION = 26
VERSION = 261
# Path to the TclKits used for creating StarPacks.
TCLKIT = /home/peter/tclkit/v85
TCLKIT_LINUX = $(TCLKIT)/tclkit-8.5.8
TCLKIT_SOLARIS = $(TCLKIT)/tclkit-solaris-sparc
TCLKIT_WIN = $(TCLKIT)/tclkit-win32.upx.exe
|
| ︙ | | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
-
+
|
# Tools
NAGELFAR = nagelfar
all: setup
SRCFILES = src/eskil.tcl src/clip.tcl src/dirdiff.tcl src/help.tcl src/map.tcl \
src/print.tcl src/registry.tcl src/rev.tcl \
src/print.tcl src/registry.tcl src/rev.tcl src/debug.tcl \
src/compare.tcl src/merge.tcl src/printobj.tcl src/plugin.tcl
#----------------------------------------------------------------
# Setup symbolic links from the VFS to the real files
#----------------------------------------------------------------
eskil.vfs/src/eskil.tcl:
|
| ︙ | | |
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
140
141
142
143
|
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
140
141
142
143
144
145
146
|
-
+
+
+
+
-
+
-
-
+
+
|
@$(NAGELFAR) $(NAGELFARFLAGS) -header eskil_h.syntax $(SRCFILES)
check: eskil_h.syntax
@echo Checking...
@for i in $(SRCFILES); do $(NAGELFAR) $(NAGELFARFLAGS) eskil_h.syntax $$i ; done
test:
@./tests/all.tcl
@./tests/all.tcl $(TESTFLAGS)
run:
$(TCLKIT_LINUX) eskil.vfs/main.tcl
#----------------------------------------------------------------
# Coverage
#----------------------------------------------------------------
# Source files for code coverage
COVFILES = src/rev.tcl src/eskil.tcl
COVFILES = eskil.vfs/main.tcl eskil.vfs/src/rev.tcl eskil.vfs/src/eskil.tcl eskil.vfs/src/merge.tcl
IFILES = $(COVFILES:.tcl=.tcl_i)
LOGFILES = $(COVFILES:.tcl=.tcl_log)
MFILES = $(COVFILES:.tcl=.tcl_m)
# Instrument source file for code coverage
%.tcl_i: %.tcl
@$(NAGELFAR) -instrument $<
%.tcl_i: %.tcl eskil_h.syntax
@$(NAGELFAR) -instrument eskil_h.syntax $<
# Target to prepare for code coverage run. Makes sure log file is clear.
instrument: $(IFILES)
@rm -f $(LOGFILES)
# Run tests to create log file.
testcover $(LOGFILES): $(IFILES)
|
| ︙ | | |
Changes to doc/revision.txt.
| ︙ | | |
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
-
+
|
Eskil can read a patch from standard input, thus allowing display from any patch generating command. Examples:
<pre>hg diff | eskil -</pre>
<pre>git diff -p --diff-filter=M master | eskil -</pre>
<ul>View all changes</ul>
If the command line option -review is used. Eskil will generate a patch
If the command line option -review is used, Eskil will generate a patch
for the current tree and display it as in patch mode.
E.g. in a Mercurial directory, these show the same thing:
<pre>eskil -preview</pre>
<pre>hg diff | eskil -</pre>
If file names are given after -review, only the listed files are included. If supported,
the Commit button will be enabled allowing the viewed differences to be committed.
|
| ︙ | | |
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
+
+
+
+
+
+
+
|
For Subversion the arguments to -r are standard version numbers just like its -r option. If a revision is a negative integer, the log is searched backwards for earlier versions. E.g. -1 gives the second to last version.
<ul>Git</ul>
For Git -r <rev> is passed to show, as in "git show <rev>:<file>".
<pre>git config --global merge.tool eskil</pre>
<pre>git config --global mergetool.eskil.cmd 'eskil -fine -a $BASE -o $MERGED $REMOTE $LOCAL'</pre>
<pre>git config --global diff.tool eskil</pre>
<pre>git config --global difftool.eskil.cmd 'eskil $LOCAL $REMOTE'</pre>
<ul>Fossil</ul>
For Fossil -r <rev> is passed to finfo, as in "fossil finfo -p <file> -r <rev>".
<pre>fossil settings gmerge-command 'eskil -fine -a "%baseline" "%merge" "%original" -o "%output"' -global</pre>
<ul>Mercurial</ul>
For Mercurial -r works as in "hg cat -r".
<ul>Bazaar</ul>
|
| ︙ | | |
Deleted eskil.vfs/COPYING.
Deleted eskil.vfs/doc.
Deleted eskil.vfs/examples.
Changes to eskil.vfs/lib/psballoon/psballoon.tcl.
| ︙ | | |
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
+
-
+
+
+
|
set balloon(created) 0
set balloon(pending) 0
}
proc psballoon::createBalloon {w mx my} {
variable balloon
if {$balloon(created) == 0} {
# Figure out widget's font
set font [$w cget -font]
if {[catch {set font [$w cget -font]}]} {
set font [ttk::style lookup [winfo class $w] -font]
}
set ww [winfo width $w]
set ih [winfo height $w]
set ix 0
set iy 0
set create 1
set msg $balloon(msg,$w)
if {$msg == ""} {
|
| ︙ | | |
Deleted eskil.vfs/plugins.
Deleted eskil.vfs/src/clip.tcl.
Deleted eskil.vfs/src/compare.tcl.
1
|
|
-
|
../../src/compare.tcl
|
Deleted eskil.vfs/src/dirdiff.tcl.
1
|
|
-
|
../../src/dirdiff.tcl
|
Deleted eskil.vfs/src/eskil.tcl.
Deleted eskil.vfs/src/help.tcl.
Deleted eskil.vfs/src/map.tcl.
Deleted eskil.vfs/src/merge.tcl.
Deleted eskil.vfs/src/plugin.tcl.
Deleted eskil.vfs/src/print.tcl.
Deleted eskil.vfs/src/printobj.tcl.
1
|
|
-
|
../../src/printobj.tcl
|
Deleted eskil.vfs/src/registry.tcl.
1
|
|
-
|
../../src/registry.tcl
|
Deleted eskil.vfs/src/rev.tcl.
Added htdocs/changes.html.