Fossil SCM
Eliminate some unnecessary end-of-line spacing
Commit
7fbc1c3a1f2cfdde389c7c3a2a73380f1ae67b55
Parent
153e17c5ebc1698…
6 files changed
+6
-6
+1
-1
+1
-1
+9
-9
+3
-3
+1
-1
+6
-6
| --- src/bundle.c | ||
| +++ src/bundle.c | ||
| @@ -28,11 +28,11 @@ | ||
| 28 | 28 | ** If an integer, then the corresponding blobid is the delta basis. |
| 29 | 29 | ** If a text string, then that string is a SHA1 hash for the delta |
| 30 | 30 | ** basis, which is presumably in the master repository. If NULL, then |
| 31 | 31 | ** data contains contain without delta compression. |
| 32 | 32 | */ |
| 33 | -static const char zBundleInit[] = | |
| 33 | +static const char zBundleInit[] = | |
| 34 | 34 | @ CREATE TABLE IF NOT EXISTS "%w".bconfig( |
| 35 | 35 | @ bcname TEXT, |
| 36 | 36 | @ bcvalue ANY |
| 37 | 37 | @ ); |
| 38 | 38 | @ CREATE TABLE IF NOT EXISTS "%w".bblob( |
| @@ -155,11 +155,11 @@ | ||
| 155 | 155 | int i; |
| 156 | 156 | Stmt q; |
| 157 | 157 | |
| 158 | 158 | verify_all_options(); |
| 159 | 159 | bundle_attach_file(g.argv[3], "b1", 1); |
| 160 | - db_prepare(&q, | |
| 160 | + db_prepare(&q, | |
| 161 | 161 | "INSERT INTO bblob(blobid, uuid, sz, delta, data, notes) " |
| 162 | 162 | "VALUES(NULL, $uuid, $sz, NULL, $data, $filename)"); |
| 163 | 163 | db_begin_transaction(); |
| 164 | 164 | for(i=4; i<g.argc; i++){ |
| 165 | 165 | int sz; |
| @@ -188,11 +188,11 @@ | ||
| 188 | 188 | ** instance of BRANCHNAME |
| 189 | 189 | ** --from TAG1 [--to TAG2] Check-in TAG1 and all primary descendants |
| 190 | 190 | ** up to and including TAG2 |
| 191 | 191 | ** --checkin TAG Check-in TAG only |
| 192 | 192 | ** |
| 193 | -** Store the RIDs for all applicable check-ins in the zTab table that | |
| 193 | +** Store the RIDs for all applicable check-ins in the zTab table that | |
| 194 | 194 | ** should already exist. Invoke fossil_fatal() if any kind of error is |
| 195 | 195 | ** seen. |
| 196 | 196 | */ |
| 197 | 197 | void subtree_from_arguments(const char *zTab){ |
| 198 | 198 | const char *zBr; |
| @@ -431,11 +431,11 @@ | ||
| 431 | 431 | if( bag_find(&busy, iSrc) ){ |
| 432 | 432 | fossil_fatal("delta loop while uncompressing bundle artifacts"); |
| 433 | 433 | } |
| 434 | 434 | bag_insert(&busy, iSrc); |
| 435 | 435 | } |
| 436 | - db_prepare(&q, | |
| 436 | + db_prepare(&q, | |
| 437 | 437 | "SELECT uuid, data, bblob.delta, bix.blobid" |
| 438 | 438 | " FROM bix, bblob" |
| 439 | 439 | " WHERE bix.delta=%d" |
| 440 | 440 | " AND bix.blobid=bblob.blobid;", |
| 441 | 441 | iSrc |
| @@ -623,11 +623,11 @@ | ||
| 623 | 623 | ); |
| 624 | 624 | manifest_crosslink_begin(); |
| 625 | 625 | bundle_import_elements(0, 0, isPriv); |
| 626 | 626 | manifest_crosslink_end(0); |
| 627 | 627 | describe_artifacts_to_stdout("IN got", "Imported content:"); |
| 628 | - db_end_transaction(0); | |
| 628 | + db_end_transaction(0); | |
| 629 | 629 | } |
| 630 | 630 | |
| 631 | 631 | /* fossil bundle purge BUNDLE |
| 632 | 632 | ** |
| 633 | 633 | ** Try to undo a prior "bundle import BUNDLE". |
| @@ -769,11 +769,11 @@ | ||
| 769 | 769 | ** |
| 770 | 770 | ** List the contents of BUNDLE on standard output |
| 771 | 771 | ** |
| 772 | 772 | ** fossil bundle purge BUNDLE |
| 773 | 773 | ** |
| 774 | -** Remove from the repository all files that are used exclusively | |
| 774 | +** Remove from the repository all files that are used exclusively | |
| 775 | 775 | ** by check-ins in BUNDLE. This has the effect of undoing a |
| 776 | 776 | ** "fossil bundle import". |
| 777 | 777 | ** |
| 778 | 778 | ** SUMMARY: |
| 779 | 779 | ** fossil bundle append BUNDLE FILE... Add files to BUNDLE |
| 780 | 780 |
| --- src/bundle.c | |
| +++ src/bundle.c | |
| @@ -28,11 +28,11 @@ | |
| 28 | ** If an integer, then the corresponding blobid is the delta basis. |
| 29 | ** If a text string, then that string is a SHA1 hash for the delta |
| 30 | ** basis, which is presumably in the master repository. If NULL, then |
| 31 | ** data contains contain without delta compression. |
| 32 | */ |
| 33 | static const char zBundleInit[] = |
| 34 | @ CREATE TABLE IF NOT EXISTS "%w".bconfig( |
| 35 | @ bcname TEXT, |
| 36 | @ bcvalue ANY |
| 37 | @ ); |
| 38 | @ CREATE TABLE IF NOT EXISTS "%w".bblob( |
| @@ -155,11 +155,11 @@ | |
| 155 | int i; |
| 156 | Stmt q; |
| 157 | |
| 158 | verify_all_options(); |
| 159 | bundle_attach_file(g.argv[3], "b1", 1); |
| 160 | db_prepare(&q, |
| 161 | "INSERT INTO bblob(blobid, uuid, sz, delta, data, notes) " |
| 162 | "VALUES(NULL, $uuid, $sz, NULL, $data, $filename)"); |
| 163 | db_begin_transaction(); |
| 164 | for(i=4; i<g.argc; i++){ |
| 165 | int sz; |
| @@ -188,11 +188,11 @@ | |
| 188 | ** instance of BRANCHNAME |
| 189 | ** --from TAG1 [--to TAG2] Check-in TAG1 and all primary descendants |
| 190 | ** up to and including TAG2 |
| 191 | ** --checkin TAG Check-in TAG only |
| 192 | ** |
| 193 | ** Store the RIDs for all applicable check-ins in the zTab table that |
| 194 | ** should already exist. Invoke fossil_fatal() if any kind of error is |
| 195 | ** seen. |
| 196 | */ |
| 197 | void subtree_from_arguments(const char *zTab){ |
| 198 | const char *zBr; |
| @@ -431,11 +431,11 @@ | |
| 431 | if( bag_find(&busy, iSrc) ){ |
| 432 | fossil_fatal("delta loop while uncompressing bundle artifacts"); |
| 433 | } |
| 434 | bag_insert(&busy, iSrc); |
| 435 | } |
| 436 | db_prepare(&q, |
| 437 | "SELECT uuid, data, bblob.delta, bix.blobid" |
| 438 | " FROM bix, bblob" |
| 439 | " WHERE bix.delta=%d" |
| 440 | " AND bix.blobid=bblob.blobid;", |
| 441 | iSrc |
| @@ -623,11 +623,11 @@ | |
| 623 | ); |
| 624 | manifest_crosslink_begin(); |
| 625 | bundle_import_elements(0, 0, isPriv); |
| 626 | manifest_crosslink_end(0); |
| 627 | describe_artifacts_to_stdout("IN got", "Imported content:"); |
| 628 | db_end_transaction(0); |
| 629 | } |
| 630 | |
| 631 | /* fossil bundle purge BUNDLE |
| 632 | ** |
| 633 | ** Try to undo a prior "bundle import BUNDLE". |
| @@ -769,11 +769,11 @@ | |
| 769 | ** |
| 770 | ** List the contents of BUNDLE on standard output |
| 771 | ** |
| 772 | ** fossil bundle purge BUNDLE |
| 773 | ** |
| 774 | ** Remove from the repository all files that are used exclusively |
| 775 | ** by check-ins in BUNDLE. This has the effect of undoing a |
| 776 | ** "fossil bundle import". |
| 777 | ** |
| 778 | ** SUMMARY: |
| 779 | ** fossil bundle append BUNDLE FILE... Add files to BUNDLE |
| 780 |
| --- src/bundle.c | |
| +++ src/bundle.c | |
| @@ -28,11 +28,11 @@ | |
| 28 | ** If an integer, then the corresponding blobid is the delta basis. |
| 29 | ** If a text string, then that string is a SHA1 hash for the delta |
| 30 | ** basis, which is presumably in the master repository. If NULL, then |
| 31 | ** data contains contain without delta compression. |
| 32 | */ |
| 33 | static const char zBundleInit[] = |
| 34 | @ CREATE TABLE IF NOT EXISTS "%w".bconfig( |
| 35 | @ bcname TEXT, |
| 36 | @ bcvalue ANY |
| 37 | @ ); |
| 38 | @ CREATE TABLE IF NOT EXISTS "%w".bblob( |
| @@ -155,11 +155,11 @@ | |
| 155 | int i; |
| 156 | Stmt q; |
| 157 | |
| 158 | verify_all_options(); |
| 159 | bundle_attach_file(g.argv[3], "b1", 1); |
| 160 | db_prepare(&q, |
| 161 | "INSERT INTO bblob(blobid, uuid, sz, delta, data, notes) " |
| 162 | "VALUES(NULL, $uuid, $sz, NULL, $data, $filename)"); |
| 163 | db_begin_transaction(); |
| 164 | for(i=4; i<g.argc; i++){ |
| 165 | int sz; |
| @@ -188,11 +188,11 @@ | |
| 188 | ** instance of BRANCHNAME |
| 189 | ** --from TAG1 [--to TAG2] Check-in TAG1 and all primary descendants |
| 190 | ** up to and including TAG2 |
| 191 | ** --checkin TAG Check-in TAG only |
| 192 | ** |
| 193 | ** Store the RIDs for all applicable check-ins in the zTab table that |
| 194 | ** should already exist. Invoke fossil_fatal() if any kind of error is |
| 195 | ** seen. |
| 196 | */ |
| 197 | void subtree_from_arguments(const char *zTab){ |
| 198 | const char *zBr; |
| @@ -431,11 +431,11 @@ | |
| 431 | if( bag_find(&busy, iSrc) ){ |
| 432 | fossil_fatal("delta loop while uncompressing bundle artifacts"); |
| 433 | } |
| 434 | bag_insert(&busy, iSrc); |
| 435 | } |
| 436 | db_prepare(&q, |
| 437 | "SELECT uuid, data, bblob.delta, bix.blobid" |
| 438 | " FROM bix, bblob" |
| 439 | " WHERE bix.delta=%d" |
| 440 | " AND bix.blobid=bblob.blobid;", |
| 441 | iSrc |
| @@ -623,11 +623,11 @@ | |
| 623 | ); |
| 624 | manifest_crosslink_begin(); |
| 625 | bundle_import_elements(0, 0, isPriv); |
| 626 | manifest_crosslink_end(0); |
| 627 | describe_artifacts_to_stdout("IN got", "Imported content:"); |
| 628 | db_end_transaction(0); |
| 629 | } |
| 630 | |
| 631 | /* fossil bundle purge BUNDLE |
| 632 | ** |
| 633 | ** Try to undo a prior "bundle import BUNDLE". |
| @@ -769,11 +769,11 @@ | |
| 769 | ** |
| 770 | ** List the contents of BUNDLE on standard output |
| 771 | ** |
| 772 | ** fossil bundle purge BUNDLE |
| 773 | ** |
| 774 | ** Remove from the repository all files that are used exclusively |
| 775 | ** by check-ins in BUNDLE. This has the effect of undoing a |
| 776 | ** "fossil bundle import". |
| 777 | ** |
| 778 | ** SUMMARY: |
| 779 | ** fossil bundle append BUNDLE FILE... Add files to BUNDLE |
| 780 |
+1
-1
| --- src/foci.c | ||
| +++ src/foci.c | ||
| @@ -24,11 +24,11 @@ | ||
| 24 | 24 | ** |
| 25 | 25 | ** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin; |
| 26 | 26 | ** -- ^^^^--- important! |
| 27 | 27 | ** SELECT * FROM foci WHERE checkinID=symbolic_name_to_rid('trunk'); |
| 28 | 28 | ** |
| 29 | -** The symbolic_name_to_rid('trunk') function finds the BLOB.RID value | |
| 29 | +** The symbolic_name_to_rid('trunk') function finds the BLOB.RID value | |
| 30 | 30 | ** corresponding to the 'trunk' tag. Then the files_of_checkin virtual table |
| 31 | 31 | ** decodes the manifest defined by that BLOB and returns all files described |
| 32 | 32 | ** by that manifest. The "schema" for the temp.foci table is: |
| 33 | 33 | ** |
| 34 | 34 | ** CREATE TABLE files_of_checkin( |
| 35 | 35 |
| --- src/foci.c | |
| +++ src/foci.c | |
| @@ -24,11 +24,11 @@ | |
| 24 | ** |
| 25 | ** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin; |
| 26 | ** -- ^^^^--- important! |
| 27 | ** SELECT * FROM foci WHERE checkinID=symbolic_name_to_rid('trunk'); |
| 28 | ** |
| 29 | ** The symbolic_name_to_rid('trunk') function finds the BLOB.RID value |
| 30 | ** corresponding to the 'trunk' tag. Then the files_of_checkin virtual table |
| 31 | ** decodes the manifest defined by that BLOB and returns all files described |
| 32 | ** by that manifest. The "schema" for the temp.foci table is: |
| 33 | ** |
| 34 | ** CREATE TABLE files_of_checkin( |
| 35 |
| --- src/foci.c | |
| +++ src/foci.c | |
| @@ -24,11 +24,11 @@ | |
| 24 | ** |
| 25 | ** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin; |
| 26 | ** -- ^^^^--- important! |
| 27 | ** SELECT * FROM foci WHERE checkinID=symbolic_name_to_rid('trunk'); |
| 28 | ** |
| 29 | ** The symbolic_name_to_rid('trunk') function finds the BLOB.RID value |
| 30 | ** corresponding to the 'trunk' tag. Then the files_of_checkin virtual table |
| 31 | ** decodes the manifest defined by that BLOB and returns all files described |
| 32 | ** by that manifest. The "schema" for the temp.foci table is: |
| 33 | ** |
| 34 | ** CREATE TABLE files_of_checkin( |
| 35 |
+1
-1
| --- src/publish.c | ||
| +++ src/publish.c | ||
| @@ -99,11 +99,11 @@ | ||
| 99 | 99 | if( bTest ){ |
| 100 | 100 | /* If the --test option is used, then do not actually publish any |
| 101 | 101 | ** artifacts. Instead, just list the artifact information on standard |
| 102 | 102 | ** output. The --test option is useful for verifying correct operation |
| 103 | 103 | ** of the logic that figures out which artifacts to publish, such as |
| 104 | - ** the find_checkin_associates() routine | |
| 104 | + ** the find_checkin_associates() routine | |
| 105 | 105 | */ |
| 106 | 106 | describe_artifacts_to_stdout("IN ok", 0); |
| 107 | 107 | }else{ |
| 108 | 108 | /* Standard behavior is simply to remove the published documents from |
| 109 | 109 | ** the PRIVATE table */ |
| 110 | 110 |
| --- src/publish.c | |
| +++ src/publish.c | |
| @@ -99,11 +99,11 @@ | |
| 99 | if( bTest ){ |
| 100 | /* If the --test option is used, then do not actually publish any |
| 101 | ** artifacts. Instead, just list the artifact information on standard |
| 102 | ** output. The --test option is useful for verifying correct operation |
| 103 | ** of the logic that figures out which artifacts to publish, such as |
| 104 | ** the find_checkin_associates() routine |
| 105 | */ |
| 106 | describe_artifacts_to_stdout("IN ok", 0); |
| 107 | }else{ |
| 108 | /* Standard behavior is simply to remove the published documents from |
| 109 | ** the PRIVATE table */ |
| 110 |
| --- src/publish.c | |
| +++ src/publish.c | |
| @@ -99,11 +99,11 @@ | |
| 99 | if( bTest ){ |
| 100 | /* If the --test option is used, then do not actually publish any |
| 101 | ** artifacts. Instead, just list the artifact information on standard |
| 102 | ** output. The --test option is useful for verifying correct operation |
| 103 | ** of the logic that figures out which artifacts to publish, such as |
| 104 | ** the find_checkin_associates() routine |
| 105 | */ |
| 106 | describe_artifacts_to_stdout("IN ok", 0); |
| 107 | }else{ |
| 108 | /* Standard behavior is simply to remove the published documents from |
| 109 | ** the PRIVATE table */ |
| 110 |
+9
-9
| --- src/purge.c | ||
| +++ src/purge.c | ||
| @@ -28,25 +28,25 @@ | ||
| 28 | 28 | ** |
| 29 | 29 | ** The purgeevent table contains one entry for each purge event. For each |
| 30 | 30 | ** purge event, multiple artifacts might have been removed. Each removed |
| 31 | 31 | ** artifact is stored as an entry in the purgeitem table. |
| 32 | 32 | ** |
| 33 | -** The purgeevent and purgeitem tables are not synced, even by the | |
| 34 | -** "fossil config" command. They exist only as a backup in case of a | |
| 33 | +** The purgeevent and purgeitem tables are not synced, even by the | |
| 34 | +** "fossil config" command. They exist only as a backup in case of a | |
| 35 | 35 | ** mistaken purge or for content recovery in case there is a bug in the |
| 36 | 36 | ** purge command. |
| 37 | 37 | */ |
| 38 | -static const char zPurgeInit[] = | |
| 38 | +static const char zPurgeInit[] = | |
| 39 | 39 | @ CREATE TABLE IF NOT EXISTS "%w".purgeevent( |
| 40 | 40 | @ peid INTEGER PRIMARY KEY, -- Unique ID for the purge event |
| 41 | 41 | @ ctime DATETIME, -- When purge occurred. Seconds since 1970. |
| 42 | 42 | @ pnotes TEXT -- Human-readable notes about the purge event |
| 43 | 43 | @ ); |
| 44 | 44 | @ CREATE TABLE IF NOT EXISTS "%w".purgeitem( |
| 45 | 45 | @ piid INTEGER PRIMARY KEY, -- ID for the purge item |
| 46 | 46 | @ peid INTEGER REFERENCES purgeevent ON DELETE CASCADE, -- Purge event |
| 47 | -@ orid INTEGER, -- Original RID before purged | |
| 47 | +@ orid INTEGER, -- Original RID before purged | |
| 48 | 48 | @ uuid TEXT NOT NULL, -- SHA1 hash of the purged artifact |
| 49 | 49 | @ srcid INTEGER, -- Basis purgeitem for delta compression |
| 50 | 50 | @ isPrivate BOOLEAN, -- True if artifact was originally private |
| 51 | 51 | @ sz INT NOT NULL, -- Uncompressed size of the purged artifact |
| 52 | 52 | @ desc TEXT, -- Brief description of this artifact |
| @@ -122,11 +122,11 @@ | ||
| 122 | 122 | db_finalize(&q); |
| 123 | 123 | |
| 124 | 124 | /* Construct the graveyard and copy the artifacts to be purged into the |
| 125 | 125 | ** graveyard */ |
| 126 | 126 | if( moveToGraveyard ){ |
| 127 | - db_multi_exec(zPurgeInit /*works-like:"%w%w"*/, | |
| 127 | + db_multi_exec(zPurgeInit /*works-like:"%w%w"*/, | |
| 128 | 128 | db_name("repository"), db_name("repository")); |
| 129 | 129 | db_multi_exec( |
| 130 | 130 | "INSERT INTO purgeevent(ctime,pnotes) VALUES(now(),%Q)", zNote |
| 131 | 131 | ); |
| 132 | 132 | peid = db_last_insert_rowid(); |
| @@ -193,11 +193,11 @@ | ||
| 193 | 193 | db_end_transaction(0); |
| 194 | 194 | return peid; |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | /* |
| 198 | -** The TEMP table named zTab contains RIDs for a set of check-ins. | |
| 198 | +** The TEMP table named zTab contains RIDs for a set of check-ins. | |
| 199 | 199 | ** |
| 200 | 200 | ** Check to see if any check-in in zTab is a baseline manifest for some |
| 201 | 201 | ** delta manifest that is not in zTab. Return true if zTab contains a |
| 202 | 202 | ** baseline for a delta that is not in zTab. |
| 203 | 203 | ** |
| @@ -275,11 +275,11 @@ | ||
| 275 | 275 | " WHERE srcid IN \"%w_tags\"" |
| 276 | 276 | " AND rid NOT IN \"%w\")", |
| 277 | 277 | zTab, zTab, zTab |
| 278 | 278 | ); |
| 279 | 279 | } |
| 280 | - | |
| 280 | + | |
| 281 | 281 | /* Transfer the extra artifacts into zTab */ |
| 282 | 282 | db_multi_exec( |
| 283 | 283 | "INSERT OR IGNORE INTO \"%w\" SELECT fid FROM \"%w_files\";" |
| 284 | 284 | "INSERT OR IGNORE INTO \"%w\" SELECT tid FROM \"%w_tags\";" |
| 285 | 285 | "DROP TABLE \"%w_files\";" |
| @@ -377,11 +377,11 @@ | ||
| 377 | 377 | if( bag_find(&busy, iSrc) ){ |
| 378 | 378 | fossil_fatal("delta loop while uncompressing purged artifacts"); |
| 379 | 379 | } |
| 380 | 380 | bag_insert(&busy, iSrc); |
| 381 | 381 | } |
| 382 | - db_prepare(&q, | |
| 382 | + db_prepare(&q, | |
| 383 | 383 | "SELECT uuid, data, isPrivate, ix.piid" |
| 384 | 384 | " FROM ix, purgeitem" |
| 385 | 385 | " WHERE ix.srcid=%d" |
| 386 | 386 | " AND ix.piid=purgeitem.piid;", |
| 387 | 387 | iSrc |
| @@ -436,11 +436,11 @@ | ||
| 436 | 436 | ** standard output. |
| 437 | 437 | ** |
| 438 | 438 | ** fossil purge ?checkins? TAGS... ?OPTIONS? |
| 439 | 439 | ** |
| 440 | 440 | ** Move the check-ins identified by TAGS and all of their descendants |
| 441 | -** out of the repository and into the graveyard. The "checkins" | |
| 441 | +** out of the repository and into the graveyard. The "checkins" | |
| 442 | 442 | ** subcommand keyword is option and can be omitted as long as TAGS |
| 443 | 443 | ** does not conflict with any other subcommand. |
| 444 | 444 | ** |
| 445 | 445 | ** If a TAGS includes a branch name then it means all the check-ins |
| 446 | 446 | ** on the most recent occurrance of that branch. |
| 447 | 447 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -28,25 +28,25 @@ | |
| 28 | ** |
| 29 | ** The purgeevent table contains one entry for each purge event. For each |
| 30 | ** purge event, multiple artifacts might have been removed. Each removed |
| 31 | ** artifact is stored as an entry in the purgeitem table. |
| 32 | ** |
| 33 | ** The purgeevent and purgeitem tables are not synced, even by the |
| 34 | ** "fossil config" command. They exist only as a backup in case of a |
| 35 | ** mistaken purge or for content recovery in case there is a bug in the |
| 36 | ** purge command. |
| 37 | */ |
| 38 | static const char zPurgeInit[] = |
| 39 | @ CREATE TABLE IF NOT EXISTS "%w".purgeevent( |
| 40 | @ peid INTEGER PRIMARY KEY, -- Unique ID for the purge event |
| 41 | @ ctime DATETIME, -- When purge occurred. Seconds since 1970. |
| 42 | @ pnotes TEXT -- Human-readable notes about the purge event |
| 43 | @ ); |
| 44 | @ CREATE TABLE IF NOT EXISTS "%w".purgeitem( |
| 45 | @ piid INTEGER PRIMARY KEY, -- ID for the purge item |
| 46 | @ peid INTEGER REFERENCES purgeevent ON DELETE CASCADE, -- Purge event |
| 47 | @ orid INTEGER, -- Original RID before purged |
| 48 | @ uuid TEXT NOT NULL, -- SHA1 hash of the purged artifact |
| 49 | @ srcid INTEGER, -- Basis purgeitem for delta compression |
| 50 | @ isPrivate BOOLEAN, -- True if artifact was originally private |
| 51 | @ sz INT NOT NULL, -- Uncompressed size of the purged artifact |
| 52 | @ desc TEXT, -- Brief description of this artifact |
| @@ -122,11 +122,11 @@ | |
| 122 | db_finalize(&q); |
| 123 | |
| 124 | /* Construct the graveyard and copy the artifacts to be purged into the |
| 125 | ** graveyard */ |
| 126 | if( moveToGraveyard ){ |
| 127 | db_multi_exec(zPurgeInit /*works-like:"%w%w"*/, |
| 128 | db_name("repository"), db_name("repository")); |
| 129 | db_multi_exec( |
| 130 | "INSERT INTO purgeevent(ctime,pnotes) VALUES(now(),%Q)", zNote |
| 131 | ); |
| 132 | peid = db_last_insert_rowid(); |
| @@ -193,11 +193,11 @@ | |
| 193 | db_end_transaction(0); |
| 194 | return peid; |
| 195 | } |
| 196 | |
| 197 | /* |
| 198 | ** The TEMP table named zTab contains RIDs for a set of check-ins. |
| 199 | ** |
| 200 | ** Check to see if any check-in in zTab is a baseline manifest for some |
| 201 | ** delta manifest that is not in zTab. Return true if zTab contains a |
| 202 | ** baseline for a delta that is not in zTab. |
| 203 | ** |
| @@ -275,11 +275,11 @@ | |
| 275 | " WHERE srcid IN \"%w_tags\"" |
| 276 | " AND rid NOT IN \"%w\")", |
| 277 | zTab, zTab, zTab |
| 278 | ); |
| 279 | } |
| 280 | |
| 281 | /* Transfer the extra artifacts into zTab */ |
| 282 | db_multi_exec( |
| 283 | "INSERT OR IGNORE INTO \"%w\" SELECT fid FROM \"%w_files\";" |
| 284 | "INSERT OR IGNORE INTO \"%w\" SELECT tid FROM \"%w_tags\";" |
| 285 | "DROP TABLE \"%w_files\";" |
| @@ -377,11 +377,11 @@ | |
| 377 | if( bag_find(&busy, iSrc) ){ |
| 378 | fossil_fatal("delta loop while uncompressing purged artifacts"); |
| 379 | } |
| 380 | bag_insert(&busy, iSrc); |
| 381 | } |
| 382 | db_prepare(&q, |
| 383 | "SELECT uuid, data, isPrivate, ix.piid" |
| 384 | " FROM ix, purgeitem" |
| 385 | " WHERE ix.srcid=%d" |
| 386 | " AND ix.piid=purgeitem.piid;", |
| 387 | iSrc |
| @@ -436,11 +436,11 @@ | |
| 436 | ** standard output. |
| 437 | ** |
| 438 | ** fossil purge ?checkins? TAGS... ?OPTIONS? |
| 439 | ** |
| 440 | ** Move the check-ins identified by TAGS and all of their descendants |
| 441 | ** out of the repository and into the graveyard. The "checkins" |
| 442 | ** subcommand keyword is option and can be omitted as long as TAGS |
| 443 | ** does not conflict with any other subcommand. |
| 444 | ** |
| 445 | ** If a TAGS includes a branch name then it means all the check-ins |
| 446 | ** on the most recent occurrance of that branch. |
| 447 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -28,25 +28,25 @@ | |
| 28 | ** |
| 29 | ** The purgeevent table contains one entry for each purge event. For each |
| 30 | ** purge event, multiple artifacts might have been removed. Each removed |
| 31 | ** artifact is stored as an entry in the purgeitem table. |
| 32 | ** |
| 33 | ** The purgeevent and purgeitem tables are not synced, even by the |
| 34 | ** "fossil config" command. They exist only as a backup in case of a |
| 35 | ** mistaken purge or for content recovery in case there is a bug in the |
| 36 | ** purge command. |
| 37 | */ |
| 38 | static const char zPurgeInit[] = |
| 39 | @ CREATE TABLE IF NOT EXISTS "%w".purgeevent( |
| 40 | @ peid INTEGER PRIMARY KEY, -- Unique ID for the purge event |
| 41 | @ ctime DATETIME, -- When purge occurred. Seconds since 1970. |
| 42 | @ pnotes TEXT -- Human-readable notes about the purge event |
| 43 | @ ); |
| 44 | @ CREATE TABLE IF NOT EXISTS "%w".purgeitem( |
| 45 | @ piid INTEGER PRIMARY KEY, -- ID for the purge item |
| 46 | @ peid INTEGER REFERENCES purgeevent ON DELETE CASCADE, -- Purge event |
| 47 | @ orid INTEGER, -- Original RID before purged |
| 48 | @ uuid TEXT NOT NULL, -- SHA1 hash of the purged artifact |
| 49 | @ srcid INTEGER, -- Basis purgeitem for delta compression |
| 50 | @ isPrivate BOOLEAN, -- True if artifact was originally private |
| 51 | @ sz INT NOT NULL, -- Uncompressed size of the purged artifact |
| 52 | @ desc TEXT, -- Brief description of this artifact |
| @@ -122,11 +122,11 @@ | |
| 122 | db_finalize(&q); |
| 123 | |
| 124 | /* Construct the graveyard and copy the artifacts to be purged into the |
| 125 | ** graveyard */ |
| 126 | if( moveToGraveyard ){ |
| 127 | db_multi_exec(zPurgeInit /*works-like:"%w%w"*/, |
| 128 | db_name("repository"), db_name("repository")); |
| 129 | db_multi_exec( |
| 130 | "INSERT INTO purgeevent(ctime,pnotes) VALUES(now(),%Q)", zNote |
| 131 | ); |
| 132 | peid = db_last_insert_rowid(); |
| @@ -193,11 +193,11 @@ | |
| 193 | db_end_transaction(0); |
| 194 | return peid; |
| 195 | } |
| 196 | |
| 197 | /* |
| 198 | ** The TEMP table named zTab contains RIDs for a set of check-ins. |
| 199 | ** |
| 200 | ** Check to see if any check-in in zTab is a baseline manifest for some |
| 201 | ** delta manifest that is not in zTab. Return true if zTab contains a |
| 202 | ** baseline for a delta that is not in zTab. |
| 203 | ** |
| @@ -275,11 +275,11 @@ | |
| 275 | " WHERE srcid IN \"%w_tags\"" |
| 276 | " AND rid NOT IN \"%w\")", |
| 277 | zTab, zTab, zTab |
| 278 | ); |
| 279 | } |
| 280 | |
| 281 | /* Transfer the extra artifacts into zTab */ |
| 282 | db_multi_exec( |
| 283 | "INSERT OR IGNORE INTO \"%w\" SELECT fid FROM \"%w_files\";" |
| 284 | "INSERT OR IGNORE INTO \"%w\" SELECT tid FROM \"%w_tags\";" |
| 285 | "DROP TABLE \"%w_files\";" |
| @@ -377,11 +377,11 @@ | |
| 377 | if( bag_find(&busy, iSrc) ){ |
| 378 | fossil_fatal("delta loop while uncompressing purged artifacts"); |
| 379 | } |
| 380 | bag_insert(&busy, iSrc); |
| 381 | } |
| 382 | db_prepare(&q, |
| 383 | "SELECT uuid, data, isPrivate, ix.piid" |
| 384 | " FROM ix, purgeitem" |
| 385 | " WHERE ix.srcid=%d" |
| 386 | " AND ix.piid=purgeitem.piid;", |
| 387 | iSrc |
| @@ -436,11 +436,11 @@ | |
| 436 | ** standard output. |
| 437 | ** |
| 438 | ** fossil purge ?checkins? TAGS... ?OPTIONS? |
| 439 | ** |
| 440 | ** Move the check-ins identified by TAGS and all of their descendants |
| 441 | ** out of the repository and into the graveyard. The "checkins" |
| 442 | ** subcommand keyword is option and can be omitted as long as TAGS |
| 443 | ** does not conflict with any other subcommand. |
| 444 | ** |
| 445 | ** If a TAGS includes a branch name then it means all the check-ins |
| 446 | ** on the most recent occurrance of that branch. |
| 447 |
+3
-3
| --- src/search.c | ||
| +++ src/search.c | ||
| @@ -729,11 +729,11 @@ | ||
| 729 | 729 | |
| 730 | 730 | /* |
| 731 | 731 | ** Number of significant bits in a u32 |
| 732 | 732 | */ |
| 733 | 733 | static int nbits(u32 x){ |
| 734 | - int n = 0; | |
| 734 | + int n = 0; | |
| 735 | 735 | while( x ){ n++; x >>= 1; } |
| 736 | 736 | return n; |
| 737 | 737 | } |
| 738 | 738 | |
| 739 | 739 | /* |
| @@ -1251,11 +1251,11 @@ | ||
| 1251 | 1251 | } |
| 1252 | 1252 | } |
| 1253 | 1253 | } |
| 1254 | 1254 | |
| 1255 | 1255 | /* |
| 1256 | -** This routine is a wrapper around search_stext(). | |
| 1256 | +** This routine is a wrapper around search_stext(). | |
| 1257 | 1257 | ** |
| 1258 | 1258 | ** This routine looks up the search text, stores it in an internal |
| 1259 | 1259 | ** buffer, and returns a pointer to the text. Subsequent requests |
| 1260 | 1260 | ** for the same document return the same pointer. The returned pointer |
| 1261 | 1261 | ** is valid until the next invocation of this routine. Call this routine |
| @@ -1693,11 +1693,11 @@ | ||
| 1693 | 1693 | } |
| 1694 | 1694 | if( iCmd==5 ){ |
| 1695 | 1695 | if( g.argc<4 ) usage("porter ON/OFF"); |
| 1696 | 1696 | db_set_int("search-stemmer", is_truth(g.argv[3]), 0); |
| 1697 | 1697 | } |
| 1698 | - | |
| 1698 | + | |
| 1699 | 1699 | |
| 1700 | 1700 | /* destroy or rebuild the index, if requested */ |
| 1701 | 1701 | if( iAction>=1 ){ |
| 1702 | 1702 | search_drop_index(); |
| 1703 | 1703 | } |
| 1704 | 1704 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -729,11 +729,11 @@ | |
| 729 | |
| 730 | /* |
| 731 | ** Number of significant bits in a u32 |
| 732 | */ |
| 733 | static int nbits(u32 x){ |
| 734 | int n = 0; |
| 735 | while( x ){ n++; x >>= 1; } |
| 736 | return n; |
| 737 | } |
| 738 | |
| 739 | /* |
| @@ -1251,11 +1251,11 @@ | |
| 1251 | } |
| 1252 | } |
| 1253 | } |
| 1254 | |
| 1255 | /* |
| 1256 | ** This routine is a wrapper around search_stext(). |
| 1257 | ** |
| 1258 | ** This routine looks up the search text, stores it in an internal |
| 1259 | ** buffer, and returns a pointer to the text. Subsequent requests |
| 1260 | ** for the same document return the same pointer. The returned pointer |
| 1261 | ** is valid until the next invocation of this routine. Call this routine |
| @@ -1693,11 +1693,11 @@ | |
| 1693 | } |
| 1694 | if( iCmd==5 ){ |
| 1695 | if( g.argc<4 ) usage("porter ON/OFF"); |
| 1696 | db_set_int("search-stemmer", is_truth(g.argv[3]), 0); |
| 1697 | } |
| 1698 | |
| 1699 | |
| 1700 | /* destroy or rebuild the index, if requested */ |
| 1701 | if( iAction>=1 ){ |
| 1702 | search_drop_index(); |
| 1703 | } |
| 1704 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -729,11 +729,11 @@ | |
| 729 | |
| 730 | /* |
| 731 | ** Number of significant bits in a u32 |
| 732 | */ |
| 733 | static int nbits(u32 x){ |
| 734 | int n = 0; |
| 735 | while( x ){ n++; x >>= 1; } |
| 736 | return n; |
| 737 | } |
| 738 | |
| 739 | /* |
| @@ -1251,11 +1251,11 @@ | |
| 1251 | } |
| 1252 | } |
| 1253 | } |
| 1254 | |
| 1255 | /* |
| 1256 | ** This routine is a wrapper around search_stext(). |
| 1257 | ** |
| 1258 | ** This routine looks up the search text, stores it in an internal |
| 1259 | ** buffer, and returns a pointer to the text. Subsequent requests |
| 1260 | ** for the same document return the same pointer. The returned pointer |
| 1261 | ** is valid until the next invocation of this routine. Call this routine |
| @@ -1693,11 +1693,11 @@ | |
| 1693 | } |
| 1694 | if( iCmd==5 ){ |
| 1695 | if( g.argc<4 ) usage("porter ON/OFF"); |
| 1696 | db_set_int("search-stemmer", is_truth(g.argv[3]), 0); |
| 1697 | } |
| 1698 | |
| 1699 | |
| 1700 | /* destroy or rebuild the index, if requested */ |
| 1701 | if( iAction>=1 ){ |
| 1702 | search_drop_index(); |
| 1703 | } |
| 1704 |
+1
-1
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -823,11 +823,11 @@ | ||
| 823 | 823 | @ white-space: nowrap; |
| 824 | 824 | }, |
| 825 | 825 | { "ul.browser li.file", |
| 826 | 826 | "List element in the 'flat-view' file browser for a file", |
| 827 | 827 | " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP" |
| 828 | - "\\/\\/\\/yEhIf\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfm" | |
| 828 | + "\\/\\/\\/yEhIf\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfm" | |
| 829 | 829 | "gOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);\n" |
| 830 | 830 | " background-repeat: no-repeat;\n" |
| 831 | 831 | " background-position: 0px center;\n" |
| 832 | 832 | " padding-left: 20px;\n" |
| 833 | 833 | " padding-top: 2px;\n" |
| 834 | 834 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -823,11 +823,11 @@ | |
| 823 | @ white-space: nowrap; |
| 824 | }, |
| 825 | { "ul.browser li.file", |
| 826 | "List element in the 'flat-view' file browser for a file", |
| 827 | " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP" |
| 828 | "\\/\\/\\/yEhIf\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfm" |
| 829 | "gOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);\n" |
| 830 | " background-repeat: no-repeat;\n" |
| 831 | " background-position: 0px center;\n" |
| 832 | " padding-left: 20px;\n" |
| 833 | " padding-top: 2px;\n" |
| 834 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -823,11 +823,11 @@ | |
| 823 | @ white-space: nowrap; |
| 824 | }, |
| 825 | { "ul.browser li.file", |
| 826 | "List element in the 'flat-view' file browser for a file", |
| 827 | " background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP" |
| 828 | "\\/\\/\\/yEhIf\\/\\/\\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfm" |
| 829 | "gOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);\n" |
| 830 | " background-repeat: no-repeat;\n" |
| 831 | " background-position: 0px center;\n" |
| 832 | " padding-left: 20px;\n" |
| 833 | " padding-top: 2px;\n" |
| 834 |