fetchGit/fetchMercurial: Filter out directories with untracked files

2 files changed, 16 insertions, 8 deletions

diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc
index 2a423f61bb89..7def7103bf3d 100644
--- a/src/libexpr/primops/fetchMercurial.cc
+++ b/src/libexpr/primops/fetchMercurial.cc
@@ -47,11 +47,15 @@ HgInfo exportMercurial(ref<Store> store, const std::string & uri,
 
             PathFilter filter = [&](const Path & p) -> bool {
                 assert(hasPrefix(p, uri));
-                auto st = lstat(p);
                 std::string file(p, uri.size() + 1);
-                if (file == ".hg") return false;
-                // FIXME: filter out directories with no tracked files.
-                if (S_ISDIR(st.st_mode)) return true;
+
+                auto st = lstat(p);
+
+                if (S_ISDIR(st.st_mode)) {
+                    auto i = files.lower_bound(file);
+                    return i != files.end() && hasPrefix(*i, file);
+                }
+
                 return files.count(file);
             };
 
diff --git a/src/libexpr/primops/fetchgit.cc b/src/libexpr/primops/fetchgit.cc
index 1d8f55bcd518..baa48f6422b7 100644
--- a/src/libexpr/primops/fetchgit.cc
+++ b/src/libexpr/primops/fetchgit.cc
@@ -44,11 +44,15 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
 
             PathFilter filter = [&](const Path & p) -> bool {
                 assert(hasPrefix(p, uri));
-                auto st = lstat(p);
                 std::string file(p, uri.size() + 1);
-                if (file == ".git") return false;
-                // FIXME: filter out directories with no tracked files.
-                if (S_ISDIR(st.st_mode)) return true;
+
+                auto st = lstat(p);
+
+                if (S_ISDIR(st.st_mode)) {
+                    auto i = files.lower_bound(file);
+                    return i != files.end() && hasPrefix(*i, file);
+                }
+
                 return files.count(file);
             };