Fossil SCM
Rename subcommand to amend and clarify the usage in help output.
Commit
7df56d1c14ba99321f6c80caad2e942adaeb725b
Parent
b9e0d72e7e6da00…
1 file changed
+8
-6
+8
-6
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2705,28 +2705,30 @@ | ||
| 2705 | 2705 | @ </div></form> |
| 2706 | 2706 | style_footer(); |
| 2707 | 2707 | } |
| 2708 | 2708 | |
| 2709 | 2709 | /* |
| 2710 | -** COMMAND: edit | |
| 2710 | +** COMMAND: amend | |
| 2711 | +** | |
| 2712 | +** Usage: %fossil amend UUID ?OPTIONS? | |
| 2711 | 2713 | ** |
| 2712 | -** Usage: %fossil edit UUID ?OPTIONS? | |
| 2714 | +** Amend the tags on check-in UUID to change how it displays in the timeline. | |
| 2713 | 2715 | ** |
| 2714 | 2716 | ** Options: |
| 2715 | 2717 | ** |
| 2716 | 2718 | ** --euser USER Make USER the check-in user |
| 2717 | 2719 | ** --comment COMMENT Make COMMENT the check-in comment |
| 2718 | 2720 | ** --date DATE Make DATE the check-in time |
| 2719 | 2721 | ** --bgcolor COLOR Apply COLOR to this check-in |
| 2720 | -** --branchcolor COLOR Apply COLOR to the branch | |
| 2722 | +** --branchcolor COLOR Apply and propagate COLOR to the branch | |
| 2721 | 2723 | ** --tag TAG Add new TAG to this check-in |
| 2722 | 2724 | ** --cancel TAG Cancel TAG from this check-in |
| 2723 | 2725 | ** --branch NAME Make this check-in the start of branch NAME |
| 2724 | 2726 | ** --hide Hide branch starting from this check-in |
| 2725 | 2727 | ** --close Mark this "leaf" as closed |
| 2726 | 2728 | */ |
| 2727 | -void ci_edit_cmd(void){ | |
| 2729 | +void ci_amend_cmd(void){ | |
| 2728 | 2730 | int rid; |
| 2729 | 2731 | const char *zComment; /* Current comment on the check-in */ |
| 2730 | 2732 | const char *zNewComment; /* Revised check-in comment */ |
| 2731 | 2733 | const char *zUser; /* Current user for the check-in */ |
| 2732 | 2734 | const char *zNewUser; /* Revised user */ |
| @@ -2738,12 +2740,12 @@ | ||
| 2738 | 2740 | const char *zNewTag; |
| 2739 | 2741 | const char *zNewBranch; |
| 2740 | 2742 | const char *zCancelTag; |
| 2741 | 2743 | int fClose; /* True if leaf should be closed */ |
| 2742 | 2744 | int fHide; /* True if branch should be hidden */ |
| 2743 | - int fPropagateColor; /* True if color propagates before edit */ | |
| 2744 | - int fNewPropagateColor = 0; /* True if color propagates after edit */ | |
| 2745 | + int fPropagateColor; /* True if color propagates before amend */ | |
| 2746 | + int fNewPropagateColor = 0; /* True if color propagates after amend */ | |
| 2745 | 2747 | const char *zChngTime; /* The change time on the control artifact */ |
| 2746 | 2748 | const char *zUuid; |
| 2747 | 2749 | Blob ctrl; |
| 2748 | 2750 | char *zNow; |
| 2749 | 2751 | |
| 2750 | 2752 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2705,28 +2705,30 @@ | |
| 2705 | @ </div></form> |
| 2706 | style_footer(); |
| 2707 | } |
| 2708 | |
| 2709 | /* |
| 2710 | ** COMMAND: edit |
| 2711 | ** |
| 2712 | ** Usage: %fossil edit UUID ?OPTIONS? |
| 2713 | ** |
| 2714 | ** Options: |
| 2715 | ** |
| 2716 | ** --euser USER Make USER the check-in user |
| 2717 | ** --comment COMMENT Make COMMENT the check-in comment |
| 2718 | ** --date DATE Make DATE the check-in time |
| 2719 | ** --bgcolor COLOR Apply COLOR to this check-in |
| 2720 | ** --branchcolor COLOR Apply COLOR to the branch |
| 2721 | ** --tag TAG Add new TAG to this check-in |
| 2722 | ** --cancel TAG Cancel TAG from this check-in |
| 2723 | ** --branch NAME Make this check-in the start of branch NAME |
| 2724 | ** --hide Hide branch starting from this check-in |
| 2725 | ** --close Mark this "leaf" as closed |
| 2726 | */ |
| 2727 | void ci_edit_cmd(void){ |
| 2728 | int rid; |
| 2729 | const char *zComment; /* Current comment on the check-in */ |
| 2730 | const char *zNewComment; /* Revised check-in comment */ |
| 2731 | const char *zUser; /* Current user for the check-in */ |
| 2732 | const char *zNewUser; /* Revised user */ |
| @@ -2738,12 +2740,12 @@ | |
| 2738 | const char *zNewTag; |
| 2739 | const char *zNewBranch; |
| 2740 | const char *zCancelTag; |
| 2741 | int fClose; /* True if leaf should be closed */ |
| 2742 | int fHide; /* True if branch should be hidden */ |
| 2743 | int fPropagateColor; /* True if color propagates before edit */ |
| 2744 | int fNewPropagateColor = 0; /* True if color propagates after edit */ |
| 2745 | const char *zChngTime; /* The change time on the control artifact */ |
| 2746 | const char *zUuid; |
| 2747 | Blob ctrl; |
| 2748 | char *zNow; |
| 2749 | |
| 2750 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2705,28 +2705,30 @@ | |
| 2705 | @ </div></form> |
| 2706 | style_footer(); |
| 2707 | } |
| 2708 | |
| 2709 | /* |
| 2710 | ** COMMAND: amend |
| 2711 | ** |
| 2712 | ** Usage: %fossil amend UUID ?OPTIONS? |
| 2713 | ** |
| 2714 | ** Amend the tags on check-in UUID to change how it displays in the timeline. |
| 2715 | ** |
| 2716 | ** Options: |
| 2717 | ** |
| 2718 | ** --euser USER Make USER the check-in user |
| 2719 | ** --comment COMMENT Make COMMENT the check-in comment |
| 2720 | ** --date DATE Make DATE the check-in time |
| 2721 | ** --bgcolor COLOR Apply COLOR to this check-in |
| 2722 | ** --branchcolor COLOR Apply and propagate COLOR to the branch |
| 2723 | ** --tag TAG Add new TAG to this check-in |
| 2724 | ** --cancel TAG Cancel TAG from this check-in |
| 2725 | ** --branch NAME Make this check-in the start of branch NAME |
| 2726 | ** --hide Hide branch starting from this check-in |
| 2727 | ** --close Mark this "leaf" as closed |
| 2728 | */ |
| 2729 | void ci_amend_cmd(void){ |
| 2730 | int rid; |
| 2731 | const char *zComment; /* Current comment on the check-in */ |
| 2732 | const char *zNewComment; /* Revised check-in comment */ |
| 2733 | const char *zUser; /* Current user for the check-in */ |
| 2734 | const char *zNewUser; /* Revised user */ |
| @@ -2738,12 +2740,12 @@ | |
| 2740 | const char *zNewTag; |
| 2741 | const char *zNewBranch; |
| 2742 | const char *zCancelTag; |
| 2743 | int fClose; /* True if leaf should be closed */ |
| 2744 | int fHide; /* True if branch should be hidden */ |
| 2745 | int fPropagateColor; /* True if color propagates before amend */ |
| 2746 | int fNewPropagateColor = 0; /* True if color propagates after amend */ |
| 2747 | const char *zChngTime; /* The change time on the control artifact */ |
| 2748 | const char *zUuid; |
| 2749 | Blob ctrl; |
| 2750 | char *zNow; |
| 2751 | |
| 2752 |