comparison mainwindow.cpp @ 62:68aebc316898

* Some adjustments to process running (avoid timer): caller must now report errors
* Function to find user's real name
* Locate hg executable in path explicitly, use a setting to remember it

 #include <QSettings>
 
 #include "mainwindow.h"
 #include "settingsdialog.h"
 #include "colourset.h"
+#include "debug.h"
 
 
 MainWindow::MainWindow()
 {
     QString wndTitle;

     createActions();
     createMenus();
     createToolBars();
     createStatusBar();
 
-    timerId = startTimer(200);
     runner = new HgRunner(this);
+    connect(runner, SIGNAL(commandCompleted()),
+            this, SLOT(commandCompleted()));
+    connect(runner, SIGNAL(commandFailed()),
+            this, SLOT(commandFailed()));
     runningAction = ACT_NONE;
     statusBar()->addPermanentWidget(runner);
 
     setWindowTitle(tr("EasyMercurial"));
 

     if (firstStart)
     {
         QMessageBox::information(this, tr("First start todo"), tr("Going to \"Settings\" first."));
         settings();
     }
+
+    DEBUG << "User's real name is " << getUserRealName() << endl;
 
     hgStat();
 }
 
 

             {
                 params << "stat" << "-" + statFlags;
             }
 
 
-            runner -> startProc(getHgBinaryName(), workFolderPath, params);
+            runner -> startHgCommand(workFolderPath, params);
             runningAction = ACT_STAT;
         }
     }
 }
 

     {
         QStringList params;
         params << "heads";
 
         //on empty repos, "hg heads" will fail, don't care of that.
-        runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_HEADS;
     }
 }
 
 void MainWindow::hgLog()

         QStringList params;
         params << "log";
         params << "--template";
         params << "id: {rev}:{node|short}\\nauthor: {author}\\nbranch: {branches}\\ntag: {tag}\\ndatetime: {date|isodate}\\ntimestamp: {date|hgdate}\\nage: {date|age}\\nparents: {parents}\\ncomment: {desc|json}\\n\\n";
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_LOG;
     }
 }
 
 

     if (runningAction == ACT_NONE)
     {
         QStringList params;
         params << "parents";
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_PARENTS;
     }
 }
 
 

             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 -> startProc(getHgBinaryName(), workFolderPath, params);
+                runner -> startHgCommand(workFolderPath, params);
                 runningAction = ACT_REMOVE;
             }
         }
     }
 }

 
         if (!currentFile.isEmpty())
         {
             params << "annotate" << "--" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
 
-            runner -> startProc(getHgBinaryName(), workFolderPath, params);
+            runner -> startHgCommand(workFolderPath, params);
             runningAction = ACT_ANNOTATE;
         }
     }
 }
 

 
         if (!currentFile.isEmpty())
         {
             params << "resolve" << "--mark" << "--" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
 
-            runner -> startProc(getHgBinaryName(), workFolderPath, params);
+            runner -> startHgCommand(workFolderPath, params);
             runningAction = ACT_RESOLVE_MARK;
         }
     }
 }
 

     if (runningAction == ACT_NONE)
     {
         QStringList params;
 
         params << "resolve" << "--list";
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_RESOLVE_LIST;
     }
 }
 
 

         {
             //Add all untracked files
             params << "add";
         }
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_ADD;
     }
 }
 
 int MainWindow::getCommentOrTag(QString& commentOrTag, QString question, QString dlgTitle)

                 {
                     //Commit all changes
                     params << "commit" << "--message" << comment << "--user" << userInfo;
                 }
 
-                runner -> startProc(getHgBinaryName(), workFolderPath, params);
+                runner -> startHgCommand(workFolderPath, params);
                 runningAction = ACT_COMMIT;
             }
         }
     }
 }

         {
             if (!tag.isEmpty())
             {
                 params << "tag" << "--user" << userInfo << filterTag(tag);
 
-                runner -> startProc(getHgBinaryName(), workFolderPath, params);
+                runner -> startHgCommand(workFolderPath, params);
                 runningAction = ACT_TAG;
             }
         }
     }
 }

         else
         {
             editorName = """C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe""";
         }
 
-        runner -> startProc(editorName, workFolderPath, params);
+        runner -> startCommand(editorName, workFolderPath, params);
         runningAction = ACT_HG_IGNORE;
     }
 }
 
 

 
         if (!currentFile.isEmpty())
         {
             //Diff parent file against working folder file
             params << "kdiff3" << "--" << currentFile.mid(2);
-            runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
+            runner -> startHgCommand(workFolderPath, params);
             runningAction = ACT_FILEDIFF;
         }
     }
 }
 

     {
         QStringList params;
 
         //Diff parent against working folder (folder diff)
         params << "kdiff3";
-        runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_FOLDERDIFF;
     }
 }
 
 

         hgExp -> getHistoryDiffRevisions(revA, revB);
 
         if ((!revA.isEmpty()) && (!revB.isEmpty()))
         {
             params << "kdiff3" << "--rev" << revA << "--rev" << revB;
-            runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
+            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."));

 
 
         params << "update";
 
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_UPDATE;
     }
 }
 
 

         hgExp -> setCurrentIndex(WORKTAB);
         enableDisableActions();
 
         params << "update" << "--rev" << rev << "--clean";
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
 
         runningAction = ACT_UPDATE;
     }
 }
 

         QStringList params;
         QString currentFile = hgExp -> getCurrentFileListLine();
 
         params << "revert" << "--no-backup" << "--" << currentFile.mid(2);
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_REVERT;
     }
 }
 
 void MainWindow::hgRetryMerge()

     if (runningAction == ACT_NONE)
     {
         QStringList params;
 
         params << "resolve" << "--all";
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_RETRY_MERGE;
     }
 }
 
 

     {
         QStringList params;
 
         params << "merge";
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_MERGE;
     }
 }
 
 

     {
         QStringList params;
 
         params << "clone" << remoteRepoPath << workFolderPath;
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_CLONEFROMREMOTE;
     }
 }
 
 

     {
         QStringList params;
 
         params << "init";
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_INIT;
     }
 }
 
 

     {
         QStringList params;
 
         params << "incoming" << "--newest-first" << remoteRepoPath;
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_INCOMING;
     }
 }
 
 

     {
         QStringList params;
 
         params << "pull" << remoteRepoPath;
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_PULL;
     }
 }
 
 

     {
         QStringList params;
 
         params << "push" << remoteRepoPath;
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_PUSH;
     }
 }
 
 

 
         QString addrs = listAllUpIpV4Addresses();
         QTextStream(&msg) << "Server running on address(es) (" << addrs << "), port 8000";
         params << "serve";
 
-        runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
+        runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_SERVE;
 
         QMessageBox::information(this, "Serve", msg, QMessageBox::Close);
-        runner -> killProc();
+        runner -> killCurrentCommand();
     }
 }
 
 
 

         selectedNotTracked = 0;
     }
 }
 
 
-void MainWindow::timerEvent(QTimerEvent *)
+void MainWindow::commandFailed()
+{
+    DEBUG << "MainWindow::commandFailed" << endl;
+}
+
+void MainWindow::commandCompleted()
 {
     bool shouldHgStat = false;
 
     if (runningAction != ACT_NONE)
     {
         //We are running some hg command...
-        if (runner -> isProcRunning() == false)
+        if (runner -> isCommandRunning() == false)
         {
             //Running has just ended.
             int exitCode = runner -> getExitCode();
 
             runner -> hideProgBar();