comparison src/hgrunner.cpp @ 691:5b3bcb2d0943

Update handling of auth extension load failures on Windows: hg itself is returning a successful error code, so we must check the output in the extension test phase. Also fix a failure & crash when trying to use fallback auth mechanism

 #include <process.h>
 #endif
 
 HgRunner::HgRunner(QString myDirPath, QWidget *parent) :
     QWidget(parent),
-    m_myDirPath(myDirPath)
+    m_myDirPath(myDirPath),
+    m_ptyFile(0)
 {
     QGridLayout *layout = new QGridLayout(this);
     layout->setMargin(0);
 
     m_progress = new QProgressBar;

         bool ok = false;
         QString prompt = tr("User name:");
         if (m_realm != "") {
             prompt = tr("User name for \"%1\":").arg(m_realm);
         }
-        QString pwd = QInputDialog::getText
+        QString name = QInputDialog::getText
             (qobject_cast<QWidget *>(parent()),
             tr("Enter user name"), prompt,
             QLineEdit::Normal, QString(), &ok);
         if (ok) {
-            m_ptyFile->write(QString("%1\n").arg(pwd).toUtf8());
+            m_ptyFile->write(QString("%1\n").arg(name).toUtf8());
             m_ptyFile->flush();
             return;
         } else {
             DEBUG << "HgRunner::getUsername: user cancelled" << endl;
             killCurrentCommand();
             return;
         }
+    } else { // usual on win32
+        DEBUG << "HgRunner::getUsername: can't handle without pty" << endl;
+        emit commandFailed(m_currentAction, "", "Host requires authentication, but we can't handle that without the EasyHg extension loaded");
     }
     // user cancelled or something went wrong
     DEBUG << "HgRunner::getUsername: something went wrong" << endl;
     killCurrentCommand();
 }

                          .arg(m_userName);
             }
         }
         QString pwd = QInputDialog::getText
             (qobject_cast<QWidget *>(parent()),
-            tr("Enter password"), prompt,
+             tr("Enter password"), prompt,
              QLineEdit::Password, QString(), &ok);
         if (ok) {
             m_ptyFile->write(QString("%1\n").arg(pwd).toUtf8());
             m_ptyFile->flush();
             return;
         } else {
             DEBUG << "HgRunner::getPassword: user cancelled" << endl;
             killCurrentCommand();
             return;
         }
+    } else { // usual on win32
+        DEBUG << "HgRunner::getPassword: can't handle without pty" << endl;
+        emit commandFailed(m_currentAction, "", "Host requires authentication, but we can't handle that without the EasyHg extension loaded");
     }
     // user cancelled or something went wrong
     DEBUG << "HgRunner::getPassword: something went wrong" << endl;
     killCurrentCommand();
 }

 
     if (completedAction.action == ACT_NONE) {
         DEBUG << "HgRunner::finished: WARNING: completed action is ACT_NONE" << endl;
     } else {
         if (procExitCode == 0 && procExitStatus == QProcess::NormalExit) {
-            DEBUG << "HgRunner::finished: Command completed successfully"
-                  << endl;
+            DEBUG << "HgRunner::finished: Command completed successfully" << endl;
 //            DEBUG << "stdout is " << m_stdout << endl;
-            emit commandCompleted(completedAction, m_stdout);
+            emit commandCompleted(completedAction, m_stdout, m_stderr);
         } else {
             DEBUG << "HgRunner::finished: Command failed, exit code "
                   << procExitCode << ", exit status " << int(procExitStatus)
                   << ", stderr follows" << endl;
             DEBUG << m_stderr << endl;
-            emit commandFailed(completedAction, m_stderr, m_stdout);
+            emit commandFailed(completedAction, m_stdout, m_stderr);
         }
     }
 
     checkQueue();
 }

 
 void HgRunner::startCommand(HgAction action)
 {
     if (action.workingDir.isEmpty()) {
         // We require a working directory, never just operate in pwd
-        emit commandFailed(action, "EasyMercurial: No working directory supplied, will not run Mercurial command without one", "");
+        emit commandFailed(action, "", "EasyMercurial: No working directory supplied, will not run Mercurial command without one");
         return;
     }
 
     m_isRunning = true;
     m_progress->setRange(0, 0);