2005-04-18 18:39:48 +00:00
|
|
|
#ifndef COMMIT_H
|
|
|
|
#define COMMIT_H
|
|
|
|
|
|
|
|
#include "object.h"
|
|
|
|
#include "tree.h"
|
|
|
|
|
|
|
|
struct commit_list {
|
|
|
|
struct commit *item;
|
|
|
|
struct commit_list *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct commit {
|
|
|
|
struct object object;
|
2006-06-18 01:26:18 +00:00
|
|
|
void *util;
|
2005-04-18 18:39:48 +00:00
|
|
|
unsigned long date;
|
|
|
|
struct commit_list *parents;
|
|
|
|
struct tree *tree;
|
2005-05-26 02:26:28 +00:00
|
|
|
char *buffer;
|
2005-04-18 18:39:48 +00: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 21:43:17 +00:00
|
|
|
extern int save_commit_buffer;
|
2005-04-18 18:39:48 +00:00
|
|
|
extern const char *commit_type;
|
|
|
|
|
2005-06-03 15:05:39 +00:00
|
|
|
struct commit *lookup_commit(const unsigned char *sha1);
|
|
|
|
struct commit *lookup_commit_reference(const unsigned char *sha1);
|
2005-08-21 09:51:10 +00:00
|
|
|
struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
|
|
|
|
int quiet);
|
2005-04-18 18:39:48 +00:00
|
|
|
|
2005-05-06 17:48:34 +00:00
|
|
|
int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
|
|
|
|
|
2005-04-18 18:39:48 +00:00
|
|
|
int parse_commit(struct commit *item);
|
|
|
|
|
2005-05-31 01:44:02 +00:00
|
|
|
struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
|
2005-07-06 16:31:17 +00:00
|
|
|
struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
|
2005-04-24 01:47:23 +00:00
|
|
|
|
2005-04-18 18:39:48 +00:00
|
|
|
void free_commit_list(struct commit_list *list);
|
|
|
|
|
2005-04-24 01:47:23 +00:00
|
|
|
void sort_by_date(struct commit_list **list);
|
|
|
|
|
2005-06-05 16:02:03 +00:00
|
|
|
/* Commit formats */
|
|
|
|
enum cmit_fmt {
|
|
|
|
CMIT_FMT_RAW,
|
|
|
|
CMIT_FMT_MEDIUM,
|
|
|
|
CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
|
2005-06-27 00:50:46 +00:00
|
|
|
CMIT_FMT_SHORT,
|
|
|
|
CMIT_FMT_FULL,
|
2005-11-10 06:15:27 +00:00
|
|
|
CMIT_FMT_FULLER,
|
2005-08-09 05:15:40 +00:00
|
|
|
CMIT_FMT_ONELINE,
|
2006-04-18 23:45:27 +00:00
|
|
|
CMIT_FMT_EMAIL,
|
2006-04-16 06:46:36 +00:00
|
|
|
|
|
|
|
CMIT_FMT_UNSPECIFIED,
|
2005-06-05 16:02:03 +00:00
|
|
|
};
|
|
|
|
|
2005-06-27 00:50:46 +00:00
|
|
|
extern enum cmit_fmt get_commit_format(const char *arg);
|
2006-08-28 13:52:13 +00:00
|
|
|
extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject, int relative_date);
|
2005-06-01 15:34:23 +00:00
|
|
|
|
2005-04-24 01:47:23 +00:00
|
|
|
/** Removes the first commit from a list sorted by date, and adds all
|
|
|
|
* of its parents.
|
|
|
|
**/
|
2005-04-24 03:29:22 +00:00
|
|
|
struct commit *pop_most_recent_commit(struct commit_list **list,
|
|
|
|
unsigned int mark);
|
2005-04-24 01:47:23 +00:00
|
|
|
|
2005-06-06 15:39:40 +00:00
|
|
|
struct commit *pop_commit(struct commit_list **stack);
|
|
|
|
|
2006-01-08 02:52:42 +00:00
|
|
|
void clear_commit_marks(struct commit *commit, unsigned int mark);
|
|
|
|
|
2005-06-06 15:39:40 +00:00
|
|
|
int count_parents(struct commit * commit);
|
2005-07-06 16:39:34 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Performs an in-place topological sort of list supplied.
|
|
|
|
*
|
2006-03-10 09:21:37 +00:00
|
|
|
* Pre-conditions for sort_in_topological_order:
|
2005-07-06 16:39:34 +00:00
|
|
|
* all commits in input list and all parents of those
|
|
|
|
* commits must have object.util == NULL
|
2006-03-10 09:21:37 +00:00
|
|
|
*
|
|
|
|
* Pre-conditions for sort_in_topological_order_fn:
|
|
|
|
* all commits in input list and all parents of those
|
|
|
|
* commits must have getter(commit) == NULL
|
|
|
|
*
|
|
|
|
* Post-conditions:
|
2005-07-06 16:39:34 +00:00
|
|
|
* invariant of resulting list is:
|
|
|
|
* a reachable from b => ord(b) < ord(a)
|
2006-02-16 06:05:33 +00:00
|
|
|
* in addition, when lifo == 0, commits on parallel tracks are
|
|
|
|
* sorted in the dates order.
|
2005-07-06 16:39:34 +00:00
|
|
|
*/
|
2006-03-10 09:21:37 +00:00
|
|
|
|
|
|
|
typedef void (*topo_sort_set_fn_t)(struct commit*, void *data);
|
|
|
|
typedef void* (*topo_sort_get_fn_t)(struct commit*);
|
|
|
|
|
|
|
|
void topo_sort_default_setter(struct commit *c, void *data);
|
|
|
|
void *topo_sort_default_getter(struct commit *c);
|
|
|
|
|
2006-02-16 06:05:33 +00:00
|
|
|
void sort_in_topological_order(struct commit_list ** list, int lifo);
|
2006-03-10 09:21:37 +00:00
|
|
|
void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
|
|
|
|
topo_sort_set_fn_t setter,
|
|
|
|
topo_sort_get_fn_t getter);
|
2006-04-07 06:58:51 +00:00
|
|
|
|
|
|
|
struct commit_graft {
|
|
|
|
unsigned char sha1[20];
|
2006-10-30 19:09:06 +00:00
|
|
|
int nr_parent; /* < 0 if shallow commit */
|
2006-04-07 06:58:51 +00: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);
|
|
|
|
int read_graft_file(const char *graft_file);
|
|
|
|
|
2006-07-02 09:49:38 +00:00
|
|
|
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
|
2006-06-29 13:17:32 +00:00
|
|
|
|
2006-10-30 19:09:06 +00:00
|
|
|
extern int register_shallow(const unsigned char *sha1);
|
2006-10-30 19:09:53 +00:00
|
|
|
extern int unregister_shallow(const unsigned char *sha1);
|
2006-10-30 19:09:06 +00:00
|
|
|
extern int write_shallow_commits(int fd, int use_pack_protocol);
|
2007-01-22 06:22:23 +00:00
|
|
|
extern int is_repository_shallow(void);
|
2006-10-30 19:09:06 +00:00
|
|
|
extern struct commit_list *get_shallow_commits(struct object_array *heads,
|
2006-10-30 19:09:53 +00:00
|
|
|
int depth, int shallow_flag, int not_shallow_flag);
|
2006-10-30 19:09:06 +00:00
|
|
|
|
2006-12-19 08:14:04 +00:00
|
|
|
int in_merge_bases(struct commit *rev1, struct commit *rev2);
|
2005-04-18 18:39:48 +00:00
|
|
|
#endif /* COMMIT_H */
|