Add git file ingestion method

src/libstore/binary-cache-store.cc

@@ -341,15 +341,14 @@ StorePath BinaryCacheStore::addToStore(const string & name, const Path & srcPath
         dumpPath(srcPath, sink, filter);
         h = hashString(hashAlgo, *sink.s);
         break;
-    }
-    case FileIngestionMethod::Flat:
+    case FileIngestionMethod::Flat: {
         auto s = readFile(srcPath);
         dumpString(s, sink);
         h = hashString(hashAlgo, s);
         break;
+    }
     case FileIngestionMethod::Git:
         throw Error("cannot add to binary cache store using the git file ingestion method");
-    default: throw;
     }
 
     ValidPathInfo info(makeFixedOutputPath(method, h, name));

src/libstore/local-store.cc

@@ -1,5 +1,6 @@
 #include "local-store.hh"
 #include "globals.hh"
+#include "git.hh"
 #include "archive.hh"
 #include "pathlocks.hh"
 #include "worker-protocol.hh"
@@ -1067,19 +1068,21 @@ StorePath LocalStore::addToStoreFromDump(const string & dump, const string & nam
 
             autoGC();
 
-            switch method{
+            switch (method) {
             case FileIngestionMethod::Flat:
                 writeFile(realPath, dump);
                 break;
-            case FileIngestionMethod::Recursive:
+            case FileIngestionMethod::Recursive: {
                 StringSource source(dump);
                 restorePath(realPath, source);
                 break;
-            case FileIngestionMethod::Git:
+            }
+            case FileIngestionMethod::Git: {
                 StringSource source(dump);
                 restoreGit(realPath, source);
                 break;
             }
+            }
 
             canonicalisePathMetaData(realPath, -1);
 

src/libutil/archive.cc

@@ -12,7 +12,6 @@
 #include <fcntl.h>
 
 #include "archive.hh"
-#include "restore-sink.hh"
 #include "util.hh"
 #include "config.hh"
 

src/libutil/archive.hh

@@ -2,7 +2,7 @@
 
 #include "types.hh"
 #include "serialise.hh"
-
+#include "fs-sink.hh"
 
 namespace nix {
 
@@ -50,19 +50,6 @@ void dumpPath(const Path & path, Sink & sink,
 
 void dumpString(const std::string & s, Sink & sink);
 
-/* FIXME: fix this API, it sucks. */
-struct ParseSink
-{
-    virtual void createDirectory(const Path & path) { };
-
-    virtual void createRegularFile(const Path & path) { };
-    virtual void isExecutable() { };
-    virtual void preallocateContents(unsigned long long size) { };
-    virtual void receiveContents(unsigned char * data, unsigned int len) { };
-
-    virtual void createSymlink(const Path & path, const string & target) { };
-};
-
 struct TeeSink : ParseSink
 {
     TeeSource source;

src/libutil/restore-sink.hh → src/libutil/fs-sink.hh

@@ -2,10 +2,22 @@
 
 #include "types.hh"
 #include "serialise.hh"
-#include "archive.hh"
 
 namespace nix {
 
+/* FIXME: fix this API, it sucks. */
+struct ParseSink
+{
+    virtual void createDirectory(const Path & path) { };
+
+    virtual void createRegularFile(const Path & path) { };
+    virtual void isExecutable() { };
+    virtual void preallocateContents(unsigned long long size) { };
+    virtual void receiveContents(unsigned char * data, unsigned int len) { };
+
+    virtual void createSymlink(const Path & path, const string & target) { };
+};
+
 struct RestoreSink : ParseSink
 {
     Path dstPath;

src/libutil/git.cc

@@ -13,19 +13,22 @@
 
 #include "util.hh"
 #include "config.hh"
-#include "restore-sink.hh"
+#include "hash.hh"
 
 #include "git.hh"
 
+using namespace std::string_literals;
+
 namespace nix {
 
+static void parse(ParseSink & sink, Source & source, const Path & path);
 
 // Converts a Path to a ParseSink
 void restoreGit(const Path & path, Source & source) {
 
     RestoreSink sink;
     sink.dstPath = path;
-    parseDump(sink, source);
+    parseGit(sink, source);
 
 }
 
@@ -49,4 +52,53 @@ static void parse(ParseSink & sink, Source & source, const Path & path) {
     }
 }
 
+// Internal version, returns the perm.
+unsigned int dumpGitInternal(const Path & path, Sink & sink, PathFilter & filter)
+{
+    struct stat st;
+    if (lstat(path.c_str(), &st))
+        throw SysError(format("getting attributes of path '%1%'") % path);
+
+    if (S_ISREG(st.st_mode)) {
+        auto s = (format("blob %d\0%s"s) % std::to_string(st.st_size) % readFile(path)).str();
+
+        vector<unsigned char> v;
+        std::copy(s.begin(), s.end(), std::back_inserter(v));
+        sink(v.data(), v.size());
+        return st.st_mode & S_IXUSR
+            ? 100755
+            : 100644;
+    }
+
+    else if (S_ISDIR(st.st_mode)) {
+        std::string s1 = "";
+
+        std::map<string, string> entries;
+        for (auto & i : readDirectory(path))
+            entries[i.name] = i.name;
+
+        for (auto & i : entries)
+            if (filter(path + "/" + i.first)) {
+                HashSink hashSink(htSHA1);
+                unsigned int perm = dumpGitInternal(path + "/" + i.first, hashSink, filter);
+                auto hash = hashSink.finish().first;
+                s1 += (format("%6d %s\0%s"s) % perm % i.first % hash.hash).str();
+            }
+
+        std::string s2 = (format("tree %d\0%s"s) % s1.size() % s1).str();
+
+        vector<unsigned char> v;
+        std::copy(s2.begin(), s2.end(), std::back_inserter(v));
+        sink(v.data(), v.size());
+        return 40000;
+    }
+
+    else throw Error(format("file '%1%' has an unsupported type") % path);
+}
+
+void dumpGit(const Path & path, Sink & sink, PathFilter & filter)
+{
+    dumpGitInternal(path, sink, filter);
+}
+
 }

src/libutil/git.hh

@@ -2,14 +2,14 @@
 
 #include "types.hh"
 #include "serialise.hh"
-#include "archive.hh"
+#include "fs-sink.hh"
 
 namespace nix {
 
 void restoreGit(const Path & path, Source & source);
 
 void parseGit(ParseSink & sink, Source & source);
 
-static void parse(ParseSink & sink, Source & source, const Path & path);
+void dumpGit(const Path & path, Sink & sink, PathFilter & filter = defaultPathFilter);
 
 }