Fossil SCM
Change references to "SHA1 hash" in comments and UI labels to be "artifact hash" or similar.
Commit
b9a1a3b9d80b034c1c92b5e1a68829c2bfe62ad2
Parent
3259aa5421f85fc…
19 files changed
+1
-1
+2
-2
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
+1
-1
+1
-1
+2
-2
+6
-6
+2
-2
+1
-1
+1
-1
+1
-2
+2
-2
+1
-1
+2
-2
+1
-1
| --- src/browse.c | ||
| +++ src/browse.c | ||
| @@ -315,11 +315,11 @@ | ||
| 315 | 315 | FileTreeNode *pSibling; /* Next element in the same subdirectory */ |
| 316 | 316 | FileTreeNode *pChild; /* List of child nodes */ |
| 317 | 317 | FileTreeNode *pLastChild; /* Last child on the pChild list */ |
| 318 | 318 | char *zName; /* Name of this entry. The "tail" */ |
| 319 | 319 | char *zFullName; /* Full pathname of this entry */ |
| 320 | - char *zUuid; /* SHA1 hash of this file. May be NULL. */ | |
| 320 | + char *zUuid; /* Artifact hash of this file. May be NULL. */ | |
| 321 | 321 | double mtime; /* Modification time for this entry */ |
| 322 | 322 | unsigned nFullName; /* Length of zFullName */ |
| 323 | 323 | unsigned iLevel; /* Levels of parent directories */ |
| 324 | 324 | }; |
| 325 | 325 | |
| 326 | 326 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -315,11 +315,11 @@ | |
| 315 | FileTreeNode *pSibling; /* Next element in the same subdirectory */ |
| 316 | FileTreeNode *pChild; /* List of child nodes */ |
| 317 | FileTreeNode *pLastChild; /* Last child on the pChild list */ |
| 318 | char *zName; /* Name of this entry. The "tail" */ |
| 319 | char *zFullName; /* Full pathname of this entry */ |
| 320 | char *zUuid; /* SHA1 hash of this file. May be NULL. */ |
| 321 | double mtime; /* Modification time for this entry */ |
| 322 | unsigned nFullName; /* Length of zFullName */ |
| 323 | unsigned iLevel; /* Levels of parent directories */ |
| 324 | }; |
| 325 | |
| 326 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -315,11 +315,11 @@ | |
| 315 | FileTreeNode *pSibling; /* Next element in the same subdirectory */ |
| 316 | FileTreeNode *pChild; /* List of child nodes */ |
| 317 | FileTreeNode *pLastChild; /* Last child on the pChild list */ |
| 318 | char *zName; /* Name of this entry. The "tail" */ |
| 319 | char *zFullName; /* Full pathname of this entry */ |
| 320 | char *zUuid; /* Artifact hash of this file. May be NULL. */ |
| 321 | double mtime; /* Modification time for this entry */ |
| 322 | unsigned nFullName; /* Length of zFullName */ |
| 323 | unsigned iLevel; /* Levels of parent directories */ |
| 324 | }; |
| 325 | |
| 326 |
+2
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -377,11 +377,11 @@ | ||
| 377 | 377 | ** As a special case, the --no-merge option does not inhibit this default. |
| 378 | 378 | ** This default shows exactly the set of changes that would be checked |
| 379 | 379 | ** in by the commit command. |
| 380 | 380 | ** |
| 381 | 381 | ** If no filter options are used, or if the --merge option is used, the |
| 382 | -** SHA1 hash of each merge contributor check-in version is displayed at | |
| 382 | +** artifact hash of each merge contributor check-in version is displayed at | |
| 383 | 383 | ** the end of the report. The --no-merge option is useful to display the |
| 384 | 384 | ** default set of changed files without the merge contributors. |
| 385 | 385 | ** |
| 386 | 386 | ** If change type classification is enabled, each output line starts with |
| 387 | 387 | ** a code describing the file's change type, e.g. EDITED or RENAMED. It |
| @@ -2033,11 +2033,11 @@ | ||
| 2033 | 2033 | int nvid; /* Blob-id of the new check-in */ |
| 2034 | 2034 | Blob comment; /* Check-in comment */ |
| 2035 | 2035 | const char *zComment; /* Check-in comment */ |
| 2036 | 2036 | Stmt q; /* Various queries */ |
| 2037 | 2037 | char *zUuid; /* UUID of the new check-in */ |
| 2038 | - int useHash = 0; /* True to verify file status using SHA1 hashing */ | |
| 2038 | + int useHash = 0; /* True to verify file status using hashing */ | |
| 2039 | 2039 | int noSign = 0; /* True to omit signing the manifest using GPG */ |
| 2040 | 2040 | int isAMerge = 0; /* True if checking in a merge */ |
| 2041 | 2041 | int noWarningFlag = 0; /* True if skipping all warnings */ |
| 2042 | 2042 | int noPrompt = 0; /* True if skipping all prompts */ |
| 2043 | 2043 | int forceFlag = 0; /* Undocumented: Disables all checks */ |
| 2044 | 2044 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -377,11 +377,11 @@ | |
| 377 | ** As a special case, the --no-merge option does not inhibit this default. |
| 378 | ** This default shows exactly the set of changes that would be checked |
| 379 | ** in by the commit command. |
| 380 | ** |
| 381 | ** If no filter options are used, or if the --merge option is used, the |
| 382 | ** SHA1 hash of each merge contributor check-in version is displayed at |
| 383 | ** the end of the report. The --no-merge option is useful to display the |
| 384 | ** default set of changed files without the merge contributors. |
| 385 | ** |
| 386 | ** If change type classification is enabled, each output line starts with |
| 387 | ** a code describing the file's change type, e.g. EDITED or RENAMED. It |
| @@ -2033,11 +2033,11 @@ | |
| 2033 | int nvid; /* Blob-id of the new check-in */ |
| 2034 | Blob comment; /* Check-in comment */ |
| 2035 | const char *zComment; /* Check-in comment */ |
| 2036 | Stmt q; /* Various queries */ |
| 2037 | char *zUuid; /* UUID of the new check-in */ |
| 2038 | int useHash = 0; /* True to verify file status using SHA1 hashing */ |
| 2039 | int noSign = 0; /* True to omit signing the manifest using GPG */ |
| 2040 | int isAMerge = 0; /* True if checking in a merge */ |
| 2041 | int noWarningFlag = 0; /* True if skipping all warnings */ |
| 2042 | int noPrompt = 0; /* True if skipping all prompts */ |
| 2043 | int forceFlag = 0; /* Undocumented: Disables all checks */ |
| 2044 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -377,11 +377,11 @@ | |
| 377 | ** As a special case, the --no-merge option does not inhibit this default. |
| 378 | ** This default shows exactly the set of changes that would be checked |
| 379 | ** in by the commit command. |
| 380 | ** |
| 381 | ** If no filter options are used, or if the --merge option is used, the |
| 382 | ** artifact hash of each merge contributor check-in version is displayed at |
| 383 | ** the end of the report. The --no-merge option is useful to display the |
| 384 | ** default set of changed files without the merge contributors. |
| 385 | ** |
| 386 | ** If change type classification is enabled, each output line starts with |
| 387 | ** a code describing the file's change type, e.g. EDITED or RENAMED. It |
| @@ -2033,11 +2033,11 @@ | |
| 2033 | int nvid; /* Blob-id of the new check-in */ |
| 2034 | Blob comment; /* Check-in comment */ |
| 2035 | const char *zComment; /* Check-in comment */ |
| 2036 | Stmt q; /* Various queries */ |
| 2037 | char *zUuid; /* UUID of the new check-in */ |
| 2038 | int useHash = 0; /* True to verify file status using hashing */ |
| 2039 | int noSign = 0; /* True to omit signing the manifest using GPG */ |
| 2040 | int isAMerge = 0; /* True if checking in a merge */ |
| 2041 | int noWarningFlag = 0; /* True if skipping all warnings */ |
| 2042 | int noPrompt = 0; /* True if skipping all prompts */ |
| 2043 | int forceFlag = 0; /* Undocumented: Disables all checks */ |
| 2044 |
+2
-2
| --- src/content.c | ||
| +++ src/content.c | ||
| @@ -312,11 +312,11 @@ | ||
| 312 | 312 | /* |
| 313 | 313 | ** COMMAND: artifact* |
| 314 | 314 | ** |
| 315 | 315 | ** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME? ?OPTIONS? |
| 316 | 316 | ** |
| 317 | -** Extract an artifact by its SHA1 hash and write the results on | |
| 317 | +** Extract an artifact by its artifact hash and write the results on | |
| 318 | 318 | ** standard output, or if the optional 4th argument is given, in |
| 319 | 319 | ** the named output file. |
| 320 | 320 | ** |
| 321 | 321 | ** Options: |
| 322 | 322 | ** -R|--repository FILE Extract artifacts from repository FILE |
| @@ -1163,11 +1163,11 @@ | ||
| 1163 | 1163 | ** |
| 1164 | 1164 | ** WARNING: You must run "fossil rebuild" after this command to rebuild |
| 1165 | 1165 | ** the metadata. |
| 1166 | 1166 | ** |
| 1167 | 1167 | ** Note that the arguments are the integer raw RID values from the BLOB table, |
| 1168 | -** not SHA1 hashs or labels. | |
| 1168 | +** not artifact hashs or labels. | |
| 1169 | 1169 | */ |
| 1170 | 1170 | void test_content_erase(void){ |
| 1171 | 1171 | int i; |
| 1172 | 1172 | Blob x; |
| 1173 | 1173 | char c; |
| 1174 | 1174 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -312,11 +312,11 @@ | |
| 312 | /* |
| 313 | ** COMMAND: artifact* |
| 314 | ** |
| 315 | ** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME? ?OPTIONS? |
| 316 | ** |
| 317 | ** Extract an artifact by its SHA1 hash and write the results on |
| 318 | ** standard output, or if the optional 4th argument is given, in |
| 319 | ** the named output file. |
| 320 | ** |
| 321 | ** Options: |
| 322 | ** -R|--repository FILE Extract artifacts from repository FILE |
| @@ -1163,11 +1163,11 @@ | |
| 1163 | ** |
| 1164 | ** WARNING: You must run "fossil rebuild" after this command to rebuild |
| 1165 | ** the metadata. |
| 1166 | ** |
| 1167 | ** Note that the arguments are the integer raw RID values from the BLOB table, |
| 1168 | ** not SHA1 hashs or labels. |
| 1169 | */ |
| 1170 | void test_content_erase(void){ |
| 1171 | int i; |
| 1172 | Blob x; |
| 1173 | char c; |
| 1174 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -312,11 +312,11 @@ | |
| 312 | /* |
| 313 | ** COMMAND: artifact* |
| 314 | ** |
| 315 | ** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME? ?OPTIONS? |
| 316 | ** |
| 317 | ** Extract an artifact by its artifact hash and write the results on |
| 318 | ** standard output, or if the optional 4th argument is given, in |
| 319 | ** the named output file. |
| 320 | ** |
| 321 | ** Options: |
| 322 | ** -R|--repository FILE Extract artifacts from repository FILE |
| @@ -1163,11 +1163,11 @@ | |
| 1163 | ** |
| 1164 | ** WARNING: You must run "fossil rebuild" after this command to rebuild |
| 1165 | ** the metadata. |
| 1166 | ** |
| 1167 | ** Note that the arguments are the integer raw RID values from the BLOB table, |
| 1168 | ** not artifact hashs or labels. |
| 1169 | */ |
| 1170 | void test_content_erase(void){ |
| 1171 | int i; |
| 1172 | Blob x; |
| 1173 | char c; |
| 1174 |
M
src/db.c
+1
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -2074,11 +2074,11 @@ | ||
| 2074 | 2074 | ** If zContent is already a well-formed artifact hash, then return a copy |
| 2075 | 2075 | ** of that hash, not a hash of the hash. |
| 2076 | 2076 | ** |
| 2077 | 2077 | ** The CONCEALED table is meant to obscure email addresses. Every valid |
| 2078 | 2078 | ** email address will contain a "@" character and "@" is not valid within |
| 2079 | -** an SHA1 hash so there is no chance that a valid email address will go | |
| 2079 | +** a SHA1 hash so there is no chance that a valid email address will go | |
| 2080 | 2080 | ** unconcealed. |
| 2081 | 2081 | */ |
| 2082 | 2082 | char *db_conceal(const char *zContent, int n){ |
| 2083 | 2083 | static char zHash[HNAME_MAX+1]; |
| 2084 | 2084 | Blob out; |
| 2085 | 2085 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2074,11 +2074,11 @@ | |
| 2074 | ** If zContent is already a well-formed artifact hash, then return a copy |
| 2075 | ** of that hash, not a hash of the hash. |
| 2076 | ** |
| 2077 | ** The CONCEALED table is meant to obscure email addresses. Every valid |
| 2078 | ** email address will contain a "@" character and "@" is not valid within |
| 2079 | ** an SHA1 hash so there is no chance that a valid email address will go |
| 2080 | ** unconcealed. |
| 2081 | */ |
| 2082 | char *db_conceal(const char *zContent, int n){ |
| 2083 | static char zHash[HNAME_MAX+1]; |
| 2084 | Blob out; |
| 2085 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -2074,11 +2074,11 @@ | |
| 2074 | ** If zContent is already a well-formed artifact hash, then return a copy |
| 2075 | ** of that hash, not a hash of the hash. |
| 2076 | ** |
| 2077 | ** The CONCEALED table is meant to obscure email addresses. Every valid |
| 2078 | ** email address will contain a "@" character and "@" is not valid within |
| 2079 | ** a SHA1 hash so there is no chance that a valid email address will go |
| 2080 | ** unconcealed. |
| 2081 | */ |
| 2082 | char *db_conceal(const char *zContent, int n){ |
| 2083 | static char zHash[HNAME_MAX+1]; |
| 2084 | Blob out; |
| 2085 |
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2278,11 +2278,11 @@ | ||
| 2278 | 2278 | ** URL: /annotate?checkin=ID&filename=FILENAME |
| 2279 | 2279 | ** URL: /blame?checkin=ID&filename=FILENAME |
| 2280 | 2280 | ** URL: /praise?checkin=ID&filename=FILENAME |
| 2281 | 2281 | ** |
| 2282 | 2282 | ** Show the most recent change to each line of a text file. /annotate shows |
| 2283 | -** the date of the changes and the check-in SHA1 hash (with a link to the | |
| 2283 | +** the date of the changes and the check-in hash (with a link to the | |
| 2284 | 2284 | ** check-in). /blame and /praise also show the user who made the check-in. |
| 2285 | 2285 | ** |
| 2286 | 2286 | ** Query parameters: |
| 2287 | 2287 | ** |
| 2288 | 2288 | ** checkin=ID The manifest ID at which to start the annotation |
| 2289 | 2289 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2278,11 +2278,11 @@ | |
| 2278 | ** URL: /annotate?checkin=ID&filename=FILENAME |
| 2279 | ** URL: /blame?checkin=ID&filename=FILENAME |
| 2280 | ** URL: /praise?checkin=ID&filename=FILENAME |
| 2281 | ** |
| 2282 | ** Show the most recent change to each line of a text file. /annotate shows |
| 2283 | ** the date of the changes and the check-in SHA1 hash (with a link to the |
| 2284 | ** check-in). /blame and /praise also show the user who made the check-in. |
| 2285 | ** |
| 2286 | ** Query parameters: |
| 2287 | ** |
| 2288 | ** checkin=ID The manifest ID at which to start the annotation |
| 2289 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2278,11 +2278,11 @@ | |
| 2278 | ** URL: /annotate?checkin=ID&filename=FILENAME |
| 2279 | ** URL: /blame?checkin=ID&filename=FILENAME |
| 2280 | ** URL: /praise?checkin=ID&filename=FILENAME |
| 2281 | ** |
| 2282 | ** Show the most recent change to each line of a text file. /annotate shows |
| 2283 | ** the date of the changes and the check-in hash (with a link to the |
| 2284 | ** check-in). /blame and /praise also show the user who made the check-in. |
| 2285 | ** |
| 2286 | ** Query parameters: |
| 2287 | ** |
| 2288 | ** checkin=ID The manifest ID at which to start the annotation |
| 2289 |
+1
-1
| --- src/doc.c | ||
| +++ src/doc.c | ||
| @@ -527,11 +527,11 @@ | ||
| 527 | 527 | ** WEBPAGE: uv |
| 528 | 528 | ** WEBPAGE: doc |
| 529 | 529 | ** URL: /uv/FILE |
| 530 | 530 | ** URL: /doc/CHECKIN/FILE |
| 531 | 531 | ** |
| 532 | -** CHECKIN can be either tag or SHA1 hash or timestamp identifying a | |
| 532 | +** CHECKIN can be either tag or hash prefix or timestamp identifying a | |
| 533 | 533 | ** particular check, or the name of a branch (meaning the most recent |
| 534 | 534 | ** check-in on that branch) or one of various magic words: |
| 535 | 535 | ** |
| 536 | 536 | ** "tip" means the most recent check-in |
| 537 | 537 | ** |
| 538 | 538 |
| --- src/doc.c | |
| +++ src/doc.c | |
| @@ -527,11 +527,11 @@ | |
| 527 | ** WEBPAGE: uv |
| 528 | ** WEBPAGE: doc |
| 529 | ** URL: /uv/FILE |
| 530 | ** URL: /doc/CHECKIN/FILE |
| 531 | ** |
| 532 | ** CHECKIN can be either tag or SHA1 hash or timestamp identifying a |
| 533 | ** particular check, or the name of a branch (meaning the most recent |
| 534 | ** check-in on that branch) or one of various magic words: |
| 535 | ** |
| 536 | ** "tip" means the most recent check-in |
| 537 | ** |
| 538 |
| --- src/doc.c | |
| +++ src/doc.c | |
| @@ -527,11 +527,11 @@ | |
| 527 | ** WEBPAGE: uv |
| 528 | ** WEBPAGE: doc |
| 529 | ** URL: /uv/FILE |
| 530 | ** URL: /doc/CHECKIN/FILE |
| 531 | ** |
| 532 | ** CHECKIN can be either tag or hash prefix or timestamp identifying a |
| 533 | ** particular check, or the name of a branch (meaning the most recent |
| 534 | ** check-in on that branch) or one of various magic words: |
| 535 | ** |
| 536 | ** "tip" means the most recent check-in |
| 537 | ** |
| 538 |
+1
-1
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -261,11 +261,11 @@ | ||
| 261 | 261 | cur_tok = strtok(NULL, " \t"); |
| 262 | 262 | if( !cur_tok ){ |
| 263 | 263 | /* This mark was generated by an older version of Fossil and doesn't |
| 264 | 264 | ** include the mark name and uuid. create_mark() will name the new mark |
| 265 | 265 | ** exactly as it was when exported to git, so that we should have a |
| 266 | - ** valid mapping from git sha1<->mark name<->fossil sha1. */ | |
| 266 | + ** valid mapping from git hash<->mark name<->fossil hash. */ | |
| 267 | 267 | unsigned int mid; |
| 268 | 268 | if( type_=='c' ){ |
| 269 | 269 | mid = COMMITMARK(mark->rid); |
| 270 | 270 | } |
| 271 | 271 | else{ |
| 272 | 272 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -261,11 +261,11 @@ | |
| 261 | cur_tok = strtok(NULL, " \t"); |
| 262 | if( !cur_tok ){ |
| 263 | /* This mark was generated by an older version of Fossil and doesn't |
| 264 | ** include the mark name and uuid. create_mark() will name the new mark |
| 265 | ** exactly as it was when exported to git, so that we should have a |
| 266 | ** valid mapping from git sha1<->mark name<->fossil sha1. */ |
| 267 | unsigned int mid; |
| 268 | if( type_=='c' ){ |
| 269 | mid = COMMITMARK(mark->rid); |
| 270 | } |
| 271 | else{ |
| 272 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -261,11 +261,11 @@ | |
| 261 | cur_tok = strtok(NULL, " \t"); |
| 262 | if( !cur_tok ){ |
| 263 | /* This mark was generated by an older version of Fossil and doesn't |
| 264 | ** include the mark name and uuid. create_mark() will name the new mark |
| 265 | ** exactly as it was when exported to git, so that we should have a |
| 266 | ** valid mapping from git hash<->mark name<->fossil hash. */ |
| 267 | unsigned int mid; |
| 268 | if( type_=='c' ){ |
| 269 | mid = COMMITMARK(mark->rid); |
| 270 | } |
| 271 | else{ |
| 272 |
+2
-2
| --- src/foci.c | ||
| +++ src/foci.c | ||
| @@ -28,11 +28,11 @@ | ||
| 28 | 28 | ** The "schema" for the temp.foci table is: |
| 29 | 29 | ** |
| 30 | 30 | ** CREATE TABLE files_of_checkin( |
| 31 | 31 | ** checkinID INTEGER, -- RID for the check-in manifest |
| 32 | 32 | ** filename TEXT, -- Name of a file |
| 33 | -** uuid TEXT, -- SHA1 hash of the file | |
| 33 | +** uuid TEXT, -- hash of the file | |
| 34 | 34 | ** previousName TEXT, -- Name of the file in previous check-in |
| 35 | 35 | ** perm TEXT, -- Permissions on the file |
| 36 | 36 | ** symname TEXT HIDDEN -- Symbolic name of the check-in. |
| 37 | 37 | ** ); |
| 38 | 38 | ** |
| @@ -54,11 +54,11 @@ | ||
| 54 | 54 | */ |
| 55 | 55 | static const char zFociSchema[] = |
| 56 | 56 | @ CREATE TABLE files_of_checkin( |
| 57 | 57 | @ checkinID INTEGER, -- RID for the check-in manifest |
| 58 | 58 | @ filename TEXT, -- Name of a file |
| 59 | -@ uuid TEXT, -- SHA1 hash of the file | |
| 59 | +@ uuid TEXT, -- hash of the file | |
| 60 | 60 | @ previousName TEXT, -- Name of the file in previous check-in |
| 61 | 61 | @ perm TEXT, -- Permissions on the file |
| 62 | 62 | @ symname TEXT HIDDEN -- Symbolic name of the check-in |
| 63 | 63 | @ ); |
| 64 | 64 | ; |
| 65 | 65 |
| --- src/foci.c | |
| +++ src/foci.c | |
| @@ -28,11 +28,11 @@ | |
| 28 | ** The "schema" for the temp.foci table is: |
| 29 | ** |
| 30 | ** CREATE TABLE files_of_checkin( |
| 31 | ** checkinID INTEGER, -- RID for the check-in manifest |
| 32 | ** filename TEXT, -- Name of a file |
| 33 | ** uuid TEXT, -- SHA1 hash of the file |
| 34 | ** previousName TEXT, -- Name of the file in previous check-in |
| 35 | ** perm TEXT, -- Permissions on the file |
| 36 | ** symname TEXT HIDDEN -- Symbolic name of the check-in. |
| 37 | ** ); |
| 38 | ** |
| @@ -54,11 +54,11 @@ | |
| 54 | */ |
| 55 | static const char zFociSchema[] = |
| 56 | @ CREATE TABLE files_of_checkin( |
| 57 | @ checkinID INTEGER, -- RID for the check-in manifest |
| 58 | @ filename TEXT, -- Name of a file |
| 59 | @ uuid TEXT, -- SHA1 hash of the file |
| 60 | @ previousName TEXT, -- Name of the file in previous check-in |
| 61 | @ perm TEXT, -- Permissions on the file |
| 62 | @ symname TEXT HIDDEN -- Symbolic name of the check-in |
| 63 | @ ); |
| 64 | ; |
| 65 |
| --- src/foci.c | |
| +++ src/foci.c | |
| @@ -28,11 +28,11 @@ | |
| 28 | ** The "schema" for the temp.foci table is: |
| 29 | ** |
| 30 | ** CREATE TABLE files_of_checkin( |
| 31 | ** checkinID INTEGER, -- RID for the check-in manifest |
| 32 | ** filename TEXT, -- Name of a file |
| 33 | ** uuid TEXT, -- hash of the file |
| 34 | ** previousName TEXT, -- Name of the file in previous check-in |
| 35 | ** perm TEXT, -- Permissions on the file |
| 36 | ** symname TEXT HIDDEN -- Symbolic name of the check-in. |
| 37 | ** ); |
| 38 | ** |
| @@ -54,11 +54,11 @@ | |
| 54 | */ |
| 55 | static const char zFociSchema[] = |
| 56 | @ CREATE TABLE files_of_checkin( |
| 57 | @ checkinID INTEGER, -- RID for the check-in manifest |
| 58 | @ filename TEXT, -- Name of a file |
| 59 | @ uuid TEXT, -- hash of the file |
| 60 | @ previousName TEXT, -- Name of the file in previous check-in |
| 61 | @ perm TEXT, -- Permissions on the file |
| 62 | @ symname TEXT HIDDEN -- Symbolic name of the check-in |
| 63 | @ ); |
| 64 | ; |
| 65 |
+1
-1
| --- src/fusefs.c | ||
| +++ src/fusefs.c | ||
| @@ -294,11 +294,11 @@ | ||
| 294 | 294 | ** This command uses the Fuse Filesystem (FuseFS) to mount a directory |
| 295 | 295 | ** at DIRECTORY that contains the content of all check-ins in the |
| 296 | 296 | ** repository. The names of files are DIRECTORY/checkins/VERSION/PATH |
| 297 | 297 | ** where DIRECTORY is the root of the mount, VERSION is any valid |
| 298 | 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 in | |
| 299 | +** prefix of an artifact hash, etc) and PATH is the pathname of the file in | |
| 300 | 300 | ** the check-in. If DIRECTORY does not exist, then an attempt is made |
| 301 | 301 | ** to create it. |
| 302 | 302 | ** |
| 303 | 303 | ** The DIRECTORY/checkins directory is not searchable so one cannot |
| 304 | 304 | ** do "ls DIRECTORY/checkins" to get a listing of all possible check-in |
| 305 | 305 |
| --- src/fusefs.c | |
| +++ src/fusefs.c | |
| @@ -294,11 +294,11 @@ | |
| 294 | ** This command uses the Fuse Filesystem (FuseFS) to mount a directory |
| 295 | ** at 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 in |
| 300 | ** the check-in. If DIRECTORY does not exist, then an attempt is made |
| 301 | ** to create it. |
| 302 | ** |
| 303 | ** The DIRECTORY/checkins directory is not searchable so one cannot |
| 304 | ** do "ls DIRECTORY/checkins" to get a listing of all possible check-in |
| 305 |
| --- src/fusefs.c | |
| +++ src/fusefs.c | |
| @@ -294,11 +294,11 @@ | |
| 294 | ** This command uses the Fuse Filesystem (FuseFS) to mount a directory |
| 295 | ** at 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 an artifact hash, etc) and PATH is the pathname of the file in |
| 300 | ** the check-in. If DIRECTORY does not exist, then an attempt is made |
| 301 | ** to create it. |
| 302 | ** |
| 303 | ** The DIRECTORY/checkins directory is not searchable so one cannot |
| 304 | ** do "ls DIRECTORY/checkins" to get a listing of all possible check-in |
| 305 |
+1
-1
| --- src/graph.c | ||
| +++ src/graph.c | ||
| @@ -179,11 +179,11 @@ | ||
| 179 | 179 | int rid, /* RID for the check-in */ |
| 180 | 180 | int nParent, /* Number of parents */ |
| 181 | 181 | int *aParent, /* Array of parents */ |
| 182 | 182 | const char *zBranch, /* Branch for this check-in */ |
| 183 | 183 | const char *zBgClr, /* Background color. NULL or "" for white. */ |
| 184 | - const char *zUuid, /* SHA1 hash of the object being graphed */ | |
| 184 | + const char *zUuid, /* hash name of the object being graphed */ | |
| 185 | 185 | int isLeaf /* True if this row is a leaf */ |
| 186 | 186 | ){ |
| 187 | 187 | GraphRow *pRow; |
| 188 | 188 | int nByte; |
| 189 | 189 | |
| 190 | 190 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | int rid, /* RID for the check-in */ |
| 180 | int nParent, /* Number of parents */ |
| 181 | int *aParent, /* Array of parents */ |
| 182 | const char *zBranch, /* Branch for this check-in */ |
| 183 | const char *zBgClr, /* Background color. NULL or "" for white. */ |
| 184 | const char *zUuid, /* SHA1 hash of the object being graphed */ |
| 185 | int isLeaf /* True if this row is a leaf */ |
| 186 | ){ |
| 187 | GraphRow *pRow; |
| 188 | int nByte; |
| 189 | |
| 190 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | int rid, /* RID for the check-in */ |
| 180 | int nParent, /* Number of parents */ |
| 181 | int *aParent, /* Array of parents */ |
| 182 | const char *zBranch, /* Branch for this check-in */ |
| 183 | const char *zBgClr, /* Background color. NULL or "" for white. */ |
| 184 | const char *zUuid, /* hash name of the object being graphed */ |
| 185 | int isLeaf /* True if this row is a leaf */ |
| 186 | ){ |
| 187 | GraphRow *pRow; |
| 188 | int nByte; |
| 189 | |
| 190 |
+2
-2
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -149,18 +149,18 @@ | ||
| 149 | 149 | ** UUID in gg.zPrevCheckin. |
| 150 | 150 | */ |
| 151 | 151 | static int fast_insert_content( |
| 152 | 152 | Blob *pContent, /* Content to insert */ |
| 153 | 153 | const char *zMark, /* Label using this mark, if not NULL */ |
| 154 | - int saveUuid, /* Save SHA1 hash in gg.zPrevCheckin */ | |
| 154 | + int saveUuid, /* Save artifact hash in gg.zPrevCheckin */ | |
| 155 | 155 | int doParse /* Invoke manifest_crosslink() */ |
| 156 | 156 | ){ |
| 157 | 157 | Blob hash; |
| 158 | 158 | Blob cmpr; |
| 159 | 159 | int rid; |
| 160 | 160 | |
| 161 | - sha1sum_blob(pContent, &hash); | |
| 161 | + hname_hash(pContent, 0, &hash); | |
| 162 | 162 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &hash); |
| 163 | 163 | if( rid==0 ){ |
| 164 | 164 | static Stmt ins; |
| 165 | 165 | db_static_prepare(&ins, |
| 166 | 166 | "INSERT INTO blob(uuid, size, content) VALUES(:uuid, :size, :content)" |
| 167 | 167 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -149,18 +149,18 @@ | |
| 149 | ** UUID in gg.zPrevCheckin. |
| 150 | */ |
| 151 | static int fast_insert_content( |
| 152 | Blob *pContent, /* Content to insert */ |
| 153 | const char *zMark, /* Label using this mark, if not NULL */ |
| 154 | int saveUuid, /* Save SHA1 hash in gg.zPrevCheckin */ |
| 155 | int doParse /* Invoke manifest_crosslink() */ |
| 156 | ){ |
| 157 | Blob hash; |
| 158 | Blob cmpr; |
| 159 | int rid; |
| 160 | |
| 161 | sha1sum_blob(pContent, &hash); |
| 162 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &hash); |
| 163 | if( rid==0 ){ |
| 164 | static Stmt ins; |
| 165 | db_static_prepare(&ins, |
| 166 | "INSERT INTO blob(uuid, size, content) VALUES(:uuid, :size, :content)" |
| 167 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -149,18 +149,18 @@ | |
| 149 | ** UUID in gg.zPrevCheckin. |
| 150 | */ |
| 151 | static int fast_insert_content( |
| 152 | Blob *pContent, /* Content to insert */ |
| 153 | const char *zMark, /* Label using this mark, if not NULL */ |
| 154 | int saveUuid, /* Save artifact hash in gg.zPrevCheckin */ |
| 155 | int doParse /* Invoke manifest_crosslink() */ |
| 156 | ){ |
| 157 | Blob hash; |
| 158 | Blob cmpr; |
| 159 | int rid; |
| 160 | |
| 161 | hname_hash(pContent, 0, &hash); |
| 162 | rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &hash); |
| 163 | if( rid==0 ){ |
| 164 | static Stmt ins; |
| 165 | db_static_prepare(&ins, |
| 166 | "INSERT INTO blob(uuid, size, content) VALUES(:uuid, :size, :content)" |
| 167 |
+6
-6
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -101,11 +101,11 @@ | ||
| 101 | 101 | ** If zType is "br" then find the first check-in of the named branch |
| 102 | 102 | ** rather than the last. |
| 103 | 103 | ** zType is "ci" in most use cases since we are usually searching for |
| 104 | 104 | ** a check-in. |
| 105 | 105 | ** |
| 106 | -** Note that the input zTag for types "t" and "e" is the SHA1 hash of | |
| 106 | +** Note that the input zTag for types "t" and "e" is the artifact hash of | |
| 107 | 107 | ** the ticket-change or event-change artifact, not the randomly generated |
| 108 | 108 | ** hexadecimal identifier assigned to tickets and events. Those identifiers |
| 109 | 109 | ** live in a separate namespace. |
| 110 | 110 | */ |
| 111 | 111 | int symbolic_name_to_rid(const char *zTag, const char *zType){ |
| @@ -740,11 +740,11 @@ | ||
| 740 | 740 | /* |
| 741 | 741 | ** COMMAND: test-ambiguous |
| 742 | 742 | ** |
| 743 | 743 | ** Usage: %fossil test-ambiguous [--minsize N] |
| 744 | 744 | ** |
| 745 | -** Show a list of ambiguous SHA1-hash abbreviations of N characters or | |
| 745 | +** Show a list of ambiguous artifact hash abbreviations of N characters or | |
| 746 | 746 | ** more where N defaults to 4. Change N to a different value using |
| 747 | 747 | ** the "--minsize N" command-line option. |
| 748 | 748 | */ |
| 749 | 749 | void test_ambiguous_cmd(void){ |
| 750 | 750 | Stmt q, ins; |
| @@ -790,11 +790,11 @@ | ||
| 790 | 790 | ** Schema for the description table |
| 791 | 791 | */ |
| 792 | 792 | static const char zDescTab[] = |
| 793 | 793 | @ CREATE TEMP TABLE IF NOT EXISTS description( |
| 794 | 794 | @ rid INTEGER PRIMARY KEY, -- RID of the object |
| 795 | -@ uuid TEXT, -- SHA1 hash of the object | |
| 795 | +@ uuid TEXT, -- hash of the object | |
| 796 | 796 | @ ctime DATETIME, -- Time of creation |
| 797 | 797 | @ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts |
| 798 | 798 | @ type TEXT, -- file, checkin, wiki, ticket, etc. |
| 799 | 799 | @ summary TEXT, -- Summary comment for the object |
| 800 | 800 | @ detail TEXT -- File name, check-in comment, etc |
| @@ -1080,11 +1080,11 @@ | ||
| 1080 | 1080 | " WHERE description.rid=blob.rid" |
| 1081 | 1081 | " ORDER BY length(content) DESC" |
| 1082 | 1082 | ); |
| 1083 | 1083 | @ <table cellpadding="2" cellspacing="0" border="1" id="bigblobtab"> |
| 1084 | 1084 | @ <thead><tr><th align="right">Size<th align="right">RID |
| 1085 | - @ <th align="right">Delta From<th>SHA1<th>Description<th>Date</tr></thead> | |
| 1085 | + @ <th align="right">Delta From<th>Hash<th>Description<th>Date</tr></thead> | |
| 1086 | 1086 | @ <tbody> |
| 1087 | 1087 | while( db_step(&q)==SQLITE_ROW ){ |
| 1088 | 1088 | int rid = db_column_int(&q,0); |
| 1089 | 1089 | const char *zUuid = db_column_text(&q, 1); |
| 1090 | 1090 | const char *zDesc = db_column_text(&q, 2); |
| @@ -1143,11 +1143,11 @@ | ||
| 1143 | 1143 | |
| 1144 | 1144 | /* Maximum number of collision examples to remember */ |
| 1145 | 1145 | #define MAX_COLLIDE 25 |
| 1146 | 1146 | |
| 1147 | 1147 | /* |
| 1148 | -** Generate a report on the number of collisions in SHA1 hashes | |
| 1148 | +** Generate a report on the number of collisions in artifact hashes | |
| 1149 | 1149 | ** generated by the SQL given in the argument. |
| 1150 | 1150 | */ |
| 1151 | 1151 | static void collision_report(const char *zSql){ |
| 1152 | 1152 | int i, j, kk; |
| 1153 | 1153 | int nHash = 0; |
| @@ -1215,11 +1215,11 @@ | ||
| 1215 | 1215 | ** Show the number of hash collisions for hash prefixes of various lengths. |
| 1216 | 1216 | */ |
| 1217 | 1217 | void hash_collisions_webpage(void){ |
| 1218 | 1218 | login_check_credentials(); |
| 1219 | 1219 | if( !g.perm.Read ){ login_needed(g.anon.Read); return; } |
| 1220 | - style_header("SHA1 Prefix Collisions"); | |
| 1220 | + style_header("Hash Prefix Collisions"); | |
| 1221 | 1221 | style_submenu_element("Activity Reports", "reports"); |
| 1222 | 1222 | style_submenu_element("Stats", "stat"); |
| 1223 | 1223 | @ <h1>Hash Prefix Collisions on Check-ins</h1> |
| 1224 | 1224 | collision_report("SELECT (SELECT uuid FROM blob WHERE rid=objid)" |
| 1225 | 1225 | " FROM event WHERE event.type='ci'" |
| 1226 | 1226 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -101,11 +101,11 @@ | |
| 101 | ** If zType is "br" then find the first check-in of the named branch |
| 102 | ** rather than the last. |
| 103 | ** zType is "ci" in most use cases since we are usually searching for |
| 104 | ** a check-in. |
| 105 | ** |
| 106 | ** Note that the input zTag for types "t" and "e" is the SHA1 hash of |
| 107 | ** the ticket-change or event-change artifact, not the randomly generated |
| 108 | ** hexadecimal identifier assigned to tickets and events. Those identifiers |
| 109 | ** live in a separate namespace. |
| 110 | */ |
| 111 | int symbolic_name_to_rid(const char *zTag, const char *zType){ |
| @@ -740,11 +740,11 @@ | |
| 740 | /* |
| 741 | ** COMMAND: test-ambiguous |
| 742 | ** |
| 743 | ** Usage: %fossil test-ambiguous [--minsize N] |
| 744 | ** |
| 745 | ** Show a list of ambiguous SHA1-hash abbreviations of N characters or |
| 746 | ** more where N defaults to 4. Change N to a different value using |
| 747 | ** the "--minsize N" command-line option. |
| 748 | */ |
| 749 | void test_ambiguous_cmd(void){ |
| 750 | Stmt q, ins; |
| @@ -790,11 +790,11 @@ | |
| 790 | ** Schema for the description table |
| 791 | */ |
| 792 | static const char zDescTab[] = |
| 793 | @ CREATE TEMP TABLE IF NOT EXISTS description( |
| 794 | @ rid INTEGER PRIMARY KEY, -- RID of the object |
| 795 | @ uuid TEXT, -- SHA1 hash of the object |
| 796 | @ ctime DATETIME, -- Time of creation |
| 797 | @ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts |
| 798 | @ type TEXT, -- file, checkin, wiki, ticket, etc. |
| 799 | @ summary TEXT, -- Summary comment for the object |
| 800 | @ detail TEXT -- File name, check-in comment, etc |
| @@ -1080,11 +1080,11 @@ | |
| 1080 | " WHERE description.rid=blob.rid" |
| 1081 | " ORDER BY length(content) DESC" |
| 1082 | ); |
| 1083 | @ <table cellpadding="2" cellspacing="0" border="1" id="bigblobtab"> |
| 1084 | @ <thead><tr><th align="right">Size<th align="right">RID |
| 1085 | @ <th align="right">Delta From<th>SHA1<th>Description<th>Date</tr></thead> |
| 1086 | @ <tbody> |
| 1087 | while( db_step(&q)==SQLITE_ROW ){ |
| 1088 | int rid = db_column_int(&q,0); |
| 1089 | const char *zUuid = db_column_text(&q, 1); |
| 1090 | const char *zDesc = db_column_text(&q, 2); |
| @@ -1143,11 +1143,11 @@ | |
| 1143 | |
| 1144 | /* Maximum number of collision examples to remember */ |
| 1145 | #define MAX_COLLIDE 25 |
| 1146 | |
| 1147 | /* |
| 1148 | ** Generate a report on the number of collisions in SHA1 hashes |
| 1149 | ** generated by the SQL given in the argument. |
| 1150 | */ |
| 1151 | static void collision_report(const char *zSql){ |
| 1152 | int i, j, kk; |
| 1153 | int nHash = 0; |
| @@ -1215,11 +1215,11 @@ | |
| 1215 | ** Show the number of hash collisions for hash prefixes of various lengths. |
| 1216 | */ |
| 1217 | void hash_collisions_webpage(void){ |
| 1218 | login_check_credentials(); |
| 1219 | if( !g.perm.Read ){ login_needed(g.anon.Read); return; } |
| 1220 | style_header("SHA1 Prefix Collisions"); |
| 1221 | style_submenu_element("Activity Reports", "reports"); |
| 1222 | style_submenu_element("Stats", "stat"); |
| 1223 | @ <h1>Hash Prefix Collisions on Check-ins</h1> |
| 1224 | collision_report("SELECT (SELECT uuid FROM blob WHERE rid=objid)" |
| 1225 | " FROM event WHERE event.type='ci'" |
| 1226 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -101,11 +101,11 @@ | |
| 101 | ** If zType is "br" then find the first check-in of the named branch |
| 102 | ** rather than the last. |
| 103 | ** zType is "ci" in most use cases since we are usually searching for |
| 104 | ** a check-in. |
| 105 | ** |
| 106 | ** Note that the input zTag for types "t" and "e" is the artifact hash of |
| 107 | ** the ticket-change or event-change artifact, not the randomly generated |
| 108 | ** hexadecimal identifier assigned to tickets and events. Those identifiers |
| 109 | ** live in a separate namespace. |
| 110 | */ |
| 111 | int symbolic_name_to_rid(const char *zTag, const char *zType){ |
| @@ -740,11 +740,11 @@ | |
| 740 | /* |
| 741 | ** COMMAND: test-ambiguous |
| 742 | ** |
| 743 | ** Usage: %fossil test-ambiguous [--minsize N] |
| 744 | ** |
| 745 | ** Show a list of ambiguous artifact hash abbreviations of N characters or |
| 746 | ** more where N defaults to 4. Change N to a different value using |
| 747 | ** the "--minsize N" command-line option. |
| 748 | */ |
| 749 | void test_ambiguous_cmd(void){ |
| 750 | Stmt q, ins; |
| @@ -790,11 +790,11 @@ | |
| 790 | ** Schema for the description table |
| 791 | */ |
| 792 | static const char zDescTab[] = |
| 793 | @ CREATE TEMP TABLE IF NOT EXISTS description( |
| 794 | @ rid INTEGER PRIMARY KEY, -- RID of the object |
| 795 | @ uuid TEXT, -- hash of the object |
| 796 | @ ctime DATETIME, -- Time of creation |
| 797 | @ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts |
| 798 | @ type TEXT, -- file, checkin, wiki, ticket, etc. |
| 799 | @ summary TEXT, -- Summary comment for the object |
| 800 | @ detail TEXT -- File name, check-in comment, etc |
| @@ -1080,11 +1080,11 @@ | |
| 1080 | " WHERE description.rid=blob.rid" |
| 1081 | " ORDER BY length(content) DESC" |
| 1082 | ); |
| 1083 | @ <table cellpadding="2" cellspacing="0" border="1" id="bigblobtab"> |
| 1084 | @ <thead><tr><th align="right">Size<th align="right">RID |
| 1085 | @ <th align="right">Delta From<th>Hash<th>Description<th>Date</tr></thead> |
| 1086 | @ <tbody> |
| 1087 | while( db_step(&q)==SQLITE_ROW ){ |
| 1088 | int rid = db_column_int(&q,0); |
| 1089 | const char *zUuid = db_column_text(&q, 1); |
| 1090 | const char *zDesc = db_column_text(&q, 2); |
| @@ -1143,11 +1143,11 @@ | |
| 1143 | |
| 1144 | /* Maximum number of collision examples to remember */ |
| 1145 | #define MAX_COLLIDE 25 |
| 1146 | |
| 1147 | /* |
| 1148 | ** Generate a report on the number of collisions in artifact hashes |
| 1149 | ** generated by the SQL given in the argument. |
| 1150 | */ |
| 1151 | static void collision_report(const char *zSql){ |
| 1152 | int i, j, kk; |
| 1153 | int nHash = 0; |
| @@ -1215,11 +1215,11 @@ | |
| 1215 | ** Show the number of hash collisions for hash prefixes of various lengths. |
| 1216 | */ |
| 1217 | void hash_collisions_webpage(void){ |
| 1218 | login_check_credentials(); |
| 1219 | if( !g.perm.Read ){ login_needed(g.anon.Read); return; } |
| 1220 | style_header("Hash Prefix Collisions"); |
| 1221 | style_submenu_element("Activity Reports", "reports"); |
| 1222 | style_submenu_element("Stats", "stat"); |
| 1223 | @ <h1>Hash Prefix Collisions on Check-ins</h1> |
| 1224 | collision_report("SELECT (SELECT uuid FROM blob WHERE rid=objid)" |
| 1225 | " FROM event WHERE event.type='ci'" |
| 1226 |
+2
-2
| --- src/printf.c | ||
| +++ src/printf.c | ||
| @@ -24,11 +24,11 @@ | ||
| 24 | 24 | # include <io.h> |
| 25 | 25 | # include <fcntl.h> |
| 26 | 26 | #endif |
| 27 | 27 | #include <time.h> |
| 28 | 28 | |
| 29 | -/* Two custom conversions are used to show a prefix of SHA1 hashes: | |
| 29 | +/* Two custom conversions are used to show a prefix of artifact hashes: | |
| 30 | 30 | ** |
| 31 | 31 | ** %!S Prefix of a length appropriate for URLs |
| 32 | 32 | ** %S Prefix of a length appropriate for human display |
| 33 | 33 | ** |
| 34 | 34 | ** The following macros help determine those lengths. FOSSIL_HASH_DIGITS |
| @@ -44,11 +44,11 @@ | ||
| 44 | 44 | #ifndef FOSSIL_HASH_DIGITS_URL |
| 45 | 45 | # define FOSSIL_HASH_DIGITS_URL 16 /* For %!S (embedded in URLs) */ |
| 46 | 46 | #endif |
| 47 | 47 | |
| 48 | 48 | /* |
| 49 | -** Return the number of SHA1 hash digits to display. The number is for | |
| 49 | +** Return the number of artifact hash digits to display. The number is for | |
| 50 | 50 | ** human output if the bForUrl is false and is destined for a URL if |
| 51 | 51 | ** bForUrl is false. |
| 52 | 52 | */ |
| 53 | 53 | static int hashDigits(int bForUrl){ |
| 54 | 54 | static int nDigitHuman = 0; |
| 55 | 55 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -24,11 +24,11 @@ | |
| 24 | # include <io.h> |
| 25 | # include <fcntl.h> |
| 26 | #endif |
| 27 | #include <time.h> |
| 28 | |
| 29 | /* Two custom conversions are used to show a prefix of SHA1 hashes: |
| 30 | ** |
| 31 | ** %!S Prefix of a length appropriate for URLs |
| 32 | ** %S Prefix of a length appropriate for human display |
| 33 | ** |
| 34 | ** The following macros help determine those lengths. FOSSIL_HASH_DIGITS |
| @@ -44,11 +44,11 @@ | |
| 44 | #ifndef FOSSIL_HASH_DIGITS_URL |
| 45 | # define FOSSIL_HASH_DIGITS_URL 16 /* For %!S (embedded in URLs) */ |
| 46 | #endif |
| 47 | |
| 48 | /* |
| 49 | ** Return the number of SHA1 hash digits to display. The number is for |
| 50 | ** human output if the bForUrl is false and is destined for a URL if |
| 51 | ** bForUrl is false. |
| 52 | */ |
| 53 | static int hashDigits(int bForUrl){ |
| 54 | static int nDigitHuman = 0; |
| 55 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -24,11 +24,11 @@ | |
| 24 | # include <io.h> |
| 25 | # include <fcntl.h> |
| 26 | #endif |
| 27 | #include <time.h> |
| 28 | |
| 29 | /* Two custom conversions are used to show a prefix of artifact hashes: |
| 30 | ** |
| 31 | ** %!S Prefix of a length appropriate for URLs |
| 32 | ** %S Prefix of a length appropriate for human display |
| 33 | ** |
| 34 | ** The following macros help determine those lengths. FOSSIL_HASH_DIGITS |
| @@ -44,11 +44,11 @@ | |
| 44 | #ifndef FOSSIL_HASH_DIGITS_URL |
| 45 | # define FOSSIL_HASH_DIGITS_URL 16 /* For %!S (embedded in URLs) */ |
| 46 | #endif |
| 47 | |
| 48 | /* |
| 49 | ** Return the number of artifact hash digits to display. The number is for |
| 50 | ** human output if the bForUrl is false and is destined for a URL if |
| 51 | ** bForUrl is false. |
| 52 | */ |
| 53 | static int hashDigits(int bForUrl){ |
| 54 | static int nDigitHuman = 0; |
| 55 |
+1
-1
| --- src/purge.c | ||
| +++ src/purge.c | ||
| @@ -43,11 +43,11 @@ | ||
| 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 | 47 | @ orid INTEGER, -- Original RID before purged |
| 48 | -@ uuid TEXT NOT NULL, -- SHA1 hash of the purged artifact | |
| 48 | +@ uuid TEXT NOT NULL, -- 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 |
| 53 | 53 | @ data BLOB -- Compressed artifact content |
| 54 | 54 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -43,11 +43,11 @@ | |
| 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 |
| 53 | @ data BLOB -- Compressed artifact content |
| 54 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -43,11 +43,11 @@ | |
| 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, -- 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 |
| 53 | @ data BLOB -- Compressed artifact content |
| 54 |
+1
-1
| --- src/shun.c | ||
| +++ src/shun.c | ||
| @@ -36,11 +36,11 @@ | ||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /* |
| 39 | 39 | ** WEBPAGE: shun |
| 40 | 40 | ** |
| 41 | -** View the SHA1 hashes of all shunned artifacts. Add new hashes | |
| 41 | +** View the hashes of all shunned artifacts. Add new hashes | |
| 42 | 42 | ** to the shun set. Requires Admin privilege. |
| 43 | 43 | */ |
| 44 | 44 | void shun_page(void){ |
| 45 | 45 | Stmt q; |
| 46 | 46 | int cnt = 0; |
| 47 | 47 |
| --- src/shun.c | |
| +++ src/shun.c | |
| @@ -36,11 +36,11 @@ | |
| 36 | } |
| 37 | |
| 38 | /* |
| 39 | ** WEBPAGE: shun |
| 40 | ** |
| 41 | ** View the SHA1 hashes of all shunned artifacts. Add new hashes |
| 42 | ** to the shun set. Requires Admin privilege. |
| 43 | */ |
| 44 | void shun_page(void){ |
| 45 | Stmt q; |
| 46 | int cnt = 0; |
| 47 |
| --- src/shun.c | |
| +++ src/shun.c | |
| @@ -36,11 +36,11 @@ | |
| 36 | } |
| 37 | |
| 38 | /* |
| 39 | ** WEBPAGE: shun |
| 40 | ** |
| 41 | ** View the hashes of all shunned artifacts. Add new hashes |
| 42 | ** to the shun set. Requires Admin privilege. |
| 43 | */ |
| 44 | void shun_page(void){ |
| 45 | Stmt q; |
| 46 | int cnt = 0; |
| 47 |
+1
-2
| --- src/sitemap.c | ||
| +++ src/sitemap.c | ||
| @@ -111,12 +111,11 @@ | ||
| 111 | 111 | } |
| 112 | 112 | @ <li>%z(href("%R/login"))Login/Logout/Change Password</a></li> |
| 113 | 113 | if( g.perm.Read ){ |
| 114 | 114 | @ <li>%z(href("%R/stat"))Repository Status</a> |
| 115 | 115 | @ <ul> |
| 116 | - @ <li>%z(href("%R/hash-collisions"))Collisions on SHA1 hash | |
| 117 | - @ prefixes</a></li> | |
| 116 | + @ <li>%z(href("%R/hash-collisions"))Collisions on hash prefixes</a></li> | |
| 118 | 117 | if( g.perm.Admin ){ |
| 119 | 118 | @ <li>%z(href("%R/urllist"))List of URLs used to access |
| 120 | 119 | @ this repository</a></li> |
| 121 | 120 | } |
| 122 | 121 | @ <li>%z(href("%R/bloblist"))List of Artifacts</a></li> |
| 123 | 122 |
| --- src/sitemap.c | |
| +++ src/sitemap.c | |
| @@ -111,12 +111,11 @@ | |
| 111 | } |
| 112 | @ <li>%z(href("%R/login"))Login/Logout/Change Password</a></li> |
| 113 | if( g.perm.Read ){ |
| 114 | @ <li>%z(href("%R/stat"))Repository Status</a> |
| 115 | @ <ul> |
| 116 | @ <li>%z(href("%R/hash-collisions"))Collisions on SHA1 hash |
| 117 | @ prefixes</a></li> |
| 118 | if( g.perm.Admin ){ |
| 119 | @ <li>%z(href("%R/urllist"))List of URLs used to access |
| 120 | @ this repository</a></li> |
| 121 | } |
| 122 | @ <li>%z(href("%R/bloblist"))List of Artifacts</a></li> |
| 123 |
| --- src/sitemap.c | |
| +++ src/sitemap.c | |
| @@ -111,12 +111,11 @@ | |
| 111 | } |
| 112 | @ <li>%z(href("%R/login"))Login/Logout/Change Password</a></li> |
| 113 | if( g.perm.Read ){ |
| 114 | @ <li>%z(href("%R/stat"))Repository Status</a> |
| 115 | @ <ul> |
| 116 | @ <li>%z(href("%R/hash-collisions"))Collisions on hash prefixes</a></li> |
| 117 | if( g.perm.Admin ){ |
| 118 | @ <li>%z(href("%R/urllist"))List of URLs used to access |
| 119 | @ this repository</a></li> |
| 120 | } |
| 121 | @ <li>%z(href("%R/bloblist"))List of Artifacts</a></li> |
| 122 |
+2
-2
| --- src/sqlcmd.c | ||
| +++ src/sqlcmd.c | ||
| @@ -185,12 +185,12 @@ | ||
| 185 | 185 | ** in ways that are unrecoverable. Be sure you know what you are doing before |
| 186 | 186 | ** running any SQL commands that modify the repository database. |
| 187 | 187 | ** |
| 188 | 188 | ** The following extensions to the usual SQLite commands are provided: |
| 189 | 189 | ** |
| 190 | -** content(X) Return the content of artifact X. X can be a | |
| 191 | -** SHA1 hash or prefix or a tag. | |
| 190 | +** content(X) Return the content of artifact X. X can be an | |
| 191 | +** artifact hash or prefix or a tag. | |
| 192 | 192 | ** |
| 193 | 193 | ** compress(X) Compress text X. |
| 194 | 194 | ** |
| 195 | 195 | ** decompress(X) Decompress text X. Undoes the work of |
| 196 | 196 | ** compress(X). |
| 197 | 197 |
| --- src/sqlcmd.c | |
| +++ src/sqlcmd.c | |
| @@ -185,12 +185,12 @@ | |
| 185 | ** in ways that are unrecoverable. Be sure you know what you are doing before |
| 186 | ** running any SQL commands that modify the repository database. |
| 187 | ** |
| 188 | ** The following extensions to the usual SQLite commands are provided: |
| 189 | ** |
| 190 | ** content(X) Return the content of artifact X. X can be a |
| 191 | ** SHA1 hash or prefix or a tag. |
| 192 | ** |
| 193 | ** compress(X) Compress text X. |
| 194 | ** |
| 195 | ** decompress(X) Decompress text X. Undoes the work of |
| 196 | ** compress(X). |
| 197 |
| --- src/sqlcmd.c | |
| +++ src/sqlcmd.c | |
| @@ -185,12 +185,12 @@ | |
| 185 | ** in ways that are unrecoverable. Be sure you know what you are doing before |
| 186 | ** running any SQL commands that modify the repository database. |
| 187 | ** |
| 188 | ** The following extensions to the usual SQLite commands are provided: |
| 189 | ** |
| 190 | ** content(X) Return the content of artifact X. X can be an |
| 191 | ** artifact hash or prefix or a tag. |
| 192 | ** |
| 193 | ** compress(X) Compress text X. |
| 194 | ** |
| 195 | ** decompress(X) Decompress text X. Undoes the work of |
| 196 | ** compress(X). |
| 197 |
+1
-1
| --- src/stat.c | ||
| +++ src/stat.c | ||
| @@ -76,11 +76,11 @@ | ||
| 76 | 76 | style_submenu_element("URLs", "urllist"); |
| 77 | 77 | style_submenu_element("Schema", "repo_schema"); |
| 78 | 78 | style_submenu_element("Web-Cache", "cachestat"); |
| 79 | 79 | } |
| 80 | 80 | style_submenu_element("Activity Reports", "reports"); |
| 81 | - style_submenu_element("SHA1 Collisions", "hash-collisions"); | |
| 81 | + style_submenu_element("Hash Collisions", "hash-collisions"); | |
| 82 | 82 | if( sqlite3_compileoption_used("ENABLE_DBSTAT_VTAB") ){ |
| 83 | 83 | style_submenu_element("Table Sizes", "repo-tabsize"); |
| 84 | 84 | } |
| 85 | 85 | if( g.perm.Admin || g.perm.Setup || db_get_boolean("test_env_enable",0) ){ |
| 86 | 86 | style_submenu_element("Environment", "test_env"); |
| 87 | 87 |
| --- src/stat.c | |
| +++ src/stat.c | |
| @@ -76,11 +76,11 @@ | |
| 76 | style_submenu_element("URLs", "urllist"); |
| 77 | style_submenu_element("Schema", "repo_schema"); |
| 78 | style_submenu_element("Web-Cache", "cachestat"); |
| 79 | } |
| 80 | style_submenu_element("Activity Reports", "reports"); |
| 81 | style_submenu_element("SHA1 Collisions", "hash-collisions"); |
| 82 | if( sqlite3_compileoption_used("ENABLE_DBSTAT_VTAB") ){ |
| 83 | style_submenu_element("Table Sizes", "repo-tabsize"); |
| 84 | } |
| 85 | if( g.perm.Admin || g.perm.Setup || db_get_boolean("test_env_enable",0) ){ |
| 86 | style_submenu_element("Environment", "test_env"); |
| 87 |
| --- src/stat.c | |
| +++ src/stat.c | |
| @@ -76,11 +76,11 @@ | |
| 76 | style_submenu_element("URLs", "urllist"); |
| 77 | style_submenu_element("Schema", "repo_schema"); |
| 78 | style_submenu_element("Web-Cache", "cachestat"); |
| 79 | } |
| 80 | style_submenu_element("Activity Reports", "reports"); |
| 81 | style_submenu_element("Hash Collisions", "hash-collisions"); |
| 82 | if( sqlite3_compileoption_used("ENABLE_DBSTAT_VTAB") ){ |
| 83 | style_submenu_element("Table Sizes", "repo-tabsize"); |
| 84 | } |
| 85 | if( g.perm.Admin || g.perm.Setup || db_get_boolean("test_env_enable",0) ){ |
| 86 | style_submenu_element("Environment", "test_env"); |
| 87 |
+2
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -723,11 +723,11 @@ | ||
| 723 | 723 | ** mi: "merge-in". An array of integer rail positions from which |
| 724 | 724 | ** merge arrows should be drawn into this node. If the value is |
| 725 | 725 | ** negative, then the rail position is the absolute value of mi[] |
| 726 | 726 | ** and a thin merge-arrow descender is drawn to the bottom of |
| 727 | 727 | ** the screen. |
| 728 | - ** h: The SHA1 hash of the object being graphed | |
| 728 | + ** h: The artifact hash of the object being graphed | |
| 729 | 729 | */ |
| 730 | 730 | cgi_printf("var rowinfo = [\n"); |
| 731 | 731 | for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){ |
| 732 | 732 | cgi_printf("{id:%d,bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,f:%d,au:", |
| 733 | 733 | pRow->idx, /* id */ |
| @@ -1461,11 +1461,11 @@ | ||
| 1461 | 1461 | ** v Show details of files changed |
| 1462 | 1462 | ** f=CHECKIN Show family (immediate parents and children) of CHECKIN |
| 1463 | 1463 | ** from=CHECKIN Path from... |
| 1464 | 1464 | ** to=CHECKIN ... to this |
| 1465 | 1465 | ** shortest ... show only the shortest path |
| 1466 | -** uf=FILE_SHA1 Show only check-ins that contain the given file version | |
| 1466 | +** uf=FILE_HASH Show only check-ins that contain the given file version | |
| 1467 | 1467 | ** chng=GLOBLIST Show only check-ins that involve changes to a file whose |
| 1468 | 1468 | ** name matches one of the comma-separate GLOBLIST |
| 1469 | 1469 | ** brbg Background color from branch name |
| 1470 | 1470 | ** ubg Background color from user |
| 1471 | 1471 | ** namechng Show only check-ins that have filename changes |
| 1472 | 1472 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -723,11 +723,11 @@ | |
| 723 | ** mi: "merge-in". An array of integer rail positions from which |
| 724 | ** merge arrows should be drawn into this node. If the value is |
| 725 | ** negative, then the rail position is the absolute value of mi[] |
| 726 | ** and a thin merge-arrow descender is drawn to the bottom of |
| 727 | ** the screen. |
| 728 | ** h: The SHA1 hash of the object being graphed |
| 729 | */ |
| 730 | cgi_printf("var rowinfo = [\n"); |
| 731 | for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){ |
| 732 | cgi_printf("{id:%d,bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,f:%d,au:", |
| 733 | pRow->idx, /* id */ |
| @@ -1461,11 +1461,11 @@ | |
| 1461 | ** v Show details of files changed |
| 1462 | ** f=CHECKIN Show family (immediate parents and children) of CHECKIN |
| 1463 | ** from=CHECKIN Path from... |
| 1464 | ** to=CHECKIN ... to this |
| 1465 | ** shortest ... show only the shortest path |
| 1466 | ** uf=FILE_SHA1 Show only check-ins that contain the given file version |
| 1467 | ** chng=GLOBLIST Show only check-ins that involve changes to a file whose |
| 1468 | ** name matches one of the comma-separate GLOBLIST |
| 1469 | ** brbg Background color from branch name |
| 1470 | ** ubg Background color from user |
| 1471 | ** namechng Show only check-ins that have filename changes |
| 1472 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -723,11 +723,11 @@ | |
| 723 | ** mi: "merge-in". An array of integer rail positions from which |
| 724 | ** merge arrows should be drawn into this node. If the value is |
| 725 | ** negative, then the rail position is the absolute value of mi[] |
| 726 | ** and a thin merge-arrow descender is drawn to the bottom of |
| 727 | ** the screen. |
| 728 | ** h: The artifact hash of the object being graphed |
| 729 | */ |
| 730 | cgi_printf("var rowinfo = [\n"); |
| 731 | for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){ |
| 732 | cgi_printf("{id:%d,bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,f:%d,au:", |
| 733 | pRow->idx, /* id */ |
| @@ -1461,11 +1461,11 @@ | |
| 1461 | ** v Show details of files changed |
| 1462 | ** f=CHECKIN Show family (immediate parents and children) of CHECKIN |
| 1463 | ** from=CHECKIN Path from... |
| 1464 | ** to=CHECKIN ... to this |
| 1465 | ** shortest ... show only the shortest path |
| 1466 | ** uf=FILE_HASH Show only check-ins that contain the given file version |
| 1467 | ** chng=GLOBLIST Show only check-ins that involve changes to a file whose |
| 1468 | ** name matches one of the comma-separate GLOBLIST |
| 1469 | ** brbg Background color from branch name |
| 1470 | ** ubg Background color from user |
| 1471 | ** namechng Show only check-ins that have filename changes |
| 1472 |