comparison mainwindow.cpp @ 148:2fef6b0dfbe8

* Some implementation of right-button menu actions on changeset item

 
     QStringList params;
 
     // Diff parent against working folder (folder diff)
 
-    params << "--config" << "extensions.extdiff=" << "extdiff" << "-p";
-    params << diffBinaryName;
+    params << "--config" << "extensions.extdiff=" << "extdiff";
+    params << "--program" << diffBinaryName;
 
     runner->requestAction(HgAction(ACT_FOLDERDIFF, workFolderPath, params));
 }
 
 
-void MainWindow::hgChgSetDiff()
-{
-        QStringList params;
-
-        //Diff 2 history log versions against each other
-        QString revA;
-        QString revB;
-/*!!!
-        hgTabs -> getHistoryDiffRevisions(revA, revB);
-
-        if ((!revA.isEmpty()) && (!revB.isEmpty()))
-        {
-            params << "kdiff3" << "--rev" << revA << "--rev" << revB;
-            runner -> startHgCommand(workFolderPath, params);
-            runningAction = ACT_CHGSETDIFF;
-        }
-        else
-        {
-            QMessageBox::information(this, tr("Changeset diff"), tr("Please select two changesets from history list or heads list first."));
-        }
-        */
-}
-
+void MainWindow::hgDiffToCurrent(QString id)
+{
+    QStringList params;
+
+    // Diff given revision against working folder
+
+    params << "--config" << "extensions.extdiff=" << "extdiff";
+    params << "--program" << diffBinaryName;
+    params << "--rev" << id;
+
+    runner->requestAction(HgAction(ACT_FOLDERDIFF, workFolderPath, params));
+}
+
+
+void MainWindow::hgDiffToParent(QString child, QString parent)
+{
+    QStringList params;
+
+    // Diff given revision against working folder
+
+    params << "--config" << "extensions.extdiff=" << "extdiff";
+    params << "--program" << diffBinaryName;
+    params << "--rev" << parent << "--rev" << child;
+
+    runner->requestAction(HgAction(ACT_CHGSETDIFF, workFolderPath, params));
+}
 
 
 void MainWindow::hgUpdate()
 {
     QStringList params;

     
     runner->requestAction(HgAction(ACT_UPDATE, workFolderPath, params));
 }
 
 
-void MainWindow::hgUpdateToRev()
-{
-        QStringList params;
-        QString rev;
-/*!!!
-        hgTabs -> getUpdateToRevRevision(rev);
-
-        hgTabs -> setCurrentIndex(WORKTAB);
-        enableDisableActions();
-
-        params << "update" << "--rev" << rev << "--clean";
-
-        runner -> startHgCommand(workFolderPath, params);
-
-        runningAction = ACT_UPDATE;
-        */
-
+void MainWindow::hgUpdateToRev(QString id)
+{
+    QStringList params;
+
+    params << "update" << "--rev" << id << "--check";
+
+    runner->requestAction(HgAction(ACT_UPDATE, workFolderPath, params));
 }
 
 
 void MainWindow::hgRevert()
 {

 void MainWindow::hgMerge()
 {
     QStringList params;
 
     params << "merge";
+    
+    runner->requestAction(HgAction(ACT_MERGE, workFolderPath, params));
+}
+
+
+void MainWindow::hgMergeFrom(QString id)
+{
+    QStringList params;
+
+    params << "merge";
+    params << "--rev" << id;
     
     runner->requestAction(HgAction(ACT_MERGE, workFolderPath, params));
 }
 
 

     connect(hgPullAct, SIGNAL(triggered()), this, SLOT(hgPull()));
     connect(hgPushAct, SIGNAL(triggered()), this, SLOT(hgPush()));
 
 //    connect(hgTabs, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
 
-    connect(hgUpdateToRevAct, SIGNAL(triggered()), this, SLOT(hgUpdateToRev()));
+//    connect(hgUpdateToRevAct, SIGNAL(triggered()), this, SLOT(hgUpdateToRev()));
     connect(hgAnnotateAct, SIGNAL(triggered()), this, SLOT(hgAnnotate()));
     connect(hgResolveListAct, SIGNAL(triggered()), this, SLOT(hgResolveList()));
     connect(hgResolveMarkAct, SIGNAL(triggered()), this, SLOT(hgResolveMark()));
     connect(hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
     connect(clearSelectionsAct, SIGNAL(triggered()), this, SLOT(clearSelections()));

     connect(hgTabs, SIGNAL(revert()),
             this, SLOT(hgRevert()));
     
     connect(hgTabs, SIGNAL(diffWorkingFolder()),
             this, SLOT(hgFolderDiff()));
-/*!!!!
+
     connect(hgTabs, SIGNAL(updateTo(QString)),
-            this, SIGNAL(updateTo(QString)));
+            this, SLOT(hgUpdateToRev(QString)));
 
     connect(hgTabs, SIGNAL(diffToCurrent(QString)),
-            this, SIGNAL(diffToCurrent(QString)));
-
-    connect(hgTabs, SIGNAL(diffToPrevious(QString)),
-            this, SIGNAL(diffToPrevious(QString)));
+            this, SLOT(hgDiffToCurrent(QString)));
+
+    connect(hgTabs, SIGNAL(diffToParent(QString, QString)),
+            this, SLOT(hgDiffToParent(QString, QString)));
 
     connect(hgTabs, SIGNAL(mergeFrom(QString)),
-            this, SIGNAL(mergeFrom(QString)));
-
+            this, SLOT(hgMergeFrom(QString)));
+/*
     connect(hgTabs, SIGNAL(tag(QString)),
-            this, SIGNAL(tag(QString)));
+            this, SLOT(hgTag(QString)));
 */
 }    
 
 /*!!!
 void MainWindow::tabChanged(int currTab)

 
     hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("Merge"), this);
     hgMergeAct->setStatusTip(tr("Merge two local repository changesets to working folder"));
 
     //Advanced actions
-    hgUpdateToRevAct = new QAction(tr("Update to revision"), this);
+/*    hgUpdateToRevAct = new QAction(tr("Update to revision"), this);
     hgUpdateToRevAct -> setStatusTip(tr("Update working folder to version selected from history list"));
-
+*/
     hgAnnotateAct = new QAction(tr("Annotate"), this);
     hgAnnotateAct -> setStatusTip(tr("Show line-by-line version information for selected file"));
 
     hgResolveListAct = new QAction(tr("Resolve (list)"), this);
     hgResolveListAct -> setStatusTip(tr("Resolve (list): Show list of files needing merge"));