mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
f3badaed51
commit
dc06dc8800
|
@ -2285,7 +2285,7 @@ static void show_commit(struct commit *commit, void *data)
|
|||
}
|
||||
|
||||
static void show_object(struct object *obj,
|
||||
const struct name_path *path, const char *last,
|
||||
struct strbuf *path, const char *last,
|
||||
void *data)
|
||||
{
|
||||
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,
|
||||
const struct name_path *path,
|
||||
struct strbuf *path,
|
||||
const char *last,
|
||||
void *data)
|
||||
{
|
||||
|
|
|
@ -178,7 +178,7 @@ static void finish_commit(struct commit *commit, void *data)
|
|||
}
|
||||
|
||||
static void finish_object(struct object *obj,
|
||||
const struct name_path *path, const char *name,
|
||||
struct strbuf *path, const char *name,
|
||||
void *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,
|
||||
const struct name_path *path, const char *component,
|
||||
struct strbuf *path, const char *component,
|
||||
void *cb_data)
|
||||
{
|
||||
struct rev_list_info *info = cb_data;
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
static void process_blob(struct rev_info *revs,
|
||||
struct blob *blob,
|
||||
show_object_fn show,
|
||||
struct name_path *path,
|
||||
struct strbuf *path,
|
||||
const char *name,
|
||||
void *cb_data)
|
||||
{
|
||||
|
@ -52,7 +52,7 @@ static void process_blob(struct rev_info *revs,
|
|||
static void process_gitlink(struct rev_info *revs,
|
||||
const unsigned char *sha1,
|
||||
show_object_fn show,
|
||||
struct name_path *path,
|
||||
struct strbuf *path,
|
||||
const char *name,
|
||||
void *cb_data)
|
||||
{
|
||||
|
@ -69,7 +69,6 @@ static void process_tree(struct rev_info *revs,
|
|||
struct object *obj = &tree->object;
|
||||
struct tree_desc desc;
|
||||
struct name_entry entry;
|
||||
struct name_path me;
|
||||
enum interesting match = revs->diffopt.pathspec.nr == 0 ?
|
||||
all_entries_interesting: entry_not_interesting;
|
||||
int baselen = base->len;
|
||||
|
@ -87,8 +86,7 @@ static void process_tree(struct rev_info *revs,
|
|||
}
|
||||
|
||||
obj->flags |= SEEN;
|
||||
me.base = base;
|
||||
show(obj, &me, name, cb_data);
|
||||
show(obj, base, name, cb_data);
|
||||
|
||||
strbuf_addstr(base, name);
|
||||
if (base->len)
|
||||
|
@ -113,12 +111,12 @@ static void process_tree(struct rev_info *revs,
|
|||
cb_data);
|
||||
else if (S_ISGITLINK(entry.mode))
|
||||
process_gitlink(revs, entry.sha1,
|
||||
show, &me, entry.path,
|
||||
show, base, entry.path,
|
||||
cb_data);
|
||||
else
|
||||
process_blob(revs,
|
||||
lookup_blob(entry.sha1),
|
||||
show, &me, entry.path,
|
||||
show, base, entry.path,
|
||||
cb_data);
|
||||
}
|
||||
strbuf_setlen(base, baselen);
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define LIST_OBJECTS_H
|
||||
|
||||
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 *);
|
||||
|
||||
typedef void (*show_edge_fn)(struct commit *);
|
||||
|
|
|
@ -148,7 +148,7 @@ static uint32_t find_object_pos(const unsigned char *sha1)
|
|||
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)
|
||||
{
|
||||
struct bitmap *base = data;
|
||||
|
|
|
@ -422,7 +422,7 @@ static int ext_index_add_object(struct object *object, const char *name)
|
|||
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)
|
||||
{
|
||||
struct bitmap *base = data;
|
||||
|
@ -903,7 +903,7 @@ struct bitmap_test_data {
|
|||
};
|
||||
|
||||
static void test_show_object(struct object *object,
|
||||
const struct name_path *path,
|
||||
struct strbuf *path,
|
||||
const char *last, void *data)
|
||||
{
|
||||
struct bitmap_test_data *tdata = data;
|
||||
|
|
|
@ -36,7 +36,7 @@ static int add_one_ref(const char *path, const unsigned char *sha1, int flag, vo
|
|||
* The traversal will have already marked us as SEEN, so we
|
||||
* 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)
|
||||
{
|
||||
update_progress(data);
|
||||
|
|
|
@ -21,17 +21,17 @@
|
|||
|
||||
volatile show_early_output_fn_t show_early_output;
|
||||
|
||||
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;
|
||||
if (path)
|
||||
strbuf_addbuf(&ret, path->base);
|
||||
strbuf_addbuf(&ret, path);
|
||||
strbuf_addstr(&ret, name);
|
||||
return strbuf_detach(&ret, NULL);
|
||||
}
|
||||
|
||||
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 *p;
|
||||
|
|
|
@ -256,14 +256,10 @@ extern void put_revision_mark(const struct rev_info *revs,
|
|||
extern void mark_parents_uninteresting(struct commit *commit);
|
||||
extern void mark_tree_uninteresting(struct tree *tree);
|
||||
|
||||
struct name_path {
|
||||
struct strbuf *base;
|
||||
};
|
||||
|
||||
char *path_name(const struct name_path *path, const char *name);
|
||||
char *path_name(struct strbuf *path, const char *name);
|
||||
|
||||
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,
|
||||
struct object *obj, const char *name);
|
||||
|
|
Loading…
Reference in a new issue