comparison hgrunner.cpp @ 180:3d6d826b04ad

* Similarly, tidier lookup for Hg binary and extension

 
     setTextVisible(false);
     setVisible(false);
     m_isRunning = false;
 
-    findExtension();
-    (void)getHgBinaryName();
+    (void)findExtension();
+    (void)findHgBinaryName();
 }
 
 HgRunner::~HgRunner()
 {
     closeTerminal();

         m_proc->kill();
         m_proc->deleteLater();
     }
 }
 
-void HgRunner::findExtension()
+QString HgRunner::findExtension()
 {
     QSettings settings;
     settings.beginGroup("Locations");
-    m_extensionPath = settings.value("extensionpath", "").toString();
-    if (m_extensionPath != "") return;
-    m_extensionPath = findInPath("easyhg.py", m_myDirPath, false);
-    if (m_extensionPath == "easyhg.py") {
-        if (!unbundleExtension()) {
-            // might have failed because the file already existed
-            if (!QFile(m_extensionPath).exists()) {
-                m_extensionPath = "";
-            }
-        }
-    }
-    settings.setValue("extensionpath", m_extensionPath);
+    QString extpath = settings.value("extensionpath", "").toString();
+    if (extpath != "") return extpath;
+    extpath = findInPath("easyhg.py", m_myDirPath, false);
+    if (extpath == "easyhg.py") {
+        extpath = unbundleExtension();
+    }
+    settings.setValue("extensionpath", extpath);
+    return extpath;
 }   
 
-bool HgRunner::unbundleExtension()
+QString HgRunner::unbundleExtension()
 {
     QString bundled = ":easyhg.py";
     QString home = QDir::homePath();
     QString target = QString("%1/.easyhg").arg(home);
     if (!QDir().mkpath(target)) {
         DEBUG << "Failed to make unbundle path " << target << endl;
         std::cerr << "Failed to make unbundle path " << target.toStdString() << std::endl;
-        return false; 
+        return ""; 
     }
     QFile bf(bundled);
-    m_extensionPath = QString("%1/easyhg.py").arg(target);
-    if (!bf.copy(m_extensionPath)) {
+    if (!bf.exists()) {
+        DEBUG << "Bundled extension is missing!" << endl;
+        return "";
+    }
+    QString extpath = QString("%1/easyhg.py").arg(target);
+    if (QFile(extpath).exists()) {
+        QFile(extpath).remove();
+    }
+    if (!bf.copy(extpath)) {
         DEBUG << "Failed to unbundle extension to " << target << endl;
-        std::cerr << "Failed to unbundle extension to " << m_extensionPath.toStdString() << std::endl;
-        return false;
-    }
-    DEBUG << "Unbundled extension to " << m_extensionPath << endl;
-    return true;
+        std::cerr << "Failed to unbundle extension to " << extpath.toStdString() << std::endl;
+        return "";
+    }
+    DEBUG << "Unbundled extension to " << extpath << endl;
+    return extpath;
 }        
 
 void HgRunner::requestAction(HgAction action)
 {
     DEBUG << "requestAction " << action.action << endl;

     }
     if (pushIt) m_queue.push_back(action);
     checkQueue();
 }
 
-QString HgRunner::getHgBinaryName()
+QString HgRunner::findHgBinaryName()
 {
     QSettings settings;
     settings.beginGroup("Locations");
     QString hg = settings.value("hgbinary", "").toString();
     if (hg == "") {

     bool interactive = false;
     QStringList params = action.params;
 
     if (executable == "") {
         // This is a Hg command
-        executable = getHgBinaryName();
+        executable = findHgBinaryName();
 
         if (action.mayBeInteractive()) {
             params.push_front("ui.interactive=true");
             params.push_front("--config");
 
             QSettings settings;
             settings.beginGroup("General");
             if (settings.value("useextension", true).toBool()) {
-                params.push_front(QString("extensions.easyhg=%1").arg(m_extensionPath));
+                QString extpath = findExtension();
+                params.push_front(QString("extensions.easyhg=%1").arg(extpath));
                 params.push_front("--config");
             }
             interactive = true;
         }