blob: cb5ab3513bc9982095e292119b9119d333556256 [file] [log] [blame]
Linus Torvaldsae563542006-02-25 16:19:46 -08001#ifndef REVISION_H
2#define REVISION_H
3
Pierre Habouzit6b61ec02008-07-09 23:38:34 +02004#include "parse-options.h"
Jeff King0843acf2008-08-25 02:15:05 -04005#include "grep.h"
Thomas Rast894a9d32010-03-12 18:04:26 +01006#include "notes.h"
Pierre Habouzit6b61ec02008-07-09 23:38:34 +02007
Linus Torvaldsae563542006-02-25 16:19:46 -08008#define SEEN (1u<<0)
9#define UNINTERESTING (1u<<1)
Linus Torvalds7dc0fe32007-11-12 23:16:08 -080010#define TREESAME (1u<<2)
Linus Torvalds765ac8e2006-02-28 15:07:20 -080011#define SHOWN (1u<<3)
Junio C Hamano7ae0b0c2006-03-01 00:58:56 -080012#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
Junio C Hamano384e99a2006-03-27 23:58:34 -080013#define BOUNDARY (1u<<5)
Junio C Hamano2b064692007-03-05 16:10:28 -080014#define CHILD_SHOWN (1u<<6)
Junio C Hamano1b65a5a2006-04-16 18:12:49 -070015#define ADDED (1u<<7) /* Parents already parsed and added? */
Junio C Hamano577ed5c2006-10-22 17:32:47 -070016#define SYMMETRIC_LEFT (1u<<8)
Michael J Gruberadbbb312011-03-07 13:31:40 +010017#define PATCHSAME (1u<<9)
18#define ALL_REV_FLAGS ((1u<<10)-1)
Linus Torvaldsae563542006-02-25 16:19:46 -080019
Lars Hjemli33e70182009-08-15 16:23:12 +020020#define DECORATE_SHORT_REFS 1
21#define DECORATE_FULL_REFS 2
22
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +010023struct rev_info;
Linus Torvalds91539832006-04-17 11:59:32 -070024struct log_info;
Thomas Rast894a9d32010-03-12 18:04:26 +010025struct string_list;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +010026
Junio C Hamano281eee42011-08-25 17:35:39 -070027struct rev_cmdline_info {
28 unsigned int nr;
29 unsigned int alloc;
30 struct rev_cmdline_entry {
31 struct object *item;
32 const char *name;
33 enum {
34 REV_CMD_REF,
35 REV_CMD_PARENTS_ONLY,
36 REV_CMD_LEFT,
37 REV_CMD_RIGHT,
38 REV_CMD_REV
39 } whence;
40 unsigned flags;
41 } *rev;
42};
43
Linus Torvaldsae563542006-02-25 16:19:46 -080044struct rev_info {
45 /* Starting list */
46 struct commit_list *commits;
Linus Torvalds1f1e8952006-06-19 17:42:35 -070047 struct object_array pending;
Linus Torvaldsae563542006-02-25 16:19:46 -080048
Junio C Hamano86ab4902007-03-05 13:10:06 -080049 /* Parents of shown commits */
50 struct object_array boundary_commits;
51
Junio C Hamano281eee42011-08-25 17:35:39 -070052 /* The end-points specified by the end user */
53 struct rev_cmdline_info cmdline;
54
Linus Torvaldsae563542006-02-25 16:19:46 -080055 /* Basic information */
56 const char *prefix;
Pierre Habouzit02e54222008-07-08 15:19:33 +020057 const char *def;
Nguyễn Thái Ngọc Duyafe069d2010-12-17 19:43:06 +070058 struct pathspec prune_data;
Junio C Hamanocc243c32011-05-18 18:08:09 -070059 unsigned int early_output:1,
60 ignore_missing:1;
Linus Torvaldscdcefbc2007-11-03 11:11:10 -070061
Linus Torvaldsae563542006-02-25 16:19:46 -080062 /* Traversal flags */
63 unsigned int dense:1,
Linus Torvalds53b2c822007-11-05 13:22:34 -080064 prune:1,
Linus Torvaldsba1d4502006-04-15 12:09:56 -070065 no_walk:1,
Linus Torvalds3131b712008-02-09 14:02:07 -080066 show_all:1,
Linus Torvaldsae563542006-02-25 16:19:46 -080067 remove_empty_trees:1,
Linus Torvalds92024342006-06-11 10:57:35 -070068 simplify_history:1,
Linus Torvaldsae563542006-02-25 16:19:46 -080069 lifo:1,
70 topo_order:1,
Junio C Hamano6546b592008-07-31 01:17:41 -070071 simplify_merges:1,
Linus Torvalds78892e32008-11-03 11:25:46 -080072 simplify_by_decoration:1,
Linus Torvaldsae563542006-02-25 16:19:46 -080073 tag_objects:1,
74 tree_objects:1,
75 blob_objects:1,
Junio C Hamano5a48d242011-09-01 15:43:34 -070076 verify_objects:1,
Linus Torvaldsd9a83682006-02-27 08:54:36 -080077 edge_hint:1,
78 limited:1,
Junio C Hamano03a96832009-02-28 00:00:21 -080079 unpacked:1,
Junio C Hamano86ab4902007-03-05 13:10:06 -080080 boundary:2,
Thomas Rastf69c5012010-06-10 13:47:23 +020081 count:1,
Junio C Hamano74bd9022006-12-16 15:31:25 -080082 left_right:1,
Michael J Gruber60adf7d2011-02-21 17:09:11 +010083 left_only:1,
84 right_only:1,
Adam Simpkins885cf802008-05-04 03:36:52 -070085 rewrite_parents:1,
86 print_parents:1,
Linus Torvalds0f3a2902008-10-27 12:51:59 -070087 show_source:1,
Linus Torvaldsd467a522008-11-03 11:23:57 -080088 show_decorations:1,
Junio C Hamano0053e902007-03-13 01:57:22 -070089 reverse:1,
Thomas Rast498bcd32008-08-29 21:18:38 +020090 reverse_output_stage:1,
Junio C Hamanod7a17ca2007-04-09 03:40:38 -070091 cherry_pick:1,
Michael J Gruberadbbb312011-03-07 13:31:40 +010092 cherry_mark:1,
Linus Torvaldsad3f9a72009-10-27 11:28:07 -070093 bisect:1,
Junio C Hamanoebdc94f2010-04-20 13:48:39 -070094 ancestry_path:1,
Junio C Hamano0053e902007-03-13 01:57:22 -070095 first_parent_only:1;
Linus Torvaldsae563542006-02-25 16:19:46 -080096
Linus Torvaldscd2bdc52006-04-14 16:52:13 -070097 /* Diff flags */
98 unsigned int diff:1,
99 full_diff:1,
100 show_root_diff:1,
101 no_commit_id:1,
102 verbose_header:1,
103 ignore_merges:1,
104 combine_merges:1,
105 dense_combined_merges:1,
106 always_show_header:1;
107
108 /* Format info */
Linus Torvalds91539832006-04-17 11:59:32 -0700109 unsigned int shown_one:1,
Pierre Habouzit02e54222008-07-08 15:19:33 +0200110 show_merge:1,
Junio C Hamano66b2ed02010-01-20 13:59:36 -0800111 show_notes:1,
112 show_notes_given:1,
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700113 show_signature:1,
Junio C Hamano66b2ed02010-01-20 13:59:36 -0800114 pretty_given:1,
Junio C Hamano4da45be2008-04-07 17:11:34 -0700115 abbrev_commit:1,
Jay Soffian0c476952011-05-18 13:56:04 -0400116 abbrev_commit_given:1,
Adam Simpkins7fefda52008-05-04 03:36:54 -0700117 use_terminator:1,
Jeff Kingf4ea32f2009-09-24 04:28:15 -0400118 missing_newline:1,
Jeff King9553d2b2011-05-26 18:28:17 -0400119 date_mode_explicit:1,
120 preserve_subject:1;
Junio C Hamano8b3dce52009-11-03 06:59:18 -0800121 unsigned int disable_stdin:1;
René Scharfe4a43d372011-10-01 17:56:08 +0200122 unsigned int leak_pending:1;
Junio C Hamano8b3dce52009-11-03 06:59:18 -0800123
Junio C Hamanoa7b02cc2007-04-24 23:36:22 -0700124 enum date_mode date_mode;
Junio C Hamano106d7102006-09-06 02:12:09 -0700125
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700126 unsigned int abbrev;
127 enum cmit_fmt commit_format;
Linus Torvalds91539832006-04-17 11:59:32 -0700128 struct log_info *loginfo;
Johannes Schindelin596524b2006-05-05 04:30:52 +0200129 int nr, total;
Johannes Schindelin698ce6f2006-05-20 15:40:29 +0200130 const char *mime_boundary;
Stephen Boyd108dab22009-03-22 19:14:05 -0700131 const char *patch_suffix;
132 int numbered_files;
Daniel Barkalowe1a37342008-02-18 22:56:06 -0500133 char *message_id;
Thomas Rastb079c502009-02-19 22:26:31 +0100134 struct string_list *ref_message_ids;
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700135 const char *add_signoff;
Johannes Schindelin20ff0682006-06-02 15:21:17 +0200136 const char *extra_headers;
Junio C Hamano52883fb2006-12-25 11:48:35 -0800137 const char *log_reencode;
Robin H. Johnson2d9e4a42007-04-11 16:58:07 -0700138 const char *subject_prefix;
Johannes Schindelinc112f682007-03-04 00:12:06 +0100139 int no_inline;
Marco Costalba9fa34652007-07-20 20:15:13 +0200140 int show_log_size;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700141
Junio C Hamano8ecae9b2006-09-17 15:43:40 -0700142 /* Filter by commit log message */
Jeff King0843acf2008-08-25 02:15:05 -0400143 struct grep_opt grep_filter;
Junio C Hamano8ecae9b2006-09-17 15:43:40 -0700144
Adam Simpkins7fefda52008-05-04 03:36:54 -0700145 /* Display history graph */
146 struct git_graph *graph;
147
Linus Torvaldsae563542006-02-25 16:19:46 -0800148 /* special limits */
Junio C Hamanod5db6c92006-12-19 18:25:32 -0800149 int skip_count;
Linus Torvaldsae563542006-02-25 16:19:46 -0800150 int max_count;
151 unsigned long max_age;
152 unsigned long min_age;
Michael J Gruberad5aeed2011-03-21 11:14:06 +0100153 int min_parents;
154 int max_parents;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100155
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700156 /* diff info for patches and for paths limiting */
Junio C Hamanoc4e05b12006-04-10 18:14:54 -0700157 struct diff_options diffopt;
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700158 struct diff_options pruning;
Junio C Hamanoc4e05b12006-04-10 18:14:54 -0700159
Johannes Schindelin8860fd42007-01-11 11:47:48 +0100160 struct reflog_walk_info *reflog_info;
Junio C Hamanof35f5602008-04-03 02:12:06 -0700161 struct decoration children;
Junio C Hamanofaf01562008-08-14 10:59:44 -0700162 struct decoration merge_simplification;
Thomas Rast894a9d32010-03-12 18:04:26 +0100163
164 /* notes-specific options: which refs to show */
165 struct display_notes_opt notes_opt;
Thomas Rastf69c5012010-06-10 13:47:23 +0200166
167 /* commit counts */
168 int count_left;
169 int count_right;
Michael J Gruberb388e142011-04-26 10:24:29 +0200170 int count_same;
Linus Torvaldsae563542006-02-25 16:19:46 -0800171};
172
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100173#define REV_TREE_SAME 0
Linus Torvaldsceff8e72009-06-02 18:34:01 -0700174#define REV_TREE_NEW 1 /* Only new files */
175#define REV_TREE_OLD 2 /* Only files removed */
176#define REV_TREE_DIFFERENT 3 /* Mixed changes */
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100177
Linus Torvaldsae563542006-02-25 16:19:46 -0800178/* revision.c */
Linus Torvaldscdcefbc2007-11-03 11:11:10 -0700179typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
Brandon Casey4dc1db02008-08-20 19:34:30 -0500180extern volatile show_early_output_fn_t show_early_output;
Fredrik Kuivinen8efdc322006-03-10 10:21:39 +0100181
Junio C Hamano32962c92010-03-08 22:58:09 -0800182struct setup_revision_opt {
183 const char *def;
Junio C Hamanob4490052010-03-08 23:27:25 -0800184 void (*tweak)(struct rev_info *, struct setup_revision_opt *);
Heiko Voigt9ef6aeb2010-07-07 15:39:12 +0200185 const char *submodule;
Clemens Buchacher6d5b93f2012-04-14 21:04:48 +0200186 int assume_dashdash;
Junio C Hamanod5f6b1d2012-07-02 12:43:05 -0700187 unsigned revarg_opt;
Junio C Hamano32962c92010-03-08 22:58:09 -0800188};
189
Linus Torvaldsdb6296a2006-07-28 21:21:48 -0700190extern void init_revisions(struct rev_info *revs, const char *prefix);
Junio C Hamano32962c92010-03-08 22:58:09 -0800191extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
Pierre Habouzit6b61ec02008-07-09 23:38:34 +0200192extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
193 const struct option *options,
194 const char * const usagestr[]);
Junio C Hamano8e676e82012-07-02 12:33:52 -0700195#define REVARG_CANNOT_BE_FILENAME 01
Junio C Hamanod5f6b1d2012-07-02 12:43:05 -0700196#define REVARG_COMMITTISH 02
Junio C Hamano8e676e82012-07-02 12:33:52 -0700197extern int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt);
Junio C Hamano5d6f0932006-09-05 21:28:36 -0700198
Heiko Voigtbcc0a3e2012-03-29 09:21:21 +0200199extern void reset_revision_walk(void);
Alex Riesencc0e6c52007-05-04 23:54:57 +0200200extern int prepare_revision_walk(struct rev_info *revs);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800201extern struct commit *get_revision(struct rev_info *revs);
Michael J Gruber1df2d652011-03-07 13:31:39 +0100202extern char *get_revision_mark(const struct rev_info *revs, const struct commit *commit);
Michael J Gruberb1b47552011-03-10 15:45:03 +0100203extern void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
Linus Torvaldsa4a88b22006-02-28 11:24:00 -0800204
Linus Torvaldsae563542006-02-25 16:19:46 -0800205extern void mark_parents_uninteresting(struct commit *commit);
206extern void mark_tree_uninteresting(struct tree *tree);
207
208struct name_path {
209 struct name_path *up;
210 int elem_len;
211 const char *elem;
212};
213
Linus Torvaldscf2ab912009-04-10 18:15:26 -0700214char *path_name(const struct name_path *path, const char *name);
Linus Torvalds8d2dfc42009-04-10 17:27:58 -0700215
Junio C Hamano91f17512011-08-17 14:30:34 -0700216extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *);
217
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700218extern void add_object(struct object *obj,
219 struct object_array *p,
220 struct name_path *path,
221 const char *name);
222
223extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
René Scharfe26c31772011-10-01 17:43:52 +0200224extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
Linus Torvaldsae563542006-02-25 16:19:46 -0800225
Junio C Hamano3384a2d2007-12-11 10:09:04 -0800226extern void add_head_to_pending(struct rev_info *);
227
Linus Torvalds252a7c02007-11-04 12:12:05 -0800228enum commit_action {
229 commit_ignore,
230 commit_show,
231 commit_error
232};
233
Adam Simpkinsbeb5af42009-08-18 19:34:33 -0700234extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
Linus Torvalds252a7c02007-11-04 12:12:05 -0800235extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
236
Linus Torvaldsae563542006-02-25 16:19:46 -0800237#endif