Fossil SCM
File Browser: use wording 'file at check-in' to denote file version and 'known file' to denote a name of a managed file.
Commit
6fd34c57747279f83314ef9b2d9289ec5e0e8930d195588e810bdd4abaf6c485
Parent
78d52675c519a02…
2 files changed
+3
-3
+4
-4
+3
-3
| --- src/browse.c | ||
| +++ src/browse.c | ||
| @@ -198,11 +198,11 @@ | ||
| 198 | 198 | } |
| 199 | 199 | if( linkTip ){ |
| 200 | 200 | style_submenu_element("Tip", "%s", url_render(&sURI, "ci", "tip", 0, 0)); |
| 201 | 201 | } |
| 202 | 202 | if( zCI ){ |
| 203 | - @ <h2>Files of check-in [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>] | |
| 203 | + @ <h2>Files at check-in [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>] | |
| 204 | 204 | @ %s(blob_str(&dirname)) |
| 205 | 205 | if( zD ){ |
| 206 | 206 | @ %z(href("%R/timeline?chng=%T/*", zD))[history]</a> |
| 207 | 207 | } |
| 208 | 208 | @ </h2> |
| @@ -209,11 +209,11 @@ | ||
| 209 | 209 | zSubdirLink = mprintf("%R/dir?ci=%!S&name=%T", zUuid, zPrefix); |
| 210 | 210 | if( nD==0 ){ |
| 211 | 211 | style_submenu_element("File Ages", "%R/fileage?name=%!S", zUuid); |
| 212 | 212 | } |
| 213 | 213 | }else{ |
| 214 | - @ <h2>The union of all files from all check-ins | |
| 214 | + @ <h2>All files known in the repository | |
| 215 | 215 | @ %s(blob_str(&dirname)) |
| 216 | 216 | if( zD ){ |
| 217 | 217 | @ %z(href("%R/timeline?chng=%T/*", zD))[history]</a> |
| 218 | 218 | } |
| 219 | 219 | @ </h2> |
| @@ -787,11 +787,11 @@ | ||
| 787 | 787 | } |
| 788 | 788 | |
| 789 | 789 | style_submenu_checkbox("nofiles", "Folders Only", 0, 0); |
| 790 | 790 | |
| 791 | 791 | if( zCI ){ |
| 792 | - @ <h2>%s(zObjType) of check-in | |
| 792 | + @ <h2>%s(zObjType) at check-in | |
| 793 | 793 | if( sqlite3_strnicmp(zCI, zUuid, (int)strlen(zCI))!=0 ){ |
| 794 | 794 | @ "%h(zCI)" |
| 795 | 795 | } |
| 796 | 796 | @ [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>] %s(blob_str(&dirname)) |
| 797 | 797 | }else{ |
| 798 | 798 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -198,11 +198,11 @@ | |
| 198 | } |
| 199 | if( linkTip ){ |
| 200 | style_submenu_element("Tip", "%s", url_render(&sURI, "ci", "tip", 0, 0)); |
| 201 | } |
| 202 | if( zCI ){ |
| 203 | @ <h2>Files of check-in [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>] |
| 204 | @ %s(blob_str(&dirname)) |
| 205 | if( zD ){ |
| 206 | @ %z(href("%R/timeline?chng=%T/*", zD))[history]</a> |
| 207 | } |
| 208 | @ </h2> |
| @@ -209,11 +209,11 @@ | |
| 209 | zSubdirLink = mprintf("%R/dir?ci=%!S&name=%T", zUuid, zPrefix); |
| 210 | if( nD==0 ){ |
| 211 | style_submenu_element("File Ages", "%R/fileage?name=%!S", zUuid); |
| 212 | } |
| 213 | }else{ |
| 214 | @ <h2>The union of all files from all check-ins |
| 215 | @ %s(blob_str(&dirname)) |
| 216 | if( zD ){ |
| 217 | @ %z(href("%R/timeline?chng=%T/*", zD))[history]</a> |
| 218 | } |
| 219 | @ </h2> |
| @@ -787,11 +787,11 @@ | |
| 787 | } |
| 788 | |
| 789 | style_submenu_checkbox("nofiles", "Folders Only", 0, 0); |
| 790 | |
| 791 | if( zCI ){ |
| 792 | @ <h2>%s(zObjType) of check-in |
| 793 | if( sqlite3_strnicmp(zCI, zUuid, (int)strlen(zCI))!=0 ){ |
| 794 | @ "%h(zCI)" |
| 795 | } |
| 796 | @ [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>] %s(blob_str(&dirname)) |
| 797 | }else{ |
| 798 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -198,11 +198,11 @@ | |
| 198 | } |
| 199 | if( linkTip ){ |
| 200 | style_submenu_element("Tip", "%s", url_render(&sURI, "ci", "tip", 0, 0)); |
| 201 | } |
| 202 | if( zCI ){ |
| 203 | @ <h2>Files at check-in [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>] |
| 204 | @ %s(blob_str(&dirname)) |
| 205 | if( zD ){ |
| 206 | @ %z(href("%R/timeline?chng=%T/*", zD))[history]</a> |
| 207 | } |
| 208 | @ </h2> |
| @@ -209,11 +209,11 @@ | |
| 209 | zSubdirLink = mprintf("%R/dir?ci=%!S&name=%T", zUuid, zPrefix); |
| 210 | if( nD==0 ){ |
| 211 | style_submenu_element("File Ages", "%R/fileage?name=%!S", zUuid); |
| 212 | } |
| 213 | }else{ |
| 214 | @ <h2>All files known in the repository |
| 215 | @ %s(blob_str(&dirname)) |
| 216 | if( zD ){ |
| 217 | @ %z(href("%R/timeline?chng=%T/*", zD))[history]</a> |
| 218 | } |
| 219 | @ </h2> |
| @@ -787,11 +787,11 @@ | |
| 787 | } |
| 788 | |
| 789 | style_submenu_checkbox("nofiles", "Folders Only", 0, 0); |
| 790 | |
| 791 | if( zCI ){ |
| 792 | @ <h2>%s(zObjType) at check-in |
| 793 | if( sqlite3_strnicmp(zCI, zUuid, (int)strlen(zCI))!=0 ){ |
| 794 | @ "%h(zCI)" |
| 795 | } |
| 796 | @ [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>] %s(blob_str(&dirname)) |
| 797 | }else{ |
| 798 |
+4
-4
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2201,15 +2201,15 @@ | ||
| 2201 | 2201 | }else{ |
| 2202 | 2202 | zHeader = mprintf("No such file at [%S]", zCIUuid); |
| 2203 | 2203 | } |
| 2204 | 2204 | style_header("%s", zHeader); |
| 2205 | 2205 | fossil_free(zHeader); |
| 2206 | - @ File %z(href("%R/finfo?name=%T",zName))%h(zName)</a> does not exist | |
| 2207 | - @ in check-in [%z(href("/info/%!S",zCIUuid))%S(zCIUuid)</a>]. | |
| 2206 | + @ File %z(href("%R/finfo?name=%T",zName))%h(zName)</a> is not known | |
| 2207 | + @ at check-in [%z(href("/info/%!S",zCIUuid))%S(zCIUuid)</a>]. | |
| 2208 | 2208 | }else{ |
| 2209 | 2209 | style_header("No such file"); |
| 2210 | - @ File '%h(zName)' does not exist in this repository. | |
| 2210 | + @ File '%h(zName)' is not known in this repository. | |
| 2211 | 2211 | } |
| 2212 | 2212 | style_footer(); |
| 2213 | 2213 | return; |
| 2214 | 2214 | } |
| 2215 | 2215 | }else{ |
| @@ -2234,11 +2234,11 @@ | ||
| 2234 | 2234 | const char *zPath; |
| 2235 | 2235 | Blob path; |
| 2236 | 2236 | blob_zero(&path); |
| 2237 | 2237 | hyperlinked_path(zName, &path, zCI, "dir", ""); |
| 2238 | 2238 | zPath = blob_str(&path); |
| 2239 | - @ <h2>File %s(zPath) of check-in [%z(href("/info/%!S",zCIUuid))%S(zCIUuid)</a>] | |
| 2239 | + @ <h2>File %s(zPath) at check-in [%z(href("/info/%!S",zCIUuid))%S(zCIUuid)</a>] | |
| 2240 | 2240 | @ </h2> |
| 2241 | 2241 | blob_reset(&path); |
| 2242 | 2242 | }else{ |
| 2243 | 2243 | @ <h2>Latest version of file '%h(zName)':</h2> |
| 2244 | 2244 | } |
| 2245 | 2245 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2201,15 +2201,15 @@ | |
| 2201 | }else{ |
| 2202 | zHeader = mprintf("No such file at [%S]", zCIUuid); |
| 2203 | } |
| 2204 | style_header("%s", zHeader); |
| 2205 | fossil_free(zHeader); |
| 2206 | @ File %z(href("%R/finfo?name=%T",zName))%h(zName)</a> does not exist |
| 2207 | @ in check-in [%z(href("/info/%!S",zCIUuid))%S(zCIUuid)</a>]. |
| 2208 | }else{ |
| 2209 | style_header("No such file"); |
| 2210 | @ File '%h(zName)' does not exist in this repository. |
| 2211 | } |
| 2212 | style_footer(); |
| 2213 | return; |
| 2214 | } |
| 2215 | }else{ |
| @@ -2234,11 +2234,11 @@ | |
| 2234 | const char *zPath; |
| 2235 | Blob path; |
| 2236 | blob_zero(&path); |
| 2237 | hyperlinked_path(zName, &path, zCI, "dir", ""); |
| 2238 | zPath = blob_str(&path); |
| 2239 | @ <h2>File %s(zPath) of check-in [%z(href("/info/%!S",zCIUuid))%S(zCIUuid)</a>] |
| 2240 | @ </h2> |
| 2241 | blob_reset(&path); |
| 2242 | }else{ |
| 2243 | @ <h2>Latest version of file '%h(zName)':</h2> |
| 2244 | } |
| 2245 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2201,15 +2201,15 @@ | |
| 2201 | }else{ |
| 2202 | zHeader = mprintf("No such file at [%S]", zCIUuid); |
| 2203 | } |
| 2204 | style_header("%s", zHeader); |
| 2205 | fossil_free(zHeader); |
| 2206 | @ File %z(href("%R/finfo?name=%T",zName))%h(zName)</a> is not known |
| 2207 | @ at check-in [%z(href("/info/%!S",zCIUuid))%S(zCIUuid)</a>]. |
| 2208 | }else{ |
| 2209 | style_header("No such file"); |
| 2210 | @ File '%h(zName)' is not known in this repository. |
| 2211 | } |
| 2212 | style_footer(); |
| 2213 | return; |
| 2214 | } |
| 2215 | }else{ |
| @@ -2234,11 +2234,11 @@ | |
| 2234 | const char *zPath; |
| 2235 | Blob path; |
| 2236 | blob_zero(&path); |
| 2237 | hyperlinked_path(zName, &path, zCI, "dir", ""); |
| 2238 | zPath = blob_str(&path); |
| 2239 | @ <h2>File %s(zPath) at check-in [%z(href("/info/%!S",zCIUuid))%S(zCIUuid)</a>] |
| 2240 | @ </h2> |
| 2241 | blob_reset(&path); |
| 2242 | }else{ |
| 2243 | @ <h2>Latest version of file '%h(zName)':</h2> |
| 2244 | } |
| 2245 |