comparison mainwindow.cpp @ 164:de39da2f9f4d

* (Re)implement tagging

     }
     return tag;
 }
 
 
-void MainWindow::hgTag()
+void MainWindow::hgTag(QString id)
 {
     QStringList params;
     QString tag;
 
     if (ConfirmCommentDialog::confirmAndGetShortComment
         (this,
          tr("Tag"),
          tr("Enter tag:"),
          tag)) {
-        if (!tag.isEmpty()) //!!! do something better if it is empty
-        {
-            params << "tag" << "--user" << getUserInfo() << filterTag(tag);
+        if (!tag.isEmpty()) {//!!! do something better if it is empty
+
+            params << "tag" << "--user" << getUserInfo();
+            params << "--rev" << Changeset::hashOf(id) << filterTag(tag);
             
             runner->requestAction(HgAction(ACT_TAG, workFolderPath, params));
         }
     }
 }

 {
     QSettings settings;
     QString merge = settings.value("mergebinary", "").toString();
     if (merge == "") {
         QStringList bases;
-        bases << "fmdiff3" << "kdiff3" << "meld" << "diffuse";
+        bases << "fmdiff3" << "meld" << "diffuse" << "kdiff3";
         bool found = false;
         foreach (QString base, bases) {
             merge = findExecutable(base);
             if (merge != base) {
                 found = true;

         lastRevertedFiles = files;
         
         if (files.empty()) {
             params << "revert" << "--no-backup";
         } else {
-            params << "revert" << "--no-backup" << "--" << files;
+            params << "revert" << "--" << files;
         }
 
         //!!! This is problematic.  If you've got an uncommitted
         //!!! merge, you can't revert it without declaring which
         //!!! parent of the merge you want to revert to (reasonably

     params << "resolve" << "--mark";
 
     if (files.empty()) {
         params << "--all";
     } else {
-        params << files;
+        params << "--" << files;
     }
 
     runner->requestAction(HgAction(ACT_RESOLVE_MARK, workFolderPath, params));
 }
 

 
     QStringList files = hgTabs->getSelectedUnresolvedFiles();
     if (files.empty()) {
         params << "--all";
     } else {
-        params << files;
+        params << "--" << files;
     }
 
     runner->requestAction(HgAction(ACT_RETRY_MERGE, workFolderPath, params));
 
     mergeCommitComment = tr("Merge");

     case ACT_ADD:
         hgTabs->clearSelections();
         shouldHgStat = true;
         break;
 
+    case ACT_TAG:
+        needNewLog = true;
+        shouldHgStat = true;
+        break;
+
     case ACT_FOLDERDIFF:
     case ACT_CHGSETDIFF:
     case ACT_SERVE:
-    case ACT_TAG:
     case ACT_HG_IGNORE:
         shouldHgStat = true;
         break;
         
     case ACT_UPDATE:

     connect(hgFolderDiffAct, SIGNAL(triggered()), this, SLOT(hgFolderDiff()));
 //    connect(hgChgSetDiffAct, SIGNAL(triggered()), this, SLOT(hgChgSetDiff()));
     connect(hgUpdateAct, SIGNAL(triggered()), this, SLOT(hgUpdate()));
     connect(hgRevertAct, SIGNAL(triggered()), this, SLOT(hgRevert()));
     connect(hgMergeAct, SIGNAL(triggered()), this, SLOT(hgMerge()));
-    connect(hgTagAct, SIGNAL(triggered()), this, SLOT(hgTag()));
+//    connect(hgTagAct, SIGNAL(triggered()), this, SLOT(hgTag()));
     connect(hgIgnoreAct, SIGNAL(triggered()), this, SLOT(hgIgnore()));
 
     connect(settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
     connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
 

     connect(hgTabs, SIGNAL(diffToParent(QString, QString)),
             this, SLOT(hgDiffToParent(QString, QString)));
 
     connect(hgTabs, SIGNAL(mergeFrom(QString)),
             this, SLOT(hgMergeFrom(QString)));
-/*
+
     connect(hgTabs, SIGNAL(tag(QString)),
             this, SLOT(hgTag(QString)));
-*/
 }    
 
 /*!!!
 void MainWindow::tabChanged(int currTab)
 {