comparison hgtabwidget.cpp @ 237:c9a7e4ec2f78

* Try to do the right thing when completely reverting a merge (forget that the merge took place)
 * When trying to clone from remote repo to existing local dir, offer to create a subdir instead
 * Tidy up clone-successful notification
 * Add a note to commit and revert confirmation dialogs to tell user if they are committing/reverting only a subset of available files

     m_historyWidget->update();
 }
 
 bool HgTabWidget::canDiff() const
 {
-    if (!m_fileStatusWidget->getSelectedAddableFiles().empty()) return false;
-    return m_fileStatusWidget->haveChangesToCommit() ||
-        !m_fileStatusWidget->getAllUnresolvedFiles().empty();
+    return canRevert();
 }
 
 bool HgTabWidget::canCommit() const
 {
-    if (!m_fileStatusWidget->getSelectedAddableFiles().empty()) return false;
-    return m_fileStatusWidget->haveChangesToCommit() &&
-        m_fileStatusWidget->getAllUnresolvedFiles().empty();
+    if (!m_fileStatusWidget->haveChangesToCommit()) return false;
+    if (!m_fileStatusWidget->getAllUnresolvedFiles().empty()) return false;
+
+    QStringList addable = m_fileStatusWidget->getSelectedAddableFiles();
+    if (addable.empty()) return true;
+
+    QStringList committable = m_fileStatusWidget->getSelectedCommittableFiles();
+
+    // "Removed" files are both committable and addable; don't return
+    // a false negative if the selection only contains these
+    if (committable == addable) return true;
+    return false;
 }
 
 bool HgTabWidget::canRevert() const
 {
-    if (!m_fileStatusWidget->getSelectedAddableFiles().empty()) return false;
-    return m_fileStatusWidget->haveChangesToCommit() ||
-        !m_fileStatusWidget->getAllUnresolvedFiles().empty();
+    // Not the same as canCommit() -- we can revert (and diff)
+    // unresolved files, but we can't commit them
+    if (!m_fileStatusWidget->haveChangesToCommit() &&
+        m_fileStatusWidget->getAllUnresolvedFiles().empty()) return false;
+
+    // The rest of this logic is as in canCommit though
+
+    QStringList addable = m_fileStatusWidget->getSelectedAddableFiles();
+    if (addable.empty()) return true;
+
+    QStringList committable = m_fileStatusWidget->getSelectedCommittableFiles();
+    if (committable == addable) return true;
+    return false;
 }
 
 bool HgTabWidget::canAdd() const
 {
     QStringList addable = m_fileStatusWidget->getSelectedAddableFiles();

 
     QStringList removable = m_fileStatusWidget->getSelectedRemovableFiles();
     if (!removable.empty()) return false;
 
     QStringList committable = m_fileStatusWidget->getSelectedCommittableFiles();
+
     // "Removed" files are both committable and addable; don't return
-    // a false positive if the selection only contains these
+    // a false negative if the selection only contains these
     if (committable == addable || committable.empty()) return true;
     return false;
 }
 
 bool HgTabWidget::canRemove() const