comparison src/mainwindow.cpp @ 520:a17c06f773cd

idiot -- we don't need to query bookmarks separately, we can just add them to the log template

 
     QStringList params;
     params << "branch";
     m_runner->requestAction(HgAction(ACT_QUERY_BRANCH, m_workFolderPath, params));
 */
-}
-
-void MainWindow::hgQueryBookmarks()
-{
-    QStringList params;
-    params << "bookmarks";
-    m_runner->requestAction(HgAction(ACT_QUERY_BOOKMARKS, m_workFolderPath, params));
 }
 
 void MainWindow::hgQueryHeadsActive()
 {
     QStringList params;

     case ACT_CHGSETDIFF:
         // external program, unlikely to be anything useful in stderr
         // and some return with failure codes when something as basic
         // as the user closing the window via the wm happens
         return;
-    case ACT_QUERY_BOOKMARKS:
-        // probably just means we have an old Hg version: simply don't
-        // display bookmarks
-        return;
     case ACT_MERGE:
     case ACT_RETRY_MERGE:
         MoreInformationDialog::information
             (this, tr("Merge"), tr("Merge failed"),
              tr("Some files were not merged successfully.<p>You can Merge again to repeat the interactive merge; use Revert to abandon the merge entirely; or edit the files that are in conflict in an editor and, when you are happy with them, choose Mark Resolved in each file's right-button menu."),

     }
 
     case ACT_QUERY_BRANCH:
         m_currentBranch = output.trimmed();
         break;
-
-    case ACT_QUERY_BOOKMARKS:
-    {
-        m_bookmarks.clear();
-        QStringList outList = output.split('\n', QString::SkipEmptyParts);
-        foreach (QString line, outList) {
-            QStringList items = line.split(' ', QString::SkipEmptyParts);
-            if (items[0] == "*") {
-                if (items.size() == 3) {
-                    m_bookmarks[items[2]].push_back(items[1]);
-                }
-            } else {
-                if (items.size() == 2) {
-                    m_bookmarks[items[1]].push_back(items[0]);
-                }
-            }
-        }
-        m_hgTabs->setBookmarks(m_bookmarks);
-        break;
-    }
 
     case ACT_STAT:
         m_lastStatOutput = output;
         updateFileSystemWatcher();
         break;

     default:
         break;
     }
 
     // Sequence when no full log required:
-    //   paths -> branch -> stat -> bookmarks -> resolve-list -> heads ->
+    //   paths -> branch -> stat -> resolve-list -> heads ->
     //     incremental-log (only if heads changed) -> parents
     // 
     // Sequence when full log required:
-    //   paths -> branch -> stat -> bookmarks -> resolve-list -> heads ->
+    //   paths -> branch -> stat -> resolve-list -> heads ->
     //     parents -> log
     //
     // Note we want to call enableDisableActions only once, at the end
     // of whichever sequence is in use.
 

         // NB this call is duplicated in hgQueryBranch
         hgStat();
         break;
         
     case ACT_STAT:
-        hgQueryBookmarks();
-        break;
-
-    case ACT_QUERY_BOOKMARKS:
         hgResolveList();
         break;
         
     case ACT_RESOLVE_LIST:
         hgQueryHeadsActive();