X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=fbe367b5f0a8c7b46416dcabf1feffb736203c46;hb=d1dddde6d800834eb6b8c7626da4d251e7c74f08;hp=cec36fce065d83028f47363e77fa8204baba1b20;hpb=7779d469204ac8c83a60e5702142d79da7993380;p=lyx.git

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index cec36fce06..fbe367b5f0 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -13,6 +13,7 @@
 
 #include "VCBackend.h"
 #include "Buffer.h"
+#include "DispatchResult.h"
 #include "LyX.h"
 #include "FuncRequest.h"
 
@@ -27,6 +28,7 @@
 #include "support/PathChanger.h"
 #include "support/Systemcall.h"
 #include "support/regex.h"
+#include "support/TempFile.h"
 
 #include <fstream>
 
@@ -34,7 +36,6 @@ using namespace std;
 using namespace lyx::support;
 
 
-
 namespace lyx {
 
 
@@ -43,7 +44,7 @@ int VCS::doVCCommandCall(string const & cmd, FileName const & path)
 	LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
 	Systemcall one;
 	support::PathChanger p(path);
-	return one.startscript(Systemcall::Wait, cmd, string(), false);
+	return one.startscript(Systemcall::Wait, cmd, string(), string(), false);
 }
 
 
@@ -58,7 +59,7 @@ int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError
 		owner_->setBusy(false);
 	if (ret && reportError)
 		frontend::Alert::error(_("Revision control error."),
-			bformat(_("Some problem occured while running the command:\n"
+			bformat(_("Some problem occurred while running the command:\n"
 				  "'%1$s'."),
 			from_utf8(cmd)));
 	return ret;
@@ -74,8 +75,8 @@ bool VCS::makeRCSRevision(string const &version, string &revis) const
 		// if positive use as the last number in the whole revision string
 		if (back > 0) {
 			string base;
-			rsplit(version, base , '.' );
-			rev = base + "." + rev;
+			rsplit(version, base , '.');
+			rev = base + '.' + rev;
 		}
 		if (back == 0)
 			rev = version;
@@ -83,14 +84,14 @@ bool VCS::makeRCSRevision(string const &version, string &revis) const
 		// in case of backward indexing
 		if (back < 0) {
 			string cur, base;
-			cur = rsplit(version, base , '.' );
+			cur = rsplit(version, base , '.');
 			if (!isStrInt(cur))
 				return false;
 			int want = convert<int>(cur) + back;
 			if (want <= 0)
 				return false;
-			
-			rev = base + "." + convert<string>(want);
+
+			rev = base + '.' + convert<string>(want);
 		}
 	}
 
@@ -99,11 +100,11 @@ 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();
 	do {
-		FileName tocheck = FileName(addName(dirname.absFileName(), pathname));
+		FileName tocheck = FileName(addName(dirname.absFileName(), vcsdir));
 		LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
 		if (tocheck.exists())
 			return true;
@@ -293,7 +294,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;
@@ -304,7 +306,6 @@ bool RCS::isCheckInWithConfirmation()
 		FileName(owner_->filePath()));
 
 	docstring diff = tmpf.fileContents("UTF-8");
-	tmpf.removeFile();
 
 	if (diff.empty())
 		return false;
@@ -359,7 +360,7 @@ bool RCS::lockingToggleEnabled()
 
 bool RCS::revert()
 {
-	if (doVCCommand("co -f -u" + version_ + " "
+	if (doVCCommand("co -f -u" + version_ + ' '
 		    + quoteName(onlyFileName(owner_->absFileName())),
 		    FileName(owner_->filePath())))
 		return false;
@@ -379,7 +380,7 @@ bool RCS::isRevertWithConfirmation()
 void RCS::undoLast()
 {
 	LYXERR(Debug::LYXVC, "LyXVC: undoLast");
-	doVCCommand("rcs -o" + version_ + " "
+	doVCCommand("rcs -o" + version_ + ' '
 		    + quoteName(onlyFileName(owner_->absFileName())),
 		    FileName(owner_->filePath()));
 }
@@ -434,7 +435,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;
@@ -481,16 +483,19 @@ 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;
 	}
 
-	doVCCommand("co -p" + rev + " "
+	doVCCommand("co -p" + rev + ' '
 	              + quoteName(onlyFileName(owner_->absFileName()))
 		      + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		FileName(owner_->filePath()));
+	tmpf.refresh();
 	if (tmpf.isFileEmpty())
 		return false;
 
@@ -561,6 +566,8 @@ void CVS::scanMaster()
 			// Ok extract the fields.
 			smatch sm;
 
+			// false positive from coverity
+			// coverity[CHECKED_RETURN]
 			regex_match(line, sm, reg);
 
 			//sm[0]; // whole matched string
@@ -635,7 +642,7 @@ docstring CVS::toString(CvsStatus status) const
 	case StatusError:
 		return _("Cannot retrieve CVS status");
 	}
-	return 0;
+	return docstring();
 }
 
 
@@ -658,7 +665,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;
@@ -666,7 +674,6 @@ CVS::CvsStatus CVS::getStatus()
 
 	if (doVCCommandCallWithOutput("cvs status " + getTarget(File),
 		FileName(owner_->filePath()), tmpf)) {
-		tmpf.removeFile();
 		return StatusError;
 	}
 
@@ -676,7 +683,7 @@ CVS::CvsStatus CVS::getStatus()
 	while (ifs) {
 		string line;
 		getline(ifs, line);
-		LYXERR(Debug::LYXVC, line << "\n");
+		LYXERR(Debug::LYXVC, line << '\n');
 		if (prefixIs(line, "File:")) {
 			if (contains(line, "Up-to-date"))
 				status = UpToDate;
@@ -690,7 +697,6 @@ CVS::CvsStatus CVS::getStatus()
 				status = NeedsCheckout;
 		}
 	}
-	tmpf.removeFile();
 	return status;
 }
 
@@ -699,28 +705,28 @@ 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;
 	}
-	
-	int rc = doVCCommandCallWithOutput("cvs log -r" + version_ 
-		+ " " + getTarget(File),
+
+	int rc = doVCCommandCallWithOutput("cvs log -r" + version_
+		+ ' ' + getTarget(File),
 		FileName(owner_->filePath()), tmpf);
 	if (rc) {
-		tmpf.removeFile();
 		LYXERR(Debug::LYXVC, "cvs log failed with exit code " << rc);
 		return;
 	}
-	
+
 	ifstream ifs(tmpf.toFilesystemEncoding().c_str());
 	static regex const reg("date: (.*) (.*) (.*);  author: (.*);  state: (.*);(.*)");
 
 	while (ifs) {
 		string line;
 		getline(ifs, line);
-		LYXERR(Debug::LYXVC, line << "\n");
+		LYXERR(Debug::LYXVC, line << '\n');
 		if (prefixIs(line, "date:")) {
 			smatch sm;
 			regex_match(line, sm, reg);
@@ -732,7 +738,6 @@ void CVS::getRevisionInfo()
 			break;
 		}
 	}
-	tmpf.removeFile();
 	if (rev_author_cache_.empty())
 		LYXERR(Debug::LYXVC,
 		   "Could not retrieve revision info for " << version_ <<
@@ -825,7 +830,7 @@ string CVS::scanLogFile(FileName const & f, string & status)
 	while (ifs) {
 		string line;
 		getline(ifs, line);
-		LYXERR(Debug::LYXVC, line << "\n");
+		LYXERR(Debug::LYXVC, line << '\n');
 		if (!line.empty())
 			status += line + "; ";
 		if (prefixIs(line, "C ")) {
@@ -903,12 +908,13 @@ 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();
 	}
-	
+
 	int rc = update(File, tmpf);
 	string log;
 	string const res = scanLogFile(tmpf, log);
@@ -920,8 +926,7 @@ string CVS::checkOut()
 				from_local8bit(res)));
 		rc = 0;
 	}
-	
-	tmpf.removeFile();
+
 	return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
 }
 
@@ -937,12 +942,13 @@ 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();
 	}
-	
+
 	getDiff(Directory, tmpf);
 	docstring res = tmpf.fileContents("UTF-8");
 	if (!res.empty()) {
@@ -954,16 +960,14 @@ string CVS::repoUpdate()
 				"or you will need to revert back to the repository version."), file);
 		int ret = frontend::Alert::prompt(_("Changes detected"),
 				text, 0, 1, _("&Continue"), _("&Abort"), _("View &Log ..."));
-		if (ret == 2 ) {
+		if (ret == 2) {
 			dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
 			ret = frontend::Alert::prompt(_("Changes detected"),
 				text, 0, 1, _("&Continue"), _("&Abort"));
 			hideDialogs("file", 0);
 		}
-		if (ret == 1 ) {
-			tmpf.removeFile();
+		if (ret == 1)
 			return string();
-		}
 	}
 
 	int rc = update(Directory, tmpf);
@@ -981,8 +985,6 @@ string CVS::repoUpdate()
 				file, from_local8bit(sres)));
 		rc = 0;
 	}
-	
-	tmpf.removeFile();
 
 	return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
 }
@@ -1109,15 +1111,18 @@ 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;
 	}
 
-	doVCCommandWithOutput("cvs update -p -r" + rev + " "
+	doVCCommandWithOutput("cvs update -p -r" + rev + ' '
 		+ getTarget(File),
 		FileName(owner_->filePath()), tmpf);
+	tmpf.refresh();
 	if (tmpf.isFileEmpty())
 		return false;
 
@@ -1157,7 +1162,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();
@@ -1168,7 +1174,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();
 }
@@ -1190,7 +1195,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;
@@ -1320,7 +1326,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.");
@@ -1348,7 +1355,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())
@@ -1370,7 +1376,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;
@@ -1381,7 +1388,6 @@ bool SVN::isCheckInWithConfirmation()
 		FileName(owner_->filePath()));
 
 	docstring diff = tmpf.fileContents("UTF-8");
-	tmpf.removeFile();
 
 	if (diff.empty())
 		return false;
@@ -1400,8 +1406,8 @@ string SVN::scanLogFile(FileName const & f, string & status)
 
 	while (ifs) {
 		getline(ifs, line);
-		LYXERR(Debug::LYXVC, line << "\n");
-		if (!line.empty()) 
+		LYXERR(Debug::LYXVC, line << '\n');
+		if (!line.empty())
 			status += line + "; ";
 		if (prefixIs(line, "C ") || prefixIs(line, "CU ")
 					 || contains(line, "Commit failed")) {
@@ -1456,7 +1462,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.");
@@ -1477,7 +1484,6 @@ string SVN::checkOut()
 
 	fileLock(true, tmpf, log);
 
-	tmpf.removeFile();
 	return log.empty() ? string() : "SVN: " + log;
 }
 
@@ -1493,7 +1499,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.");
@@ -1513,16 +1520,14 @@ string SVN::repoUpdate()
 				"\n\nContinue?"), file);
 		int ret = frontend::Alert::prompt(_("Changes detected"),
 				text, 0, 1, _("&Yes"), _("&No"), _("View &Log ..."));
-		if (ret == 2 ) {
+		if (ret == 2) {
 			dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
 			ret = frontend::Alert::prompt(_("Changes detected"),
 				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.
@@ -1536,7 +1541,6 @@ string SVN::repoUpdate()
 	res += "Update log:\n" + tmpf.fileContents("UTF-8");
 
 	LYXERR(Debug::LYXVC, res);
-	tmpf.removeFile();
 	return to_utf8(res);
 }
 
@@ -1549,7 +1553,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.");
@@ -1577,9 +1582,8 @@ string SVN::lockingToggle()
 	if (ret)
 		return string();
 
-	tmpf.removeFile();
 	frontend::Alert::warning(_("SVN File Locking"),
-		(locking ? _("Locking property unset.") : _("Locking property set.")) + "\n"
+		(locking ? _("Locking property unset.") : _("Locking property set.")) + '\n'
 		+ _("Do not forget to commit the locking property into the repository."),
 		true);
 
@@ -1668,7 +1672,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;
@@ -1714,14 +1719,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;
@@ -1738,7 +1743,6 @@ bool SVN::getTreeRevisionInfo()
 	string line;
 	getline(ifs, line);
 	ifs.close();
-	tmpf.removeFile();
 
 	rev_tree_cache_ = line;
 	return !line.empty();
@@ -1772,16 +1776,19 @@ 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;
 	}
 
-	doVCCommand("svn cat -r " + revname + " "
+	doVCCommand("svn cat -r " + revname + ' '
 	              + quoteName(onlyFileName(owner_->absFileName()))
 		      + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		FileName(owner_->filePath()));
+	tmpf.refresh();
 	if (tmpf.isFileEmpty())
 		return false;
 
@@ -1827,7 +1834,8 @@ 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();
@@ -1840,8 +1848,8 @@ FileName const GIT::findFile(FileName const & file)
 			quoteName(fname) + " > " +
 			quoteName(tmpf.toFilesystemEncoding()),
 			file.onlyPath());
+	tmpf.refresh();
 	bool found = !tmpf.isFileEmpty();
-	tmpf.removeFile();
 	LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled"));
 	return found ? file : FileName();
 }
@@ -1935,7 +1943,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.");
@@ -1960,7 +1969,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())
@@ -1979,7 +1987,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;
@@ -1990,7 +1999,6 @@ bool GIT::isCheckInWithConfirmation()
 		FileName(owner_->filePath()));
 
 	docstring diff = tmpf.fileContents("UTF-8");
-	tmpf.removeFile();
 
 	if (diff.empty())
 		return false;
@@ -2010,7 +2018,7 @@ string GIT::scanLogFile(FileName const & f, string & status)
 	while (ifs) {
 		getline(ifs, line);
 		LYXERR(Debug::LYXVC, line << "\n");
-		if (!line.empty()) 
+		if (!line.empty())
 			status += line + "; ";
 		if (prefixIs(line, "C ") || prefixIs(line, "CU ")
 					 || contains(line, "Commit failed")) {
@@ -2133,7 +2141,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;
@@ -2159,14 +2168,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;
@@ -2182,7 +2191,6 @@ bool GIT::getTreeRevisionInfo()
 	ifstream ifs(tmpf.toFilesystemEncoding().c_str());
 	getline(ifs, rev_tree_cache_);
 	ifs.close();
-	tmpf.removeFile();
 
 	return !rev_tree_cache_.empty();
 }
@@ -2217,9 +2225,11 @@ bool GIT::prepareFileRevision(string const & revis, string & f)
 	else
 		pointer = revis;
 
-	pointer += ":";
+	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;
@@ -2229,6 +2239,7 @@ bool GIT::prepareFileRevision(string const & revis, string & f)
 	              + quoteName(onlyFileName(owner_->absFileName()))
 		      + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		FileName(owner_->filePath()));
+	tmpf.refresh();
 	if (tmpf.isFileEmpty())
 		return false;
 
@@ -2245,7 +2256,7 @@ bool GIT::prepareFileRevisionEnabled()
 
 bool GIT::toggleReadOnlyEnabled()
 {
-	return false;
+	return true;
 }