maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libexpr): Replace logging.h with glog

Browse source
This commit is contained in:
Vincent Ambo 2020-05-19 01:24:50 +01:00
parent d0c44425e1
commit 939dd9f817
8 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
third_party/nix/src/libexpr/primops/fetchGit.cc vendored
View file

@ -7,6 +7,7 @@
#include "pathlocks.hh"
#include "primops.hh"
#include "store-api.hh"
#include <glog/logging.h>
using namespace std::string_literals;
@ -119,8 +120,7 @@ GitInfo exportGit(ref<Store> store, const std::string& uri,
(uint64_t)st.st_mtime + settings.tarballTtl <= (uint64_t)now;
}
if (doFetch) {
Activity act(*logger, lvlTalkative, actUnknown,
fmt("fetching Git repository '%s'", uri));
DLOG(INFO) << "fetching Git repository '" << uri << "'";
// FIXME: git stderr messes up our progress indicator, so
// we're using --quiet for now. Should process its stderr.
@ -142,7 +142,7 @@ GitInfo exportGit(ref<Store> store, const std::string& uri,
gitInfo.rev = rev != "" ? rev : chomp(readFile(localRefFile));
gitInfo.shortRev = std::string(gitInfo.rev, 0, 7);
printTalkative("using revision %s of repo '%s'", gitInfo.rev, uri);
DLOG(INFO) << "using revision " << gitInfo.rev << " of repo '" << uri << "'";
std::string storeLinkName =
hashString(htSHA512, name + std::string("\0"s) + gitInfo.rev)

9
third_party/nix/src/libexpr/primops/fetchMercurial.cc vendored
View file

@ -1,3 +1,4 @@
#include <glog/logging.h>
#include <sys/time.h>
#include <nlohmann/json.hpp>
#include <regex>
@ -36,7 +37,7 @@ HgInfo exportMercurial(ref<Store> store, const std::string& uri,
/* This is an unclean working tree. So copy all tracked
files. */
printTalkative("copying unclean Mercurial working tree '%s'", uri);
DLOG(INFO) << "copying unclean Mercurial working tree '" << uri << "'";
HgInfo hgInfo;
hgInfo.rev = "0000000000000000000000000000000000000000";
@ -91,8 +92,7 @@ HgInfo exportMercurial(ref<Store> store, const std::string& uri,
"--template", "1"})
.killStderr(true))
.second == "1")) {
Activity act(*logger, lvlTalkative, actUnknown,
fmt("fetching Mercurial repository '%s'", uri));
DLOG(INFO) << "fetching Mercurial repository '" << uri << "'";
if (pathExists(cacheDir)) {
try {
@ -141,8 +141,7 @@ HgInfo exportMercurial(ref<Store> store, const std::string& uri,
hgInfo.storePath = json["storePath"];
if (store->isValidPath(hgInfo.storePath)) {
printTalkative("using cached Mercurial store path '%s'",
hgInfo.storePath);
DLOG(INFO) << "using cached Mercurial store path '" << hgInfo.storePath << "'";
return hgInfo;
}