nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 20:16:03 +01:00
Code Activity

Merge pull request #14204 from NixOS/kill-to-real-path-fetchers

Browse source 
libfetchers: Remove toRealPath in SourceHutInputScheme::getRevFromRef
This commit is contained in:
John Ericson 2025-10-09 22:01:03 +00:00 • committed by GitHub
commit 2fc88ec114
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libfetchers/github.cc
View file

@ -548,13 +548,10 @@ struct SourceHutInputScheme : GitArchiveInputScheme
std::string refUri; std::string refUri;
if (ref == "HEAD") { if (ref == "HEAD") {
auto file = store->toRealPath( auto downloadFileResult = downloadFile(store, *input.settings, fmt("%s/HEAD", base_url), "source", headers);
downloadFile(store, *input.settings, fmt("%s/HEAD", base_url), "source", headers).storePath); auto contents = nix::ref(store->getFSAccessor(downloadFileResult.storePath))->readFile(CanonPath::root);
std::ifstream is(file);
std::string line;
getline(is, line);
auto remoteLine = git::parseLsRemoteLine(line); auto remoteLine = git::parseLsRemoteLine(getLine(contents).first);
if (!remoteLine) { if (!remoteLine) {
throw BadURL("in '%d', couldn't resolve HEAD ref '%d'", input.to_string(), ref); throw BadURL("in '%d', couldn't resolve HEAD ref '%d'", input.to_string(), ref);
} }
@ -564,9 +561,10 @@ struct SourceHutInputScheme : GitArchiveInputScheme
} }
std::regex refRegex(refUri); std::regex refRegex(refUri);
auto file = store->toRealPath( auto downloadFileResult =
downloadFile(store, *input.settings, fmt("%s/info/refs", base_url), "source", headers).storePath); downloadFile(store, *input.settings, fmt("%s/info/refs", base_url), "source", headers);
std::ifstream is(file); auto contents = nix::ref(store->getFSAccessor(downloadFileResult.storePath))->readFile(CanonPath::root);
std::istringstream is(contents);
std::string line; std::string line;
std::optional<std::string> id; std::optional<std::string> id;