Fossil SCM

Remove spacings at end-of-line. No change in any functionality.

jan.nijtmans 2015-01-15 09:28 trunk
Commit 080ab8cb0a1aab44b10e60a3b5bd127acea70d1c
Parent 3b2dcd937899ad6…
17 files changed +5 -5 +6 -6 +1 -1 +4 -4 +1 -1 +4 -4 +4 -4 +5 -5 +5 -5 +1 -1 +6 -6 +1 -1 +2 -2 +1 -1 +5 -5 +17 -17 +2 -2
~ src/checkin.c ~ src/clone.c ~ src/deltacmd.c ~ src/export.c ~ src/finfo.c ~ src/foci.c ~ src/fusefs.c ~ src/graph.c ~ src/leaf.c ~ src/login.c ~ src/merge.c ~ src/mkbuiltin.c ~ src/search.c ~ src/setup.c ~ src/sync.c ~ src/update.c ~ src/verify.c
M src/checkin.c
+5 -5
--- src/checkin.c
+++ src/checkin.c
@@ -213,11 +213,11 @@
213213
 int showHdr = find_option("header",0,0)!=0;
214214
 int verboseFlag = find_option("verbose","v",0)!=0;
215215
 int cwdRelative = 0;
216216
 db_must_be_within_tree();
217217
 cwdRelative = determine_cwd_relative_option();
218
-
218
+
219219
 /* We should be done with options.. */
220220
 verify_all_options();
221221
222222
 print_changes(useSha1sum, showHdr, verboseFlag, cwdRelative);
223223
 }
@@ -249,11 +249,11 @@
249249
 int verboseFlag = find_option("verbose","v",0)!=0;
250250
 int cwdRelative = 0;
251251
 db_must_be_within_tree();
252252
 /* 012345678901234 */
253253
 cwdRelative = determine_cwd_relative_option();
254
-
254
+
255255
 /* We should be done with options.. */
256256
 verify_all_options();
257257
258258
 fossil_print("repository: %s\n", db_repository_filename());
259259
 fossil_print("local-root: %s\n", g.zLocalRoot);
@@ -262,11 +262,11 @@
262262
 }
263263
 vid = db_lget_int("checkout", 0);
264264
 if( vid ){
265265
 show_common_info(vid, "checkout:", 1, 1);
266266
 }
267
- db_record_repository_filename(0);
267
+ db_record_repository_filename(0);
268268
 print_changes(useSha1sum, showHdr, verboseFlag, cwdRelative);
269269
 }
270270
271271
 /*
272272
 ** COMMAND: ls
@@ -480,11 +480,11 @@
480480
 const char *zPathname, *zDisplayName;
481481
482482
 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
483483
 db_must_be_within_tree();
484484
 cwdRelative = determine_cwd_relative_option();
485
-
485
+
486486
 /* We should be done with options.. */
487487
 verify_all_options();
488488
489489
 if( zIgnoreFlag==0 ){
490490
 zIgnoreFlag = db_get("ignore-glob", 0);
@@ -1728,11 +1728,11 @@
17281728
17291729
 /*
17301730
 ** Do not allow a commit against a closed leaf unless the commit
17311731
 ** ends up on a different branch.
17321732
 */
1733
- if(
1733
+ if(
17341734
 /* parent checkin has the "closed" tag... */
17351735
 db_exists("SELECT 1 FROM tagxref"
17361736
 " WHERE tagid=%d AND rid=%d AND tagtype>0",
17371737
 TAG_CLOSED, vid)
17381738
 /* ... and the new checkin has no --branch option or the --branch
17391739
--- src/checkin.c
+++ src/checkin.c
@@ -213,11 +213,11 @@
213 int showHdr = find_option("header",0,0)!=0;
214 int verboseFlag = find_option("verbose","v",0)!=0;
215 int cwdRelative = 0;
216 db_must_be_within_tree();
217 cwdRelative = determine_cwd_relative_option();
218
219 /* We should be done with options.. */
220 verify_all_options();
221
222 print_changes(useSha1sum, showHdr, verboseFlag, cwdRelative);
223 }
@@ -249,11 +249,11 @@
249 int verboseFlag = find_option("verbose","v",0)!=0;
250 int cwdRelative = 0;
251 db_must_be_within_tree();
252 /* 012345678901234 */
253 cwdRelative = determine_cwd_relative_option();
254
255 /* We should be done with options.. */
256 verify_all_options();
257
258 fossil_print("repository: %s\n", db_repository_filename());
259 fossil_print("local-root: %s\n", g.zLocalRoot);
@@ -262,11 +262,11 @@
262 }
263 vid = db_lget_int("checkout", 0);
264 if( vid ){
265 show_common_info(vid, "checkout:", 1, 1);
266 }
267 db_record_repository_filename(0);
268 print_changes(useSha1sum, showHdr, verboseFlag, cwdRelative);
269 }
270
271 /*
272 ** COMMAND: ls
@@ -480,11 +480,11 @@
480 const char *zPathname, *zDisplayName;
481
482 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
483 db_must_be_within_tree();
484 cwdRelative = determine_cwd_relative_option();
485
486 /* We should be done with options.. */
487 verify_all_options();
488
489 if( zIgnoreFlag==0 ){
490 zIgnoreFlag = db_get("ignore-glob", 0);
@@ -1728,11 +1728,11 @@
1728
1729 /*
1730 ** Do not allow a commit against a closed leaf unless the commit
1731 ** ends up on a different branch.
1732 */
1733 if(
1734 /* parent checkin has the "closed" tag... */
1735 db_exists("SELECT 1 FROM tagxref"
1736 " WHERE tagid=%d AND rid=%d AND tagtype>0",
1737 TAG_CLOSED, vid)
1738 /* ... and the new checkin has no --branch option or the --branch
1739
--- src/checkin.c
+++ src/checkin.c
@@ -213,11 +213,11 @@
213 int showHdr = find_option("header",0,0)!=0;
214 int verboseFlag = find_option("verbose","v",0)!=0;
215 int cwdRelative = 0;
216 db_must_be_within_tree();
217 cwdRelative = determine_cwd_relative_option();
218
219 /* We should be done with options.. */
220 verify_all_options();
221
222 print_changes(useSha1sum, showHdr, verboseFlag, cwdRelative);
223 }
@@ -249,11 +249,11 @@
249 int verboseFlag = find_option("verbose","v",0)!=0;
250 int cwdRelative = 0;
251 db_must_be_within_tree();
252 /* 012345678901234 */
253 cwdRelative = determine_cwd_relative_option();
254
255 /* We should be done with options.. */
256 verify_all_options();
257
258 fossil_print("repository: %s\n", db_repository_filename());
259 fossil_print("local-root: %s\n", g.zLocalRoot);
@@ -262,11 +262,11 @@
262 }
263 vid = db_lget_int("checkout", 0);
264 if( vid ){
265 show_common_info(vid, "checkout:", 1, 1);
266 }
267 db_record_repository_filename(0);
268 print_changes(useSha1sum, showHdr, verboseFlag, cwdRelative);
269 }
270
271 /*
272 ** COMMAND: ls
@@ -480,11 +480,11 @@
480 const char *zPathname, *zDisplayName;
481
482 if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP;
483 db_must_be_within_tree();
484 cwdRelative = determine_cwd_relative_option();
485
486 /* We should be done with options.. */
487 verify_all_options();
488
489 if( zIgnoreFlag==0 ){
490 zIgnoreFlag = db_get("ignore-glob", 0);
@@ -1728,11 +1728,11 @@
1728
1729 /*
1730 ** Do not allow a commit against a closed leaf unless the commit
1731 ** ends up on a different branch.
1732 */
1733 if(
1734 /* parent checkin has the "closed" tag... */
1735 db_exists("SELECT 1 FROM tagxref"
1736 " WHERE tagid=%d AND rid=%d AND tagtype>0",
1737 TAG_CLOSED, vid)
1738 /* ... and the new checkin has no --branch option or the --branch
1739
M src/clone.c
+6 -6
--- src/clone.c
+++ src/clone.c
@@ -83,11 +83,11 @@
8383
 ** COMMAND: clone
8484
 **
8585
 ** Usage: %fossil clone ?OPTIONS? URL FILENAME
8686
 **
8787
 ** Make a clone of a repository specified by URL in the local
88
-** file named FILENAME.
88
+** file named FILENAME.
8989
 **
9090
 ** URL must be in one of the following form: ([...] mean optional)
9191
 ** HTTP/HTTPS protocol:
9292
 ** http[s]://[userid[:password]@]host[:port][/path]
9393
 **
@@ -96,21 +96,21 @@
9696
 ** [?fossil=path/to/fossil.exe]
9797
 **
9898
 ** Filesystem:
9999
 ** [file://]path/to/repo.fossil
100100
 **
101
-** Note: For ssh and filesystem, path must have an extra leading
101
+** Note: For ssh and filesystem, path must have an extra leading
102102
 ** '/' to use an absolute path.
103103
 **
104104
 ** By default, your current login name is used to create the default
105105
 ** admin user. This can be overridden using the -A|--admin-user
106106
 ** parameter.
107107
 **
108108
 ** Options:
109109
 ** --admin-user|-A USERNAME Make USERNAME the administrator
110110
 ** --once Don't save url.
111
-** --private Also clone private branches
111
+** --private Also clone private branches
112112
 ** --ssl-identity=filename Use the SSL identity if requested by the server
113113
 ** --ssh-command|-c 'command' Use this SSH command
114114
 ** --httpauth|-B 'user:pass' Add HTTP Basic Authorization to requests
115115
 ** --verbose Show more statistics in output
116116
 **
@@ -130,11 +130,11 @@
130130
 if( find_option("verbose",0,0)!=0) syncFlags |= SYNC_VERBOSE;
131131
 zHttpAuth = find_option("httpauth","B",1);
132132
 zDefaultUser = find_option("admin-user","A",1);
133133
 clone_ssh_find_options();
134134
 url_proxy_options();
135
-
135
+
136136
 /* We should be done with options.. */
137137
 verify_all_options();
138138
139139
 if( g.argc < 4 ){
140140
 usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY");
@@ -210,11 +210,11 @@
210210
 db_end_transaction(0);
211211
 }
212212
213213
 /*
214214
 ** If user chooses to use HTTP Authentication over unencrypted HTTP,
215
-** remember decision. Otherwise, if the URL is being changed and no
215
+** remember decision. Otherwise, if the URL is being changed and no
216216
 ** preference has been indicated, err on the safe side and revert the
217217
 ** decision. Set the global preference if the URL is not being changed.
218218
 */
219219
 void remember_or_get_http_auth(
220220
 const char *zHttpAuth, /* Credentials in the form "user:password" */
@@ -269,13 +269,13 @@
269269
 g.zSshCmd = mprintf("%s", zSshCmd);
270270
 }
271271
 }
272272
273273
 /*
274
-** Set SSH options discovered in global variables (set from command line
274
+** Set SSH options discovered in global variables (set from command line
275275
 ** options).
276276
 */
277277
 void clone_ssh_db_set_options(void){
278278
 if( g.zSshCmd && g.zSshCmd[0] ){
279279
 db_set("ssh-command", g.zSshCmd, 0);
280280
 }
281281
 }
282282
--- src/clone.c
+++ src/clone.c
@@ -83,11 +83,11 @@
83 ** COMMAND: clone
84 **
85 ** Usage: %fossil clone ?OPTIONS? URL FILENAME
86 **
87 ** Make a clone of a repository specified by URL in the local
88 ** file named FILENAME.
89 **
90 ** URL must be in one of the following form: ([...] mean optional)
91 ** HTTP/HTTPS protocol:
92 ** http[s]://[userid[:password]@]host[:port][/path]
93 **
@@ -96,21 +96,21 @@
96 ** [?fossil=path/to/fossil.exe]
97 **
98 ** Filesystem:
99 ** [file://]path/to/repo.fossil
100 **
101 ** Note: For ssh and filesystem, path must have an extra leading
102 ** '/' to use an absolute path.
103 **
104 ** By default, your current login name is used to create the default
105 ** admin user. This can be overridden using the -A|--admin-user
106 ** parameter.
107 **
108 ** Options:
109 ** --admin-user|-A USERNAME Make USERNAME the administrator
110 ** --once Don't save url.
111 ** --private Also clone private branches
112 ** --ssl-identity=filename Use the SSL identity if requested by the server
113 ** --ssh-command|-c 'command' Use this SSH command
114 ** --httpauth|-B 'user:pass' Add HTTP Basic Authorization to requests
115 ** --verbose Show more statistics in output
116 **
@@ -130,11 +130,11 @@
130 if( find_option("verbose",0,0)!=0) syncFlags |= SYNC_VERBOSE;
131 zHttpAuth = find_option("httpauth","B",1);
132 zDefaultUser = find_option("admin-user","A",1);
133 clone_ssh_find_options();
134 url_proxy_options();
135
136 /* We should be done with options.. */
137 verify_all_options();
138
139 if( g.argc < 4 ){
140 usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY");
@@ -210,11 +210,11 @@
210 db_end_transaction(0);
211 }
212
213 /*
214 ** If user chooses to use HTTP Authentication over unencrypted HTTP,
215 ** remember decision. Otherwise, if the URL is being changed and no
216 ** preference has been indicated, err on the safe side and revert the
217 ** decision. Set the global preference if the URL is not being changed.
218 */
219 void remember_or_get_http_auth(
220 const char *zHttpAuth, /* Credentials in the form "user:password" */
@@ -269,13 +269,13 @@
269 g.zSshCmd = mprintf("%s", zSshCmd);
270 }
271 }
272
273 /*
274 ** Set SSH options discovered in global variables (set from command line
275 ** options).
276 */
277 void clone_ssh_db_set_options(void){
278 if( g.zSshCmd && g.zSshCmd[0] ){
279 db_set("ssh-command", g.zSshCmd, 0);
280 }
281 }
282
--- src/clone.c
+++ src/clone.c
@@ -83,11 +83,11 @@
83 ** COMMAND: clone
84 **
85 ** Usage: %fossil clone ?OPTIONS? URL FILENAME
86 **
87 ** Make a clone of a repository specified by URL in the local
88 ** file named FILENAME.
89 **
90 ** URL must be in one of the following form: ([...] mean optional)
91 ** HTTP/HTTPS protocol:
92 ** http[s]://[userid[:password]@]host[:port][/path]
93 **
@@ -96,21 +96,21 @@
96 ** [?fossil=path/to/fossil.exe]
97 **
98 ** Filesystem:
99 ** [file://]path/to/repo.fossil
100 **
101 ** Note: For ssh and filesystem, path must have an extra leading
102 ** '/' to use an absolute path.
103 **
104 ** By default, your current login name is used to create the default
105 ** admin user. This can be overridden using the -A|--admin-user
106 ** parameter.
107 **
108 ** Options:
109 ** --admin-user|-A USERNAME Make USERNAME the administrator
110 ** --once Don't save url.
111 ** --private Also clone private branches
112 ** --ssl-identity=filename Use the SSL identity if requested by the server
113 ** --ssh-command|-c 'command' Use this SSH command
114 ** --httpauth|-B 'user:pass' Add HTTP Basic Authorization to requests
115 ** --verbose Show more statistics in output
116 **
@@ -130,11 +130,11 @@
130 if( find_option("verbose",0,0)!=0) syncFlags |= SYNC_VERBOSE;
131 zHttpAuth = find_option("httpauth","B",1);
132 zDefaultUser = find_option("admin-user","A",1);
133 clone_ssh_find_options();
134 url_proxy_options();
135
136 /* We should be done with options.. */
137 verify_all_options();
138
139 if( g.argc < 4 ){
140 usage("?OPTIONS? FILE-OR-URL NEW-REPOSITORY");
@@ -210,11 +210,11 @@
210 db_end_transaction(0);
211 }
212
213 /*
214 ** If user chooses to use HTTP Authentication over unencrypted HTTP,
215 ** remember decision. Otherwise, if the URL is being changed and no
216 ** preference has been indicated, err on the safe side and revert the
217 ** decision. Set the global preference if the URL is not being changed.
218 */
219 void remember_or_get_http_auth(
220 const char *zHttpAuth, /* Credentials in the form "user:password" */
@@ -269,13 +269,13 @@
269 g.zSshCmd = mprintf("%s", zSshCmd);
270 }
271 }
272
273 /*
274 ** Set SSH options discovered in global variables (set from command line
275 ** options).
276 */
277 void clone_ssh_db_set_options(void){
278 if( g.zSshCmd && g.zSshCmd[0] ){
279 db_set("ssh-command", g.zSshCmd, 0);
280 }
281 }
282
M src/deltacmd.c
+1 -1
--- src/deltacmd.c
+++ src/deltacmd.c
@@ -17,11 +17,11 @@
1717
 **
1818
 ** This module implements the interface to the delta generator.
1919
 */
2020
 #include "config.h"
2121
 #include "deltacmd.h"
22
-
22
+
2323
 /*
2424
 ** Create a delta that describes the change from pOriginal to pTarget
2525
 ** and put that delta in pDelta. The pDelta blob is assumed to be
2626
 ** uninitialized.
2727
 */
2828
--- src/deltacmd.c
+++ src/deltacmd.c
@@ -17,11 +17,11 @@
17 **
18 ** This module implements the interface to the delta generator.
19 */
20 #include "config.h"
21 #include "deltacmd.h"
22
23 /*
24 ** Create a delta that describes the change from pOriginal to pTarget
25 ** and put that delta in pDelta. The pDelta blob is assumed to be
26 ** uninitialized.
27 */
28
--- src/deltacmd.c
+++ src/deltacmd.c
@@ -17,11 +17,11 @@
17 **
18 ** This module implements the interface to the delta generator.
19 */
20 #include "config.h"
21 #include "deltacmd.h"
22
23 /*
24 ** Create a delta that describes the change from pOriginal to pTarget
25 ** and put that delta in pDelta. The pDelta blob is assumed to be
26 ** uninitialized.
27 */
28
M src/export.c
+4 -4
--- src/export.c
+++ src/export.c
@@ -104,18 +104,18 @@
104104
 **
105105
 ** Usage: %fossil export --git ?OPTIONS? ?REPOSITORY?
106106
 **
107107
 ** Write an export of all check-ins to standard output. The export is
108108
 ** written in the git-fast-export file format assuming the --git option is
109
-** provided. The git-fast-export format is currently the only VCS
109
+** provided. The git-fast-export format is currently the only VCS
110110
 ** interchange format supported, though other formats may be added in
111111
 ** the future.
112112
 **
113113
 ** Run this command within a checkout. Or use the -R or --repository
114114
 ** option to specify a Fossil repository to be exported.
115115
 **
116
-** Only check-ins are exported using --git. Git does not support tickets
116
+** Only check-ins are exported using --git. Git does not support tickets
117117
 ** or wiki or events or attachments, so none of those are exported.
118118
 **
119119
 ** If the "--import-marks FILE" option is used, it contains a list of
120120
 ** rids to skip.
121121
 **
@@ -124,11 +124,11 @@
124124
 **
125125
 ** Options:
126126
 ** --export-marks FILE export rids of exported data to FILE
127127
 ** --import-marks FILE read rids of data to ignore from FILE
128128
 ** --repository|-R REPOSITORY export the given REPOSITORY
129
-**
129
+**
130130
 ** See also: import
131131
 */
132132
 void export_cmd(void){
133133
 Stmt q, q2, q3;
134134
 int i;
@@ -179,11 +179,11 @@
179179
 db_finalize(&qc);
180180
 fclose(f);
181181
 }
182182
183183
 /* Step 1: Generate "blob" records for every artifact that is part
184
- ** of a check-in
184
+ ** of a check-in
185185
 */
186186
 fossil_binary_mode(stdout);
187187
 db_multi_exec("CREATE TEMP TABLE newblob(rid INTEGER KEY, srcid INTEGER)");
188188
 db_multi_exec("CREATE INDEX newblob_src ON newblob(srcid)");
189189
 db_multi_exec(
190190
--- src/export.c
+++ src/export.c
@@ -104,18 +104,18 @@
104 **
105 ** Usage: %fossil export --git ?OPTIONS? ?REPOSITORY?
106 **
107 ** Write an export of all check-ins to standard output. The export is
108 ** written in the git-fast-export file format assuming the --git option is
109 ** provided. The git-fast-export format is currently the only VCS
110 ** interchange format supported, though other formats may be added in
111 ** the future.
112 **
113 ** Run this command within a checkout. Or use the -R or --repository
114 ** option to specify a Fossil repository to be exported.
115 **
116 ** Only check-ins are exported using --git. Git does not support tickets
117 ** or wiki or events or attachments, so none of those are exported.
118 **
119 ** If the "--import-marks FILE" option is used, it contains a list of
120 ** rids to skip.
121 **
@@ -124,11 +124,11 @@
124 **
125 ** Options:
126 ** --export-marks FILE export rids of exported data to FILE
127 ** --import-marks FILE read rids of data to ignore from FILE
128 ** --repository|-R REPOSITORY export the given REPOSITORY
129 **
130 ** See also: import
131 */
132 void export_cmd(void){
133 Stmt q, q2, q3;
134 int i;
@@ -179,11 +179,11 @@
179 db_finalize(&qc);
180 fclose(f);
181 }
182
183 /* Step 1: Generate "blob" records for every artifact that is part
184 ** of a check-in
185 */
186 fossil_binary_mode(stdout);
187 db_multi_exec("CREATE TEMP TABLE newblob(rid INTEGER KEY, srcid INTEGER)");
188 db_multi_exec("CREATE INDEX newblob_src ON newblob(srcid)");
189 db_multi_exec(
190
--- src/export.c
+++ src/export.c
@@ -104,18 +104,18 @@
104 **
105 ** Usage: %fossil export --git ?OPTIONS? ?REPOSITORY?
106 **
107 ** Write an export of all check-ins to standard output. The export is
108 ** written in the git-fast-export file format assuming the --git option is
109 ** provided. The git-fast-export format is currently the only VCS
110 ** interchange format supported, though other formats may be added in
111 ** the future.
112 **
113 ** Run this command within a checkout. Or use the -R or --repository
114 ** option to specify a Fossil repository to be exported.
115 **
116 ** Only check-ins are exported using --git. Git does not support tickets
117 ** or wiki or events or attachments, so none of those are exported.
118 **
119 ** If the "--import-marks FILE" option is used, it contains a list of
120 ** rids to skip.
121 **
@@ -124,11 +124,11 @@
124 **
125 ** Options:
126 ** --export-marks FILE export rids of exported data to FILE
127 ** --import-marks FILE read rids of data to ignore from FILE
128 ** --repository|-R REPOSITORY export the given REPOSITORY
129 **
130 ** See also: import
131 */
132 void export_cmd(void){
133 Stmt q, q2, q3;
134 int i;
@@ -179,11 +179,11 @@
179 db_finalize(&qc);
180 fclose(f);
181 }
182
183 /* Step 1: Generate "blob" records for every artifact that is part
184 ** of a check-in
185 */
186 fossil_binary_mode(stdout);
187 db_multi_exec("CREATE TEMP TABLE newblob(rid INTEGER KEY, srcid INTEGER)");
188 db_multi_exec("CREATE INDEX newblob_src ON newblob(srcid)");
189 db_multi_exec(
190
M src/finfo.c
+1 -1
--- src/finfo.c
+++ src/finfo.c
@@ -250,11 +250,11 @@
250250
 int rc;
251251
 Blob content, fname;
252252
 const char *zRev;
253253
 db_find_and_open_repository(0, 0);
254254
 zRev = find_option("r","r",1);
255
-
255
+
256256
 /* We should be done with options.. */
257257
 verify_all_options();
258258
259259
 for(i=2; i<g.argc; i++){
260260
 file_tree_name(g.argv[i], &fname, 1);
261261
--- src/finfo.c
+++ src/finfo.c
@@ -250,11 +250,11 @@
250 int rc;
251 Blob content, fname;
252 const char *zRev;
253 db_find_and_open_repository(0, 0);
254 zRev = find_option("r","r",1);
255
256 /* We should be done with options.. */
257 verify_all_options();
258
259 for(i=2; i<g.argc; i++){
260 file_tree_name(g.argv[i], &fname, 1);
261
--- src/finfo.c
+++ src/finfo.c
@@ -250,11 +250,11 @@
250 int rc;
251 Blob content, fname;
252 const char *zRev;
253 db_find_and_open_repository(0, 0);
254 zRev = find_option("r","r",1);
255
256 /* We should be done with options.. */
257 verify_all_options();
258
259 for(i=2; i<g.argc; i++){
260 file_tree_name(g.argv[i], &fname, 1);
261
M src/foci.c
+4 -4
--- src/foci.c
+++ src/foci.c
@@ -25,11 +25,11 @@
2525
 #include <assert.h>
2626
2727
 /*
2828
 ** The schema for the virtual table:
2929
 */
30
-static const char zFociSchema[] =
30
+static const char zFociSchema[] =
3131
 @ CREATE TABLE files_of_checkin(
3232
 @ checkinID INTEGER, -- RID for the checkin manifest
3333
 @ filename TEXT, -- Name of a file
3434
 @ uuid TEXT, -- SHA1 hash of the file
3535
 @ previousName TEXT, -- Name of the file in previous checkin
@@ -139,11 +139,11 @@
139139
 FociCursor *pCsr = (FociCursor *)pCursor;
140140
 return pCsr->pFile==0;
141141
 }
142142
143143
 static int fociFilter(
144
- sqlite3_vtab_cursor *pCursor,
144
+ sqlite3_vtab_cursor *pCursor,
145145
 int idxNum, const char *idxStr,
146146
 int argc, sqlite3_value **argv
147147
 ){
148148
 FociCursor *pCur = (FociCursor *)pCursor;
149149
 manifest_destroy(pCur->pMan);
@@ -158,12 +158,12 @@
158158
 }
159159
 return SQLITE_OK;
160160
 }
161161
162162
 static int fociColumn(
163
- sqlite3_vtab_cursor *pCursor,
164
- sqlite3_context *ctx,
163
+ sqlite3_vtab_cursor *pCursor,
164
+ sqlite3_context *ctx,
165165
 int i
166166
 ){
167167
 FociCursor *pCsr = (FociCursor *)pCursor;
168168
 switch( i ){
169169
 case 0: /* checkinID */
170170
--- src/foci.c
+++ src/foci.c
@@ -25,11 +25,11 @@
25 #include <assert.h>
26
27 /*
28 ** The schema for the virtual table:
29 */
30 static const char zFociSchema[] =
31 @ CREATE TABLE files_of_checkin(
32 @ checkinID INTEGER, -- RID for the checkin manifest
33 @ filename TEXT, -- Name of a file
34 @ uuid TEXT, -- SHA1 hash of the file
35 @ previousName TEXT, -- Name of the file in previous checkin
@@ -139,11 +139,11 @@
139 FociCursor *pCsr = (FociCursor *)pCursor;
140 return pCsr->pFile==0;
141 }
142
143 static int fociFilter(
144 sqlite3_vtab_cursor *pCursor,
145 int idxNum, const char *idxStr,
146 int argc, sqlite3_value **argv
147 ){
148 FociCursor *pCur = (FociCursor *)pCursor;
149 manifest_destroy(pCur->pMan);
@@ -158,12 +158,12 @@
158 }
159 return SQLITE_OK;
160 }
161
162 static int fociColumn(
163 sqlite3_vtab_cursor *pCursor,
164 sqlite3_context *ctx,
165 int i
166 ){
167 FociCursor *pCsr = (FociCursor *)pCursor;
168 switch( i ){
169 case 0: /* checkinID */
170
--- src/foci.c
+++ src/foci.c
@@ -25,11 +25,11 @@
25 #include <assert.h>
26
27 /*
28 ** The schema for the virtual table:
29 */
30 static const char zFociSchema[] =
31 @ CREATE TABLE files_of_checkin(
32 @ checkinID INTEGER, -- RID for the checkin manifest
33 @ filename TEXT, -- Name of a file
34 @ uuid TEXT, -- SHA1 hash of the file
35 @ previousName TEXT, -- Name of the file in previous checkin
@@ -139,11 +139,11 @@
139 FociCursor *pCsr = (FociCursor *)pCursor;
140 return pCsr->pFile==0;
141 }
142
143 static int fociFilter(
144 sqlite3_vtab_cursor *pCursor,
145 int idxNum, const char *idxStr,
146 int argc, sqlite3_value **argv
147 ){
148 FociCursor *pCur = (FociCursor *)pCursor;
149 manifest_destroy(pCur->pMan);
@@ -158,12 +158,12 @@
158 }
159 return SQLITE_OK;
160 }
161
162 static int fociColumn(
163 sqlite3_vtab_cursor *pCursor,
164 sqlite3_context *ctx,
165 int i
166 ){
167 FociCursor *pCsr = (FociCursor *)pCursor;
168 switch( i ){
169 case 0: /* checkinID */
170
M src/fusefs.c
+4 -4
--- src/fusefs.c
+++ src/fusefs.c
@@ -14,11 +14,11 @@
1414
 ** http://www.hwaci.com/drh/
1515
 **
1616
 *******************************************************************************
1717
 **
1818
 ** This module implements the userspace side of a Fuse Filesystem that
19
-** contains all check-ins for a fossil repository.
19
+** contains all check-ins for a fossil repository.
2020
 **
2121
 ** This module is a mostly a no-op unless compiled with -DFOSSIL_HAVE_FUSEFS.
2222
 ** The FOSSIL_HAVE_FUSEFS should be omitted on systems that lack support for
2323
 ** the Fuse Filesystem, of course.
2424
 */
@@ -193,11 +193,11 @@
193193
 int cnt = 0;
194194
 n = fusefs_parse_path(zPath);
195195
 if( n==0 ){
196196
 filler(buf, ".", NULL, 0);
197197
 filler(buf, "..", NULL, 0);
198
- filler(buf, "checkins", NULL, 0);
198
+ filler(buf, "checkins", NULL, 0);
199199
 return 0;
200200
 }
201201
 if( strcmp(fusefs.az[0],"checkins")!=0 ) return -ENOENT;
202202
 if( n==1 ) return -ENOENT;
203203
 rid = fusefs_name_to_rid(fusefs.az[1]);
@@ -275,11 +275,11 @@
275275
 if( offset+size>blob_size(&fusefs.content) ){
276276
 size = blob_size(&fusefs.content) - offset;
277277
 }
278278
 memcpy(buf, blob_buffer(&fusefs.content)+offset, size);
279279
 return size;
280
-}
280
+}
281281
282282
 static struct fuse_operations fusefs_methods = {
283283
 .getattr = fusefs_getattr,
284284
 .readdir = fusefs_readdir,
285285
 .read = fusefs_read,
@@ -293,11 +293,11 @@
293293
 **
294294
 ** This command uses the Fuse Filesystem to mount a directory at
295295
 ** DIRECTORY that contains the content of all check-ins in the
296296
 ** repository. The names of files are DIRECTORY/checkins/VERSION/PATH
297297
 ** where DIRECTORY is the root of the mount, VERSION is any valid
298
-** check-in name (examples: "trunk" or "tip" or a tag or any unique
298
+** check-in name (examples: "trunk" or "tip" or a tag or any unique
299299
 ** prefix of a SHA1 hash, etc) and PATH is the pathname of the file
300300
 ** in the checkin. If DIRECTORY does not exist, then an attempt is
301301
 ** made to create it.
302302
 **
303303
 ** The DIRECTORY/checkins directory is not searchable so one cannot
304304
--- src/fusefs.c
+++ src/fusefs.c
@@ -14,11 +14,11 @@
14 ** http://www.hwaci.com/drh/
15 **
16 *******************************************************************************
17 **
18 ** This module implements the userspace side of a Fuse Filesystem that
19 ** contains all check-ins for a fossil repository.
20 **
21 ** This module is a mostly a no-op unless compiled with -DFOSSIL_HAVE_FUSEFS.
22 ** The FOSSIL_HAVE_FUSEFS should be omitted on systems that lack support for
23 ** the Fuse Filesystem, of course.
24 */
@@ -193,11 +193,11 @@
193 int cnt = 0;
194 n = fusefs_parse_path(zPath);
195 if( n==0 ){
196 filler(buf, ".", NULL, 0);
197 filler(buf, "..", NULL, 0);
198 filler(buf, "checkins", NULL, 0);
199 return 0;
200 }
201 if( strcmp(fusefs.az[0],"checkins")!=0 ) return -ENOENT;
202 if( n==1 ) return -ENOENT;
203 rid = fusefs_name_to_rid(fusefs.az[1]);
@@ -275,11 +275,11 @@
275 if( offset+size>blob_size(&fusefs.content) ){
276 size = blob_size(&fusefs.content) - offset;
277 }
278 memcpy(buf, blob_buffer(&fusefs.content)+offset, size);
279 return size;
280 }
281
282 static struct fuse_operations fusefs_methods = {
283 .getattr = fusefs_getattr,
284 .readdir = fusefs_readdir,
285 .read = fusefs_read,
@@ -293,11 +293,11 @@
293 **
294 ** This command uses the Fuse Filesystem to mount a directory at
295 ** DIRECTORY that contains the content of all check-ins in the
296 ** repository. The names of files are DIRECTORY/checkins/VERSION/PATH
297 ** where DIRECTORY is the root of the mount, VERSION is any valid
298 ** check-in name (examples: "trunk" or "tip" or a tag or any unique
299 ** prefix of a SHA1 hash, etc) and PATH is the pathname of the file
300 ** in the checkin. If DIRECTORY does not exist, then an attempt is
301 ** made to create it.
302 **
303 ** The DIRECTORY/checkins directory is not searchable so one cannot
304
--- src/fusefs.c
+++ src/fusefs.c
@@ -14,11 +14,11 @@
14 ** http://www.hwaci.com/drh/
15 **
16 *******************************************************************************
17 **
18 ** This module implements the userspace side of a Fuse Filesystem that
19 ** contains all check-ins for a fossil repository.
20 **
21 ** This module is a mostly a no-op unless compiled with -DFOSSIL_HAVE_FUSEFS.
22 ** The FOSSIL_HAVE_FUSEFS should be omitted on systems that lack support for
23 ** the Fuse Filesystem, of course.
24 */
@@ -193,11 +193,11 @@
193 int cnt = 0;
194 n = fusefs_parse_path(zPath);
195 if( n==0 ){
196 filler(buf, ".", NULL, 0);
197 filler(buf, "..", NULL, 0);
198 filler(buf, "checkins", NULL, 0);
199 return 0;
200 }
201 if( strcmp(fusefs.az[0],"checkins")!=0 ) return -ENOENT;
202 if( n==1 ) return -ENOENT;
203 rid = fusefs_name_to_rid(fusefs.az[1]);
@@ -275,11 +275,11 @@
275 if( offset+size>blob_size(&fusefs.content) ){
276 size = blob_size(&fusefs.content) - offset;
277 }
278 memcpy(buf, blob_buffer(&fusefs.content)+offset, size);
279 return size;
280 }
281
282 static struct fuse_operations fusefs_methods = {
283 .getattr = fusefs_getattr,
284 .readdir = fusefs_readdir,
285 .read = fusefs_read,
@@ -293,11 +293,11 @@
293 **
294 ** This command uses the Fuse Filesystem to mount a directory at
295 ** DIRECTORY that contains the content of all check-ins in the
296 ** repository. The names of files are DIRECTORY/checkins/VERSION/PATH
297 ** where DIRECTORY is the root of the mount, VERSION is any valid
298 ** check-in name (examples: "trunk" or "tip" or a tag or any unique
299 ** prefix of a SHA1 hash, etc) and PATH is the pathname of the file
300 ** in the checkin. If DIRECTORY does not exist, then an attempt is
301 ** made to create it.
302 **
303 ** The DIRECTORY/checkins directory is not searchable so one cannot
304
M src/graph.c
+5 -5
--- src/graph.c
+++ src/graph.c
@@ -38,11 +38,11 @@
3838
 char *zBgClr; /* Background Color */
3939
 char zUuid[41]; /* Check-in for file ID */
4040
4141
 GraphRow *pNext; /* Next row down in the list of all rows */
4242
 GraphRow *pPrev; /* Previous row */
43
-
43
+
4444
 int idx; /* Row index. First is 1. 0 used for "none" */
4545
 int idxTop; /* Direct descendent highest up on the graph */
4646
 GraphRow *pChild; /* Child immediately above this node */
4747
 u8 isDup; /* True if this is duplicate of a prior entry */
4848
 u8 isLeaf; /* True if this is a leaf node */
@@ -154,11 +154,11 @@
154154
 ** Return the canonical pointer for a given branch name.
155155
 ** Multiple calls to this routine with equivalent strings
156156
 ** will return the same pointer.
157157
 **
158158
 ** The returned value is a pointer to a (readonly) string that
159
-** has the useful property that strings can be checked for
159
+** has the useful property that strings can be checked for
160160
 ** equality by comparing pointers.
161161
 **
162162
 ** Note: also used for background color names.
163163
 */
164164
 static char *persistBranchName(GraphContext *p, const char *zBranch){
@@ -214,11 +214,11 @@
214214
 return pRow->idx;
215215
 }
216216
217217
 /*
218218
 ** Return the index of a rail currently not in use for any row between
219
-** top and bottom, inclusive.
219
+** top and bottom, inclusive.
220220
 */
221221
 static int findFreeRail(
222222
 GraphContext *p, /* The graph context */
223223
 int top, int btm, /* Span of rows for which the rail is needed */
224224
 u64 inUseMask, /* Mask or rails already in use */
@@ -380,11 +380,11 @@
380380
 }
381381
 }
382382
 }
383383
384384
385
- /* Find the pChild pointer for each node.
385
+ /* Find the pChild pointer for each node.
386386
 **
387387
 ** The pChild points to the node directly above on the same rail.
388388
 ** The pChild must be in the same branch. Leaf nodes have a NULL
389389
 ** pChild.
390390
 **
@@ -533,11 +533,11 @@
533533
 }
534534
 }
535535
 }
536536
537537
 /*
538
- ** Insert merge rails from primaries to duplicates.
538
+ ** Insert merge rails from primaries to duplicates.
539539
 */
540540
 if( hasDup ){
541541
 int dupRail;
542542
 int mxRail;
543543
 find_max_rail(p);
544544
--- src/graph.c
+++ src/graph.c
@@ -38,11 +38,11 @@
38 char *zBgClr; /* Background Color */
39 char zUuid[41]; /* Check-in for file ID */
40
41 GraphRow *pNext; /* Next row down in the list of all rows */
42 GraphRow *pPrev; /* Previous row */
43
44 int idx; /* Row index. First is 1. 0 used for "none" */
45 int idxTop; /* Direct descendent highest up on the graph */
46 GraphRow *pChild; /* Child immediately above this node */
47 u8 isDup; /* True if this is duplicate of a prior entry */
48 u8 isLeaf; /* True if this is a leaf node */
@@ -154,11 +154,11 @@
154 ** Return the canonical pointer for a given branch name.
155 ** Multiple calls to this routine with equivalent strings
156 ** will return the same pointer.
157 **
158 ** The returned value is a pointer to a (readonly) string that
159 ** has the useful property that strings can be checked for
160 ** equality by comparing pointers.
161 **
162 ** Note: also used for background color names.
163 */
164 static char *persistBranchName(GraphContext *p, const char *zBranch){
@@ -214,11 +214,11 @@
214 return pRow->idx;
215 }
216
217 /*
218 ** Return the index of a rail currently not in use for any row between
219 ** top and bottom, inclusive.
220 */
221 static int findFreeRail(
222 GraphContext *p, /* The graph context */
223 int top, int btm, /* Span of rows for which the rail is needed */
224 u64 inUseMask, /* Mask or rails already in use */
@@ -380,11 +380,11 @@
380 }
381 }
382 }
383
384
385 /* Find the pChild pointer for each node.
386 **
387 ** The pChild points to the node directly above on the same rail.
388 ** The pChild must be in the same branch. Leaf nodes have a NULL
389 ** pChild.
390 **
@@ -533,11 +533,11 @@
533 }
534 }
535 }
536
537 /*
538 ** Insert merge rails from primaries to duplicates.
539 */
540 if( hasDup ){
541 int dupRail;
542 int mxRail;
543 find_max_rail(p);
544
--- src/graph.c
+++ src/graph.c
@@ -38,11 +38,11 @@
38 char *zBgClr; /* Background Color */
39 char zUuid[41]; /* Check-in for file ID */
40
41 GraphRow *pNext; /* Next row down in the list of all rows */
42 GraphRow *pPrev; /* Previous row */
43
44 int idx; /* Row index. First is 1. 0 used for "none" */
45 int idxTop; /* Direct descendent highest up on the graph */
46 GraphRow *pChild; /* Child immediately above this node */
47 u8 isDup; /* True if this is duplicate of a prior entry */
48 u8 isLeaf; /* True if this is a leaf node */
@@ -154,11 +154,11 @@
154 ** Return the canonical pointer for a given branch name.
155 ** Multiple calls to this routine with equivalent strings
156 ** will return the same pointer.
157 **
158 ** The returned value is a pointer to a (readonly) string that
159 ** has the useful property that strings can be checked for
160 ** equality by comparing pointers.
161 **
162 ** Note: also used for background color names.
163 */
164 static char *persistBranchName(GraphContext *p, const char *zBranch){
@@ -214,11 +214,11 @@
214 return pRow->idx;
215 }
216
217 /*
218 ** Return the index of a rail currently not in use for any row between
219 ** top and bottom, inclusive.
220 */
221 static int findFreeRail(
222 GraphContext *p, /* The graph context */
223 int top, int btm, /* Span of rows for which the rail is needed */
224 u64 inUseMask, /* Mask or rails already in use */
@@ -380,11 +380,11 @@
380 }
381 }
382 }
383
384
385 /* Find the pChild pointer for each node.
386 **
387 ** The pChild points to the node directly above on the same rail.
388 ** The pChild must be in the same branch. Leaf nodes have a NULL
389 ** pChild.
390 **
@@ -533,11 +533,11 @@
533 }
534 }
535 }
536
537 /*
538 ** Insert merge rails from primaries to duplicates.
539 */
540 if( hasDup ){
541 int dupRail;
542 int mxRail;
543 find_max_rail(p);
544
M src/leaf.c
+5 -5
--- src/leaf.c
+++ src/leaf.c
@@ -27,15 +27,15 @@
2727
2828
2929
 /*
3030
 ** Return true if the check-in with RID=rid is a leaf.
3131
 **
32
-** A leaf has no children in the same branch.
32
+** A leaf has no children in the same branch.
3333
 */
3434
 int is_a_leaf(int rid){
3535
 int rc;
36
- static const char zSql[] =
36
+ static const char zSql[] =
3737
 @ SELECT 1 FROM plink
3838
 @ WHERE pid=%d
3939
 @ AND coalesce((SELECT value FROM tagxref
4040
 @ WHERE tagid=%d AND rid=plink.pid), 'trunk')
4141
 @ =coalesce((SELECT value FROM tagxref
@@ -56,11 +56,11 @@
5656
 ** A non-branch child is one which is on the same branch as the parent.
5757
 */
5858
 int count_nonbranch_children(int pid){
5959
 int nNonBranch = 0;
6060
 static Stmt q;
61
- static const char zSql[] =
61
+ static const char zSql[] =
6262
 @ SELECT count(*) FROM plink
6363
 @ WHERE pid=:pid AND isprim
6464
 @ AND coalesce((SELECT value FROM tagxref
6565
 @ WHERE tagid=%d AND rid=plink.pid), 'trunk')
6666
 @ =coalesce((SELECT value FROM tagxref
@@ -75,11 +75,11 @@
7575
 return nNonBranch;
7676
 }
7777
7878
7979
 /*
80
-** Recompute the entire LEAF table.
80
+** Recompute the entire LEAF table.
8181
 **
8282
 ** This can be expensive (5 seconds or so) for a really large repository.
8383
 ** So it is only done for things like a rebuild.
8484
 */
8585
 void leaf_rebuild(void){
@@ -159,11 +159,11 @@
159159
 ** Schedule a leaf check for "rid" and its parents.
160160
 */
161161
 void leaf_eventually_check(int rid){
162162
 static Stmt parentsOf;
163163
164
- db_static_prepare(&parentsOf,
164
+ db_static_prepare(&parentsOf,
165165
 "SELECT pid FROM plink WHERE cid=:rid AND pid>0"
166166
 );
167167
 db_bind_int(&parentsOf, ":rid", rid);
168168
 bag_insert(&needToCheck, rid);
169169
 while( db_step(&parentsOf)==SQLITE_ROW ){
170170
--- src/leaf.c
+++ src/leaf.c
@@ -27,15 +27,15 @@
27
28
29 /*
30 ** Return true if the check-in with RID=rid is a leaf.
31 **
32 ** A leaf has no children in the same branch.
33 */
34 int is_a_leaf(int rid){
35 int rc;
36 static const char zSql[] =
37 @ SELECT 1 FROM plink
38 @ WHERE pid=%d
39 @ AND coalesce((SELECT value FROM tagxref
40 @ WHERE tagid=%d AND rid=plink.pid), 'trunk')
41 @ =coalesce((SELECT value FROM tagxref
@@ -56,11 +56,11 @@
56 ** A non-branch child is one which is on the same branch as the parent.
57 */
58 int count_nonbranch_children(int pid){
59 int nNonBranch = 0;
60 static Stmt q;
61 static const char zSql[] =
62 @ SELECT count(*) FROM plink
63 @ WHERE pid=:pid AND isprim
64 @ AND coalesce((SELECT value FROM tagxref
65 @ WHERE tagid=%d AND rid=plink.pid), 'trunk')
66 @ =coalesce((SELECT value FROM tagxref
@@ -75,11 +75,11 @@
75 return nNonBranch;
76 }
77
78
79 /*
80 ** Recompute the entire LEAF table.
81 **
82 ** This can be expensive (5 seconds or so) for a really large repository.
83 ** So it is only done for things like a rebuild.
84 */
85 void leaf_rebuild(void){
@@ -159,11 +159,11 @@
159 ** Schedule a leaf check for "rid" and its parents.
160 */
161 void leaf_eventually_check(int rid){
162 static Stmt parentsOf;
163
164 db_static_prepare(&parentsOf,
165 "SELECT pid FROM plink WHERE cid=:rid AND pid>0"
166 );
167 db_bind_int(&parentsOf, ":rid", rid);
168 bag_insert(&needToCheck, rid);
169 while( db_step(&parentsOf)==SQLITE_ROW ){
170
--- src/leaf.c
+++ src/leaf.c
@@ -27,15 +27,15 @@
27
28
29 /*
30 ** Return true if the check-in with RID=rid is a leaf.
31 **
32 ** A leaf has no children in the same branch.
33 */
34 int is_a_leaf(int rid){
35 int rc;
36 static const char zSql[] =
37 @ SELECT 1 FROM plink
38 @ WHERE pid=%d
39 @ AND coalesce((SELECT value FROM tagxref
40 @ WHERE tagid=%d AND rid=plink.pid), 'trunk')
41 @ =coalesce((SELECT value FROM tagxref
@@ -56,11 +56,11 @@
56 ** A non-branch child is one which is on the same branch as the parent.
57 */
58 int count_nonbranch_children(int pid){
59 int nNonBranch = 0;
60 static Stmt q;
61 static const char zSql[] =
62 @ SELECT count(*) FROM plink
63 @ WHERE pid=:pid AND isprim
64 @ AND coalesce((SELECT value FROM tagxref
65 @ WHERE tagid=%d AND rid=plink.pid), 'trunk')
66 @ =coalesce((SELECT value FROM tagxref
@@ -75,11 +75,11 @@
75 return nNonBranch;
76 }
77
78
79 /*
80 ** Recompute the entire LEAF table.
81 **
82 ** This can be expensive (5 seconds or so) for a really large repository.
83 ** So it is only done for things like a rebuild.
84 */
85 void leaf_rebuild(void){
@@ -159,11 +159,11 @@
159 ** Schedule a leaf check for "rid" and its parents.
160 */
161 void leaf_eventually_check(int rid){
162 static Stmt parentsOf;
163
164 db_static_prepare(&parentsOf,
165 "SELECT pid FROM plink WHERE cid=:rid AND pid>0"
166 );
167 db_bind_int(&parentsOf, ":rid", rid);
168 bag_insert(&needToCheck, rid);
169 while( db_step(&parentsOf)==SQLITE_ROW ){
170
M src/login.c
+1 -1
--- src/login.c
+++ src/login.c
@@ -483,11 +483,11 @@
483483
 zQS = "";
484484
 }else if( zQS[0]!=0 ){
485485
 zQS = mprintf("?%s", zQS);
486486
 }
487487
 cgi_redirectf("%s%s%s", g.zHttpsURL, P("PATH_INFO"), zQS);
488
- return;
488
+ return;
489489
 }
490490
 sqlite3_create_function(g.db, "constant_time_cmp", 2, SQLITE_UTF8, 0,
491491
 constant_time_cmp_function, 0, 0);
492492
 zUsername = P("u");
493493
 zPasswd = P("p");
494494
--- src/login.c
+++ src/login.c
@@ -483,11 +483,11 @@
483 zQS = "";
484 }else if( zQS[0]!=0 ){
485 zQS = mprintf("?%s", zQS);
486 }
487 cgi_redirectf("%s%s%s", g.zHttpsURL, P("PATH_INFO"), zQS);
488 return;
489 }
490 sqlite3_create_function(g.db, "constant_time_cmp", 2, SQLITE_UTF8, 0,
491 constant_time_cmp_function, 0, 0);
492 zUsername = P("u");
493 zPasswd = P("p");
494
--- src/login.c
+++ src/login.c
@@ -483,11 +483,11 @@
483 zQS = "";
484 }else if( zQS[0]!=0 ){
485 zQS = mprintf("?%s", zQS);
486 }
487 cgi_redirectf("%s%s%s", g.zHttpsURL, P("PATH_INFO"), zQS);
488 return;
489 }
490 sqlite3_create_function(g.db, "constant_time_cmp", 2, SQLITE_UTF8, 0,
491 constant_time_cmp_function, 0, 0);
492 zUsername = P("u");
493 zPasswd = P("p");
494
M src/merge.c
+6 -6
--- src/merge.c
+++ src/merge.c
@@ -41,11 +41,11 @@
4141
 if( zTagList && zTagList[0] ){
4242
 zCom = mprintf("%s (%s)", db_column_text(&q, 2), zTagList);
4343
 }else{
4444
 zCom = mprintf("%s", db_column_text(&q,2));
4545
 }
46
- fossil_print("%-*s [%S] by %s on %s\n%*s",
46
+ fossil_print("%-*s [%S] by %s on %s\n%*s",
4747
 indent-1, zLabel,
4848
 db_column_text(&q, 3),
4949
 db_column_text(&q, 1),
5050
 db_column_text(&q, 0),
5151
 indent, "");
@@ -166,11 +166,11 @@
166166
 }else if( g.argc==2 ){
167167
 /* No version specified on the command-line so pick the most recent
168168
 ** leaf that is (1) not the version currently checked out and (2)
169169
 ** has not already been merged into the current checkout and (3)
170170
 ** the leaf is not closed and (4) the leaf is in the same branch
171
- ** as the current checkout.
171
+ ** as the current checkout.
172172
 */
173173
 Stmt q;
174174
 if( pickFlag || backoutFlag || integrateFlag){
175175
 fossil_fatal("cannot use --backout, --cherrypick or --integrate with a fork merge");
176176
 }
@@ -472,13 +472,13 @@
472472
 undo_save(zName);
473473
 vfile_to_disk(0, idm, 0, 0);
474474
 }
475475
 }
476476
 db_finalize(&q);
477
-
477
+
478478
 /*
479
- ** Find files that have changed from P->M but not P->V.
479
+ ** Find files that have changed from P->M but not P->V.
480480
 ** Copy the M content over into V.
481481
 */
482482
 db_prepare(&q,
483483
 "SELECT idv, ridm, fn, islinkm FROM fv"
484484
 " WHERE idp>0 AND idv>0 AND idm>0"
@@ -524,18 +524,18 @@
524524
 int rc;
525525
 char *zFullPath;
526526
 Blob m, p, r;
527527
 /* Do a 3-way merge of idp->idm into idp->idv. The results go into idv. */
528528
 if( verboseFlag ){
529
- fossil_print("MERGE %s (pivot=%d v1=%d v2=%d)\n",
529
+ fossil_print("MERGE %s (pivot=%d v1=%d v2=%d)\n",
530530
 zName, ridp, ridm, ridv);
531531
 }else{
532532
 fossil_print("MERGE %s\n", zName);
533533
 }
534534
 if( islinkv || islinkm /* || file_wd_islink(zFullPath) */ ){
535535
 fossil_print("***** Cannot merge symlink %s\n", zName);
536
- nConflict++;
536
+ nConflict++;
537537
 }else{
538538
 undo_save(zName);
539539
 zFullPath = mprintf("%s/%s", g.zLocalRoot, zName);
540540
 content_get(ridp, &p);
541541
 content_get(ridm, &m);
542542
--- src/merge.c
+++ src/merge.c
@@ -41,11 +41,11 @@
41 if( zTagList && zTagList[0] ){
42 zCom = mprintf("%s (%s)", db_column_text(&q, 2), zTagList);
43 }else{
44 zCom = mprintf("%s", db_column_text(&q,2));
45 }
46 fossil_print("%-*s [%S] by %s on %s\n%*s",
47 indent-1, zLabel,
48 db_column_text(&q, 3),
49 db_column_text(&q, 1),
50 db_column_text(&q, 0),
51 indent, "");
@@ -166,11 +166,11 @@
166 }else if( g.argc==2 ){
167 /* No version specified on the command-line so pick the most recent
168 ** leaf that is (1) not the version currently checked out and (2)
169 ** has not already been merged into the current checkout and (3)
170 ** the leaf is not closed and (4) the leaf is in the same branch
171 ** as the current checkout.
172 */
173 Stmt q;
174 if( pickFlag || backoutFlag || integrateFlag){
175 fossil_fatal("cannot use --backout, --cherrypick or --integrate with a fork merge");
176 }
@@ -472,13 +472,13 @@
472 undo_save(zName);
473 vfile_to_disk(0, idm, 0, 0);
474 }
475 }
476 db_finalize(&q);
477
478 /*
479 ** Find files that have changed from P->M but not P->V.
480 ** Copy the M content over into V.
481 */
482 db_prepare(&q,
483 "SELECT idv, ridm, fn, islinkm FROM fv"
484 " WHERE idp>0 AND idv>0 AND idm>0"
@@ -524,18 +524,18 @@
524 int rc;
525 char *zFullPath;
526 Blob m, p, r;
527 /* Do a 3-way merge of idp->idm into idp->idv. The results go into idv. */
528 if( verboseFlag ){
529 fossil_print("MERGE %s (pivot=%d v1=%d v2=%d)\n",
530 zName, ridp, ridm, ridv);
531 }else{
532 fossil_print("MERGE %s\n", zName);
533 }
534 if( islinkv || islinkm /* || file_wd_islink(zFullPath) */ ){
535 fossil_print("***** Cannot merge symlink %s\n", zName);
536 nConflict++;
537 }else{
538 undo_save(zName);
539 zFullPath = mprintf("%s/%s", g.zLocalRoot, zName);
540 content_get(ridp, &p);
541 content_get(ridm, &m);
542
--- src/merge.c
+++ src/merge.c
@@ -41,11 +41,11 @@
41 if( zTagList && zTagList[0] ){
42 zCom = mprintf("%s (%s)", db_column_text(&q, 2), zTagList);
43 }else{
44 zCom = mprintf("%s", db_column_text(&q,2));
45 }
46 fossil_print("%-*s [%S] by %s on %s\n%*s",
47 indent-1, zLabel,
48 db_column_text(&q, 3),
49 db_column_text(&q, 1),
50 db_column_text(&q, 0),
51 indent, "");
@@ -166,11 +166,11 @@
166 }else if( g.argc==2 ){
167 /* No version specified on the command-line so pick the most recent
168 ** leaf that is (1) not the version currently checked out and (2)
169 ** has not already been merged into the current checkout and (3)
170 ** the leaf is not closed and (4) the leaf is in the same branch
171 ** as the current checkout.
172 */
173 Stmt q;
174 if( pickFlag || backoutFlag || integrateFlag){
175 fossil_fatal("cannot use --backout, --cherrypick or --integrate with a fork merge");
176 }
@@ -472,13 +472,13 @@
472 undo_save(zName);
473 vfile_to_disk(0, idm, 0, 0);
474 }
475 }
476 db_finalize(&q);
477
478 /*
479 ** Find files that have changed from P->M but not P->V.
480 ** Copy the M content over into V.
481 */
482 db_prepare(&q,
483 "SELECT idv, ridm, fn, islinkm FROM fv"
484 " WHERE idp>0 AND idv>0 AND idm>0"
@@ -524,18 +524,18 @@
524 int rc;
525 char *zFullPath;
526 Blob m, p, r;
527 /* Do a 3-way merge of idp->idm into idp->idv. The results go into idv. */
528 if( verboseFlag ){
529 fossil_print("MERGE %s (pivot=%d v1=%d v2=%d)\n",
530 zName, ridp, ridm, ridv);
531 }else{
532 fossil_print("MERGE %s\n", zName);
533 }
534 if( islinkv || islinkm /* || file_wd_islink(zFullPath) */ ){
535 fossil_print("***** Cannot merge symlink %s\n", zName);
536 nConflict++;
537 }else{
538 undo_save(zName);
539 zFullPath = mprintf("%s/%s", g.zLocalRoot, zName);
540 content_get(ridp, &p);
541 content_get(ridm, &m);
542
M src/mkbuiltin.c
+1 -1
--- src/mkbuiltin.c
+++ src/mkbuiltin.c
@@ -82,11 +82,11 @@
8282
 int j, n;
8383
 Resource *aRes;
8484
 int nRes = argc-1;
8585
 unsigned char *pData;
8686
 int nErr = 0;
87
-
87
+
8888
 aRes = malloc( nRes*sizeof(aRes[0]) );
8989
 if( aRes==0 ){
9090
 fprintf(stderr, "malloc failed\n");
9191
 return 1;
9292
 }
9393
--- src/mkbuiltin.c
+++ src/mkbuiltin.c
@@ -82,11 +82,11 @@
82 int j, n;
83 Resource *aRes;
84 int nRes = argc-1;
85 unsigned char *pData;
86 int nErr = 0;
87
88 aRes = malloc( nRes*sizeof(aRes[0]) );
89 if( aRes==0 ){
90 fprintf(stderr, "malloc failed\n");
91 return 1;
92 }
93
--- src/mkbuiltin.c
+++ src/mkbuiltin.c
@@ -82,11 +82,11 @@
82 int j, n;
83 Resource *aRes;
84 int nRes = argc-1;
85 unsigned char *pData;
86 int nErr = 0;
87
88 aRes = malloc( nRes*sizeof(aRes[0]) );
89 if( aRes==0 ){
90 fprintf(stderr, "malloc failed\n");
91 return 1;
92 }
93
M src/search.c
+2 -2
--- src/search.c
+++ src/search.c
@@ -34,11 +34,11 @@
3434
 struct Search {
3535
 int nTerm; /* Number of search terms */
3636
 struct srchTerm { /* For each search term */
3737
 char *z; /* Text */
3838
 int n; /* length */
39
- } a[8];
39
+ } a[8];
4040
 };
4141
 #endif
4242
4343
 /*
4444
 ** Compile a search pattern
@@ -139,11 +139,11 @@
139139
 }
140140
 iBonus /= 2;
141141
 while( !isBoundary[zDoc[i]&0xff] ){ i++; }
142142
 }
143143
 }
144
-
144
+
145145
 /* Every term must be seen or else the score is zero */
146146
 for(j=0; j<p->nTerm; j++){
147147
 if( !seen[j] ) return 0;
148148
 }
149149
150150
--- src/search.c
+++ src/search.c
@@ -34,11 +34,11 @@
34 struct Search {
35 int nTerm; /* Number of search terms */
36 struct srchTerm { /* For each search term */
37 char *z; /* Text */
38 int n; /* length */
39 } a[8];
40 };
41 #endif
42
43 /*
44 ** Compile a search pattern
@@ -139,11 +139,11 @@
139 }
140 iBonus /= 2;
141 while( !isBoundary[zDoc[i]&0xff] ){ i++; }
142 }
143 }
144
145 /* Every term must be seen or else the score is zero */
146 for(j=0; j<p->nTerm; j++){
147 if( !seen[j] ) return 0;
148 }
149
150
--- src/search.c
+++ src/search.c
@@ -34,11 +34,11 @@
34 struct Search {
35 int nTerm; /* Number of search terms */
36 struct srchTerm { /* For each search term */
37 char *z; /* Text */
38 int n; /* length */
39 } a[8];
40 };
41 #endif
42
43 /*
44 ** Compile a search pattern
@@ -139,11 +139,11 @@
139 }
140 iBonus /= 2;
141 while( !isBoundary[zDoc[i]&0xff] ){ i++; }
142 }
143 }
144
145 /* Every term must be seen or else the score is zero */
146 for(j=0; j<p->nTerm; j++){
147 if( !seen[j] ) return 0;
148 }
149
150
M src/setup.c
+1 -1
--- src/setup.c
+++ src/setup.c
@@ -995,11 +995,11 @@
995995
 login_insert_csrf_secret();
996996
 @ <hr />
997997
 onoff_attribute("Redirect to HTTPS on the Login page",
998998
 "redirect-to-https", "redirhttps", 0, 0);
999999
 @ <p>When selected, force the use of HTTPS for the Login page.
1000
- @ <p>Details: When enabled, this option causes the $secureurl TH1
1000
+ @ <p>Details: When enabled, this option causes the $secureurl TH1
10011001
 @ variable is set to an "https:" variant of $baseurl. Otherwise,
10021002
 @ $secureurl is just an alias for $baseurl. Also when enabled, the
10031003
 @ Login page redirects to https if accessed via http.
10041004
 @ <hr />
10051005
 onoff_attribute("Require password for local access",
10061006
--- src/setup.c
+++ src/setup.c
@@ -995,11 +995,11 @@
995 login_insert_csrf_secret();
996 @ <hr />
997 onoff_attribute("Redirect to HTTPS on the Login page",
998 "redirect-to-https", "redirhttps", 0, 0);
999 @ <p>When selected, force the use of HTTPS for the Login page.
1000 @ <p>Details: When enabled, this option causes the $secureurl TH1
1001 @ variable is set to an "https:" variant of $baseurl. Otherwise,
1002 @ $secureurl is just an alias for $baseurl. Also when enabled, the
1003 @ Login page redirects to https if accessed via http.
1004 @ <hr />
1005 onoff_attribute("Require password for local access",
1006
--- src/setup.c
+++ src/setup.c
@@ -995,11 +995,11 @@
995 login_insert_csrf_secret();
996 @ <hr />
997 onoff_attribute("Redirect to HTTPS on the Login page",
998 "redirect-to-https", "redirhttps", 0, 0);
999 @ <p>When selected, force the use of HTTPS for the Login page.
1000 @ <p>Details: When enabled, this option causes the $secureurl TH1
1001 @ variable is set to an "https:" variant of $baseurl. Otherwise,
1002 @ $secureurl is just an alias for $baseurl. Also when enabled, the
1003 @ Login page redirects to https if accessed via http.
1004 @ <hr />
1005 onoff_attribute("Require password for local access",
1006
M src/sync.c
+5 -5
--- src/sync.c
+++ src/sync.c
@@ -48,11 +48,11 @@
4848
 }
4949
 }else{
5050
 /* Autosync defaults on. To make it default off, "return" here. */
5151
 }
5252
 url_parse(0, URL_REMEMBER);
53
- if( g.url.protocol==0 ) return 0;
53
+ if( g.url.protocol==0 ) return 0;
5454
 if( g.url.user!=0 && g.url.passwd==0 ){
5555
 g.url.passwd = unobscure(db_get("last-sync-pw", 0));
5656
 g.url.flags |= URL_PROMPT_PW;
5757
 url_prompt_for_password();
5858
 }
@@ -61,11 +61,11 @@
6161
 #if 0 /* Disabled for now */
6262
 if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
6363
 /* When doing an automatic pull, also automatically pull shuns from
6464
 ** the server if pull_shuns is enabled.
6565
 **
66
- ** TODO: What happens if the shun list gets really big?
66
+ ** TODO: What happens if the shun list gets really big?
6767
 ** Maybe the shunning list should only be pulled on every 10th
6868
 ** autosync, or something?
6969
 */
7070
 configSync = CONFIGSET_SHUN;
7171
 }
@@ -186,11 +186,11 @@
186186
 */
187187
 void pull_cmd(void){
188188
 unsigned configFlags = 0;
189189
 unsigned syncFlags = SYNC_PULL;
190190
 process_sync_args(&configFlags, &syncFlags);
191
-
191
+
192192
 /* We should be done with options.. */
193193
 verify_all_options();
194194
195195
 client_sync(syncFlags, configFlags, 0);
196196
 }
@@ -221,11 +221,11 @@
221221
 */
222222
 void push_cmd(void){
223223
 unsigned configFlags = 0;
224224
 unsigned syncFlags = SYNC_PUSH;
225225
 process_sync_args(&configFlags, &syncFlags);
226
-
226
+
227227
 /* We should be done with options.. */
228228
 verify_all_options();
229229
230230
 if( db_get_boolean("dont-push",0) ){
231231
 fossil_fatal("pushing is prohibited: the 'dont-push' option is set");
@@ -261,11 +261,11 @@
261261
 */
262262
 void sync_cmd(void){
263263
 unsigned configFlags = 0;
264264
 unsigned syncFlags = SYNC_PUSH|SYNC_PULL;
265265
 process_sync_args(&configFlags, &syncFlags);
266
-
266
+
267267
 /* We should be done with options.. */
268268
 verify_all_options();
269269
270270
 if( db_get_boolean("dont-push",0) ) syncFlags &= ~SYNC_PUSH;
271271
 client_sync(syncFlags, configFlags, 0);
272272
--- src/sync.c
+++ src/sync.c
@@ -48,11 +48,11 @@
48 }
49 }else{
50 /* Autosync defaults on. To make it default off, "return" here. */
51 }
52 url_parse(0, URL_REMEMBER);
53 if( g.url.protocol==0 ) return 0;
54 if( g.url.user!=0 && g.url.passwd==0 ){
55 g.url.passwd = unobscure(db_get("last-sync-pw", 0));
56 g.url.flags |= URL_PROMPT_PW;
57 url_prompt_for_password();
58 }
@@ -61,11 +61,11 @@
61 #if 0 /* Disabled for now */
62 if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
63 /* When doing an automatic pull, also automatically pull shuns from
64 ** the server if pull_shuns is enabled.
65 **
66 ** TODO: What happens if the shun list gets really big?
67 ** Maybe the shunning list should only be pulled on every 10th
68 ** autosync, or something?
69 */
70 configSync = CONFIGSET_SHUN;
71 }
@@ -186,11 +186,11 @@
186 */
187 void pull_cmd(void){
188 unsigned configFlags = 0;
189 unsigned syncFlags = SYNC_PULL;
190 process_sync_args(&configFlags, &syncFlags);
191
192 /* We should be done with options.. */
193 verify_all_options();
194
195 client_sync(syncFlags, configFlags, 0);
196 }
@@ -221,11 +221,11 @@
221 */
222 void push_cmd(void){
223 unsigned configFlags = 0;
224 unsigned syncFlags = SYNC_PUSH;
225 process_sync_args(&configFlags, &syncFlags);
226
227 /* We should be done with options.. */
228 verify_all_options();
229
230 if( db_get_boolean("dont-push",0) ){
231 fossil_fatal("pushing is prohibited: the 'dont-push' option is set");
@@ -261,11 +261,11 @@
261 */
262 void sync_cmd(void){
263 unsigned configFlags = 0;
264 unsigned syncFlags = SYNC_PUSH|SYNC_PULL;
265 process_sync_args(&configFlags, &syncFlags);
266
267 /* We should be done with options.. */
268 verify_all_options();
269
270 if( db_get_boolean("dont-push",0) ) syncFlags &= ~SYNC_PUSH;
271 client_sync(syncFlags, configFlags, 0);
272
--- src/sync.c
+++ src/sync.c
@@ -48,11 +48,11 @@
48 }
49 }else{
50 /* Autosync defaults on. To make it default off, "return" here. */
51 }
52 url_parse(0, URL_REMEMBER);
53 if( g.url.protocol==0 ) return 0;
54 if( g.url.user!=0 && g.url.passwd==0 ){
55 g.url.passwd = unobscure(db_get("last-sync-pw", 0));
56 g.url.flags |= URL_PROMPT_PW;
57 url_prompt_for_password();
58 }
@@ -61,11 +61,11 @@
61 #if 0 /* Disabled for now */
62 if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
63 /* When doing an automatic pull, also automatically pull shuns from
64 ** the server if pull_shuns is enabled.
65 **
66 ** TODO: What happens if the shun list gets really big?
67 ** Maybe the shunning list should only be pulled on every 10th
68 ** autosync, or something?
69 */
70 configSync = CONFIGSET_SHUN;
71 }
@@ -186,11 +186,11 @@
186 */
187 void pull_cmd(void){
188 unsigned configFlags = 0;
189 unsigned syncFlags = SYNC_PULL;
190 process_sync_args(&configFlags, &syncFlags);
191
192 /* We should be done with options.. */
193 verify_all_options();
194
195 client_sync(syncFlags, configFlags, 0);
196 }
@@ -221,11 +221,11 @@
221 */
222 void push_cmd(void){
223 unsigned configFlags = 0;
224 unsigned syncFlags = SYNC_PUSH;
225 process_sync_args(&configFlags, &syncFlags);
226
227 /* We should be done with options.. */
228 verify_all_options();
229
230 if( db_get_boolean("dont-push",0) ){
231 fossil_fatal("pushing is prohibited: the 'dont-push' option is set");
@@ -261,11 +261,11 @@
261 */
262 void sync_cmd(void){
263 unsigned configFlags = 0;
264 unsigned syncFlags = SYNC_PUSH|SYNC_PULL;
265 process_sync_args(&configFlags, &syncFlags);
266
267 /* We should be done with options.. */
268 verify_all_options();
269
270 if( db_get_boolean("dont-push",0) ) syncFlags &= ~SYNC_PUSH;
271 client_sync(syncFlags, configFlags, 0);
272
M src/update.c
+17 -17
--- src/update.c
+++ src/update.c
@@ -34,11 +34,11 @@
3434
 */
3535
 static int internalUpdate = 0;
3636
 static int internalConflictCnt = 0;
3737
3838
 /*
39
-** Do an update to version vid.
39
+** Do an update to version vid.
4040
 **
4141
 ** Start an undo session but do not terminate it. Do not autosync.
4242
 */
4343
 int update_to(int vid){
4444
 int savedArgc;
@@ -157,11 +157,11 @@
157157
 if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag,
158158
 db_get_int("autosync-tries", 1)) ){
159159
 fossil_fatal("Cannot proceed with update");
160160
 }
161161
 }
162
-
162
+
163163
 /* Create any empty directories now, as well as after the update,
164164
 ** so changes in settings are reflected now */
165165
 if( !dryRunFlag ) ensure_empty_dirs_created();
166166
167167
 if( internalUpdate ){
@@ -182,11 +182,11 @@
182182
 }else if( !is_a_version(tid) ){
183183
 fossil_fatal("no such version: %s", g.argv[2]);
184184
 }
185185
 }
186186
 }
187
-
187
+
188188
 /* If no VERSION is specified on the command-line, then look for a
189189
 ** descendent of the current version. If there are multiple descendants,
190190
 ** look for one from the same branch as the current version. If there
191191
 ** are still multiple descendants, show them all and refuse to update
192192
 ** until the user selects one.
@@ -207,11 +207,11 @@
207207
 " WHERE tagid=%d AND rid=%d))",
208208
 TAG_BRANCH, TAG_BRANCH, vid
209209
 );
210210
 if( db_int(0, "SELECT count(*) FROM leaves")>1 ){
211211
 compute_leaves(vid, closeCode);
212
- db_prepare(&q,
212
+ db_prepare(&q,
213213
 "%s "
214214
 " AND event.objid IN leaves"
215215
 " ORDER BY event.mtime DESC",
216216
 timeline_query_for_tty()
217217
 );
@@ -220,11 +220,11 @@
220220
 fossil_fatal("Multiple descendants");
221221
 }
222222
 }
223223
 tid = db_int(0, "SELECT rid FROM leaves, event"
224224
 " WHERE event.objid=leaves.rid"
225
- " ORDER BY event.mtime DESC");
225
+ " ORDER BY event.mtime DESC");
226226
 if( tid==0 ) tid = vid;
227227
 }
228228
229229
 if( tid==0 ){
230230
 return;
@@ -357,11 +357,11 @@
357357
 zSep = "";
358358
 for(i=3; i<g.argc; i++){
359359
 file_tree_name(g.argv[i], &treename, 1);
360360
 if( file_wd_isdir(g.argv[i])==1 ){
361361
 if( blob_size(&treename) != 1 || blob_str(&treename)[0] != '.' ){
362
- blob_append_sql(&sql, "%sfn NOT GLOB '%q/*' ",
362
+ blob_append_sql(&sql, "%sfn NOT GLOB '%q/*' ",
363363
 zSep /*safe-for-%s*/, blob_str(&treename));
364364
 }else{
365365
 blob_reset(&sql);
366366
 break;
367367
 }
@@ -378,11 +378,11 @@
378378
379379
 /*
380380
 ** Alter the content of the checkout so that it conforms with the
381381
 ** target
382382
 */
383
- db_prepare(&q,
383
+ db_prepare(&q,
384384
 "SELECT fn, idv, ridv, idt, ridt, chnged, fnt,"
385385
 " isexe, islinkv, islinkt, deleted FROM fv ORDER BY 1"
386386
 );
387387
 db_prepare(&mtimeXfer,
388388
 "UPDATE vfile SET mtime=(SELECT mtime FROM vfile WHERE id=:idv)"
@@ -470,11 +470,11 @@
470470
 }else{
471471
 fossil_print("MERGE %s\n", zName);
472472
 }
473473
 if( islinkv || islinkt /* || file_wd_islink(zFullPath) */ ){
474474
 fossil_print("***** Cannot merge symlink %s\n", zNewName);
475
- nConflict++;
475
+ nConflict++;
476476
 }else{
477477
 unsigned mergeFlags = dryRunFlag ? MERGE_DRYRUN : 0;
478478
 undo_save(zName);
479479
 content_get(ridt, &t);
480480
 content_get(ridv, &v);
@@ -544,11 +544,11 @@
544544
 fossil_warning("uncommitted %s against %S.",
545545
 zLabel, db_column_text(&q, 0));
546546
 nMerge++;
547547
 }
548548
 db_finalize(&q);
549
-
549
+
550550
 if( nConflict ){
551551
 if( internalUpdate ){
552552
 internalConflictCnt = nConflict;
553553
 nConflict = 0;
554554
 }else{
@@ -561,11 +561,11 @@
561561
 }
562562
 if( nMerge ){
563563
 fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
564564
 }
565565
 }
566
-
566
+
567567
 /*
568568
 ** Clean up the mid and pid VFILE entries. Then commit the changes.
569569
 */
570570
 if( dryRunFlag ){
571571
 db_end_transaction(1); /* With --dry-run, rollback changes */
@@ -615,27 +615,27 @@
615615
 Blob path;
616616
 const char *zPath;
617617
618618
 blob_zero(&path);
619619
 blob_appendf(&path, "%s/%s", g.zLocalRoot, zDir);
620
- zPath = blob_str(&path);
620
+ zPath = blob_str(&path);
621621
 /* Handle various cases of existence of the directory */
622622
 switch( file_wd_isdir(zPath) ){
623623
 case 0: { /* doesn't exist */
624624
 if( file_mkdir(zPath, 0)!=0 ) {
625625
 fossil_warning("couldn't create directory %s as "
626626
 "required by empty-dirs setting", zDir);
627
- }
627
+ }
628628
 break;
629629
 }
630630
 case 1: { /* exists, and is a directory */
631631
 /* do nothing - required directory exists already */
632632
 break;
633633
 }
634634
 case 2: { /* exists, but isn't a directory */
635635
 fossil_warning("file %s found, but a directory is required "
636
- "by empty-dirs setting", zDir);
636
+ "by empty-dirs setting", zDir);
637637
 }
638638
 }
639639
 blob_reset(&path);
640640
 }
641641
 }
@@ -656,11 +656,11 @@
656656
 int errCode /* Error code if file not found. Panic if 0. */
657657
 ){
658658
 Manifest *pManifest;
659659
 ManifestFile *pFile;
660660
 int rid=0;
661
-
661
+
662662
 if( revision ){
663663
 rid = name_to_typed_rid(revision,"ci");
664664
 }else if( !g.localOpen ){
665665
 rid = name_to_typed_rid(db_get("main-branch","trunk"),"ci");
666666
 }else{
@@ -669,11 +669,11 @@
669669
 if( !is_a_version(rid) ){
670670
 if( errCode>0 ) return errCode;
671671
 fossil_fatal("no such checkin: %s", revision);
672672
 }
673673
 pManifest = manifest_get(rid, CFTYPE_MANIFEST, 0);
674
-
674
+
675675
 if( pManifest ){
676676
 pFile = manifest_file_find(pManifest, file);
677677
 if( pFile ){
678678
 int rc;
679679
 rid = uuid_to_rid(pFile->zUuid, 0);
@@ -728,14 +728,14 @@
728728
 Blob record;
729729
 int i;
730730
 int errCode;
731731
 Stmt q;
732732
733
- undo_capture_command_line();
733
+ undo_capture_command_line();
734734
 zRevision = find_option("revision", "r", 1);
735735
 verify_all_options();
736
-
736
+
737737
 if( g.argc<2 ){
738738
 usage("?OPTIONS? [FILE] ...");
739739
 }
740740
 if( zRevision && g.argc<3 ){
741741
 fossil_fatal("the --revision option does not work for the entire tree");
742742
--- src/update.c
+++ src/update.c
@@ -34,11 +34,11 @@
34 */
35 static int internalUpdate = 0;
36 static int internalConflictCnt = 0;
37
38 /*
39 ** Do an update to version vid.
40 **
41 ** Start an undo session but do not terminate it. Do not autosync.
42 */
43 int update_to(int vid){
44 int savedArgc;
@@ -157,11 +157,11 @@
157 if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag,
158 db_get_int("autosync-tries", 1)) ){
159 fossil_fatal("Cannot proceed with update");
160 }
161 }
162
163 /* Create any empty directories now, as well as after the update,
164 ** so changes in settings are reflected now */
165 if( !dryRunFlag ) ensure_empty_dirs_created();
166
167 if( internalUpdate ){
@@ -182,11 +182,11 @@
182 }else if( !is_a_version(tid) ){
183 fossil_fatal("no such version: %s", g.argv[2]);
184 }
185 }
186 }
187
188 /* If no VERSION is specified on the command-line, then look for a
189 ** descendent of the current version. If there are multiple descendants,
190 ** look for one from the same branch as the current version. If there
191 ** are still multiple descendants, show them all and refuse to update
192 ** until the user selects one.
@@ -207,11 +207,11 @@
207 " WHERE tagid=%d AND rid=%d))",
208 TAG_BRANCH, TAG_BRANCH, vid
209 );
210 if( db_int(0, "SELECT count(*) FROM leaves")>1 ){
211 compute_leaves(vid, closeCode);
212 db_prepare(&q,
213 "%s "
214 " AND event.objid IN leaves"
215 " ORDER BY event.mtime DESC",
216 timeline_query_for_tty()
217 );
@@ -220,11 +220,11 @@
220 fossil_fatal("Multiple descendants");
221 }
222 }
223 tid = db_int(0, "SELECT rid FROM leaves, event"
224 " WHERE event.objid=leaves.rid"
225 " ORDER BY event.mtime DESC");
226 if( tid==0 ) tid = vid;
227 }
228
229 if( tid==0 ){
230 return;
@@ -357,11 +357,11 @@
357 zSep = "";
358 for(i=3; i<g.argc; i++){
359 file_tree_name(g.argv[i], &treename, 1);
360 if( file_wd_isdir(g.argv[i])==1 ){
361 if( blob_size(&treename) != 1 || blob_str(&treename)[0] != '.' ){
362 blob_append_sql(&sql, "%sfn NOT GLOB '%q/*' ",
363 zSep /*safe-for-%s*/, blob_str(&treename));
364 }else{
365 blob_reset(&sql);
366 break;
367 }
@@ -378,11 +378,11 @@
378
379 /*
380 ** Alter the content of the checkout so that it conforms with the
381 ** target
382 */
383 db_prepare(&q,
384 "SELECT fn, idv, ridv, idt, ridt, chnged, fnt,"
385 " isexe, islinkv, islinkt, deleted FROM fv ORDER BY 1"
386 );
387 db_prepare(&mtimeXfer,
388 "UPDATE vfile SET mtime=(SELECT mtime FROM vfile WHERE id=:idv)"
@@ -470,11 +470,11 @@
470 }else{
471 fossil_print("MERGE %s\n", zName);
472 }
473 if( islinkv || islinkt /* || file_wd_islink(zFullPath) */ ){
474 fossil_print("***** Cannot merge symlink %s\n", zNewName);
475 nConflict++;
476 }else{
477 unsigned mergeFlags = dryRunFlag ? MERGE_DRYRUN : 0;
478 undo_save(zName);
479 content_get(ridt, &t);
480 content_get(ridv, &v);
@@ -544,11 +544,11 @@
544 fossil_warning("uncommitted %s against %S.",
545 zLabel, db_column_text(&q, 0));
546 nMerge++;
547 }
548 db_finalize(&q);
549
550 if( nConflict ){
551 if( internalUpdate ){
552 internalConflictCnt = nConflict;
553 nConflict = 0;
554 }else{
@@ -561,11 +561,11 @@
561 }
562 if( nMerge ){
563 fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
564 }
565 }
566
567 /*
568 ** Clean up the mid and pid VFILE entries. Then commit the changes.
569 */
570 if( dryRunFlag ){
571 db_end_transaction(1); /* With --dry-run, rollback changes */
@@ -615,27 +615,27 @@
615 Blob path;
616 const char *zPath;
617
618 blob_zero(&path);
619 blob_appendf(&path, "%s/%s", g.zLocalRoot, zDir);
620 zPath = blob_str(&path);
621 /* Handle various cases of existence of the directory */
622 switch( file_wd_isdir(zPath) ){
623 case 0: { /* doesn't exist */
624 if( file_mkdir(zPath, 0)!=0 ) {
625 fossil_warning("couldn't create directory %s as "
626 "required by empty-dirs setting", zDir);
627 }
628 break;
629 }
630 case 1: { /* exists, and is a directory */
631 /* do nothing - required directory exists already */
632 break;
633 }
634 case 2: { /* exists, but isn't a directory */
635 fossil_warning("file %s found, but a directory is required "
636 "by empty-dirs setting", zDir);
637 }
638 }
639 blob_reset(&path);
640 }
641 }
@@ -656,11 +656,11 @@
656 int errCode /* Error code if file not found. Panic if 0. */
657 ){
658 Manifest *pManifest;
659 ManifestFile *pFile;
660 int rid=0;
661
662 if( revision ){
663 rid = name_to_typed_rid(revision,"ci");
664 }else if( !g.localOpen ){
665 rid = name_to_typed_rid(db_get("main-branch","trunk"),"ci");
666 }else{
@@ -669,11 +669,11 @@
669 if( !is_a_version(rid) ){
670 if( errCode>0 ) return errCode;
671 fossil_fatal("no such checkin: %s", revision);
672 }
673 pManifest = manifest_get(rid, CFTYPE_MANIFEST, 0);
674
675 if( pManifest ){
676 pFile = manifest_file_find(pManifest, file);
677 if( pFile ){
678 int rc;
679 rid = uuid_to_rid(pFile->zUuid, 0);
@@ -728,14 +728,14 @@
728 Blob record;
729 int i;
730 int errCode;
731 Stmt q;
732
733 undo_capture_command_line();
734 zRevision = find_option("revision", "r", 1);
735 verify_all_options();
736
737 if( g.argc<2 ){
738 usage("?OPTIONS? [FILE] ...");
739 }
740 if( zRevision && g.argc<3 ){
741 fossil_fatal("the --revision option does not work for the entire tree");
742
--- src/update.c
+++ src/update.c
@@ -34,11 +34,11 @@
34 */
35 static int internalUpdate = 0;
36 static int internalConflictCnt = 0;
37
38 /*
39 ** Do an update to version vid.
40 **
41 ** Start an undo session but do not terminate it. Do not autosync.
42 */
43 int update_to(int vid){
44 int savedArgc;
@@ -157,11 +157,11 @@
157 if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag,
158 db_get_int("autosync-tries", 1)) ){
159 fossil_fatal("Cannot proceed with update");
160 }
161 }
162
163 /* Create any empty directories now, as well as after the update,
164 ** so changes in settings are reflected now */
165 if( !dryRunFlag ) ensure_empty_dirs_created();
166
167 if( internalUpdate ){
@@ -182,11 +182,11 @@
182 }else if( !is_a_version(tid) ){
183 fossil_fatal("no such version: %s", g.argv[2]);
184 }
185 }
186 }
187
188 /* If no VERSION is specified on the command-line, then look for a
189 ** descendent of the current version. If there are multiple descendants,
190 ** look for one from the same branch as the current version. If there
191 ** are still multiple descendants, show them all and refuse to update
192 ** until the user selects one.
@@ -207,11 +207,11 @@
207 " WHERE tagid=%d AND rid=%d))",
208 TAG_BRANCH, TAG_BRANCH, vid
209 );
210 if( db_int(0, "SELECT count(*) FROM leaves")>1 ){
211 compute_leaves(vid, closeCode);
212 db_prepare(&q,
213 "%s "
214 " AND event.objid IN leaves"
215 " ORDER BY event.mtime DESC",
216 timeline_query_for_tty()
217 );
@@ -220,11 +220,11 @@
220 fossil_fatal("Multiple descendants");
221 }
222 }
223 tid = db_int(0, "SELECT rid FROM leaves, event"
224 " WHERE event.objid=leaves.rid"
225 " ORDER BY event.mtime DESC");
226 if( tid==0 ) tid = vid;
227 }
228
229 if( tid==0 ){
230 return;
@@ -357,11 +357,11 @@
357 zSep = "";
358 for(i=3; i<g.argc; i++){
359 file_tree_name(g.argv[i], &treename, 1);
360 if( file_wd_isdir(g.argv[i])==1 ){
361 if( blob_size(&treename) != 1 || blob_str(&treename)[0] != '.' ){
362 blob_append_sql(&sql, "%sfn NOT GLOB '%q/*' ",
363 zSep /*safe-for-%s*/, blob_str(&treename));
364 }else{
365 blob_reset(&sql);
366 break;
367 }
@@ -378,11 +378,11 @@
378
379 /*
380 ** Alter the content of the checkout so that it conforms with the
381 ** target
382 */
383 db_prepare(&q,
384 "SELECT fn, idv, ridv, idt, ridt, chnged, fnt,"
385 " isexe, islinkv, islinkt, deleted FROM fv ORDER BY 1"
386 );
387 db_prepare(&mtimeXfer,
388 "UPDATE vfile SET mtime=(SELECT mtime FROM vfile WHERE id=:idv)"
@@ -470,11 +470,11 @@
470 }else{
471 fossil_print("MERGE %s\n", zName);
472 }
473 if( islinkv || islinkt /* || file_wd_islink(zFullPath) */ ){
474 fossil_print("***** Cannot merge symlink %s\n", zNewName);
475 nConflict++;
476 }else{
477 unsigned mergeFlags = dryRunFlag ? MERGE_DRYRUN : 0;
478 undo_save(zName);
479 content_get(ridt, &t);
480 content_get(ridv, &v);
@@ -544,11 +544,11 @@
544 fossil_warning("uncommitted %s against %S.",
545 zLabel, db_column_text(&q, 0));
546 nMerge++;
547 }
548 db_finalize(&q);
549
550 if( nConflict ){
551 if( internalUpdate ){
552 internalConflictCnt = nConflict;
553 nConflict = 0;
554 }else{
@@ -561,11 +561,11 @@
561 }
562 if( nMerge ){
563 fossil_warning("WARNING: %d uncommitted prior merges", nMerge);
564 }
565 }
566
567 /*
568 ** Clean up the mid and pid VFILE entries. Then commit the changes.
569 */
570 if( dryRunFlag ){
571 db_end_transaction(1); /* With --dry-run, rollback changes */
@@ -615,27 +615,27 @@
615 Blob path;
616 const char *zPath;
617
618 blob_zero(&path);
619 blob_appendf(&path, "%s/%s", g.zLocalRoot, zDir);
620 zPath = blob_str(&path);
621 /* Handle various cases of existence of the directory */
622 switch( file_wd_isdir(zPath) ){
623 case 0: { /* doesn't exist */
624 if( file_mkdir(zPath, 0)!=0 ) {
625 fossil_warning("couldn't create directory %s as "
626 "required by empty-dirs setting", zDir);
627 }
628 break;
629 }
630 case 1: { /* exists, and is a directory */
631 /* do nothing - required directory exists already */
632 break;
633 }
634 case 2: { /* exists, but isn't a directory */
635 fossil_warning("file %s found, but a directory is required "
636 "by empty-dirs setting", zDir);
637 }
638 }
639 blob_reset(&path);
640 }
641 }
@@ -656,11 +656,11 @@
656 int errCode /* Error code if file not found. Panic if 0. */
657 ){
658 Manifest *pManifest;
659 ManifestFile *pFile;
660 int rid=0;
661
662 if( revision ){
663 rid = name_to_typed_rid(revision,"ci");
664 }else if( !g.localOpen ){
665 rid = name_to_typed_rid(db_get("main-branch","trunk"),"ci");
666 }else{
@@ -669,11 +669,11 @@
669 if( !is_a_version(rid) ){
670 if( errCode>0 ) return errCode;
671 fossil_fatal("no such checkin: %s", revision);
672 }
673 pManifest = manifest_get(rid, CFTYPE_MANIFEST, 0);
674
675 if( pManifest ){
676 pFile = manifest_file_find(pManifest, file);
677 if( pFile ){
678 int rc;
679 rid = uuid_to_rid(pFile->zUuid, 0);
@@ -728,14 +728,14 @@
728 Blob record;
729 int i;
730 int errCode;
731 Stmt q;
732
733 undo_capture_command_line();
734 zRevision = find_option("revision", "r", 1);
735 verify_all_options();
736
737 if( g.argc<2 ){
738 usage("?OPTIONS? [FILE] ...");
739 }
740 if( zRevision && g.argc<3 ){
741 fossil_fatal("the --revision option does not work for the entire tree");
742
M src/verify.c
+2 -2
--- src/verify.c
+++ src/verify.c
@@ -63,11 +63,11 @@
6363
 */
6464
 static Bag toVerify;
6565
 static int inFinalVerify = 0;
6666
6767
 /*
68
-** This routine is called just prior to each commit operation.
68
+** This routine is called just prior to each commit operation.
6969
 **
7070
 ** Invoke verify_rid() on every record that has been added or modified
7171
 ** in the repository, in order to make sure that the repository is sane.
7272
 */
7373
 static int verify_at_commit(void){
@@ -84,11 +84,11 @@
8484
 return 0;
8585
 }
8686
8787
 /*
8888
 ** Arrange to verify a particular record prior to committing.
89
-**
89
+**
9090
 ** If the record rid is less than 1, then just initialize the
9191
 ** verification system but do not record anything as needing
9292
 ** verification.
9393
 */
9494
 void verify_before_commit(int rid){
9595
--- src/verify.c
+++ src/verify.c
@@ -63,11 +63,11 @@
63 */
64 static Bag toVerify;
65 static int inFinalVerify = 0;
66
67 /*
68 ** This routine is called just prior to each commit operation.
69 **
70 ** Invoke verify_rid() on every record that has been added or modified
71 ** in the repository, in order to make sure that the repository is sane.
72 */
73 static int verify_at_commit(void){
@@ -84,11 +84,11 @@
84 return 0;
85 }
86
87 /*
88 ** Arrange to verify a particular record prior to committing.
89 **
90 ** If the record rid is less than 1, then just initialize the
91 ** verification system but do not record anything as needing
92 ** verification.
93 */
94 void verify_before_commit(int rid){
95
--- src/verify.c
+++ src/verify.c
@@ -63,11 +63,11 @@
63 */
64 static Bag toVerify;
65 static int inFinalVerify = 0;
66
67 /*
68 ** This routine is called just prior to each commit operation.
69 **
70 ** Invoke verify_rid() on every record that has been added or modified
71 ** in the repository, in order to make sure that the repository is sane.
72 */
73 static int verify_at_commit(void){
@@ -84,11 +84,11 @@
84 return 0;
85 }
86
87 /*
88 ** Arrange to verify a particular record prior to committing.
89 **
90 ** If the record rid is less than 1, then just initialize the
91 ** verification system but do not record anything as needing
92 ** verification.
93 */
94 void verify_before_commit(int rid){
95

Keyboard Shortcuts

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