comparison src/mainwindow.cpp @ 541:0a16db274f2c fswatcher

Update the filesystem watcher with work directory / file state. Still doesn't track "clean" files properly unless "show all files" is enabled

     m_showAllFiles = false;
 
     m_fsWatcher = new FsWatcher();
     m_fsWatcherToken = m_fsWatcher->getNewToken();
     m_commandSequenceInProgress = false;
-    connect(m_fsWatcher, SIGNAL(changed()), this, SLOT(fsWatcherChanged()));
+    connect(m_fsWatcher, SIGNAL(changed()), this, SLOT(checkFilesystem()));
 
     m_commitsSincePush = 0;
     m_shouldHgStat = true;
 
     createActions();

             this, SLOT(showAllChanged()));
 
     setUnifiedTitleAndToolBarOnMac(true);
     connectActions();
     clearState();
+    updateFsWatcher();
     enableDisableActions();
 
     if (m_firstStart) {
         startupDialog();
     }

         params << "stat" << "-ardum";
     }
 
     m_lastStatOutput = "";
 
+    // We're about to do a stat, so we can silently bring ourselves
+    // up-to-date on any file changes to this point
+    (void)m_fsWatcher->getChangedPaths(m_fsWatcherToken);
+
     m_runner->requestAction(HgAction(ACT_STAT, m_workFolderPath, params));
 }
 
 void MainWindow::hgQueryPaths()
 {

             }
 
             if (result) {
                 enableDisableActions();
                 clearState();
+                updateFsWatcher();
                 hgQueryPaths();
                 done = true;
             }
 
         } else {

 void MainWindow::open(QString local)
 {
     if (openLocal(local)) {
         enableDisableActions();
         clearState();
+        updateFsWatcher();
         hgQueryPaths();
     }
 }
 
 bool MainWindow::complainAboutFilePath(QString arg)

         updateToolBarStyle();
         hgRefresh();
     }
 }
 
+void MainWindow::updateFsWatcher()
+{
+    m_fsWatcher->setWorkDirPath(m_workFolderPath);
+    m_fsWatcher->setTrackedFilePaths(m_hgTabs->getFileStates().trackedFiles());
+}
+
 void MainWindow::checkFilesystem()
 {
     DEBUG << "MainWindow::checkFilesystem" << endl;
-    hgRefresh();
-}
-
-void MainWindow::fsWatcherChanged()
-{
-    DEBUG << "MainWindow::fsWatcherChanged" << endl;
-
+    if (!m_commandSequenceInProgress) {
+        if (!m_fsWatcher->getChangedPaths(m_fsWatcherToken).empty()) {
+            hgRefresh();
+            return;
+        }
+    }
+    updateFsWatcher();
 }
 
 QString MainWindow::format1(QString head)
 {
     return QString("<qt><h3>%1</h3></qt>").arg(head);

         m_commandSequenceInProgress = false;
         m_stateUnknown = false;
         enableDisableActions();
         m_hgTabs->updateHistory();
         updateRecentMenu();
+        checkFilesystem();
     }
 }
 
 void MainWindow::connectActions()
 {