comparison mainwindow.cpp @ 150:fb697ce0f625

* Attempt to make the sequence of hg commands after a change more rational; avoid incremental log if heads unchanged

     params << Changeset::getLogTemplate();
     
     runner->requestAction(HgAction(ACT_LOG, workFolderPath, params));
 }
 
-void MainWindow::hgLogIncremental()
+void MainWindow::hgLogIncremental(QStringList prune)
 {
     QStringList params;
     params << "log";
 
-    foreach (Changeset *head, currentHeads) {
-        int n = head->number();
-        params << "--prune" << QString("%1").arg(n);
+    foreach (QString p, prune) {
+        params << "--prune" << p;
     }
         
     params << "--template";
     params << Changeset::getLogTemplate();
     

              .arg(xmlEncode(output.left(800))
                   .replace("\n", "<br>"))
              : "");
 
     QMessageBox::warning(this, tr("Command failed"), message);
-}
-
-void MainWindow::commandCompleted(HgAction completedAction, QString output)
-{
-    bool shouldHgStat = false;
-
-    HGACTIONS action = completedAction.action;
-
-    if (action == ACT_NONE) return;
-
-    switch(action) {
-
-    case ACT_QUERY_PATHS:
-    {
-        DEBUG << "stdout is " << output << endl;
-        LogParser lp(output, "=");
-        LogList ll = lp.parse();
-        DEBUG << ll.size() << " results" << endl;
-        if (!ll.empty()) {
-            remoteRepoPath = lp.parse()[0]["default"].trimmed();
-            DEBUG << "Set remote path to " << remoteRepoPath << endl;
-        }
-        MultiChoiceDialog::addRecentArgument("local", workFolderPath);
-        MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath);
-        hgTabs->setWorkFolderAndRepoNames(workFolderPath, remoteRepoPath);
-        break;
-    }
-
-    case ACT_QUERY_BRANCH:
-        currentBranch = output.trimmed();
-        break;
-
-    case ACT_STAT:
-        hgTabs->updateWorkFolderFileList(output);
-        updateFileSystemWatcher();
-        break;
-        
-    case ACT_INCOMING:
-        showIncoming(output);
-        break;
-
-    case ACT_ANNOTATE:
-    case ACT_RESOLVE_LIST:
-    case ACT_RESOLVE_MARK:
-        presentLongStdoutToUser(output);
-        shouldHgStat = true;
-        break;
-        
-    case ACT_PULL:
-        showPullResult(output);
-        shouldHgStat = true;
-        break;
-        
-    case ACT_PUSH:
-        showPushResult(output);
-        break;
-        
-    case ACT_INIT:
-        MultiChoiceDialog::addRecentArgument("init", workFolderPath);
-        MultiChoiceDialog::addRecentArgument("local", workFolderPath);
-        enableDisableActions();
-        shouldHgStat = true;
-        break;
-        
-    case ACT_CLONEFROMREMOTE:
-        MultiChoiceDialog::addRecentArgument("local", workFolderPath);
-        MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath);
-        MultiChoiceDialog::addRecentArgument("remote", workFolderPath, true);
-        QMessageBox::information(this, "Clone", output);
-        enableDisableActions();
-        shouldHgStat = true;
-        break;
-        
-    case ACT_LOG:
-        hgTabs->setNewLog(output);
-        needNewLog = false;
-        break;
-        
-    case ACT_LOG_INCREMENTAL:
-        hgTabs->addIncrementalLog(output);
-        break;
-        
-    case ACT_QUERY_PARENTS:
-        foreach (Changeset *cs, currentParents) delete cs;
-        currentParents = Changeset::parseChangesets(output);
-        break;
-        
-    case ACT_QUERY_HEADS:
-        foreach (Changeset *cs, currentHeads) delete cs;
-        currentHeads = Changeset::parseChangesets(output);
-        break;
-
-    case ACT_COMMIT:
-        hgTabs->clearSelections();
-        shouldHgStat = true;
-        break;
-        
-    case ACT_REMOVE:
-    case ACT_ADD:
-    case ACT_REVERT:
-        hgTabs->clearSelections();
-        shouldHgStat = true;
-        break;
-
-    case ACT_FILEDIFF:
-    case ACT_FOLDERDIFF:
-    case ACT_CHGSETDIFF:
-    case ACT_SERVE:
-    case ACT_TAG:
-    case ACT_HG_IGNORE:
-        shouldHgStat = true;
-        break;
-        
-    case ACT_UPDATE:
-        QMessageBox::information(this, tr("Update"), output);
-        shouldHgStat = true;
-        break;
-        
-    case ACT_MERGE:
-        QMessageBox::information(this, tr("Merge"), output);
-        shouldHgStat = true;
-        justMerged = true;
-        break;
-        
-    case ACT_RETRY_MERGE:
-        QMessageBox::information(this, tr("Merge retry"), tr("Merge retry successful."));
-        shouldHgStat = true;
-        justMerged = true;
-        break;
-        
-    default:
-        break;
-    }
-
-    enableDisableActions();
-
-    // Sequence when no full log required:
-    //   paths -> branch -> stat -> incremental-log -> heads -> parents
-    // Sequence when full log required:
-    //   paths -> branch -> stat -> heads -> parents -> log
-    if (action == ACT_QUERY_PATHS) {
-        hgQueryBranch();
-    } else if (action == ACT_QUERY_BRANCH) {
-        hgStat();
-    } else if (action == ACT_STAT) {
-        if (!needNewLog) {
-            hgLogIncremental();
-        } else {
-            hgQueryHeads();
-        }
-    } else if (action == ACT_LOG_INCREMENTAL) {
-        hgQueryHeads();
-    } else if (action == ACT_QUERY_HEADS) {
-        hgQueryParents();
-    } else if (action == ACT_QUERY_PARENTS) {
-        if (needNewLog) {
-            hgLog();
-        }
-    } else 
-/* Move to commandFailed
+
+/* todo:
 if ((runningAction == ACT_MERGE) && (exitCode != 0))
             {
                 // If we had a failed merge, offer to retry
                 if (QMessageBox::Ok == QMessageBox::information(this, tr("Retry merge ?"), tr("Merge attempt failed. retry ?"), QMessageBox::Ok | QMessageBox::Cancel))
                 {

                 }
             }
             else
             {
 */
+}
+
+void MainWindow::commandCompleted(HgAction completedAction, QString output)
+{
+    HGACTIONS action = completedAction.action;
+
+    if (action == ACT_NONE) return;
+
+    bool shouldHgStat = false;
+    bool headsChanged = false;
+    QStringList oldHeadIds;
+
+    switch (action) {
+
+    case ACT_QUERY_PATHS:
+    {
+        DEBUG << "stdout is " << output << endl;
+        LogParser lp(output, "=");
+        LogList ll = lp.parse();
+        DEBUG << ll.size() << " results" << endl;
+        if (!ll.empty()) {
+            remoteRepoPath = lp.parse()[0]["default"].trimmed();
+            DEBUG << "Set remote path to " << remoteRepoPath << endl;
+        }
+        MultiChoiceDialog::addRecentArgument("local", workFolderPath);
+        MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath);
+        hgTabs->setWorkFolderAndRepoNames(workFolderPath, remoteRepoPath);
+        break;
+    }
+
+    case ACT_QUERY_BRANCH:
+        currentBranch = output.trimmed();
+        break;
+
+    case ACT_STAT:
+        hgTabs->updateWorkFolderFileList(output);
+        updateFileSystemWatcher();
+        break;
+        
+    case ACT_INCOMING:
+        showIncoming(output);
+        break;
+
+    case ACT_ANNOTATE:
+    case ACT_RESOLVE_LIST:
+    case ACT_RESOLVE_MARK:
+        presentLongStdoutToUser(output);
+        shouldHgStat = true;
+        break;
+        
+    case ACT_PULL:
+        showPullResult(output);
+        shouldHgStat = true;
+        break;
+        
+    case ACT_PUSH:
+        showPushResult(output);
+        break;
+        
+    case ACT_INIT:
+        MultiChoiceDialog::addRecentArgument("init", workFolderPath);
+        MultiChoiceDialog::addRecentArgument("local", workFolderPath);
+        enableDisableActions();
+        shouldHgStat = true;
+        break;
+        
+    case ACT_CLONEFROMREMOTE:
+        MultiChoiceDialog::addRecentArgument("local", workFolderPath);
+        MultiChoiceDialog::addRecentArgument("remote", remoteRepoPath);
+        MultiChoiceDialog::addRecentArgument("remote", workFolderPath, true);
+        QMessageBox::information(this, "Clone", output);
+        enableDisableActions();
+        shouldHgStat = true;
+        break;
+        
+    case ACT_LOG:
+        hgTabs->setNewLog(output);
+        needNewLog = false;
+        break;
+        
+    case ACT_LOG_INCREMENTAL:
+        hgTabs->addIncrementalLog(output);
+        break;
+        
+    case ACT_QUERY_PARENTS:
+        foreach (Changeset *cs, currentParents) delete cs;
+        currentParents = Changeset::parseChangesets(output);
+        break;
+        
+    case ACT_QUERY_HEADS:
+    {
+        oldHeadIds = Changeset::getIds(currentHeads);
+        Changesets newHeads = Changeset::parseChangesets(output);
+        QStringList newHeadIds = Changeset::getIds(newHeads);
+        if (oldHeadIds != newHeadIds) {
+            DEBUG << "Heads changed, will prompt an incremental log if appropriate" << endl;
+            headsChanged = true;
+            foreach (Changeset *cs, currentHeads) delete cs;
+            currentHeads = newHeads;
+        }
+    }
+        break;
+
+    case ACT_COMMIT:
+        hgTabs->clearSelections();
+        shouldHgStat = true;
+        break;
+        
+    case ACT_REMOVE:
+    case ACT_ADD:
+    case ACT_REVERT:
+        hgTabs->clearSelections();
+        shouldHgStat = true;
+        break;
+
+    case ACT_FILEDIFF:
+    case ACT_FOLDERDIFF:
+    case ACT_CHGSETDIFF:
+    case ACT_SERVE:
+    case ACT_TAG:
+    case ACT_HG_IGNORE:
+        shouldHgStat = true;
+        break;
+        
+    case ACT_UPDATE:
+        QMessageBox::information(this, tr("Update"), output);
+        shouldHgStat = true;
+        break;
+        
+    case ACT_MERGE:
+        QMessageBox::information(this, tr("Merge"), output);
+        shouldHgStat = true;
+        justMerged = true;
+        break;
+        
+    case ACT_RETRY_MERGE:
+        QMessageBox::information(this, tr("Merge retry"),
+                                 tr("Merge retry successful."));
+        shouldHgStat = true;
+        justMerged = true;
+        break;
+        
+    default:
+        break;
+    }
+
+    // Sequence when no full log required:
+    //   paths -> branch -> stat -> heads ->
+    //     incremental-log (only if heads changed) -> parents
+    // 
+    // Sequence when full log required:
+    //   paths -> branch -> stat -> heads -> parents -> log
+    //
+    // Note we want to call enableDisableActions only once, at the end
+    // of whichever sequence is in use.
+
+    switch (action) {
+        
+    case ACT_QUERY_PATHS:
+        hgQueryBranch();
+        break;
+
+    case ACT_QUERY_BRANCH:
+        hgStat();
+        break;
+        
+    case ACT_STAT:
+        hgQueryHeads();
+        break;
+
+    case ACT_QUERY_HEADS:
+        if (headsChanged && !needNewLog) {
+            hgLogIncremental(oldHeadIds);
+        } else {
+            hgQueryParents();
+        }
+        break;
+
+    case ACT_LOG_INCREMENTAL:
+        hgQueryParents();
+        break;
+
+    case ACT_QUERY_PARENTS:
+        if (needNewLog) {
+            hgLog();
+        } else {
+            // we're done
+            enableDisableActions();
+        }
+        break;
+
+    case ACT_LOG:
+        // we're done
+        enableDisableActions();
+
+    default:
         if (shouldHgStat) {
             hgQueryPaths();
-        }
+        } else {
+            enableDisableActions();
+        }
+        break;
+    }
 }
 
 void MainWindow::connectActions()
 {
     connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));