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

Address Fossil weirdness which treats all closed branches as active tags with a special "closed" attribute

Browse Source 
FossilOrigin-Name: 51d26d1e0912e6da939e9a48f0357847acd1501a
This commit is contained in:
kostas
2015-07-23 17:22:30 +00:00
parent 1607710731
commit 92ccbb10ab
3 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Fossil.cpp
View File

@@ -521,18 +521,42 @@ bool Fossil::tagList(QStringMap& tags)
info.clear();
if(!runFossil(QStringList() << "info" << "tag:"+tag, &info, RUNFLAGS_SILENT_ALL))
// Use "whatis" instead of "info" to get extra information like the closed raw-tag
if(!runFossil(QStringList() << "whatis" << "tag:"+tag, &info, RUNFLAGS_SILENT_ALL))
return false;
/*
name: tag:refactor
artifact: 54059126aee6bb232373c1f134cc07ea0a6f4cca
size: 15831 bytes
tags: refactor
raw-tags: closed
type: Check-in by kostas on 2015-04-30 19:23:15
comment: Renamed tableView to fileTableView Renamed treeView to workspaceTreeView Renamed
tableViewStash to stashTableView
*/
QStringMap props;
ParseProperties(props, info, ':');
Q_ASSERT(props.contains("uuid"));
// uuid: 0e29a46f036d2e0cc89727190ad34c2dfdc5737c 2015-04-27 15:41:45 UTC
QStringList uuid = props["uuid"].trimmed().split(' ');
Q_ASSERT(uuid.length()>0);
bool closed = false;
if(props.contains("raw-tags"))
{
QString raw_tags = props["raw-tags"];
closed = raw_tags.indexOf("closed") != -1;
}
// Skip closed tags, which are essentially closed branches.
// FIXME: Fossil treating listing all closed branches as active tags with a "closed"
// "raw-tag" seems weird. Maybe this will change at some point. Re-evaluate this
// behaviour in the future.
if(closed)
continue;
Q_ASSERT(props.contains("artifact"));
QString revision = props["artifact"];
Q_ASSERT(!revision.isEmpty());
QString revision = uuid[0].trimmed();
tags.insert(tag, revision);
}
return true;