2005-04-18 20:39:48 +02:00
|
|
|
#ifndef COMMIT_H
|
|
|
|
#define COMMIT_H
|
|
|
|
|
|
|
|
#include "object.h"
|
|
|
|
#include "tree.h"
|
2007-09-10 12:35:06 +02:00
|
|
|
#include "strbuf.h"
|
2007-04-17 01:05:10 +02:00
|
|
|
#include "decorate.h"
|
2005-04-18 20:39:48 +02:00
|
|
|
|
|
|
|
struct commit_list {
|
|
|
|
struct commit *item;
|
|
|
|
struct commit_list *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct commit {
|
|
|
|
struct object object;
|
2006-06-18 03:26:18 +02:00
|
|
|
void *util;
|
2007-11-02 21:32:58 +01:00
|
|
|
unsigned int indegree;
|
2005-04-18 20:39:48 +02:00
|
|
|
unsigned long date;
|
|
|
|
struct commit_list *parents;
|
|
|
|
struct tree *tree;
|
2005-05-26 04:26:28 +02:00
|
|
|
char *buffer;
|
2005-04-18 20:39:48 +02:00
|
|
|
};
|
|
|
|
|
[PATCH] Avoid wasting memory in git-rev-list
As pointed out on the list, git-rev-list can use a lot of memory.
One low-hanging fruit is to free the commit buffer for commits that we
parse. By default, parse_commit() will save away the buffer, since a lot
of cases do want it, and re-reading it continually would be unnecessary.
However, in many cases the buffer isn't actually necessary and saving it
just wastes memory.
We could just free the buffer ourselves, but especially in git-rev-list,
we actually end up using the helper functions that automatically add
parent commits to the commit lists, so we don't actually control the
commit parsing directly.
Instead, just make this behaviour of "parse_commit()" a global flag.
Maybe this is a bit tasteless, but it's very simple, and it makes a
noticable difference in memory usage.
Before the change:
[torvalds@g5 linux]$ /usr/bin/time git-rev-list v2.6.12..HEAD > /dev/null
0.26user 0.02system 0:00.28elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+3714minor)pagefaults 0swaps
after the change:
[torvalds@g5 linux]$ /usr/bin/time git-rev-list v2.6.12..HEAD > /dev/null
0.26user 0.00system 0:00.27elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+2433minor)pagefaults 0swaps
note how the minor faults have decreased from 3714 pages to 2433 pages.
That's all due to the fewer anonymous pages allocated to hold the comment
buffers and their metadata.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-15 23:43:17 +02:00
|
|
|
extern int save_commit_buffer;
|
2005-04-18 20:39:48 +02:00
|
|
|
extern const char *commit_type;
|
|
|
|
|
2007-04-17 01:05:10 +02:00
|
|
|
/* While we can decorate any object with a name, it's only used for commits.. */
|
|
|
|
extern struct decoration name_decoration;
|
|
|
|
struct name_decoration {
|
|
|
|
struct name_decoration *next;
|
2010-06-19 03:37:33 +02:00
|
|
|
int type;
|
2007-04-17 01:05:10 +02:00
|
|
|
char name[1];
|
|
|
|
};
|
|
|
|
|
2005-06-03 17:05:39 +02:00
|
|
|
struct commit *lookup_commit(const unsigned char *sha1);
|
|
|
|
struct commit *lookup_commit_reference(const unsigned char *sha1);
|
2005-08-21 11:51:10 +02:00
|
|
|
struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
|
|
|
|
int quiet);
|
2010-11-02 20:59:07 +01:00
|
|
|
struct commit *lookup_commit_reference_by_name(const char *name);
|
2005-04-18 20:39:48 +02:00
|
|
|
|
2005-05-06 19:48:34 +02:00
|
|
|
int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
|
|
|
|
|
2005-04-18 20:39:48 +02:00
|
|
|
int parse_commit(struct commit *item);
|
|
|
|
|
2010-07-22 15:18:30 +02:00
|
|
|
/* Find beginning and length of commit subject. */
|
|
|
|
int find_commit_subject(const char *commit_buffer, const char **subject);
|
|
|
|
|
2005-05-31 03:44:02 +02:00
|
|
|
struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
|
2008-06-27 18:21:55 +02:00
|
|
|
unsigned commit_list_count(const struct commit_list *l);
|
2005-07-06 18:31:17 +02:00
|
|
|
struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2005-04-18 20:39:48 +02:00
|
|
|
void free_commit_list(struct commit_list *list);
|
|
|
|
|
2005-04-24 03:47:23 +02:00
|
|
|
void sort_by_date(struct commit_list **list);
|
|
|
|
|
2005-06-05 18:02:03 +02:00
|
|
|
/* Commit formats */
|
|
|
|
enum cmit_fmt {
|
|
|
|
CMIT_FMT_RAW,
|
|
|
|
CMIT_FMT_MEDIUM,
|
|
|
|
CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
|
2005-06-27 02:50:46 +02:00
|
|
|
CMIT_FMT_SHORT,
|
|
|
|
CMIT_FMT_FULL,
|
2005-11-10 07:15:27 +01:00
|
|
|
CMIT_FMT_FULLER,
|
2005-08-09 07:15:40 +02:00
|
|
|
CMIT_FMT_ONELINE,
|
2006-04-19 01:45:27 +02:00
|
|
|
CMIT_FMT_EMAIL,
|
2007-02-23 01:35:03 +01:00
|
|
|
CMIT_FMT_USERFORMAT,
|
2006-04-16 08:46:36 +02:00
|
|
|
|
2010-05-14 11:31:35 +02:00
|
|
|
CMIT_FMT_UNSPECIFIED
|
2005-06-05 18:02:03 +02:00
|
|
|
};
|
|
|
|
|
2009-10-19 17:48:08 +02:00
|
|
|
struct pretty_print_context
|
|
|
|
{
|
|
|
|
int abbrev;
|
|
|
|
const char *subject;
|
|
|
|
const char *after_subject;
|
|
|
|
enum date_mode date_mode;
|
|
|
|
int need_8bit_cte;
|
2010-01-20 22:59:36 +01:00
|
|
|
int show_notes;
|
2009-10-19 17:48:10 +02:00
|
|
|
struct reflog_walk_info *reflog_info;
|
2009-10-19 17:48:08 +02:00
|
|
|
};
|
|
|
|
|
2010-04-13 22:31:12 +02:00
|
|
|
struct userformat_want {
|
|
|
|
unsigned notes:1;
|
|
|
|
};
|
|
|
|
|
2009-08-10 18:22:18 +02:00
|
|
|
extern int has_non_ascii(const char *text);
|
2008-04-08 02:11:34 +02:00
|
|
|
struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
|
2008-10-21 22:55:57 +02:00
|
|
|
extern char *reencode_commit_message(const struct commit *commit,
|
|
|
|
const char **encoding_p);
|
2008-04-08 02:11:34 +02:00
|
|
|
extern void get_commit_format(const char *arg, struct rev_info *);
|
2010-04-13 22:31:12 +02:00
|
|
|
extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
|
2007-09-10 12:35:06 +02:00
|
|
|
extern void format_commit_message(const struct commit *commit,
|
2009-10-16 07:59:41 +02:00
|
|
|
const char *format, struct strbuf *sb,
|
2009-10-19 17:48:08 +02:00
|
|
|
const struct pretty_print_context *context);
|
|
|
|
extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
|
|
|
|
struct strbuf *sb,
|
|
|
|
const struct pretty_print_context *context);
|
2008-02-19 04:56:08 +01:00
|
|
|
void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
|
|
|
|
const char *line, enum date_mode dmode,
|
|
|
|
const char *encoding);
|
|
|
|
void pp_title_line(enum cmit_fmt fmt,
|
|
|
|
const char **msg_p,
|
|
|
|
struct strbuf *sb,
|
|
|
|
const char *subject,
|
|
|
|
const char *after_subject,
|
|
|
|
const char *encoding,
|
2008-03-15 08:09:20 +01:00
|
|
|
int need_8bit_cte);
|
2008-02-19 04:56:08 +01:00
|
|
|
void pp_remainder(enum cmit_fmt fmt,
|
|
|
|
const char **msg_p,
|
|
|
|
struct strbuf *sb,
|
|
|
|
int indent);
|
|
|
|
|
2005-06-01 17:34:23 +02:00
|
|
|
|
2005-04-24 03:47:23 +02:00
|
|
|
/** Removes the first commit from a list sorted by date, and adds all
|
|
|
|
* of its parents.
|
|
|
|
**/
|
2007-06-07 09:04:01 +02:00
|
|
|
struct commit *pop_most_recent_commit(struct commit_list **list,
|
2005-04-24 05:29:22 +02:00
|
|
|
unsigned int mark);
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2005-06-06 17:39:40 +02:00
|
|
|
struct commit *pop_commit(struct commit_list **stack);
|
|
|
|
|
2006-01-08 03:52:42 +01:00
|
|
|
void clear_commit_marks(struct commit *commit, unsigned int mark);
|
|
|
|
|
2005-07-06 18:39:34 +02:00
|
|
|
/*
|
|
|
|
* Performs an in-place topological sort of list supplied.
|
|
|
|
*
|
|
|
|
* invariant of resulting list is:
|
|
|
|
* a reachable from b => ord(b) < ord(a)
|
2006-02-16 07:05:33 +01:00
|
|
|
* in addition, when lifo == 0, commits on parallel tracks are
|
|
|
|
* sorted in the dates order.
|
2005-07-06 18:39:34 +02:00
|
|
|
*/
|
2006-02-16 07:05:33 +01:00
|
|
|
void sort_in_topological_order(struct commit_list ** list, int lifo);
|
2006-04-07 08:58:51 +02:00
|
|
|
|
|
|
|
struct commit_graft {
|
|
|
|
unsigned char sha1[20];
|
2006-10-30 20:09:06 +01:00
|
|
|
int nr_parent; /* < 0 if shallow commit */
|
2006-04-07 08:58:51 +02:00
|
|
|
unsigned char parent[FLEX_ARRAY][20]; /* more */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct commit_graft *read_graft_line(char *buf, int len);
|
|
|
|
int register_commit_graft(struct commit_graft *, int);
|
2008-02-25 22:46:07 +01:00
|
|
|
struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
|
2006-04-07 08:58:51 +02:00
|
|
|
|
2009-01-23 10:06:53 +01:00
|
|
|
const unsigned char *lookup_replace_object(const unsigned char *sha1);
|
|
|
|
|
2006-07-02 11:49:38 +02:00
|
|
|
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
|
2008-07-30 07:04:14 +02:00
|
|
|
extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
|
2008-06-27 18:22:00 +02:00
|
|
|
extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
|
2006-06-29 15:17:32 +02:00
|
|
|
|
2006-10-30 20:09:06 +01:00
|
|
|
extern int register_shallow(const unsigned char *sha1);
|
2006-10-30 20:09:53 +01:00
|
|
|
extern int unregister_shallow(const unsigned char *sha1);
|
2009-10-31 01:47:23 +01:00
|
|
|
extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol);
|
2007-01-22 07:22:23 +01:00
|
|
|
extern int is_repository_shallow(void);
|
2006-10-30 20:09:06 +01:00
|
|
|
extern struct commit_list *get_shallow_commits(struct object_array *heads,
|
2006-10-30 20:09:53 +01:00
|
|
|
int depth, int shallow_flag, int not_shallow_flag);
|
2006-10-30 20:09:06 +01:00
|
|
|
|
2009-01-26 15:13:24 +01:00
|
|
|
int is_descendant_of(struct commit *, struct commit_list *);
|
2007-01-09 08:22:31 +01:00
|
|
|
int in_merge_bases(struct commit *, struct commit **, int);
|
2007-09-18 02:06:44 +02:00
|
|
|
|
2007-11-25 19:10:10 +01:00
|
|
|
extern int interactive_add(int argc, const char **argv, const char *prefix);
|
2009-08-13 14:29:41 +02:00
|
|
|
extern int run_add_interactive(const char *revision, const char *patch_mode,
|
|
|
|
const char **pathspec);
|
2007-09-18 02:06:44 +02:00
|
|
|
|
2007-11-05 22:22:34 +01:00
|
|
|
static inline int single_parent(struct commit *commit)
|
|
|
|
{
|
|
|
|
return commit->parents && !commit->parents->next;
|
|
|
|
}
|
|
|
|
|
2008-06-27 18:22:03 +02:00
|
|
|
struct commit_list *reduce_heads(struct commit_list *heads);
|
|
|
|
|
make commit_tree a library function
Until now, this has been part of the commit-tree builtin.
However, it is already used by other builtins (like commit,
merge, and notes), and it would be useful to access it from
library code.
The check_valid helper has to come along, too, but is given
a more library-ish name of "assert_sha1_type".
Otherwise, the code is unchanged. There are still a few
rough edges for a library function, like printing the utf8
warning to stderr, but we can address those if and when they
come up as inappropriate.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-02 02:05:23 +02:00
|
|
|
extern int commit_tree(const char *msg, unsigned char *tree,
|
|
|
|
struct commit_list *parents, unsigned char *ret,
|
|
|
|
const char *author);
|
|
|
|
|
2005-04-18 20:39:48 +02:00
|
|
|
#endif /* COMMIT_H */
|