forked from lix-project/lix
Remove the --xml
query command option
The `--graphml` option can be used instead.
This commit is contained in:
parent
73c2ae43f0
commit
d506342aa2
|
@ -8,7 +8,6 @@
|
||||||
#include "shared.hh"
|
#include "shared.hh"
|
||||||
#include "util.hh"
|
#include "util.hh"
|
||||||
#include "worker-protocol.hh"
|
#include "worker-protocol.hh"
|
||||||
#include "xmlgraph.hh"
|
|
||||||
#include "graphml.hh"
|
#include "graphml.hh"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -274,7 +273,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
|
||||||
enum QueryType
|
enum QueryType
|
||||||
{ qDefault, qOutputs, qRequisites, qReferences, qReferrers
|
{ qDefault, qOutputs, qRequisites, qReferences, qReferrers
|
||||||
, qReferrersClosure, qDeriver, qBinding, qHash, qSize
|
, qReferrersClosure, qDeriver, qBinding, qHash, qSize
|
||||||
, qTree, qGraph, qXml, qGraphML, qResolve, qRoots };
|
, qTree, qGraph, qGraphML, qResolve, qRoots };
|
||||||
QueryType query = qDefault;
|
QueryType query = qDefault;
|
||||||
bool useOutput = false;
|
bool useOutput = false;
|
||||||
bool includeOutputs = false;
|
bool includeOutputs = false;
|
||||||
|
@ -300,7 +299,6 @@ static void opQuery(Strings opFlags, Strings opArgs)
|
||||||
else if (i == "--size") query = qSize;
|
else if (i == "--size") query = qSize;
|
||||||
else if (i == "--tree") query = qTree;
|
else if (i == "--tree") query = qTree;
|
||||||
else if (i == "--graph") query = qGraph;
|
else if (i == "--graph") query = qGraph;
|
||||||
else if (i == "--xml") query = qXml;
|
|
||||||
else if (i == "--graphml") query = qGraphML;
|
else if (i == "--graphml") query = qGraphML;
|
||||||
else if (i == "--resolve") query = qResolve;
|
else if (i == "--resolve") query = qResolve;
|
||||||
else if (i == "--roots") query = qRoots;
|
else if (i == "--roots") query = qRoots;
|
||||||
|
@ -405,16 +403,6 @@ static void opQuery(Strings opFlags, Strings opArgs)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case qXml: {
|
|
||||||
PathSet roots;
|
|
||||||
for (auto & i : opArgs) {
|
|
||||||
PathSet paths = maybeUseOutputs(store->followLinksToStorePath(i), useOutput, forceRealise);
|
|
||||||
roots.insert(paths.begin(), paths.end());
|
|
||||||
}
|
|
||||||
printXmlGraph(ref<Store>(store), roots);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case qGraphML: {
|
case qGraphML: {
|
||||||
PathSet roots;
|
PathSet roots;
|
||||||
for (auto & i : opArgs) {
|
for (auto & i : opArgs) {
|
||||||
|
|
|
@ -1,66 +0,0 @@
|
||||||
#include "xmlgraph.hh"
|
|
||||||
#include "util.hh"
|
|
||||||
#include "store-api.hh"
|
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
|
|
||||||
using std::cout;
|
|
||||||
|
|
||||||
namespace nix {
|
|
||||||
|
|
||||||
|
|
||||||
static inline const string & xmlQuote(const string & s)
|
|
||||||
{
|
|
||||||
// Luckily, store paths shouldn't contain any character that needs to be
|
|
||||||
// quoted.
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static string makeEdge(const string & src, const string & dst)
|
|
||||||
{
|
|
||||||
format f = format(" <edge src=\"%1%\" dst=\"%2%\"/>\n")
|
|
||||||
% xmlQuote(src) % xmlQuote(dst);
|
|
||||||
return f.str();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static string makeNode(const string & id)
|
|
||||||
{
|
|
||||||
format f = format(" <node name=\"%1%\"/>\n") % xmlQuote(id);
|
|
||||||
return f.str();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void printXmlGraph(ref<Store> store, const PathSet & roots)
|
|
||||||
{
|
|
||||||
PathSet workList(roots);
|
|
||||||
PathSet doneSet;
|
|
||||||
|
|
||||||
cout << "<?xml version='1.0' encoding='utf-8'?>\n"
|
|
||||||
<< "<nix>\n";
|
|
||||||
|
|
||||||
while (!workList.empty()) {
|
|
||||||
Path path = *(workList.begin());
|
|
||||||
workList.erase(path);
|
|
||||||
|
|
||||||
if (doneSet.find(path) != doneSet.end()) continue;
|
|
||||||
doneSet.insert(path);
|
|
||||||
|
|
||||||
cout << makeNode(path);
|
|
||||||
|
|
||||||
for (auto & p : store->queryPathInfo(path)->references) {
|
|
||||||
if (p != path) {
|
|
||||||
workList.insert(p);
|
|
||||||
cout << makeEdge(p, path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
cout << "</nix>\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,11 +0,0 @@
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "types.hh"
|
|
||||||
|
|
||||||
namespace nix {
|
|
||||||
|
|
||||||
class Store;
|
|
||||||
|
|
||||||
void printXmlGraph(ref<Store> store, const PathSet & roots);
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in a new issue