Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix SQLITE_ERROR as reported by Taylor Venable: https://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg20645.html |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | mvRmHardFix |
Files: | files | file ages | folders |
SHA1: |
89212c5a69576f77fb0875cc33bd75c5 |
User & Date: | jan.nijtmans 2015-05-26 20:07:53.850 |
Context
2015-05-26
| ||
20:07 | Fix SQLITE_ERROR as reported by Taylor Venable: https://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg20645.html ... (Closed-Leaf check-in: 89212c5a user: jan.nijtmans tags: mvRmHardFix) | |
2015-05-25
| ||
09:52 | Close <a> tag, as reported by Svyatoslav Mishyn ... (check-in: d10b1e02 user: jan.nijtmans tags: trunk) | |
Changes
Changes to src/add.c.
︙ | ︙ | |||
346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 | glob_free(pIgnore); glob_free(pClean); add_files_in_sfile(vid); db_end_transaction(0); } /* ** This function adds a file to list of files to delete from disk after ** the other actions required for the parent operation have completed ** successfully. The first time it is called for the current process, ** it creates a temporary table named "fremove", to keep track of these ** files. */ static void add_file_to_remove( const char *zOldName /* The old name of the file on disk. */ ){ | > > < | 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 | glob_free(pIgnore); glob_free(pClean); add_files_in_sfile(vid); db_end_transaction(0); } static int tableCreated = 0; /* ** This function adds a file to list of files to delete from disk after ** the other actions required for the parent operation have completed ** successfully. The first time it is called for the current process, ** it creates a temporary table named "fremove", to keep track of these ** files. */ static void add_file_to_remove( const char *zOldName /* The old name of the file on disk. */ ){ Blob fullOldName; if( !tableCreated ){ db_multi_exec("CREATE TEMP TABLE fremove(x TEXT PRIMARY KEY %s)", filename_collation()); tableCreated = 1; } file_canonical_name(zOldName, &fullOldName, 0); |
︙ | ︙ | |||
489 490 491 492 493 494 495 | if( !dryRunFlag ){ db_multi_exec( "UPDATE vfile SET deleted=1 WHERE pathname IN sfile;" "DELETE FROM vfile WHERE rid=0 AND deleted;" ); } db_end_transaction(0); | | | 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 | if( !dryRunFlag ){ db_multi_exec( "UPDATE vfile SET deleted=1 WHERE pathname IN sfile;" "DELETE FROM vfile WHERE rid=0 AND deleted;" ); } db_end_transaction(0); if( tableCreated ) process_files_to_remove(dryRunFlag); } /* ** Capture the command-line --case-sensitive option. */ static const char *zCaseSensitive = 0; void capture_case_sensitive_option(void){ |
︙ | ︙ | |||
736 737 738 739 740 741 742 | ** it creates a temporary table named "fmove", to keep track of these ** files. */ static void add_file_to_move( const char *zOldName, /* The old name of the file on disk. */ const char *zNewName /* The new name of the file on disk. */ ){ | < | 737 738 739 740 741 742 743 744 745 746 747 748 749 750 | ** it creates a temporary table named "fmove", to keep track of these ** files. */ static void add_file_to_move( const char *zOldName, /* The old name of the file on disk. */ const char *zNewName /* The new name of the file on disk. */ ){ Blob fullOldName; Blob fullNewName; if( !tableCreated ){ db_multi_exec("CREATE TEMP TABLE fmove(x TEXT PRIMARY KEY %s, y TEXT %s)", filename_collation(), filename_collation()); tableCreated = 1; } |
︙ | ︙ | |||
921 922 923 924 925 926 927 | const char *zFrom = db_column_text(&q, 0); const char *zTo = db_column_text(&q, 1); mv_one_file(vid, zFrom, zTo, dryRunFlag); if( moveFiles ) add_file_to_move(zFrom, zTo); } db_finalize(&q); db_end_transaction(0); | | | 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 | const char *zFrom = db_column_text(&q, 0); const char *zTo = db_column_text(&q, 1); mv_one_file(vid, zFrom, zTo, dryRunFlag); if( moveFiles ) add_file_to_move(zFrom, zTo); } db_finalize(&q); db_end_transaction(0); if( tableCreated ) process_files_to_move(dryRunFlag); } /* ** Function for stash_apply to be able to restore a file and indicate ** newly ADDED state. */ int stash_add_files_in_sfile(int vid){ return add_files_in_sfile(vid); } |