Fossil SCM
Remove dead code and fix a comment - issues found while looking for an unrelated problem.
Commit
d4125d551e6669ff2a760389ac9d183726f47cde
Parent
f44a3f70beee4be…
2 files changed
-30
+1
-1
-30
| --- src/content.c | ||
| +++ src/content.c | ||
| @@ -280,40 +280,10 @@ | ||
| 280 | 280 | bag_insert(&contentCache.available, rid); |
| 281 | 281 | } |
| 282 | 282 | return rc; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | -/* | |
| 286 | -** Get the contents of a file within a given baseline. | |
| 287 | -*/ | |
| 288 | -int content_get_historical_file( | |
| 289 | - const char *revision, /* Name of the baseline containing the file */ | |
| 290 | - const char *file, /* Name of the file */ | |
| 291 | - Blob *content /* Write file content here */ | |
| 292 | -){ | |
| 293 | - Blob mfile; | |
| 294 | - Manifest m; | |
| 295 | - int i, rid=0; | |
| 296 | - | |
| 297 | - rid = name_to_rid(revision); | |
| 298 | - content_get(rid, &mfile); | |
| 299 | - | |
| 300 | - if( manifest_parse(&m, &mfile) ){ | |
| 301 | - for(i=0; i<m.nFile; i++){ | |
| 302 | - if( strcmp(m.aFile[i].zName, file)==0 ){ | |
| 303 | - rid = uuid_to_rid(m.aFile[i].zUuid, 0); | |
| 304 | - return content_get(rid, content); | |
| 305 | - } | |
| 306 | - } | |
| 307 | - fossil_panic("file: %s does not exist in revision: %s", file, revision); | |
| 308 | - }else{ | |
| 309 | - fossil_panic("could not parse manifest for revision: %s", revision); | |
| 310 | - } | |
| 311 | - | |
| 312 | - return 0; | |
| 313 | -} | |
| 314 | - | |
| 315 | 285 | /* |
| 316 | 286 | ** COMMAND: artifact |
| 317 | 287 | ** |
| 318 | 288 | ** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME? |
| 319 | 289 | ** |
| 320 | 290 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -280,40 +280,10 @@ | |
| 280 | bag_insert(&contentCache.available, rid); |
| 281 | } |
| 282 | return rc; |
| 283 | } |
| 284 | |
| 285 | /* |
| 286 | ** Get the contents of a file within a given baseline. |
| 287 | */ |
| 288 | int content_get_historical_file( |
| 289 | const char *revision, /* Name of the baseline containing the file */ |
| 290 | const char *file, /* Name of the file */ |
| 291 | Blob *content /* Write file content here */ |
| 292 | ){ |
| 293 | Blob mfile; |
| 294 | Manifest m; |
| 295 | int i, rid=0; |
| 296 | |
| 297 | rid = name_to_rid(revision); |
| 298 | content_get(rid, &mfile); |
| 299 | |
| 300 | if( manifest_parse(&m, &mfile) ){ |
| 301 | for(i=0; i<m.nFile; i++){ |
| 302 | if( strcmp(m.aFile[i].zName, file)==0 ){ |
| 303 | rid = uuid_to_rid(m.aFile[i].zUuid, 0); |
| 304 | return content_get(rid, content); |
| 305 | } |
| 306 | } |
| 307 | fossil_panic("file: %s does not exist in revision: %s", file, revision); |
| 308 | }else{ |
| 309 | fossil_panic("could not parse manifest for revision: %s", revision); |
| 310 | } |
| 311 | |
| 312 | return 0; |
| 313 | } |
| 314 | |
| 315 | /* |
| 316 | ** COMMAND: artifact |
| 317 | ** |
| 318 | ** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME? |
| 319 | ** |
| 320 |
| --- src/content.c | |
| +++ src/content.c | |
| @@ -280,40 +280,10 @@ | |
| 280 | bag_insert(&contentCache.available, rid); |
| 281 | } |
| 282 | return rc; |
| 283 | } |
| 284 | |
| 285 | /* |
| 286 | ** COMMAND: artifact |
| 287 | ** |
| 288 | ** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME? |
| 289 | ** |
| 290 |
+1
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1093,11 +1093,11 @@ | ||
| 1093 | 1093 | /* |
| 1094 | 1094 | ** WEBPAGE: info |
| 1095 | 1095 | ** URL: info/ARTIFACTID |
| 1096 | 1096 | ** |
| 1097 | 1097 | ** The argument is a artifact ID which might be a baseline or a file or |
| 1098 | -** a ticket changes or a wiki editor or something else. | |
| 1098 | +** a ticket changes or a wiki edit or something else. | |
| 1099 | 1099 | ** |
| 1100 | 1100 | ** Figure out what the artifact ID is and jump to it. |
| 1101 | 1101 | */ |
| 1102 | 1102 | void info_page(void){ |
| 1103 | 1103 | const char *zName; |
| 1104 | 1104 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1093,11 +1093,11 @@ | |
| 1093 | /* |
| 1094 | ** WEBPAGE: info |
| 1095 | ** URL: info/ARTIFACTID |
| 1096 | ** |
| 1097 | ** The argument is a artifact ID which might be a baseline or a file or |
| 1098 | ** a ticket changes or a wiki editor or something else. |
| 1099 | ** |
| 1100 | ** Figure out what the artifact ID is and jump to it. |
| 1101 | */ |
| 1102 | void info_page(void){ |
| 1103 | const char *zName; |
| 1104 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1093,11 +1093,11 @@ | |
| 1093 | /* |
| 1094 | ** WEBPAGE: info |
| 1095 | ** URL: info/ARTIFACTID |
| 1096 | ** |
| 1097 | ** The argument is a artifact ID which might be a baseline or a file or |
| 1098 | ** a ticket changes or a wiki edit or something else. |
| 1099 | ** |
| 1100 | ** Figure out what the artifact ID is and jump to it. |
| 1101 | */ |
| 1102 | void info_page(void){ |
| 1103 | const char *zName; |
| 1104 |