Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 1 | #ifndef REVISION_H |
| 2 | #define REVISION_H |
| 3 | |
Elijah Newren | ef3ca95 | 2018-08-15 10:54:05 -0700 | [diff] [blame] | 4 | #include "commit.h" |
Pierre Habouzit | 6b61ec0 | 2008-07-09 23:38:34 +0200 | [diff] [blame] | 5 | #include "parse-options.h" |
Jeff King | 0843acf | 2008-08-25 02:15:05 -0400 | [diff] [blame] | 6 | #include "grep.h" |
Thomas Rast | 894a9d3 | 2010-03-12 18:04:26 +0100 | [diff] [blame] | 7 | #include "notes.h" |
Olga Telezhnaya | cf39471 | 2017-12-12 08:55:35 +0000 | [diff] [blame] | 8 | #include "pretty.h" |
Felipe Contreras | 19ecb56 | 2013-10-31 03:25:36 -0600 | [diff] [blame] | 9 | #include "diff.h" |
Nguyễn Thái Ngọc Duy | 87be252 | 2018-05-19 07:28:24 +0200 | [diff] [blame] | 10 | #include "commit-slab-decl.h" |
Pierre Habouzit | 6b61ec0 | 2008-07-09 23:38:34 +0200 | [diff] [blame] | 11 | |
Nguyễn Thái Ngọc Duy | 208acbf | 2014-03-25 20:23:26 +0700 | [diff] [blame] | 12 | /* Remember to update object flag allocation in object.h */ |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 13 | #define SEEN (1u<<0) |
| 14 | #define UNINTERESTING (1u<<1) |
Linus Torvalds | 7dc0fe3 | 2007-11-12 23:16:08 -0800 | [diff] [blame] | 15 | #define TREESAME (1u<<2) |
Linus Torvalds | 765ac8e | 2006-02-28 15:07:20 -0800 | [diff] [blame] | 16 | #define SHOWN (1u<<3) |
Junio C Hamano | 7ae0b0c | 2006-03-01 00:58:56 -0800 | [diff] [blame] | 17 | #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */ |
Junio C Hamano | 384e99a | 2006-03-27 23:58:34 -0800 | [diff] [blame] | 18 | #define BOUNDARY (1u<<5) |
Junio C Hamano | 2b06469 | 2007-03-05 16:10:28 -0800 | [diff] [blame] | 19 | #define CHILD_SHOWN (1u<<6) |
Junio C Hamano | 1b65a5a | 2006-04-16 18:12:49 -0700 | [diff] [blame] | 20 | #define ADDED (1u<<7) /* Parents already parsed and added? */ |
Junio C Hamano | 577ed5c | 2006-10-22 17:32:47 -0700 | [diff] [blame] | 21 | #define SYMMETRIC_LEFT (1u<<8) |
Michael J Gruber | adbbb31 | 2011-03-07 13:31:40 +0100 | [diff] [blame] | 22 | #define PATCHSAME (1u<<9) |
Kevin Bracey | 7f34a46 | 2013-05-16 18:32:38 +0300 | [diff] [blame] | 23 | #define BOTTOM (1u<<10) |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 24 | /* |
| 25 | * Indicates object was reached by traversal. i.e. not given by user on |
| 26 | * command-line or stdin. |
| 27 | * NEEDSWORK: NOT_USER_GIVEN doesn't apply to commits because we only support |
| 28 | * filtering trees and blobs, but it may be useful to support filtering commits |
| 29 | * in the future. |
| 30 | */ |
| 31 | #define NOT_USER_GIVEN (1u<<25) |
Nguyễn Thái Ngọc Duy | 1b32dec | 2014-03-25 20:23:27 +0700 | [diff] [blame] | 32 | #define TRACK_LINEAR (1u<<26) |
Matthew DeVore | 99c9aa9 | 2018-10-05 14:31:24 -0700 | [diff] [blame] | 33 | #define ALL_REV_FLAGS (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR) |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 34 | |
Derrick Stolee | b454241 | 2018-11-01 13:46:22 +0000 | [diff] [blame] | 35 | #define TOPO_WALK_EXPLORED (1u<<27) |
| 36 | #define TOPO_WALK_INDEGREE (1u<<28) |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 37 | |
Lars Hjemli | 33e7018 | 2009-08-15 16:23:12 +0200 | [diff] [blame] | 38 | #define DECORATE_SHORT_REFS 1 |
| 39 | #define DECORATE_FULL_REFS 2 |
| 40 | |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 41 | struct log_info; |
Nguyễn Thái Ngọc Duy | 2abf350 | 2018-09-21 17:57:38 +0200 | [diff] [blame] | 42 | struct repository; |
| 43 | struct rev_info; |
Thomas Rast | 894a9d3 | 2010-03-12 18:04:26 +0100 | [diff] [blame] | 44 | struct string_list; |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 45 | struct saved_parents; |
Nguyễn Thái Ngọc Duy | 87be252 | 2018-05-19 07:28:24 +0200 | [diff] [blame] | 46 | define_shared_commit_slab(revision_sources, char *); |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 47 | |
Junio C Hamano | 281eee4 | 2011-08-25 17:35:39 -0700 | [diff] [blame] | 48 | struct rev_cmdline_info { |
| 49 | unsigned int nr; |
| 50 | unsigned int alloc; |
| 51 | struct rev_cmdline_entry { |
| 52 | struct object *item; |
| 53 | const char *name; |
| 54 | enum { |
| 55 | REV_CMD_REF, |
| 56 | REV_CMD_PARENTS_ONLY, |
| 57 | REV_CMD_LEFT, |
| 58 | REV_CMD_RIGHT, |
Kevin Bracey | a765499 | 2013-05-13 18:00:47 +0300 | [diff] [blame] | 59 | REV_CMD_MERGE_BASE, |
Junio C Hamano | 281eee4 | 2011-08-25 17:35:39 -0700 | [diff] [blame] | 60 | REV_CMD_REV |
| 61 | } whence; |
| 62 | unsigned flags; |
| 63 | } *rev; |
| 64 | }; |
| 65 | |
Martin von Zweigbergk | ca92e59 | 2012-08-28 23:15:54 -0700 | [diff] [blame] | 66 | #define REVISION_WALK_WALK 0 |
| 67 | #define REVISION_WALK_NO_WALK_SORTED 1 |
| 68 | #define REVISION_WALK_NO_WALK_UNSORTED 2 |
| 69 | |
Derrick Stolee | f1f5de4 | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 70 | struct oidset; |
Derrick Stolee | f0d9cc4 | 2018-11-01 13:46:20 +0000 | [diff] [blame] | 71 | struct topo_walk_info; |
| 72 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 73 | struct rev_info { |
| 74 | /* Starting list */ |
| 75 | struct commit_list *commits; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 76 | struct object_array pending; |
Nguyễn Thái Ngọc Duy | 2abf350 | 2018-09-21 17:57:38 +0200 | [diff] [blame] | 77 | struct repository *repo; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 78 | |
Junio C Hamano | 86ab490 | 2007-03-05 13:10:06 -0800 | [diff] [blame] | 79 | /* Parents of shown commits */ |
| 80 | struct object_array boundary_commits; |
| 81 | |
Junio C Hamano | 281eee4 | 2011-08-25 17:35:39 -0700 | [diff] [blame] | 82 | /* The end-points specified by the end user */ |
| 83 | struct rev_cmdline_info cmdline; |
| 84 | |
Junio C Hamano | e7b432c | 2013-08-30 16:37:55 -0700 | [diff] [blame] | 85 | /* excluding from --branches, --refs, etc. expansion */ |
| 86 | struct string_list *ref_excludes; |
| 87 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 88 | /* Basic information */ |
| 89 | const char *prefix; |
Pierre Habouzit | 02e5422 | 2008-07-08 15:19:33 +0200 | [diff] [blame] | 90 | const char *def; |
Nguyễn Thái Ngọc Duy | afe069d | 2010-12-17 19:43:06 +0700 | [diff] [blame] | 91 | struct pathspec prune_data; |
Junio C Hamano | 08f704f | 2013-06-06 16:07:14 -0700 | [diff] [blame] | 92 | |
Jeff King | 7ba8262 | 2017-08-02 18:25:27 -0400 | [diff] [blame] | 93 | /* |
| 94 | * Whether the arguments parsed by setup_revisions() included any |
| 95 | * "input" revisions that might still have yielded an empty pending |
| 96 | * list (e.g., patterns like "--all" or "--glob"). |
| 97 | */ |
| 98 | int rev_input_given; |
| 99 | |
Jeff King | a12cbe2 | 2018-08-22 17:37:23 -0400 | [diff] [blame] | 100 | /* |
| 101 | * Whether we read from stdin due to the --stdin option. |
| 102 | */ |
| 103 | int read_from_stdin; |
| 104 | |
Junio C Hamano | 08f704f | 2013-06-06 16:07:14 -0700 | [diff] [blame] | 105 | /* topo-sort */ |
| 106 | enum rev_sort_order sort_order; |
| 107 | |
SZEDER Gábor | e35b6ac | 2017-06-10 13:41:01 +0200 | [diff] [blame] | 108 | unsigned int early_output; |
| 109 | |
| 110 | unsigned int ignore_missing:1, |
Vicent Marti | 2db1a43 | 2014-03-28 06:00:43 -0400 | [diff] [blame] | 111 | ignore_missing_links:1; |
Linus Torvalds | cdcefbc | 2007-11-03 11:11:10 -0700 | [diff] [blame] | 112 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 113 | /* Traversal flags */ |
| 114 | unsigned int dense:1, |
Linus Torvalds | 53b2c82 | 2007-11-05 13:22:34 -0800 | [diff] [blame] | 115 | prune:1, |
Martin von Zweigbergk | ca92e59 | 2012-08-28 23:15:54 -0700 | [diff] [blame] | 116 | no_walk:2, |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 117 | remove_empty_trees:1, |
Linus Torvalds | 9202434 | 2006-06-11 10:57:35 -0700 | [diff] [blame] | 118 | simplify_history:1, |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 119 | topo_order:1, |
Junio C Hamano | 6546b59 | 2008-07-31 01:17:41 -0700 | [diff] [blame] | 120 | simplify_merges:1, |
Linus Torvalds | 78892e3 | 2008-11-03 11:25:46 -0800 | [diff] [blame] | 121 | simplify_by_decoration:1, |
Nguyễn Thái Ngọc Duy | ff9445b | 2017-08-23 19:36:49 +0700 | [diff] [blame] | 122 | single_worktree:1, |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 123 | tag_objects:1, |
| 124 | tree_objects:1, |
| 125 | blob_objects:1, |
Junio C Hamano | 5a48d24 | 2011-09-01 15:43:34 -0700 | [diff] [blame] | 126 | verify_objects:1, |
Linus Torvalds | d9a8368 | 2006-02-27 08:54:36 -0800 | [diff] [blame] | 127 | edge_hint:1, |
brian m. carlson | 1684c1b | 2014-12-24 23:05:39 +0000 | [diff] [blame] | 128 | edge_hint_aggressive:1, |
Linus Torvalds | d9a8368 | 2006-02-27 08:54:36 -0800 | [diff] [blame] | 129 | limited:1, |
Junio C Hamano | 03a9683 | 2009-02-28 00:00:21 -0800 | [diff] [blame] | 130 | unpacked:1, |
Junio C Hamano | 86ab490 | 2007-03-05 13:10:06 -0800 | [diff] [blame] | 131 | boundary:2, |
Thomas Rast | f69c501 | 2010-06-10 13:47:23 +0200 | [diff] [blame] | 132 | count:1, |
Junio C Hamano | 74bd902 | 2006-12-16 15:31:25 -0800 | [diff] [blame] | 133 | left_right:1, |
Michael J Gruber | 60adf7d | 2011-02-21 17:09:11 +0100 | [diff] [blame] | 134 | left_only:1, |
| 135 | right_only:1, |
Adam Simpkins | 885cf80 | 2008-05-04 03:36:52 -0700 | [diff] [blame] | 136 | rewrite_parents:1, |
| 137 | print_parents:1, |
Linus Torvalds | d467a52 | 2008-11-03 11:23:57 -0800 | [diff] [blame] | 138 | show_decorations:1, |
Junio C Hamano | 0053e90 | 2007-03-13 01:57:22 -0700 | [diff] [blame] | 139 | reverse:1, |
Thomas Rast | 498bcd3 | 2008-08-29 21:18:38 +0200 | [diff] [blame] | 140 | reverse_output_stage:1, |
Junio C Hamano | d7a17ca | 2007-04-09 03:40:38 -0700 | [diff] [blame] | 141 | cherry_pick:1, |
Michael J Gruber | adbbb31 | 2011-03-07 13:31:40 +0100 | [diff] [blame] | 142 | cherry_mark:1, |
Linus Torvalds | ad3f9a7 | 2009-10-27 11:28:07 -0700 | [diff] [blame] | 143 | bisect:1, |
Junio C Hamano | ebdc94f | 2010-04-20 13:48:39 -0700 | [diff] [blame] | 144 | ancestry_path:1, |
Thomas Rast | 12da1d1 | 2013-03-28 17:47:32 +0100 | [diff] [blame] | 145 | first_parent_only:1, |
Stefan Beller | ce5b6f9 | 2017-11-15 18:00:35 -0800 | [diff] [blame] | 146 | line_level_traverse:1, |
Junio C Hamano | f3d618d | 2018-02-13 13:39:03 -0800 | [diff] [blame] | 147 | tree_blobs_in_commit_order:1, |
Jonathan Tan | df11e19 | 2017-12-08 15:27:15 +0000 | [diff] [blame] | 148 | |
Matthew DeVore | 7c0fe33 | 2018-10-05 14:31:23 -0700 | [diff] [blame] | 149 | /* |
| 150 | * Blobs are shown without regard for their existence. |
| 151 | * But not so for trees: unless exclude_promisor_objects |
| 152 | * is set and the tree in question is a promisor object; |
| 153 | * OR ignore_missing_links is set, the revision walker |
| 154 | * dies with a "bad tree object HASH" message when |
| 155 | * encountering a missing tree. For callers that can |
| 156 | * handle missing trees and want them to be filterable |
| 157 | * and showable, set this to true. The revision walker |
| 158 | * will filter and show such a missing tree as usual, |
| 159 | * but will not attempt to recurse into this tree |
| 160 | * object. |
| 161 | */ |
| 162 | do_not_die_on_missing_tree:1, |
| 163 | |
Jonathan Tan | df11e19 | 2017-12-08 15:27:15 +0000 | [diff] [blame] | 164 | /* for internal use only */ |
| 165 | exclude_promisor_objects:1; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 166 | |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 167 | /* Diff flags */ |
| 168 | unsigned int diff:1, |
| 169 | full_diff:1, |
| 170 | show_root_diff:1, |
| 171 | no_commit_id:1, |
| 172 | verbose_header:1, |
| 173 | ignore_merges:1, |
| 174 | combine_merges:1, |
Elijah Newren | d76ce4f | 2019-02-07 17:12:46 -0800 | [diff] [blame] | 175 | combined_all_paths:1, |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 176 | dense_combined_merges:1, |
| 177 | always_show_header:1; |
| 178 | |
| 179 | /* Format info */ |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 180 | unsigned int shown_one:1, |
Junio C Hamano | bd1470b | 2012-10-17 21:27:22 -0700 | [diff] [blame] | 181 | shown_dashes:1, |
Pierre Habouzit | 02e5422 | 2008-07-08 15:19:33 +0200 | [diff] [blame] | 182 | show_merge:1, |
Junio C Hamano | 66b2ed0 | 2010-01-20 13:59:36 -0800 | [diff] [blame] | 183 | show_notes:1, |
| 184 | show_notes_given:1, |
Junio C Hamano | 0c37f1f | 2011-10-18 15:53:23 -0700 | [diff] [blame] | 185 | show_signature:1, |
Junio C Hamano | 66b2ed0 | 2010-01-20 13:59:36 -0800 | [diff] [blame] | 186 | pretty_given:1, |
Junio C Hamano | 4da45be | 2008-04-07 17:11:34 -0700 | [diff] [blame] | 187 | abbrev_commit:1, |
Jay Soffian | 0c47695 | 2011-05-18 13:56:04 -0400 | [diff] [blame] | 188 | abbrev_commit_given:1, |
brian m. carlson | 3a30aa1 | 2015-12-15 01:52:04 +0000 | [diff] [blame] | 189 | zero_commit:1, |
Adam Simpkins | 7fefda5 | 2008-05-04 03:36:54 -0700 | [diff] [blame] | 190 | use_terminator:1, |
Jeff King | f4ea32f | 2009-09-24 04:28:15 -0400 | [diff] [blame] | 191 | missing_newline:1, |
Jeff King | 9553d2b | 2011-05-26 18:28:17 -0400 | [diff] [blame] | 192 | date_mode_explicit:1, |
| 193 | preserve_subject:1; |
Junio C Hamano | 8b3dce5 | 2009-11-03 06:59:18 -0800 | [diff] [blame] | 194 | unsigned int disable_stdin:1; |
Nguyễn Thái Ngọc Duy | 1b32dec | 2014-03-25 20:23:27 +0700 | [diff] [blame] | 195 | /* --show-linear-break */ |
| 196 | unsigned int track_linear:1, |
| 197 | track_first_time:1, |
| 198 | linear:1; |
Junio C Hamano | 8b3dce5 | 2009-11-03 06:59:18 -0800 | [diff] [blame] | 199 | |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 200 | struct date_mode date_mode; |
Junio C Hamano | 0893eec | 2016-03-29 15:49:24 -0700 | [diff] [blame] | 201 | int expand_tabs_in_log; /* unset if negative */ |
| 202 | int expand_tabs_in_log_default; |
Junio C Hamano | 106d710 | 2006-09-06 02:12:09 -0700 | [diff] [blame] | 203 | |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 204 | unsigned int abbrev; |
| 205 | enum cmit_fmt commit_format; |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 206 | struct log_info *loginfo; |
Johannes Schindelin | 596524b | 2006-05-05 04:30:52 +0200 | [diff] [blame] | 207 | int nr, total; |
Johannes Schindelin | 698ce6f | 2006-05-20 15:40:29 +0200 | [diff] [blame] | 208 | const char *mime_boundary; |
Stephen Boyd | 108dab2 | 2009-03-22 19:14:05 -0700 | [diff] [blame] | 209 | const char *patch_suffix; |
| 210 | int numbered_files; |
Junio C Hamano | 5fe10fe | 2012-12-22 00:21:23 -0800 | [diff] [blame] | 211 | int reroll_count; |
Daniel Barkalow | e1a3734 | 2008-02-18 22:56:06 -0500 | [diff] [blame] | 212 | char *message_id; |
Jeff King | a908047 | 2013-07-03 03:08:22 -0400 | [diff] [blame] | 213 | struct ident_split from_ident; |
Thomas Rast | b079c50 | 2009-02-19 22:26:31 +0100 | [diff] [blame] | 214 | struct string_list *ref_message_ids; |
Nguyễn Thái Ngọc Duy | 5289c56 | 2013-02-12 02:17:38 -0800 | [diff] [blame] | 215 | int add_signoff; |
Johannes Schindelin | 20ff068 | 2006-06-02 15:21:17 +0200 | [diff] [blame] | 216 | const char *extra_headers; |
Junio C Hamano | 52883fb | 2006-12-25 11:48:35 -0800 | [diff] [blame] | 217 | const char *log_reencode; |
Robin H. Johnson | 2d9e4a4 | 2007-04-11 16:58:07 -0700 | [diff] [blame] | 218 | const char *subject_prefix; |
Johannes Schindelin | c112f68 | 2007-03-04 00:12:06 +0100 | [diff] [blame] | 219 | int no_inline; |
Marco Costalba | 9fa3465 | 2007-07-20 20:15:13 +0200 | [diff] [blame] | 220 | int show_log_size; |
Antoine Pelisse | 0e2913b | 2013-01-05 22:26:41 +0100 | [diff] [blame] | 221 | struct string_list *mailmap; |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 222 | |
Junio C Hamano | 8ecae9b | 2006-09-17 15:43:40 -0700 | [diff] [blame] | 223 | /* Filter by commit log message */ |
Jeff King | 0843acf | 2008-08-25 02:15:05 -0400 | [diff] [blame] | 224 | struct grep_opt grep_filter; |
Christoph Junghans | 22dfa8a | 2015-01-12 18:33:32 -0700 | [diff] [blame] | 225 | /* Negate the match of grep_filter */ |
| 226 | int invert_grep; |
Junio C Hamano | 8ecae9b | 2006-09-17 15:43:40 -0700 | [diff] [blame] | 227 | |
Adam Simpkins | 7fefda5 | 2008-05-04 03:36:54 -0700 | [diff] [blame] | 228 | /* Display history graph */ |
| 229 | struct git_graph *graph; |
| 230 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 231 | /* special limits */ |
Junio C Hamano | d5db6c9 | 2006-12-19 18:25:32 -0800 | [diff] [blame] | 232 | int skip_count; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 233 | int max_count; |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 234 | timestamp_t max_age; |
| 235 | timestamp_t min_age; |
Michael J Gruber | ad5aeed | 2011-03-21 11:14:06 +0100 | [diff] [blame] | 236 | int min_parents; |
| 237 | int max_parents; |
Vicent Marti | a330de3 | 2013-10-24 14:01:41 -0400 | [diff] [blame] | 238 | int (*include_check)(struct commit *, void *); |
| 239 | void *include_check_data; |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 240 | |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 241 | /* diff info for patches and for paths limiting */ |
Junio C Hamano | c4e05b1 | 2006-04-10 18:14:54 -0700 | [diff] [blame] | 242 | struct diff_options diffopt; |
Linus Torvalds | cd2bdc5 | 2006-04-14 16:52:13 -0700 | [diff] [blame] | 243 | struct diff_options pruning; |
Junio C Hamano | c4e05b1 | 2006-04-10 18:14:54 -0700 | [diff] [blame] | 244 | |
Johannes Schindelin | 8860fd4 | 2007-01-11 11:47:48 +0100 | [diff] [blame] | 245 | struct reflog_walk_info *reflog_info; |
Junio C Hamano | f35f560 | 2008-04-03 02:12:06 -0700 | [diff] [blame] | 246 | struct decoration children; |
Junio C Hamano | faf0156 | 2008-08-14 10:59:44 -0700 | [diff] [blame] | 247 | struct decoration merge_simplification; |
Kevin Bracey | d0af663 | 2013-05-16 18:32:34 +0300 | [diff] [blame] | 248 | struct decoration treesame; |
Thomas Rast | 894a9d3 | 2010-03-12 18:04:26 +0100 | [diff] [blame] | 249 | |
| 250 | /* notes-specific options: which refs to show */ |
| 251 | struct display_notes_opt notes_opt; |
Thomas Rast | f69c501 | 2010-06-10 13:47:23 +0200 | [diff] [blame] | 252 | |
Eric Sunshine | 126facf | 2018-07-22 05:57:05 -0400 | [diff] [blame] | 253 | /* interdiff */ |
| 254 | const struct object_id *idiff_oid1; |
| 255 | const struct object_id *idiff_oid2; |
Eric Sunshine | 5ac290f | 2018-07-22 05:57:06 -0400 | [diff] [blame] | 256 | const char *idiff_title; |
Eric Sunshine | 126facf | 2018-07-22 05:57:05 -0400 | [diff] [blame] | 257 | |
Eric Sunshine | 31e2617 | 2018-07-22 05:57:13 -0400 | [diff] [blame] | 258 | /* range-diff */ |
| 259 | const char *rdiff1; |
| 260 | const char *rdiff2; |
| 261 | int creation_factor; |
Eric Sunshine | 4ee9968 | 2018-07-22 05:57:15 -0400 | [diff] [blame] | 262 | const char *rdiff_title; |
Eric Sunshine | 31e2617 | 2018-07-22 05:57:13 -0400 | [diff] [blame] | 263 | |
Thomas Rast | f69c501 | 2010-06-10 13:47:23 +0200 | [diff] [blame] | 264 | /* commit counts */ |
| 265 | int count_left; |
| 266 | int count_right; |
Michael J Gruber | b388e14 | 2011-04-26 10:24:29 +0200 | [diff] [blame] | 267 | int count_same; |
Thomas Rast | 12da1d1 | 2013-03-28 17:47:32 +0100 | [diff] [blame] | 268 | |
| 269 | /* line level range that we are chasing */ |
| 270 | struct decoration line_log_data; |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 271 | |
| 272 | /* copies of the parent lists, for --full-diff display */ |
| 273 | struct saved_parents *saved_parents_slab; |
Nguyễn Thái Ngọc Duy | 1b32dec | 2014-03-25 20:23:27 +0700 | [diff] [blame] | 274 | |
| 275 | struct commit_list *previous_parents; |
| 276 | const char *break_bar; |
Nguyễn Thái Ngọc Duy | 87be252 | 2018-05-19 07:28:24 +0200 | [diff] [blame] | 277 | |
| 278 | struct revision_sources *sources; |
Derrick Stolee | f0d9cc4 | 2018-11-01 13:46:20 +0000 | [diff] [blame] | 279 | |
| 280 | struct topo_walk_info *topo_walk_info; |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 281 | }; |
| 282 | |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 283 | int ref_excluded(struct string_list *, const char *path); |
Junio C Hamano | ff32d34 | 2013-11-01 12:02:45 -0700 | [diff] [blame] | 284 | void clear_ref_exclusion(struct string_list **); |
| 285 | void add_ref_exclusion(struct string_list **, const char *exclude); |
| 286 | |
| 287 | |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 288 | #define REV_TREE_SAME 0 |
Linus Torvalds | ceff8e7 | 2009-06-02 18:34:01 -0700 | [diff] [blame] | 289 | #define REV_TREE_NEW 1 /* Only new files */ |
| 290 | #define REV_TREE_OLD 2 /* Only files removed */ |
| 291 | #define REV_TREE_DIFFERENT 3 /* Mixed changes */ |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 292 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 293 | /* revision.c */ |
Linus Torvalds | cdcefbc | 2007-11-03 11:11:10 -0700 | [diff] [blame] | 294 | 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] | 295 | extern volatile show_early_output_fn_t show_early_output; |
Fredrik Kuivinen | 8efdc32 | 2006-03-10 10:21:39 +0100 | [diff] [blame] | 296 | |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 297 | struct setup_revision_opt { |
| 298 | const char *def; |
Junio C Hamano | b449005 | 2010-03-08 23:27:25 -0800 | [diff] [blame] | 299 | void (*tweak)(struct rev_info *, struct setup_revision_opt *); |
Nguyễn Thái Ngọc Duy | 2abf350 | 2018-09-21 17:57:38 +0200 | [diff] [blame] | 300 | const char *submodule; /* TODO: drop this and use rev_info->repo */ |
Matthew DeVore | bbcde41 | 2018-12-03 14:10:19 -0800 | [diff] [blame] | 301 | unsigned int assume_dashdash:1, |
| 302 | allow_exclude_promisor_objects:1; |
Junio C Hamano | d5f6b1d | 2012-07-02 12:43:05 -0700 | [diff] [blame] | 303 | unsigned revarg_opt; |
Junio C Hamano | 32962c9 | 2010-03-08 22:58:09 -0800 | [diff] [blame] | 304 | }; |
| 305 | |
Nguyễn Thái Ngọc Duy | 2abf350 | 2018-09-21 17:57:38 +0200 | [diff] [blame] | 306 | #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS |
| 307 | #define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix) |
| 308 | #endif |
| 309 | void repo_init_revisions(struct repository *r, |
| 310 | struct rev_info *revs, |
| 311 | const char *prefix); |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 312 | int setup_revisions(int argc, const char **argv, struct rev_info *revs, |
| 313 | struct setup_revision_opt *); |
| 314 | void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, |
| 315 | const struct option *options, |
| 316 | const char * const usagestr[]); |
Junio C Hamano | 8e676e8 | 2012-07-02 12:33:52 -0700 | [diff] [blame] | 317 | #define REVARG_CANNOT_BE_FILENAME 01 |
Junio C Hamano | d5f6b1d | 2012-07-02 12:43:05 -0700 | [diff] [blame] | 318 | #define REVARG_COMMITTISH 02 |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 319 | int handle_revision_arg(const char *arg, struct rev_info *revs, |
| 320 | int flags, unsigned revarg_opt); |
Junio C Hamano | 5d6f093 | 2006-09-05 21:28:36 -0700 | [diff] [blame] | 321 | |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 322 | void reset_revision_walk(void); |
| 323 | int prepare_revision_walk(struct rev_info *revs); |
| 324 | struct commit *get_revision(struct rev_info *revs); |
| 325 | char *get_revision_mark(const struct rev_info *revs, |
| 326 | const struct commit *commit); |
| 327 | void put_revision_mark(const struct rev_info *revs, |
| 328 | const struct commit *commit); |
Linus Torvalds | a4a88b2 | 2006-02-28 11:24:00 -0800 | [diff] [blame] | 329 | |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 330 | void mark_parents_uninteresting(struct commit *commit); |
Nguyễn Thái Ngọc Duy | b3c7eef | 2018-09-21 17:57:39 +0200 | [diff] [blame] | 331 | void mark_tree_uninteresting(struct repository *r, struct tree *tree); |
Derrick Stolee | f1f5de4 | 2019-01-16 10:25:58 -0800 | [diff] [blame] | 332 | void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees); |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 333 | |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 334 | void show_object_with_name(FILE *, struct object *, const char *); |
Junio C Hamano | 91f1751 | 2011-08-17 14:30:34 -0700 | [diff] [blame] | 335 | |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 336 | void add_pending_object(struct rev_info *revs, |
| 337 | struct object *obj, const char *name); |
| 338 | void add_pending_oid(struct rev_info *revs, |
| 339 | const char *name, const struct object_id *oid, |
| 340 | unsigned int flags); |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 341 | |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 342 | void add_head_to_pending(struct rev_info *); |
| 343 | void add_reflogs_to_pending(struct rev_info *, unsigned int flags); |
| 344 | 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] | 345 | |
Linus Torvalds | 252a7c0 | 2007-11-04 12:12:05 -0800 | [diff] [blame] | 346 | enum commit_action { |
| 347 | commit_ignore, |
| 348 | commit_show, |
| 349 | commit_error |
| 350 | }; |
| 351 | |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 352 | enum commit_action get_commit_action(struct rev_info *revs, |
| 353 | struct commit *commit); |
| 354 | enum commit_action simplify_commit(struct rev_info *revs, |
| 355 | struct commit *commit); |
Linus Torvalds | 252a7c0 | 2007-11-04 12:12:05 -0800 | [diff] [blame] | 356 | |
Bo Yang | c7edcae | 2013-03-28 17:47:31 +0100 | [diff] [blame] | 357 | enum rewrite_result { |
| 358 | rewrite_one_ok, |
| 359 | rewrite_one_noparents, |
| 360 | rewrite_one_error |
| 361 | }; |
| 362 | |
| 363 | typedef enum rewrite_result (*rewrite_parent_fn_t)(struct rev_info *revs, struct commit **pp); |
| 364 | |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 365 | int rewrite_parents(struct rev_info *revs, |
| 366 | struct commit *commit, |
| 367 | rewrite_parent_fn_t rewrite_parent); |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 368 | |
| 369 | /* |
Junio C Hamano | 0131c49 | 2015-01-14 14:49:24 -0800 | [diff] [blame] | 370 | * The log machinery saves the original parent list so that |
| 371 | * get_saved_parents() can later tell what the real parents of the |
| 372 | * commits are, when commit->parents has been modified by history |
| 373 | * simpification. |
Thomas Rast | 53d00b3 | 2013-07-31 22:13:20 +0200 | [diff] [blame] | 374 | * |
| 375 | * get_saved_parents() will transparently return commit->parents if |
| 376 | * history simplification is off. |
| 377 | */ |
Nguyễn Thái Ngọc Duy | d16ec9c | 2018-06-30 11:20:30 +0200 | [diff] [blame] | 378 | 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] | 379 | |
Linus Torvalds | ae56354 | 2006-02-25 16:19:46 -0800 | [diff] [blame] | 380 | #endif |