diff options
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 131 |
1 files changed, 71 insertions, 60 deletions
@@ -32,7 +32,7 @@ struct commit { /* * If the commit is loaded from the commit-graph file, then this - * member may be NULL. Only access it through get_commit_tree() + * member may be NULL. Only access it through repo_get_commit_tree() * or get_commit_tree_oid(). */ struct tree *maybe_tree; @@ -89,6 +89,12 @@ static inline int repo_parse_commit(struct repository *r, struct commit *item) { return repo_parse_commit_gently(r, item, 0); } + +static inline int parse_commit_no_graph(struct commit *commit) +{ + return repo_parse_commit_internal(the_repository, commit, 0, 0); +} + #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS #define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use) #define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet) @@ -143,7 +149,8 @@ void repo_unuse_commit_buffer(struct repository *r, */ void free_commit_buffer(struct parsed_object_pool *pool, struct commit *); -struct tree *get_commit_tree(const struct commit *); +struct tree *repo_get_commit_tree(struct repository *, const struct commit *); +#define get_commit_tree(c) repo_get_commit_tree(the_repository, c) struct object_id *get_commit_tree_oid(const struct commit *); /* @@ -177,10 +184,10 @@ void free_commit_list(struct commit_list *list); struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */ -extern int has_non_ascii(const char *text); -extern const char *logmsg_reencode(const struct commit *commit, - char **commit_encoding, - const char *output_encoding); +int has_non_ascii(const char *text); +const char *logmsg_reencode(const struct commit *commit, + char **commit_encoding, + const char *output_encoding); const char *repo_logmsg_reencode(struct repository *r, const struct commit *commit, char **commit_encoding, @@ -189,7 +196,7 @@ const char *repo_logmsg_reencode(struct repository *r, #define logmsg_reencode(c, enc, out) repo_logmsg_reencode(the_repository, c, enc, out) #endif -extern const char *skip_blank_lines(const char *msg); +const char *skip_blank_lines(const char *msg); /** Removes the first commit from a list sorted by date, and adds all * of its parents. @@ -240,23 +247,27 @@ struct commit *get_fork_point(const char *refname, struct commit *commit); struct oid_array; struct ref; -extern int register_shallow(struct repository *r, const struct object_id *oid); -extern int unregister_shallow(const struct object_id *oid); -extern int for_each_commit_graft(each_commit_graft_fn, void *); -extern int is_repository_shallow(struct repository *r); -extern struct commit_list *get_shallow_commits(struct object_array *heads, - int depth, int shallow_flag, int not_shallow_flag); -extern struct commit_list *get_shallow_commits_by_rev_list( +int register_shallow(struct repository *r, const struct object_id *oid); +int unregister_shallow(const struct object_id *oid); +int for_each_commit_graft(each_commit_graft_fn, void *); +int is_repository_shallow(struct repository *r); +struct commit_list *get_shallow_commits(struct object_array *heads, + int depth, int shallow_flag, int not_shallow_flag); +struct commit_list *get_shallow_commits_by_rev_list( int ac, const char **av, int shallow_flag, int not_shallow_flag); -extern void set_alternate_shallow_file(struct repository *r, const char *path, int override); -extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol, - const struct oid_array *extra); -extern void setup_alternate_shallow(struct lock_file *shallow_lock, - const char **alternate_shallow_file, - const struct oid_array *extra); -extern const char *setup_temporary_shallow(const struct oid_array *extra); -extern void advertise_shallow_grafts(int); +void set_alternate_shallow_file(struct repository *r, const char *path, int override); +int write_shallow_commits(struct strbuf *out, int use_pack_protocol, + const struct oid_array *extra); +void setup_alternate_shallow(struct lock_file *shallow_lock, + const char **alternate_shallow_file, + const struct oid_array *extra); +const char *setup_temporary_shallow(const struct oid_array *extra); +void advertise_shallow_grafts(int); +/* + * Initialize with prepare_shallow_info() or zero-initialize (equivalent to + * prepare_shallow_info with a NULL oid_array). + */ struct shallow_info { struct oid_array *shallow; int *ours, nr_ours; @@ -272,21 +283,21 @@ struct shallow_info { int nr_commits; }; -extern void prepare_shallow_info(struct shallow_info *, struct oid_array *); -extern void clear_shallow_info(struct shallow_info *); -extern void remove_nonexistent_theirs_shallow(struct shallow_info *); -extern void assign_shallow_commits_to_refs(struct shallow_info *info, - uint32_t **used, - int *ref_status); -extern int delayed_reachability_test(struct shallow_info *si, int c); +void prepare_shallow_info(struct shallow_info *, struct oid_array *); +void clear_shallow_info(struct shallow_info *); +void remove_nonexistent_theirs_shallow(struct shallow_info *); +void assign_shallow_commits_to_refs(struct shallow_info *info, + uint32_t **used, + int *ref_status); +int delayed_reachability_test(struct shallow_info *si, int c); #define PRUNE_SHOW_ONLY 1 #define PRUNE_QUICK 2 -extern void prune_shallow(unsigned options); +void prune_shallow(unsigned options); extern struct trace_key trace_shallow; -extern int interactive_add(int argc, const char **argv, const char *prefix, int patch); -extern int run_add_interactive(const char *revision, const char *patch_mode, - const struct pathspec *pathspec); +int interactive_add(int argc, const char **argv, const char *prefix, int patch); +int run_add_interactive(const char *revision, const char *patch_mode, + const struct pathspec *pathspec); struct commit_extra_header { struct commit_extra_header *next; @@ -295,24 +306,24 @@ struct commit_extra_header { size_t len; }; -extern void append_merge_tag_headers(struct commit_list *parents, - struct commit_extra_header ***tail); +void append_merge_tag_headers(struct commit_list *parents, + struct commit_extra_header ***tail); -extern int commit_tree(const char *msg, size_t msg_len, - const struct object_id *tree, - struct commit_list *parents, struct object_id *ret, - const char *author, const char *sign_commit); +int commit_tree(const char *msg, size_t msg_len, + const struct object_id *tree, + struct commit_list *parents, struct object_id *ret, + const char *author, const char *sign_commit); -extern int commit_tree_extended(const char *msg, size_t msg_len, - const struct object_id *tree, - struct commit_list *parents, - struct object_id *ret, const char *author, - const char *sign_commit, - struct commit_extra_header *); +int commit_tree_extended(const char *msg, size_t msg_len, + const struct object_id *tree, + struct commit_list *parents, + struct object_id *ret, const char *author, + const char *sign_commit, + struct commit_extra_header *); -extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **); +struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **); -extern void free_commit_extra_headers(struct commit_extra_header *extra); +void free_commit_extra_headers(struct commit_extra_header *extra); /* * Search the commit object contents given by "msg" for the header "key". @@ -322,24 +333,24 @@ extern void free_commit_extra_headers(struct commit_extra_header *extra); * Note that some headers (like mergetag) may be multi-line. It is the caller's * responsibility to parse further in this case! */ -extern const char *find_commit_header(const char *msg, const char *key, - size_t *out_len); +const char *find_commit_header(const char *msg, const char *key, + size_t *out_len); /* Find the end of the log message, the right place for a new trailer. */ -extern size_t ignore_non_trailer(const char *buf, size_t len); +size_t ignore_non_trailer(const char *buf, size_t len); typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra, - void *cb_data); + void *cb_data); -extern int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data); +int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data); struct merge_remote_desc { struct object *obj; /* the named object, could be a tag */ char name[FLEX_ARRAY]; }; -extern struct merge_remote_desc *merge_remote_util(struct commit *); -extern void set_merge_remote_desc(struct commit *commit, - const char *name, struct object *obj); +struct merge_remote_desc *merge_remote_util(struct commit *); +void set_merge_remote_desc(struct commit *commit, + const char *name, struct object *obj); /* * Given "name" from the command line to merge, find the commit object @@ -348,9 +359,9 @@ extern void set_merge_remote_desc(struct commit *commit, */ struct commit *get_merge_parent(const char *name); -extern int parse_signed_commit(const struct commit *commit, - struct strbuf *message, struct strbuf *signature); -extern int remove_signature(struct strbuf *buf); +int parse_signed_commit(const struct commit *commit, + struct strbuf *message, struct strbuf *signature); +int remove_signature(struct strbuf *buf); /* * Check the signature of the given commit. The result of the check is stored @@ -359,7 +370,7 @@ extern int remove_signature(struct strbuf *buf); * at all. This may allocate memory for sig->gpg_output, sig->gpg_status, * sig->signer and sig->key. */ -extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc); +int check_commit_signature(const struct commit *commit, struct signature_check *sigc); /* record author-date for each commit object */ struct author_date_slab; @@ -379,6 +390,6 @@ int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused) int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused); LAST_ARG_MUST_BE_NULL -extern int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); +int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); #endif /* COMMIT_H */ |