Make LaTeX export threadsafe.

[lyx.git] / src / VCBackend.cpp

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 5ab61630d3f250ef924f3dfdf7515912d9476679..0e10aaafca0a7ba72698c0c5459dda2893a3e8de 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -27,6 +27,7 @@
 #include "support/PathChanger.h"
 #include "support/Systemcall.h"
 #include "support/regex.h"
+#include "support/TempFile.h"
 
 #include <fstream>
 
@@ -34,7 +35,6 @@ using namespace std;
 using namespace lyx::support;
 
 
-
 namespace lyx {
 
 
@@ -99,23 +99,21 @@ bool VCS::makeRCSRevision(string const &version, string &revis) const
 }
 
 
-bool VCS::checkparentdirs(FileName const & file, std::string const & pathname)
+bool VCS::checkparentdirs(FileName const & file, std::string const & vcsdir)
 {
        FileName dirname = file.onlyPath();
-       FileName tocheck = FileName(addName(dirname.absFileName(),pathname));
-       LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
-       bool result = tocheck.exists();
-       while ( !result && !dirname.empty() ) {
+       do {
+               FileName tocheck = FileName(addName(dirname.absFileName(), vcsdir));
+               LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
+               if (tocheck.exists())
+                       return true;
                //this construct because of #8295
                dirname = FileName(dirname.absFileName()).parentPath();
-               LYXERR(Debug::LYXVC, "check directory: " << dirname.absFileName());
-               tocheck = FileName(addName(dirname.absFileName(),pathname));
-               result = tocheck.exists();
-       }
-       return result;
+       } while (!dirname.empty());
+       return false;
 }
 
-       
+
 /////////////////////////////////////////////////////////////////////
 //
 // RCS
@@ -295,7 +293,8 @@ bool RCS::isCheckInWithConfirmation()
        // if (getDiff(file, diff) && diff.empty())
        //      return false;
 
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return true;
@@ -306,7 +305,6 @@ bool RCS::isCheckInWithConfirmation()
                FileName(owner_->filePath()));
 
        docstring diff = tmpf.fileContents("UTF-8");
-       tmpf.removeFile();
 
        if (diff.empty())
                return false;
@@ -436,7 +434,8 @@ string RCS::revisionInfo(LyXVC::RevisionInfo const info)
 
 bool RCS::getRevisionInfo()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;
@@ -483,7 +482,9 @@ bool RCS::prepareFileRevision(string const &revis, string & f)
        if (!VCS::makeRCSRevision(version_, rev))
                return false;
 
-       FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_");
+       TempFile tempfile("lyxvcrev_" + rev + "_");
+       tempfile.setAutoRemove(false);
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;
@@ -660,7 +661,8 @@ int CVS::doVCCommandCallWithOutput(std::string const & cmd,
 
 CVS::CvsStatus CVS::getStatus()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return StatusError;
@@ -668,7 +670,6 @@ CVS::CvsStatus CVS::getStatus()
 
        if (doVCCommandCallWithOutput("cvs status " + getTarget(File),
                FileName(owner_->filePath()), tmpf)) {
-               tmpf.removeFile();
                return StatusError;
        }
 
@@ -692,7 +693,6 @@ CVS::CvsStatus CVS::getStatus()
                                status = NeedsCheckout;
                }
        }
-       tmpf.removeFile();
        return status;
 }
 
@@ -701,7 +701,8 @@ void CVS::getRevisionInfo()
        if (have_rev_info_)
                return;
        have_rev_info_ = true;
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return;
@@ -711,7 +712,6 @@ void CVS::getRevisionInfo()
                + " " + getTarget(File),
                FileName(owner_->filePath()), tmpf);
        if (rc) {
-               tmpf.removeFile();
                LYXERR(Debug::LYXVC, "cvs log failed with exit code " << rc);
                return;
        }
@@ -734,7 +734,6 @@ void CVS::getRevisionInfo()
                        break;
                }
        }
-       tmpf.removeFile();
        if (rev_author_cache_.empty())
                LYXERR(Debug::LYXVC,
                   "Could not retrieve revision info for " << version_ <<
@@ -905,7 +904,8 @@ string CVS::checkOut()
 {
        if (vcstatus != NOLOCKING && edit())
                return string();
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return string();
@@ -923,7 +923,6 @@ string CVS::checkOut()
                rc = 0;
        }
        
-       tmpf.removeFile();
        return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
 }
 
@@ -939,7 +938,8 @@ bool CVS::checkOutEnabled()
 
 string CVS::repoUpdate()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return string();
@@ -962,10 +962,8 @@ string CVS::repoUpdate()
                                text, 0, 1, _("&Continue"), _("&Abort"));
                        hideDialogs("file", 0);
                }
-               if (ret == 1 ) {
-                       tmpf.removeFile();
+               if (ret == 1 )
                        return string();
-               }
        }
 
        int rc = update(Directory, tmpf);
@@ -983,8 +981,6 @@ string CVS::repoUpdate()
                                file, from_local8bit(sres)));
                rc = 0;
        }
-       
-       tmpf.removeFile();
 
        return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
 }
@@ -1111,7 +1107,9 @@ bool CVS::prepareFileRevision(string const & revis, string & f)
        if (!VCS::makeRCSRevision(version_, rev))
                return false;
 
-       FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_");
+       TempFile tempfile("lyxvcrev_" + rev + "_");
+       tempfile.setAutoRemove(false);
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;
@@ -1159,7 +1157,8 @@ FileName const SVN::findFile(FileName const & file)
        }
 
        // Now we check the status of the file.
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return FileName();
@@ -1170,7 +1169,6 @@ FileName const SVN::findFile(FileName const & file)
        bool found = 0 == doVCCommandCall("svn info " + quoteName(fname)
                                                + " > " + quoteName(tmpf.toFilesystemEncoding()),
                                                file.onlyPath());
-       tmpf.removeFile();
        LYXERR(Debug::LYXVC, "SVN control: " << (found ? "enabled" : "disabled"));
        return found ? file : FileName();
 }
@@ -1192,7 +1190,8 @@ void SVN::scanMaster()
 
 bool SVN::checkLockMode()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()){
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;
@@ -1322,7 +1321,8 @@ LyXVC::CommandResult SVN::checkIn(string const & msg, string & log)
 LyXVC::CommandResult
 SVN::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()){
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                log = N_("Error: Could not generate logfile.");
@@ -1350,7 +1350,6 @@ SVN::checkIn(vector<support::FileName> const & f, string const & msg, string & l
                if (!fileLock(false, tmpf, log))
                        ret = LyXVC::ErrorCommand;
 
-       tmpf.removeFile();
        if (!log.empty())
                log.insert(0, "SVN: ");
        if (ret == LyXVC::VCSuccess && log.empty())
@@ -1372,7 +1371,8 @@ bool SVN::isCheckInWithConfirmation()
 {
        // FIXME one day common getDiff and perhaps OpMode for all backends
 
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return true;
@@ -1383,7 +1383,6 @@ bool SVN::isCheckInWithConfirmation()
                FileName(owner_->filePath()));
 
        docstring diff = tmpf.fileContents("UTF-8");
-       tmpf.removeFile();
 
        if (diff.empty())
                return false;
@@ -1458,7 +1457,8 @@ bool SVN::fileLock(bool lock, FileName const & tmpf, string &status)
 
 string SVN::checkOut()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return N_("Error: Could not generate logfile.");
@@ -1479,7 +1479,6 @@ string SVN::checkOut()
 
        fileLock(true, tmpf, log);
 
-       tmpf.removeFile();
        return log.empty() ? string() : "SVN: " + log;
 }
 
@@ -1495,7 +1494,8 @@ bool SVN::checkOutEnabled()
 
 string SVN::repoUpdate()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return N_("Error: Could not generate logfile.");
@@ -1521,10 +1521,8 @@ string SVN::repoUpdate()
                                text, 0, 1, _("&Yes"), _("&No"));
                        hideDialogs("file", 0);
                }
-               if (ret == 1 ) {
-                       tmpf.removeFile();
+               if (ret == 1 )
                        return string();
-               }
        }
 
        // Reverting looks too harsh, see bug #6255.
@@ -1538,7 +1536,6 @@ string SVN::repoUpdate()
        res += "Update log:\n" + tmpf.fileContents("UTF-8");
 
        LYXERR(Debug::LYXVC, res);
-       tmpf.removeFile();
        return to_utf8(res);
 }
 
@@ -1551,7 +1548,8 @@ bool SVN::repoUpdateEnabled()
 
 string SVN::lockingToggle()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return N_("Error: Could not generate logfile.");
@@ -1579,7 +1577,6 @@ string SVN::lockingToggle()
        if (ret)
                return string();
 
-       tmpf.removeFile();
        frontend::Alert::warning(_("SVN File Locking"),
                (locking ? _("Locking property unset.") : _("Locking property set.")) + "\n"
                + _("Do not forget to commit the locking property into the repository."),
@@ -1670,7 +1667,8 @@ string SVN::revisionInfo(LyXVC::RevisionInfo const info)
 
 bool SVN::getFileRevisionInfo()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;
@@ -1716,14 +1714,14 @@ bool SVN::getFileRevisionInfo()
        }
 
        ifs.close();
-       tmpf.removeFile();
        return !rev.empty();
 }
 
 
 bool SVN::getTreeRevisionInfo()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;
@@ -1740,7 +1738,6 @@ bool SVN::getTreeRevisionInfo()
        string line;
        getline(ifs, line);
        ifs.close();
-       tmpf.removeFile();
 
        rev_tree_cache_ = line;
        return !line.empty();
@@ -1774,7 +1771,9 @@ bool SVN::prepareFileRevision(string const & revis, string & f)
        }
 
        string revname = convert<string>(rev);
-       FileName tmpf = FileName::tempName("lyxvcrev_" + revname + "_");
+       TempFile tempfile("lyxvcrev_" + revname + "_");
+       tempfile.setAutoRemove(false);
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;
@@ -1829,39 +1828,21 @@ FileName const GIT::findFile(FileName const & file)
        }
 
        // Now we check the status of the file.
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return FileName();
        }
 
-       // --porcelain selects a format that is supposed to be stable across
-       // git versions
        string const fname = onlyFileName(file.absFileName());
        LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under git control for `"
                        << fname << '\'');
-       bool found = 0 == doVCCommandCall("git status --porcelain " +
-                               quoteName(fname) + " > " +
-                               quoteName(tmpf.toFilesystemEncoding()),
+       doVCCommandCall("git ls-files " +
+                       quoteName(fname) + " > " +
+                       quoteName(tmpf.toFilesystemEncoding()),
                        file.onlyPath());
-       if (found)
-       {
-               // The output is empty for file names NOT in repo.
-               // The output contains a line starting with "??" for unknown
-               // files, no line for known unmodified files and a line
-               // starting with "M" or something else for modified/deleted
-               // etc. files.
-               if (tmpf.isFileEmpty())
-                       found = false;
-               else {
-                       ifstream ifs(tmpf.toFilesystemEncoding().c_str());
-                       string test;
-                       if ((ifs >> test))
-                               found = (test != "??");
-                       // else is no error
-               }
-       }
-       tmpf.removeFile();
+       bool found = !tmpf.isFileEmpty();
        LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled"));
        return found ? file : FileName();
 }
@@ -1955,7 +1936,8 @@ LyXVC::CommandResult GIT::checkIn(string const & msg, string & log)
 LyXVC::CommandResult
 GIT::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()){
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                log = N_("Error: Could not generate logfile.");
@@ -1980,7 +1962,6 @@ GIT::checkIn(vector<support::FileName> const & f, string const & msg, string & l
                ret = LyXVC::ErrorCommand;
        }
 
-       tmpf.removeFile();
        if (!log.empty())
                log.insert(0, "GIT: ");
        if (ret == LyXVC::VCSuccess && log.empty())
@@ -1999,7 +1980,8 @@ bool GIT::isCheckInWithConfirmation()
 {
        // FIXME one day common getDiff and perhaps OpMode for all backends
 
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return true;
@@ -2010,7 +1992,6 @@ bool GIT::isCheckInWithConfirmation()
                FileName(owner_->filePath()));
 
        docstring diff = tmpf.fileContents("UTF-8");
-       tmpf.removeFile();
 
        if (diff.empty())
                return false;
@@ -2153,7 +2134,8 @@ string GIT::revisionInfo(LyXVC::RevisionInfo const info)
 
 bool GIT::getFileRevisionInfo()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;
@@ -2179,14 +2161,14 @@ bool GIT::getFileRevisionInfo()
        }
 
        ifs.close();
-       tmpf.removeFile();
        return !rev_file_cache_.empty();
 }
 
 
 bool GIT::getTreeRevisionInfo()
 {
-       FileName tmpf = FileName::tempName("lyxvcout");
+       TempFile tempfile("lyxvcout");
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;
@@ -2202,7 +2184,6 @@ bool GIT::getTreeRevisionInfo()
        ifstream ifs(tmpf.toFilesystemEncoding().c_str());
        getline(ifs, rev_tree_cache_);
        ifs.close();
-       tmpf.removeFile();
 
        return !rev_tree_cache_.empty();
 }
@@ -2239,7 +2220,9 @@ bool GIT::prepareFileRevision(string const & revis, string & f)
 
        pointer += ":";
 
-       FileName tmpf = FileName::tempName("lyxvcrev_" + revis + "_");
+       TempFile tempfile("lyxvcrev_" + revis + "_");
+       tempfile.setAutoRemove(false);
+       FileName tmpf = tempfile.name();
        if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return false;