commit.hon commit Merge branch 'mm/conflict-advice' (71b3ef1)
   1#ifndef COMMIT_H
   2#define COMMIT_H
   3
   4#include "object.h"
   5#include "tree.h"
   6#include "strbuf.h"
   7#include "decorate.h"
   8
   9struct commit_list {
  10        struct commit *item;
  11        struct commit_list *next;
  12};
  13
  14struct commit {
  15        struct object object;
  16        void *util;
  17        unsigned int indegree;
  18        unsigned long date;
  19        struct commit_list *parents;
  20        struct tree *tree;
  21        char *buffer;
  22};
  23
  24extern int save_commit_buffer;
  25extern const char *commit_type;
  26
  27/* While we can decorate any object with a name, it's only used for commits.. */
  28extern struct decoration name_decoration;
  29struct name_decoration {
  30        struct name_decoration *next;
  31        char name[1];
  32};
  33
  34struct commit *lookup_commit(const unsigned char *sha1);
  35struct commit *lookup_commit_reference(const unsigned char *sha1);
  36struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
  37                                              int quiet);
  38
  39int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
  40
  41int parse_commit(struct commit *item);
  42
  43struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
  44unsigned commit_list_count(const struct commit_list *l);
  45struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
  46
  47void free_commit_list(struct commit_list *list);
  48
  49void sort_by_date(struct commit_list **list);
  50
  51/* Commit formats */
  52enum cmit_fmt {
  53        CMIT_FMT_RAW,
  54        CMIT_FMT_MEDIUM,
  55        CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
  56        CMIT_FMT_SHORT,
  57        CMIT_FMT_FULL,
  58        CMIT_FMT_FULLER,
  59        CMIT_FMT_ONELINE,
  60        CMIT_FMT_EMAIL,
  61        CMIT_FMT_USERFORMAT,
  62
  63        CMIT_FMT_UNSPECIFIED,
  64};
  65
  66struct pretty_print_context
  67{
  68        int abbrev;
  69        const char *subject;
  70        const char *after_subject;
  71        enum date_mode date_mode;
  72        int need_8bit_cte;
  73        struct reflog_walk_info *reflog_info;
  74};
  75
  76extern int has_non_ascii(const char *text);
  77struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
  78extern char *reencode_commit_message(const struct commit *commit,
  79                                     const char **encoding_p);
  80extern void get_commit_format(const char *arg, struct rev_info *);
  81extern void format_commit_message(const struct commit *commit,
  82                                  const char *format, struct strbuf *sb,
  83                                  const struct pretty_print_context *context);
  84extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
  85                                struct strbuf *sb,
  86                                const struct pretty_print_context *context);
  87void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
  88                   const char *line, enum date_mode dmode,
  89                   const char *encoding);
  90void pp_title_line(enum cmit_fmt fmt,
  91                   const char **msg_p,
  92                   struct strbuf *sb,
  93                   const char *subject,
  94                   const char *after_subject,
  95                   const char *encoding,
  96                   int need_8bit_cte);
  97void pp_remainder(enum cmit_fmt fmt,
  98                  const char **msg_p,
  99                  struct strbuf *sb,
 100                  int indent);
 101
 102
 103/** Removes the first commit from a list sorted by date, and adds all
 104 * of its parents.
 105 **/
 106struct commit *pop_most_recent_commit(struct commit_list **list,
 107                                      unsigned int mark);
 108
 109struct commit *pop_commit(struct commit_list **stack);
 110
 111void clear_commit_marks(struct commit *commit, unsigned int mark);
 112
 113/*
 114 * Performs an in-place topological sort of list supplied.
 115 *
 116 *   invariant of resulting list is:
 117 *      a reachable from b => ord(b) < ord(a)
 118 *   in addition, when lifo == 0, commits on parallel tracks are
 119 *   sorted in the dates order.
 120 */
 121void sort_in_topological_order(struct commit_list ** list, int lifo);
 122
 123struct commit_graft {
 124        unsigned char sha1[20];
 125        int nr_parent; /* < 0 if shallow commit */
 126        unsigned char parent[FLEX_ARRAY][20]; /* more */
 127};
 128
 129struct commit_graft *read_graft_line(char *buf, int len);
 130int register_commit_graft(struct commit_graft *, int);
 131struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
 132
 133const unsigned char *lookup_replace_object(const unsigned char *sha1);
 134
 135extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
 136extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
 137extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 138
 139extern int register_shallow(const unsigned char *sha1);
 140extern int unregister_shallow(const unsigned char *sha1);
 141extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol);
 142extern int is_repository_shallow(void);
 143extern struct commit_list *get_shallow_commits(struct object_array *heads,
 144                int depth, int shallow_flag, int not_shallow_flag);
 145
 146int is_descendant_of(struct commit *, struct commit_list *);
 147int in_merge_bases(struct commit *, struct commit **, int);
 148
 149extern int interactive_add(int argc, const char **argv, const char *prefix);
 150extern int run_add_interactive(const char *revision, const char *patch_mode,
 151                               const char **pathspec);
 152
 153static inline int single_parent(struct commit *commit)
 154{
 155        return commit->parents && !commit->parents->next;
 156}
 157
 158struct commit_list *reduce_heads(struct commit_list *heads);
 159
 160#endif /* COMMIT_H */