Skip to content

Commit bcaafd5

Browse files
jeffhostetlerdscho
jeffhostetler
authored and
dscho
committed
Merge first wave of gvfs-helper feature
Includes commits from these pull requests: git-for-windows#191 git-for-windows#205 git-for-windows#206 git-for-windows#207 git-for-windows#208 git-for-windows#215 git-for-windows#220 git-for-windows#221 Signed-off-by: Derrick Stolee <[email protected]>
2 parents a25cba0 + 24a1c1d commit bcaafd5

29 files changed

+7215
-5
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
/git-gc
7575
/git-get-tar-commit-id
7676
/git-grep
77+
/git-gvfs-helper
7778
/git-hash-object
7879
/git-help
7980
/git-hook

‎Documentation/config.txt

+2
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,8 @@ include::config/gui.txt[]
448448

449449
include::config/guitool.txt[]
450450

451+
include::config/gvfs.txt[]
452+
451453
include::config/help.txt[]
452454

453455
include::config/http.txt[]

‎Documentation/config/core.txt

+3
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,9 @@ core.gvfs::
793793
flag just blocks them from occurring at all.
794794
--
795795

796+
core.useGvfsHelper::
797+
TODO
798+
796799
core.sparseCheckout::
797800
Enable "sparse checkout" feature. See linkgit:git-sparse-checkout[1]
798801
for more information.

‎Documentation/config/gvfs.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
gvfs.cache-server::
2+
TODO
3+
4+
gvfs.sharedcache::
5+
TODO

‎Documentation/lint-manpages.sh

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ check_missing_docs () (
2727
git-init-db) continue;;
2828
git-remote-*) continue;;
2929
git-stage) continue;;
30+
git-gvfs-helper) continue;;
3031
git-legacy-*) continue;;
3132
git-?*--?* ) continue ;;
3233
esac

‎Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -1039,6 +1039,7 @@ LIB_OBJS += gpg-interface.o
10391039
LIB_OBJS += graph.o
10401040
LIB_OBJS += grep.o
10411041
LIB_OBJS += gvfs.o
1042+
LIB_OBJS += gvfs-helper-client.o
10421043
LIB_OBJS += hash-lookup.o
10431044
LIB_OBJS += hashmap.o
10441045
LIB_OBJS += help.o
@@ -1687,6 +1688,9 @@ endif
16871688
endif
16881689
BASIC_CFLAGS += $(CURL_CFLAGS)
16891690

1691+
PROGRAM_OBJS += gvfs-helper.o
1692+
TEST_PROGRAMS_NEED_X += test-gvfs-protocol
1693+
16901694
REMOTE_CURL_PRIMARY = git-remote-http$X
16911695
REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X
16921696
REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
@@ -2937,6 +2941,10 @@ scalar$X: scalar.o GIT-LDFLAGS $(GITLIBS)
29372941
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
29382942
$(filter %.o,$^) $(LIBS)
29392943

2944+
git-gvfs-helper$X: gvfs-helper.o http.o GIT-LDFLAGS $(GITLIBS) $(LAZYLOAD_LIBCURL_OBJ)
2945+
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
2946+
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
2947+
29402948
$(LIB_FILE): $(LIB_OBJS)
29412949
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
29422950

‎bin-wrappers/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
/git-upload-pack
77
/scalar
88
/test-fake-ssh
9+
/test-gvfs-protocol
910
/test-tool

‎builtin/index-pack.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
891891
read_lock();
892892
collision_test_needed =
893893
repo_has_object_file_with_flags(the_repository, oid,
894-
OBJECT_INFO_QUICK);
894+
OBJECT_INFO_FOR_PREFETCH);
895895
read_unlock();
896896
}
897897

‎config.c

+40
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include "wildmatch.h"
4444
#include "ws.h"
4545
#include "write-or-die.h"
46+
#include "transport.h"
4647

4748
struct config_source {
4849
struct config_source *prev;
@@ -1627,6 +1628,11 @@ int git_default_core_config(const char *var, const char *value,
16271628
return 0;
16281629
}
16291630

1631+
if (!strcmp(var, "core.usegvfshelper")) {
1632+
core_use_gvfs_helper = git_config_bool(var, value);
1633+
return 0;
1634+
}
1635+
16301636
if (!strcmp(var, "core.sparsecheckout")) {
16311637
/* virtual file system relies on the sparse checkout logic so force it on */
16321638
if (core_virtualfilesystem)
@@ -1778,6 +1784,37 @@ static int git_default_mailmap_config(const char *var, const char *value)
17781784
return 0;
17791785
}
17801786

1787+
static int git_default_gvfs_config(const char *var, const char *value)
1788+
{
1789+
if (!strcmp(var, "gvfs.cache-server")) {
1790+
char *v2 = NULL;
1791+
1792+
if (!git_config_string(&v2, var, value) && v2 && *v2) {
1793+
free(gvfs_cache_server_url);
1794+
gvfs_cache_server_url = transport_anonymize_url(v2);
1795+
}
1796+
free(v2);
1797+
return 0;
1798+
}
1799+
1800+
if (!strcmp(var, "gvfs.sharedcache") && value && *value) {
1801+
strbuf_setlen(&gvfs_shared_cache_pathname, 0);
1802+
strbuf_addstr(&gvfs_shared_cache_pathname, value);
1803+
if (strbuf_normalize_path(&gvfs_shared_cache_pathname) < 0) {
1804+
/*
1805+
* Pretend it wasn't set. This will cause us to
1806+
* fallback to ".git/objects" effectively.
1807+
*/
1808+
strbuf_release(&gvfs_shared_cache_pathname);
1809+
return 0;
1810+
}
1811+
strbuf_trim_trailing_dir_sep(&gvfs_shared_cache_pathname);
1812+
return 0;
1813+
}
1814+
1815+
return 0;
1816+
}
1817+
17811818
static int git_default_attr_config(const char *var, const char *value)
17821819
{
17831820
if (!strcmp(var, "attr.tree")) {
@@ -1845,6 +1882,9 @@ int git_default_config(const char *var, const char *value,
18451882
if (starts_with(var, "sparse."))
18461883
return git_default_sparse_config(var, value);
18471884

1885+
if (starts_with(var, "gvfs."))
1886+
return git_default_gvfs_config(var, value);
1887+
18481888
/* Add other config variables here and to Documentation/config.txt. */
18491889
return 0;
18501890
}

‎contrib/buildsystems/CMakeLists.txt

+18-1
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ if(NOT CURL_FOUND)
635635
add_compile_definitions(NO_CURL)
636636
message(WARNING "git-http-push and git-http-fetch will not be built")
637637
else()
638-
list(APPEND PROGRAMS_BUILT git-http-fetch git-http-push git-imap-send git-remote-http)
638+
list(APPEND PROGRAMS_BUILT git-http-fetch git-http-push git-imap-send git-remote-http git-gvfs-helper)
639639
if(CURL_VERSION_STRING VERSION_GREATER_EQUAL 7.34.0)
640640
add_compile_definitions(USE_CURL_FOR_IMAP_SEND)
641641
endif()
@@ -823,6 +823,9 @@ if(CURL_FOUND)
823823
add_executable(git-http-push ${CMAKE_SOURCE_DIR}/http-push.c)
824824
target_link_libraries(git-http-push http_obj common-main ${CURL_LIBRARIES} ${EXPAT_LIBRARIES})
825825
endif()
826+
827+
add_executable(git-gvfs-helper ${CMAKE_SOURCE_DIR}/gvfs-helper.c)
828+
target_link_libraries(git-gvfs-helper http_obj common-main ${CURL_LIBRARIES} )
826829
endif()
827830

828831
parse_makefile_for_executables(git_builtin_extra "BUILT_INS")
@@ -1116,6 +1119,20 @@ set(wrapper_scripts
11161119
set(wrapper_test_scripts
11171120
test-fake-ssh test-tool)
11181121

1122+
if(CURL_FOUND)
1123+
list(APPEND wrapper_test_scripts test-gvfs-protocol)
1124+
1125+
add_executable(test-gvfs-protocol ${CMAKE_SOURCE_DIR}/t/helper/test-gvfs-protocol.c)
1126+
target_link_libraries(test-gvfs-protocol common-main)
1127+
1128+
if(MSVC)
1129+
set_target_properties(test-gvfs-protocol
1130+
PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/t/helper)
1131+
set_target_properties(test-gvfs-protocol
1132+
PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/t/helper)
1133+
endif()
1134+
endif()
1135+
11191136

11201137
foreach(script ${wrapper_scripts})
11211138
file(STRINGS ${CMAKE_SOURCE_DIR}/bin-wrappers/wrap-for-bin.sh content NEWLINE_CONSUME)

‎credential.c

+2
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,8 @@ static int run_credential_helper(struct credential *c,
457457
else
458458
helper.no_stdout = 1;
459459

460+
helper.trace2_child_class = "cred";
461+
460462
if (start_command(&helper) < 0)
461463
return -1;
462464

‎environment.c

+3
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ int protect_hfs = PROTECT_HFS_DEFAULT;
9898
#define PROTECT_NTFS_DEFAULT 1
9999
#endif
100100
int protect_ntfs = PROTECT_NTFS_DEFAULT;
101+
int core_use_gvfs_helper;
102+
char *gvfs_cache_server_url;
103+
struct strbuf gvfs_shared_cache_pathname = STRBUF_INIT;
101104

102105
/*
103106
* The character that begins a commented line in user-editable file

‎environment.h

+3
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@ extern int core_gvfs;
175175
extern int precomposed_unicode;
176176
extern int protect_hfs;
177177
extern int protect_ntfs;
178+
extern int core_use_gvfs_helper;
179+
extern char *gvfs_cache_server_url;
180+
extern struct strbuf gvfs_shared_cache_pathname;
178181

179182
extern int core_apply_sparse_checkout;
180183
extern int core_sparse_checkout_cone;

0 commit comments

Comments
 (0)