diff options
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 82 |
1 files changed, 64 insertions, 18 deletions
diff --git a/revision.h b/revision.h index f46b4d55a2..a14deefc25 100644 --- a/revision.h +++ b/revision.h @@ -1,21 +1,26 @@ #ifndef REVISION_H #define REVISION_H +#include "parse-options.h" +#include "grep.h" + #define SEEN (1u<<0) #define UNINTERESTING (1u<<1) -#define TREECHANGE (1u<<2) +#define TREESAME (1u<<2) #define SHOWN (1u<<3) #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */ #define BOUNDARY (1u<<5) #define CHILD_SHOWN (1u<<6) #define ADDED (1u<<7) /* Parents already parsed and added? */ #define SYMMETRIC_LEFT (1u<<8) +#define ALL_REV_FLAGS ((1u<<9)-1) + +#define DECORATE_SHORT_REFS 1 +#define DECORATE_FULL_REFS 2 struct rev_info; struct log_info; -typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit); - struct rev_info { /* Starting list */ struct commit_list *commits; @@ -26,28 +31,39 @@ struct rev_info { /* Basic information */ const char *prefix; + const char *def; void *prune_data; - prune_fn_t *prune_fn; + unsigned int early_output; /* Traversal flags */ unsigned int dense:1, + prune:1, no_merges:1, + merges_only:1, no_walk:1, + show_all:1, remove_empty_trees:1, simplify_history:1, lifo:1, topo_order:1, + simplify_merges:1, + simplify_by_decoration:1, tag_objects:1, tree_objects:1, blob_objects:1, edge_hint:1, limited:1, - unpacked:1, /* see also ignore_packed below */ + unpacked:1, boundary:2, left_right:1, - parents:1, + rewrite_parents:1, + print_parents:1, + show_source:1, + show_decorations:1, reverse:1, + reverse_output_stage:1, cherry_pick:1, + bisect:1, first_parent_only:1; /* Diff flags */ @@ -63,27 +79,39 @@ struct rev_info { /* Format info */ unsigned int shown_one:1, - abbrev_commit:1; - enum date_mode date_mode; + show_merge:1, + show_notes:1, + show_notes_given:1, + pretty_given:1, + abbrev_commit:1, + use_terminator:1, + missing_newline:1, + date_mode_explicit:1; + unsigned int disable_stdin:1; - const char **ignore_packed; /* pretend objects in these are unpacked */ - int num_ignore_packed; + enum date_mode date_mode; unsigned int abbrev; enum cmit_fmt commit_format; struct log_info *loginfo; int nr, total; const char *mime_boundary; - const char *message_id; - const char *ref_message_id; + const char *patch_suffix; + int numbered_files; + char *message_id; + struct string_list *ref_message_ids; const char *add_signoff; const char *extra_headers; const char *log_reencode; const char *subject_prefix; int no_inline; + int show_log_size; /* Filter by commit log message */ - struct grep_opt *grep_filter; + struct grep_opt grep_filter; + + /* Display history graph */ + struct git_graph *graph; /* special limits */ int skip_count; @@ -95,20 +123,25 @@ struct rev_info { struct diff_options diffopt; struct diff_options pruning; - topo_sort_set_fn_t topo_setter; - topo_sort_get_fn_t topo_getter; - struct reflog_walk_info *reflog_info; + struct decoration children; + struct decoration merge_simplification; }; #define REV_TREE_SAME 0 -#define REV_TREE_NEW 1 -#define REV_TREE_DIFFERENT 2 +#define REV_TREE_NEW 1 /* Only new files */ +#define REV_TREE_OLD 2 /* Only files removed */ +#define REV_TREE_DIFFERENT 3 /* Mixed changes */ /* revision.c */ +typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *); +extern volatile show_early_output_fn_t show_early_output; extern void init_revisions(struct rev_info *revs, const char *prefix); extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def); +extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, + const struct option *options, + const char * const usagestr[]); extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename); extern int prepare_revision_walk(struct rev_info *revs); @@ -123,6 +156,8 @@ struct name_path { const char *elem; }; +char *path_name(const struct name_path *path, const char *name); + extern void add_object(struct object *obj, struct object_array *p, struct name_path *path, @@ -130,4 +165,15 @@ extern void add_object(struct object *obj, extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name); +extern void add_head_to_pending(struct rev_info *); + +enum commit_action { + commit_ignore, + commit_show, + commit_error +}; + +extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit); +extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit); + #endif |