Eskil

Check-in [ad5a922deb]
Login

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

Overview
Comment:Allow revision control detect with -browse.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: ad5a922deb914d87b63ebb6ffa864d2e0957cca14fa005a9a8578027f1b3a4d8
User & Date: peter 2021-09-23 11:43:53.011
Context
2021-09-23
14:40
More variants of Emacs detection check-in: 4eeb246a35 user: peter tags: trunk
11:43
Allow revision control detect with -browse. check-in: ad5a922deb user: peter tags: trunk
2021-09-02
11:05
Corrected call check-in: de38e8d7bf user: peter tags: trunk
Changes
Side-by-Side Diff Ignore Whitespace Patch
Changes to Changes. 



1
2
3
4
5
6
7

1
2
3
4
5
6
7
8
9
10

+
+
+








2021-09-23
 Allow revision control detect with -browse.

2021-03-29
 Support -context/-w/-b for -review.

2021-03-01
 Bumped revision to 2.8.5

2021-02-28




︙





Changes to doc/cmdline.txt.






︙


52
53
54
55
56
57
58
59

60
61
62
63
64
65
66

52
53
54
55
56
57
58

59
60
61
62
63
64
65
66








-
+









  -a <file>   : Give anscestor file for three way merge.
  -conflict   : Treat file as a merge conflict file and enter merge
                mode.
  -o <file>   : Specify merge result output file.
  -fine       : Use fine grained chunks. Useful for merging.

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

  -print <file>          : Generate PDF and exit.
  -printCharsPerLine <n> : Adapt font size for this line length and wrap. (80)
  -printPaper <paper>    : Select paper size (a4)
  -printHeaderSize <n>   : Font size for page header (10)
  -printFont <fontfile>  : Select font to use in PDF, afm or ttf. If <fontfile>




︙





Changes to htdocs/usage.wiki.






︙


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

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








-
+















+
+









  Options:
-            : Read patch file from standard input, to allow pipes
-a <file>    : 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
-browse      : Bring up file dialog for missing files after starting
-char        : Character based change view (default)
-clip        : Start in clip diff mode. Ignores other args
-close       : Close any window with no changes
-conflict    : Treat file as a merge conflict file and enter merge mode
-context <n> : 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
-includedir <v> : Include in directory diff
-includefile <v> : Include in directory diff
-limit <lines> : 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




︙





Changes to src/startup.tcl.






︙


726
727
728
729
730
731
732
733

734
735
736
737
738
739
740

726
727
728
729
730
731
732

733
734
735
736
737
738
739
740








-
+








    docFlag -patch  "View patch file"
    docFlag -       "Read patch file from standard input, to allow pipes"
    docFlag -review "View revision control tree as a patch"
    addSideEffect -review {
        optSet -noignore 1
    }
    addFlags -browse -nodiff
    docFlag -browse "Automatically bring up file dialog after starting"
    docFlag -browse "Bring up file dialog for missing files after starting"
    docFlag -nodiff "Do not run diff after startup"
    addFlags -server -cvs -svn -debug
    docFlag -server "Set up Eskil to be controllable from the outside"
    docFlag -cvs    "Detect CVS first, if multiple version systems are used"
    docFlag -svn    "Detect SVN first, if multiple version systems are used"
    docFlag -debug  "Start in debug mode"
    addFlags -foreach -close




︙


1097
1098
1099
1100
1101
1102
1103
1104

1105
1106
1107
1108
1109
1110
1111

1097
1098
1099
1100
1101
1102
1103

1104
1105
1106
1107
1108
1109
1110
1111








-
+








            set fulldir [file dirname $fullname]
            if {$::eskil($top,mode) eq "conflict"} {
                startConflictDiff $top $fullname
                after idle [list doDiff $top]
                set ReturnAfterLoop 1
                continue
            }
            if { ! $autobrowse && !$dopatch} {
            if { ! $dopatch} {
                # Check for revision control
                set rev [detectRevSystem $fullname $preferedRev]
                if {$rev ne ""} {
                    startRevMode $top $rev $fullname
                    if {$noautodiff} {
                        enableRedo $top
                    } else {




︙