mirror of
https://github.com/git/git.git
synced 2024-11-25 19:04:18 +08:00
1f1e895fcc
We've had this notion of a "object_list" for a long time, which eventually grew a "name" member because some users (notably git-rev-list) wanted to name each object as it is generated. That object_list is great for some things, but it isn't all that wonderful for others, and the "name" member is generally not used by everybody. This patch splits the users of the object_list array up into two: the traditional list users, who want the list-like format, and who don't actually use or want the name. And another class of users that really used the list as an extensible array, and generally wanted to name the objects. The patch is fairly straightforward, but it's also biggish. Most of it really just cleans things up: switching the revision parsing and listing over to the array makes things like the builtin-diff usage much simpler (we now see exactly how many members the array has, and we don't get the objects reversed from the order they were on the command line). One of the main reasons for doing this at all is that the malloc overhead of the simple object list was actually pretty high, and the array is just a lot denser. So this patch brings down memory usage by git-rev-list by just under 3% (on top of all the other memory use optimizations) on the mozilla archive. It does add more lines than it removes, and more importantly, it adds a whole new infrastructure for maintaining lists of objects, but on the other hand, the new dynamic array code is pretty obvious. The change to builtin-diff-tree.c shows a fairly good example of why an array interface is sometimes more natural, and just much simpler for everybody. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
110 lines
2.5 KiB
C
110 lines
2.5 KiB
C
#ifndef REVISION_H
|
|
#define REVISION_H
|
|
|
|
#define SEEN (1u<<0)
|
|
#define UNINTERESTING (1u<<1)
|
|
#define TREECHANGE (1u<<2)
|
|
#define SHOWN (1u<<3)
|
|
#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
|
|
#define BOUNDARY (1u<<5)
|
|
#define BOUNDARY_SHOW (1u<<6)
|
|
#define ADDED (1u<<7) /* Parents already parsed and added? */
|
|
|
|
struct rev_info;
|
|
struct log_info;
|
|
|
|
typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
|
|
|
|
struct rev_info {
|
|
/* Starting list */
|
|
struct commit_list *commits;
|
|
struct object_array pending;
|
|
|
|
/* Basic information */
|
|
const char *prefix;
|
|
void *prune_data;
|
|
prune_fn_t *prune_fn;
|
|
|
|
/* Traversal flags */
|
|
unsigned int dense:1,
|
|
no_merges:1,
|
|
no_walk:1,
|
|
remove_empty_trees:1,
|
|
simplify_history:1,
|
|
lifo:1,
|
|
topo_order:1,
|
|
tag_objects:1,
|
|
tree_objects:1,
|
|
blob_objects:1,
|
|
edge_hint:1,
|
|
limited:1,
|
|
unpacked:1,
|
|
boundary:1,
|
|
parents:1;
|
|
|
|
/* Diff flags */
|
|
unsigned int diff:1,
|
|
full_diff:1,
|
|
show_root_diff:1,
|
|
no_commit_id:1,
|
|
verbose_header:1,
|
|
ignore_merges:1,
|
|
combine_merges:1,
|
|
dense_combined_merges:1,
|
|
always_show_header:1;
|
|
|
|
/* Format info */
|
|
unsigned int shown_one:1,
|
|
abbrev_commit:1;
|
|
unsigned int abbrev;
|
|
enum cmit_fmt commit_format;
|
|
struct log_info *loginfo;
|
|
int nr, total;
|
|
const char *mime_boundary;
|
|
const char *add_signoff;
|
|
const char *extra_headers;
|
|
|
|
/* special limits */
|
|
int max_count;
|
|
unsigned long max_age;
|
|
unsigned long min_age;
|
|
|
|
/* diff info for patches and for paths limiting */
|
|
struct diff_options diffopt;
|
|
struct diff_options pruning;
|
|
|
|
topo_sort_set_fn_t topo_setter;
|
|
topo_sort_get_fn_t topo_getter;
|
|
};
|
|
|
|
#define REV_TREE_SAME 0
|
|
#define REV_TREE_NEW 1
|
|
#define REV_TREE_DIFFERENT 2
|
|
|
|
/* revision.c */
|
|
extern int rev_same_tree_as_empty(struct rev_info *, struct tree *t1);
|
|
extern int rev_compare_tree(struct rev_info *, struct tree *t1, struct tree *t2);
|
|
|
|
extern void init_revisions(struct rev_info *revs);
|
|
extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
|
|
extern void prepare_revision_walk(struct rev_info *revs);
|
|
extern struct commit *get_revision(struct rev_info *revs);
|
|
|
|
extern void mark_parents_uninteresting(struct commit *commit);
|
|
extern void mark_tree_uninteresting(struct tree *tree);
|
|
|
|
struct name_path {
|
|
struct name_path *up;
|
|
int elem_len;
|
|
const char *elem;
|
|
};
|
|
|
|
extern void add_object(struct object *obj,
|
|
struct object_array *p,
|
|
struct name_path *path,
|
|
const char *name);
|
|
|
|
extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
|
|
|
|
#endif
|