Feedback
- Improved feedback when announcing 'depends' attirubte changes. Now uses task IDs instead of UUIDs, resulting in a shorter, clearer message (thanks to Peter De Poorter).
This commit is contained in:
64
src/util.cpp
64
src/util.cpp
@@ -371,22 +371,62 @@ std::string taskDifferences (const Task& before, const Task& after)
|
|||||||
<< " will be deleted.\n";
|
<< " will be deleted.\n";
|
||||||
|
|
||||||
foreach (name, afterOnly)
|
foreach (name, afterOnly)
|
||||||
out << " - "
|
{
|
||||||
<< *name
|
if (*name == "depends")
|
||||||
<< " will be set to '"
|
{
|
||||||
<< renderAttribute (*name, after.get (*name))
|
std::vector <int> deps_after;
|
||||||
<< "'.\n";
|
after.getDependencies (deps_after);
|
||||||
|
std::string to;
|
||||||
|
join (to, ",", deps_after);
|
||||||
|
|
||||||
|
out << " - "
|
||||||
|
<< *name
|
||||||
|
<< " will be set to '"
|
||||||
|
<< to
|
||||||
|
<< "'.\n";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
out << " - "
|
||||||
|
<< *name
|
||||||
|
<< " will be set to '"
|
||||||
|
<< renderAttribute (*name, after.get (*name))
|
||||||
|
<< "'.\n";
|
||||||
|
}
|
||||||
|
|
||||||
foreach (name, beforeAtts)
|
foreach (name, beforeAtts)
|
||||||
if (*name != "uuid" &&
|
if (*name != "uuid" &&
|
||||||
before.get (*name) != after.get (*name))
|
before.get (*name) != after.get (*name))
|
||||||
out << " - "
|
{
|
||||||
<< *name
|
if (*name == "depends")
|
||||||
<< " will be changed from '"
|
{
|
||||||
<< renderAttribute (*name, before.get (*name))
|
std::vector <int> deps_before;
|
||||||
<< "' to '"
|
before.getDependencies (deps_before);
|
||||||
<< renderAttribute (*name, after.get (*name))
|
std::string from;
|
||||||
<< "'.\n";
|
join (from, ",", deps_before);
|
||||||
|
|
||||||
|
std::vector <int> deps_after;
|
||||||
|
after.getDependencies (deps_after);
|
||||||
|
std::string to;
|
||||||
|
join (to, ",", deps_after);
|
||||||
|
|
||||||
|
out << " - "
|
||||||
|
<< *name
|
||||||
|
<< " will be changed from '"
|
||||||
|
<< from
|
||||||
|
<< "' to '"
|
||||||
|
<< to
|
||||||
|
<< "'.\n";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
out << " - "
|
||||||
|
<< *name
|
||||||
|
<< " will be changed from '"
|
||||||
|
<< renderAttribute (*name, before.get (*name))
|
||||||
|
<< "' to '"
|
||||||
|
<< renderAttribute (*name, after.get (*name))
|
||||||
|
<< "'.\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Shouldn't just say nothing.
|
// Shouldn't just say nothing.
|
||||||
if (out.str ().length () == 0)
|
if (out.str ().length () == 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user