http-push: send out fetch requests on queue

Previously, requests for remote files were simply added to the queue
(pointed to by request_queue_head) and no transfer actually takes
place (the fill function add_fill_function() is not added until line
2441), even though code that followed may rely on these remote files to
be present (eg. the setup_revisions invocation).

The code that sends out the requests on the request queue is refactored
into the method run_request_queue.

After the get_dav_remote_heads invocation (ie. after fetch requests are
added to the queue), the requests on the queue are sent out through an
invocation to run_request_queue.

This invocation to run_request_queue entails adding a fill function
before pushing checks take place, which may lead to accidental,
unwanted pushes previously.

The flag is_running_queue is introduced to prevent this from occurring.
fill_active_slot is made to check the flag is_running_queue before
the sending of the requests proceeds.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-push.c b/http-push.c
index a4ff7be217b029348e6acad15970ee465c46c3be..b3d5c4512a69b9b10b409c18e5a4e5f4d17d92eb 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -846,11 +846,12 @@ static void finish_request(struct transfer_request *request)
 }
 
 #ifdef USE_CURL_MULTI
 }
 
 #ifdef USE_CURL_MULTI

+static int is_running_queue;

 static int fill_active_slot(void *unused)
 {
        struct transfer_request *request;
 
 static int fill_active_slot(void *unused)
 {
        struct transfer_request *request;
 

-       if (aborted)
+       if (aborted || !is_running_queue)

                return 0;
 
        for (request = request_queue_head; request; request = request->next) {
                return 0;
 
        for (request = request_queue_head; request; request = request->next) {


@@ -2173,6 +2174,25 @@ static int delete_remote_branch(char *pattern, int force)
        return 0;
 }
 
        return 0;
 }
 

+void run_request_queue(void)
+{
+#ifdef USE_CURL_MULTI
+       is_running_queue = 1;
+       fill_active_slots();
+       add_fill_function(NULL, fill_active_slot);
+#endif
+       do {
+               finish_all_active_slots();
+#ifdef USE_CURL_MULTI
+               fill_active_slots();
+#endif
+       } while (request_queue_head && !aborted);
+
+#ifdef USE_CURL_MULTI
+       is_running_queue = 0;
+#endif
+}
+

 int main(int argc, char **argv)
 {
        struct transfer_request *request;
 int main(int argc, char **argv)
 {
        struct transfer_request *request;


@@ -2277,6 +2297,8 @@ int main(int argc, char **argv)
                repo->url = rewritten_url;
        }
 
                repo->url = rewritten_url;
        }
 

+       is_running_queue = 0;
+

        /* Verify DAV compliance/lock support */
        if (!locking_available()) {
                rc = 1;
        /* Verify DAV compliance/lock support */
        if (!locking_available()) {
                rc = 1;


@@ -2306,6 +2328,7 @@ int main(int argc, char **argv)
        local_refs = get_local_heads();
        fprintf(stderr, "Fetching remote heads...\n");
        get_dav_remote_heads();
        local_refs = get_local_heads();
        fprintf(stderr, "Fetching remote heads...\n");
        get_dav_remote_heads();

+       run_request_queue();

 
        /* Remove a remote branch if -d or -D was specified */
        if (delete_branch) {
 
        /* Remove a remote branch if -d or -D was specified */
        if (delete_branch) {


@@ -2435,16 +2458,8 @@ int main(int argc, char **argv)
                if (objects_to_send)
                        fprintf(stderr, "    sending %d objects\n",
                                objects_to_send);
                if (objects_to_send)
                        fprintf(stderr, "    sending %d objects\n",
                                objects_to_send);

-#ifdef USE_CURL_MULTI
-               fill_active_slots();
-               add_fill_function(NULL, fill_active_slot);
-#endif
-               do {
-                       finish_all_active_slots();
-#ifdef USE_CURL_MULTI
-                       fill_active_slots();
-#endif
-               } while (request_queue_head && !aborted);
+
+               run_request_queue();

 
                /* Update the remote branch if all went well */
                if (aborted || !update_remote(ref->new_sha1, ref_lock))
 
                /* Update the remote branch if all went well */
                if (aborted || !update_remote(ref->new_sha1, ref_lock))

diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
index ad0f14b93c50450343ccc6f938456ae8426a73a8..f4a2cf6c171a6356804f61ac6f5707dd587515e5 100755 (executable)
--- a/t/t5540-http-push.sh
+++ b/t/t5540-http-push.sh
@@ -67,7 +67,7 @@ test_expect_success ' push to remote repository with unpacked refs' '
         test $HEAD = $(git rev-parse --verify HEAD))
 '
 
         test $HEAD = $(git rev-parse --verify HEAD))
 '
 

-test_expect_failure 'http-push fetches unpacked objects' '
+test_expect_success 'http-push fetches unpacked objects' '

        cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
                "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_unpacked.git &&
 
        cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
                "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_unpacked.git &&
 


@@ -83,7 +83,7 @@ test_expect_failure 'http-push fetches unpacked objects' '
         git push -f -v $HTTPD_URL/test_repo_unpacked.git master)
 '
 
         git push -f -v $HTTPD_URL/test_repo_unpacked.git master)
 '
 

-test_expect_failure 'http-push fetches packed objects' '
+test_expect_success 'http-push fetches packed objects' '

        cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
                "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_packed.git &&
 
        cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
                "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_packed.git &&