Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 1 | #ifndef REVISION_H |
| 2 | #define REVISION_H |
| 3 | |
Pierre Habouzit | 6b61ec0 | 2008-07-09 23:38:34 +0200 | [diff] [blame] | 4 | #include "parse-options.h" |
Jeff King | 0843acf | 2008-08-25 02:15:05 -0400 | [diff] [blame] | 5 | #include "grep.h" |
Thomas Rast | 894a9d3 | 2010-03-12 18:04:26 +0100 | [diff] [blame] | 6 | #include "notes.h" |
Pierre Habouzit | 6b61ec0 | 2008-07-09 23:38:34 +0200 | [diff] [blame] | 7 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 8 | #define SEEN (1u<<0) |
| 9 | #define UNINTERESTING (1u<<1) |
Linus Torvalds | 7dc0fe3 | 2007-11-12 23:16:08 -0800 | [diff] [blame] | 10 | #define TREESAME (1u<<2) |
Linus Torvalds | 765ac8e | 2006-02-28 15:07:20 -0800 | [diff] [blame] | 11 | #define SHOWN (1u<<3) |
Junio C Hamano | 7ae0b0c | 2006-03-01 00:58:56 -0800 | [diff] [blame] | 12 | #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */ |
Junio C Hamano | 384e99a | 2006-03-27 23:58:34 -0800 | [diff] [blame] | 13 | #define BOUNDARY (1u<<5) |
Junio C Hamano | 2b06469 | 2007-03-05 16:10:28 -0800 | [diff] [blame] | 14 | #define CHILD_SHOWN (1u<<6) |
Junio C Hamano | 1b65a5a | 2006-04-16 18:12:49 -0700 | [diff] [blame] | 15 | #define ADDED (1u<<7) /* Parents already parsed and added? */ |
Junio C Hamano | 577ed5c | 2006-10-22 17:32:47 -0700 | [diff] [blame] | 16 | #define SYMMETRIC_LEFT (1u<<8) |
Johannes Schindelin | e358f3c | 2008-07-23 01:51:36 +0100 | [diff] [blame] | 17 | #define ALL_REV_FLAGS ((1u<<9)-1) |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 18 | |
Lars Hjemli | 33e7018 | 2009-08-15 16:23:12 +0200 | [diff] [blame] | 19 | #define DECORATE_SHORT_REFS 1 |
| 20 | #define DECORATE_FULL_REFS 2 |
| 21 | |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 22 | struct rev_info; |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 23 | struct log_info; |
Thomas Rast | 894a9d3 | 2010-03-12 18:04:26 +0100 | [diff] [blame] | 24 | struct string_list; |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 25 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 26 | struct rev_info { |
| 27 | /* Starting list */ |
| 28 | struct commit_list *commits; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 29 | struct object_array pending; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 30 | |
Junio C Hamano | 86ab490 | 2007-03-05 13:10:06 -0800 | [diff] [blame] | 31 | /* Parents of shown commits */ |
| 32 | struct object_array boundary_commits; |
| 33 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 34 | /* Basic information */ |
| 35 | const char *prefix; |
Pierre Habouzit | 02e5422 | 2008-07-08 15:19:33 +0200 | [diff] [blame] | 36 | const char *def; |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 37 | void *prune_data; |
Linus Torvalds | cdcefbc | 2007-11-03 11:11:10 -0700 | [diff] [blame] | 38 | unsigned int early_output; |
| 39 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 40 | /* Traversal flags */ |
| 41 | unsigned int dense:1, |
Linus Torvalds | 53b2c82 | 2007-11-05 13:22:34 -0800 | [diff] [blame] | 42 | prune:1, |
Linus Torvalds | 765ac8e | 2006-02-28 15:07:20 -0800 | [diff] [blame] | 43 | no_merges:1, |
Linus Torvalds | b8e8db2 | 2009-06-29 10:28:25 -0700 | [diff] [blame] | 44 | merges_only:1, |
Linus Torvalds | ba1d450 | 2006-04-15 12:09:56 -0700 | [diff] [blame] | 45 | no_walk:1, |
Linus Torvalds | 3131b71 | 2008-02-09 14:02:07 -0800 | [diff] [blame] | 46 | show_all:1, |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 47 | remove_empty_trees:1, |
Linus Torvalds | 9202434 | 2006-06-11 10:57:35 -0700 | [diff] [blame] | 48 | simplify_history:1, |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 49 | lifo:1, |
| 50 | topo_order:1, |
Junio C Hamano | 6546b59 | 2008-07-31 01:17:41 -0700 | [diff] [blame] | 51 | simplify_merges:1, |
Linus Torvalds | 78892e3 | 2008-11-03 11:25:46 -0800 | [diff] [blame] | 52 | simplify_by_decoration:1, |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 53 | tag_objects:1, |
| 54 | tree_objects:1, |
| 55 | blob_objects:1, |
Linus Torvalds | d9a8368 | 2006-02-27 08:54:36 -0800 | [diff] [blame] | 56 | edge_hint:1, |
| 57 | limited:1, |
Junio C Hamano | 03a9683 | 2009-02-28 00:00:21 -0800 | [diff] [blame] | 58 | unpacked:1, |
Junio C Hamano | 86ab490 | 2007-03-05 13:10:06 -0800 | [diff] [blame] | 59 | boundary:2, |
Thomas Rast | f69c501 | 2010-06-10 13:47:23 +0200 | [diff] [blame] | 60 | count:1, |
Junio C Hamano | 74bd902 | 2006-12-16 15:31:25 -0800 | [diff] [blame] | 61 | left_right:1, |
Adam Simpkins | 885cf80 | 2008-05-04 03:36:52 -0700 | [diff] [blame] | 62 | rewrite_parents:1, |
| 63 | print_parents:1, |
Linus Torvalds | 0f3a290 | 2008-10-27 12:51:59 -0700 | [diff] [blame] | 64 | show_source:1, |
Linus Torvalds | d467a52 | 2008-11-03 11:23:57 -0800 | [diff] [blame] | 65 | show_decorations:1, |
Junio C Hamano | 0053e90 | 2007-03-13 01:57:22 -0700 | [diff] [blame] | 66 | reverse:1, |
Thomas Rast | 498bcd3 | 2008-08-29 21:18:38 +0200 | [diff] [blame] | 67 | reverse_output_stage:1, |
Junio C Hamano | d7a17ca | 2007-04-09 03:40:38 -0700 | [diff] [blame] | 68 | cherry_pick:1, |
Linus Torvalds | ad3f9a7 | 2009-10-27 11:28:07 -0700 | [diff] [blame] | 69 | bisect:1, |
Junio C Hamano | ebdc94f | 2010-04-20 13:48:39 -0700 | [diff] [blame] | 70 | ancestry_path:1, |
Junio C Hamano | 0053e90 | 2007-03-13 01:57:22 -0700 | [diff] [blame] | 71 | first_parent_only:1; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 72 | |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 73 | /* Diff flags */ |
| 74 | unsigned int diff:1, |
| 75 | full_diff:1, |
| 76 | show_root_diff:1, |
| 77 | no_commit_id:1, |
| 78 | verbose_header:1, |
| 79 | ignore_merges:1, |
| 80 | combine_merges:1, |
| 81 | dense_combined_merges:1, |
| 82 | always_show_header:1; |
| 83 | |
| 84 | /* Format info */ |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 85 | unsigned int shown_one:1, |
Pierre Habouzit | 02e5422 | 2008-07-08 15:19:33 +0200 | [diff] [blame] | 86 | show_merge:1, |
Junio C Hamano | 66b2ed0 | 2010-01-20 13:59:36 -0800 | [diff] [blame] | 87 | show_notes:1, |
| 88 | show_notes_given:1, |
| 89 | pretty_given:1, |
Junio C Hamano | 4da45be | 2008-04-07 17:11:34 -0700 | [diff] [blame] | 90 | abbrev_commit:1, |
Adam Simpkins | 7fefda5 | 2008-05-04 03:36:54 -0700 | [diff] [blame] | 91 | use_terminator:1, |
Jeff King | f4ea32f | 2009-09-24 04:28:15 -0400 | [diff] [blame] | 92 | missing_newline:1, |
| 93 | date_mode_explicit:1; |
Junio C Hamano | 8b3dce5 | 2009-11-03 06:59:18 -0800 | [diff] [blame] | 94 | unsigned int disable_stdin:1; |
| 95 | |
Junio C Hamano | a7b02cc | 2007-04-24 23:36:22 -0700 | [diff] [blame] | 96 | enum date_mode date_mode; |
Junio C Hamano | 106d710 | 2006-09-06 02:12:09 -0700 | [diff] [blame] | 97 | |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 98 | unsigned int abbrev; |
| 99 | enum cmit_fmt commit_format; |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 100 | struct log_info *loginfo; |
Johannes Schindelin | 596524b | 2006-05-05 04:30:52 +0200 | [diff] [blame] | 101 | int nr, total; |
Johannes Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 102 | const char *mime_boundary; |
Stephen Boyd | 108dab2 | 2009-03-22 19:14:05 -0700 | [diff] [blame] | 103 | const char *patch_suffix; |
| 104 | int numbered_files; |
Daniel Barkalow | e1a3734 | 2008-02-18 22:56:06 -0500 | [diff] [blame] | 105 | char *message_id; |
Thomas Rast | b079c50 | 2009-02-19 22:26:31 +0100 | [diff] [blame] | 106 | struct string_list *ref_message_ids; |
Junio C Hamano | cf2251b | 2006-05-31 15:11:49 -0700 | [diff] [blame] | 107 | const char *add_signoff; |
Johannes Schindelin | 20ff068 | 2006-06-02 15:21:17 +0200 | [diff] [blame] | 108 | const char *extra_headers; |
Junio C Hamano | 52883fb | 2006-12-25 11:48:35 -0800 | [diff] [blame] | 109 | const char *log_reencode; |
Robin H. Johnson | 2d9e4a4 | 2007-04-11 16:58:07 -0700 | [diff] [blame] | 110 | const char *subject_prefix; |
Johannes Schindelin | c112f68 | 2007-03-04 00:12:06 +0100 | [diff] [blame] | 111 | int no_inline; |
Marco Costalba | 9fa3465 | 2007-07-20 20:15:13 +0200 | [diff] [blame] | 112 | int show_log_size; |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 113 | |
Junio C Hamano | 8ecae9b | 2006-09-17 15:43:40 -0700 | [diff] [blame] | 114 | /* Filter by commit log message */ |
Jeff King | 0843acf | 2008-08-25 02:15:05 -0400 | [diff] [blame] | 115 | struct grep_opt grep_filter; |
Junio C Hamano | 8ecae9b | 2006-09-17 15:43:40 -0700 | [diff] [blame] | 116 | |
Adam Simpkins | 7fefda5 | 2008-05-04 03:36:54 -0700 | [diff] [blame] | 117 | /* Display history graph */ |
| 118 | struct git_graph *graph; |
| 119 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 120 | /* special limits */ |
Junio C Hamano | d5db6c9 | 2006-12-19 18:25:32 -0800 | [diff] [blame] | 121 | int skip_count; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 122 | int max_count; |
| 123 | unsigned long max_age; |
| 124 | unsigned long min_age; |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 125 | |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 126 | /* diff info for patches and for paths limiting */ |
Junio C Hamano | c4e05b1 | 2006-04-10 18:14:54 -0700 | [diff] [blame] | 127 | struct diff_options diffopt; |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 128 | struct diff_options pruning; |
Junio C Hamano | c4e05b1 | 2006-04-10 18:14:54 -0700 | [diff] [blame] | 129 | |
Johannes Schindelin | 8860fd4 | 2007-01-11 11:47:48 +0100 | [diff] [blame] | 130 | struct reflog_walk_info *reflog_info; |
Junio C Hamano | f35f560 | 2008-04-03 02:12:06 -0700 | [diff] [blame] | 131 | struct decoration children; |
Junio C Hamano | faf0156 | 2008-08-14 10:59:44 -0700 | [diff] [blame] | 132 | struct decoration merge_simplification; |
Thomas Rast | 894a9d3 | 2010-03-12 18:04:26 +0100 | [diff] [blame] | 133 | |
| 134 | /* notes-specific options: which refs to show */ |
| 135 | struct display_notes_opt notes_opt; |
Thomas Rast | f69c501 | 2010-06-10 13:47:23 +0200 | [diff] [blame] | 136 | |
| 137 | /* commit counts */ |
| 138 | int count_left; |
| 139 | int count_right; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 140 | }; |
| 141 | |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 142 | #define REV_TREE_SAME 0 |
Linus Torvalds | ceff8e7 | 2009-06-02 18:34:01 -0700 | [diff] [blame] | 143 | #define REV_TREE_NEW 1 /* Only new files */ |
| 144 | #define REV_TREE_OLD 2 /* Only files removed */ |
| 145 | #define REV_TREE_DIFFERENT 3 /* Mixed changes */ |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 146 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 147 | /* revision.c */ |
Linus Torvalds | cdcefbc | 2007-11-03 11:11:10 -0700 | [diff] [blame] | 148 | typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *); |
Brandon Casey | 4dc1db0 | 2008-08-20 19:34:30 -0500 | [diff] [blame] | 149 | extern volatile show_early_output_fn_t show_early_output; |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 150 | |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 151 | struct setup_revision_opt { |
| 152 | const char *def; |
Junio C Hamano | b449005 | 2010-03-08 23:27:25 -0800 | [diff] [blame] | 153 | void (*tweak)(struct rev_info *, struct setup_revision_opt *); |
Heiko Voigt | 9ef6aeb | 2010-07-07 15:39:12 +0200 | [diff] [blame] | 154 | const char *submodule; |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 155 | }; |
| 156 | |
Linus Torvalds | db6296a | 2006-07-28 21:21:48 -0700 | [diff] [blame] | 157 | extern void init_revisions(struct rev_info *revs, const char *prefix); |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 158 | extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *); |
Pierre Habouzit | 6b61ec0 | 2008-07-09 23:38:34 +0200 | [diff] [blame] | 159 | extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, |
| 160 | const struct option *options, |
| 161 | const char * const usagestr[]); |
Junio C Hamano | 5d6f093 | 2006-09-05 21:28:36 -0700 | [diff] [blame] | 162 | extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename); |
| 163 | |
Alex Riesen | cc0e6c5 | 2007-05-04 23:54:57 +0200 | [diff] [blame] | 164 | extern int prepare_revision_walk(struct rev_info *revs); |
Linus Torvalds | a4a88b2 | 2006-02-28 11:24:00 -0800 | [diff] [blame] | 165 | extern struct commit *get_revision(struct rev_info *revs); |
| 166 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 167 | extern void mark_parents_uninteresting(struct commit *commit); |
| 168 | extern void mark_tree_uninteresting(struct tree *tree); |
| 169 | |
| 170 | struct name_path { |
| 171 | struct name_path *up; |
| 172 | int elem_len; |
| 173 | const char *elem; |
| 174 | }; |
| 175 | |
Linus Torvalds | cf2ab91 | 2009-04-10 18:15:26 -0700 | [diff] [blame] | 176 | char *path_name(const struct name_path *path, const char *name); |
Linus Torvalds | 8d2dfc4 | 2009-04-10 17:27:58 -0700 | [diff] [blame] | 177 | |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 178 | extern void add_object(struct object *obj, |
| 179 | struct object_array *p, |
| 180 | struct name_path *path, |
| 181 | const char *name); |
| 182 | |
| 183 | extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name); |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 184 | |
Junio C Hamano | 3384a2d | 2007-12-11 10:09:04 -0800 | [diff] [blame] | 185 | extern void add_head_to_pending(struct rev_info *); |
| 186 | |
Linus Torvalds | 252a7c0 | 2007-11-04 12:12:05 -0800 | [diff] [blame] | 187 | enum commit_action { |
| 188 | commit_ignore, |
| 189 | commit_show, |
| 190 | commit_error |
| 191 | }; |
| 192 | |
Adam Simpkins | beb5af4 | 2009-08-18 19:34:33 -0700 | [diff] [blame] | 193 | extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit); |
Linus Torvalds | 252a7c0 | 2007-11-04 12:12:05 -0800 | [diff] [blame] | 194 | extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit); |
| 195 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 196 | #endif |