Fossil SCM
In the /uvlist upload process, use %h instead of %s to render the newly-uploaded file's name.
Commit
d1b0ccf1571158dd66e0481b1e77015321c96135e1528a76a312cccc0a129776
Parent
2d4fd55fee5c4a1…
1 file changed
+2
-2
+2
-2
| --- src/unversioned.c | ||
| +++ src/unversioned.c | ||
| @@ -548,21 +548,21 @@ | ||
| 548 | 548 | zError = "be an empty string"; |
| 549 | 549 | }else if( contains_whitespace(zName) ){ |
| 550 | 550 | zError = "contain spaces"; |
| 551 | 551 | } |
| 552 | 552 | if( zError ){ |
| 553 | - fossil_fatal("Unversioned filenames may not %s: %Q", | |
| 553 | + fossil_fatal("Unversioned filenames may not %s: %h", | |
| 554 | 554 | zError, zName); |
| 555 | 555 | } |
| 556 | 556 | unversioned_schema(); |
| 557 | 557 | db_begin_transaction(); |
| 558 | 558 | content_rcvid_init("#!fossil /uvlist upload"); |
| 559 | 559 | blob_init(&content, aContent, nContent); |
| 560 | 560 | unversioned_write(zName, &content, time(0)); |
| 561 | 561 | blob_reset(&content); |
| 562 | 562 | db_end_transaction(0); |
| 563 | - CX("<div>Added: %s</div>", zName); | |
| 563 | + CX("<div>Added: %h</div>", zName); | |
| 564 | 564 | } |
| 565 | 565 | form_begin("enctype='multipart/form-data'", "%R/uvlist"); |
| 566 | 566 | CX("<label for='uvupload'>Upload unversioned file:</label>"); |
| 567 | 567 | CX("<input type='file' id='uvupload' name='f'/>"); |
| 568 | 568 | CX("<input type='submit' value='Upload'/>"); |
| 569 | 569 |
| --- src/unversioned.c | |
| +++ src/unversioned.c | |
| @@ -548,21 +548,21 @@ | |
| 548 | zError = "be an empty string"; |
| 549 | }else if( contains_whitespace(zName) ){ |
| 550 | zError = "contain spaces"; |
| 551 | } |
| 552 | if( zError ){ |
| 553 | fossil_fatal("Unversioned filenames may not %s: %Q", |
| 554 | zError, zName); |
| 555 | } |
| 556 | unversioned_schema(); |
| 557 | db_begin_transaction(); |
| 558 | content_rcvid_init("#!fossil /uvlist upload"); |
| 559 | blob_init(&content, aContent, nContent); |
| 560 | unversioned_write(zName, &content, time(0)); |
| 561 | blob_reset(&content); |
| 562 | db_end_transaction(0); |
| 563 | CX("<div>Added: %s</div>", zName); |
| 564 | } |
| 565 | form_begin("enctype='multipart/form-data'", "%R/uvlist"); |
| 566 | CX("<label for='uvupload'>Upload unversioned file:</label>"); |
| 567 | CX("<input type='file' id='uvupload' name='f'/>"); |
| 568 | CX("<input type='submit' value='Upload'/>"); |
| 569 |
| --- src/unversioned.c | |
| +++ src/unversioned.c | |
| @@ -548,21 +548,21 @@ | |
| 548 | zError = "be an empty string"; |
| 549 | }else if( contains_whitespace(zName) ){ |
| 550 | zError = "contain spaces"; |
| 551 | } |
| 552 | if( zError ){ |
| 553 | fossil_fatal("Unversioned filenames may not %s: %h", |
| 554 | zError, zName); |
| 555 | } |
| 556 | unversioned_schema(); |
| 557 | db_begin_transaction(); |
| 558 | content_rcvid_init("#!fossil /uvlist upload"); |
| 559 | blob_init(&content, aContent, nContent); |
| 560 | unversioned_write(zName, &content, time(0)); |
| 561 | blob_reset(&content); |
| 562 | db_end_transaction(0); |
| 563 | CX("<div>Added: %h</div>", zName); |
| 564 | } |
| 565 | form_begin("enctype='multipart/form-data'", "%R/uvlist"); |
| 566 | CX("<label for='uvupload'>Upload unversioned file:</label>"); |
| 567 | CX("<input type='file' id='uvupload' name='f'/>"); |
| 568 | CX("<input type='submit' value='Upload'/>"); |
| 569 |