comparison src/mainwindow.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

     createStatusBar();
 
     m_runner = new HgRunner(m_myDirPath, this);
     connect(m_runner, SIGNAL(commandStarting(HgAction)),
             this, SLOT(commandStarting(HgAction)));
-    connect(m_runner, SIGNAL(commandCompleted(HgAction, QString)),
-            this, SLOT(commandCompleted(HgAction, QString)));
+    connect(m_runner, SIGNAL(commandCompleted(HgAction, QString, QString)),
+            this, SLOT(commandCompleted(HgAction, QString, QString)));
     connect(m_runner, SIGNAL(commandFailed(HgAction, QString, QString)),
             this, SLOT(commandFailed(HgAction, QString, QString)));
     connect(m_runner, SIGNAL(commandCancelled(HgAction)),
             this, SLOT(commandCancelled(HgAction)));
     statusBar()->addPermanentWidget(m_runner);

 void MainWindow::commandStarting(HgAction)
 {
     m_commandSequenceInProgress = true;
 }
 
-void MainWindow::commandFailed(HgAction action, QString stdErr, QString stdOut)
+void MainWindow::commandFailed(HgAction action, QString stdOut, QString stdErr)
 {
     DEBUG << "MainWindow::commandFailed" << endl;
 
     m_commandSequenceInProgress = false;
 

             // ignore this, user cancelled username or password dialog
             return;
         } else if (stdErr.contains("no changes found") || stdOut.contains("no changes found")) {
             // success: hg 2.1 starts returning failure code for empty pull/push
             m_commandSequenceInProgress = true; // there may be further commands
-            commandCompleted(action, stdOut);
+            commandCompleted(action, stdOut, stdErr);
             return;
         }
         break; // go on to default report
     case ACT_PUSH:
         if (stdErr.contains("creates new remote head")) {

             // ignore this, user cancelled username or password dialog
             return;
         } else if (stdErr.contains("no changes found") || stdOut.contains("no changes found")) {
             // success: hg 2.1 starts returning failure code for empty pull/push
             m_commandSequenceInProgress = true; // there may be further commands
-            commandCompleted(action, stdOut);
+            commandCompleted(action, stdOut, stdErr);
             return;
         }
         break; // go on to default report
     case ACT_QUERY_HEADS_ACTIVE:
     case ACT_QUERY_HEADS:
         // fails if repo is empty; we don't care (if there's a genuine
         // problem, something else will fail too).  Pretend it
         // succeeded, so that any further actions that are contingent
         // on the success of the heads query get carried out properly.
         m_commandSequenceInProgress = true; // there may be further commands
-        commandCompleted(action, "");
+        commandCompleted(action, "", "");
         return;
     case ACT_FOLDERDIFF:
     case ACT_CHGSETDIFF:
         // external program, unlikely to be anything useful in stdErr
         // and some return with failure codes when something as basic

           tr("A Mercurial command failed to run correctly.  This may indicate an installation problem or some other problem with EasyMercurial.") :
           tr("A Mercurial command failed to run correctly.  This may indicate an installation problem or some other problem with EasyMercurial.<br><br>See &ldquo;More Details&rdquo; for the command output.")),
          stdErr);
 }
 
-void MainWindow::commandCompleted(HgAction completedAction, QString output)
+void MainWindow::commandCompleted(HgAction completedAction, QString output, QString stdErr)
 {
 //    std::cerr << "commandCompleted: " << completedAction.action << std::endl;
 
     HGACTIONS action = completedAction.action;
 

         }
         break;
     }
 
     case ACT_TEST_HG_EXT:
+        if (stdErr.contains("Failed to load PyQt")) {
+            commandFailed(completedAction, output, stdErr);
+            return;
+        }
         break;
 
     case ACT_QUERY_PATHS:
     {
         DEBUG << "stdout is " << output << endl;

             foreach (QString line, outList) {
                 if (!line.startsWith("R ")) winnowed.push_back(line);
             }
             output = winnowed.join("\n");
         }
+        /*
         DEBUG << "m_lastStatOutput = " << m_lastStatOutput << endl;
         DEBUG << "resolve output = " << output << endl;
+        */
         m_hgTabs->updateWorkFolderFileList(m_lastStatOutput + output);
         break;
 
     case ACT_RESOLVE_MARK:
         m_shouldHgStat = true;