sequencer.hon commit rebase-interactive: append_todo_help() changes (af1fc3a)
   1#ifndef SEQUENCER_H
   2#define SEQUENCER_H
   3
   4#include "cache.h"
   5#include "strbuf.h"
   6
   7struct commit;
   8struct repository;
   9
  10const char *git_path_commit_editmsg(void);
  11const char *git_path_seq_dir(void);
  12const char *rebase_path_todo(void);
  13
  14#define APPEND_SIGNOFF_DEDUP (1u << 0)
  15
  16enum replay_action {
  17        REPLAY_REVERT,
  18        REPLAY_PICK,
  19        REPLAY_INTERACTIVE_REBASE
  20};
  21
  22enum commit_msg_cleanup_mode {
  23        COMMIT_MSG_CLEANUP_SPACE,
  24        COMMIT_MSG_CLEANUP_NONE,
  25        COMMIT_MSG_CLEANUP_SCISSORS,
  26        COMMIT_MSG_CLEANUP_ALL
  27};
  28
  29struct replay_opts {
  30        enum replay_action action;
  31
  32        /* Boolean options */
  33        int edit;
  34        int record_origin;
  35        int no_commit;
  36        int signoff;
  37        int allow_ff;
  38        int allow_rerere_auto;
  39        int allow_empty;
  40        int allow_empty_message;
  41        int keep_redundant_commits;
  42        int verbose;
  43
  44        int mainline;
  45
  46        char *gpg_sign;
  47        enum commit_msg_cleanup_mode default_msg_cleanup;
  48
  49        /* Merge strategy */
  50        char *strategy;
  51        char **xopts;
  52        size_t xopts_nr, xopts_alloc;
  53
  54        /* Used by fixup/squash */
  55        struct strbuf current_fixups;
  56        int current_fixup_count;
  57
  58        /* placeholder commit for -i --root */
  59        struct object_id squash_onto;
  60        int have_squash_onto;
  61
  62        /* Only used by REPLAY_NONE */
  63        struct rev_info *revs;
  64};
  65#define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
  66
  67/*
  68 * Note that ordering matters in this enum. Not only must it match the mapping
  69 * of todo_command_info (in sequencer.c), it is also divided into several
  70 * sections that matter.  When adding new commands, make sure you add it in the
  71 * right section.
  72 */
  73enum todo_command {
  74        /* commands that handle commits */
  75        TODO_PICK = 0,
  76        TODO_REVERT,
  77        TODO_EDIT,
  78        TODO_REWORD,
  79        TODO_FIXUP,
  80        TODO_SQUASH,
  81        /* commands that do something else than handling a single commit */
  82        TODO_EXEC,
  83        TODO_BREAK,
  84        TODO_LABEL,
  85        TODO_RESET,
  86        TODO_MERGE,
  87        /* commands that do nothing but are counted for reporting progress */
  88        TODO_NOOP,
  89        TODO_DROP,
  90        /* comments (not counted for reporting progress) */
  91        TODO_COMMENT
  92};
  93
  94struct todo_item {
  95        enum todo_command command;
  96        struct commit *commit;
  97        unsigned int flags;
  98        int arg_len;
  99        /* The offset of the command and its argument in the strbuf */
 100        size_t offset_in_buf, arg_offset;
 101};
 102
 103struct todo_list {
 104        struct strbuf buf;
 105        struct todo_item *items;
 106        int nr, alloc, current;
 107        int done_nr, total_nr;
 108        struct stat_data stat;
 109};
 110
 111#define TODO_LIST_INIT { STRBUF_INIT }
 112
 113int todo_list_parse_insn_buffer(struct repository *r, char *buf,
 114                                struct todo_list *todo_list);
 115int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
 116                            const char *file, const char *shortrevisions,
 117                            const char *shortonto, int num, unsigned flags);
 118void todo_list_release(struct todo_list *todo_list);
 119const char *todo_item_get_arg(struct todo_list *todo_list,
 120                              struct todo_item *item);
 121
 122/* Call this to setup defaults before parsing command line options */
 123void sequencer_init_config(struct replay_opts *opts);
 124int sequencer_pick_revisions(struct repository *repo,
 125                             struct replay_opts *opts);
 126int sequencer_continue(struct repository *repo, struct replay_opts *opts);
 127int sequencer_rollback(struct repository *repo, struct replay_opts *opts);
 128int sequencer_remove_state(struct replay_opts *opts);
 129
 130#define TODO_LIST_KEEP_EMPTY (1U << 0)
 131#define TODO_LIST_SHORTEN_IDS (1U << 1)
 132#define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
 133#define TODO_LIST_REBASE_MERGES (1U << 3)
 134/*
 135 * When rebasing merges, commits that do have the base commit as ancestor
 136 * ("cousins") are *not* rebased onto the new base by default. If those
 137 * commits should be rebased onto the new base, this flag needs to be passed.
 138 */
 139#define TODO_LIST_REBASE_COUSINS (1U << 4)
 140#define TODO_LIST_APPEND_TODO_HELP (1U << 5)
 141
 142int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 143                          const char **argv, unsigned flags);
 144
 145int transform_todo_file(struct repository *r, unsigned flags);
 146void todo_list_add_exec_commands(struct todo_list *todo_list,
 147                                 struct string_list *commands);
 148int check_todo_list_from_file(struct repository *r);
 149int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
 150                    const char *shortrevisions, const char *onto_name,
 151                    const char *onto, const char *orig_head, struct string_list *commands,
 152                    unsigned autosquash, struct todo_list *todo_list);
 153int todo_list_rearrange_squash(struct todo_list *todo_list);
 154
 155extern const char sign_off_header[];
 156
 157/*
 158 * Append a signoff to the commit message in "msgbuf". The ignore_footer
 159 * parameter specifies the number of bytes at the end of msgbuf that should
 160 * not be considered at all. I.e., they are not checked for existing trailers,
 161 * and the new signoff will be spliced into the buffer before those bytes.
 162 */
 163void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag);
 164
 165void append_conflicts_hint(struct index_state *istate, struct strbuf *msgbuf);
 166int message_is_empty(const struct strbuf *sb,
 167                     enum commit_msg_cleanup_mode cleanup_mode);
 168int template_untouched(const struct strbuf *sb, const char *template_file,
 169                       enum commit_msg_cleanup_mode cleanup_mode);
 170int update_head_with_reflog(const struct commit *old_head,
 171                            const struct object_id *new_head,
 172                            const char *action, const struct strbuf *msg,
 173                            struct strbuf *err);
 174void commit_post_rewrite(const struct commit *current_head,
 175                         const struct object_id *new_head);
 176
 177int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);
 178
 179#define SUMMARY_INITIAL_COMMIT   (1 << 0)
 180#define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
 181void print_commit_summary(struct repository *repo,
 182                          const char *prefix,
 183                          const struct object_id *oid,
 184                          unsigned int flags);
 185
 186int read_author_script(const char *path, char **name, char **email, char **date,
 187                       int allow_missing);
 188#endif
 189
 190void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
 191int write_basic_state(struct replay_opts *opts, const char *head_name,
 192                      const char *onto, const char *orig_head);