comparison mainwindow.cpp @ 120:c92f5859c707

* Add incremental log (though not incremental relayout)

     remoteRepoPath = "";
     workFolderPath = "";
 
     readSettings();
 
-//    tabPage = 0;
     justMerged = false;
     hgTabs = new HgTabWidget((QWidget *) this, remoteRepoPath, workFolderPath);
     setCentralWidget(hgTabs);
 
     connect(hgTabs, SIGNAL(selectionChanged()),
             this, SLOT(enableDisableActions()));
 
     setUnifiedTitleAndToolBarOnMac(true);
     connectActions();
+    clearState();
     enableDisableActions();
 
     if (firstStart) {
         startupDialog();
     }

 void MainWindow::clearSelections()
 {
     hgTabs->clearSelections();
 }
 
+void MainWindow::hgRefresh()
+{
+    clearState();
+    hgQueryPaths();
+}
+
 void MainWindow::hgStat()
 {
     QStringList params;
     params << "stat" << "-ardum";
     runner->requestAction(HgAction(ACT_STAT, workFolderPath, params));

     runner->requestAction(HgAction(ACT_QUERY_HEADS, workFolderPath, params));
 }
 
 void MainWindow::hgLog()
 {
-//!!! This needs to be incremental, except when we pull or set new repo.
-    // Be sure to use ACT_LOG_INCREMENTAL for incremental logs
     QStringList params;
     params << "log";
     params << "--template";
     params << "id: {rev}:{node|short}\\nauthor: {author}\\nbranch: {branches}\\ntag: {tag}\\ndatetime: {date|isodate}\\ntimestamp: {date|hgdate}\\nage: {date|age}\\nparents: {parents}\\ncomment: {desc|json}\\n\\n";
     
     runner->requestAction(HgAction(ACT_LOG, workFolderPath, params));
 }
 
+void MainWindow::hgLogIncremental()
+{
+    QStringList params;
+    params << "log";
+
+    foreach (Changeset *head, currentHeads) {
+        int n = head->number();
+        params << "--prune" << QString("%1").arg(n);
+    }
+        
+    params << "--template";
+    params << "id: {rev}:{node|short}\\nauthor: {author}\\nbranch: {branches}\\ntag: {tag}\\ndatetime: {date|isodate}\\ntimestamp: {date|hgdate}\\nage: {date|age}\\nparents: {parents}\\ncomment: {desc|json}\\n\\n";
+    
+    runner->requestAction(HgAction(ACT_LOG_INCREMENTAL, workFolderPath, params));
+}
 
 void MainWindow::hgQueryParents()
 {
     QStringList params;
     params << "parents";

         }
     }
     return ret;
 }
 
+void MainWindow::clearState()
+{
+    foreach (Changeset *cs, currentParents) delete cs;
+    currentParents.clear();
+    foreach (Changeset *cs, currentHeads) delete cs;
+    currentHeads.clear();
+    currentBranch = "";
+    needNewLog = true;
+}
 
 void MainWindow::hgServe()
 {
     QStringList params;
     QString msg;

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

             this, SLOT(fsFileChanged(QString)));
 }
 
 void MainWindow::fsDirectoryChanged(QString)
 {
-    //!!! should just queue one of these!
     hgStat();
 }
 
 void MainWindow::fsFileChanged(QString)
 {
-    //!!! should just queue one of these!
     hgStat();
+}
+
+void MainWindow::showIncoming(QString output)
+{
+    runner->hide();
+    QMessageBox::information(this, "Incoming", output);
+}
+
+void MainWindow::showPushResult(QString output)
+{
+    runner->hide();
+    QMessageBox::information(this, "Push", output);
+}
+
+void MainWindow::showPullResult(QString output)
+{
+    runner->hide();
+    QMessageBox::information(this, "Pull", output);
 }
 
 void MainWindow::commandFailed(HgAction action, QString stderr)
 {
     DEBUG << "MainWindow::commandFailed" << endl;

         hgTabs->updateWorkFolderFileList(output);
         updateFileSystemWatcher();
         break;
         
     case ACT_INCOMING:
+        showIncoming(output);
+        break;
+
     case ACT_ANNOTATE:
     case ACT_RESOLVE_LIST:
     case ACT_RESOLVE_MARK:
         presentLongStdoutToUser(output);
         shouldHgStat = true;
         break;
         
     case ACT_PULL:
-        QMessageBox::information(this, "Pull", output);
+        showPullResult(output);
         shouldHgStat = true;
         break;
         
     case ACT_PUSH:
-        QMessageBox::information(this, "Push", output);
-        shouldHgStat = true;
+        showPushResult(output);
         break;
         
     case ACT_INIT:
         MultiChoiceDialog::addRecentArgument("init", workFolderPath);
         MultiChoiceDialog::addRecentArgument("local", workFolderPath);

         enableDisableActions();
         shouldHgStat = true;
         break;
         
     case ACT_LOG:
-        hgTabs -> updateLocalRepoHgLogList(output);
+        hgTabs->setNewLog(output);
+        needNewLog = false;
+        break;
+        
+    case ACT_LOG_INCREMENTAL:
+        hgTabs->addIncrementalLog(output);
         break;
         
     case ACT_QUERY_PARENTS:
         foreach (Changeset *cs, currentParents) delete cs;
         currentParents = Changeset::parseChangesets(output);

     } else if (action == ACT_STAT) {
         hgQueryHeads();
     } else if (action == ACT_QUERY_HEADS) {
         hgQueryParents();
     } else if (action == ACT_QUERY_PARENTS) {
-        hgLog();
+        if (needNewLog) {
+            hgLog();
+        } else {
+            hgLogIncremental();
+        }
     } else 
 /* Move to commandFailed
 if ((runningAction == ACT_MERGE) && (exitCode != 0))
             {
                 // If we had a failed merge, offer to retry

 {
     connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
     connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
     connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
 
-    connect(hgStatAct, SIGNAL(triggered()), this, SLOT(hgQueryPaths()));
+    connect(hgRefreshAct, SIGNAL(triggered()), this, SLOT(hgRefresh()));
     connect(hgRemoveAct, SIGNAL(triggered()), this, SLOT(hgRemove()));
     connect(hgAddAct, SIGNAL(triggered()), this, SLOT(hgAdd()));
     connect(hgCommitAct, SIGNAL(triggered()), this, SLOT(hgCommit()));
     connect(hgFileDiffAct, SIGNAL(triggered()), this, SLOT(hgFileDiff()));
     connect(hgFolderDiffAct, SIGNAL(triggered()), this, SLOT(hgFolderDiff()));

     }
 */
     bool haveDiff = (diffBinaryName != "");
 
     hgInitAct -> setEnabled((localRepoExist == false) && (workFolderExist==true));
-    hgStatAct -> setEnabled(localRepoActionsEnabled);
+    hgRefreshAct -> setEnabled(localRepoActionsEnabled);
     hgFileDiffAct -> setEnabled(localRepoActionsEnabled && haveDiff);
     hgFolderDiffAct -> setEnabled(localRepoActionsEnabled && haveDiff);
     hgRevertAct -> setEnabled(localRepoActionsEnabled);
     hgAddAct -> setEnabled(localRepoActionsEnabled);
     hgRemoveAct -> setEnabled(localRepoActionsEnabled);

     exitAct->setShortcuts(QKeySequence::Quit);
     exitAct->setStatusTip(tr("Exit application"));
     exitAct -> setIconVisibleInMenu(true);
 
     //Repository actions
-    hgStatAct = new QAction(QIcon(":/images/status.png"), tr("Refresh"), this);
-    hgStatAct->setStatusTip(tr("Refresh (info of) status of workfolder files"));
+    hgRefreshAct = new QAction(QIcon(":/images/status.png"), tr("Refresh"), this);
+    hgRefreshAct->setStatusTip(tr("Refresh (info of) status of workfolder files"));
 
     hgIncomingAct = new QAction(QIcon(":/images/incoming.png"), tr("Preview"), this);
     hgIncomingAct -> setStatusTip(tr("View info of changesets incoming to us from remote repository (on pull operation)"));
 
     hgPullAct = new QAction(QIcon(":/images/pull.png"), tr("Pull"), this);

 void MainWindow::createToolBars()
 {
     fileToolBar = addToolBar(tr("File"));
     fileToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
     fileToolBar -> addAction(openAct);
-    fileToolBar -> addAction(hgStatAct);
+    fileToolBar -> addAction(hgRefreshAct);
     fileToolBar -> addSeparator();
 //    fileToolBar -> addAction(hgChgSetDiffAct);
     fileToolBar -> setMovable(false);
 
     repoToolBar = addToolBar(tr(REPOMENU_TITLE));