{"header":{"message":"Don't directly execute Pijul from fetcher","description":null,"timestamp":"2024-03-24T20:31:07.061450868Z","authors":[{}]},"hash":"H5RKFV7YLV3QFY5HCQHGU7T232FPYMGWSBR3ABNGKMEAN5DS523AC","authors":[{"login":"dblsaiko","key":"FeMhzz74btJURqQy9nfU1xL9Jvbzr7GuZXu3HGNFY331"}],"deps":{"hashes":[["H5RKFV7YLV3QFY5HCQHGU7T232FPYMGWSBR3ABNGKMEAN5DS523AC","Don't directly execute Pijul from fetcher"],["AA",null],["U5AKEHEQWHBOVXMTTQFBJA4M4VJ7OWSJJVYYB6FLTJB7NCFPYVRQC","Fix build for Nix 2.19 to 2.21"],["XGCRPWKLJYWGVCMHDIR2K3PVT2R22JALVV5K2IXTHU3JBAEYANGAC","Move repo interaction into separate source file"],["3KEFKH5FYGFUIWMIW6NY3K4FYSLE7LEXR4ZSF6WN52PCC3TVDZBAC","Import existing code"]],"deps":["U5AKEHEQWHBOVXMTTQFBJA4M4VJ7OWSJJVYYB6FLTJB7NCFPYVRQC","XGCRPWKLJYWGVCMHDIR2K3PVT2R22JALVV5K2IXTHU3JBAEYANGAC"],"known":["3KEFKH5FYGFUIWMIW6NY3K4FYSLE7LEXR4ZSF6WN52PCC3TVDZBAC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":31},"path":"src/repo.h","line":17,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":288}],"down_context":[{"change":3,"pos":288}],"flag":"BLOCK","start":0,"end":241,"inode":{"change":3,"pos":31}}},"contents":[{"Add":""},{"Add":"std::string clone(const std::string_view &repoUrl,"},{"Add":" const nix::PathView &repoDir,"},{"Add":" const std::optional &channel = {},"},{"Add":" const std::optional &state = {});"}]}},{"Replacement":{"inode":{"change":3,"pos":31},"path":"src/repo.h","line":23,"ins":{"up_context":[{"change":3,"pos":289}],"down_context":[{"change":3,"pos":434}],"flag":"BLOCK","start":242,"end":490,"inode":{"change":3,"pos":31}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":289},"to":{"change":3,"start":289,"end":434},"introduced_by":3}],"inode":{"change":3,"pos":31}},"ins_contents":[{"Add":"std::string record(const std::string_view &message, const nix::PathView &repoDir, const std::vector &paths = {});"},{"Add":""},{"Add":"bool isRepoDirty(const nix::PathView &repoDir);"},{"Add":""},{"Add":"std::set getTrackedFiles(const nix::PathView &repoDir);"}],"del_contents":[{"Del":"std::string runPijul(nix::Strings args, std::optional chdir = {}, std::optional input = {}, bool isInteractive = false);\n"}]}},{"Edit":{"inode":{"change":3,"pos":781},"path":"src/repo.cpp","line":11,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":930}],"down_context":[{"change":3,"pos":930}],"flag":"BLOCK","start":491,"end":510,"inode":{"change":3,"pos":781}}},"contents":[{"Add":"#include "}]}},{"Replacement":{"inode":{"change":3,"pos":781},"path":"src/repo.cpp","line":23,"ins":{"up_context":[{"change":3,"pos":1086}],"down_context":[{"change":3,"pos":1202}],"flag":"BLOCK","start":511,"end":626,"inode":{"change":3,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1086},"to":{"change":3,"start":1086,"end":1202},"introduced_by":3}],"inode":{"change":3,"pos":781}},"ins_contents":[{"Add":"std::string runPijul(Strings args, PathView chdir, std::optional input = {}, bool isInteractive = {})"}],"del_contents":[{"Del":"std::string runPijul(Strings args, std::optional chdir, std::optional input, bool isInteractive)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":781},"path":"src/repo.cpp","line":31,"ins":{"up_context":[{"change":3,"pos":1375}],"down_context":[{"change":3,"pos":1410}],"flag":"BLOCK","start":627,"end":657,"inode":{"change":3,"pos":781}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1375},"to":{"change":3,"start":1375,"end":1410},"introduced_by":3}],"inode":{"change":3,"pos":781}},"ins_contents":[{"Add":" .chdir = Path(chdir),"}],"del_contents":[{"Del":" .chdir = std::move(chdir),\n"}]}},{"Edit":{"inode":{"change":3,"pos":781},"path":"src/repo.cpp","line":41,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1649}],"down_context":[{"change":3,"pos":1649}],"flag":"BLOCK","start":658,"end":1563,"inode":{"change":3,"pos":781}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"std::string record(const std::string_view &message, const PathView &chdir, const std::vector &paths)"},{"Add":"{"},{"Add":" Strings args{\"record\", \"--message\"};"},{"Add":""},{"Add":" args.emplace_back(message);"},{"Add":" args.emplace_back(\"--\");"},{"Add":""},{"Add":" for (auto &s : paths) {"},{"Add":" args.emplace_back(s);"},{"Add":" }"},{"Add":""},{"Add":" return runPijul(args, chdir, {}, true);"},{"Add":"}"},{"Add":""},{"Add":"std::string clone(const std::string_view &repoUrl,"},{"Add":" const std::string_view &repoDir,"},{"Add":" const std::optional &channel,"},{"Add":" const std::optional &state)"},{"Add":"{"},{"Add":" Strings args{\"clone\"s};"},{"Add":""},{"Add":" if (channel) {"},{"Add":" args.push_back(\"--channel\"s);"},{"Add":" args.emplace_back(*channel);"},{"Add":" }"},{"Add":""},{"Add":" if (state) {"},{"Add":" args.push_back(\"--state\"s);"},{"Add":" args.emplace_back(*state);"},{"Add":" }"},{"Add":""},{"Add":" args.emplace_back(repoUrl);"},{"Add":" args.emplace_back(repoDir);"},{"Add":""},{"Add":" return runPijul(args, {}, {}, true);"}]}},{"Edit":{"inode":{"change":3,"pos":781},"path":"src/repo.cpp","line":80,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1652}],"down_context":[{"change":3,"pos":1652}],"flag":"BLOCK","start":1564,"end":2084,"inode":{"change":3,"pos":781}}},"contents":[{"Add":"bool isRepoDirty(const PathView &chdir = {})"},{"Add":"{"},{"Add":" const std::string &diffOutput = runPijul({\"diff\", \"--json\"}, chdir);"},{"Add":""},{"Add":" bool dirty = false;"},{"Add":""},{"Add":" if (!diffOutput.empty()) {"},{"Add":" const auto &json = nlohmann::json::parse(diffOutput);"},{"Add":""},{"Add":" if (!json.empty()) {"},{"Add":" dirty = true;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" return dirty;"},{"Add":"}"},{"Add":""},{"Add":"std::set getTrackedFiles(const nix::PathView &repoDir)"},{"Add":"{"},{"Add":" auto output = runPijul({\"list\"}, repoDir);"},{"Add":""},{"Add":" return tokenizeString>(output, \"\\n\\r\");"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":27,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3553}],"down_context":[{"change":3,"pos":3553}],"flag":"BLOCK","start":2085,"end":2189,"inode":{"change":4,"pos":53}}},"contents":[{"Add":"using nixpluginpijul::isRepoDirty;"},{"Add":"using nixpluginpijul::record;"},{"Add":"using nixpluginpijul::getTrackedFiles;"}]}},{"Replacement":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":167,"ins":{"up_context":[{"change":2,"pos":965}],"down_context":[{"change":2,"pos":1146}],"flag":"BLOCK","start":2190,"end":2239,"inode":{"change":4,"pos":53}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":965},"to":{"change":2,"start":965,"end":1029},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":1029},"to":{"change":4,"start":3936,"end":3937},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3936},"to":{"change":4,"start":3936,"end":3937},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3937},"to":{"change":2,"start":1030,"end":1146},"introduced_by":2}],"inode":{"change":4,"pos":53}},"ins_contents":[{"Add":" record(*commitMsg, *root, {path.rel()});"}],"del_contents":[{"Del":" runPijul({\"add\", \"--\", std::string(path.rel())}, root);\n"},{"Del":"\n"},{"Del":" if (commitMsg)\n runPijul({\"record\", std::string(path.rel()), \"-m\", *commitMsg}, root, {}, true);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":175,"ins":{"up_context":[{"change":4,"pos":4135}],"down_context":[{"change":2,"pos":1370}],"flag":"BLOCK","start":2240,"end":2283,"inode":{"change":4,"pos":53}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4135},"to":{"change":2,"start":1224,"end":1282},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":1282},"to":{"change":4,"start":4199,"end":4223},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4199},"to":{"change":4,"start":4199,"end":4223},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4223},"to":{"change":2,"start":1283,"end":1370},"introduced_by":2}],"inode":{"change":4,"pos":53}},"ins_contents":[{"Add":" record(*commitMsg, *root, {file});"}],"del_contents":[{"Del":" runPijul({\"add\", \"--\", std::string(file)}, root);\n"},{"Del":"\n if (commitMsg)\n"},{"Del":" runPijul({\"record\", std::string(file), \"-m\", *commitMsg}, root, {}, true);\n"}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":295,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7224},"to":{"change":4,"start":7224,"end":7485},"introduced_by":4}],"inode":{"change":4,"pos":53}}},"contents":[{"Del":"\n Strings args{\"clone\"s};\n\n if (channel) {\n args.push_back(\"--channel\"s);\n args.emplace_back(*channel);\n }\n\n if (state) {\n args.push_back(\"--state\"s);\n args.emplace_back(*state);\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":296,"ins":{"up_context":[{"change":4,"pos":7486}],"down_context":[{"change":4,"pos":7555}],"flag":"BLOCK","start":2284,"end":2349,"inode":{"change":4,"pos":53}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7486},"to":{"change":4,"start":7486,"end":7555},"introduced_by":4}],"inode":{"change":4,"pos":53}},"ins_contents":[{"Add":" nixpluginpijul::clone(repoUrl, repoDir, channel, state);"}],"del_contents":[{"Del":" args.emplace_back(repoUrl);\n args.push_back(repoDir);\n"}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":298,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":7556},"to":{"change":4,"start":7556,"end":7595},"introduced_by":4}],"inode":{"change":4,"pos":53}}},"contents":[{"Del":" runPijul(args, {}, {}, true);\n\n"}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":330,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8443},"to":{"change":4,"start":8443,"end":8562},"introduced_by":4}],"inode":{"change":4,"pos":53}}},"contents":[{"Del":"\n const std::string &diffOutput = runPijul({\"diff\", \"--json\"}, std::string(path));\n\n bool dirty = false;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":331,"ins":{"up_context":[{"change":4,"pos":8563}],"down_context":[{"change":4,"pos":8664}],"flag":"BLOCK","start":2350,"end":2390,"inode":{"change":4,"pos":53}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8563},"to":{"change":4,"start":8563,"end":8664},"introduced_by":4}],"inode":{"change":4,"pos":53}},"ins_contents":[{"Add":" bool dirty = isRepoDirty(path);"}],"del_contents":[{"Del":" if (!diffOutput.empty()) {\n const auto &json = nlohmann::json::parse(diffOutput);\n"}]}},{"Edit":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":333,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":8665},"to":{"change":4,"start":8665,"end":8753},"introduced_by":4}],"inode":{"change":4,"pos":53}}},"contents":[{"Del":" if (!json.empty()) {\n dirty = true;\n }\n }\n\n"}]}},{"Replacement":{"inode":{"change":4,"pos":53},"path":"src/fetcher.cpp","line":343,"ins":{"up_context":[{"change":4,"pos":9021}],"down_context":[{"change":4,"pos":9128}],"flag":"BLOCK","start":2391,"end":2435,"inode":{"change":4,"pos":53}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":9021},"to":{"change":4,"start":9021,"end":9128},"introduced_by":4}],"inode":{"change":4,"pos":53}},"ins_contents":[{"Add":" auto files = getTrackedFiles(path);"}],"del_contents":[{"Del":" auto files = tokenizeString>(runPijul({\"list\"}, std::string(path)), \"\\n\\r\");\n"}]}}],"owner":"dblsaiko","repo":"nix-plugin-pijul","token":"bGrGyhVBgt4uf55GYaGklrv5NCh5Ju8J9ByMp2vIWTA=","login":null}

…

Dependencies

Change contents