gvfs-helper: override cache server for get

This extension of the gvfs.cache-server config now allows a new key,
gvfs.get.cache-server, to override the cache-server URL for only the
prefetch endpoint.

The purpose of this config is to allow for incremental testing and
deployment of new cache-server infrastructure.

Signed-off-by: Derrick Stolee <stolee@gmail.com>

Author: derrickstolee

Documentation/config/gvfs.adoc

@@ -10,6 +10,9 @@ gvfs.<verb>.cache-server::
 --
 	prefetch::
 		Use this cache server when prefetching commits and tree packfiles.
+	get::
+		Use this cache server when downloading objects immediately via the
+		GET endpoint.
 --
 
 gvfs.sharedcache::

gvfs-helper.c

@@ -395,6 +395,7 @@ enum gh__server_type {
 
 enum gh__verb {
 	PREFETCH,
+	GET,
 };
 
 static void update_cache_server_for_verb(enum gh__verb verb)
@@ -408,6 +409,10 @@ static void update_cache_server_for_verb(enum gh__verb verb)
 			verbstr = "prefetch";
 			break;
 
+		case GET:
+			verbstr = "get";
+			break;
+
 		default:
 			gh__global.cache_server_url_backup = NULL;
 			return;
@@ -3360,7 +3365,9 @@ static void do__http_get__gvfs_object(struct gh__response_status *status,
 
 	setup_gvfs_objects_progress(&params, l_num, l_den);
 
+	update_cache_server_for_verb(GET);
 	do_req__with_fallback(component_url.buf, &params, status);
+	reset_cache_server();
 
 	gh__request_params__release(&params);
 	strbuf_release(&component_url);

t/t5799-gvfs-helper.sh

@@ -1725,4 +1725,52 @@ test_expect_success 'verb-specific cache-server: get does NOT use gvfs.prefetch.
 	verify_server_was_not_contacted 1
 '
 
+test_expect_success 'verb-specific cache-server: get uses gvfs.get.cache-server' '
+	test_when_finished "per_test_cleanup" &&
+	test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.get.cache-server" &&
+	start_gvfs_protocol_server 0 &&
+	start_gvfs_protocol_server 1 &&
+
+	# Configure server 0 as default cache-server and server 1 for get.
+	git -C "$REPO_T1" config gvfs.cache-server "$(cache_server_url 0)" &&
+	git -C "$REPO_T1" config gvfs.get.cache-server "$(cache_server_url 1)" &&
+
+	# Run get - should go to server 1.
+	git -C "$REPO_T1" gvfs-helper \
+		--cache-server=trust \
+		--remote=origin \
+		get \
+		<"$OID_ONE_BLOB_FILE" >OUT.output 2>OUT.stderr &&
+
+	# Verify server 1 was contacted (get-specific).
+	verify_server_was_contacted 1 &&
+
+	# Verify server 0 was NOT contacted.
+	verify_server_was_not_contacted 0
+'
+
+test_expect_success 'verb-specific cache-server: prefetch does NOT use gvfs.get.cache-server' '
+	test_when_finished "per_test_cleanup" &&
+	test_when_finished "git -C \"$REPO_T1\" config --unset gvfs.get.cache-server" &&
+	start_gvfs_protocol_server 0 &&
+	start_gvfs_protocol_server 1 &&
+
+	# Configure server 0 as default cache-server and server 1 for get.
+	git -C "$REPO_T1" config gvfs.cache-server "$(cache_server_url 0)" &&
+	git -C "$REPO_T1" config gvfs.get.cache-server "$(cache_server_url 1)" &&
+
+	# Run prefetch - should go to server 0 (default), not server 1 (get).
+	git -C "$REPO_T1" gvfs-helper \
+		--cache-server=trust \
+		--remote=origin \
+		--no-progress \
+		prefetch >OUT.output 2>OUT.stderr &&
+
+	# Verify server 0 was contacted (default cache-server).
+	verify_server_was_contacted 0 &&
+
+	# Verify server 1 was NOT contacted (get-specific).
+	verify_server_was_not_contacted 1
+'
+
 test_done