From a9b9930b02bcf8fae908ea5a1d2d1a18bc362cac Mon Sep 17 00:00:00 2001 From: Marc Guenther Date: Fri, 16 Apr 2010 17:34:15 +0200 Subject: error message and exit when rules file cannot be read --- src/ruleparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ruleparser.cpp b/src/ruleparser.cpp index 905115c..9a83203 100644 --- a/src/ruleparser.cpp +++ b/src/ruleparser.cpp @@ -44,7 +44,7 @@ void Rules::load() { QFile file(filename); if (!file.open(QIODevice::ReadOnly)) - return; + qFatal("Could not read the rules file: %s", qPrintable(filename)); // initialize the regexps we will use QRegExp repoLine("create repository\\s+(\\S+)", Qt::CaseInsensitive); -- cgit v1.2.1 From b886ca85875859e7a3dd98aaf087abe9365c0646 Mon Sep 17 00:00:00 2001 From: Marc Guenther Date: Tue, 20 Apr 2010 22:45:14 +0200 Subject: small typo in debug message --- src/repository.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/repository.cpp b/src/repository.cpp index 922027d..d589b6e 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -67,7 +67,7 @@ Repository::Repository(const Rules::Repository &rule) fastImport.setWorkingDirectory(name); if (!CommandLineParser::instance()->contains("dry-run")) { if (!QDir(name).exists()) { // repo doesn't exist yet. - qDebug() << "Creating new repositoryn" << name; + qDebug() << "Creating new repository" << name; QDir::current().mkpath(name); QProcess init; init.setWorkingDirectory(name); -- cgit v1.2.1 From 03e7d518f73053d56b240917f3b0a412d30d47db Mon Sep 17 00:00:00 2001 From: Pavel Plesov Date: Tue, 18 May 2010 03:12:19 +0400 Subject: Fix broken utf-8 filenames. --- src/svn.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/svn.cpp b/src/svn.cpp index bb00214..604ddf1 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -322,7 +322,7 @@ static int recursiveDumpDir(Repository::Transaction *txn, svn_fs_root_t *fs_root svn_fs_dirent_t *dirent = reinterpret_cast(value); QByteArray entryName = pathname + '/' + dirent->name; - QString entryFinalName = finalPathName + dirent->name; + QString entryFinalName = finalPathName + QString::fromUtf8(dirent->name); if (dirent->kind == svn_node_dir) { entryFinalName += '/'; -- cgit v1.2.1