revision.hon commit revision.c: don't show all merges for --parents (bf3418b)
   1#ifndef REVISION_H
   2#define REVISION_H
   3
   4#include "parse-options.h"
   5#include "grep.h"
   6#include "notes.h"
   7
   8#define SEEN            (1u<<0)
   9#define UNINTERESTING   (1u<<1)
  10#define TREESAME        (1u<<2)
  11#define SHOWN           (1u<<3)
  12#define TMP_MARK        (1u<<4) /* for isolated cases; clean after use */
  13#define BOUNDARY        (1u<<5)
  14#define CHILD_SHOWN     (1u<<6)
  15#define ADDED           (1u<<7) /* Parents already parsed and added? */
  16#define SYMMETRIC_LEFT  (1u<<8)
  17#define PATCHSAME       (1u<<9)
  18#define BOTTOM          (1u<<10)
  19#define ALL_REV_FLAGS   ((1u<<11)-1)
  20
  21#define DECORATE_SHORT_REFS     1
  22#define DECORATE_FULL_REFS      2
  23
  24struct rev_info;
  25struct log_info;
  26struct string_list;
  27
  28struct rev_cmdline_info {
  29        unsigned int nr;
  30        unsigned int alloc;
  31        struct rev_cmdline_entry {
  32                struct object *item;
  33                const char *name;
  34                enum {
  35                        REV_CMD_REF,
  36                        REV_CMD_PARENTS_ONLY,
  37                        REV_CMD_LEFT,
  38                        REV_CMD_RIGHT,
  39                        REV_CMD_MERGE_BASE,
  40                        REV_CMD_REV
  41                } whence;
  42                unsigned flags;
  43        } *rev;
  44};
  45
  46#define REVISION_WALK_WALK 0
  47#define REVISION_WALK_NO_WALK_SORTED 1
  48#define REVISION_WALK_NO_WALK_UNSORTED 2
  49
  50struct rev_info {
  51        /* Starting list */
  52        struct commit_list *commits;
  53        struct object_array pending;
  54
  55        /* Parents of shown commits */
  56        struct object_array boundary_commits;
  57
  58        /* The end-points specified by the end user */
  59        struct rev_cmdline_info cmdline;
  60
  61        /* Basic information */
  62        const char *prefix;
  63        const char *def;
  64        struct pathspec prune_data;
  65        unsigned int    early_output:1,
  66                        ignore_missing:1;
  67
  68        /* Traversal flags */
  69        unsigned int    dense:1,
  70                        prune:1,
  71                        no_walk:2,
  72                        show_all:1,
  73                        remove_empty_trees:1,
  74                        simplify_history:1,
  75                        lifo:1,
  76                        topo_order:1,
  77                        simplify_merges:1,
  78                        simplify_by_decoration:1,
  79                        tag_objects:1,
  80                        tree_objects:1,
  81                        blob_objects:1,
  82                        verify_objects:1,
  83                        edge_hint:1,
  84                        limited:1,
  85                        unpacked:1,
  86                        boundary:2,
  87                        count:1,
  88                        left_right:1,
  89                        left_only:1,
  90                        right_only:1,
  91                        rewrite_parents:1,
  92                        print_parents:1,
  93                        show_source:1,
  94                        show_decorations:1,
  95                        reverse:1,
  96                        reverse_output_stage:1,
  97                        cherry_pick:1,
  98                        cherry_mark:1,
  99                        bisect:1,
 100                        ancestry_path:1,
 101                        first_parent_only:1;
 102
 103        /* Diff flags */
 104        unsigned int    diff:1,
 105                        full_diff:1,
 106                        show_root_diff:1,
 107                        no_commit_id:1,
 108                        verbose_header:1,
 109                        ignore_merges:1,
 110                        combine_merges:1,
 111                        dense_combined_merges:1,
 112                        always_show_header:1;
 113
 114        /* Format info */
 115        unsigned int    shown_one:1,
 116                        shown_dashes:1,
 117                        show_merge:1,
 118                        show_notes:1,
 119                        show_notes_given:1,
 120                        show_signature:1,
 121                        pretty_given:1,
 122                        abbrev_commit:1,
 123                        abbrev_commit_given:1,
 124                        use_terminator:1,
 125                        missing_newline:1,
 126                        date_mode_explicit:1,
 127                        preserve_subject:1;
 128        unsigned int    disable_stdin:1;
 129        unsigned int    leak_pending:1;
 130
 131        enum date_mode date_mode;
 132
 133        unsigned int    abbrev;
 134        enum cmit_fmt   commit_format;
 135        struct log_info *loginfo;
 136        int             nr, total;
 137        const char      *mime_boundary;
 138        const char      *patch_suffix;
 139        int             numbered_files;
 140        int             reroll_count;
 141        char            *message_id;
 142        struct string_list *ref_message_ids;
 143        int             add_signoff;
 144        const char      *extra_headers;
 145        const char      *log_reencode;
 146        const char      *subject_prefix;
 147        int             no_inline;
 148        int             show_log_size;
 149        struct string_list *mailmap;
 150
 151        /* Filter by commit log message */
 152        struct grep_opt grep_filter;
 153
 154        /* Display history graph */
 155        struct git_graph *graph;
 156
 157        /* special limits */
 158        int skip_count;
 159        int max_count;
 160        unsigned long max_age;
 161        unsigned long min_age;
 162        int min_parents;
 163        int max_parents;
 164
 165        /* diff info for patches and for paths limiting */
 166        struct diff_options diffopt;
 167        struct diff_options pruning;
 168
 169        struct reflog_walk_info *reflog_info;
 170        struct decoration children;
 171        struct decoration merge_simplification;
 172        struct decoration treesame;
 173
 174        /* notes-specific options: which refs to show */
 175        struct display_notes_opt notes_opt;
 176
 177        /* commit counts */
 178        int count_left;
 179        int count_right;
 180        int count_same;
 181};
 182
 183#define REV_TREE_SAME           0
 184#define REV_TREE_NEW            1       /* Only new files */
 185#define REV_TREE_OLD            2       /* Only files removed */
 186#define REV_TREE_DIFFERENT      3       /* Mixed changes */
 187
 188/* revision.c */
 189typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
 190extern volatile show_early_output_fn_t show_early_output;
 191
 192struct setup_revision_opt {
 193        const char *def;
 194        void (*tweak)(struct rev_info *, struct setup_revision_opt *);
 195        const char *submodule;
 196        int assume_dashdash;
 197        unsigned revarg_opt;
 198};
 199
 200extern void init_revisions(struct rev_info *revs, const char *prefix);
 201extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
 202extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 203                                 const struct option *options,
 204                                 const char * const usagestr[]);
 205#define REVARG_CANNOT_BE_FILENAME 01
 206#define REVARG_COMMITTISH 02
 207extern int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt);
 208
 209extern void reset_revision_walk(void);
 210extern int prepare_revision_walk(struct rev_info *revs);
 211extern struct commit *get_revision(struct rev_info *revs);
 212extern char *get_revision_mark(const struct rev_info *revs, const struct commit *commit);
 213extern void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
 214
 215extern void mark_parents_uninteresting(struct commit *commit);
 216extern void mark_tree_uninteresting(struct tree *tree);
 217
 218struct name_path {
 219        struct name_path *up;
 220        int elem_len;
 221        const char *elem;
 222};
 223
 224char *path_name(const struct name_path *path, const char *name);
 225
 226extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *);
 227
 228extern void add_object(struct object *obj,
 229                       struct object_array *p,
 230                       struct name_path *path,
 231                       const char *name);
 232
 233extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
 234extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
 235
 236extern void add_head_to_pending(struct rev_info *);
 237
 238enum commit_action {
 239        commit_ignore,
 240        commit_show,
 241        commit_error
 242};
 243
 244extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
 245extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
 246
 247#endif