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" |
Junio C Hamano | 08f704f | 2013-06-06 16:07:14 -0700 | [diff] [blame] | 7 | #include "commit.h" |
Felipe Contreras | 19ecb56 | 2013-10-31 03:25:36 -0600 | [diff] [blame] | 8 | #include "diff.h" |
Pierre Habouzit | 6b61ec0 | 2008-07-09 23:38:34 +0200 | [diff] [blame] | 9 | |
Nguyễn Thái Ngọc Duy | 208acbf | 2014-03-25 20:23:26 +0700 | [diff] [blame] | 10 | /* Remember to update object flag allocation in object.h */ |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 11 | #define SEEN (1u<<0) |
| 12 | #define UNINTERESTING (1u<<1) |
Linus Torvalds | 7dc0fe3 | 2007-11-12 23:16:08 -0800 | [diff] [blame] | 13 | #define TREESAME (1u<<2) |
Linus Torvalds | 765ac8e | 2006-02-28 15:07:20 -0800 | [diff] [blame] | 14 | #define SHOWN (1u<<3) |
Junio C Hamano | 7ae0b0c | 2006-03-01 00:58:56 -0800 | [diff] [blame] | 15 | #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */ |
Junio C Hamano | 384e99a | 2006-03-27 23:58:34 -0800 | [diff] [blame] | 16 | #define BOUNDARY (1u<<5) |
Junio C Hamano | 2b06469 | 2007-03-05 16:10:28 -0800 | [diff] [blame] | 17 | #define CHILD_SHOWN (1u<<6) |
Junio C Hamano | 1b65a5a | 2006-04-16 18:12:49 -0700 | [diff] [blame] | 18 | #define ADDED (1u<<7) /* Parents already parsed and added? */ |
Junio C Hamano | 577ed5c | 2006-10-22 17:32:47 -0700 | [diff] [blame] | 19 | #define SYMMETRIC_LEFT (1u<<8) |
Michael J Gruber | adbbb31 | 2011-03-07 13:31:40 +0100 | [diff] [blame] | 20 | #define PATCHSAME (1u<<9) |
Kevin Bracey | 7f34a46 | 2013-05-16 18:32:38 +0300 | [diff] [blame] | 21 | #define BOTTOM (1u<<10) |
Nguyễn Thái Ngọc Duy | 1b32dec | 2014-03-25 20:23:27 +0700 | [diff] [blame] | 22 | #define TRACK_LINEAR (1u<<26) |
| 23 | #define ALL_REV_FLAGS (((1u<<11)-1) | TRACK_LINEAR) |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 24 | |
Lars Hjemli | 33e7018 | 2009-08-15 16:23:12 +0200 | [diff] [blame] | 25 | #define DECORATE_SHORT_REFS 1 |
| 26 | #define DECORATE_FULL_REFS 2 |
| 27 | |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 28 | struct rev_info; |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 29 | struct log_info; |
Thomas Rast | 894a9d3 | 2010-03-12 18:04:26 +0100 | [diff] [blame] | 30 | struct string_list; |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 31 | struct saved_parents; |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 32 | |
Junio C Hamano | 281eee4 | 2011-08-25 17:35:39 -0700 | [diff] [blame] | 33 | struct rev_cmdline_info { |
| 34 | unsigned int nr; |
| 35 | unsigned int alloc; |
| 36 | struct rev_cmdline_entry { |
| 37 | struct object *item; |
| 38 | const char *name; |
| 39 | enum { |
| 40 | REV_CMD_REF, |
| 41 | REV_CMD_PARENTS_ONLY, |
| 42 | REV_CMD_LEFT, |
| 43 | REV_CMD_RIGHT, |
Kevin Bracey | a765499 | 2013-05-13 18:00:47 +0300 | [diff] [blame] | 44 | REV_CMD_MERGE_BASE, |
Junio C Hamano | 281eee4 | 2011-08-25 17:35:39 -0700 | [diff] [blame] | 45 | REV_CMD_REV |
| 46 | } whence; |
| 47 | unsigned flags; |
| 48 | } *rev; |
| 49 | }; |
| 50 | |
Martin von Zweigbergk | ca92e59 | 2012-08-28 23:15:54 -0700 | [diff] [blame] | 51 | #define REVISION_WALK_WALK 0 |
| 52 | #define REVISION_WALK_NO_WALK_SORTED 1 |
| 53 | #define REVISION_WALK_NO_WALK_UNSORTED 2 |
| 54 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 55 | struct rev_info { |
| 56 | /* Starting list */ |
| 57 | struct commit_list *commits; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 58 | struct object_array pending; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 59 | |
Junio C Hamano | 86ab490 | 2007-03-05 13:10:06 -0800 | [diff] [blame] | 60 | /* Parents of shown commits */ |
| 61 | struct object_array boundary_commits; |
| 62 | |
Junio C Hamano | 281eee4 | 2011-08-25 17:35:39 -0700 | [diff] [blame] | 63 | /* The end-points specified by the end user */ |
| 64 | struct rev_cmdline_info cmdline; |
| 65 | |
Junio C Hamano | e7b432c | 2013-08-30 16:37:55 -0700 | [diff] [blame] | 66 | /* excluding from --branches, --refs, etc. expansion */ |
| 67 | struct string_list *ref_excludes; |
| 68 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 69 | /* Basic information */ |
| 70 | const char *prefix; |
Pierre Habouzit | 02e5422 | 2008-07-08 15:19:33 +0200 | [diff] [blame] | 71 | const char *def; |
Nguyễn Thái Ngọc Duy | afe069d | 2010-12-17 19:43:06 +0700 | [diff] [blame] | 72 | struct pathspec prune_data; |
Junio C Hamano | 08f704f | 2013-06-06 16:07:14 -0700 | [diff] [blame] | 73 | |
| 74 | /* topo-sort */ |
| 75 | enum rev_sort_order sort_order; |
| 76 | |
Junio C Hamano | cc243c3 | 2011-05-18 18:08:09 -0700 | [diff] [blame] | 77 | unsigned int early_output:1, |
Vicent Marti | 2db1a43 | 2014-03-28 06:00:43 -0400 | [diff] [blame] | 78 | ignore_missing:1, |
| 79 | ignore_missing_links:1; |
Linus Torvalds | cdcefbc | 2007-11-03 11:11:10 -0700 | [diff] [blame] | 80 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 81 | /* Traversal flags */ |
| 82 | unsigned int dense:1, |
Linus Torvalds | 53b2c82 | 2007-11-05 13:22:34 -0800 | [diff] [blame] | 83 | prune:1, |
Martin von Zweigbergk | ca92e59 | 2012-08-28 23:15:54 -0700 | [diff] [blame] | 84 | no_walk:2, |
Linus Torvalds | 3131b71 | 2008-02-09 14:02:07 -0800 | [diff] [blame] | 85 | show_all:1, |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 86 | remove_empty_trees:1, |
Linus Torvalds | 9202434 | 2006-06-11 10:57:35 -0700 | [diff] [blame] | 87 | simplify_history:1, |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 88 | topo_order:1, |
Junio C Hamano | 6546b59 | 2008-07-31 01:17:41 -0700 | [diff] [blame] | 89 | simplify_merges:1, |
Linus Torvalds | 78892e3 | 2008-11-03 11:25:46 -0800 | [diff] [blame] | 90 | simplify_by_decoration:1, |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 91 | tag_objects:1, |
| 92 | tree_objects:1, |
| 93 | blob_objects:1, |
Junio C Hamano | 5a48d24 | 2011-09-01 15:43:34 -0700 | [diff] [blame] | 94 | verify_objects:1, |
Linus Torvalds | d9a8368 | 2006-02-27 08:54:36 -0800 | [diff] [blame] | 95 | edge_hint:1, |
brian m. carlson | 1684c1b | 2014-12-24 23:05:39 +0000 | [diff] [blame] | 96 | edge_hint_aggressive:1, |
Linus Torvalds | d9a8368 | 2006-02-27 08:54:36 -0800 | [diff] [blame] | 97 | limited:1, |
Junio C Hamano | 03a9683 | 2009-02-28 00:00:21 -0800 | [diff] [blame] | 98 | unpacked:1, |
Junio C Hamano | 86ab490 | 2007-03-05 13:10:06 -0800 | [diff] [blame] | 99 | boundary:2, |
Thomas Rast | f69c501 | 2010-06-10 13:47:23 +0200 | [diff] [blame] | 100 | count:1, |
Junio C Hamano | 74bd902 | 2006-12-16 15:31:25 -0800 | [diff] [blame] | 101 | left_right:1, |
Michael J Gruber | 60adf7d | 2011-02-21 17:09:11 +0100 | [diff] [blame] | 102 | left_only:1, |
| 103 | right_only:1, |
Adam Simpkins | 885cf80 | 2008-05-04 03:36:52 -0700 | [diff] [blame] | 104 | rewrite_parents:1, |
| 105 | print_parents:1, |
Linus Torvalds | 0f3a290 | 2008-10-27 12:51:59 -0700 | [diff] [blame] | 106 | show_source:1, |
Linus Torvalds | d467a52 | 2008-11-03 11:23:57 -0800 | [diff] [blame] | 107 | show_decorations:1, |
Junio C Hamano | 0053e90 | 2007-03-13 01:57:22 -0700 | [diff] [blame] | 108 | reverse:1, |
Thomas Rast | 498bcd3 | 2008-08-29 21:18:38 +0200 | [diff] [blame] | 109 | reverse_output_stage:1, |
Junio C Hamano | d7a17ca | 2007-04-09 03:40:38 -0700 | [diff] [blame] | 110 | cherry_pick:1, |
Michael J Gruber | adbbb31 | 2011-03-07 13:31:40 +0100 | [diff] [blame] | 111 | cherry_mark:1, |
Linus Torvalds | ad3f9a7 | 2009-10-27 11:28:07 -0700 | [diff] [blame] | 112 | bisect:1, |
Junio C Hamano | ebdc94f | 2010-04-20 13:48:39 -0700 | [diff] [blame] | 113 | ancestry_path:1, |
Thomas Rast | 12da1d1 | 2013-03-28 17:47:32 +0100 | [diff] [blame] | 114 | first_parent_only:1, |
| 115 | line_level_traverse:1; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 116 | |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 117 | /* Diff flags */ |
| 118 | unsigned int diff:1, |
| 119 | full_diff:1, |
| 120 | show_root_diff:1, |
| 121 | no_commit_id:1, |
| 122 | verbose_header:1, |
| 123 | ignore_merges:1, |
| 124 | combine_merges:1, |
| 125 | dense_combined_merges:1, |
| 126 | always_show_header:1; |
| 127 | |
| 128 | /* Format info */ |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 129 | unsigned int shown_one:1, |
Junio C Hamano | bd1470b | 2012-10-17 21:27:22 -0700 | [diff] [blame] | 130 | shown_dashes:1, |
Pierre Habouzit | 02e5422 | 2008-07-08 15:19:33 +0200 | [diff] [blame] | 131 | show_merge:1, |
Junio C Hamano | 66b2ed0 | 2010-01-20 13:59:36 -0800 | [diff] [blame] | 132 | show_notes:1, |
| 133 | show_notes_given:1, |
Junio C Hamano | 0c37f1f | 2011-10-18 15:53:23 -0700 | [diff] [blame] | 134 | show_signature:1, |
Junio C Hamano | 66b2ed0 | 2010-01-20 13:59:36 -0800 | [diff] [blame] | 135 | pretty_given:1, |
Junio C Hamano | 4da45be | 2008-04-07 17:11:34 -0700 | [diff] [blame] | 136 | abbrev_commit:1, |
Jay Soffian | 0c47695 | 2011-05-18 13:56:04 -0400 | [diff] [blame] | 137 | abbrev_commit_given:1, |
brian m. carlson | 3a30aa1 | 2015-12-15 01:52:04 +0000 | [diff] [blame] | 138 | zero_commit:1, |
Adam Simpkins | 7fefda5 | 2008-05-04 03:36:54 -0700 | [diff] [blame] | 139 | use_terminator:1, |
Jeff King | f4ea32f | 2009-09-24 04:28:15 -0400 | [diff] [blame] | 140 | missing_newline:1, |
Jeff King | 9553d2b | 2011-05-26 18:28:17 -0400 | [diff] [blame] | 141 | date_mode_explicit:1, |
| 142 | preserve_subject:1; |
Junio C Hamano | 8b3dce5 | 2009-11-03 06:59:18 -0800 | [diff] [blame] | 143 | unsigned int disable_stdin:1; |
René Scharfe | 4a43d37 | 2011-10-01 17:56:08 +0200 | [diff] [blame] | 144 | unsigned int leak_pending:1; |
Nguyễn Thái Ngọc Duy | 1b32dec | 2014-03-25 20:23:27 +0700 | [diff] [blame] | 145 | /* --show-linear-break */ |
| 146 | unsigned int track_linear:1, |
| 147 | track_first_time:1, |
| 148 | linear:1; |
Junio C Hamano | 8b3dce5 | 2009-11-03 06:59:18 -0800 | [diff] [blame] | 149 | |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 150 | struct date_mode date_mode; |
Junio C Hamano | 0893eec | 2016-03-29 15:49:24 -0700 | [diff] [blame] | 151 | int expand_tabs_in_log; /* unset if negative */ |
| 152 | int expand_tabs_in_log_default; |
Junio C Hamano | 106d710 | 2006-09-06 02:12:09 -0700 | [diff] [blame] | 153 | |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 154 | unsigned int abbrev; |
| 155 | enum cmit_fmt commit_format; |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 156 | struct log_info *loginfo; |
Johannes Schindelin | 596524b | 2006-05-05 04:30:52 +0200 | [diff] [blame] | 157 | int nr, total; |
Johannes Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 158 | const char *mime_boundary; |
Stephen Boyd | 108dab2 | 2009-03-22 19:14:05 -0700 | [diff] [blame] | 159 | const char *patch_suffix; |
| 160 | int numbered_files; |
Junio C Hamano | 5fe10fe | 2012-12-22 00:21:23 -0800 | [diff] [blame] | 161 | int reroll_count; |
Daniel Barkalow | e1a3734 | 2008-02-18 22:56:06 -0500 | [diff] [blame] | 162 | char *message_id; |
Jeff King | a908047 | 2013-07-03 03:08:22 -0400 | [diff] [blame] | 163 | struct ident_split from_ident; |
Thomas Rast | b079c50 | 2009-02-19 22:26:31 +0100 | [diff] [blame] | 164 | struct string_list *ref_message_ids; |
Nguyễn Thái Ngọc Duy | 5289c56 | 2013-02-12 02:17:38 -0800 | [diff] [blame] | 165 | int add_signoff; |
Johannes Schindelin | 20ff068 | 2006-06-02 15:21:17 +0200 | [diff] [blame] | 166 | const char *extra_headers; |
Junio C Hamano | 52883fb | 2006-12-25 11:48:35 -0800 | [diff] [blame] | 167 | const char *log_reencode; |
Robin H. Johnson | 2d9e4a4 | 2007-04-11 16:58:07 -0700 | [diff] [blame] | 168 | const char *subject_prefix; |
Johannes Schindelin | c112f68 | 2007-03-04 00:12:06 +0100 | [diff] [blame] | 169 | int no_inline; |
Marco Costalba | 9fa3465 | 2007-07-20 20:15:13 +0200 | [diff] [blame] | 170 | int show_log_size; |
Antoine Pelisse | 0e2913b | 2013-01-05 22:26:41 +0100 | [diff] [blame] | 171 | struct string_list *mailmap; |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 172 | |
Junio C Hamano | 8ecae9b | 2006-09-17 15:43:40 -0700 | [diff] [blame] | 173 | /* Filter by commit log message */ |
Jeff King | 0843acf | 2008-08-25 02:15:05 -0400 | [diff] [blame] | 174 | struct grep_opt grep_filter; |
Christoph Junghans | 22dfa8a | 2015-01-12 18:33:32 -0700 | [diff] [blame] | 175 | /* Negate the match of grep_filter */ |
| 176 | int invert_grep; |
Junio C Hamano | 8ecae9b | 2006-09-17 15:43:40 -0700 | [diff] [blame] | 177 | |
Adam Simpkins | 7fefda5 | 2008-05-04 03:36:54 -0700 | [diff] [blame] | 178 | /* Display history graph */ |
| 179 | struct git_graph *graph; |
| 180 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 181 | /* special limits */ |
Junio C Hamano | d5db6c9 | 2006-12-19 18:25:32 -0800 | [diff] [blame] | 182 | int skip_count; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 183 | int max_count; |
| 184 | unsigned long max_age; |
| 185 | unsigned long min_age; |
Michael J Gruber | ad5aeed | 2011-03-21 11:14:06 +0100 | [diff] [blame] | 186 | int min_parents; |
| 187 | int max_parents; |
Vicent Marti | a330de3 | 2013-10-24 14:01:41 -0400 | [diff] [blame] | 188 | int (*include_check)(struct commit *, void *); |
| 189 | void *include_check_data; |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 190 | |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 191 | /* diff info for patches and for paths limiting */ |
Junio C Hamano | c4e05b1 | 2006-04-10 18:14:54 -0700 | [diff] [blame] | 192 | struct diff_options diffopt; |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 193 | struct diff_options pruning; |
Junio C Hamano | c4e05b1 | 2006-04-10 18:14:54 -0700 | [diff] [blame] | 194 | |
Johannes Schindelin | 8860fd4 | 2007-01-11 11:47:48 +0100 | [diff] [blame] | 195 | struct reflog_walk_info *reflog_info; |
Junio C Hamano | f35f560 | 2008-04-03 02:12:06 -0700 | [diff] [blame] | 196 | struct decoration children; |
Junio C Hamano | faf0156 | 2008-08-14 10:59:44 -0700 | [diff] [blame] | 197 | struct decoration merge_simplification; |
Kevin Bracey | d0af663 | 2013-05-16 18:32:34 +0300 | [diff] [blame] | 198 | struct decoration treesame; |
Thomas Rast | 894a9d3 | 2010-03-12 18:04:26 +0100 | [diff] [blame] | 199 | |
| 200 | /* notes-specific options: which refs to show */ |
| 201 | struct display_notes_opt notes_opt; |
Thomas Rast | f69c501 | 2010-06-10 13:47:23 +0200 | [diff] [blame] | 202 | |
| 203 | /* commit counts */ |
| 204 | int count_left; |
| 205 | int count_right; |
Michael J Gruber | b388e14 | 2011-04-26 10:24:29 +0200 | [diff] [blame] | 206 | int count_same; |
Thomas Rast | 12da1d1 | 2013-03-28 17:47:32 +0100 | [diff] [blame] | 207 | |
| 208 | /* line level range that we are chasing */ |
| 209 | struct decoration line_log_data; |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 210 | |
| 211 | /* copies of the parent lists, for --full-diff display */ |
| 212 | struct saved_parents *saved_parents_slab; |
Nguyễn Thái Ngọc Duy | 1b32dec | 2014-03-25 20:23:27 +0700 | [diff] [blame] | 213 | |
| 214 | struct commit_list *previous_parents; |
| 215 | const char *break_bar; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 216 | }; |
| 217 | |
Junio C Hamano | ff32d34 | 2013-11-01 12:02:45 -0700 | [diff] [blame] | 218 | extern int ref_excluded(struct string_list *, const char *path); |
| 219 | void clear_ref_exclusion(struct string_list **); |
| 220 | void add_ref_exclusion(struct string_list **, const char *exclude); |
| 221 | |
| 222 | |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 223 | #define REV_TREE_SAME 0 |
Linus Torvalds | ceff8e7 | 2009-06-02 18:34:01 -0700 | [diff] [blame] | 224 | #define REV_TREE_NEW 1 /* Only new files */ |
| 225 | #define REV_TREE_OLD 2 /* Only files removed */ |
| 226 | #define REV_TREE_DIFFERENT 3 /* Mixed changes */ |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 227 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 228 | /* revision.c */ |
Linus Torvalds | cdcefbc | 2007-11-03 11:11:10 -0700 | [diff] [blame] | 229 | 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] | 230 | extern volatile show_early_output_fn_t show_early_output; |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 231 | |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 232 | struct setup_revision_opt { |
| 233 | const char *def; |
Junio C Hamano | b449005 | 2010-03-08 23:27:25 -0800 | [diff] [blame] | 234 | void (*tweak)(struct rev_info *, struct setup_revision_opt *); |
Heiko Voigt | 9ef6aeb | 2010-07-07 15:39:12 +0200 | [diff] [blame] | 235 | const char *submodule; |
Clemens Buchacher | 6d5b93f | 2012-04-14 21:04:48 +0200 | [diff] [blame] | 236 | int assume_dashdash; |
Junio C Hamano | d5f6b1d | 2012-07-02 12:43:05 -0700 | [diff] [blame] | 237 | unsigned revarg_opt; |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 238 | }; |
| 239 | |
Linus Torvalds | db6296a | 2006-07-28 21:21:48 -0700 | [diff] [blame] | 240 | extern void init_revisions(struct rev_info *revs, const char *prefix); |
Michael Haggerty | ff5f5f2 | 2013-05-25 11:08:07 +0200 | [diff] [blame] | 241 | extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, |
| 242 | struct setup_revision_opt *); |
Pierre Habouzit | 6b61ec0 | 2008-07-09 23:38:34 +0200 | [diff] [blame] | 243 | extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, |
Michael Haggerty | ff5f5f2 | 2013-05-25 11:08:07 +0200 | [diff] [blame] | 244 | const struct option *options, |
| 245 | const char * const usagestr[]); |
Junio C Hamano | 8e676e8 | 2012-07-02 12:33:52 -0700 | [diff] [blame] | 246 | #define REVARG_CANNOT_BE_FILENAME 01 |
Junio C Hamano | d5f6b1d | 2012-07-02 12:43:05 -0700 | [diff] [blame] | 247 | #define REVARG_COMMITTISH 02 |
Michael Haggerty | ff5f5f2 | 2013-05-25 11:08:07 +0200 | [diff] [blame] | 248 | extern int handle_revision_arg(const char *arg, struct rev_info *revs, |
| 249 | int flags, unsigned revarg_opt); |
Junio C Hamano | 5d6f093 | 2006-09-05 21:28:36 -0700 | [diff] [blame] | 250 | |
Heiko Voigt | bcc0a3e | 2012-03-29 09:21:21 +0200 | [diff] [blame] | 251 | extern void reset_revision_walk(void); |
Alex Riesen | cc0e6c5 | 2007-05-04 23:54:57 +0200 | [diff] [blame] | 252 | extern int prepare_revision_walk(struct rev_info *revs); |
Linus Torvalds | a4a88b2 | 2006-02-28 11:24:00 -0800 | [diff] [blame] | 253 | extern struct commit *get_revision(struct rev_info *revs); |
Michael Haggerty | ff5f5f2 | 2013-05-25 11:08:07 +0200 | [diff] [blame] | 254 | extern char *get_revision_mark(const struct rev_info *revs, |
| 255 | const struct commit *commit); |
| 256 | extern void put_revision_mark(const struct rev_info *revs, |
| 257 | const struct commit *commit); |
Linus Torvalds | a4a88b2 | 2006-02-28 11:24:00 -0800 | [diff] [blame] | 258 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 259 | extern void mark_parents_uninteresting(struct commit *commit); |
| 260 | extern void mark_tree_uninteresting(struct tree *tree); |
| 261 | |
Jeff King | bd64516 | 2016-02-11 17:26:44 -0500 | [diff] [blame] | 262 | char *path_name(struct strbuf *path, const char *name); |
Linus Torvalds | 8d2dfc4 | 2009-04-10 17:27:58 -0700 | [diff] [blame] | 263 | |
Jeff King | de1e67d | 2016-02-11 17:28:36 -0500 | [diff] [blame] | 264 | extern void show_object_with_name(FILE *, struct object *, const char *); |
Junio C Hamano | 91f1751 | 2011-08-17 14:30:34 -0700 | [diff] [blame] | 265 | |
Michael Haggerty | ff5f5f2 | 2013-05-25 11:08:07 +0200 | [diff] [blame] | 266 | extern void add_pending_object(struct rev_info *revs, |
| 267 | struct object *obj, const char *name); |
| 268 | extern void add_pending_sha1(struct rev_info *revs, |
| 269 | const char *name, const unsigned char *sha1, |
| 270 | unsigned int flags); |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 271 | |
Junio C Hamano | 3384a2d | 2007-12-11 10:09:04 -0800 | [diff] [blame] | 272 | extern void add_head_to_pending(struct rev_info *); |
Jeff King | 718ccc9 | 2014-10-15 18:38:31 -0400 | [diff] [blame] | 273 | extern void add_reflogs_to_pending(struct rev_info *, unsigned int flags); |
Jeff King | 4fe1021 | 2014-10-16 20:44:23 -0400 | [diff] [blame] | 274 | extern void add_index_objects_to_pending(struct rev_info *, unsigned int flags); |
Junio C Hamano | 3384a2d | 2007-12-11 10:09:04 -0800 | [diff] [blame] | 275 | |
Linus Torvalds | 252a7c0 | 2007-11-04 12:12:05 -0800 | [diff] [blame] | 276 | enum commit_action { |
| 277 | commit_ignore, |
| 278 | commit_show, |
| 279 | commit_error |
| 280 | }; |
| 281 | |
Michael Haggerty | ff5f5f2 | 2013-05-25 11:08:07 +0200 | [diff] [blame] | 282 | extern enum commit_action get_commit_action(struct rev_info *revs, |
| 283 | struct commit *commit); |
| 284 | extern enum commit_action simplify_commit(struct rev_info *revs, |
| 285 | struct commit *commit); |
Linus Torvalds | 252a7c0 | 2007-11-04 12:12:05 -0800 | [diff] [blame] | 286 | |
Bo Yang | c7edcae | 2013-03-28 17:47:31 +0100 | [diff] [blame] | 287 | enum rewrite_result { |
| 288 | rewrite_one_ok, |
| 289 | rewrite_one_noparents, |
| 290 | rewrite_one_error |
| 291 | }; |
| 292 | |
| 293 | typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp); |
| 294 | |
| 295 | extern int rewrite_parents(struct rev_info *revs, struct commit *commit, |
| 296 | rewrite_parent_fn_t rewrite_parent); |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 297 | |
| 298 | /* |
Junio C Hamano | 0131c49 | 2015-01-14 14:49:24 -0800 | [diff] [blame] | 299 | * The log machinery saves the original parent list so that |
| 300 | * get_saved_parents() can later tell what the real parents of the |
| 301 | * commits are, when commit->parents has been modified by history |
| 302 | * simpification. |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 303 | * |
| 304 | * get_saved_parents() will transparently return commit->parents if |
| 305 | * history simplification is off. |
| 306 | */ |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 307 | extern struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit); |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 308 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 309 | #endif |