comparison common.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 <QFileInfo>
 #include <QProcessEnvironment>
 #include <QStringList>
 #include <QDir>
+#include <QRegExp>
 
 #include <sys/types.h>
 
 #ifdef Q_OS_WIN32
 #define _WIN32_WINNT 0x0500

 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
 #endif
 
-QString findExecutable(QString name)
+QString findInPath(QString name, QString installPath, bool executableRequired)
 {
     bool found = false;
     if (name != "") {
-        if (name[0] != '/') {
+        if (name[0] != '/'
+#ifdef Q_OS_WIN32
+			&& (QRegExp("^[a-zA-Z]:").indexIn(name) != 0)
+#endif
+			) {
 #ifdef Q_OS_WIN32
             QChar pathSep = ';';
 #else
             QChar pathSep = ':';
 #endif
             name = QFileInfo(name).fileName();
             QString path =
                 QProcessEnvironment::systemEnvironment().value("PATH");
             DEBUG << "findExecutable: seeking location for binary " << name
                   << ": system path is " << path << endl;
+            if (installPath != "") {   
+                DEBUG << "findExecutable: install path is " << installPath
+                      << ", adding to system path" << endl;
+                //!!! path = path + pathSep + installPath;
+                path = installPath + pathSep + path;
+            }
 #ifndef Q_OS_WIN32
+			//!!!
             path = path + ":/usr/local/bin";
             DEBUG << "... adding /usr/local/bin just in case (fix and add settings dlg please)"
                     << endl;
 #endif
             QStringList elements = path.split(pathSep, QString::SkipEmptyParts);
             foreach (QString element, elements) {
                 QString full = QDir(element).filePath(name);
                 QFileInfo fi(full);
-                if (fi.exists() && fi.isFile() && fi.isExecutable()) {
-                    name = full;
-                    found = true;
-                    break;
+                DEBUG << "findExecutable: looking at " << full << endl;
+                if (fi.exists() && fi.isFile()) {
+                    DEBUG << "findExecutable: it's a file" << endl;
+                    if (!executableRequired || fi.isExecutable()) {
+                        name = full;
+                        DEBUG << "findExecutable: found at " << name << endl;
+                        found = true;
+                        break;
+                    }
                 }
             }
         }
     }
 #ifdef Q_OS_WIN32
     if (!found) {
         if (!name.endsWith(".exe")) {
-            return findExecutable(name + ".exe");
+            return findInPath(name + ".exe", installPath, executableRequired);
         }
     }
 #endif
     return name;
 }