Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the handling of manifest files for the "tag" and "amend" commands. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
5e20a4f7a8ca21cf0135a2161c0d28dd |
| User & Date: | drh 2019-02-18 22:37:31 |
Context
|
2019-02-20
| ||
| 15:01 | Version 2.8 (check-in: f8d7f76b user: drh tags: trunk, release, version-2.8) | |
|
2019-02-18
| ||
| 22:37 | Fix the handling of manifest files for the "tag" and "amend" commands. (check-in: 5e20a4f7 user: drh tags: trunk) | |
| 21:04 | Tweaks to the change log in preparation for 2.8. (check-in: dbf342e7 user: drh tags: trunk) | |
|
2019-02-07
| ||
| 17:39 | Backout [6e80af7e52], as this branch enables the 'reparent' command to work without an open check-out. (Closed-Leaf check-in: 3580fce8 user: florian tags: tag-cmd-manifest-updates) | |
Changes
Changes to src/info.c.
3169 3170 3171 3172 3173 3174 3175 3176 |
if( fHide && !fHasHidden ) hide_branch();
if( fClose && !fHasClosed ) close_leaf(rid);
if( zNewBranch && zNewBranch[0] ) change_branch(rid,zNewBranch);
apply_newtags(&ctrl, rid, zUuid, zUserOvrd, fDryRun);
if( fDryRun==0 ){
show_common_info(rid, "uuid:", 1, 0);
}
}
|
> > | > |
3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 |
if( fHide && !fHasHidden ) hide_branch();
if( fClose && !fHasClosed ) close_leaf(rid);
if( zNewBranch && zNewBranch[0] ) change_branch(rid,zNewBranch);
apply_newtags(&ctrl, rid, zUuid, zUserOvrd, fDryRun);
if( fDryRun==0 ){
show_common_info(rid, "uuid:", 1, 0);
}
if( g.localOpen ){
manifest_to_disk(rid);
}
}
|
Changes to src/tag.c.
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
...
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
|
fossil_print("%s", blob_str(&ctrl));
blob_reset(&ctrl);
}else{
nrid = content_put(&ctrl);
manifest_crosslink(nrid, &ctrl, MC_PERMIT_HOOKS);
}
assert( blob_is_reset(&ctrl) );
manifest_to_disk(rid);
}
/*
** COMMAND: tag
**
** Usage: %fossil tag SUBCOMMAND ...
**
................................................................................
int i;
Blob value;
char *zUuid;
int dryRun = 0;
const char *zDateOvrd; /* The change time on the control artifact */
const char *zUserOvrd; /* The user name on the control artifact */
db_must_be_within_tree();
if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
zDateOvrd = find_option("date-override",0,1);
zUserOvrd = find_option("user-override",0,1);
verify_all_options();
if( g.argc<4 ){
usage("[OPTIONS] CHECK-IN PARENT ...");
}
rid = name_to_typed_rid(g.argv[2], "ci");
blob_init(&value, 0, 0);
for(i=3; i<g.argc; i++){
|
>
|
>
<
>
|
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
...
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
|
fossil_print("%s", blob_str(&ctrl));
blob_reset(&ctrl);
}else{
nrid = content_put(&ctrl);
manifest_crosslink(nrid, &ctrl, MC_PERMIT_HOOKS);
}
assert( blob_is_reset(&ctrl) );
if( g.localOpen ){
manifest_to_disk(rid);
}
}
/*
** COMMAND: tag
**
** Usage: %fossil tag SUBCOMMAND ...
**
................................................................................
int i;
Blob value;
char *zUuid;
int dryRun = 0;
const char *zDateOvrd; /* The change time on the control artifact */
const char *zUserOvrd; /* The user name on the control artifact */
if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
zDateOvrd = find_option("date-override",0,1);
zUserOvrd = find_option("user-override",0,1);
db_find_and_open_repository(0, 0);
verify_all_options();
if( g.argc<4 ){
usage("[OPTIONS] CHECK-IN PARENT ...");
}
rid = name_to_typed_rid(g.argv[2], "ci");
blob_init(&value, 0, 0);
for(i=3; i<g.argc; i++){
|