The 19th batch

[thirdparty/git.git] / fetch-pack.c

diff --git a/fetch-pack.c b/fetch-pack.c
index 5b8aa0adc77621504619b831bdd842b83f4867a1..2c76bcad400374e7c6cfe14ef3d9e8817c907031 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1,3 +1,5 @@
+#define USE_THE_REPOSITORY_VARIABLE
+

 #include "git-compat-util.h"
 #include "repository.h"
 #include "config.h"
 #include "git-compat-util.h"
 #include "repository.h"
 #include "config.h"


@@ -181,6 +183,7 @@ static int rev_list_insert_ref(struct fetch_negotiator *negotiator,
 }
 
 static int rev_list_insert_ref_oid(const char *refname UNUSED,
 }
 
 static int rev_list_insert_ref_oid(const char *refname UNUSED,

+                                  const char *referent UNUSED,

                                   const struct object_id *oid,
                                   int flag UNUSED,
                                   void *cb_data)
                                   const struct object_id *oid,
                                   int flag UNUSED,
                                   void *cb_data)


@@ -290,7 +293,8 @@ static void mark_tips(struct fetch_negotiator *negotiator,
        int i;
 
        if (!negotiation_tips) {
        int i;
 
        if (!negotiation_tips) {

-               for_each_rawref(rev_list_insert_ref_oid, negotiator);
+               refs_for_each_rawref(get_main_ref_store(the_repository),
+                                    rev_list_insert_ref_oid, negotiator);

                return;
        }
 
                return;
        }
 


@@ -607,6 +611,7 @@ static int mark_complete(const struct object_id *oid)
 }
 
 static int mark_complete_oid(const char *refname UNUSED,
 }
 
 static int mark_complete_oid(const char *refname UNUSED,

+                            const char *referent UNUSED,

                             const struct object_id *oid,
                             int flag UNUSED,
                             void *cb_data UNUSED)
                             const struct object_id *oid,
                             int flag UNUSED,
                             void *cb_data UNUSED)


@@ -732,11 +737,6 @@ static void mark_alternate_complete(struct fetch_negotiator *negotiator UNUSED,
        mark_complete(&obj->oid);
 }
 
        mark_complete(&obj->oid);
 }
 

-struct loose_object_iter {
-       struct oidset *loose_object_set;
-       struct ref *refs;
-};
-

 /*
  * Mark recent commits available locally and reachable from a local ref as
  * COMPLETE.
 /*
  * Mark recent commits available locally and reachable from a local ref as
  * COMPLETE.


@@ -793,7 +793,8 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
         */
        trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL);
        if (!args->deepen) {
         */
        trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL);
        if (!args->deepen) {

-               for_each_rawref(mark_complete_oid, NULL);
+               refs_for_each_rawref(get_main_ref_store(the_repository),
+                                    mark_complete_oid, NULL);

                for_each_cached_alternate(NULL, mark_alternate_complete);
                commit_list_sort_by_date(&complete);
                if (cutoff)
                for_each_cached_alternate(NULL, mark_alternate_complete);
                commit_list_sort_by_date(&complete);
                if (cutoff)


@@ -957,12 +958,7 @@ static int get_pack(struct fetch_pack_args *args,
                strvec_push(&cmd.args, alternate_shallow_file);
        }
 
                strvec_push(&cmd.args, alternate_shallow_file);
        }
 

-       if (fetch_fsck_objects >= 0
-           ? fetch_fsck_objects
-           : transfer_fsck_objects >= 0
-           ? transfer_fsck_objects
-           : 0)
-               fsck_objects = 1;
+       fsck_objects = fetch_pack_fsck_objects();

 
        if (do_keep || args->from_promisor || index_pack_args || fsck_objects) {
                if (pack_lockfiles || fsck_objects)
 
        if (do_keep || args->from_promisor || index_pack_args || fsck_objects) {
                if (pack_lockfiles || fsck_objects)


@@ -1041,8 +1037,10 @@ static int get_pack(struct fetch_pack_args *args,
 
                if (!is_well_formed)
                        die(_("fetch-pack: invalid index-pack output"));
 
                if (!is_well_formed)
                        die(_("fetch-pack: invalid index-pack output"));

-               if (pack_lockfile)
+               if (pack_lockfiles && pack_lockfile)

                        string_list_append_nodup(pack_lockfiles, pack_lockfile);
                        string_list_append_nodup(pack_lockfiles, pack_lockfile);

+               else
+                       free(pack_lockfile);

                parse_gitmodules_oids(cmd.out, gitmodules_oids);
                close(cmd.out);
        }
                parse_gitmodules_oids(cmd.out, gitmodules_oids);
                close(cmd.out);
        }


@@ -1616,7 +1614,7 @@ static void receive_packfile_uris(struct packet_reader *reader,
        while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
                if (reader->pktlen < the_hash_algo->hexsz ||
                    reader->line[the_hash_algo->hexsz] != ' ')
        while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
                if (reader->pktlen < the_hash_algo->hexsz ||
                    reader->line[the_hash_algo->hexsz] != ' ')

-                       die("expected '<hash> <uri>', got: %s\n", reader->line);
+                       die("expected '<hash> <uri>', got: %s", reader->line);

 
                string_list_append(uris, reader->line);
        }
 
                string_list_append(uris, reader->line);
        }


@@ -1863,13 +1861,13 @@ static int fetch_pack_config_cb(const char *var, const char *value,
        const char *msg_id;
 
        if (strcmp(var, "fetch.fsck.skiplist") == 0) {
        const char *msg_id;
 
        if (strcmp(var, "fetch.fsck.skiplist") == 0) {

-               const char *path;
+               char *path ;

 
                if (git_config_pathname(&path, var, value))
                        return 1;
                strbuf_addf(&fsck_msg_types, "%cskiplist=%s",
                        fsck_msg_types.len ? ',' : '=', path);
 
                if (git_config_pathname(&path, var, value))
                        return 1;
                strbuf_addf(&fsck_msg_types, "%cskiplist=%s",
                        fsck_msg_types.len ? ',' : '=', path);

-               free((char *)path);
+               free(path);

                return 0;
        }
 
                return 0;
        }
 


@@ -2049,6 +2047,16 @@ static const struct object_id *iterate_ref_map(void *cb_data)
        return &ref->old_oid;
 }
 
        return &ref->old_oid;
 }
 

+int fetch_pack_fsck_objects(void)
+{
+       fetch_pack_setup();
+       if (fetch_fsck_objects >= 0)
+               return fetch_fsck_objects;
+       if (transfer_fsck_objects >= 0)
+               return transfer_fsck_objects;
+       return 0;
+}
+

 struct ref *fetch_pack(struct fetch_pack_args *args,
                       int fd[],
                       const struct ref *ref,
 struct ref *fetch_pack(struct fetch_pack_args *args,
                       int fd[],
                       const struct ref *ref,


@@ -2216,10 +2224,13 @@ void negotiate_using_fetch(const struct oid_array *negotiation_tips,
                                           the_repository, "%d",
                                           negotiation_round);
        }
                                           the_repository, "%d",
                                           negotiation_round);
        }

-       trace2_region_enter("fetch-pack", "negotiate_using_fetch", the_repository);
+       trace2_region_leave("fetch-pack", "negotiate_using_fetch", the_repository);

        trace2_data_intmax("negotiate_using_fetch", the_repository,
                           "total_rounds", negotiation_round);
        trace2_data_intmax("negotiate_using_fetch", the_repository,
                           "total_rounds", negotiation_round);

+

        clear_common_flag(acked_commits);
        clear_common_flag(acked_commits);

+       object_array_clear(&nt_object_array);
+       negotiator.release(&negotiator);

        strbuf_release(&req_buf);
 }
 
        strbuf_release(&req_buf);
 }