Fossil SCM

some end-of-line spacing

jan.nijtmans 2017-04-19 06:58 trunk
Commit 7f4b50b23de7628ea2212d5c9fe6c467fe4279a11ad1ccdbc4f108764e763540
Parent 48d466ab73882c5…
5 files changed +8 -8 +1 -1 +1 -1 +1 -1 +4 -4
~ test/commit-warning.test ~ test/merge5.test ~ test/tester.tcl ~ test/th1.test ~ www/aboutdownload.wiki
M test/commit-warning.test
+8 -8
--- test/commit-warning.test
+++ test/commit-warning.test
@@ -16,11 +16,11 @@
1616
 ############################################################################
1717
 #
1818
 # The focus of this file is to test pre-commit warnings.
1919
 #
2020
21
-test_setup
21
+test_setup
2222
2323
 # binary
2424
 write_file binary "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
2525
2626
 # text with CRLF lines
@@ -60,13 +60,13 @@
6060
 set a15 $a14$a14
6161
 set a16 $a15$a15
6262
 write_file line-64K "$a16\n"
6363
6464
 # UTF-8 extends 7-bit ASCII using bytes 80 and above to encode
65
-# larger character codes. Unicode uses U+0 through U+10FFFF only,
65
+# larger character codes. Unicode uses U+0 through U+10FFFF only,
6666
 # with U+D800 through U+DFFF reserved for surrogate pairs.
67
-# UTF-8 is valid if it is the shortest possible coding, encodes a
67
+# UTF-8 is valid if it is the shortest possible coding, encodes a
6868
 # valid Unicode code point. But it's complicated.
6969
 write_file utf-mod-c0-80 "11 bit NUL:\xC0\x80 is sometimes ok\n"
7070
 write_file utf-bad-e0-80-80 "16 bit NUL:\xE0\x80\x80 is bad\n"
7171
 write_file utf-bad-f0-80-80-80 "21 bit NUL:\xF0\x80\x80\x80 is bad\n"
7272
 write_file utf-bad-f8-80-80-80-80 "26 bit NUL:\xF8\x80\x80\x80\x80 is bad\n"
@@ -99,15 +99,15 @@
9999
 write_file utf-16be-bombe-hello "$bomBE$hello16BE"
100100
 write_file utf-16le-bombe-hello "$bomBE$hello16LE"
101101
 write_file utf-16be-bomle-hello "$bomLE$hello16BE"
102102
 set le16 [read_file [file join $testdir utf16le.txt]]
103103
 set be16 [read_file [file join $testdir utf16be.txt]]
104
-write_file utf-16le.txt $le16
104
+write_file utf-16le.txt $le16
105105
 write_file utf-16be.txt $be16
106
-write_file utf-nobom-16le.txt [string range $le16 2 end]
106
+write_file utf-nobom-16le.txt [string range $le16 2 end]
107107
 write_file utf-nobom-16be.txt [string range $be16 2 end]
108
-#write_file [file join $::env(TEMP) utf-nobom-16le.txt] [string range $le16 2 end]
108
+#write_file [file join $::env(TEMP) utf-nobom-16le.txt] [string range $le16 2 end]
109109
 #write_file [file join $::env(TEMP) utf-nobom-16be.txt] [string range $be16 2 end]
110110
111111
 # make all the test files known to fossil, then test
112112
 fossil addremove
113113
 fossil test-commit-warning --no-settings -v
@@ -157,11 +157,11 @@
157157
 ###############################################################################
158158
159159
 # TODO: Change to a collection of test-case crafted files
160160
 # rather than depend on this list of files that will
161161
 # be fragile as development progresses.
162
-#
162
+#
163163
 # Unless the real goal of this test is to document a collection
164164
 # of source files that MUST NEVER BE TEXT.
165165
 #
166166
 run_in_checkout {
167167
 fossil test-commit-warning --no-settings
@@ -296,10 +296,10 @@
296296
 1\twww/fossil3.gif\tbinary data
297297
 1\twww/fossil_logo_small.gif\tbinary data
298298
 1\twww/fossil_logo_small2.gif\tbinary data
299299
 1\twww/fossil_logo_small3.gif\tbinary data
300300
 1\twww/xkcd-git.gif\tbinary data
301
-1}]]}
301
+1}]]}
302302
303303
 ###############################################################################
304304
305305
 test_cleanup
306306
--- test/commit-warning.test
+++ test/commit-warning.test
@@ -16,11 +16,11 @@
16 ############################################################################
17 #
18 # The focus of this file is to test pre-commit warnings.
19 #
20
21 test_setup
22
23 # binary
24 write_file binary "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
25
26 # text with CRLF lines
@@ -60,13 +60,13 @@
60 set a15 $a14$a14
61 set a16 $a15$a15
62 write_file line-64K "$a16\n"
63
64 # UTF-8 extends 7-bit ASCII using bytes 80 and above to encode
65 # larger character codes. Unicode uses U+0 through U+10FFFF only,
66 # with U+D800 through U+DFFF reserved for surrogate pairs.
67 # UTF-8 is valid if it is the shortest possible coding, encodes a
68 # valid Unicode code point. But it's complicated.
69 write_file utf-mod-c0-80 "11 bit NUL:\xC0\x80 is sometimes ok\n"
70 write_file utf-bad-e0-80-80 "16 bit NUL:\xE0\x80\x80 is bad\n"
71 write_file utf-bad-f0-80-80-80 "21 bit NUL:\xF0\x80\x80\x80 is bad\n"
72 write_file utf-bad-f8-80-80-80-80 "26 bit NUL:\xF8\x80\x80\x80\x80 is bad\n"
@@ -99,15 +99,15 @@
99 write_file utf-16be-bombe-hello "$bomBE$hello16BE"
100 write_file utf-16le-bombe-hello "$bomBE$hello16LE"
101 write_file utf-16be-bomle-hello "$bomLE$hello16BE"
102 set le16 [read_file [file join $testdir utf16le.txt]]
103 set be16 [read_file [file join $testdir utf16be.txt]]
104 write_file utf-16le.txt $le16
105 write_file utf-16be.txt $be16
106 write_file utf-nobom-16le.txt [string range $le16 2 end]
107 write_file utf-nobom-16be.txt [string range $be16 2 end]
108 #write_file [file join $::env(TEMP) utf-nobom-16le.txt] [string range $le16 2 end]
109 #write_file [file join $::env(TEMP) utf-nobom-16be.txt] [string range $be16 2 end]
110
111 # make all the test files known to fossil, then test
112 fossil addremove
113 fossil test-commit-warning --no-settings -v
@@ -157,11 +157,11 @@
157 ###############################################################################
158
159 # TODO: Change to a collection of test-case crafted files
160 # rather than depend on this list of files that will
161 # be fragile as development progresses.
162 #
163 # Unless the real goal of this test is to document a collection
164 # of source files that MUST NEVER BE TEXT.
165 #
166 run_in_checkout {
167 fossil test-commit-warning --no-settings
@@ -296,10 +296,10 @@
296 1\twww/fossil3.gif\tbinary data
297 1\twww/fossil_logo_small.gif\tbinary data
298 1\twww/fossil_logo_small2.gif\tbinary data
299 1\twww/fossil_logo_small3.gif\tbinary data
300 1\twww/xkcd-git.gif\tbinary data
301 1}]]}
302
303 ###############################################################################
304
305 test_cleanup
306
--- test/commit-warning.test
+++ test/commit-warning.test
@@ -16,11 +16,11 @@
16 ############################################################################
17 #
18 # The focus of this file is to test pre-commit warnings.
19 #
20
21 test_setup
22
23 # binary
24 write_file binary "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
25
26 # text with CRLF lines
@@ -60,13 +60,13 @@
60 set a15 $a14$a14
61 set a16 $a15$a15
62 write_file line-64K "$a16\n"
63
64 # UTF-8 extends 7-bit ASCII using bytes 80 and above to encode
65 # larger character codes. Unicode uses U+0 through U+10FFFF only,
66 # with U+D800 through U+DFFF reserved for surrogate pairs.
67 # UTF-8 is valid if it is the shortest possible coding, encodes a
68 # valid Unicode code point. But it's complicated.
69 write_file utf-mod-c0-80 "11 bit NUL:\xC0\x80 is sometimes ok\n"
70 write_file utf-bad-e0-80-80 "16 bit NUL:\xE0\x80\x80 is bad\n"
71 write_file utf-bad-f0-80-80-80 "21 bit NUL:\xF0\x80\x80\x80 is bad\n"
72 write_file utf-bad-f8-80-80-80-80 "26 bit NUL:\xF8\x80\x80\x80\x80 is bad\n"
@@ -99,15 +99,15 @@
99 write_file utf-16be-bombe-hello "$bomBE$hello16BE"
100 write_file utf-16le-bombe-hello "$bomBE$hello16LE"
101 write_file utf-16be-bomle-hello "$bomLE$hello16BE"
102 set le16 [read_file [file join $testdir utf16le.txt]]
103 set be16 [read_file [file join $testdir utf16be.txt]]
104 write_file utf-16le.txt $le16
105 write_file utf-16be.txt $be16
106 write_file utf-nobom-16le.txt [string range $le16 2 end]
107 write_file utf-nobom-16be.txt [string range $be16 2 end]
108 #write_file [file join $::env(TEMP) utf-nobom-16le.txt] [string range $le16 2 end]
109 #write_file [file join $::env(TEMP) utf-nobom-16be.txt] [string range $be16 2 end]
110
111 # make all the test files known to fossil, then test
112 fossil addremove
113 fossil test-commit-warning --no-settings -v
@@ -157,11 +157,11 @@
157 ###############################################################################
158
159 # TODO: Change to a collection of test-case crafted files
160 # rather than depend on this list of files that will
161 # be fragile as development progresses.
162 #
163 # Unless the real goal of this test is to document a collection
164 # of source files that MUST NEVER BE TEXT.
165 #
166 run_in_checkout {
167 fossil test-commit-warning --no-settings
@@ -296,10 +296,10 @@
296 1\twww/fossil3.gif\tbinary data
297 1\twww/fossil_logo_small.gif\tbinary data
298 1\twww/fossil_logo_small2.gif\tbinary data
299 1\twww/fossil_logo_small3.gif\tbinary data
300 1\twww/xkcd-git.gif\tbinary data
301 1}]]}
302
303 ###############################################################################
304
305 test_cleanup
306
M test/merge5.test
+1 -1
--- test/merge5.test
+++ test/merge5.test
@@ -18,11 +18,11 @@
1818
 # Tests of the "merge" command
1919
 #
2020
2121
 puts "Skipping Merge5 tests"
2222
 protOut {
23
-fossil sqlite3 --no-repository reacts badly to SQL dumped from
23
+fossil sqlite3 --no-repository reacts badly to SQL dumped from
2424
 repositories created from fossil older than version 2.0.
2525
 }
2626
 test merge5-sqlite3-issue false knownBug
2727
 test_cleanup_then_return
2828
2929
--- test/merge5.test
+++ test/merge5.test
@@ -18,11 +18,11 @@
18 # Tests of the "merge" command
19 #
20
21 puts "Skipping Merge5 tests"
22 protOut {
23 fossil sqlite3 --no-repository reacts badly to SQL dumped from
24 repositories created from fossil older than version 2.0.
25 }
26 test merge5-sqlite3-issue false knownBug
27 test_cleanup_then_return
28
29
--- test/merge5.test
+++ test/merge5.test
@@ -18,11 +18,11 @@
18 # Tests of the "merge" command
19 #
20
21 puts "Skipping Merge5 tests"
22 protOut {
23 fossil sqlite3 --no-repository reacts badly to SQL dumped from
24 repositories created from fossil older than version 2.0.
25 }
26 test merge5-sqlite3-issue false knownBug
27 test_cleanup_then_return
28
29
M test/tester.tcl
+1 -1
--- test/tester.tcl
+++ test/tester.tcl
@@ -338,11 +338,11 @@
338338
 set y [read_file $b]
339339
 regsub -all { +\n} $y \n y
340340
 return [expr {$x==$y}]
341341
 }
342342
343
-# Return true if two strings refer to the
343
+# Return true if two strings refer to the
344344
 # same uuid. That is, the shorter is a prefix
345345
 # of the longer.
346346
 #
347347
 proc same_uuid {a b} {
348348
 set na [string length $a]
349349
--- test/tester.tcl
+++ test/tester.tcl
@@ -338,11 +338,11 @@
338 set y [read_file $b]
339 regsub -all { +\n} $y \n y
340 return [expr {$x==$y}]
341 }
342
343 # Return true if two strings refer to the
344 # same uuid. That is, the shorter is a prefix
345 # of the longer.
346 #
347 proc same_uuid {a b} {
348 set na [string length $a]
349
--- test/tester.tcl
+++ test/tester.tcl
@@ -338,11 +338,11 @@
338 set y [read_file $b]
339 regsub -all { +\n} $y \n y
340 return [expr {$x==$y}]
341 }
342
343 # Return true if two strings refer to the
344 # same uuid. That is, the shorter is a prefix
345 # of the longer.
346 #
347 proc same_uuid {a b} {
348 set na [string length $a]
349
M test/th1.test
+1 -1
--- test/th1.test
+++ test/th1.test
@@ -1579,11 +1579,11 @@
15791579
 file delete $th1FileName
15801580
15811581
 ###############################################################################
15821582
15831583
 # Tests for the TH1 unversioned command require at least one
1584
-# unversioned file in the repository. All tests run in a freshly
1584
+# unversioned file in the repository. All tests run in a freshly
15851585
 # created checkout of a freshly created repo, so we can just
15861586
 # create a file or two for the purpose.
15871587
 write_file ten.txt "0123456789"
15881588
 fossil unversioned add ten.txt
15891589
 fossil unversioned list
15901590
--- test/th1.test
+++ test/th1.test
@@ -1579,11 +1579,11 @@
1579 file delete $th1FileName
1580
1581 ###############################################################################
1582
1583 # Tests for the TH1 unversioned command require at least one
1584 # unversioned file in the repository. All tests run in a freshly
1585 # created checkout of a freshly created repo, so we can just
1586 # create a file or two for the purpose.
1587 write_file ten.txt "0123456789"
1588 fossil unversioned add ten.txt
1589 fossil unversioned list
1590
--- test/th1.test
+++ test/th1.test
@@ -1579,11 +1579,11 @@
1579 file delete $th1FileName
1580
1581 ###############################################################################
1582
1583 # Tests for the TH1 unversioned command require at least one
1584 # unversioned file in the repository. All tests run in a freshly
1585 # created checkout of a freshly created repo, so we can just
1586 # create a file or two for the purpose.
1587 write_file ten.txt "0123456789"
1588 fossil unversioned add ten.txt
1589 fossil unversioned list
1590
M www/aboutdownload.wiki
+4 -4
--- www/aboutdownload.wiki
+++ www/aboutdownload.wiki
@@ -16,14 +16,14 @@
1616
 When a new version is generated, the developers use the
1717
 [/help?cmd=uv|fossil uv edit] command to make minor changes
1818
 to the "[/uv/download.html?mimetype=text/plain|download.html]"
1919
 file so that it knows about the
2020
 new version number. Then the developers run
21
-the [/help?cmd=uv|fossil uv add] command for each
21
+the [/help?cmd=uv|fossil uv add] command for each
2222
 build product. Finally, the
2323
 [/help?cmd=uv|fossil uv sync] command is run to push all
24
-the content up to servers. All
24
+the content up to servers. All
2525
 [./selfhost.wiki|three self-hosting repositories] for Fossil
2626
 are updated automatically.
2727
2828
 <h2>2.0 Details</h2>
2929
@@ -82,11 +82,11 @@
8282
 Only users with the [/setup_ulist_notes|"y" permission] are allowed
8383
 to push unversioned content up to the servers. Having the ability
8484
 to push check-ins (the [/setup_ulist_notes|"i" permission]) is not
8585
 sufficient.
8686
87
-On the Fossil project there are 67 people (as of 2017-03-24) who have
88
-check-in privileges. But only 3 core developers
87
+On the Fossil project there are 67 people (as of 2017-03-24) who have
88
+check-in privileges. But only 3 core developers
8989
 have the ability push unversioned content and thus
9090
 change the build products on the download page. Minimizing the number
9191
 of people who can change the build products helps to ensure that
9292
 rogue binaries do not slip onto the download page unnoticed.
9393
--- www/aboutdownload.wiki
+++ www/aboutdownload.wiki
@@ -16,14 +16,14 @@
16 When a new version is generated, the developers use the
17 [/help?cmd=uv|fossil uv edit] command to make minor changes
18 to the "[/uv/download.html?mimetype=text/plain|download.html]"
19 file so that it knows about the
20 new version number. Then the developers run
21 the [/help?cmd=uv|fossil uv add] command for each
22 build product. Finally, the
23 [/help?cmd=uv|fossil uv sync] command is run to push all
24 the content up to servers. All
25 [./selfhost.wiki|three self-hosting repositories] for Fossil
26 are updated automatically.
27
28 <h2>2.0 Details</h2>
29
@@ -82,11 +82,11 @@
82 Only users with the [/setup_ulist_notes|"y" permission] are allowed
83 to push unversioned content up to the servers. Having the ability
84 to push check-ins (the [/setup_ulist_notes|"i" permission]) is not
85 sufficient.
86
87 On the Fossil project there are 67 people (as of 2017-03-24) who have
88 check-in privileges. But only 3 core developers
89 have the ability push unversioned content and thus
90 change the build products on the download page. Minimizing the number
91 of people who can change the build products helps to ensure that
92 rogue binaries do not slip onto the download page unnoticed.
93
--- www/aboutdownload.wiki
+++ www/aboutdownload.wiki
@@ -16,14 +16,14 @@
16 When a new version is generated, the developers use the
17 [/help?cmd=uv|fossil uv edit] command to make minor changes
18 to the "[/uv/download.html?mimetype=text/plain|download.html]"
19 file so that it knows about the
20 new version number. Then the developers run
21 the [/help?cmd=uv|fossil uv add] command for each
22 build product. Finally, the
23 [/help?cmd=uv|fossil uv sync] command is run to push all
24 the content up to servers. All
25 [./selfhost.wiki|three self-hosting repositories] for Fossil
26 are updated automatically.
27
28 <h2>2.0 Details</h2>
29
@@ -82,11 +82,11 @@
82 Only users with the [/setup_ulist_notes|"y" permission] are allowed
83 to push unversioned content up to the servers. Having the ability
84 to push check-ins (the [/setup_ulist_notes|"i" permission]) is not
85 sufficient.
86
87 On the Fossil project there are 67 people (as of 2017-03-24) who have
88 check-in privileges. But only 3 core developers
89 have the ability push unversioned content and thus
90 change the build products on the download page. Minimizing the number
91 of people who can change the build products helps to ensure that
92 rogue binaries do not slip onto the download page unnoticed.
93

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button