kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

list-objects: drop name_path entirely 

In the previous commit, we left name_path as a thin wrapper
around a strbuf. This patch drops it entirely. As a result,
every show_object_fn callback needs to be adjusted. However,
none of their code needs to be changed at all, because the
only use was to pass it to path_name(), which now handles
the bare strbuf.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2016-02-11 17:26:44 -05:00 committed by Junio C Hamano
parent 13528ab37c
commit bd64516aca
9 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/pack-objects.c
View File

@ -2285,7 +2285,7 @@ static void show_commit(struct commit *commit, void *data)
} }


static void show_object(struct object *obj, static void show_object(struct object *obj,
const struct name_path *path, const char *last, struct strbuf *path, const char *last,
void *data) void *data)
{ {
char *name = path_name(path, last); char *name = path_name(path, last);
@ -2480,7 +2480,7 @@ static int get_object_list_from_bitmap(struct rev_info *revs)
} }


static void record_recent_object(struct object *obj, static void record_recent_object(struct object *obj,
const struct name_path *path, struct strbuf *path,
const char *last, const char *last,
void *data) void *data)
{ {

4
builtin/rev-list.c
View File

@ -178,7 +178,7 @@ static void finish_commit(struct commit *commit, void *data)
} }


static void finish_object(struct object *obj, static void finish_object(struct object *obj,
const struct name_path *path, const char *name, struct strbuf *path, const char *name,
void *cb_data) void *cb_data)
{ {
struct rev_list_info *info = cb_data; struct rev_list_info *info = cb_data;
@ -189,7 +189,7 @@ static void finish_object(struct object *obj,
} }


static void show_object(struct object *obj, static void show_object(struct object *obj,
const struct name_path *path, const char *component, struct strbuf *path, const char *component,
void *cb_data) void *cb_data)
{ {
struct rev_list_info *info = cb_data; struct rev_list_info *info = cb_data;

12
list-objects.c
View File

@ -11,7 +11,7 @@
static void process_blob(struct rev_info *revs, static void process_blob(struct rev_info *revs,
struct blob *blob, struct blob *blob,
show_object_fn show, show_object_fn show,
struct name_path *path, struct strbuf *path,
const char *name, const char *name,
void *cb_data) void *cb_data)
{ {
@ -52,7 +52,7 @@ static void process_blob(struct rev_info *revs,
static void process_gitlink(struct rev_info *revs, static void process_gitlink(struct rev_info *revs,
const unsigned char *sha1, const unsigned char *sha1,
show_object_fn show, show_object_fn show,
struct name_path *path, struct strbuf *path,
const char *name, const char *name,
void *cb_data) void *cb_data)
{ {
@ -69,7 +69,6 @@ static void process_tree(struct rev_info *revs,
struct object *obj = &tree->object; struct object *obj = &tree->object;
struct tree_desc desc; struct tree_desc desc;
struct name_entry entry; struct name_entry entry;
struct name_path me;
enum interesting match = revs->diffopt.pathspec.nr == 0 ? enum interesting match = revs->diffopt.pathspec.nr == 0 ?
all_entries_interesting: entry_not_interesting; all_entries_interesting: entry_not_interesting;
int baselen = base->len; int baselen = base->len;
@ -87,8 +86,7 @@ static void process_tree(struct rev_info *revs,
} }


obj->flags |= SEEN; obj->flags |= SEEN;
me.base = base; show(obj, base, name, cb_data);
show(obj, &me, name, cb_data);


strbuf_addstr(base, name); strbuf_addstr(base, name);
if (base->len) if (base->len)
@ -113,12 +111,12 @@ static void process_tree(struct rev_info *revs,
cb_data); cb_data);
else if (S_ISGITLINK(entry.mode)) else if (S_ISGITLINK(entry.mode))
process_gitlink(revs, entry.sha1, process_gitlink(revs, entry.sha1,
show, &me, entry.path, show, base, entry.path,
cb_data); cb_data);
else else
process_blob(revs, process_blob(revs,
lookup_blob(entry.sha1), lookup_blob(entry.sha1),
show, &me, entry.path, show, base, entry.path,
cb_data); cb_data);
} }
strbuf_setlen(base, baselen); strbuf_setlen(base, baselen);

2
list-objects.h
View File

@ -2,7 +2,7 @@
#define LIST_OBJECTS_H #define LIST_OBJECTS_H


typedef void (*show_commit_fn)(struct commit *, void *); typedef void (*show_commit_fn)(struct commit *, void *);
typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *, void *); typedef void (*show_object_fn)(struct object *, struct strbuf *, const char *, void *);
void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *); void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);


typedef void (*show_edge_fn)(struct commit *); typedef void (*show_edge_fn)(struct commit *);

2
pack-bitmap-write.c
View File

@ -148,7 +148,7 @@ static uint32_t find_object_pos(const unsigned char *sha1)
return entry->in_pack_pos; return entry->in_pack_pos;
} }


static void show_object(struct object *object, const struct name_path *path, static void show_object(struct object *object, struct strbuf *path,
const char *last, void *data) const char *last, void *data)
{ {
struct bitmap *base = data; struct bitmap *base = data;

4
pack-bitmap.c
View File

@ -414,7 +414,7 @@ static int ext_index_add_object(struct object *object, const char *name)
return bitmap_pos + bitmap_git.pack->num_objects; return bitmap_pos + bitmap_git.pack->num_objects;
} }


static void show_object(struct object *object, const struct name_path *path, static void show_object(struct object *object, struct strbuf *path,
const char *last, void *data) const char *last, void *data)
{ {
struct bitmap *base = data; struct bitmap *base = data;
@ -895,7 +895,7 @@ struct bitmap_test_data {
}; };


static void test_show_object(struct object *object, static void test_show_object(struct object *object,
const struct name_path *path, struct strbuf *path,
const char *last, void *data) const char *last, void *data)
{ {
struct bitmap_test_data *tdata = data; struct bitmap_test_data *tdata = data;

2
reachable.c
View File

@ -43,7 +43,7 @@ static int add_one_ref(const char *path, const struct object_id *oid,
* The traversal will have already marked us as SEEN, so we * The traversal will have already marked us as SEEN, so we
* only need to handle any progress reporting here. * only need to handle any progress reporting here.
*/ */
static void mark_object(struct object *obj, const struct name_path *path, static void mark_object(struct object *obj, struct strbuf *path,
const char *name, void *data) const char *name, void *data)
{ {
update_progress(data); update_progress(data);

6
revision.c
View File

@ -25,17 +25,17 @@ volatile show_early_output_fn_t show_early_output;
static const char *term_bad; static const char *term_bad;
static const char *term_good; static const char *term_good;


char *path_name(const struct name_path *path, const char *name) char *path_name(struct strbuf *path, const char *name)
{ {
struct strbuf ret = STRBUF_INIT; struct strbuf ret = STRBUF_INIT;
if (path) if (path)
strbuf_addbuf(&ret, path->base); strbuf_addbuf(&ret, path);
strbuf_addstr(&ret, name); strbuf_addstr(&ret, name);
return strbuf_detach(&ret, NULL); return strbuf_detach(&ret, NULL);
} }


void show_object_with_name(FILE *out, struct object *obj, void show_object_with_name(FILE *out, struct object *obj,
const struct name_path *path, const char *component) struct strbuf *path, const char *component)
{ {
char *name = path_name(path, component); char *name = path_name(path, component);
char *p; char *p;

8
revision.h
View File

@ -257,14 +257,10 @@ extern void put_revision_mark(const struct rev_info *revs,
extern void mark_parents_uninteresting(struct commit *commit); extern void mark_parents_uninteresting(struct commit *commit);
extern void mark_tree_uninteresting(struct tree *tree); extern void mark_tree_uninteresting(struct tree *tree);


struct name_path { char *path_name(struct strbuf *path, const char *name);
struct strbuf *base;
};

char *path_name(const struct name_path *path, const char *name);


extern void show_object_with_name(FILE *, struct object *, extern void show_object_with_name(FILE *, struct object *,
const struct name_path *, const char *); struct strbuf *, const char *);


extern void add_pending_object(struct rev_info *revs, extern void add_pending_object(struct rev_info *revs,
struct object *obj, const char *name); struct object *obj, const char *name);