Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 143 lines (115 sloc) 4.323 kB
6eb8ae0 [PATCH] Header files for object parsing
Daniel Barkalow authored
1 #ifndef COMMIT_H
2 #define COMMIT_H
3
4 #include "object.h"
5 #include "tree.h"
674d172 Rework pretty_print_commit to use strbufs instead of custom buffers.
Pierre Habouzit authored
6 #include "strbuf.h"
ca135e7 @torvalds Add support for "commit name decorations" to log family of commands
torvalds authored
7 #include "decorate.h"
6eb8ae0 [PATCH] Header files for object parsing
Daniel Barkalow authored
8
9 struct commit_list {
10 struct commit *item;
11 struct commit_list *next;
12 };
13
14 struct commit {
15 struct object object;
d3ff6f5 Move "void *util" from "struct object" into "struct commit"
Linus Torvalds authored
16 void *util;
23c17d4 @torvalds Simplify topo-sort logic
torvalds authored
17 unsigned int indegree;
6eb8ae0 [PATCH] Header files for object parsing
Daniel Barkalow authored
18 unsigned long date;
19 struct commit_list *parents;
20 struct tree *tree;
bd1e17e Make "parse_object()" also fill in commit message buffer data.
Linus Torvalds authored
21 char *buffer;
6eb8ae0 [PATCH] Header files for object parsing
Daniel Barkalow authored
22 };
23
60ab26d [PATCH] Avoid wasting memory in git-rev-list
Linus Torvalds authored
24 extern int save_commit_buffer;
6eb8ae0 [PATCH] Header files for object parsing
Daniel Barkalow authored
25 extern const char *commit_type;
26
ca135e7 @torvalds Add support for "commit name decorations" to log family of commands
torvalds authored
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];
32 };
33
5d6ccf5 [PATCH] Anal retentive 'const unsigned char *sha1'
Jason McMullan authored
34 struct commit *lookup_commit(const unsigned char *sha1);
35 struct commit *lookup_commit_reference(const unsigned char *sha1);
f76412e [PATCH] Add 'git show-branch'.
Junio C Hamano authored
36 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
37 int quiet);
6eb8ae0 [PATCH] Header files for object parsing
Daniel Barkalow authored
38
bd2c39f [PATCH] don't load and decompress objects twice with parse_object()
Nicolas Pitre authored
39 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
40
6eb8ae0 [PATCH] Header files for object parsing
Daniel Barkalow authored
41 int parse_commit(struct commit *item);
42
ac5155e commit_list_insert: return the new commit list entry
Linus Torvalds authored
43 struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
6531947 Move commit_list_count() to commit.c
Miklos Vajna authored
44 unsigned commit_list_count(const struct commit_list *l);
f755494 Make "insert_by_date()" match "commit_list_insert()"
Linus Torvalds authored
45 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
46
6eb8ae0 [PATCH] Header files for object parsing
Daniel Barkalow authored
47 void free_commit_list(struct commit_list *list);
48
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
49 void sort_by_date(struct commit_list **list);
50
000182e pretty_print_commit: add different formats
Linus Torvalds authored
51 /* Commit formats */
52 enum cmit_fmt {
53 CMIT_FMT_RAW,
54 CMIT_FMT_MEDIUM,
55 CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
9b66ec0 Add "--pretty=full" format that also shows committer.
Linus Torvalds authored
56 CMIT_FMT_SHORT,
57 CMIT_FMT_FULL,
ff56fe1 Add --pretty=fuller
Junio C Hamano authored
58 CMIT_FMT_FULLER,
d87449c Introduce --pretty=oneline format.
Junio C Hamano authored
59 CMIT_FMT_ONELINE,
3eefc18 Tentative built-in format-patch.
Junio C Hamano authored
60 CMIT_FMT_EMAIL,
e52a5de @dscho pretty-formats: add 'format:<string>'
dscho authored
61 CMIT_FMT_USERFORMAT,
6b9c58f Split init_revisions() out of setup_revisions()
Junio C Hamano authored
62
63 CMIT_FMT_UNSPECIFIED,
000182e pretty_print_commit: add different formats
Linus Torvalds authored
64 };
65
4593fb8 @gitster format-patch -s: add MIME encoding header if signer's name requires so
gitster authored
66 extern int non_ascii(int);
4da45be @gitster log: teach "terminator" vs "separator" mode to "--pretty=format"
gitster authored
67 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
68 extern void get_commit_format(const char *arg, struct rev_info *);
674d172 Rework pretty_print_commit to use strbufs instead of custom buffers.
Pierre Habouzit authored
69 extern void format_commit_message(const struct commit *commit,
70 const void *format, struct strbuf *sb);
71 extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*,
72 struct strbuf *,
73 int abbrev, const char *subject,
4593fb8 @gitster format-patch -s: add MIME encoding header if signer's name requires so
gitster authored
74 const char *after_subject, enum date_mode,
6bf4f1b @gitster format-patch: generate MIME header as needed even when there is forma…
gitster authored
75 int need_8bit_cte);
b02bd65 Export some email and pretty-printing functions
Daniel Barkalow authored
76 void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
77 const char *line, enum date_mode dmode,
78 const char *encoding);
79 void pp_title_line(enum cmit_fmt fmt,
80 const char **msg_p,
81 struct strbuf *sb,
82 const char *subject,
83 const char *after_subject,
84 const char *encoding,
267123b @gitster Merge branch 'maint'
gitster authored
85 int need_8bit_cte);
b02bd65 Export some email and pretty-printing functions
Daniel Barkalow authored
86 void pp_remainder(enum cmit_fmt fmt,
87 const char **msg_p,
88 struct strbuf *sb,
89 int indent);
90
e3bc7a3 Add generic commit "pretty print" function.
Linus Torvalds authored
91
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
92 /** Removes the first commit from a list sorted by date, and adds all
93 * of its parents.
94 **/
a6080a0 @gitster War on whitespace
gitster authored
95 struct commit *pop_most_recent_commit(struct commit_list **list,
58e28af [PATCH] Allow multiple date-ordered lists
Daniel Barkalow authored
96 unsigned int mark);
dd97f85 [PATCH] Add some functions for commit lists
Daniel Barkalow authored
97
a3437b8 [PATCH] Modify git-rev-list to linearise the commit history in merge …
jon@blackcubes.dyndns.org authored
98 struct commit *pop_commit(struct commit_list **stack);
99
f8f9c73 describe: allow more than one revs to be named.
Junio C Hamano authored
100 void clear_commit_marks(struct commit *commit, unsigned int mark);
101
ab580ac @jonseymour [PATCH] Add a topological sort procedure to commit.c
jonseymour authored
102 /*
103 * Performs an in-place topological sort of list supplied.
104 *
105 * invariant of resulting list is:
106 * a reachable from b => ord(b) < ord(a)
4c8725f topo-order: make --date-order optional.
Junio C Hamano authored
107 * in addition, when lifo == 0, commits on parallel tracks are
108 * sorted in the dates order.
ab580ac @jonseymour [PATCH] Add a topological sort procedure to commit.c
jonseymour authored
109 */
4c8725f topo-order: make --date-order optional.
Junio C Hamano authored
110 void sort_in_topological_order(struct commit_list ** list, int lifo);
5040f17 blame -S <ancestry-file>
Junio C Hamano authored
111
112 struct commit_graft {
113 unsigned char sha1[20];
ed09aef @dscho support fetching into a shallow repository
dscho authored
114 int nr_parent; /* < 0 if shallow commit */
5040f17 blame -S <ancestry-file>
Junio C Hamano authored
115 unsigned char parent[FLEX_ARRAY][20]; /* more */
116 };
117
118 struct commit_graft *read_graft_line(char *buf, int len);
119 int register_commit_graft(struct commit_graft *, int);
120 int read_graft_file(const char *graft_file);
4516338 builtin-fsck: reports missing parent commits
Martin Koegler authored
121 struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
5040f17 blame -S <ancestry-file>
Junio C Hamano authored
122
c0fa825 Fold get_merge_bases_clean() into get_merge_bases()
Rene Scharfe authored
123 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
7c6f8aa @dscho move get_merge_bases() to core lib.
dscho authored
124
ed09aef @dscho support fetching into a shallow repository
dscho authored
125 extern int register_shallow(const unsigned char *sha1);
f53514b @dscho allow deepening of a shallow repository
dscho authored
126 extern int unregister_shallow(const unsigned char *sha1);
ed09aef @dscho support fetching into a shallow repository
dscho authored
127 extern int write_shallow_commits(int fd, int use_pack_protocol);
f43117a is_repository_shallow(): prototype fix.
Junio C Hamano authored
128 extern int is_repository_shallow(void);
ed09aef @dscho support fetching into a shallow repository
dscho authored
129 extern struct commit_list *get_shallow_commits(struct object_array *heads,
f53514b @dscho allow deepening of a shallow repository
dscho authored
130 int depth, int shallow_flag, int not_shallow_flag);
ed09aef @dscho support fetching into a shallow repository
dscho authored
131
03840fc Allow in_merge_bases() to take more than one reference commits.
Junio C Hamano authored
132 int in_merge_bases(struct commit *, struct commit **, int);
5868016 Introduce entry point add_interactive and add_files_to_cache
Kristian Høgsberg authored
133
3f06188 @gitster add -i: Fix running from a subdirectory
gitster authored
134 extern int interactive_add(int argc, const char **argv, const char *prefix);
d8b7db0 Export rerere() and launch_editor().
Kristian Høgsberg authored
135 extern int rerere(void);
5868016 Introduce entry point add_interactive and add_files_to_cache
Kristian Høgsberg authored
136
53b2c82 @torvalds revision walker: mini clean-up
torvalds authored
137 static inline int single_parent(struct commit *commit)
138 {
139 return commit->parents && !commit->parents->next;
140 }
141
6eb8ae0 [PATCH] Header files for object parsing
Daniel Barkalow authored
142 #endif /* COMMIT_H */
Something went wrong with that request. Please try again.