X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit.h;h=70a7c75e6590ae7f8eef50f91a495fc6138fda4a;hb=180b0d7483711120e28289ff7d9fa346eddd5cb7;hp=4afd27b1095cf9f9203c96db2b9f2b0bba5063d8;hpb=b51ad4314078298194d23d46e2b4473ffd32a88a;p=git.git diff --git a/commit.h b/commit.h index 4afd27b1..70a7c75e 100644 --- a/commit.h +++ b/commit.h @@ -14,14 +14,66 @@ struct commit { unsigned long date; struct commit_list *parents; struct tree *tree; + char *buffer; }; +extern int save_commit_buffer; extern const char *commit_type; -struct commit *lookup_commit(unsigned char *sha1); +struct commit *lookup_commit(const unsigned char *sha1); +struct commit *lookup_commit_reference(const unsigned char *sha1); +struct commit *lookup_commit_reference_gently(const unsigned char *sha1, + int quiet); + +int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size); int parse_commit(struct commit *item); +struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p); +struct commit_list * insert_by_date(struct commit *item, struct commit_list **list); + void free_commit_list(struct commit_list *list); +void sort_by_date(struct commit_list **list); + +/* Commit formats */ +enum cmit_fmt { + CMIT_FMT_RAW, + CMIT_FMT_MEDIUM, + CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM, + CMIT_FMT_SHORT, + CMIT_FMT_FULL, + CMIT_FMT_FULLER, + CMIT_FMT_ONELINE, +}; + +extern enum cmit_fmt get_commit_format(const char *arg); +extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev); + +/** Removes the first commit from a list sorted by date, and adds all + * of its parents. + **/ +struct commit *pop_most_recent_commit(struct commit_list **list, + unsigned int mark); + +struct commit *pop_commit(struct commit_list **stack); + +void clear_commit_marks(struct commit *commit, unsigned int mark); + +int count_parents(struct commit * commit); + +/* + * Performs an in-place topological sort of list supplied. + * + * Pre-conditions: + * all commits in input list and all parents of those + * commits must have object.util == NULL + * + * Post-conditions: + * invariant of resulting list is: + * a reachable from b => ord(b) < ord(a) + * in addition, when lifo == 0, commits on parallel tracks are + * sorted in the dates order. + */ +void sort_in_topological_order(struct commit_list ** list, int lifo); #endif /* COMMIT_H */