fetch

Author: schiele

git-incrypt

@@ -57,6 +57,7 @@ plugin.mktemplate.argtypes = [ctypes.c_char_p, ctypes.c_char_p,
                               ctypes.c_char_p, ctypes.c_char_p,
                               ctypes.c_char_p]
 plugin.mktemplate.restype = ctypes.c_char_p
+plugin.fetchpattern.argtypes = [ctypes.c_char]
 
 if not hasattr(pygit2.enums, 'FileMode'):
     class FileMode(enum.IntFlag):
@@ -182,7 +183,7 @@ class CryptRepo:
             self.trust(force=True, sign=True)
         else:
             self.repo = pygit2.Repository('.')
-            self._fetch('_')
+            plugin.fetchpattern('_'.encode('utf-8')[0])
             self.meta = MetaData(self.repo).read()
             if forcetrust:
                 self.trust(force=forcetrust)
@@ -230,16 +231,6 @@ class CryptRepo:
                 ([f'^{x}\n' for x in excl] if excl else [])))
         return text.strip().split('\n') if text else []
 
-    def _fetch(self, pattern):
-        subprocess.run(
-            ['git', 'fetch',
-             CryptRepo.verbosityflags[plugin.getverbosity()],
-             '--progress' if plugin.getprogress() else '--no-progress',
-             '--no-write-fetch-head', '-p', plugin.geturl().decode('utf-8'),
-             f'+refs/heads/{pattern}:{
-                 plugin.getprefix().decode("utf-8")}1/{pattern}'],
-            cwd=self.repo.path, check=True, stdout=sys.stderr)
-
     def trust(self, force=False, sign=False):
         'trust this repository'
         if force:
@@ -275,7 +266,7 @@ class CryptRepo:
             'decrypt an object'
             raw = decryptdata(self.repo.get(oid).read_raw(), self.meta.key)
             return self.repo.odb.write(raw[20], raw[21:])
-        self._fetch('*')
+        plugin.fetchpattern('*'.encode('utf-8')[0])
         self.meta.read()
         self.trust()
         # [ dec(crypt) , prefdec(crypt), crypt ]

incrypt-plugin.c

@@ -13,6 +13,7 @@
 #include "hex.h"
 #include "setup.h"
 #include "ident.h"
+#include "run-command.h"
 
 void globalinit(const char* dir, const char* url_arg);
 int set_option(const char *name, size_t namelen, const char *value);
@@ -34,6 +35,7 @@ char* hashdatahex(const unsigned char* input, size_t inputlen,
 		  char* output);
 void initbare(const char* dir);
 char* mktemplate(const char* name, const char* email, const char* date, const char* msg, char* output);
+void fetchpattern(const char pattern);
 
 /*static*/ const char* CRYPTREADME = "# 401 Unauthorized\n\n"
 "This is an encrypted git repository.  You can clone it, but you will not be\n"
@@ -347,6 +349,26 @@ char* mktemplate(const char* name, const char* email, const char* date, const ch
 	return output;
 }
 
+static const char* verbosityflags[5] = {"-q", "-q", "-v", "-vv", "-vvv"};
+static const char* progressflags[2] = {"--no-progress", "--progress"};
+
+void fetchpattern(const char pattern) {
+	struct child_process cmd = CHILD_PROCESS_INIT;
+
+	char refspec[14+GIT_SHA1_HEXSZ+14+4];
+	memcpy(refspec, "+refs/heads/.:refs/incrypt/......................................../1/.", 14+GIT_SHA1_HEXSZ+14+4);
+	refspec[12] = refspec[70] = pattern;
+	memcpy(refspec + 14, prefix, GIT_SHA1_HEXSZ + 14);
+
+	strvec_pushl(&cmd.args, "fetch", verbosityflags[options.verbosity],
+		     progressflags[options.progress], "--no-write-fetch-head",
+		     "-p", url, refspec, NULL);
+
+	cmd.git_cmd = 1;
+	//This causes a crash! : cmd.close_object_store = 1;
+	/*return*/ run_command(&cmd);
+}
+
 int cmd_main(int argc, const char** argv) {
 	(void)argv;
 	(void)argc;