revert: prepare to move replay_action to header

REVERT and CHERRY_PICK and are unsuitable names for an enumerator in a
public interface, because they are generic enough to be likely to
clash with identifiers with other meanings.  Rename to REPLAY_REVERT
and REPLAY_PICK as preparation for exposing them.

Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/revert.c b/builtin/revert.c
index 0d8020cf640e1abe6898308a1656446b327c83f4..2739405766a9a757ccdceb03c05635127a9bba03 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -39,7 +39,11 @@ static const char * const cherry_pick_usage[] = {
        NULL
 };
 
        NULL
 };
 

-enum replay_action { REVERT, CHERRY_PICK };
+enum replay_action {
+       REPLAY_REVERT,
+       REPLAY_PICK
+};
+

 enum replay_subcommand {
        REPLAY_NONE,
        REPLAY_REMOVE_STATE,
 enum replay_subcommand {
        REPLAY_NONE,
        REPLAY_REMOVE_STATE,


@@ -74,14 +78,14 @@ struct replay_opts {
 
 static const char *action_name(const struct replay_opts *opts)
 {
 
 static const char *action_name(const struct replay_opts *opts)
 {

-       return opts->action == REVERT ? "revert" : "cherry-pick";
+       return opts->action == REPLAY_REVERT ? "revert" : "cherry-pick";

 }
 
 static char *get_encoding(const char *message);
 
 static const char * const *revert_or_cherry_pick_usage(struct replay_opts *opts)
 {
 }
 
 static char *get_encoding(const char *message);
 
 static const char * const *revert_or_cherry_pick_usage(struct replay_opts *opts)
 {

-       return opts->action == REVERT ? revert_usage : cherry_pick_usage;
+       return opts->action == REPLAY_REVERT ? revert_usage : cherry_pick_usage;

 }
 
 static int option_parse_x(const struct option *opt,
 }
 
 static int option_parse_x(const struct option *opt,


@@ -160,7 +164,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
                OPT_END(),
        };
 
                OPT_END(),
        };
 

-       if (opts->action == CHERRY_PICK) {
+       if (opts->action == REPLAY_PICK) {

                struct option cp_extra[] = {
                        OPT_BOOLEAN('x', NULL, &opts->record_origin, "append commit name"),
                        OPT_BOOLEAN(0, "ff", &opts->allow_ff, "allow fast-forward"),
                struct option cp_extra[] = {
                        OPT_BOOLEAN('x', NULL, &opts->record_origin, "append commit name"),
                        OPT_BOOLEAN(0, "ff", &opts->allow_ff, "allow fast-forward"),


@@ -374,7 +378,7 @@ static int error_dirty_index(struct replay_opts *opts)
                return error_resolve_conflict(action_name(opts));
 
        /* Different translation strings for cherry-pick and revert */
                return error_resolve_conflict(action_name(opts));
 
        /* Different translation strings for cherry-pick and revert */

-       if (opts->action == CHERRY_PICK)
+       if (opts->action == REPLAY_PICK)

                error(_("Your local changes would be overwritten by cherry-pick."));
        else
                error(_("Your local changes would be overwritten by revert."));
                error(_("Your local changes would be overwritten by cherry-pick."));
        else
                error(_("Your local changes would be overwritten by revert."));


@@ -553,7 +557,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
 
        defmsg = git_pathdup("MERGE_MSG");
 
 
        defmsg = git_pathdup("MERGE_MSG");
 

-       if (opts->action == REVERT) {
+       if (opts->action == REPLAY_REVERT) {

                base = commit;
                base_label = msg.label;
                next = parent;
                base = commit;
                base_label = msg.label;
                next = parent;


@@ -594,7 +598,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
                }
        }
 
                }
        }
 

-       if (!opts->strategy || !strcmp(opts->strategy, "recursive") || opts->action == REVERT) {
+       if (!opts->strategy || !strcmp(opts->strategy, "recursive") || opts->action == REPLAY_REVERT) {

                res = do_recursive_merge(base, next, base_label, next_label,
                                         head, &msgbuf, opts);
                write_message(&msgbuf, defmsg);
                res = do_recursive_merge(base, next, base_label, next_label,
                                         head, &msgbuf, opts);
                write_message(&msgbuf, defmsg);


@@ -618,13 +622,13 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
         * However, if the merge did not even start, then we don't want to
         * write it at all.
         */
         * However, if the merge did not even start, then we don't want to
         * write it at all.
         */

-       if (opts->action == CHERRY_PICK && !opts->no_commit && (res == 0 || res == 1))
+       if (opts->action == REPLAY_PICK && !opts->no_commit && (res == 0 || res == 1))

                write_cherry_pick_head(commit, "CHERRY_PICK_HEAD");
                write_cherry_pick_head(commit, "CHERRY_PICK_HEAD");

-       if (opts->action == REVERT && ((opts->no_commit && res == 0) || res == 1))
+       if (opts->action == REPLAY_REVERT && ((opts->no_commit && res == 0) || res == 1))

                write_cherry_pick_head(commit, "REVERT_HEAD");
 
        if (res) {
                write_cherry_pick_head(commit, "REVERT_HEAD");
 
        if (res) {

-               error(opts->action == REVERT
+               error(opts->action == REPLAY_REVERT

                      ? _("could not revert %s... %s")
                      : _("could not apply %s... %s"),
                      find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
                      ? _("could not revert %s... %s")
                      : _("could not apply %s... %s"),
                      find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),


@@ -644,7 +648,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
 
 static void prepare_revs(struct replay_opts *opts)
 {
 
 static void prepare_revs(struct replay_opts *opts)
 {

-       if (opts->action != REVERT)
+       if (opts->action != REPLAY_REVERT)

                opts->revs->reverse ^= 1;
 
        if (prepare_revision_walk(opts->revs))
                opts->revs->reverse ^= 1;
 
        if (prepare_revision_walk(opts->revs))


@@ -701,7 +705,7 @@ static int format_todo(struct strbuf *buf, struct commit_list *todo_list,
 {
        struct commit_list *cur = NULL;
        const char *sha1_abbrev = NULL;
 {
        struct commit_list *cur = NULL;
        const char *sha1_abbrev = NULL;

-       const char *action_str = opts->action == REVERT ? "revert" : "pick";
+       const char *action_str = opts->action == REPLAY_REVERT ? "revert" : "pick";

        const char *subject;
        int subject_len;
 
        const char *subject;
        int subject_len;
 


@@ -722,10 +726,10 @@ static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *
        int saved, status, padding;
 
        if (!prefixcmp(bol, "pick")) {
        int saved, status, padding;
 
        if (!prefixcmp(bol, "pick")) {

-               action = CHERRY_PICK;
+               action = REPLAY_PICK;

                bol += strlen("pick");
        } else if (!prefixcmp(bol, "revert")) {
                bol += strlen("pick");
        } else if (!prefixcmp(bol, "revert")) {

-               action = REVERT;
+               action = REPLAY_REVERT;

                bol += strlen("revert");
        } else
                return NULL;
                bol += strlen("revert");
        } else
                return NULL;


@@ -748,7 +752,7 @@ static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *
         */
        if (action != opts->action) {
                const char *action_str;
         */
        if (action != opts->action) {
                const char *action_str;

-               action_str = action == REVERT ? "revert" : "cherry-pick";
+               action_str = action == REPLAY_REVERT ? "revert" : "cherry-pick";

                error(_("Cannot %s during a %s"), action_str, action_name(opts));
                return NULL;
        }
                error(_("Cannot %s during a %s"), action_str, action_name(opts));
                return NULL;
        }


@@ -1124,7 +1128,7 @@ static int pick_revisions(struct replay_opts *opts)
        if (create_seq_dir() < 0)
                return -1;
        if (get_sha1("HEAD", sha1)) {
        if (create_seq_dir() < 0)
                return -1;
        if (get_sha1("HEAD", sha1)) {

-               if (opts->action == REVERT)
+               if (opts->action == REPLAY_REVERT)

                        return error(_("Can't revert as initial commit"));
                return error(_("Can't cherry-pick into empty head"));
        }
                        return error(_("Can't revert as initial commit"));
                return error(_("Can't cherry-pick into empty head"));
        }


@@ -1141,7 +1145,7 @@ int cmd_revert(int argc, const char **argv, const char *prefix)
        memset(&opts, 0, sizeof(opts));
        if (isatty(0))
                opts.edit = 1;
        memset(&opts, 0, sizeof(opts));
        if (isatty(0))
                opts.edit = 1;

-       opts.action = REVERT;
+       opts.action = REPLAY_REVERT;

        git_config(git_default_config, NULL);
        parse_args(argc, argv, &opts);
        res = pick_revisions(&opts);
        git_config(git_default_config, NULL);
        parse_args(argc, argv, &opts);
        res = pick_revisions(&opts);


@@ -1156,7 +1160,7 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
        int res;
 
        memset(&opts, 0, sizeof(opts));
        int res;
 
        memset(&opts, 0, sizeof(opts));

-       opts.action = CHERRY_PICK;
+       opts.action = REPLAY_PICK;

        git_config(git_default_config, NULL);
        parse_args(argc, argv, &opts);
        res = pick_revisions(&opts);
        git_config(git_default_config, NULL);
        parse_args(argc, argv, &opts);
        res = pick_revisions(&opts);