Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch file-safety Excluding Merge-Ins
This is equivalent to a diff from e7b6434112 to a1814d5015
2011-02-16
| ||
15:00 | Work around the seemingly buggy behavior of git-fast-export with regard to tags when doing an import. check-in: 496aacd10e user: drh tags: trunk | |
2011-02-15
| ||
07:47 | add custom Makefile with changes to support OpenSSL build on Windows check-in: 5567c81285 user: mistachkin tags: trunk | |
05:18 | Create new branch named "bch" check-in: 8b5556c9fe user: bharder tags: bch | |
2011-02-12
| ||
13:38 | This branch contains experimental changes attempting to address complaints that Fossil sometimes overwrites unmanaged files. In this checkin: Use file_delete() instead of unlink() everywhere. Add interfaces file_move() and file_dont_overwrite() but do not use those interfaces yet. Leaf check-in: a1814d5015 user: drh tags: file-safety | |
2011-02-11
| ||
20:53 | Add the --detail option to the test-timewarp-list command. check-in: e7b6434112 user: drh tags: trunk | |
20:09 | Make sure the EVENT.OMTIME value is recorded correctly when parsing a check-in manifest. check-in: 1d83ecc5d5 user: drh tags: trunk | |
Changes to src/checkin.c.
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
...
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
|
g.zLocalRoot, fossil_all_reserved_names(), glob_expr("x",zIgnoreFlag) ); if( file_tree_name(g.zRepositoryName, &repo, 0) ){ db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo); } while( db_step(&q)==SQLITE_ROW ){ if( allFlag ){ unlink(db_column_text(&q, 0)); }else{ Blob ans; char *prompt = mprintf("remove unmanaged file \"%s\" (y/N)? ", db_column_text(&q, 0)); blob_zero(&ans); prompt_user(prompt, &ans); if( blob_str(&ans)[0]=='y' ){ unlink(db_column_text(&q, 0)); } } } db_finalize(&q); } /* ................................................................................ blob_reset(&text); while( fgets(zIn, sizeof(zIn), stdin)!=0 ){ if( zIn[0]=='.' && (zIn[1]==0 || zIn[1]=='\r' || zIn[1]=='\n') ) break; blob_append(&text, zIn, -1); } } blob_remove_cr(&text); unlink(zFile); free(zFile); blob_zero(pComment); while( blob_line(&text, &line) ){ int i, n; char *z; n = blob_size(&line); z = blob_buffer(&line); |
|
|
|
|
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
...
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
|
g.zLocalRoot, fossil_all_reserved_names(), glob_expr("x",zIgnoreFlag) ); if( file_tree_name(g.zRepositoryName, &repo, 0) ){ db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo); } while( db_step(&q)==SQLITE_ROW ){ if( allFlag ){ file_delete(db_column_text(&q, 0)); }else{ Blob ans; char *prompt = mprintf("remove unmanaged file \"%s\" (y/N)? ", db_column_text(&q, 0)); blob_zero(&ans); prompt_user(prompt, &ans); if( blob_str(&ans)[0]=='y' ){ file_delete(db_column_text(&q, 0)); } } } db_finalize(&q); } /* ................................................................................ blob_reset(&text); while( fgets(zIn, sizeof(zIn), stdin)!=0 ){ if( zIn[0]=='.' && (zIn[1]==0 || zIn[1]=='\r' || zIn[1]=='\n') ) break; blob_append(&text, zIn, -1); } } blob_remove_cr(&text); file_delete(zFile); free(zFile); blob_zero(pComment); while( blob_line(&text, &line) ){ int i, n; char *z; n = blob_size(&line); z = blob_buffer(&line); |
Changes to src/checkout.c.
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
...
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
|
blob_append(&hash, "\n", 1); blob_write_to_file(&hash, zManFile); free(zManFile); blob_reset(&hash); }else{ if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest'") ){ zManFile = mprintf("%smanifest", g.zLocalRoot); unlink(zManFile); free(zManFile); } if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest.uuid'") ){ zManFile = mprintf("%smanifest.uuid", g.zLocalRoot); unlink(zManFile); free(zManFile); } } } /* ................................................................................ static void unlink_local_database(int manifestOnly){ const char *zReserved; int i; for(i=0; (zReserved = fossil_reserved_name(i))!=0; i++){ if( manifestOnly==0 || zReserved[0]=='m' ){ char *z; z = mprintf("%s%s", g.zLocalRoot, zReserved); unlink(z); free(z); } } } /* ** COMMAND: close |
|
|
|
|
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
...
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
|
blob_append(&hash, "\n", 1); blob_write_to_file(&hash, zManFile); free(zManFile); blob_reset(&hash); }else{ if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest'") ){ zManFile = mprintf("%smanifest", g.zLocalRoot); file_delete(zManFile); free(zManFile); } if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest.uuid'") ){ zManFile = mprintf("%smanifest.uuid", g.zLocalRoot); file_delete(zManFile); free(zManFile); } } } /* ................................................................................ static void unlink_local_database(int manifestOnly){ const char *zReserved; int i; for(i=0; (zReserved = fossil_reserved_name(i))!=0; i++){ if( manifestOnly==0 || zReserved[0]=='m' ){ char *z; z = mprintf("%s%s", g.zLocalRoot, zReserved); file_delete(z); free(z); } } } /* ** COMMAND: close |
Changes to src/clearsign.c.
50 51 52 53 54 55 56 57 58 59 60 61 62 |
blob_zero(pOut); blob_read_from_file(pOut, zIn); }else{ if( pOut!=pIn ){ blob_copy(pOut, pIn); } } unlink(zOut); unlink(zIn); free(zOut); free(zIn); return rc; } |
| | |
50 51 52 53 54 55 56 57 58 59 60 61 62 |
blob_zero(pOut); blob_read_from_file(pOut, zIn); }else{ if( pOut!=pIn ){ blob_copy(pOut, pIn); } } file_delete(zOut); file_delete(zIn); free(zOut); free(zIn); return rc; } |
Changes to src/clone.c.
98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
g.xlinkClusterOnly = 1;
nErr = client_sync(0,0,1,CONFIGSET_ALL,0);
g.xlinkClusterOnly = 0;
verify_cancel();
db_end_transaction(0);
db_close(1);
if( nErr ){
unlink(g.argv[3]);
fossil_fatal("server returned an error - clone aborted");
}
db_open_repository(g.argv[3]);
}
db_begin_transaction();
printf("Rebuilding repository meta-data...\n");
rebuild_db(0, 1, 0);
printf("project-id: %s\n", db_get("project-code", 0));
printf("server-id: %s\n", db_get("server-code", 0));
zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
printf("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
db_end_transaction(0);
}
|
| |
98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
g.xlinkClusterOnly = 1;
nErr = client_sync(0,0,1,CONFIGSET_ALL,0);
g.xlinkClusterOnly = 0;
verify_cancel();
db_end_transaction(0);
db_close(1);
if( nErr ){
file_delete(g.argv[3]);
fossil_fatal("server returned an error - clone aborted");
}
db_open_repository(g.argv[3]);
}
db_begin_transaction();
printf("Rebuilding repository meta-data...\n");
rebuild_db(0, 1, 0);
printf("project-id: %s\n", db_get("project-code", 0));
printf("server-id: %s\n", db_get("server-code", 0));
zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
printf("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
db_end_transaction(0);
}
|
Changes to src/db.c.
149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 |
db_finalize(pAllStmt);
}
if( nBegin ){
sqlite3_exec(g.db, "ROLLBACK", 0, 0, 0);
nBegin = 0;
if( isNewRepo ){
db_close(0);
unlink(g.zRepositoryName);
}
}
busy = 0;
db_close(0);
}
/*
|
| |
149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 |
db_finalize(pAllStmt);
}
if( nBegin ){
sqlite3_exec(g.db, "ROLLBACK", 0, 0, 0);
nBegin = 0;
if( isNewRepo ){
db_close(0);
file_delete(g.zRepositoryName);
}
}
busy = 0;
db_close(0);
}
/*
|
Changes to src/diffcmd.c.
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
...
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
|
blob_append(&cmd, " ", 1); shell_escape(&cmd, zFile2); /* Run the external diff command */ fossil_system(blob_str(&cmd)); /* Delete the temporary file and clean up memory used */ unlink(blob_str(&nameFile1)); blob_reset(&nameFile1); blob_reset(&cmd); } } /* ** Show the difference between two files, both in memory. ................................................................................ blob_append(&cmd, " ", 1); shell_escape(&cmd, zTemp2); /* Run the external diff command */ fossil_system(blob_str(&cmd)); /* Delete the temporary file and clean up memory used */ unlink(zTemp1); unlink(zTemp2); blob_reset(&cmd); } } /* ** Do a diff against a single file named in g.argv[2] from version zFrom ** against the same file on disk. |
|
|
|
|
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
...
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
|
blob_append(&cmd, " ", 1); shell_escape(&cmd, zFile2); /* Run the external diff command */ fossil_system(blob_str(&cmd)); /* Delete the temporary file and clean up memory used */ file_delete(blob_str(&nameFile1)); blob_reset(&nameFile1); blob_reset(&cmd); } } /* ** Show the difference between two files, both in memory. ................................................................................ blob_append(&cmd, " ", 1); shell_escape(&cmd, zTemp2); /* Run the external diff command */ fossil_system(blob_str(&cmd)); /* Delete the temporary file and clean up memory used */ file_delete(zTemp1); file_delete(zTemp2); blob_reset(&cmd); } } /* ** Do a diff against a single file named in g.argv[2] from version zFrom ** against the same file on disk. |
Changes to src/file.c.
131 132 133 134 135 136 137 138 139 140 141 142 143 144 ... 149 150 151 152 153 154 155 156 157 158 159 160 161 162 ... 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 |
const char *zTail = z; while( z[0] ){ if( z[0]=='/' ) zTail = &z[1]; z++; } return zTail; } /* ** Copy the content of a file from one place to another. */ void file_copy(const char *zFrom, const char *zTo){ FILE *in, *out; int got; ................................................................................ if( out==0 ) fossil_fatal("cannot open \"%s\" for writing", zTo); while( (got=fread(zBuf, 1, sizeof(zBuf), in))>0 ){ fwrite(zBuf, 1, got, out); } fclose(in); fclose(out); } /* ** Set or clear the execute bit on a file. */ void file_setexe(const char *zFilename, int onoff){ #if !defined(_WIN32) struct stat buf; ................................................................................ ** ** Return the number of errors. */ int file_mkdir(const char *zName, int forceFlag){ int rc = file_isdir(zName); if( rc==2 ){ if( !forceFlag ) return 1; unlink(zName); } if( rc!=1 ){ #if defined(_WIN32) return mkdir(zName); #else return mkdir(zName, 0755); #endif |
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | |
131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 ... 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 ... 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
const char *zTail = z; while( z[0] ){ if( z[0]=='/' ) zTail = &z[1]; z++; } return zTail; } /* ** Delete a file. */ void file_delete(const char *zFilename){ unlink(zFilename); } /* ** Copy the content of a file from one place to another. */ void file_copy(const char *zFrom, const char *zTo){ FILE *in, *out; int got; ................................................................................ if( out==0 ) fossil_fatal("cannot open \"%s\" for writing", zTo); while( (got=fread(zBuf, 1, sizeof(zBuf), in))>0 ){ fwrite(zBuf, 1, got, out); } fclose(in); fclose(out); } /* ** Rename a file. */ void file_move(const char *zFrom, const char *zTo){ #if defined(_WIN32) /* if( MoveFileW(zFrom, zTo) ) return; */ #else if( rename(zFrom, zTo)==0 ) return; #endif file_copy(zFrom, zTo); file_delete(zFrom); } /* ** If the named file exists, move it out of the way so that it will not ** be overwritten by subsequent operations. */ void file_dont_overwrite(const char *z){ char *zNow; char *zNewName; int cnt = 0; if( file_mtime(z)<0 ) return; if( !file_isfile(0) ){ fossil_fatal("cannot overwrite \"%s\" - not an ordinary file"); } zNow = db_text(0, "SELECT strftime('%%Y%%m%%d%%H%%M%%S', 'now')"); while(1){ zNewName = mprintf("%s-%s-%d", z, zNow, cnt++); if( file_mtime(zNewName)<0 ) break; fossil_free(zNewName); } fossil_free(zNow); file_move(z, zNewName); fossil_free(zNewName); } /* ** Set or clear the execute bit on a file. */ void file_setexe(const char *zFilename, int onoff){ #if !defined(_WIN32) struct stat buf; ................................................................................ ** ** Return the number of errors. */ int file_mkdir(const char *zName, int forceFlag){ int rc = file_isdir(zName); if( rc==2 ){ if( !forceFlag ) return 1; file_delete(zName); } if( rc!=1 ){ #if defined(_WIN32) return mkdir(zName); #else return mkdir(zName, 0755); #endif |
Changes to src/http_transport.c.
240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 |
ssl_close(); #endif }else if( g.urlIsFile ){ if( transport.pFile ){ fclose(transport.pFile); transport.pFile = 0; } unlink(transport.zInFile); unlink(transport.zOutFile); free(transport.zInFile); free(transport.zOutFile); }else{ socket_close(); } transport.isOpen = 0; } |
| | |
240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 |
ssl_close(); #endif }else if( g.urlIsFile ){ if( transport.pFile ){ fclose(transport.pFile); transport.pFile = 0; } file_delete(transport.zInFile); file_delete(transport.zOutFile); free(transport.zInFile); free(transport.zOutFile); }else{ socket_close(); } transport.isOpen = 0; } |
Changes to src/import.c.
641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 |
}
if( g.argc==4 ){
pIn = fopen(g.argv[3], "rb");
}else{
pIn = stdin;
fossil_binary_mode(pIn);
}
if( forceFlag ) unlink(g.argv[2]);
db_create_repository(g.argv[2]);
db_open_repository(g.argv[2]);
db_open_config(0);
db_multi_exec(
"CREATE TEMP TABLE xtag(tname TEXT UNIQUE, trid INT, tuuid TEXT);"
"CREATE TEMP TABLE xbranch(tname TEXT UNIQUE, brnm TEXT);"
);
|
| |
641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 |
}
if( g.argc==4 ){
pIn = fopen(g.argv[3], "rb");
}else{
pIn = stdin;
fossil_binary_mode(pIn);
}
if( forceFlag ) file_delete(g.argv[2]);
db_create_repository(g.argv[2]);
db_open_repository(g.argv[2]);
db_open_config(0);
db_multi_exec(
"CREATE TEMP TABLE xtag(tname TEXT UNIQUE, trid INT, tuuid TEXT);"
"CREATE TEMP TABLE xbranch(tname TEXT UNIQUE, brnm TEXT);"
);
|
Changes to src/merge.c.
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
...
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
|
} undo_save(zName); db_multi_exec( "UPDATE vfile SET deleted=1 WHERE id=%d", idv ); if( !nochangeFlag ){ char *zFullPath = mprintf("%s%s", g.zLocalRoot, zName); unlink(zFullPath); free(zFullPath); } } db_finalize(&q); /* ** Rename files that have taken a rename on P->M but which keep the same ................................................................................ "UPDATE vfile SET pathname=%Q, origname=coalesce(origname,pathname)" " WHERE id=%d AND vid=%d", zNewName, idv, vid ); if( !nochangeFlag ){ char *zFullOldPath = mprintf("%s%s", g.zLocalRoot, zOldName); char *zFullNewPath = mprintf("%s%s", g.zLocalRoot, zNewName); file_copy(zFullOldPath, zFullNewPath); unlink(zFullOldPath); free(zFullNewPath); free(zFullOldPath); } } db_finalize(&q); |
|
|
|
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
...
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
|
} undo_save(zName); db_multi_exec( "UPDATE vfile SET deleted=1 WHERE id=%d", idv ); if( !nochangeFlag ){ char *zFullPath = mprintf("%s%s", g.zLocalRoot, zName); file_delete(zFullPath); free(zFullPath); } } db_finalize(&q); /* ** Rename files that have taken a rename on P->M but which keep the same ................................................................................ "UPDATE vfile SET pathname=%Q, origname=coalesce(origname,pathname)" " WHERE id=%d AND vid=%d", zNewName, idv, vid ); if( !nochangeFlag ){ char *zFullOldPath = mprintf("%s%s", g.zLocalRoot, zOldName); char *zFullNewPath = mprintf("%s%s", g.zLocalRoot, zNewName); file_copy(zFullOldPath, zFullNewPath); file_delete(zFullOldPath); free(zFullNewPath); free(zFullOldPath); } } db_finalize(&q); |
Changes to src/stash.c.
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
...
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
|
blob_zero(&delta); if( rid==0 ){ db_ephemeral_blob(&q, 5, &delta); blob_write_to_file(&delta, zNPath); printf("ADD %s\n", zNew); }else if( isRemoved ){ printf("DELETE %s\n", zOrig); unlink(zOPath); }else{ Blob a, b, out, disk; db_ephemeral_blob(&q, 5, &delta); blob_read_from_file(&disk, zOPath); content_get(rid, &a); blob_delta_apply(&a, &delta, &b); if( blob_compare(&disk, &a)==0 ){ ................................................................................ blob_reset(&a); blob_reset(&b); blob_reset(&disk); } blob_reset(&delta); if( fossil_strcmp(zOrig,zNew)!=0 ){ undo_save(zOrig); unlink(zOPath); } } db_finalize(&q); if( nConflict ){ printf("WARNING: merge conflicts - see messages above for details.\n"); } } |
|
|
|
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
...
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
|
blob_zero(&delta); if( rid==0 ){ db_ephemeral_blob(&q, 5, &delta); blob_write_to_file(&delta, zNPath); printf("ADD %s\n", zNew); }else if( isRemoved ){ printf("DELETE %s\n", zOrig); file_delete(zOPath); }else{ Blob a, b, out, disk; db_ephemeral_blob(&q, 5, &delta); blob_read_from_file(&disk, zOPath); content_get(rid, &a); blob_delta_apply(&a, &delta, &b); if( blob_compare(&disk, &a)==0 ){ ................................................................................ blob_reset(&a); blob_reset(&b); blob_reset(&disk); } blob_reset(&delta); if( fossil_strcmp(zOrig,zNew)!=0 ){ undo_save(zOrig); file_delete(zOPath); } } db_finalize(&q); if( nConflict ){ printf("WARNING: merge conflicts - see messages above for details.\n"); } } |
Changes to src/undo.c.
57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 |
printf("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
}else{
printf("NEW %s\n", zPathname);
}
blob_write_to_file(&new, zFullname);
}else{
printf("DELETE %s\n", zPathname);
unlink(zFullname);
}
blob_reset(&new);
free(zFullname);
db_finalize(&q);
db_prepare(&q,
"UPDATE undo SET content=:c, existsflag=%d, redoflag=NOT redoflag"
" WHERE pathname=%Q",
|
| |
57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 |
printf("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
}else{
printf("NEW %s\n", zPathname);
}
blob_write_to_file(&new, zFullname);
}else{
printf("DELETE %s\n", zPathname);
file_delete(zFullname);
}
blob_reset(&new);
free(zFullname);
db_finalize(&q);
db_prepare(&q,
"UPDATE undo SET content=:c, existsflag=%d, redoflag=NOT redoflag"
" WHERE pathname=%Q",
|
Changes to src/update.c.
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
...
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
|
/* Edited locally but deleted from the target. Do not track the ** file but keep the edited version around. */ printf("CONFLICT %s - edited locally but deleted by update\n", zName); nConflict++; }else{ printf("REMOVE %s\n", zName); undo_save(zName); if( !nochangeFlag ) unlink(zFullPath); } }else if( idt>0 && idv>0 && ridt!=ridv && chnged ){ /* Merge the changes in the current tree into the target version */ Blob e, r, t, v; int rc; if( nameChng ){ printf("MERGE %s -> %s\n", zName, zNewName); ................................................................................ nConflict++; } }else{ if( !nochangeFlag ) blob_write_to_file(&t, zFullNewPath); printf("***** Cannot merge binary file %s\n", zNewName); nConflict++; } if( nameChng && !nochangeFlag ) unlink(zFullPath); blob_reset(&v); blob_reset(&e); blob_reset(&t); blob_reset(&r); }else{ if( chnged ){ if( verboseFlag ) printf("EDITED %s\n", zName); |
|
|
|
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
...
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
|
/* Edited locally but deleted from the target. Do not track the ** file but keep the edited version around. */ printf("CONFLICT %s - edited locally but deleted by update\n", zName); nConflict++; }else{ printf("REMOVE %s\n", zName); undo_save(zName); if( !nochangeFlag ) file_delete(zFullPath); } }else if( idt>0 && idv>0 && ridt!=ridv && chnged ){ /* Merge the changes in the current tree into the target version */ Blob e, r, t, v; int rc; if( nameChng ){ printf("MERGE %s -> %s\n", zName, zNewName); ................................................................................ nConflict++; } }else{ if( !nochangeFlag ) blob_write_to_file(&t, zFullNewPath); printf("***** Cannot merge binary file %s\n", zNewName); nConflict++; } if( nameChng && !nochangeFlag ) file_delete(zFullPath); blob_reset(&v); blob_reset(&e); blob_reset(&t); blob_reset(&r); }else{ if( chnged ){ if( verboseFlag ) printf("EDITED %s\n", zName); |
Changes to src/vfile.c.
266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
Stmt q;
db_prepare(&q, "SELECT %Q || pathname FROM vfile"
" WHERE vid=%d AND mrid>0", g.zLocalRoot, vid);
while( db_step(&q)==SQLITE_ROW ){
const char *zName;
zName = db_column_text(&q, 0);
unlink(zName);
}
db_finalize(&q);
db_multi_exec("UPDATE vfile SET mtime=NULL WHERE vid=%d AND mrid>0", vid);
}
/*
** Load into table SFILE the name of every ordinary file in
|
| |
266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
Stmt q;
db_prepare(&q, "SELECT %Q || pathname FROM vfile"
" WHERE vid=%d AND mrid>0", g.zLocalRoot, vid);
while( db_step(&q)==SQLITE_ROW ){
const char *zName;
zName = db_column_text(&q, 0);
file_delete(zName);
}
db_finalize(&q);
db_multi_exec("UPDATE vfile SET mtime=NULL WHERE vid=%d AND mrid>0", vid);
}
/*
** Load into table SFILE the name of every ordinary file in
|
Changes to src/winhttp.c.
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
...
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
|
} } end_request: if( out ) fclose(out); if( in ) fclose(in); closesocket(p->s); unlink(zRequestFName); unlink(zReplyFName); free(p); } /* ** Start a listening socket and process incoming HTTP requests on ** that socket. */ ................................................................................ WSADATA wd; SOCKET s = INVALID_SOCKET; SOCKADDR_IN addr; int idCnt = 0; int iPort = mnPort; char *zNotFoundOption; if( zStopper ) unlink(zStopper); if( zNotFound ){ zNotFoundOption = mprintf(" --notfound %s", zNotFound); }else{ zNotFoundOption = ""; } if( WSAStartup(MAKEWORD(1,1), &wd) ){ fossil_fatal("unable to initialize winsock"); |
|
|
|
|
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
...
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
|
} } end_request: if( out ) fclose(out); if( in ) fclose(in); closesocket(p->s); file_delete(zRequestFName); file_delete(zReplyFName); free(p); } /* ** Start a listening socket and process incoming HTTP requests on ** that socket. */ ................................................................................ WSADATA wd; SOCKET s = INVALID_SOCKET; SOCKADDR_IN addr; int idCnt = 0; int iPort = mnPort; char *zNotFoundOption; if( zStopper ) file_delete(zStopper); if( zNotFound ){ zNotFoundOption = mprintf(" --notfound %s", zNotFound); }else{ zNotFoundOption = ""; } if( WSAStartup(MAKEWORD(1,1), &wd) ){ fossil_fatal("unable to initialize winsock"); |