comparison hgrunner.cpp @ 172:b6dd1ee0e486

* Fix failure to recognise local uncommitted changes when an untracked file was selected
 * Win32: Look in installed location (currently just the location of the present .exe) for executables as well as in path
 * Win32: Search for easyhg extension in same way as executables
 * Win32: Set installed location to path when running hg commands (for dependent DLLs)

 #include <unistd.h>
 #include <termios.h>
 #include <fcntl.h>
 #endif
 
-HgRunner::HgRunner(QWidget * parent): QProgressBar(parent)
+HgRunner::HgRunner(QString myDirPath, QWidget * parent) :
+    QProgressBar(parent),
+    m_myDirPath(myDirPath)
 {
     m_proc = 0;
 
     setTextVisible(false);
     setVisible(false);
     m_isRunning = false;
 
-    unbundleExtension();
+    findExtension();
 }
 
 HgRunner::~HgRunner()
 {
     closeTerminal();
     if (m_proc) {
         m_proc->kill();
         m_proc->deleteLater();
     }
 }
+
+void HgRunner::findExtension()
+{
+    m_extensionPath = findInPath("easyhg.py", m_myDirPath, false);
+    if (m_extensionPath == "easyhg.py") {
+        if (!unbundleExtension()) {
+            m_extensionPath = "";
+        }
+    }
+}   
 
 bool HgRunner::unbundleExtension()
 {
     QString bundled = ":easyhg.py";
     QString home = QDir::homePath();

 QString HgRunner::getHgBinaryName()
 {
     QSettings settings;
     QString hg = settings.value("hgbinary", "").toString();
     if (hg == "") {
-        hg = findExecutable("hg");
+        hg = findInPath("hg", m_myDirPath, true);
     }
     if (hg != "hg") {
         settings.setValue("hgbinary", hg);
     }
     return hg;

     m_userName = "";
 
     m_proc = new QProcess;
 
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+
+#ifdef Q_OS_WIN32
+    if (m_myDirPath != "") {
+        env.insert("PATH", m_myDirPath + ";" + env.value("PATH"));
+    }
+#endif
+
     env.insert("LANG", "en_US.utf8");
     env.insert("LC_ALL", "en_US.utf8");
     env.insert("HGPLAIN", "1");
     m_proc->setProcessEnvironment(env);