Make git add -n and git -u -n output consistent
[git/jrn.git] / commit.h
blob2d94d4148ed4048469ba79cae4f6ff2a2e3f9bca
1 #ifndef COMMIT_H
2 #define COMMIT_H
4 #include "object.h"
5 #include "tree.h"
6 #include "strbuf.h"
7 #include "decorate.h"
9 struct commit_list {
10 struct commit *item;
11 struct commit_list *next;
14 struct 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;
24 extern int save_commit_buffer;
25 extern const char *commit_type;
27 /* While we can decorate any object with a name, it's only used for commits.. */
28 extern struct decoration name_decoration;
29 struct name_decoration {
30 struct name_decoration *next;
31 char name[1];
34 struct commit *lookup_commit(const unsigned char *sha1);
35 struct commit *lookup_commit_reference(const unsigned char *sha1);
36 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
37 int quiet);
39 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
41 int parse_commit(struct commit *item);
43 struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
44 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
46 void free_commit_list(struct commit_list *list);
48 void sort_by_date(struct commit_list **list);
50 /* Commit formats */
51 enum cmit_fmt {
52 CMIT_FMT_RAW,
53 CMIT_FMT_MEDIUM,
54 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
55 CMIT_FMT_SHORT,
56 CMIT_FMT_FULL,
57 CMIT_FMT_FULLER,
58 CMIT_FMT_ONELINE,
59 CMIT_FMT_EMAIL,
60 CMIT_FMT_USERFORMAT,
62 CMIT_FMT_UNSPECIFIED,
65 extern int non_ascii(int);
66 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
67 extern void get_commit_format(const char *arg, struct rev_info *);
68 extern void format_commit_message(const struct commit *commit,
69 const void *format, struct strbuf *sb);
70 extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*,
71 struct strbuf *,
72 int abbrev, const char *subject,
73 const char *after_subject, enum date_mode,
74 int need_8bit_cte);
75 void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
76 const char *line, enum date_mode dmode,
77 const char *encoding);
78 void pp_title_line(enum cmit_fmt fmt,
79 const char **msg_p,
80 struct strbuf *sb,
81 const char *subject,
82 const char *after_subject,
83 const char *encoding,
84 int need_8bit_cte);
85 void pp_remainder(enum cmit_fmt fmt,
86 const char **msg_p,
87 struct strbuf *sb,
88 int indent);
91 /** Removes the first commit from a list sorted by date, and adds all
92 * of its parents.
93 **/
94 struct commit *pop_most_recent_commit(struct commit_list **list,
95 unsigned int mark);
97 struct commit *pop_commit(struct commit_list **stack);
99 void clear_commit_marks(struct commit *commit, unsigned int mark);
102 * Performs an in-place topological sort of list supplied.
104 * invariant of resulting list is:
105 * a reachable from b => ord(b) < ord(a)
106 * in addition, when lifo == 0, commits on parallel tracks are
107 * sorted in the dates order.
109 void sort_in_topological_order(struct commit_list ** list, int lifo);
111 struct commit_graft {
112 unsigned char sha1[20];
113 int nr_parent; /* < 0 if shallow commit */
114 unsigned char parent[FLEX_ARRAY][20]; /* more */
117 struct commit_graft *read_graft_line(char *buf, int len);
118 int register_commit_graft(struct commit_graft *, int);
119 int read_graft_file(const char *graft_file);
120 struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
122 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
124 extern int register_shallow(const unsigned char *sha1);
125 extern int unregister_shallow(const unsigned char *sha1);
126 extern int write_shallow_commits(int fd, int use_pack_protocol);
127 extern int is_repository_shallow(void);
128 extern struct commit_list *get_shallow_commits(struct object_array *heads,
129 int depth, int shallow_flag, int not_shallow_flag);
131 int in_merge_bases(struct commit *, struct commit **, int);
133 extern int interactive_add(int argc, const char **argv, const char *prefix);
134 extern int rerere(void);
136 static inline int single_parent(struct commit *commit)
138 return commit->parents && !commit->parents->next;
141 #endif /* COMMIT_H */