{"header":{"message":"Move repo interaction into separate source file","description":null,"timestamp":"2024-03-24T19:52:38.16129299Z","authors":[{}]},"hash":"XGCRPWKLJYWGVCMHDIR2K3PVT2R22JALVV5K2IXTHU3JBAEYANGAC","authors":[{"login":"dblsaiko","key":"FeMhzz74btJURqQy9nfU1xL9Jvbzr7GuZXu3HGNFY331"}],"deps":{"hashes":[["XGCRPWKLJYWGVCMHDIR2K3PVT2R22JALVV5K2IXTHU3JBAEYANGAC","Move repo interaction into separate source file"],["AA",null],["7YS2X7JJVAFT7QFDASQR4ZVUAAFYF4OLK5XLY3JJ2URSXI34ZOTAC","Fix compilation against older Nix versions (tested with 2.13.6)"],["SVCRRNQ6OPGD3HJW5JFCLRYHFBABDER3YDN64VA4ZEXS7SU4QI5QC","Remove unnecessary version checks"],["3KEFKH5FYGFUIWMIW6NY3K4FYSLE7LEXR4ZSF6WN52PCC3TVDZBAC","Import existing code"],["U5AKEHEQWHBOVXMTTQFBJA4M4VJ7OWSJJVYYB6FLTJB7NCFPYVRQC","Fix build for Nix 2.19 to 2.21"]],"deps":["7YS2X7JJVAFT7QFDASQR4ZVUAAFYF4OLK5XLY3JJ2URSXI34ZOTAC"],"known":["3KEFKH5FYGFUIWMIW6NY3K4FYSLE7LEXR4ZSF6WN52PCC3TVDZBAC","U5AKEHEQWHBOVXMTTQFBJA4M4VJ7OWSJJVYYB6FLTJB7NCFPYVRQC","SVCRRNQ6OPGD3HJW5JFCLRYHFBABDER3YDN64VA4ZEXS7SU4QI5QC"]},"hunks":[{"FileAdd":{"meta":{"basename":"repo.h","metadata":0},"context":[{"change":3,"pos":15}],"contents":[{"Add":"#ifndef NIX_PLUGIN_PIJUL_REPO_H"},{"Add":"#define NIX_PLUGIN_PIJUL_REPO_H"},{"Add":""},{"Add":"#include "},{"Add":""},{"Add":"#include "},{"Add":"#include "},{"Add":""},{"Add":"namespace nixpluginpijul"},{"Add":"{"},{"Add":""},{"Add":"struct RepoStatus {"},{"Add":" std::string channel;"},{"Add":" std::string state;"},{"Add":" uint64_t lastModified;"},{"Add":"};"},{"Add":""},{"Add":"std::string runPijul(nix::Strings args, std::optional chdir = {}, std::optional input = {}, bool isInteractive = false);"},{"Add":""},{"Add":"RepoStatus getRepoStatus(const nix::PathView &repoPath);"},{"Add":""},{"Add":"std::pair getState(const nix::PathView &repoPath);"},{"Add":""},{"Add":"std::string getRepoChannel(const nix::PathView &repoPath);"},{"Add":""},{"Add":"date::sys_time parseRFC3339(const std::string &spec);"},{"Add":""},{"Add":"}"},{"Add":""},{"Add":"#endif // NIX_PLUGIN_PIJUL_REPO_H"}]}},{"FileAdd":{"meta":{"basename":"repo.cpp","metadata":0},"context":[{"change":3,"pos":15}],"contents":[{"Add":"#include \"repo.h\""},{"Add":""},{"Add":"#include "},{"Add":"#include "},{"Add":""},{"Add":"#if NIX_VERSION >= 0x021900"},{"Add":"#include "},{"Add":"#endif"},{"Add":""},{"Add":"#include "},{"Add":""},{"Add":"using nlohmann::json;"},{"Add":""},{"Add":"using namespace nix;"},{"Add":""},{"Add":"using namespace std::string_literals;"},{"Add":"using namespace std::string_view_literals;"},{"Add":""},{"Add":"namespace nixpluginpijul"},{"Add":"{"},{"Add":""},{"Add":"std::string runPijul(Strings args, std::optional chdir, std::optional input, bool isInteractive)"},{"Add":"{"},{"Add":" auto program = \"pijul\"sv;"},{"Add":""},{"Add":" auto res = runProgram(RunOptions{"},{"Add":" .program = std::string(program),"},{"Add":" .searchPath = true,"},{"Add":" .args = std::move(args),"},{"Add":" .chdir = std::move(chdir),"},{"Add":" .input = std::move(input),"},{"Add":" .isInteractive = isInteractive,"},{"Add":" });"},{"Add":""},{"Add":" if (!statusOk(res.first)) {"},{"Add":" throw ExecError(res.first, \"program '%1%' %2%\", program, statusToString(res.first));"},{"Add":" }"},{"Add":""},{"Add":" return res.second;"},{"Add":"}"},{"Add":""},{"Add":"RepoStatus getRepoStatus(const PathView &repoPath)"},{"Add":"{"},{"Add":" auto [state, lastModified] = getState(repoPath);"},{"Add":" auto channel = getRepoChannel(repoPath);"},{"Add":""},{"Add":" return RepoStatus{"},{"Add":" .channel = std::move(channel),"},{"Add":" .state = std::move(state),"},{"Add":" .lastModified = lastModified,"},{"Add":" };"},{"Add":"}"},{"Add":""},{"Add":"std::pair getState(const PathView &repoPath)"},{"Add":"{"},{"Add":" const auto &output = runPijul({\"log\", \"--output-format\", \"json\", \"--state\", \"--limit\", \"1\"}, Path(repoPath));"},{"Add":""},{"Add":" const auto &json = json::parse(output);"},{"Add":" const auto &commitInfo = json.at(0);"},{"Add":""},{"Add":" const auto ×tampSpec = commitInfo.at(\"timestamp\").get();"},{"Add":" const uint64_t timestamp = std::chrono::duration_cast(parseRFC3339(timestampSpec).time_since_epoch()).count();"},{"Add":""},{"Add":" const std::string &state = commitInfo.at(\"state\");"},{"Add":""},{"Add":" return {state, timestamp};"},{"Add":"}"},{"Add":""},{"Add":"std::string getRepoChannel(const PathView &repoPath)"},{"Add":"{"},{"Add":" const auto &output = runPijul({\"channel\"}, Path(repoPath));"},{"Add":""},{"Add":" std::string::size_type pos = 0;"},{"Add":""},{"Add":" do {"},{"Add":" const auto nl = output.find('\\n', pos);"},{"Add":" const auto line = std::string_view(output).substr(pos, nl - pos);"},{"Add":""},{"Add":" if (line.empty()) {"},{"Add":" continue;"},{"Add":" }"},{"Add":""},{"Add":" if (line.at(0) == '*') {"},{"Add":" return std::string(line.substr(2));"},{"Add":" }"},{"Add":""},{"Add":" pos = nl;"},{"Add":" } while (pos != std::string::npos);"},{"Add":""},{"Add":" throw Error(\"could not parse current channel\"s);"},{"Add":"}"},{"Add":""},{"Add":"date::sys_time parseRFC3339(const std::string &spec)"},{"Add":"{"},{"Add":" std::istringstream in{spec};"},{"Add":" date::sys_time pt;"},{"Add":""},{"Add":" in >> date::parse(\"%FT%TZ\", pt);"},{"Add":""},{"Add":" if (in.fail()) {"},{"Add":" in.clear();"},{"Add":" in.exceptions(std::ios::failbit);"},{"Add":" in.str(spec);"},{"Add":" in >> date::parse(\"%FT%T%Ez\", pt);"},{"Add":" }"},{"Add":""},{"Add":" return pt;"},{"Add":"}"},{"Add":""},{"Add":"}"}]}},{"Edit":{"inode":{"change":3,"pos":53},"path":"src/fetcher.cpp","line":1,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":53}],"down_context":[{"change":3,"pos":54}],"flag":"BLOCK","start":3464,"end":3483,"inode":{"change":3,"pos":53}}},"contents":[{"Add":"#include \"repo.h\""},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":53},"path":"src/fetcher.cpp","line":25,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":223}],"down_context":[{"change":3,"pos":223}],"flag":"BLOCK","start":3484,"end":3588,"inode":{"change":3,"pos":53}}},"contents":[{"Add":"using nixpluginpijul::getRepoStatus;"},{"Add":"using nixpluginpijul::getState;"},{"Add":"using nixpluginpijul::RepoStatus;"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":53},"path":"src/fetcher.cpp","line":34,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":331},"to":{"change":3,"start":331,"end":332},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":332},"to":{"change":3,"start":332,"end":709},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":28},"to":{"change":3,"start":709,"end":749},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":709},"to":{"change":3,"start":709,"end":749},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":36},"to":{"change":3,"start":749,"end":915},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":749},"to":{"change":3,"start":749,"end":915},"introduced_by":3}],"inode":{"change":3,"pos":53}}},"contents":[{"Del":"\n"},{"Del":"std::string runPijul(Strings args, std::optional chdir = {}, std::optional input = {}, bool isInteractive = false)\n{\n auto program = \"pijul\"sv;\n\n auto res = runProgram(RunOptions{\n .program = std::string(program),\n .searchPath = true,\n .args = std::move(args),\n .chdir = std::move(chdir),\n .input = std::move(input),\n"},{"Del":" .isInteractive = isInteractive,\n"},{"Del":" });\n\n if (!statusOk(res.first)) {\n throw ExecError(res.first, \"program '%1%' %2%\", program, statusToString(res.first));\n }\n\n return res.second;\n}\n"}]}},{"Edit":{"inode":{"change":3,"pos":53},"path":"src/fetcher.cpp","line":211,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4332},"to":{"change":3,"start":4332,"end":4451},"introduced_by":3}],"inode":{"change":3,"pos":53}}},"contents":[{"Del":" struct RepoStatus {\n std::string channel;\n std::string state;\n uint64_t lastModified;\n };\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":53},"path":"src/fetcher.cpp","line":436,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10847},"to":{"change":3,"start":10847,"end":11185},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11185},"to":{"change":3,"start":11185,"end":11191},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11191},"to":{"change":3,"start":11191,"end":11827},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11827},"to":{"change":3,"start":11827,"end":11894},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11894},"to":{"change":3,"start":11894,"end":11900},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11900},"to":{"change":3,"start":11900,"end":11961},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11961},"to":{"change":3,"start":11961,"end":12099},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12099},"to":{"change":3,"start":12099,"end":12814},"introduced_by":3}],"inode":{"change":3,"pos":53}}},"contents":[{"Del":"\n static RepoStatus getRepoStatus(const PathView &repoPath)\n {\n auto [state, lastModified] = getState(repoPath);\n auto channel = getRepoChannel(repoPath);\n\n return RepoStatus{\n .channel = std::move(channel),\n .state = std::move(state),\n .lastModified = lastModified,\n };\n"},{"Del":" }\n"},{"Del":"\n static std::pair getState(const PathView &repoPath)\n {\n const auto &output = runPijul({\"log\", \"--output-format\", \"json\", \"--state\", \"--limit\", \"1\"}, Path(repoPath));\n\n const auto &json = nlohmann::json::parse(output);\n const auto &commitInfo = json.at(0);\n\n const auto ×tampSpec = commitInfo.at(\"timestamp\").get();\n const uint64_t timestamp = std::chrono::duration_cast(parseRFC3339(timestampSpec).time_since_epoch()).count();\n\n const std::string &state = commitInfo.at(\"state\");\n\n return {state, timestamp};\n }\n\n"},{"Del":" static date::sys_seconds parseRFC3339(const std::string &spec)\n"},{"Del":" {\n"},{"Del":" std::istringstream in;\n date::sys_seconds pt;\n"},{"Del":"\n in >> date::parse(\"%FT%TZ\", pt);\n\n if (in.fail()) {\n in.clear();\n in.exceptions(std::ios::failbit);\n"},{"Del":" in >> date::parse(\"%FT%T%Ez\", pt);\n }\n\n return pt;\n }\n\n static std::string getRepoChannel(const PathView &repoPath)\n {\n const auto &output = runPijul({\"channel\"}, Path(repoPath));\n\n std::string::size_type pos = 0;\n\n do {\n const auto nl = output.find('\\n', pos);\n const auto line = std::string_view(output).substr(pos, nl - pos);\n\n if (line.empty()) {\n continue;\n }\n\n if (line.at(0) == '*') {\n return std::string(line.substr(2));\n }\n\n pos = nl;\n } while (pos != std::string::npos);\n\n throw Error(\"could not parse current channel\"s);\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":13019},"path":"src/CMakeLists.txt","line":4,"ins":{"up_context":[{"change":3,"pos":13076}],"down_context":[{"change":3,"pos":13097}],"flag":"BLOCK","start":3589,"end":3642,"inode":{"change":3,"pos":13019}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":13076},"to":{"change":3,"start":13076,"end":13097},"introduced_by":3}],"inode":{"change":3,"pos":13019}},"ins_contents":[{"Add":" fetcher.cpp"},{"Add":" repo.cpp"},{"Add":" repo.h)"}],"del_contents":[{"Del":" fetcher.cpp)\n"}]}}],"owner":"dblsaiko","repo":"nix-plugin-pijul","token":"ZMK/yyUjnDvYtThtkdTIak2W1lG666XPKvHLv+vMMC8=","login":null}

…

Dependencies

Change contents