Skip to content

Commit daaf41f

Browse files
jeffhostetlermjcheetham
jeffhostetler
authored and
mjcheetham
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 04bfc3c + 0c52f94 commit daaf41f

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.adoc

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

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

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

453455
include::config/http.adoc[]

‎Documentation/config/core.adoc

+3
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,9 @@ core.gvfs::
787787
flag just blocks them from occurring at all.
788788
--
789789

790+
core.useGvfsHelper::
791+
TODO
792+
790793
core.sparseCheckout::
791794
Enable "sparse checkout" feature. See linkgit:git-sparse-checkout[1]
792795
for more information.

‎Documentation/config/gvfs.adoc

+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
@@ -1047,6 +1047,7 @@ LIB_OBJS += gpg-interface.o
10471047
LIB_OBJS += graph.o
10481048
LIB_OBJS += grep.o
10491049
LIB_OBJS += gvfs.o
1050+
LIB_OBJS += gvfs-helper-client.o
10501051
LIB_OBJS += hash-lookup.o
10511052
LIB_OBJS += hashmap.o
10521053
LIB_OBJS += help.o
@@ -1697,6 +1698,9 @@ endif
16971698
endif
16981699
BASIC_CFLAGS += $(CURL_CFLAGS)
16991700

1701+
PROGRAM_OBJS += gvfs-helper.o
1702+
TEST_PROGRAMS_NEED_X += test-gvfs-protocol
1703+
17001704
REMOTE_CURL_PRIMARY = git-remote-http$X
17011705
REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X
17021706
REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
@@ -2970,6 +2974,10 @@ scalar$X: scalar.o GIT-LDFLAGS $(GITLIBS)
29702974
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
29712975
$(filter %.o,$^) $(LIBS)
29722976

2977+
git-gvfs-helper$X: gvfs-helper.o http.o GIT-LDFLAGS $(GITLIBS) $(LAZYLOAD_LIBCURL_OBJ)
2978+
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
2979+
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
2980+
29732981
$(LIB_FILE): $(LIB_OBJS)
29742982
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
29752983

‎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
@@ -892,7 +892,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
892892
read_lock();
893893
collision_test_needed =
894894
repo_has_object_file_with_flags(the_repository, oid,
895-
OBJECT_INFO_QUICK);
895+
OBJECT_INFO_FOR_PREFETCH);
896896
read_unlock();
897897
}
898898

‎config.c

+40
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "wildmatch.h"
4545
#include "ws.h"
4646
#include "write-or-die.h"
47+
#include "transport.h"
4748

4849
struct config_source {
4950
struct config_source *prev;
@@ -1623,6 +1624,11 @@ int git_default_core_config(const char *var, const char *value,
16231624
return 0;
16241625
}
16251626

1627+
if (!strcmp(var, "core.usegvfshelper")) {
1628+
core_use_gvfs_helper = git_config_bool(var, value);
1629+
return 0;
1630+
}
1631+
16261632
if (!strcmp(var, "core.sparsecheckout")) {
16271633
/* virtual file system relies on the sparse checkout logic so force it on */
16281634
if (core_virtualfilesystem)
@@ -1774,6 +1780,37 @@ static int git_default_mailmap_config(const char *var, const char *value)
17741780
return 0;
17751781
}
17761782

1783+
static int git_default_gvfs_config(const char *var, const char *value)
1784+
{
1785+
if (!strcmp(var, "gvfs.cache-server")) {
1786+
char *v2 = NULL;
1787+
1788+
if (!git_config_string(&v2, var, value) && v2 && *v2) {
1789+
free(gvfs_cache_server_url);
1790+
gvfs_cache_server_url = transport_anonymize_url(v2);
1791+
}
1792+
free(v2);
1793+
return 0;
1794+
}
1795+
1796+
if (!strcmp(var, "gvfs.sharedcache") && value && *value) {
1797+
strbuf_setlen(&gvfs_shared_cache_pathname, 0);
1798+
strbuf_addstr(&gvfs_shared_cache_pathname, value);
1799+
if (strbuf_normalize_path(&gvfs_shared_cache_pathname) < 0) {
1800+
/*
1801+
* Pretend it wasn't set. This will cause us to
1802+
* fallback to ".git/objects" effectively.
1803+
*/
1804+
strbuf_release(&gvfs_shared_cache_pathname);
1805+
return 0;
1806+
}
1807+
strbuf_trim_trailing_dir_sep(&gvfs_shared_cache_pathname);
1808+
return 0;
1809+
}
1810+
1811+
return 0;
1812+
}
1813+
17771814
static int git_default_attr_config(const char *var, const char *value)
17781815
{
17791816
if (!strcmp(var, "attr.tree")) {
@@ -1841,6 +1878,9 @@ int git_default_config(const char *var, const char *value,
18411878
if (starts_with(var, "sparse."))
18421879
return git_default_sparse_config(var, value);
18431880

1881+
if (starts_with(var, "gvfs."))
1882+
return git_default_gvfs_config(var, value);
1883+
18441884
/* Add other config variables here and to Documentation/config.adoc. */
18451885
return 0;
18461886
}

‎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")
@@ -1120,6 +1123,20 @@ set(wrapper_scripts
11201123
set(wrapper_test_scripts
11211124
test-fake-ssh test-tool)
11221125

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

11241141
foreach(script ${wrapper_scripts})
11251142
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
@@ -456,6 +456,8 @@ static int run_credential_helper(struct credential *c,
456456
else
457457
helper.no_stdout = 1;
458458

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

‎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
@@ -164,6 +164,9 @@ extern int core_gvfs;
164164
extern int precomposed_unicode;
165165
extern int protect_hfs;
166166
extern int protect_ntfs;
167+
extern int core_use_gvfs_helper;
168+
extern char *gvfs_cache_server_url;
169+
extern struct strbuf gvfs_shared_cache_pathname;
167170

168171
extern int core_apply_sparse_checkout;
169172
extern int core_sparse_checkout_cone;

0 commit comments

Comments
 (0)