Fossil SCM
Enable processing of versioned manifest setting when creating zips and tarballs outside of an open checkout directory
Commit
da23bec78094a90b9b7653599aaf5c081327221d7d5d3a88eda0ebfa158d00e3
Parent
b9de60427ad9321…
3 files changed
+2
-1
+2
-1
+4
+2
-1
| --- src/tar.c | ||
| +++ src/tar.c | ||
| @@ -616,10 +616,11 @@ | ||
| 616 | 616 | verify_all_options(); |
| 617 | 617 | |
| 618 | 618 | if( g.argc!=4 ){ |
| 619 | 619 | usage("VERSION OUTPUTFILE"); |
| 620 | 620 | } |
| 621 | + g.zOpenRevision = g.argv[2]; | |
| 621 | 622 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 622 | 623 | if( rid==0 ){ |
| 623 | 624 | fossil_fatal("Check-in not found: %s", g.argv[2]); |
| 624 | 625 | return; |
| 625 | 626 | } |
| @@ -689,11 +690,11 @@ | ||
| 689 | 690 | zName = mprintf("%s", PD("name","")); |
| 690 | 691 | nName = strlen(zName); |
| 691 | 692 | z = P("r"); |
| 692 | 693 | if( z==0 ) z = P("uuid"); |
| 693 | 694 | if( z==0 ) z = "trunk"; |
| 694 | - zRid = fossil_strdup(z); | |
| 695 | + g.zOpenRevision = zRid = fossil_strdup(z); | |
| 695 | 696 | nRid = strlen(zRid); |
| 696 | 697 | zInclude = P("in"); |
| 697 | 698 | if( zInclude ) pInclude = glob_create(zInclude); |
| 698 | 699 | zExclude = P("ex"); |
| 699 | 700 | if( zExclude ) pExclude = glob_create(zExclude); |
| 700 | 701 |
| --- src/tar.c | |
| +++ src/tar.c | |
| @@ -616,10 +616,11 @@ | |
| 616 | verify_all_options(); |
| 617 | |
| 618 | if( g.argc!=4 ){ |
| 619 | usage("VERSION OUTPUTFILE"); |
| 620 | } |
| 621 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 622 | if( rid==0 ){ |
| 623 | fossil_fatal("Check-in not found: %s", g.argv[2]); |
| 624 | return; |
| 625 | } |
| @@ -689,11 +690,11 @@ | |
| 689 | zName = mprintf("%s", PD("name","")); |
| 690 | nName = strlen(zName); |
| 691 | z = P("r"); |
| 692 | if( z==0 ) z = P("uuid"); |
| 693 | if( z==0 ) z = "trunk"; |
| 694 | zRid = fossil_strdup(z); |
| 695 | nRid = strlen(zRid); |
| 696 | zInclude = P("in"); |
| 697 | if( zInclude ) pInclude = glob_create(zInclude); |
| 698 | zExclude = P("ex"); |
| 699 | if( zExclude ) pExclude = glob_create(zExclude); |
| 700 |
| --- src/tar.c | |
| +++ src/tar.c | |
| @@ -616,10 +616,11 @@ | |
| 616 | verify_all_options(); |
| 617 | |
| 618 | if( g.argc!=4 ){ |
| 619 | usage("VERSION OUTPUTFILE"); |
| 620 | } |
| 621 | g.zOpenRevision = g.argv[2]; |
| 622 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 623 | if( rid==0 ){ |
| 624 | fossil_fatal("Check-in not found: %s", g.argv[2]); |
| 625 | return; |
| 626 | } |
| @@ -689,11 +690,11 @@ | |
| 690 | zName = mprintf("%s", PD("name","")); |
| 691 | nName = strlen(zName); |
| 692 | z = P("r"); |
| 693 | if( z==0 ) z = P("uuid"); |
| 694 | if( z==0 ) z = "trunk"; |
| 695 | g.zOpenRevision = zRid = fossil_strdup(z); |
| 696 | nRid = strlen(zRid); |
| 697 | zInclude = P("in"); |
| 698 | if( zInclude ) pInclude = glob_create(zInclude); |
| 699 | zExclude = P("ex"); |
| 700 | if( zExclude ) pExclude = glob_create(zExclude); |
| 701 |
+2
-1
| --- src/zip.c | ||
| +++ src/zip.c | ||
| @@ -466,10 +466,11 @@ | ||
| 466 | 466 | verify_all_options(); |
| 467 | 467 | |
| 468 | 468 | if( g.argc!=4 ){ |
| 469 | 469 | usage("VERSION OUTPUTFILE"); |
| 470 | 470 | } |
| 471 | + g.zOpenRevision = g.argv[2]; | |
| 471 | 472 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 472 | 473 | if( rid==0 ){ |
| 473 | 474 | fossil_fatal("Check-in not found: %s", g.argv[2]); |
| 474 | 475 | return; |
| 475 | 476 | } |
| @@ -539,11 +540,11 @@ | ||
| 539 | 540 | zName = mprintf("%s", PD("name","")); |
| 540 | 541 | nName = strlen(zName); |
| 541 | 542 | z = P("r"); |
| 542 | 543 | if( z==0 ) z = P("uuid"); |
| 543 | 544 | if( z==0 ) z = "trunk"; |
| 544 | - zRid = fossil_strdup(z); | |
| 545 | + g.zOpenRevision = zRid = fossil_strdup(z); | |
| 545 | 546 | nRid = strlen(zRid); |
| 546 | 547 | zInclude = P("in"); |
| 547 | 548 | if( zInclude ) pInclude = glob_create(zInclude); |
| 548 | 549 | zExclude = P("ex"); |
| 549 | 550 | if( zExclude ) pExclude = glob_create(zExclude); |
| 550 | 551 |
| --- src/zip.c | |
| +++ src/zip.c | |
| @@ -466,10 +466,11 @@ | |
| 466 | verify_all_options(); |
| 467 | |
| 468 | if( g.argc!=4 ){ |
| 469 | usage("VERSION OUTPUTFILE"); |
| 470 | } |
| 471 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 472 | if( rid==0 ){ |
| 473 | fossil_fatal("Check-in not found: %s", g.argv[2]); |
| 474 | return; |
| 475 | } |
| @@ -539,11 +540,11 @@ | |
| 539 | zName = mprintf("%s", PD("name","")); |
| 540 | nName = strlen(zName); |
| 541 | z = P("r"); |
| 542 | if( z==0 ) z = P("uuid"); |
| 543 | if( z==0 ) z = "trunk"; |
| 544 | zRid = fossil_strdup(z); |
| 545 | nRid = strlen(zRid); |
| 546 | zInclude = P("in"); |
| 547 | if( zInclude ) pInclude = glob_create(zInclude); |
| 548 | zExclude = P("ex"); |
| 549 | if( zExclude ) pExclude = glob_create(zExclude); |
| 550 |
| --- src/zip.c | |
| +++ src/zip.c | |
| @@ -466,10 +466,11 @@ | |
| 466 | verify_all_options(); |
| 467 | |
| 468 | if( g.argc!=4 ){ |
| 469 | usage("VERSION OUTPUTFILE"); |
| 470 | } |
| 471 | g.zOpenRevision = g.argv[2]; |
| 472 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 473 | if( rid==0 ){ |
| 474 | fossil_fatal("Check-in not found: %s", g.argv[2]); |
| 475 | return; |
| 476 | } |
| @@ -539,11 +540,11 @@ | |
| 540 | zName = mprintf("%s", PD("name","")); |
| 541 | nName = strlen(zName); |
| 542 | z = P("r"); |
| 543 | if( z==0 ) z = P("uuid"); |
| 544 | if( z==0 ) z = "trunk"; |
| 545 | g.zOpenRevision = zRid = fossil_strdup(z); |
| 546 | nRid = strlen(zRid); |
| 547 | zInclude = P("in"); |
| 548 | if( zInclude ) pInclude = glob_create(zInclude); |
| 549 | zExclude = P("ex"); |
| 550 | if( zExclude ) pExclude = glob_create(zExclude); |
| 551 |
+4
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -2,10 +2,14 @@ | ||
| 2 | 2 | |
| 3 | 3 | <a name='v2_4'></a> |
| 4 | 4 | <h2>Changes for Version 2.4 (TBD)</h2> |
| 5 | 5 | |
| 6 | 6 | * Correct the [/help?cmd=/doc|/doc] page to support read-only repositories. |
| 7 | + * Correct [/help?cmd=/zip|/zip], [/help?cmd=/tarball|/tarball], | |
| 8 | + [/help?cmd=zip|zip], and [/help?cmd=tarball|tarball] pages and commands to | |
| 9 | + honor the versioned manifest setting when outside of an open checkout | |
| 10 | + directory. | |
| 7 | 11 | |
| 8 | 12 | <a name='v2_3'></a> |
| 9 | 13 | <h2>Changes for Version 2.3 (2017-07-21)</h2> |
| 10 | 14 | |
| 11 | 15 | * Update the built-in SQLite to version 3.20.0 (beta). |
| 12 | 16 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -2,10 +2,14 @@ | |
| 2 | |
| 3 | <a name='v2_4'></a> |
| 4 | <h2>Changes for Version 2.4 (TBD)</h2> |
| 5 | |
| 6 | * Correct the [/help?cmd=/doc|/doc] page to support read-only repositories. |
| 7 | |
| 8 | <a name='v2_3'></a> |
| 9 | <h2>Changes for Version 2.3 (2017-07-21)</h2> |
| 10 | |
| 11 | * Update the built-in SQLite to version 3.20.0 (beta). |
| 12 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -2,10 +2,14 @@ | |
| 2 | |
| 3 | <a name='v2_4'></a> |
| 4 | <h2>Changes for Version 2.4 (TBD)</h2> |
| 5 | |
| 6 | * Correct the [/help?cmd=/doc|/doc] page to support read-only repositories. |
| 7 | * Correct [/help?cmd=/zip|/zip], [/help?cmd=/tarball|/tarball], |
| 8 | [/help?cmd=zip|zip], and [/help?cmd=tarball|tarball] pages and commands to |
| 9 | honor the versioned manifest setting when outside of an open checkout |
| 10 | directory. |
| 11 | |
| 12 | <a name='v2_3'></a> |
| 13 | <h2>Changes for Version 2.3 (2017-07-21)</h2> |
| 14 | |
| 15 | * Update the built-in SQLite to version 3.20.0 (beta). |
| 16 |