comparison src/mainwindow.cpp @ 505:1c05e7576ea5

Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes

         m_lastStatOutput = output;
         updateFileSystemWatcher();
         break;
 
     case ACT_RESOLVE_LIST:
+        // This happens on every update, after the stat (above)
         if (output != "") {
             // Remove lines beginning with R (they are resolved,
             // and the file stat parser treats R as removed)
             QStringList outList = output.split('\n');
             QStringList winnowed;

     if (settings.value("extdiffbinary", "").toString() != "") {
         haveDiff = true;
     }
     settings.endGroup();
 
+    m_hgTabs->setHaveMerge(m_currentParents.size() == 2);
+
     m_hgRefreshAct->setEnabled(m_localRepoActionsEnabled);
     m_hgFolderDiffAct->setEnabled(m_localRepoActionsEnabled && haveDiff);
     m_hgRevertAct->setEnabled(m_localRepoActionsEnabled);
     m_hgAddAct->setEnabled(m_localRepoActionsEnabled);
     m_hgRemoveAct->setEnabled(m_localRepoActionsEnabled);

         m_justMerged = false;
     } else {
         haveMerge = true;
         m_justMerged = true;
     }
-        
+
     m_hgIncomingAct->setEnabled(m_remoteRepoActionsEnabled);
     m_hgPullAct->setEnabled(m_remoteRepoActionsEnabled);
     // permit push even if no remote yet; we'll ask for one
     m_hgPushAct->setEnabled(m_localRepoActionsEnabled && !emptyRepo);