revision.hon commit branch -d: base the "already-merged" safety on the branch it merges with (99c419c)
   1#ifndef REVISION_H
   2#define REVISION_H
   3
   4#include "parse-options.h"
   5#include "grep.h"
   6
   7#define SEEN            (1u<<0)
   8#define UNINTERESTING   (1u<<1)
   9#define TREESAME        (1u<<2)
  10#define SHOWN           (1u<<3)
  11#define TMP_MARK        (1u<<4) /* for isolated cases; clean after use */
  12#define BOUNDARY        (1u<<5)
  13#define CHILD_SHOWN     (1u<<6)
  14#define ADDED           (1u<<7) /* Parents already parsed and added? */
  15#define SYMMETRIC_LEFT  (1u<<8)
  16#define ALL_REV_FLAGS   ((1u<<9)-1)
  17
  18#define DECORATE_SHORT_REFS     1
  19#define DECORATE_FULL_REFS      2
  20
  21struct rev_info;
  22struct log_info;
  23
  24struct rev_info {
  25        /* Starting list */
  26        struct commit_list *commits;
  27        struct object_array pending;
  28
  29        /* Parents of shown commits */
  30        struct object_array boundary_commits;
  31
  32        /* Basic information */
  33        const char *prefix;
  34        const char *def;
  35        void *prune_data;
  36        unsigned int early_output;
  37
  38        /* Traversal flags */
  39        unsigned int    dense:1,
  40                        prune:1,
  41                        no_merges:1,
  42                        merges_only:1,
  43                        no_walk:1,
  44                        show_all:1,
  45                        remove_empty_trees:1,
  46                        simplify_history:1,
  47                        lifo:1,
  48                        topo_order:1,
  49                        simplify_merges:1,
  50                        simplify_by_decoration:1,
  51                        tag_objects:1,
  52                        tree_objects:1,
  53                        blob_objects:1,
  54                        edge_hint:1,
  55                        limited:1,
  56                        unpacked:1,
  57                        boundary:2,
  58                        left_right:1,
  59                        rewrite_parents:1,
  60                        print_parents:1,
  61                        show_source:1,
  62                        show_decorations:1,
  63                        reverse:1,
  64                        reverse_output_stage:1,
  65                        cherry_pick:1,
  66                        bisect:1,
  67                        first_parent_only:1;
  68
  69        /* Diff flags */
  70        unsigned int    diff:1,
  71                        full_diff:1,
  72                        show_root_diff:1,
  73                        no_commit_id:1,
  74                        verbose_header:1,
  75                        ignore_merges:1,
  76                        combine_merges:1,
  77                        dense_combined_merges:1,
  78                        always_show_header:1;
  79
  80        /* Format info */
  81        unsigned int    shown_one:1,
  82                        show_merge:1,
  83                        abbrev_commit:1,
  84                        use_terminator:1,
  85                        missing_newline:1,
  86                        date_mode_explicit:1;
  87        unsigned int    disable_stdin:1;
  88
  89        enum date_mode date_mode;
  90
  91        unsigned int    abbrev;
  92        enum cmit_fmt   commit_format;
  93        struct log_info *loginfo;
  94        int             nr, total;
  95        const char      *mime_boundary;
  96        const char      *patch_suffix;
  97        int             numbered_files;
  98        char            *message_id;
  99        struct string_list *ref_message_ids;
 100        const char      *add_signoff;
 101        const char      *extra_headers;
 102        const char      *log_reencode;
 103        const char      *subject_prefix;
 104        int             no_inline;
 105        int             show_log_size;
 106
 107        /* Filter by commit log message */
 108        struct grep_opt grep_filter;
 109
 110        /* Display history graph */
 111        struct git_graph *graph;
 112
 113        /* special limits */
 114        int skip_count;
 115        int max_count;
 116        unsigned long max_age;
 117        unsigned long min_age;
 118
 119        /* diff info for patches and for paths limiting */
 120        struct diff_options diffopt;
 121        struct diff_options pruning;
 122
 123        struct reflog_walk_info *reflog_info;
 124        struct decoration children;
 125        struct decoration merge_simplification;
 126};
 127
 128#define REV_TREE_SAME           0
 129#define REV_TREE_NEW            1       /* Only new files */
 130#define REV_TREE_OLD            2       /* Only files removed */
 131#define REV_TREE_DIFFERENT      3       /* Mixed changes */
 132
 133/* revision.c */
 134typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
 135extern volatile show_early_output_fn_t show_early_output;
 136
 137extern void init_revisions(struct rev_info *revs, const char *prefix);
 138extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
 139extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 140                                 const struct option *options,
 141                                 const char * const usagestr[]);
 142extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
 143
 144extern int prepare_revision_walk(struct rev_info *revs);
 145extern struct commit *get_revision(struct rev_info *revs);
 146
 147extern void mark_parents_uninteresting(struct commit *commit);
 148extern void mark_tree_uninteresting(struct tree *tree);
 149
 150struct name_path {
 151        struct name_path *up;
 152        int elem_len;
 153        const char *elem;
 154};
 155
 156char *path_name(const struct name_path *path, const char *name);
 157
 158extern void add_object(struct object *obj,
 159                       struct object_array *p,
 160                       struct name_path *path,
 161                       const char *name);
 162
 163extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
 164
 165extern void add_head_to_pending(struct rev_info *);
 166
 167enum commit_action {
 168        commit_ignore,
 169        commit_show,
 170        commit_error
 171};
 172
 173extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
 174extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
 175
 176#endif