comparison mainwindow.cpp @ 11:45c4ac1323b2

Version 0.4.2: Added hg serve. Can commit one file.

         
         if (QDialog::Accepted == getCommitComment(comment))
         {
             if (!comment.isEmpty())
             {
-                params << "commit" << "--message" << comment << "--user" << userInfo;
+                QString currentFile = hgExp -> getCurrentFileListLine();
+
+                if (isSelectedCommitable(hgExp -> workFolderFileList))
+                {
+                    //User wants to commit only one file
+                    params << "commit" << "--message" << comment << "--user" << userInfo << currentFile.mid(2);
+                }
+                else
+                {
+                    //Commit all changes
+                    params << "commit" << "--message" << comment << "--user" << userInfo;
+                }
 
                 runner -> startProc(getHgBinaryName(), workFolderPath, params);
                 runningAction = ACT_COMMIT;
             }
         }

 
         runner -> startProc(getHgBinaryName(), workFolderPath, params);
         runningAction = ACT_PUSH;
     }
 }
+
+
+void MainWindow::hgServe()
+{
+    if (runningAction == ACT_NONE)
+    {
+        QStringList params;
+
+        params << "serve";
+
+        runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
+        runningAction = ACT_SERVE;
+
+        QMessageBox::information(this, "Serve", "Server running", QMessageBox::Close);
+        runner -> killProc();
+    }
+}
+
 
 
 void MainWindow::settings()
 {
     SettingsDialog *settingsDlg = new SettingsDialog(this);

     {
         QMessageBox::information(this, tr("HgExplorer"), tr("Mercurial command did not return any output."));
     }
 }
 
+
+bool MainWindow::isSelectedCommitable(QListWidget *workList)
+{
+    QList<QListWidgetItem *> selList = workList -> selectedItems();
+    if (selList.count() == 1)
+    {
+        QString tmp = selList.at(0)->text().mid(0, 1);
+        if (tmp == "A")
+        {
+            //scheduled to be added, ok to commit
+            return true;
+        }
+        else if (tmp == "M")
+        {
+            //locally modified, ok to commit
+            return true;
+        }
+    }
+    return false;
+}
 
 bool MainWindow::isSelectedDeletable(QListWidget *workList)
 {
     QList<QListWidgetItem *> selList = workList -> selectedItems();
     if (selList.count() == 1)

                     case ACT_COMMIT:
                     case ACT_FILEDIFF:
                     case ACT_FOLDERDIFF:
                     case ACT_CHGSETDIFF:
                     case ACT_REVERT:
+                    case ACT_SERVE:
                         shouldHgStat = true;
                         break;
 
                     case ACT_UPDATE:
                         QMessageBox::information(this, "update", runner -> getStdOut());

 
     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()));
 }
 
 void MainWindow::tabChanged(int currTab)
 {
     tabPage = currTab;

     hgCommitAct -> setEnabled(localRepoActionsEnabled);
     hgMergeAct -> setEnabled(localRepoActionsEnabled);
     hgResolveListAct -> setEnabled(localRepoActionsEnabled);
     hgResolveMarkAct -> setEnabled(localRepoActionsEnabled);
     hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
+    hgServeAct -> setEnabled(localRepoActionsEnabled);
 
     hgExp -> enableDisableOtherTabs();
 
     int a, m, r, n;
     countAMRNModifications(hgExp -> workFolderFileList, a, m, r, n);

     hgRemoveAct -> setStatusTip(tr("Remove selected working folder file from local repository (on next commit)"));
 
     hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("Update working folder"), this);
     hgUpdateAct->setStatusTip(tr("Update working folder from local repository"));
 
-    hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit / Save changes"), this);
-    hgCommitAct->setStatusTip(tr("Save all changes in working folder (and all subfolders) to local repository"));
+    hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit / Save change(s)"), this);
+    hgCommitAct->setStatusTip(tr("Save (selected file or all changed files working folder (and all subfolders)) to local repository"));
 
     hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("Merge"), this);
     hgMergeAct->setStatusTip(tr("Merge two local repository changesets to working folder"));
 
     //Advanced actions

     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"));
+
+    hgServeAct = new QAction(tr("Serve (via http)"), this);
+    hgServeAct -> setStatusTip(tr("Serve local repository via http for workgroup access"));
 
     //Help actions
     aboutAct = new QAction(tr("About"), this);
     aboutAct->setStatusTip(tr("Show the application's About box"));
 

     advancedMenu -> addSeparator();
     advancedMenu -> addAction(hgAnnotateAct);
     advancedMenu -> addSeparator();
     advancedMenu -> addAction(hgResolveListAct);
     advancedMenu -> addAction(hgResolveMarkAct);
+    advancedMenu -> addSeparator();
+    advancedMenu -> addAction(hgServeAct);
 
     helpMenu = menuBar()->addMenu(tr("Help"));
     helpMenu->addAction(aboutAct);
     helpMenu->addAction(aboutQtAct);
 }