comparison mainwindow.cpp @ 121:6ce2ceb2c3a5

* Fix incremental log (was referring to "new" parents and so not actually returning anything)

     }
 }
 
 void MainWindow::updateFileSystemWatcher()
 {
-    //!!! this needs to be incremental when something changes
-
     delete fsWatcher;
     fsWatcher = new QFileSystemWatcher();
     std::deque<QString> pending;
     pending.push_back(workFolderPath);
     while (!pending.empty()) {

         break;
     }
 
     enableDisableActions();
 
-    // Typical sequence goes paths -> branch -> stat -> heads -> parents -> log
+    // 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 {
-            hgLogIncremental();
         }
     } else 
 /* Move to commandFailed
 if ((runningAction == ACT_MERGE) && (exitCode != 0))
             {