Skip to content

Commit 6b987ad

Browse files
committed
Revert "Error out if error happens in fast import process"
This reverts commit 58839fa.
1 parent 71d254e commit 6b987ad

File tree

2 files changed

+12
-22
lines changed

2 files changed

+12
-22
lines changed

src/repository.cpp

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,6 @@ static const int maxSimultaneousProcesses = 100;
3030
typedef unsigned long long mark_t;
3131
static const mark_t maxMark = ULONG_MAX;
3232

33-
LoggingQProcess::LoggingQProcess(const QString filename)
34-
: QProcess(), log()
35-
{
36-
if(CommandLineParser::instance()->contains("debug-rules")) {
37-
logging = true;
38-
QString name = filename;
39-
name.replace('/', '_');
40-
name.prepend("gitlog-");
41-
log.setFileName(name);
42-
log.open(QIODevice::WriteOnly);
43-
} else {
44-
logging = false;
45-
}
46-
47-
// Trigger a crictical error if any error in the process happens
48-
connect(this, &QProcess::errorOccurred, this,
49-
[this](QProcess::ProcessError error) {
50-
qCritical() << "Error happened in fast import process, error code: '" << error <<"'";
51-
});
52-
};
53-
5433
class FastImportRepository : public Repository
5534
{
5635
public:

src/repository.h

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,18 @@ class LoggingQProcess : public QProcess
3131
QFile log;
3232
bool logging;
3333
public:
34-
LoggingQProcess(const QString filename);
34+
LoggingQProcess(const QString filename) : QProcess(), log() {
35+
if(CommandLineParser::instance()->contains("debug-rules")) {
36+
logging = true;
37+
QString name = filename;
38+
name.replace('/', '_');
39+
name.prepend("gitlog-");
40+
log.setFileName(name);
41+
log.open(QIODevice::WriteOnly);
42+
} else {
43+
logging = false;
44+
}
45+
};
3546
~LoggingQProcess() {
3647
if(logging) {
3748
log.close();

0 commit comments

Comments
 (0)