comparison mainwindow.cpp @ 33:ff8d64625aa3

Added retry_merge. Fixed bug in "after merge" commit.

     workFolderPath = "";
 
     readSettings();
 
     tabPage = 0;
+    justMerged = false;
     hgExp = new HgExpWidget((QWidget *) this, remoteRepoPath, workFolderPath, initialFileTypesBits);
     setCentralWidget(hgExp);
 
     setUnifiedTitleAndToolBarOnMac(true);
     connectActions();

         {
             if (!comment.isEmpty())
             {
                 QString currentFile = hgExp -> getCurrentFileListLine();
 
-                if (areAllSelectedCommitable(hgExp -> workFolderFileList))
+                if ((justMerged == false) && (areAllSelectedCommitable(hgExp -> workFolderFileList)))
                 {
-                    //User wants to commit selected file(s)
+                    //User wants to commit selected file(s) (and this is not merge commit, which would fail if we selected files)
                     params << "commit" << "--message" << comment << "--user" << userInfo;
 
                     QList <QListWidgetItem *> selList = hgExp -> workFolderFileList -> selectedItems();
                     for (int i = 0; i < selList.size(); ++i)
                     {

         runner -> startProc(getHgBinaryName(), workFolderPath, params);
         runningAction = ACT_REVERT;
     }
 }
 
+void MainWindow::hgRetryMerge()
+{
+    if (runningAction == ACT_NONE)
+    {
+        QStringList params;
+
+        params << "resolve" << "--all";
+        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runningAction = ACT_RETRY_MERGE;
+    }
+}
+
+
 void MainWindow::hgMerge()
 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;

                         break;
 
                     case ACT_MERGE:
                         QMessageBox::information(this, "merge", runner -> getStdOut());
                         shouldHgStat = true;
+                        justMerged = true;
+                        break;
+
+                    case ACT_RETRY_MERGE:
+                        QMessageBox::information(this, "retry merge", runner -> getStdOut());
+                        shouldHgStat = true;
+                        justMerged = true;
                         break;
 
                     default:
                         break;
                 }

     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(hgRetryMergeAct, SIGNAL(triggered()), this, SLOT(hgRetryMerge()));
 
     connect(settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
 
     connect(hgInitAct, SIGNAL(triggered()), this, SLOT(hgInit()));
     connect(hgCloneFromRemoteAct, SIGNAL(triggered()), this, SLOT(hgCloneFromRemote()));

     hgAddAct -> setEnabled(localRepoActionsEnabled);
     hgRemoveAct -> setEnabled(localRepoActionsEnabled);
     hgUpdateAct -> setEnabled(localRepoActionsEnabled);
     hgCommitAct -> setEnabled(localRepoActionsEnabled);
     hgMergeAct -> setEnabled(localRepoActionsEnabled);
+    hgRetryMergeAct -> setEnabled(localRepoActionsEnabled);
     hgResolveListAct -> setEnabled(localRepoActionsEnabled);
     hgResolveMarkAct -> setEnabled(localRepoActionsEnabled);
     hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
     hgServeAct -> setEnabled(localRepoActionsEnabled);
 

             hgResolveListAct -> setEnabled(true);
 
             if (hgExp -> localRepoHeadsList->count() < 2)
             {
                 hgMergeAct -> setEnabled(false);
+                hgRetryMergeAct -> setEnabled(false);
             }
 
             QString currentFile = hgExp -> getCurrentFileListLine();
             if (!currentFile.isEmpty())
             {

     hgResolveListAct = new QAction(tr("Resolve (list)"), this);
     hgResolveListAct -> setStatusTip(tr("Resolve (list): Show list of files needing merge"));
 
     hgResolveMarkAct = new QAction(tr("Resolve (mark)"), this);
     hgResolveMarkAct -> setStatusTip(tr("Resolve (mark): Mark selected file status as resolved"));
+
+    hgRetryMergeAct = new QAction(tr("Retry merge"), this);
+    hgRetryMergeAct -> setStatusTip(tr("Retry merge after failed merge attempt."));
 
     hgServeAct = new QAction(tr("Serve (via http)"), this);
     hgServeAct -> setStatusTip(tr("Serve local repository via http for workgroup access"));
 
     //Help actions

     advancedMenu = menuBar()->addMenu(tr("Advanced"));
     advancedMenu -> addAction(hgUpdateToRevAct);
     advancedMenu -> addSeparator();
     advancedMenu -> addAction(hgAnnotateAct);
     advancedMenu -> addSeparator();
+    advancedMenu -> addAction(hgRetryMergeAct);
     advancedMenu -> addAction(hgResolveListAct);
     advancedMenu -> addAction(hgResolveMarkAct);
     advancedMenu -> addSeparator();
     advancedMenu -> addAction(hgServeAct);