Diffstat (limited to 'ui-clone.c')
| -rw-r--r-- | ui-clone.c | 49 |
1 files changed, 20 insertions, 29 deletions
@@ -14,45 +14,42 @@ #include "html.h" #include "ui-shared.h" #include "packfile.h" +#include "object-store.h" -static int print_ref_info(const struct reference *ref, void *cb_data) +static int print_ref_info(const char *refname, const char *referent UNUSED, + const struct object_id *oid, int flags, void *cb_data) { struct object *obj; - if (!(obj = parse_object(the_repository, ref->oid))) + if (!(obj = parse_object(the_repository, oid))) return 0; - htmlf("%s\t%s\n", oid_to_hex(ref->oid), ref->name); + htmlf("%s\t%s\n", oid_to_hex(oid), refname); if (obj->type == OBJ_TAG) { - if (!(obj = deref_tag(the_repository, obj, ref->name, 0))) + if (!(obj = deref_tag(the_repository, obj, refname, 0))) return 0; - htmlf("%s\t%s^{}\n", oid_to_hex(&obj->oid), ref->name); + htmlf("%s\t%s^{}\n", oid_to_hex(&obj->oid), refname); } return 0; } static void print_pack_info(void) { - struct odb_source *source; + struct packed_git *pack; char *offset; ctx.page.mimetype = "text/plain"; ctx.page.filename = "objects/info/packs"; cgit_print_http_headers(); - odb_reprepare(the_repository->objects); - for (source = the_repository->objects->sources; source; source = source->next) { - struct odb_source_files *files = odb_source_files_downcast(source); - struct packfile_list_entry *e; - for (e = files->packed->packs.head; e; e = e->next) { - struct packed_git *p = e->pack; - if (p->pack_local) { - offset = strrchr(p->pack_name, '/'); - if (offset && offset[1] != '\0') - ++offset; - else - offset = p->pack_name; - htmlf("P %s\n", offset); - } + reprepare_packed_git(the_repository); + for (pack = get_packed_git(the_repository); pack; pack = pack->next) { + if (pack->pack_local) { + offset = strrchr(pack->pack_name, '/'); + if (offset && offset[1] != '\0') + ++offset; + else + offset = pack->pack_name; + htmlf("P %s\n", offset); } } } @@ -98,7 +95,7 @@ void cgit_clone_info(void) void cgit_clone_objects(void) { - char *p, *path; + char *p; if (!ctx.qry.path) goto err; @@ -119,9 +116,7 @@ void cgit_clone_objects(void) goto err; } - path = repo_git_path(the_repository, "objects/%s", ctx.qry.path); - send_file(path); - free(path); + send_file(git_path("objects/%s", ctx.qry.path)); return; err: @@ -130,9 +125,5 @@ err: void cgit_clone_head(void) { - char *path; - - path = repo_git_path(the_repository, "HEAD"); - send_file(path); - free(path); + send_file(git_path("%s", "HEAD")); } |