aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Pauls <daniel1708.de+git@gmail.com>2022-04-09 19:10:23 +0200
committerDaniel Pauls <daniel1708.de+git@gmail.com>2022-04-09 19:10:23 +0200
commitd6b75295797af332f2cba635531b2019571319e2 (patch)
tree458b787854e029da8c7609848c03aad388605541 /src
parent646af7325d93f98802b989f8a8e008a25f7a4788 (diff)
libfetchers: Fix assertion (Mercurial)
See commit 1e1cd6e7a for more information.
Diffstat (limited to 'src')
-rw-r--r--src/libfetchers/mercurial.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc
index 8b82e9daa..51cf35bf4 100644
--- a/src/libfetchers/mercurial.cc
+++ b/src/libfetchers/mercurial.cc
@@ -178,9 +178,11 @@ struct MercurialInputScheme : InputScheme
auto files = tokenizeString<std::set<std::string>>(
runHg({ "status", "-R", actualUrl, "--clean", "--modified", "--added", "--no-status", "--print0" }), "\0"s);
+ Path actualPath(absPath(actualUrl));
+
PathFilter filter = [&](const Path & p) -> bool {
- assert(hasPrefix(p, actualUrl));
- std::string file(p, actualUrl.size() + 1);
+ assert(hasPrefix(p, actualPath));
+ std::string file(p, actualPath.size() + 1);
auto st = lstat(p);
@@ -193,7 +195,7 @@ struct MercurialInputScheme : InputScheme
return files.count(file);
};
- auto storePath = store->addToStore(input.getName(), actualUrl, FileIngestionMethod::Recursive, htSHA256, filter);
+ auto storePath = store->addToStore(input.getName(), actualPath, FileIngestionMethod::Recursive, htSHA256, filter);
return {std::move(storePath), input};
}