Fossil SCM
Fix the handling of manifest files for the "tag" and "amend" commands.
Commit
5e20a4f7a8ca21cf0135a2161c0d28ddee20fb8787749714a6b12598d8ad41c4
Parent
dbf342e76373cbc…
2 files changed
+3
+4
-2
+3
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -3171,6 +3171,9 @@ | ||
| 3171 | 3171 | if( zNewBranch && zNewBranch[0] ) change_branch(rid,zNewBranch); |
| 3172 | 3172 | apply_newtags(&ctrl, rid, zUuid, zUserOvrd, fDryRun); |
| 3173 | 3173 | if( fDryRun==0 ){ |
| 3174 | 3174 | show_common_info(rid, "uuid:", 1, 0); |
| 3175 | 3175 | } |
| 3176 | + if( g.localOpen ){ | |
| 3177 | + manifest_to_disk(rid); | |
| 3178 | + } | |
| 3176 | 3179 | } |
| 3177 | 3180 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -3171,6 +3171,9 @@ | |
| 3171 | if( zNewBranch && zNewBranch[0] ) change_branch(rid,zNewBranch); |
| 3172 | apply_newtags(&ctrl, rid, zUuid, zUserOvrd, fDryRun); |
| 3173 | if( fDryRun==0 ){ |
| 3174 | show_common_info(rid, "uuid:", 1, 0); |
| 3175 | } |
| 3176 | } |
| 3177 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -3171,6 +3171,9 @@ | |
| 3171 | if( zNewBranch && zNewBranch[0] ) change_branch(rid,zNewBranch); |
| 3172 | apply_newtags(&ctrl, rid, zUuid, zUserOvrd, fDryRun); |
| 3173 | if( fDryRun==0 ){ |
| 3174 | show_common_info(rid, "uuid:", 1, 0); |
| 3175 | } |
| 3176 | if( g.localOpen ){ |
| 3177 | manifest_to_disk(rid); |
| 3178 | } |
| 3179 | } |
| 3180 |
+4
-2
| --- src/tag.c | ||
| +++ src/tag.c | ||
| @@ -359,11 +359,13 @@ | ||
| 359 | 359 | }else{ |
| 360 | 360 | nrid = content_put(&ctrl); |
| 361 | 361 | manifest_crosslink(nrid, &ctrl, MC_PERMIT_HOOKS); |
| 362 | 362 | } |
| 363 | 363 | assert( blob_is_reset(&ctrl) ); |
| 364 | - manifest_to_disk(rid); | |
| 364 | + if( g.localOpen ){ | |
| 365 | + manifest_to_disk(rid); | |
| 366 | + } | |
| 365 | 367 | } |
| 366 | 368 | |
| 367 | 369 | /* |
| 368 | 370 | ** COMMAND: tag |
| 369 | 371 | ** |
| @@ -633,14 +635,14 @@ | ||
| 633 | 635 | char *zUuid; |
| 634 | 636 | int dryRun = 0; |
| 635 | 637 | const char *zDateOvrd; /* The change time on the control artifact */ |
| 636 | 638 | const char *zUserOvrd; /* The user name on the control artifact */ |
| 637 | 639 | |
| 638 | - db_must_be_within_tree(); | |
| 639 | 640 | if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN; |
| 640 | 641 | zDateOvrd = find_option("date-override",0,1); |
| 641 | 642 | zUserOvrd = find_option("user-override",0,1); |
| 643 | + db_find_and_open_repository(0, 0); | |
| 642 | 644 | verify_all_options(); |
| 643 | 645 | if( g.argc<4 ){ |
| 644 | 646 | usage("[OPTIONS] CHECK-IN PARENT ..."); |
| 645 | 647 | } |
| 646 | 648 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 647 | 649 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -359,11 +359,13 @@ | |
| 359 | }else{ |
| 360 | nrid = content_put(&ctrl); |
| 361 | manifest_crosslink(nrid, &ctrl, MC_PERMIT_HOOKS); |
| 362 | } |
| 363 | assert( blob_is_reset(&ctrl) ); |
| 364 | manifest_to_disk(rid); |
| 365 | } |
| 366 | |
| 367 | /* |
| 368 | ** COMMAND: tag |
| 369 | ** |
| @@ -633,14 +635,14 @@ | |
| 633 | char *zUuid; |
| 634 | int dryRun = 0; |
| 635 | const char *zDateOvrd; /* The change time on the control artifact */ |
| 636 | const char *zUserOvrd; /* The user name on the control artifact */ |
| 637 | |
| 638 | db_must_be_within_tree(); |
| 639 | if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN; |
| 640 | zDateOvrd = find_option("date-override",0,1); |
| 641 | zUserOvrd = find_option("user-override",0,1); |
| 642 | verify_all_options(); |
| 643 | if( g.argc<4 ){ |
| 644 | usage("[OPTIONS] CHECK-IN PARENT ..."); |
| 645 | } |
| 646 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 647 |
| --- src/tag.c | |
| +++ src/tag.c | |
| @@ -359,11 +359,13 @@ | |
| 359 | }else{ |
| 360 | nrid = content_put(&ctrl); |
| 361 | manifest_crosslink(nrid, &ctrl, MC_PERMIT_HOOKS); |
| 362 | } |
| 363 | assert( blob_is_reset(&ctrl) ); |
| 364 | if( g.localOpen ){ |
| 365 | manifest_to_disk(rid); |
| 366 | } |
| 367 | } |
| 368 | |
| 369 | /* |
| 370 | ** COMMAND: tag |
| 371 | ** |
| @@ -633,14 +635,14 @@ | |
| 635 | char *zUuid; |
| 636 | int dryRun = 0; |
| 637 | const char *zDateOvrd; /* The change time on the control artifact */ |
| 638 | const char *zUserOvrd; /* The user name on the control artifact */ |
| 639 | |
| 640 | if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN; |
| 641 | zDateOvrd = find_option("date-override",0,1); |
| 642 | zUserOvrd = find_option("user-override",0,1); |
| 643 | db_find_and_open_repository(0, 0); |
| 644 | verify_all_options(); |
| 645 | if( g.argc<4 ){ |
| 646 | usage("[OPTIONS] CHECK-IN PARENT ..."); |
| 647 | } |
| 648 | rid = name_to_typed_rid(g.argv[2], "ci"); |
| 649 |