comparison mainwindow.cpp @ 162:910c2c5d1873

* Better handling of empty repositories; some tidying & textual fixes

 
     if (!files.empty()) {
         params << "remove" << "--after" << "--force" << "--" << files;
         runner->requestAction(HgAction(ACT_REMOVE, workFolderPath, params));
     }
-
-/*!!!
-        QString currentFile;//!!! = hgTabs -> getCurrentFileListLine();
-
-        if (!currentFile.isEmpty())
-        {
-            if (QMessageBox::Ok == QMessageBox::warning(this, "Remove file", "Really remove file " + currentFile.mid(2) + "?",
-                QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel))
-            {
-                params << "remove" << "--after" << "--force" << "--" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
-
-                runner -> startHgCommand(workFolderPath, params);
-                runningAction = ACT_REMOVE;
-            }
-        }
-        */
 }
 
 void MainWindow::hgCommit()
 {
     QStringList params;

             diff = "";
         }
     }
     diffBinaryName = diff;
 }
-
-void MainWindow::hgFileDiff()
-{
-        QStringList params;
-/*!!!
-        QString currentFile = hgTabs -> getCurrentFileListLine();
-
-        if (!currentFile.isEmpty())
-        {
-            //Diff parent file against working folder file
-            params << "kdiff3" << "--" << currentFile.mid(2);
-            runner -> startHgCommand(workFolderPath, params);
-            runningAction = ACT_FILEDIFF;
-        }
-    */
-}
-
 
 void MainWindow::hgFolderDiff()
 {
     if (diffBinaryName == "") return;
 

     case ACT_INCOMING:
         // returns non-zero code if the check was successful but there
         // are no changes pending
         if (output.trimmed() == "") showIncoming("");
         return;
+    case ACT_QUERY_HEADS:
+        // fails if repo is empty; we don't care (if there's a genuine
+        // problem, something else will fail too).  Need to do this,
+        // otherwise empty repo state will not be reflected properly
+        // (since heads/log procedure never completes for empty repo)
+        enableDisableActions();
+        return;
     case ACT_FOLDERDIFF:
-    case ACT_FILEDIFF:
     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_REVERT:
         hgTabs->clearSelections();
         shouldHgStat = true;
         break;
 
-    case ACT_FILEDIFF:
     case ACT_FOLDERDIFF:
     case ACT_CHGSETDIFF:
     case ACT_SERVE:
     case ACT_TAG:
     case ACT_HG_IGNORE:
         shouldHgStat = true;
         break;
         
     case ACT_UPDATE:
-        QMessageBox::information(this, tr("Update"), output);
+        QMessageBox::information(this, tr("Update"), tr("<qt><h3>Update successful</h3><p>%1</p>").arg(xmlEncode(output)));
         shouldHgStat = true;
         break;
         
     case ACT_MERGE:
-        QMessageBox::information(this, tr("Merge"), output);
+        QMessageBox::information(this, tr("Update"), tr("<qt><h3>Merge successful</h3><p>%1</p>").arg(xmlEncode(output)));
         shouldHgStat = true;
         justMerged = true;
         break;
         
     case ACT_RETRY_MERGE:

 
     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()));
 //    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()));

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

     //  * the parent is not one of the current heads
 
     bool canMerge = false;
     bool canUpdate = false;
     bool haveMerge = false;
+    bool emptyRepo = false;
     int currentBranchHeads = 0;
 
     if (currentParents.size() == 1) {
         bool parentIsHead = false;
         Changeset *parent = currentParents[0];

             DEBUG << " head ids "<<endl;
             foreach (Changeset *h, currentHeads) {
                 DEBUG << "head id = " << h->id() << endl;
             }
         }
+    } else if (currentParents.size() == 0) {
+        emptyRepo = true;
     } else {
         haveMerge = true;
     }
         
     hgMergeAct->setEnabled(localRepoActionsEnabled && canMerge);

         branchText = tr("branch \"%1\"").arg(currentBranch);
     }
 
     //!!! Want "merge failed" report
 
-    if (canMerge) {
+    if (emptyRepo) {
+        hgTabs->setState(tr("Nothing committed to this repository yet"));
+    } else if (canMerge) {
         hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
     } else if (haveMerge) {
         hgTabs->setState(tr("Have merged but not yet committed on %1").arg(branchText));
     } else if (canUpdate) {
         hgTabs->setState(tr("On %1. Not at the head of the branch: consider updating").arg(branchText));

 
     hgPushAct = new QAction(QIcon(":/images/push.png"), tr("Push"), this);
     hgPushAct->setStatusTip(tr("Push local changesets to remote repository"));
 
     //Workfolder actions
-    hgFileDiffAct   = new QAction(QIcon(":/images/diff.png"), tr("Diff"), this);
-    hgFileDiffAct->setStatusTip(tr("Filediff: View differences between selected working folder file and local repository file"));
-
     hgFolderDiffAct   = new QAction(QIcon(":/images/folderdiff.png"), tr("Diff"), this);
     hgFolderDiffAct->setStatusTip(tr("Folderdiff: View all differences between working folder files and local repository files"));
 
     hgChgSetDiffAct   = new QAction(QIcon(":/images/chgsetdiff.png"), tr("View changesetdiff"), this);
     hgChgSetDiffAct->setStatusTip(tr("Change set diff: View differences between all files of 2 repository changesets"));

     repoToolBar -> setMovable(false);
 
     workFolderToolBar = addToolBar(tr(WORKFOLDERMENU_TITLE));
     addToolBar(Qt::LeftToolBarArea, workFolderToolBar);
     workFolderToolBar -> setIconSize(QSize(MY_ICON_SIZE, MY_ICON_SIZE));
-//    workFolderToolBar->addSeparator();
-//    workFolderToolBar->addAction(hgFileDiffAct);
     workFolderToolBar->addAction(hgFolderDiffAct);
     workFolderToolBar->addSeparator();
     workFolderToolBar->addAction(hgRevertAct);
     workFolderToolBar->addAction(hgUpdateAct);
     workFolderToolBar->addAction(hgCommitAct);