i18n: unpack-trees: avoid substituting only a verb in sentences
[gitweb.git] / sequencer.h
index 2d4528f2928053827aedd0b737bf01985f1c4957..5ed5cb1d97ced70a9ebffd1dad524a12e7f7810a 100644 (file)
@@ -6,7 +6,53 @@
 #define SEQ_TODO_FILE  "sequencer/todo"
 #define SEQ_OPTS_FILE  "sequencer/opts"
 
-/* Removes SEQ_DIR. */
-extern void remove_sequencer_state(void);
+#define APPEND_SIGNOFF_DEDUP (1u << 0)
+
+enum replay_action {
+       REPLAY_REVERT,
+       REPLAY_PICK
+};
+
+enum replay_subcommand {
+       REPLAY_NONE,
+       REPLAY_REMOVE_STATE,
+       REPLAY_CONTINUE,
+       REPLAY_ROLLBACK
+};
+
+struct replay_opts {
+       enum replay_action action;
+       enum replay_subcommand subcommand;
+
+       /* Boolean options */
+       int edit;
+       int record_origin;
+       int no_commit;
+       int signoff;
+       int allow_ff;
+       int allow_rerere_auto;
+       int allow_empty;
+       int allow_empty_message;
+       int keep_redundant_commits;
+
+       int mainline;
+
+       const char *gpg_sign;
+
+       /* Merge strategy */
+       const char *strategy;
+       const char **xopts;
+       size_t xopts_nr, xopts_alloc;
+
+       /* Only used by REPLAY_NONE */
+       struct rev_info *revs;
+};
+
+int sequencer_pick_revisions(struct replay_opts *opts);
+
+extern const char sign_off_header[];
+
+void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
+void append_conflicts_hint(struct strbuf *msgbuf);
 
 #endif