]> git.ipfire.org Git - thirdparty/git.git/blob - sequencer.h
rebase -i: introduce --rebase-merges=[no-]rebase-cousins
[thirdparty/git.git] / sequencer.h
1 #ifndef SEQUENCER_H
2 #define SEQUENCER_H
3
4 const char *git_path_commit_editmsg(void);
5 const char *git_path_seq_dir(void);
6
7 #define APPEND_SIGNOFF_DEDUP (1u << 0)
8
9 enum replay_action {
10 REPLAY_REVERT,
11 REPLAY_PICK,
12 REPLAY_INTERACTIVE_REBASE
13 };
14
15 enum commit_msg_cleanup_mode {
16 COMMIT_MSG_CLEANUP_SPACE,
17 COMMIT_MSG_CLEANUP_NONE,
18 COMMIT_MSG_CLEANUP_SCISSORS,
19 COMMIT_MSG_CLEANUP_ALL
20 };
21
22 struct replay_opts {
23 enum replay_action action;
24
25 /* Boolean options */
26 int edit;
27 int record_origin;
28 int no_commit;
29 int signoff;
30 int allow_ff;
31 int allow_rerere_auto;
32 int allow_empty;
33 int allow_empty_message;
34 int keep_redundant_commits;
35 int verbose;
36
37 int mainline;
38
39 char *gpg_sign;
40 enum commit_msg_cleanup_mode default_msg_cleanup;
41
42 /* Merge strategy */
43 char *strategy;
44 char **xopts;
45 size_t xopts_nr, xopts_alloc;
46
47 /* Only used by REPLAY_NONE */
48 struct rev_info *revs;
49 };
50 #define REPLAY_OPTS_INIT { -1 }
51
52 /* Call this to setup defaults before parsing command line options */
53 void sequencer_init_config(struct replay_opts *opts);
54 int sequencer_pick_revisions(struct replay_opts *opts);
55 int sequencer_continue(struct replay_opts *opts);
56 int sequencer_rollback(struct replay_opts *opts);
57 int sequencer_remove_state(struct replay_opts *opts);
58
59 #define TODO_LIST_KEEP_EMPTY (1U << 0)
60 #define TODO_LIST_SHORTEN_IDS (1U << 1)
61 #define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
62 #define TODO_LIST_REBASE_MERGES (1U << 3)
63 /*
64 * When rebasing merges, commits that do have the base commit as ancestor
65 * ("cousins") are *not* rebased onto the new base by default. If those
66 * commits should be rebased onto the new base, this flag needs to be passed.
67 */
68 #define TODO_LIST_REBASE_COUSINS (1U << 4)
69 int sequencer_make_script(FILE *out, int argc, const char **argv,
70 unsigned flags);
71
72 int sequencer_add_exec_commands(const char *command);
73 int transform_todos(unsigned flags);
74 int check_todo_list(void);
75 int skip_unnecessary_picks(void);
76 int rearrange_squash(void);
77
78 extern const char sign_off_header[];
79
80 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
81 void append_conflicts_hint(struct strbuf *msgbuf);
82 int message_is_empty(const struct strbuf *sb,
83 enum commit_msg_cleanup_mode cleanup_mode);
84 int template_untouched(const struct strbuf *sb, const char *template_file,
85 enum commit_msg_cleanup_mode cleanup_mode);
86 int update_head_with_reflog(const struct commit *old_head,
87 const struct object_id *new_head,
88 const char *action, const struct strbuf *msg,
89 struct strbuf *err);
90 void commit_post_rewrite(const struct commit *current_head,
91 const struct object_id *new_head);
92
93 #define SUMMARY_INITIAL_COMMIT (1 << 0)
94 #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
95 void print_commit_summary(const char *prefix, const struct object_id *oid,
96 unsigned int flags);
97 #endif