comparison hgrunner.cpp @ 114:bb2d2eecdd60

* minor output fixes
author Chris Cannam
date Fri, 26 Nov 2010 21:17:24 +0000
parents 5fc7b4fc77a8
children 78374cefa10f
comparison
equal deleted inserted replaced
113:5fc7b4fc77a8 114:bb2d2eecdd60
48 } 48 }
49 49
50 HgRunner::~HgRunner() 50 HgRunner::~HgRunner()
51 { 51 {
52 closeTerminal(); 52 closeTerminal();
53 delete m_proc; 53 if (m_proc) delete m_proc;
54 } 54 }
55 55
56 void HgRunner::requestAction(HgAction action) 56 void HgRunner::requestAction(HgAction action)
57 { 57 {
58 DEBUG << "requestAction " << action.action << endl; 58 DEBUG << "requestAction " << action.action << endl;
243 DEBUG << "HgRunner::finished: WARNING: completed action is ACT_NONE" << endl; 243 DEBUG << "HgRunner::finished: WARNING: completed action is ACT_NONE" << endl;
244 } else { 244 } else {
245 if (procExitCode == 0 && procExitStatus == QProcess::NormalExit) { 245 if (procExitCode == 0 && procExitStatus == QProcess::NormalExit) {
246 DEBUG << "HgRunner::finished: Command completed successfully" 246 DEBUG << "HgRunner::finished: Command completed successfully"
247 << endl; 247 << endl;
248 DEBUG << "stdout is " << m_stdout << endl;
248 emit commandCompleted(completedAction, m_stdout); 249 emit commandCompleted(completedAction, m_stdout);
249 } else { 250 } else {
250 DEBUG << "HgRunner::finished: Command failed, exit code " 251 DEBUG << "HgRunner::finished: Command failed, exit code "
251 << procExitCode << ", exit status " << procExitStatus 252 << procExitCode << ", exit status " << procExitStatus
252 << ", stderr follows" << endl; 253 << ", stderr follows" << endl;
336 if (interactive) { 337 if (interactive) {
337 openTerminal(); 338 openTerminal();
338 if (m_ptySlaveFilename != "") { 339 if (m_ptySlaveFilename != "") {
339 DEBUG << "HgRunner: connecting to pseudoterminal" << endl; 340 DEBUG << "HgRunner: connecting to pseudoterminal" << endl;
340 m_proc->setStandardInputFile(m_ptySlaveFilename); 341 m_proc->setStandardInputFile(m_ptySlaveFilename);
341 m_proc->setStandardOutputFile(m_ptySlaveFilename); 342 // m_proc->setStandardOutputFile(m_ptySlaveFilename);
342 // m_proc->setStandardErrorFile(m_ptySlaveFilename); 343 // m_proc->setStandardErrorFile(m_ptySlaveFilename);
343 } 344 }
344 } 345 }
345 346
346 QString cmdline = executable; 347 QString cmdline = executable;