foreach (Rules::Repository::Branch branchRule, rule.branches) {
Branch branch;
branch.branchFrom = branchRule.branchFrom;
+ if (!branch.branchFrom.startsWith("refs/heads/"))
+ branch.branchFrom.prepend("refs/heads/");
branch.isCreated = false;
branches.insert(branchRule.name, branch);
Repository::~Repository()
{
- if (fastImport.state() == QProcess::Running) {
+ if (fastImport.state() != QProcess::NotRunning) {
fastImport.closeWriteChannel();
fastImport.waitForFinished();
}
int revnum)
{
if (!branches.contains(branch)) {
- qCritical() << branch << "is not known in repository" << name;
+ qCritical() << branch << "is not a known branch in repository" << name;
return 0;
}
QByteArray message = log;
if (!message.endsWith('\n'))
message += '\n';
- message += "\nsvn=" + svnprefix + "; revision=" + QByteArray::number(revnum) + "\n";
+ message += "\nsvn path=" + svnprefix + "; revision=" + QByteArray::number(revnum) + "\n";
{
QByteArray branchRef = branch;