Fossil SCM

Merge updates from trunk.

mistachkin 2014-06-20 19:15 UTC respectformatting merge
Commit fc84a01a8b36bf9d6fd55ff9968de2dd0d1ea409
Parent 334f518c5f58b0d…
4 files changed +2 +2 +40 +40
~ src/comformat.c ~ src/comformat.c ~ test/comment.test ~ test/comment.test
M src/comformat.c
+2
--- src/comformat.c
+++ src/comformat.c
@@ -124,16 +124,18 @@
124124
 ** Test comment formatting and printing. Use for testing only.
125125
 **
126126
 ** Options:
127127
 ** --decode Decode the text using the same method used when
128128
 ** handling the value of a C-card from a manifest.
129
+** --wordbreak This does nothing and is ignored.
129130
 */
130131
 void test_comment_format(void){
131132
 const char *zPrefix;
132133
 char *zText;
133134
 int indent, width;
134135
 int decode = find_option("decode", 0, 0)!=0;
136
+ find_option("wordbreak", 0, 0); /* NOT USED */
135137
 if( g.argc!=4 && g.argc!=5 ){
136138
 usage("PREFIX TEXT ?WIDTH?");
137139
 }
138140
 zPrefix = g.argv[2];
139141
 if( decode ){
140142
--- src/comformat.c
+++ src/comformat.c
@@ -124,16 +124,18 @@
124 ** Test comment formatting and printing. Use for testing only.
125 **
126 ** Options:
127 ** --decode Decode the text using the same method used when
128 ** handling the value of a C-card from a manifest.
 
129 */
130 void test_comment_format(void){
131 const char *zPrefix;
132 char *zText;
133 int indent, width;
134 int decode = find_option("decode", 0, 0)!=0;
 
135 if( g.argc!=4 && g.argc!=5 ){
136 usage("PREFIX TEXT ?WIDTH?");
137 }
138 zPrefix = g.argv[2];
139 if( decode ){
140
--- src/comformat.c
+++ src/comformat.c
@@ -124,16 +124,18 @@
124 ** Test comment formatting and printing. Use for testing only.
125 **
126 ** Options:
127 ** --decode Decode the text using the same method used when
128 ** handling the value of a C-card from a manifest.
129 ** --wordbreak This does nothing and is ignored.
130 */
131 void test_comment_format(void){
132 const char *zPrefix;
133 char *zText;
134 int indent, width;
135 int decode = find_option("decode", 0, 0)!=0;
136 find_option("wordbreak", 0, 0); /* NOT USED */
137 if( g.argc!=4 && g.argc!=5 ){
138 usage("PREFIX TEXT ?WIDTH?");
139 }
140 zPrefix = g.argv[2];
141 if( decode ){
142
M src/comformat.c
+2
--- src/comformat.c
+++ src/comformat.c
@@ -124,16 +124,18 @@
124124
 ** Test comment formatting and printing. Use for testing only.
125125
 **
126126
 ** Options:
127127
 ** --decode Decode the text using the same method used when
128128
 ** handling the value of a C-card from a manifest.
129
+** --wordbreak This does nothing and is ignored.
129130
 */
130131
 void test_comment_format(void){
131132
 const char *zPrefix;
132133
 char *zText;
133134
 int indent, width;
134135
 int decode = find_option("decode", 0, 0)!=0;
136
+ find_option("wordbreak", 0, 0); /* NOT USED */
135137
 if( g.argc!=4 && g.argc!=5 ){
136138
 usage("PREFIX TEXT ?WIDTH?");
137139
 }
138140
 zPrefix = g.argv[2];
139141
 if( decode ){
140142
--- src/comformat.c
+++ src/comformat.c
@@ -124,16 +124,18 @@
124 ** Test comment formatting and printing. Use for testing only.
125 **
126 ** Options:
127 ** --decode Decode the text using the same method used when
128 ** handling the value of a C-card from a manifest.
 
129 */
130 void test_comment_format(void){
131 const char *zPrefix;
132 char *zText;
133 int indent, width;
134 int decode = find_option("decode", 0, 0)!=0;
 
135 if( g.argc!=4 && g.argc!=5 ){
136 usage("PREFIX TEXT ?WIDTH?");
137 }
138 zPrefix = g.argv[2];
139 if( decode ){
140
--- src/comformat.c
+++ src/comformat.c
@@ -124,16 +124,18 @@
124 ** Test comment formatting and printing. Use for testing only.
125 **
126 ** Options:
127 ** --decode Decode the text using the same method used when
128 ** handling the value of a C-card from a manifest.
129 ** --wordbreak This does nothing and is ignored.
130 */
131 void test_comment_format(void){
132 const char *zPrefix;
133 char *zText;
134 int indent, width;
135 int decode = find_option("decode", 0, 0)!=0;
136 find_option("wordbreak", 0, 0); /* NOT USED */
137 if( g.argc!=4 && g.argc!=5 ){
138 usage("PREFIX TEXT ?WIDTH?");
139 }
140 zPrefix = g.argv[2];
141 if( decode ){
142
M test/comment.test
+40
--- test/comment.test
+++ test/comment.test
@@ -79,5 +79,45 @@
7979
8080
 ###############################################################################
8181
8282
 fossil test-comment-format "*TEST* " "this\tis a test." 26
8383
 test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
84
+
85
+###############################################################################
86
+
87
+fossil test-comment-format "*TEST* " "this is a test......................................................................................................................." 60
88
+test comment-14 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
89
+
90
+###############################################################################
91
+
92
+fossil test-comment-format --wordbreak "*TEST* " "this is a test......................................................................................................................." 60
93
+test comment-15 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
94
+
95
+###############################################################################
96
+
97
+fossil test-comment-format "*TEST* " "this is a test......................................................................................................................." 60
98
+test comment-16 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
99
+
100
+###############################################################################
101
+
102
+fossil test-comment-format --wordbreak "*TEST* " "this is a test......................................................................................................................." 60
103
+test comment-17 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
104
+
105
+###############################################################################
106
+
107
+fossil test-comment-format "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
108
+test comment-18 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
109
+
110
+###############################################################################
111
+
112
+fossil test-comment-format --wordbreak "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
113
+test comment-19 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
114
+
115
+###############################################################################
116
+
117
+fossil test-comment-format "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
118
+test comment-20 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
119
+
120
+###############################################################################
121
+
122
+fossil test-comment-format --wordbreak "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
123
+test comment-21 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
84124
--- test/comment.test
+++ test/comment.test
@@ -79,5 +79,45 @@
79
80 ###############################################################################
81
82 fossil test-comment-format "*TEST* " "this\tis a test." 26
83 test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
84
--- test/comment.test
+++ test/comment.test
@@ -79,5 +79,45 @@
79
80 ###############################################################################
81
82 fossil test-comment-format "*TEST* " "this\tis a test." 26
83 test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
84
85 ###############################################################################
86
87 fossil test-comment-format "*TEST* " "this is a test......................................................................................................................." 60
88 test comment-14 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
89
90 ###############################################################################
91
92 fossil test-comment-format --wordbreak "*TEST* " "this is a test......................................................................................................................." 60
93 test comment-15 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
94
95 ###############################################################################
96
97 fossil test-comment-format "*TEST* " "this is a test......................................................................................................................." 60
98 test comment-16 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
99
100 ###############################################################################
101
102 fossil test-comment-format --wordbreak "*TEST* " "this is a test......................................................................................................................." 60
103 test comment-17 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
104
105 ###############################################################################
106
107 fossil test-comment-format "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
108 test comment-18 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
109
110 ###############################################################################
111
112 fossil test-comment-format --wordbreak "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
113 test comment-19 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
114
115 ###############################################################################
116
117 fossil test-comment-format "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
118 test comment-20 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
119
120 ###############################################################################
121
122 fossil test-comment-format --wordbreak "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
123 test comment-21 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
124
M test/comment.test
+40
--- test/comment.test
+++ test/comment.test
@@ -79,5 +79,45 @@
7979
8080
 ###############################################################################
8181
8282
 fossil test-comment-format "*TEST* " "this\tis a test." 26
8383
 test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
84
+
85
+###############################################################################
86
+
87
+fossil test-comment-format "*TEST* " "this is a test......................................................................................................................." 60
88
+test comment-14 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
89
+
90
+###############################################################################
91
+
92
+fossil test-comment-format --wordbreak "*TEST* " "this is a test......................................................................................................................." 60
93
+test comment-15 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
94
+
95
+###############################################################################
96
+
97
+fossil test-comment-format "*TEST* " "this is a test......................................................................................................................." 60
98
+test comment-16 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
99
+
100
+###############################################################################
101
+
102
+fossil test-comment-format --wordbreak "*TEST* " "this is a test......................................................................................................................." 60
103
+test comment-17 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
104
+
105
+###############################################################################
106
+
107
+fossil test-comment-format "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
108
+test comment-18 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
109
+
110
+###############################################################################
111
+
112
+fossil test-comment-format --wordbreak "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
113
+test comment-19 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
114
+
115
+###############################################################################
116
+
117
+fossil test-comment-format "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
118
+test comment-20 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
119
+
120
+###############################################################################
121
+
122
+fossil test-comment-format --wordbreak "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
123
+test comment-21 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
84124
--- test/comment.test
+++ test/comment.test
@@ -79,5 +79,45 @@
79
80 ###############################################################################
81
82 fossil test-comment-format "*TEST* " "this\tis a test." 26
83 test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
84
--- test/comment.test
+++ test/comment.test
@@ -79,5 +79,45 @@
79
80 ###############################################################################
81
82 fossil test-comment-format "*TEST* " "this\tis a test." 26
83 test comment-13 {$RESULT eq "*TEST* this\tis a te\n st.\n(2 lines output)"}
84
85 ###############################################################################
86
87 fossil test-comment-format "*TEST* " "this is a test......................................................................................................................." 60
88 test comment-14 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
89
90 ###############################################################################
91
92 fossil test-comment-format --wordbreak "*TEST* " "this is a test......................................................................................................................." 60
93 test comment-15 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
94
95 ###############################################################################
96
97 fossil test-comment-format "*TEST* " "this is a test......................................................................................................................." 60
98 test comment-16 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
99
100 ###############################################################################
101
102 fossil test-comment-format --wordbreak "*TEST* " "this is a test......................................................................................................................." 60
103 test comment-17 {$RESULT eq "*TEST* this is a\n test.................................................\n .....................................................\n .................\n(4 lines output)"}
104
105 ###############################################################################
106
107 fossil test-comment-format "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
108 test comment-18 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
109
110 ###############################################################################
111
112 fossil test-comment-format --wordbreak "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
113 test comment-19 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
114
115 ###############################################################################
116
117 fossil test-comment-format "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
118 test comment-20 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
119
120 ###############################################################################
121
122 fossil test-comment-format --wordbreak "*TEST* " "one two three four five six seven eight nine ten eleven twelve" 60
123 test comment-21 {$RESULT eq "*TEST* one two three four five six seven eight nine ten\n eleven twelve\n(2 lines output)"}
124

Keyboard Shortcuts

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