Mercurial > hg > easyhg

changeset 213:90e70a9024f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Make findInPath return empty string if not found -- previous hopelessly fragile behaviour failed in situations where it was called with an absolute path
author Chris Cannam
date Wed, 05 Jan 2011 16:08:37 +0000
parents 4c5993d860f3
children 478d0222e93d 18bac9a34d58
files common.cpp hgrunner.cpp mainwindow.cpp
diffstat 3 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/common.cpp	Wed Jan 05 15:55:36 2011 +0000
+++ b/common.cpp	Wed Jan 05 16:08:37 2011 +0000
@@ -97,7 +97,11 @@
         }
     }
 #endif
-    return name;
+    if (found) {
+        return name;
+    } else {
+        return "";
+    }
 }
 
 #ifdef Q_OS_WIN32
--- a/hgrunner.cpp	Wed Jan 05 15:55:36 2011 +0000
+++ b/hgrunner.cpp	Wed Jan 05 16:08:37 2011 +0000
@@ -83,9 +83,6 @@
     extpath = unbundled;
     if (extpath == "") {
         extpath = findInPath("easyhg.py", m_myDirPath, false);
-        if (extpath == "easyhg.py") {
-            extpath = "";
-        }
     }
 
     settings.setValue("extensionpath", extpath);
@@ -186,7 +183,7 @@
     if (hg == "") {
         hg = findInPath("hg", m_myDirPath, true);
     }
-    if (hg != "hg") {
+    if (hg != "") {
         settings.setValue("hgbinary", hg);
     }
     return hg;
--- a/mainwindow.cpp	Wed Jan 05 15:55:36 2011 +0000
+++ b/mainwindow.cpp	Wed Jan 05 16:08:37 2011 +0000
@@ -512,7 +512,7 @@
         bool found = false;
         foreach (QString base, bases) {
             diff = findInPath(base, m_myDirPath, true);
-            if (diff != base && diff != base + ".exe") {
+            if (diff != "") {
                 found = true;
                 break;
             }
@@ -543,7 +543,7 @@
     bool found = false;
     foreach (QString base, bases) {
         merge = findInPath(base, m_myDirPath, true);
-        if (merge != base && merge != base + ".exe") {
+        if (merge != "") {
             found = true;
             break;
         }
@@ -577,7 +577,7 @@
         bool found = false;
         foreach (QString base, bases) {
             editor = findInPath(base, m_myDirPath, true);
-            if (editor != base && editor != base + ".exe") {
+            if (editor != "") {
                 found = true;
                 break;
             }