commit.hon commit log: use true parents for diff even when rewriting (53d00b3)
   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#include "gpg-interface.h"
   9#include "string-list.h"
  10
  11struct commit_list {
  12        struct commit *item;
  13        struct commit_list *next;
  14};
  15
  16struct commit {
  17        struct object object;
  18        void *util;
  19        unsigned int index;
  20        unsigned long date;
  21        struct commit_list *parents;
  22        struct tree *tree;
  23        char *buffer;
  24};
  25
  26extern int save_commit_buffer;
  27extern const char *commit_type;
  28
  29/* While we can decorate any object with a name, it's only used for commits.. */
  30extern struct decoration name_decoration;
  31struct name_decoration {
  32        struct name_decoration *next;
  33        int type;
  34        char name[1];
  35};
  36
  37struct commit *lookup_commit(const unsigned char *sha1);
  38struct commit *lookup_commit_reference(const unsigned char *sha1);
  39struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
  40                                              int quiet);
  41struct commit *lookup_commit_reference_by_name(const char *name);
  42
  43/*
  44 * Look up object named by "sha1", dereference tag as necessary,
  45 * get a commit and return it. If "sha1" does not dereference to
  46 * a commit, use ref_name to report an error and die.
  47 */
  48struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name);
  49
  50int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size);
  51int parse_commit(struct commit *item);
  52
  53/* Find beginning and length of commit subject. */
  54int find_commit_subject(const char *commit_buffer, const char **subject);
  55
  56struct commit_list *commit_list_insert(struct commit *item,
  57                                        struct commit_list **list);
  58struct commit_list **commit_list_append(struct commit *commit,
  59                                        struct commit_list **next);
  60unsigned commit_list_count(const struct commit_list *l);
  61struct commit_list *commit_list_insert_by_date(struct commit *item,
  62                                    struct commit_list **list);
  63void commit_list_sort_by_date(struct commit_list **list);
  64
  65/* Shallow copy of the input list */
  66struct commit_list *copy_commit_list(struct commit_list *list);
  67
  68void free_commit_list(struct commit_list *list);
  69
  70/* Commit formats */
  71enum cmit_fmt {
  72        CMIT_FMT_RAW,
  73        CMIT_FMT_MEDIUM,
  74        CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
  75        CMIT_FMT_SHORT,
  76        CMIT_FMT_FULL,
  77        CMIT_FMT_FULLER,
  78        CMIT_FMT_ONELINE,
  79        CMIT_FMT_EMAIL,
  80        CMIT_FMT_USERFORMAT,
  81
  82        CMIT_FMT_UNSPECIFIED
  83};
  84
  85struct pretty_print_context {
  86        /*
  87         * Callers should tweak these to change the behavior of pp_* functions.
  88         */
  89        enum cmit_fmt fmt;
  90        int abbrev;
  91        const char *subject;
  92        const char *after_subject;
  93        int preserve_subject;
  94        enum date_mode date_mode;
  95        unsigned date_mode_explicit:1;
  96        int need_8bit_cte;
  97        char *notes_message;
  98        struct reflog_walk_info *reflog_info;
  99        const char *output_encoding;
 100        struct string_list *mailmap;
 101        int color;
 102        struct ident_split *from_ident;
 103
 104        /*
 105         * Fields below here are manipulated internally by pp_* functions and
 106         * should not be counted on by callers.
 107         */
 108
 109        /* Manipulated by the pp_* functions internally. */
 110        struct string_list in_body_headers;
 111};
 112
 113struct userformat_want {
 114        unsigned notes:1;
 115};
 116
 117extern int has_non_ascii(const char *text);
 118struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
 119extern char *logmsg_reencode(const struct commit *commit,
 120                             char **commit_encoding,
 121                             const char *output_encoding);
 122extern void logmsg_free(char *msg, const struct commit *commit);
 123extern void get_commit_format(const char *arg, struct rev_info *);
 124extern const char *format_subject(struct strbuf *sb, const char *msg,
 125                                  const char *line_separator);
 126extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
 127extern void format_commit_message(const struct commit *commit,
 128                                  const char *format, struct strbuf *sb,
 129                                  const struct pretty_print_context *context);
 130extern void pretty_print_commit(struct pretty_print_context *pp,
 131                                const struct commit *commit,
 132                                struct strbuf *sb);
 133extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
 134                           struct strbuf *sb);
 135void pp_user_info(struct pretty_print_context *pp,
 136                  const char *what, struct strbuf *sb,
 137                  const char *line, const char *encoding);
 138void pp_title_line(struct pretty_print_context *pp,
 139                   const char **msg_p,
 140                   struct strbuf *sb,
 141                   const char *encoding,
 142                   int need_8bit_cte);
 143void pp_remainder(struct pretty_print_context *pp,
 144                  const char **msg_p,
 145                  struct strbuf *sb,
 146                  int indent);
 147
 148
 149/** Removes the first commit from a list sorted by date, and adds all
 150 * of its parents.
 151 **/
 152struct commit *pop_most_recent_commit(struct commit_list **list,
 153                                      unsigned int mark);
 154
 155struct commit *pop_commit(struct commit_list **stack);
 156
 157void clear_commit_marks(struct commit *commit, unsigned int mark);
 158void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
 159void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
 160
 161
 162enum rev_sort_order {
 163        REV_SORT_IN_GRAPH_ORDER = 0,
 164        REV_SORT_BY_COMMIT_DATE,
 165        REV_SORT_BY_AUTHOR_DATE
 166};
 167
 168/*
 169 * Performs an in-place topological sort of list supplied.
 170 *
 171 *   invariant of resulting list is:
 172 *      a reachable from b => ord(b) < ord(a)
 173 *   sort_order further specifies:
 174 *   REV_SORT_IN_GRAPH_ORDER: try to show a commit on a single-parent
 175 *                            chain together.
 176 *   REV_SORT_BY_COMMIT_DATE: show eligible commits in committer-date order.
 177 */
 178void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
 179
 180struct commit_graft {
 181        unsigned char sha1[20];
 182        int nr_parent; /* < 0 if shallow commit */
 183        unsigned char parent[FLEX_ARRAY][20]; /* more */
 184};
 185typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
 186
 187struct commit_graft *read_graft_line(char *buf, int len);
 188int register_commit_graft(struct commit_graft *, int);
 189struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
 190
 191extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
 192extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
 193extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 194
 195/* largest positive number a signed 32-bit integer can contain */
 196#define INFINITE_DEPTH 0x7fffffff
 197
 198extern int register_shallow(const unsigned char *sha1);
 199extern int unregister_shallow(const unsigned char *sha1);
 200extern int for_each_commit_graft(each_commit_graft_fn, void *);
 201extern int is_repository_shallow(void);
 202extern struct commit_list *get_shallow_commits(struct object_array *heads,
 203                int depth, int shallow_flag, int not_shallow_flag);
 204extern void check_shallow_file_for_update(void);
 205extern void set_alternate_shallow_file(const char *path);
 206
 207int is_descendant_of(struct commit *, struct commit_list *);
 208int in_merge_bases(struct commit *, struct commit *);
 209int in_merge_bases_many(struct commit *, int, struct commit **);
 210
 211extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
 212extern int run_add_interactive(const char *revision, const char *patch_mode,
 213                               const char **pathspec);
 214
 215static inline int single_parent(struct commit *commit)
 216{
 217        return commit->parents && !commit->parents->next;
 218}
 219
 220struct commit_list *reduce_heads(struct commit_list *heads);
 221
 222struct commit_extra_header {
 223        struct commit_extra_header *next;
 224        char *key;
 225        char *value;
 226        size_t len;
 227};
 228
 229extern void append_merge_tag_headers(struct commit_list *parents,
 230                                     struct commit_extra_header ***tail);
 231
 232extern int commit_tree(const struct strbuf *msg, unsigned char *tree,
 233                       struct commit_list *parents, unsigned char *ret,
 234                       const char *author, const char *sign_commit);
 235
 236extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
 237                                struct commit_list *parents, unsigned char *ret,
 238                                const char *author, const char *sign_commit,
 239                                struct commit_extra_header *);
 240
 241extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
 242
 243extern void free_commit_extra_headers(struct commit_extra_header *extra);
 244
 245struct merge_remote_desc {
 246        struct object *obj; /* the named object, could be a tag */
 247        const char *name;
 248};
 249#define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
 250
 251/*
 252 * Given "name" from the command line to merge, find the commit object
 253 * and return it, while storing merge_remote_desc in its ->util field,
 254 * to allow callers to tell if we are told to merge a tag.
 255 */
 256struct commit *get_merge_parent(const char *name);
 257
 258extern int parse_signed_commit(const unsigned char *sha1,
 259                               struct strbuf *message, struct strbuf *signature);
 260extern void print_commit_list(struct commit_list *list,
 261                              const char *format_cur,
 262                              const char *format_last);
 263
 264/*
 265 * Check the signature of the given commit. The result of the check is stored
 266 * in sig->check_result, 'G' for a good signature, 'U' for a good signature
 267 * from an untrusted signer, 'B' for a bad signature and 'N' for no signature
 268 * at all.  This may allocate memory for sig->gpg_output, sig->gpg_status,
 269 * sig->signer and sig->key.
 270 */
 271extern void check_commit_signature(const struct commit* commit, struct signature_check *sigc);
 272
 273int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
 274
 275#endif /* COMMIT_H */