{"header":{"message":"Uncouple some of the logic from Nix library and add basic tests","description":null,"timestamp":"2024-03-25T00:57:45.395772306Z","authors":[{}]},"hash":"DYNXZQZVGIOW26Y6VPP4TIBOJEMK6T6Y7HU5ZJYH4GIWFFRIJSIQC","authors":[{"login":"dblsaiko","key":"FeMhzz74btJURqQy9nfU1xL9Jvbzr7GuZXu3HGNFY331"}],"deps":{"hashes":[["DYNXZQZVGIOW26Y6VPP4TIBOJEMK6T6Y7HU5ZJYH4GIWFFRIJSIQC","Uncouple some of the logic from Nix library and add basic tests"],["AA",null],["FYYWB54CXR3FTAQ4HLDTFS6XWBVLWRGKHVMMNKUXDEJ7UWLHXPBQC","Fix conflicts"],["H5RKFV7YLV3QFY5HCQHGU7T232FPYMGWSBR3ABNGKMEAN5DS523AC","Don't directly execute Pijul from fetcher"],["XGCRPWKLJYWGVCMHDIR2K3PVT2R22JALVV5K2IXTHU3JBAEYANGAC","Move repo interaction into separate source file"],["3KEFKH5FYGFUIWMIW6NY3K4FYSLE7LEXR4ZSF6WN52PCC3TVDZBAC","Import existing code"],["U5AKEHEQWHBOVXMTTQFBJA4M4VJ7OWSJJVYYB6FLTJB7NCFPYVRQC","Fix build for Nix 2.19 to 2.21"],["SGQQ6LNZCGWM4WP5VOOCGDUZ2FVQEC4FANXJ5SEZPDQHSLF7YL2QC","Attach Boost and SYSTEM def to Nix target instead of plugin"],["XXCRSVXOJVHO4A6W5R4A32WXXSNJDJLAT2CAQ6DE3JAMUFJF3HPAC",""],["7YS2X7JJVAFT7QFDASQR4ZVUAAFYF4OLK5XLY3JJ2URSXI34ZOTAC","Fix compilation against older Nix versions (tested with 2.13.6)"]],"deps":["FYYWB54CXR3FTAQ4HLDTFS6XWBVLWRGKHVMMNKUXDEJ7UWLHXPBQC","H5RKFV7YLV3QFY5HCQHGU7T232FPYMGWSBR3ABNGKMEAN5DS523AC"],"known":["3KEFKH5FYGFUIWMIW6NY3K4FYSLE7LEXR4ZSF6WN52PCC3TVDZBAC","U5AKEHEQWHBOVXMTTQFBJA4M4VJ7OWSJJVYYB6FLTJB7NCFPYVRQC","XGCRPWKLJYWGVCMHDIR2K3PVT2R22JALVV5K2IXTHU3JBAEYANGAC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":3,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":96}],"down_context":[{"change":4,"pos":96}],"flag":"BLOCK","start":0,"end":21,"inode":{"change":4,"pos":31}}},"contents":[{"Add":""},{"Add":"#include \"compat.h\""}]}},{"Edit":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":7,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":117}],"down_context":[{"change":4,"pos":117}],"flag":"BLOCK","start":22,"end":37,"inode":{"change":4,"pos":31}}},"contents":[{"Add":"#include "}]}},{"Edit":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":141},"to":{"change":4,"start":141,"end":161},"introduced_by":4}],"inode":{"change":4,"pos":31}}},"contents":[{"Del":"#include \n"}]}},{"Replacement":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":20,"ins":{"up_context":[{"change":3,"pos":1}],"down_context":[{"change":4,"pos":288}],"flag":"BLOCK","start":38,"end":241,"inode":{"change":4,"pos":31}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1},"to":{"change":3,"start":1,"end":241},"introduced_by":3}],"inode":{"change":4,"pos":31}},"ins_contents":[{"Add":"void clone(const std::string_view &repoUrl,"},{"Add":" const Path &repoDir,"},{"Add":" const std::optional &channel = {},"},{"Add":" const std::optional &state = {});"}],"del_contents":[{"Del":"std::string clone(const std::string_view &repoUrl,\n const nix::PathView &repoDir,\n const std::optional &channel = {},\n const std::optional &state = {});\n"}]}},{"Replacement":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":25,"ins":{"up_context":[{"change":4,"pos":289}],"down_context":[{"change":3,"pos":371}],"flag":"BLOCK","start":242,"end":346,"inode":{"change":4,"pos":31}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":289},"to":{"change":3,"start":242,"end":371},"introduced_by":3}],"inode":{"change":4,"pos":31}},"ins_contents":[{"Add":"void record(const std::string_view &message, const Path &repoDir, const std::vector &paths = {});"}],"del_contents":[{"Del":"std::string record(const std::string_view &message, const nix::PathView &repoDir, const std::vector &paths = {});\n"}]}},{"Replacement":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":27,"ins":{"up_context":[{"change":3,"pos":372}],"down_context":[{"change":3,"pos":420}],"flag":"BLOCK","start":347,"end":386,"inode":{"change":4,"pos":31}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":372},"to":{"change":3,"start":372,"end":420},"introduced_by":3}],"inode":{"change":4,"pos":31}},"ins_contents":[{"Add":"bool isRepoDirty(const Path &repoDir);"}],"del_contents":[{"Del":"bool isRepoDirty(const nix::PathView &repoDir);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":29,"ins":{"up_context":[{"change":3,"pos":421}],"down_context":[{"change":4,"pos":434}],"flag":"BLOCK","start":387,"end":440,"inode":{"change":4,"pos":31}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":421},"to":{"change":3,"start":421,"end":490},"introduced_by":3}],"inode":{"change":4,"pos":31}},"ins_contents":[{"Add":"std::set getTrackedFiles(const Path &repoDir);"}],"del_contents":[{"Del":"std::set getTrackedFiles(const nix::PathView &repoDir);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":31,"ins":{"up_context":[{"change":4,"pos":435}],"down_context":[{"change":4,"pos":492}],"flag":"BLOCK","start":441,"end":489,"inode":{"change":4,"pos":31}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":435},"to":{"change":4,"start":435,"end":492},"introduced_by":4}],"inode":{"change":4,"pos":31}},"ins_contents":[{"Add":"RepoStatus getRepoStatus(const Path &repoPath);"}],"del_contents":[{"Del":"RepoStatus getRepoStatus(const nix::PathView &repoPath);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":33,"ins":{"up_context":[{"change":4,"pos":493}],"down_context":[{"change":4,"pos":567}],"flag":"BLOCK","start":490,"end":555,"inode":{"change":4,"pos":31}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":493},"to":{"change":4,"start":493,"end":567},"introduced_by":4}],"inode":{"change":4,"pos":31}},"ins_contents":[{"Add":"std::pair getState(const Path &repoPath);"}],"del_contents":[{"Del":"std::pair getState(const nix::PathView &repoPath);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":31},"path":"src/repo.h","line":35,"ins":{"up_context":[{"change":4,"pos":568}],"down_context":[{"change":4,"pos":627}],"flag":"BLOCK","start":556,"end":606,"inode":{"change":4,"pos":31}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":568},"to":{"change":4,"start":568,"end":627},"introduced_by":4}],"inode":{"change":4,"pos":31}},"ins_contents":[{"Add":"std::string getRepoChannel(const Path &repoPath);"}],"del_contents":[{"Del":"std::string getRepoChannel(const nix::PathView &repoPath);\n"}]}},{"Edit":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":800},"to":{"change":4,"start":800,"end":840},"introduced_by":4}],"inode":{"change":4,"pos":781}}},"contents":[{"Del":"\n#include \n#include \n"}]}},{"Edit":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":841},"to":{"change":4,"start":841,"end":901},"introduced_by":4}],"inode":{"change":4,"pos":781}}},"contents":[{"Del":"#if NIX_VERSION >= 0x021900\n#include \n#endif\n\n"}]}},{"Edit":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":954},"to":{"change":4,"start":954,"end":976},"introduced_by":4}],"inode":{"change":4,"pos":781}}},"contents":[{"Del":"using namespace nix;\n\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":14,"ins":{"up_context":[{"change":4,"pos":1086}],"down_context":[{"change":4,"pos":1202}],"flag":"BLOCK","start":607,"end":719,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1086},"to":{"change":3,"start":511,"end":626},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":"void runPijul(const StringList &args, const std::optional &chdir, OutputMode mode = OutputMode::Standard)"}],"del_contents":[{"Del":"std::string runPijul(Strings args, PathView chdir, std::optional input = {}, bool isInteractive = {})\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":16,"ins":{"up_context":[{"change":4,"pos":1204}],"down_context":[{"change":3,"pos":658}],"flag":"BLOCK","start":720,"end":791,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1204},"to":{"change":4,"start":1204,"end":1375},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1375},"to":{"change":3,"start":627,"end":657},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":657},"to":{"change":4,"start":1410,"end":1649},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1410},"to":{"change":4,"start":1410,"end":1649},"introduced_by":4}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" runProcess(\"pijul\", args, chdir ? chdir->c_str() : nullptr, mode);"}],"del_contents":[{"Del":" auto program = \"pijul\"sv;\n\n auto res = runProgram(RunOptions{\n .program = std::string(program),\n .searchPath = true,\n .args = std::move(args),\n"},{"Del":" .chdir = Path(chdir),\n"},{"Del":" .input = std::move(input),\n .isInteractive = isInteractive,\n });\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"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":19,"ins":{"up_context":[{"change":3,"pos":661}],"down_context":[{"change":3,"pos":780}],"flag":"BLOCK","start":792,"end":888,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":661},"to":{"change":3,"start":661,"end":780},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":"void record(const std::string_view &message, const Path &chdir, const std::vector &paths)"}],"del_contents":[{"Del":"std::string record(const std::string_view &message, const PathView &chdir, const std::vector &paths)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":21,"ins":{"up_context":[{"change":3,"pos":782}],"down_context":[{"change":3,"pos":823}],"flag":"BLOCK","start":889,"end":933,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":782},"to":{"change":3,"start":782,"end":823},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" StringList args{\"record\", \"--message\"};"}],"del_contents":[{"Del":" Strings args{\"record\", \"--message\"};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":30,"ins":{"up_context":[{"change":3,"pos":951}],"down_context":[{"change":3,"pos":995}],"flag":"BLOCK","start":934,"end":986,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":951},"to":{"change":3,"start":951,"end":995},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" runPijul(args, chdir, OutputMode::Interactive);"}],"del_contents":[{"Del":" return runPijul(args, chdir, {}, true);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":33,"ins":{"up_context":[{"change":3,"pos":998}],"down_context":[{"change":3,"pos":1230}],"flag":"BLOCK","start":987,"end":1179,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":998},"to":{"change":3,"start":998,"end":1230},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":"void clone(const std::string_view &repoUrl,"},{"Add":" const Path &repoDir,"},{"Add":" const std::optional &channel,"},{"Add":" const std::optional &state)"}],"del_contents":[{"Del":"std::string clone(const std::string_view &repoUrl,\n const std::string_view &repoDir,\n const std::optional &channel,\n const std::optional &state)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":38,"ins":{"up_context":[{"change":3,"pos":1232}],"down_context":[{"change":3,"pos":1260}],"flag":"BLOCK","start":1180,"end":1211,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1232},"to":{"change":3,"start":1232,"end":1260},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" StringList args{\"clone\"s};"}],"del_contents":[{"Del":" Strings args{\"clone\"s};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":53,"ins":{"up_context":[{"change":3,"pos":1522}],"down_context":[{"change":4,"pos":1649}],"flag":"BLOCK","start":1212,"end":1261,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1522},"to":{"change":3,"start":1522,"end":1563},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" runPijul(args, {}, OutputMode::Interactive);"}],"del_contents":[{"Del":" return runPijul(args, {}, {}, true);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":56,"ins":{"up_context":[{"change":4,"pos":1652}],"down_context":[{"change":3,"pos":1609}],"flag":"BLOCK","start":1262,"end":1303,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1652},"to":{"change":3,"start":1564,"end":1609},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":"bool isRepoDirty(const Path &chdir = {})"}],"del_contents":[{"Del":"bool isRepoDirty(const PathView &chdir = {})\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":58,"ins":{"up_context":[{"change":3,"pos":1611}],"down_context":[{"change":3,"pos":1684}],"flag":"BLOCK","start":1304,"end":1409,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1611},"to":{"change":3,"start":1611,"end":1684},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" std::string diffOutput;"},{"Add":" runPijul({\"diff\", \"--json\"}, chdir, OutputMode::WithOutput{diffOutput});"}],"del_contents":[{"Del":" const std::string &diffOutput = runPijul({\"diff\", \"--json\"}, chdir);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":74,"ins":{"up_context":[{"change":3,"pos":1897}],"down_context":[{"change":3,"pos":1965}],"flag":"BLOCK","start":1410,"end":1462,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1897},"to":{"change":3,"start":1897,"end":1965},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":"std::set getTrackedFiles(const Path &repoDir)"}],"del_contents":[{"Del":"std::set getTrackedFiles(const nix::PathView &repoDir)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":76,"ins":{"up_context":[{"change":3,"pos":1967}],"down_context":[{"change":3,"pos":2014}],"flag":"BLOCK","start":1463,"end":1777,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1967},"to":{"change":3,"start":1967,"end":2014},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" std::string output;"},{"Add":" runPijul({\"list\"}, repoDir, OutputMode::WithOutput{output});"},{"Add":""},{"Add":" size_t pos = 0;"},{"Add":" size_t next;"},{"Add":""},{"Add":" std::set out;"},{"Add":""},{"Add":" while ((next = output.find_first_of(\"\\n\\r\", pos)) != std::string::npos) {"},{"Add":" out.emplace(output.substr(pos, next - pos));"},{"Add":" pos = next + 1;"},{"Add":" }"}],"del_contents":[{"Del":" auto output = runPijul({\"list\"}, repoDir);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":89,"ins":{"up_context":[{"change":3,"pos":2015}],"down_context":[{"change":3,"pos":2081}],"flag":"BLOCK","start":1778,"end":1794,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2015},"to":{"change":3,"start":2015,"end":2081},"introduced_by":3}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" return out;"}],"del_contents":[{"Del":" return tokenizeString>(output, \"\\n\\r\");\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":92,"ins":{"up_context":[{"change":3,"pos":2084}],"down_context":[{"change":4,"pos":1703}],"flag":"BLOCK","start":1795,"end":1842,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":2084},"to":{"change":4,"start":1652,"end":1703},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1652},"to":{"change":4,"start":1652,"end":1703},"introduced_by":4}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":"RepoStatus getRepoStatus(const Path &repoPath)"}],"del_contents":[{"Del":"RepoStatus getRepoStatus(const PathView &repoPath)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":104,"ins":{"up_context":[{"change":4,"pos":1949}],"down_context":[{"change":4,"pos":2017}],"flag":"BLOCK","start":1843,"end":1907,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1949},"to":{"change":4,"start":1949,"end":2017},"introduced_by":4}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":"std::pair getState(const Path &repoPath)"}],"del_contents":[{"Del":"std::pair getState(const PathView &repoPath)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":106,"ins":{"up_context":[{"change":4,"pos":2019}],"down_context":[{"change":4,"pos":2133}],"flag":"BLOCK","start":1908,"end":2057,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2019},"to":{"change":4,"start":2019,"end":2133},"introduced_by":4}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" std::string output;"},{"Add":" runPijul({\"log\", \"--output-format\", \"json\", \"--state\", \"--limit\", \"1\"}, Path(repoPath), OutputMode::WithOutput{output});"}],"del_contents":[{"Del":" const auto &output = runPijul({\"log\", \"--output-format\", \"json\", \"--state\", \"--limit\", \"1\"}, Path(repoPath));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":120,"ins":{"up_context":[{"change":4,"pos":2527}],"down_context":[{"change":4,"pos":2580}],"flag":"BLOCK","start":2058,"end":2107,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2527},"to":{"change":4,"start":2527,"end":2580},"introduced_by":4}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":"std::string getRepoChannel(const Path &repoPath)"}],"del_contents":[{"Del":"std::string getRepoChannel(const PathView &repoPath)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":122,"ins":{"up_context":[{"change":4,"pos":2582}],"down_context":[{"change":4,"pos":2646}],"flag":"BLOCK","start":2108,"end":2207,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2582},"to":{"change":4,"start":2582,"end":2646},"introduced_by":4}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" std::string output;"},{"Add":" runPijul({\"channel\"}, Path(repoPath), OutputMode::WithOutput{output});"}],"del_contents":[{"Del":" const auto &output = runPijul({\"channel\"}, Path(repoPath));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":781},"path":"src/repo.cpp","line":142,"ins":{"up_context":[{"change":4,"pos":3028}],"down_context":[{"change":4,"pos":3081}],"flag":"BLOCK","start":2208,"end":2254,"inode":{"change":4,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3028},"to":{"change":4,"start":3028,"end":3081},"introduced_by":4}],"inode":{"change":4,"pos":781}},"ins_contents":[{"Add":" fatal(\"could not parse current channel\");"}],"del_contents":[{"Del":" throw Error(\"could not parse current channel\"s);\n"}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":1,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":53}],"down_context":[{"change":4,"pos":3464}],"flag":"BLOCK","start":2255,"end":2275,"inode":{"change":4,"pos":53}}},"contents":[{"Add":"#ifdef NIX_VERSION"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":11,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":169},"to":{"change":4,"start":0,"end":60},"introduced_by":4}],"inode":{"change":4,"pos":53}}},"contents":[{"Del":"\n#if NIX_VERSION >= 0x021900\n#include \n#endif\n"}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":25,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":3553}],"down_context":[{"change":3,"pos":2085}],"flag":"BLOCK","start":2276,"end":2315,"inode":{"change":4,"pos":53}}},"contents":[{"Add":"using nixpluginpijul::getTrackedFiles;"}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":28,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2150},"to":{"change":3,"start":2150,"end":2189},"introduced_by":3}],"inode":{"change":4,"pos":53}}},"contents":[{"Del":"using nixpluginpijul::getTrackedFiles;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":165,"ins":{"up_context":[{"change":4,"pos":965}],"down_context":[{"change":4,"pos":1146}],"flag":"BLOCK","start":2316,"end":2371,"inode":{"change":4,"pos":53}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":965},"to":{"change":3,"start":2190,"end":2239},"introduced_by":3}],"inode":{"change":4,"pos":53}},"ins_contents":[{"Add":" record(*commitMsg, *root, {Path(path.rel())});"}],"del_contents":[{"Del":" record(*commitMsg, *root, {path.rel()});\n"}]}},{"Replacement":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":173,"ins":{"up_context":[{"change":4,"pos":4135}],"down_context":[{"change":4,"pos":1370}],"flag":"BLOCK","start":2372,"end":2428,"inode":{"change":4,"pos":53}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4135},"to":{"change":3,"start":2240,"end":2283},"introduced_by":3}],"inode":{"change":4,"pos":53}},"ins_contents":[{"Add":" record(*commitMsg, *root, {std::string(file)});"}],"del_contents":[{"Del":" record(*commitMsg, *root, {file});\n"}]}},{"Replacement":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":321,"ins":{"up_context":[{"change":4,"pos":8102}],"down_context":[{"change":4,"pos":8228}],"flag":"BLOCK","start":2429,"end":2543,"inode":{"change":4,"pos":53}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8102},"to":{"change":4,"start":8102,"end":8228},"introduced_by":4}],"inode":{"change":4,"pos":53}},"ins_contents":[{"Add":" static std::pair fetchLocal(const ref &store, const Input &_input, const Path &path)"}],"del_contents":[{"Del":" static std::pair fetchLocal(const ref &store, const Input &_input, const std::string_view &path)\n"}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":413,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":12979}],"down_context":[],"flag":"BLOCK","start":2544,"end":2552,"inode":{"change":4,"pos":53}}},"contents":[{"Add":""},{"Add":"#endif"}]}},{"FileAdd":{"meta":{"basename":"compat.h","metadata":0},"context":[{"change":4,"pos":15}],"contents":[{"Add":"#ifndef NIX_PLUGIN_PIJUL_COMPAT_H"},{"Add":"#define NIX_PLUGIN_PIJUL_COMPAT_H"},{"Add":""},{"Add":"#ifdef NIX_VERSION"},{"Add":"#include "},{"Add":"#include "},{"Add":"#else"},{"Add":"#include "},{"Add":"#include "},{"Add":"#include "},{"Add":"#endif"},{"Add":""},{"Add":"#include "},{"Add":""},{"Add":"namespace nixpluginpijul"},{"Add":"{"},{"Add":""},{"Add":"#ifdef NIX_VERSION"},{"Add":"using StringList = nix::Strings;"},{"Add":"using Path = nix::Path;"},{"Add":"#else"},{"Add":"using StringList = std::vector;"},{"Add":"using Path = std::filesystem::path;"},{"Add":"#endif"},{"Add":""},{"Add":"struct OutputMode final {"},{"Add":" enum Units {"},{"Add":" Standard,"},{"Add":" Interactive,"},{"Add":" };"},{"Add":""},{"Add":" struct WithOutput {"},{"Add":" std::string &output;"},{"Add":" };"},{"Add":""},{"Add":" OutputMode(Units data)"},{"Add":" : m_data(data)"},{"Add":" {"},{"Add":" }"},{"Add":""},{"Add":" OutputMode(WithOutput data)"},{"Add":" : m_data(data)"},{"Add":" {"},{"Add":" }"},{"Add":""},{"Add":" bool interactive()"},{"Add":" {"},{"Add":" if (auto *t = get_if(&m_data)) {"},{"Add":" return *t == Interactive;"},{"Add":" } else {"},{"Add":" return false;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" std::string *output()"},{"Add":" {"},{"Add":" if (auto *t = get_if(&m_data)) {"},{"Add":" return &t->output;"},{"Add":" } else {"},{"Add":" return nullptr;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":"private:"},{"Add":" std::variant m_data;"},{"Add":"};"},{"Add":""},{"Add":"void runProcess(const char *path, const StringList &args, const char *chdir = nullptr, OutputMode mode = OutputMode::Standard);"},{"Add":""},{"Add":"[[noreturn]] void fatal(const char *text);"},{"Add":""},{"Add":"}"},{"Add":""},{"Add":"#endif // NIX_PLUGIN_PIJUL_COMPAT_H"}]}},{"FileAdd":{"meta":{"basename":"compat.cpp","metadata":0},"context":[{"change":4,"pos":15}],"contents":[{"Add":"#include \"compat.h\""},{"Add":""},{"Add":"#ifdef NIX_VERSION"},{"Add":"#if NIX_VERSION >= 0x021900"},{"Add":"#include "},{"Add":"#else"},{"Add":"#include "},{"Add":"#endif"},{"Add":"#else"},{"Add":"#include "},{"Add":"#include "},{"Add":"#include "},{"Add":"#include "},{"Add":"#include "},{"Add":"#include "},{"Add":"#endif"},{"Add":""},{"Add":"using namespace std::string_literals;"},{"Add":"using namespace std::string_view_literals;"},{"Add":""},{"Add":"namespace nixpluginpijul"},{"Add":"{"},{"Add":""},{"Add":"void runProcess(const char *p, const StringList &args, const char *chdir, OutputMode mode)"},{"Add":"{"},{"Add":"#ifdef NIX_VERSION"},{"Add":" auto res = nix::runProgram(nix::RunOptions{"},{"Add":" .program = std::string(p),"},{"Add":" .searchPath = true,"},{"Add":" .args = args,"},{"Add":" .chdir = Path(chdir),"},{"Add":" .isInteractive = mode.interactive(),"},{"Add":" });"},{"Add":""},{"Add":" if (!nix::statusOk(res.first)) {"},{"Add":" throw nix::ExecError(res.first, \"program '%1%' %2%\", p, nix::statusToString(res.first));"},{"Add":" }"},{"Add":""},{"Add":" if (mode.output()) {"},{"Add":" *mode.output() = std::move(res.second);"},{"Add":" }"},{"Add":"#else"},{"Add":" int fds[2];"},{"Add":""},{"Add":" posix_spawn_file_actions_t fa;"},{"Add":" posix_spawn_file_actions_init(&fa);"},{"Add":""},{"Add":" if (mode.output()) {"},{"Add":" if (pipe(fds) != 0) {"},{"Add":" perror(\"failed to create pipe\");"},{"Add":" exit(EX_OSERR);"},{"Add":" }"},{"Add":""},{"Add":" posix_spawn_file_actions_adddup2(&fa, fds[1], 0);"},{"Add":" posix_spawn_file_actions_adddup2(&fa, fds[1], 1);"},{"Add":" }"},{"Add":""},{"Add":" if (!mode.interactive()) {"},{"Add":" posix_spawn_file_actions_addclose(&fa, 2);"},{"Add":" }"},{"Add":""},{"Add":" if (chdir) {"},{"Add":" posix_spawn_file_actions_addchdir_np(&fa, chdir);"},{"Add":" }"},{"Add":""},{"Add":" std::vector argv;"},{"Add":" argv.push_back(p);"},{"Add":""},{"Add":" for (const auto &el : args) {"},{"Add":" argv.push_back(el.c_str());"},{"Add":" }"},{"Add":""},{"Add":" pid_t pid;"},{"Add":""},{"Add":" if (posix_spawnp(&pid, p, &fa, nullptr, const_cast(argv.data()), nullptr) != 0) {"},{"Add":" perror(\"failed to spawn process\");"},{"Add":" exit(EX_OSERR);"},{"Add":" }"},{"Add":""},{"Add":" close(fds[1]);"},{"Add":" posix_spawn_file_actions_destroy(&fa);"},{"Add":""},{"Add":" fd_set set;"},{"Add":" FD_ZERO(&set);"},{"Add":" int nfds = 0;"},{"Add":""},{"Add":" if (mode.output()) {"},{"Add":" FD_SET(fds[0], &set);"},{"Add":" fcntl(fds[0], F_SETFL, fcntl(fds[0], F_GETFL) | O_NONBLOCK);"},{"Add":" nfds = 1;"},{"Add":" }"},{"Add":""},{"Add":" sigset_t sigs;"},{"Add":" sigfillset(&sigs);"},{"Add":" sigdelset(&sigs, SIGCHLD);"},{"Add":""},{"Add":" timespec timeout{.tv_sec = 1};"},{"Add":""},{"Add":" bool running = true;"},{"Add":" int status;"},{"Add":""},{"Add":" while (running) {"},{"Add":" // FIXME: this never catches the SIGCHLD"},{"Add":" int ret = pselect(nfds, &set, nullptr, nullptr, &timeout, &sigs);"},{"Add":""},{"Add":" printf(\"%d\\n\", ret);"},{"Add":""},{"Add":" if (ret == -1) {"},{"Add":" if (errno != EINTR) {"},{"Add":" perror(\"pselect\");"},{"Add":" exit(EX_OSERR);"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" ret = waitpid(pid, &status, WNOHANG);"},{"Add":""},{"Add":" if (ret == -1) {"},{"Add":" perror(\"waitpid\");"},{"Add":" exit(EX_OSERR);"},{"Add":" } else if (ret == pid) {"},{"Add":" running = false;"},{"Add":" ret = 1; // get the last data out of the pipe"},{"Add":" }"},{"Add":""},{"Add":" if (ret > 0 && mode.output()) {"},{"Add":" char buf[4096];"},{"Add":" ssize_t len;"},{"Add":""},{"Add":" do {"},{"Add":" len = read(fds[0], buf, sizeof(buf));"},{"Add":""},{"Add":" if (len < 0 && errno != EWOULDBLOCK) {"},{"Add":" perror(\"read\");"},{"Add":" exit(EX_OSERR);"},{"Add":" }"},{"Add":""},{"Add":" if (len > 1) {"},{"Add":" mode.output()->append(buf, len);"},{"Add":" }"},{"Add":" } while (len > 0);"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if (mode.output()) {"},{"Add":" close(fds[0]);"},{"Add":" }"},{"Add":""},{"Add":" if (status != 0) {"},{"Add":" fatal(std::format(\"process `{}' exited with status {}\", p, WEXITSTATUS(status)).c_str());"},{"Add":" }"},{"Add":"#endif"},{"Add":"}"},{"Add":""},{"Add":"void fatal(const char *text)"},{"Add":"{"},{"Add":"#ifdef NIX_VERSION"},{"Add":" throw nix::Error(\"%1%\", text);"},{"Add":"#else"},{"Add":" fprintf(stderr, \"fatal: %s\\n\", text);"},{"Add":" exit(EX_SOFTWARE);"},{"Add":"#endif"},{"Add":"}"},{"Add":""},{"Add":"}"}]}},{"Edit":{"inode":{"change":4,"pos":13019},"path":"src/CMakeLists.txt","line":2,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":13046}],"down_context":[{"change":4,"pos":13046}],"flag":"BLOCK","start":7557,"end":7590,"inode":{"change":4,"pos":13019}}},"contents":[{"Add":"add_library(PijulTesting STATIC)"}]}},{"Replacement":{"inode":{"change":4,"pos":13019},"path":"src/CMakeLists.txt","line":4,"ins":{"up_context":[{"change":4,"pos":13047}],"down_context":[{"change":4,"pos":3589}],"flag":"BLOCK","start":7591,"end":7635,"inode":{"change":4,"pos":13019}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":13047},"to":{"change":4,"start":13047,"end":13076},"introduced_by":4}],"inode":{"change":4,"pos":13019}},"ins_contents":[{"Add":"set(SRC"},{"Add":" compat.cpp"},{"Add":" compat.h"}],"del_contents":[{"Del":"target_sources(pijul PRIVATE\n"}]}},{"Edit":{"inode":{"change":4,"pos":13019},"path":"src/CMakeLists.txt","line":11,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":13098}],"down_context":[{"change":8,"pos":213}],"flag":"BLOCK","start":7636,"end":7847,"inode":{"change":4,"pos":13019}}},"contents":[{"Add":"target_sources(pijul PRIVATE ${SRC})"},{"Add":""},{"Add":"target_sources(PijulTesting PRIVATE ${SRC})"},{"Add":"target_include_directories(PijulTesting PUBLIC ${CMAKE_CURRENT_LIST_DIR})"},{"Add":"target_compile_options(PijulTesting PUBLIC -O1 -ggdb)"},{"Add":""}]}},{"FileAdd":{"meta":{"basename":"autotests","metadata":576},"context":[{"change":9,"pos":1}],"contents":[]}},{"FileAdd":{"meta":{"basename":"repotest.cpp","metadata":0},"context":[{"change":0,"pos":7869}],"contents":[{"Add":"#include \"repo.h\""},{"Add":""},{"Add":"using namespace nixpluginpijul;"},{"Add":""},{"Add":"int main()"},{"Add":"{"},{"Add":" clone(\"https://nest.pijul.com/dblsaiko/nix-plugin-pijul\", \"nix-plugin-pijul\");"},{"Add":" const std::set &set = getTrackedFiles(\"nix-plugin-pijul\");"},{"Add":""},{"Add":" for (const auto &item : set) {"},{"Add":" printf(\"- %s\\n\", item.c_str());"},{"Add":" }"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"datetest.cpp","metadata":0},"context":[{"change":0,"pos":7869}],"contents":[{"Add":"#include \"repo.h\""},{"Add":""},{"Add":"#include "},{"Add":""},{"Add":"using namespace nixpluginpijul;"},{"Add":""},{"Add":"template"},{"Add":"void assert_eq(const T &left, const T &right)"},{"Add":"{"},{"Add":" if (left != right) {"},{"Add":" const std::string &string = std::format(\"assertion failed: {} == {}\", left, right);"},{"Add":" fprintf(stderr, \"%s\\n\", string.c_str());"},{"Add":" exit(1);"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"template"},{"Add":"void assert_throws(F op)"},{"Add":"{"},{"Add":" try {"},{"Add":" op();"},{"Add":" } catch (...) {"},{"Add":" return;"},{"Add":" }"},{"Add":""},{"Add":" fprintf(stderr, \"%s\\n\", \"assertion failed: `op' didn't throw\");"},{"Add":" exit(1);"},{"Add":"}"},{"Add":""},{"Add":"int main()"},{"Add":"{"},{"Add":" auto point = parseRFC3339(\"1970-01-01T00:00:00.000Z\");"},{"Add":" assert_eq(0L, point.time_since_epoch().count());"},{"Add":""},{"Add":" point = parseRFC3339(\"1970-01-01T00:00:00Z\");"},{"Add":" assert_eq(0L, point.time_since_epoch().count());"},{"Add":""},{"Add":" point = parseRFC3339(\"1970-01-01T00:30:00+00:30\");"},{"Add":" assert_eq(0L, point.time_since_epoch().count());"},{"Add":""},{"Add":" point = parseRFC3339(\"1970-01-01T00:00:00.000-01:00\");"},{"Add":" assert_eq(3600000L, point.time_since_epoch().count());"},{"Add":""},{"Add":" assert_throws([] {"},{"Add":" parseRFC3339(\"garbage\");"},{"Add":" });"},{"Add":""},{"Add":" assert_throws([] {"},{"Add":" parseRFC3339(\"1\");"},{"Add":" });"},{"Add":""},{"Add":" assert_throws([] {"},{"Add":" parseRFC3339(\"1970-01-01T00:00:00\");"},{"Add":" });"},{"Add":""},{"Add":" // FIXME: this should be an invalid timestamp (at least, I think so) because"},{"Add":" // it has both +00:30 and 'Z' but it parses"},{"Add":" assert_throws([] {"},{"Add":" parseRFC3339(\"1970-01-01T00:30:00+00:30Z\");"},{"Add":" });"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"CMakeLists.txt","metadata":0},"context":[{"change":0,"pos":7869}],"contents":[{"Add":"add_compile_options(-O1 -ggdb)"},{"Add":""},{"Add":"add_executable(DateTest datetest.cpp)"},{"Add":"target_link_libraries(DateTest PUBLIC PijulTesting)"},{"Add":"add_test(NAME DateTest COMMAND DateTest)"},{"Add":""},{"Add":"add_executable(RepoTest repotest.cpp)"},{"Add":"target_link_libraries(RepoTest PUBLIC PijulTesting)"},{"Add":"add_test(NAME RepoTest COMMAND RepoTest)"}]}},{"Edit":{"inode":{"change":4,"pos":13814},"path":"CMakeLists.txt","line":15,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":14161}],"down_context":[{"change":4,"pos":14161}],"flag":"BLOCK","start":9990,"end":10005,"inode":{"change":4,"pos":13814}}},"contents":[{"Add":"include(CTest)"}]}},{"Edit":{"inode":{"change":4,"pos":13814},"path":"CMakeLists.txt","line":41,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":66}],"down_context":[{"change":10,"pos":677}],"flag":"BLOCK","start":10006,"end":10042,"inode":{"change":4,"pos":13814}}},"contents":[{"Add":""},{"Add":"add_compile_options(-Wall -Werror)"}]}},{"Edit":{"inode":{"change":4,"pos":13814},"path":"CMakeLists.txt","line":44,"atom":{"NewVertex":{"up_context":[{"change":10,"pos":678}],"down_context":[{"change":4,"pos":14335}],"flag":"BLOCK","start":10043,"end":10071,"inode":{"change":4,"pos":13814}}},"contents":[{"Add":"add_subdirectory(autotests)"}]}}],"owner":"dblsaiko","repo":"nix-plugin-pijul","token":"UT4JVbxtVh5Uw3RJ8nqSX3NvB847HpFHe52isybYnhw=","login":null}

…

Dependencies

Change contents