Merge first wave of gvfs-helper feature

Includes commits from these pull requests:

	#191
	#205
	#206
	#207
	#208
	#215
	#220
	#221

Signed-off-by: Derrick Stolee <[email protected]>

Author: jeffhostetler

.gitignore

@@ -74,6 +74,7 @@
 /git-gc
 /git-get-tar-commit-id
 /git-grep
+/git-gvfs-helper
 /git-hash-object
 /git-help
 /git-hook

Documentation/config.adoc

@@ -448,6 +448,8 @@ include::config/gui.adoc[]
 
 include::config/guitool.adoc[]
 
+include::config/gvfs.adoc[]
+
 include::config/help.adoc[]
 
 include::config/http.adoc[]

Documentation/config/core.adoc

@@ -793,6 +793,9 @@ core.gvfs::
 		flag just blocks them from occurring at all.
 --
 
+core.useGvfsHelper::
+	TODO
+
 core.sparseCheckout::
 	Enable "sparse checkout" feature. See linkgit:git-sparse-checkout[1]
 	for more information.

Documentation/config/gvfs.adoc

@@ -0,0 +1,5 @@
+gvfs.cache-server::
+	TODO
+
+gvfs.sharedcache::
+	TODO

Documentation/lint-manpages.sh

@@ -27,6 +27,7 @@ check_missing_docs () (
 		git-init-db) continue;;
 		git-remote-*) continue;;
 		git-stage) continue;;
+		git-gvfs-helper) continue;;
 		git-legacy-*) continue;;
 		git-?*--?* ) continue ;;
 		esac

Makefile

@@ -1047,6 +1047,7 @@ LIB_OBJS += gpg-interface.o
 LIB_OBJS += graph.o
 LIB_OBJS += grep.o
 LIB_OBJS += gvfs.o
+LIB_OBJS += gvfs-helper-client.o
 LIB_OBJS += hash-lookup.o
 LIB_OBJS += hashmap.o
 LIB_OBJS += help.o
@@ -1697,6 +1698,9 @@ endif
         endif
 	BASIC_CFLAGS += $(CURL_CFLAGS)
 
+	PROGRAM_OBJS += gvfs-helper.o
+	TEST_PROGRAMS_NEED_X += test-gvfs-protocol
+
 	REMOTE_CURL_PRIMARY = git-remote-http$X
 	REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X
 	REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
@@ -2970,6 +2974,10 @@ scalar$X: scalar.o GIT-LDFLAGS $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
 		$(filter %.o,$^) $(LIBS)
 
+git-gvfs-helper$X: gvfs-helper.o http.o GIT-LDFLAGS $(GITLIBS) $(LAZYLOAD_LIBCURL_OBJ)
+	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
+		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
+
 $(LIB_FILE): $(LIB_OBJS)
 	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
 

bin-wrappers/.gitignore

@@ -6,4 +6,5 @@
 /git-upload-pack
 /scalar
 /test-fake-ssh
+/test-gvfs-protocol
 /test-tool

builtin/index-pack.c

@@ -892,7 +892,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
 		read_lock();
 		collision_test_needed =
 			repo_has_object_file_with_flags(the_repository, oid,
-							OBJECT_INFO_QUICK);
+							OBJECT_INFO_FOR_PREFETCH);
 		read_unlock();
 	}
 

config.c

@@ -44,6 +44,7 @@
 #include "wildmatch.h"
 #include "ws.h"
 #include "write-or-die.h"
+#include "transport.h"
 
 struct config_source {
 	struct config_source *prev;
@@ -1628,6 +1629,11 @@ int git_default_core_config(const char *var, const char *value,
 		return 0;
 	}
 
+	if (!strcmp(var, "core.usegvfshelper")) {
+		core_use_gvfs_helper = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (!strcmp(var, "core.sparsecheckout")) {
 		/* virtual file system relies on the sparse checkout logic so force it on */
 		if (core_virtualfilesystem)
@@ -1779,6 +1785,37 @@ static int git_default_mailmap_config(const char *var, const char *value)
 	return 0;
 }
 
+static int git_default_gvfs_config(const char *var, const char *value)
+{
+	if (!strcmp(var, "gvfs.cache-server")) {
+		char *v2 = NULL;
+
+		if (!git_config_string(&v2, var, value) && v2 && *v2) {
+			free(gvfs_cache_server_url);
+			gvfs_cache_server_url = transport_anonymize_url(v2);
+		}
+		free(v2);
+		return 0;
+	}
+
+	if (!strcmp(var, "gvfs.sharedcache") && value && *value) {
+		strbuf_setlen(&gvfs_shared_cache_pathname, 0);
+		strbuf_addstr(&gvfs_shared_cache_pathname, value);
+		if (strbuf_normalize_path(&gvfs_shared_cache_pathname) < 0) {
+			/*
+			 * Pretend it wasn't set.  This will cause us to
+			 * fallback to ".git/objects" effectively.
+			 */
+			strbuf_release(&gvfs_shared_cache_pathname);
+			return 0;
+		}
+		strbuf_trim_trailing_dir_sep(&gvfs_shared_cache_pathname);
+		return 0;
+	}
+
+	return 0;
+}
+
 static int git_default_attr_config(const char *var, const char *value)
 {
 	if (!strcmp(var, "attr.tree")) {
@@ -1846,6 +1883,9 @@ int git_default_config(const char *var, const char *value,
 	if (starts_with(var, "sparse."))
 		return git_default_sparse_config(var, value);
 
+	if (starts_with(var, "gvfs."))
+		return git_default_gvfs_config(var, value);
+
 	/* Add other config variables here and to Documentation/config.txt. */
 	return 0;
 }

contrib/buildsystems/CMakeLists.txt

@@ -635,7 +635,7 @@ if(NOT CURL_FOUND)
 	add_compile_definitions(NO_CURL)
 	message(WARNING "git-http-push and git-http-fetch will not be built")
 else()
-	list(APPEND PROGRAMS_BUILT git-http-fetch git-http-push git-imap-send git-remote-http)
+	list(APPEND PROGRAMS_BUILT git-http-fetch git-http-push git-imap-send git-remote-http git-gvfs-helper)
 	if(CURL_VERSION_STRING VERSION_GREATER_EQUAL 7.34.0)
 		add_compile_definitions(USE_CURL_FOR_IMAP_SEND)
 	endif()
@@ -823,6 +823,9 @@ if(CURL_FOUND)
 		add_executable(git-http-push ${CMAKE_SOURCE_DIR}/http-push.c)
 		target_link_libraries(git-http-push http_obj common-main ${CURL_LIBRARIES} ${EXPAT_LIBRARIES})
 	endif()
+
+	add_executable(git-gvfs-helper ${CMAKE_SOURCE_DIR}/gvfs-helper.c)
+	target_link_libraries(git-gvfs-helper http_obj common-main ${CURL_LIBRARIES} )
 endif()
 
 parse_makefile_for_executables(git_builtin_extra "BUILT_INS")
@@ -1116,6 +1119,20 @@ set(wrapper_scripts
 set(wrapper_test_scripts
 	test-fake-ssh test-tool)
 
+if(CURL_FOUND)
+	list(APPEND wrapper_test_scripts test-gvfs-protocol)
+
+	add_executable(test-gvfs-protocol ${CMAKE_SOURCE_DIR}/t/helper/test-gvfs-protocol.c)
+	target_link_libraries(test-gvfs-protocol common-main)
+
+	if(MSVC)
+		set_target_properties(test-gvfs-protocol
+					PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/t/helper)
+		set_target_properties(test-gvfs-protocol
+					PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/t/helper)
+	endif()
+endif()
+
 
 foreach(script ${wrapper_scripts})
 	file(STRINGS ${CMAKE_SOURCE_DIR}/bin-wrappers/wrap-for-bin.sh content NEWLINE_CONSUME)