AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Increased robustness in the stash parsing

Browse Source 
FossilOrigin-Name: ce3816871d40d08821944aa58329baf993fcb688
This commit is contained in:
kostas
2012-04-22 05:57:52 +00:00
parent ef4945494c
commit dbaf78d164
3 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
MainWindow.cpp
View File

@ -664,26 +664,37 @@ void MainWindow::scanWorkspace()
if(!runFossil(QStringList() << "stash" << "ls", &res, RUNGLAGS_SILENT_ALL))
return;
for(QStringList::iterator line_it=res.begin(); line_it!=res.end(); ++line_it)
{
QString l = (*line_it).trimmed();
int colon = l.indexOf(':');
// 19: [5c46757d4b9765] on 2012-04-22 04:41:15
QRegExp stash_rx("\\s*(\\d+):\\s+\\[(.*)\\] on (\\d+)-(\\d+)-(\\d+) (\\d+):(\\d+):(\\d+)", Qt::CaseInsensitive);
// When no colon we have no stash to process
if(colon==-1)
for(QStringList::iterator line_it=res.begin(); line_it!=res.end();)
{
QString line = *line_it;
int index = stash_rx.indexIn(line);
if(index==-1)
break;
QString id = l.left(colon);
QString id = stash_rx.cap(1);
// Parse stash name
++line_it;
line = *line_it;
// Invalid stash, exit
if(line_it==res.end())
break;
// Named stash
QString name;
// Finish at an anonymous stash or start of a new stash
if(line_it==res.end() || stash_rx.indexIn(line)!=-1)
{
name = tr("Stash %1").arg(id);
}
else
{
name = (*line_it);
name = name.trimmed();
++line_it;
}
QString name = (*line_it);
name = name.trimmed();
stashMap.insert(name, id);
}