bundle.c: remove the_repository references

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/bundle.c b/builtin/bundle.c
index d0de59b94ff23eebe03984dc670babf793bdd5ff..9e9c65d9c698cae2ab735463edf378d5dd3a9815 100644 (file)
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -40,7 +40,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
                        usage(builtin_bundle_usage);
                        return 1;
                }
                        usage(builtin_bundle_usage);
                        return 1;
                }

-               if (verify_bundle(&header, 1))
+               if (verify_bundle(the_repository, &header, 1))

                        return 1;
                fprintf(stderr, _("%s is okay\n"), bundle_file);
                return 0;
                        return 1;
                fprintf(stderr, _("%s is okay\n"), bundle_file);
                return 0;


@@ -56,11 +56,12 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
                }
                if (!startup_info->have_repository)
                        die(_("Need a repository to create a bundle."));
                }
                if (!startup_info->have_repository)
                        die(_("Need a repository to create a bundle."));

-               return !!create_bundle(&header, bundle_file, argc, argv);
+               return !!create_bundle(the_repository, &header,
+                                      bundle_file, argc, argv);

        } else if (!strcmp(cmd, "unbundle")) {
                if (!startup_info->have_repository)
                        die(_("Need a repository to unbundle."));
        } else if (!strcmp(cmd, "unbundle")) {
                if (!startup_info->have_repository)
                        die(_("Need a repository to unbundle."));

-               return !!unbundle(&header, bundle_fd, 0) ||
+               return !!unbundle(the_repository, &header, bundle_fd, 0) ||

                        list_bundle_refs(&header, argc, argv);
        } else
                usage(builtin_bundle_usage);
                        list_bundle_refs(&header, argc, argv);
        } else
                usage(builtin_bundle_usage);

diff --git a/bundle.c b/bundle.c
index 1ef584b93b87491dca873429f1fbbbadf19622d4..b94992675ab763728abdc47cc75ab9996f499ba1 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -127,7 +127,9 @@ static int list_refs(struct ref_list *r, int argc, const char **argv)
 /* Remember to update object flag allocation in object.h */
 #define PREREQ_MARK (1u<<16)
 
 /* Remember to update object flag allocation in object.h */
 #define PREREQ_MARK (1u<<16)
 

-int verify_bundle(struct bundle_header *header, int verbose)
+int verify_bundle(struct repository *r,
+                 struct bundle_header *header,
+                 int verbose)

 {
        /*
         * Do fast check, then if any prereqs are missing then go line by line
 {
        /*
         * Do fast check, then if any prereqs are missing then go line by line


@@ -140,10 +142,10 @@ int verify_bundle(struct bundle_header *header, int verbose)
        int i, ret = 0, req_nr;
        const char *message = _("Repository lacks these prerequisite commits:");
 
        int i, ret = 0, req_nr;
        const char *message = _("Repository lacks these prerequisite commits:");
 

-       repo_init_revisions(the_repository, &revs, NULL);
+       repo_init_revisions(r, &revs, NULL);

        for (i = 0; i < p->nr; i++) {
                struct ref_list_entry *e = p->list + i;
        for (i = 0; i < p->nr; i++) {
                struct ref_list_entry *e = p->list + i;

-               struct object *o = parse_object(the_repository, &e->oid);
+               struct object *o = parse_object(r, &e->oid);

                if (o) {
                        o->flags |= PREREQ_MARK;
                        add_pending_object(&revs, o, e->name);
                if (o) {
                        o->flags |= PREREQ_MARK;
                        add_pending_object(&revs, o, e->name);


@@ -168,7 +170,7 @@ int verify_bundle(struct bundle_header *header, int verbose)
 
        for (i = 0; i < p->nr; i++) {
                struct ref_list_entry *e = p->list + i;
 
        for (i = 0; i < p->nr; i++) {
                struct ref_list_entry *e = p->list + i;

-               struct object *o = parse_object(the_repository, &e->oid);
+               struct object *o = parse_object(r, &e->oid);

                assert(o); /* otherwise we'd have returned early */
                if (o->flags & SHOWN)
                        continue;
                assert(o); /* otherwise we'd have returned early */
                if (o->flags & SHOWN)
                        continue;


@@ -180,7 +182,7 @@ int verify_bundle(struct bundle_header *header, int verbose)
        /* Clean up objects used, as they will be reused. */
        for (i = 0; i < p->nr; i++) {
                struct ref_list_entry *e = p->list + i;
        /* Clean up objects used, as they will be reused. */
        for (i = 0; i < p->nr; i++) {
                struct ref_list_entry *e = p->list + i;

-               commit = lookup_commit_reference_gently(the_repository, &e->oid, 1);
+               commit = lookup_commit_reference_gently(r, &e->oid, 1);

                if (commit)
                        clear_commit_marks(commit, ALL_REV_FLAGS);
        }
                if (commit)
                        clear_commit_marks(commit, ALL_REV_FLAGS);
        }


@@ -375,8 +377,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
                         * in terms of a tag (e.g. v2.0 from the range
                         * "v1.0..v2.0")?
                         */
                         * in terms of a tag (e.g. v2.0 from the range
                         * "v1.0..v2.0")?
                         */

-                       struct commit *one = lookup_commit_reference(the_repository,
-                                                                    &oid);
+                       struct commit *one = lookup_commit_reference(revs->repo, &oid);

                        struct object *obj;
 
                        if (e->item == &(one->object)) {
                        struct object *obj;
 
                        if (e->item == &(one->object)) {


@@ -409,8 +410,8 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
        return ref_count;
 }
 
        return ref_count;
 }
 

-int create_bundle(struct bundle_header *header, const char *path,
-                 int argc, const char **argv)
+int create_bundle(struct repository *r, struct bundle_header *header,
+                 const char *path, int argc, const char **argv)

 {
        struct lock_file lock = LOCK_INIT;
        int bundle_fd = -1;
 {
        struct lock_file lock = LOCK_INIT;
        int bundle_fd = -1;


@@ -441,7 +442,7 @@ int create_bundle(struct bundle_header *header, const char *path,
 
        /* init revs to list objects for pack-objects later */
        save_commit_buffer = 0;
 
        /* init revs to list objects for pack-objects later */
        save_commit_buffer = 0;

-       repo_init_revisions(the_repository, &revs, NULL);
+       repo_init_revisions(r, &revs, NULL);

 
        /* write prerequisites */
        if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv))
 
        /* write prerequisites */
        if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv))


@@ -482,7 +483,8 @@ int create_bundle(struct bundle_header *header, const char *path,
        return -1;
 }
 
        return -1;
 }
 

-int unbundle(struct bundle_header *header, int bundle_fd, int flags)
+int unbundle(struct repository *r, struct bundle_header *header,
+            int bundle_fd, int flags)

 {
        const char *argv_index_pack[] = {"index-pack",
                                         "--fix-thin", "--stdin", NULL, NULL};
 {
        const char *argv_index_pack[] = {"index-pack",
                                         "--fix-thin", "--stdin", NULL, NULL};


@@ -491,7 +493,7 @@ int unbundle(struct bundle_header *header, int bundle_fd, int flags)
        if (flags & BUNDLE_VERBOSE)
                argv_index_pack[3] = "-v";
 
        if (flags & BUNDLE_VERBOSE)
                argv_index_pack[3] = "-v";
 

-       if (verify_bundle(header, 0))
+       if (verify_bundle(r, header, 0))

                return -1;
        ip.argv = argv_index_pack;
        ip.in = bundle_fd;
                return -1;
        ip.argv = argv_index_pack;
        ip.in = bundle_fd;

diff --git a/bundle.h b/bundle.h
index e9a4cb6a74335cfd8972b19340b38e2210061a6d..781e6f5c3a837ac65e6911ec5e0ae458b8b6a5c7 100644 (file)
--- a/bundle.h
+++ b/bundle.h
@@ -18,11 +18,12 @@ struct bundle_header {
 
 int is_bundle(const char *path, int quiet);
 int read_bundle_header(const char *path, struct bundle_header *header);
 
 int is_bundle(const char *path, int quiet);
 int read_bundle_header(const char *path, struct bundle_header *header);

-int create_bundle(struct bundle_header *header, const char *path,
-               int argc, const char **argv);
-int verify_bundle(struct bundle_header *header, int verbose);
+int create_bundle(struct repository *r, struct bundle_header *header,
+                 const char *path, int argc, const char **argv);
+int verify_bundle(struct repository *r, struct bundle_header *header, int verbose);

 #define BUNDLE_VERBOSE 1
 #define BUNDLE_VERBOSE 1

-int unbundle(struct bundle_header *header, int bundle_fd, int flags);
+int unbundle(struct repository *r, struct bundle_header *header,
+            int bundle_fd, int flags);

 int list_bundle_refs(struct bundle_header *header,
                int argc, const char **argv);
 
 int list_bundle_refs(struct bundle_header *header,
                int argc, const char **argv);
 

diff --git a/transport.c b/transport.c
index 71f663743f329d24de1834e71b89a8fb422d3f05..f6e54f641254aa9ddbeeb722bdb22e351e22a482 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -154,7 +154,7 @@ static int fetch_refs_from_bundle(struct transport *transport,
                               int nr_heads, struct ref **to_fetch)
 {
        struct bundle_transport_data *data = transport->data;
                               int nr_heads, struct ref **to_fetch)
 {
        struct bundle_transport_data *data = transport->data;

-       return unbundle(&data->header, data->fd,
+       return unbundle(the_repository, &data->header, data->fd,

                        transport->progress ? BUNDLE_VERBOSE : 0);
 }
 
                        transport->progress ? BUNDLE_VERBOSE : 0);
 }