-Complete the fix of #1056 by having CmdSummary print abstract parent
 names and not prefix children project names with parent project names.
-Unit tests for above.
This commit is contained in:
Scott Kostyshak 2012-09-24 05:47:11 -04:00 committed by Paul Beckingham
parent be5dc8ab90
commit 9fb15b0d7d
3 changed files with 153 additions and 0 deletions

View file

@ -27,6 +27,7 @@
#define L10N // Localization complete.
#include <algorithm>
#include <sstream>
#include <stdlib.h>
#include <Context.h>
@ -130,11 +131,25 @@ int CmdSummary::execute (std::string& output)
Color bg_color (context.config.get ("color.summary.background"));
int barWidth = 30;
std::vector <std::string> processed;
std::map <std::string, bool>::iterator i;
for (i = allProjects.begin (); i != allProjects.end (); ++i)
{
if (countPending[i->first] > 0)
{
const std::vector <std::string> parents = extractParents (i->first);
std::vector <std::string>::const_iterator parent;
for (parent = parents.begin (); parent != parents.end (); parent++)
{
if (std::find (processed.begin (), processed.end (), *parent)
== processed.end ())
{
int row = view.addRow ();
view.set (row, 0, indentProject (*parent));
processed.push_back (*parent);
}
}
int row = view.addRow ();
view.set (row, 0, (i->first == ""
? STRING_CMD_SUMMARY_NONE
@ -165,6 +180,7 @@ int CmdSummary::execute (std::string& output)
char percent[12];
sprintf (percent, "%d%%", 100 * c / (c + p));
view.set (row, 3, percent);
processed.push_back (i->first);
}
}