X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=f799587177d719ce57717cb8de1fa43c2aab6fbb;hb=449c766e03d94ddf6c823cfcae845f76f83c0e1c;hp=72148f728321d7deb6158b6f080b74364104c63e;hpb=26dd4d0c15b438543eaa9bab14cab748b3299bc9;p=lyx.git

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 72148f7283..f799587177 100644
--- 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 {
 
 
@@ -68,14 +68,14 @@ int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError
 bool VCS::makeRCSRevision(string const &version, string &revis) const
 {
 	string rev = revis;
-	
+
 	if (isStrInt(rev)) {
 		int back = convert<int>(rev);
 		// 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 +83,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,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
@@ -124,6 +122,8 @@ bool VCS::checkparentdirs(FileName const & file, std::string const & pathname)
 
 RCS::RCS(FileName const & m, Buffer * b) : VCS(b)
 {
+	// Here we know that the buffer file is either already in RCS or
+	// about to be registered
 	master_ = m;
 	scanMaster();
 }
@@ -293,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;
@@ -304,7 +305,6 @@ bool RCS::isCheckInWithConfirmation()
 		FileName(owner_->filePath()));
 
 	docstring diff = tmpf.fileContents("UTF-8");
-	tmpf.removeFile();
 
 	if (diff.empty())
 		return false;
@@ -359,7 +359,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 +379,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()));
 }
@@ -404,7 +404,7 @@ bool RCS::toggleReadOnlyEnabled()
 	// This got broken somewhere along lfuns dispatch reorganization.
 	// reloadBuffer would be needed after this, but thats problematic
 	// since we are inside Buffer::dispatch.
-	// return return status() != UNVERSIONED;
+	// return true;
 	return false;
 }
 
@@ -434,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;
@@ -481,13 +482,15 @@ 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()));
@@ -513,6 +516,8 @@ bool RCS::prepareFileRevisionEnabled()
 
 CVS::CVS(FileName const & m, Buffer * b) : VCS(b)
 {
+	// Here we know that the buffer file is either already in CVS or
+	// about to be registered
 	master_ = m;
 	have_rev_info_ = false;
 	scanMaster();
@@ -553,7 +558,6 @@ void CVS::scanMaster()
 	LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\'');
 	string line;
 	static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
-	vcstatus = UNVERSIONED;
 	while (getline(ifs, line)) {
 		LYXERR(Debug::LYXVC, "\t  line: " << line);
 		if (contains(line, tmpf)) {
@@ -634,7 +638,7 @@ docstring CVS::toString(CvsStatus status) const
 	case StatusError:
 		return _("Cannot retrieve CVS status");
 	}
-	return 0;
+	return docstring();
 }
 
 
@@ -657,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;
@@ -665,7 +670,6 @@ CVS::CvsStatus CVS::getStatus()
 
 	if (doVCCommandCallWithOutput("cvs status " + getTarget(File),
 		FileName(owner_->filePath()), tmpf)) {
-		tmpf.removeFile();
 		return StatusError;
 	}
 
@@ -675,7 +679,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;
@@ -689,7 +693,6 @@ CVS::CvsStatus CVS::getStatus()
 				status = NeedsCheckout;
 		}
 	}
-	tmpf.removeFile();
 	return status;
 }
 
@@ -698,28 +701,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);
@@ -731,7 +734,6 @@ void CVS::getRevisionInfo()
 			break;
 		}
 	}
-	tmpf.removeFile();
 	if (rev_author_cache_.empty())
 		LYXERR(Debug::LYXVC,
 		   "Could not retrieve revision info for " << version_ <<
@@ -824,7 +826,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 ")) {
@@ -902,12 +904,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);
@@ -919,8 +922,7 @@ string CVS::checkOut()
 				from_local8bit(res)));
 		rc = 0;
 	}
-	
-	tmpf.removeFile();
+
 	return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
 }
 
@@ -936,12 +938,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()) {
@@ -953,16 +956,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);
@@ -980,8 +981,6 @@ string CVS::repoUpdate()
 				file, from_local8bit(sres)));
 		rc = 0;
 	}
-	
-	tmpf.removeFile();
 
 	return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
 }
@@ -1108,13 +1107,15 @@ 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);
 	if (tmpf.isFileEmpty())
@@ -1139,6 +1140,8 @@ bool CVS::prepareFileRevisionEnabled()
 
 SVN::SVN(FileName const & m, Buffer * b) : VCS(b)
 {
+	// Here we know that the buffer file is either already in SVN or
+	// about to be registered
 	master_ = m;
 	locked_mode_ = 0;
 	scanMaster();
@@ -1154,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();
@@ -1165,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();
 }
@@ -1173,26 +1176,22 @@ FileName const SVN::findFile(FileName const & file)
 
 void SVN::scanMaster()
 {
-	// vcstatus code other than UNVERSIONED is somewhat superflous,
+	// vcstatus code is somewhat superflous,
 	// until we want to implement read-only toggle for svn.
-	FileName f = findFile(owner_->fileName());
-	if (f.empty()) {
-		vcstatus = UNVERSIONED;
-	} else {
-		vcstatus = NOLOCKING;
-		if (checkLockMode()) {
-			if (isLocked())
-				vcstatus = LOCKED;
-			else
-				vcstatus = UNLOCKED;
-		}
+	vcstatus = NOLOCKING;
+	if (checkLockMode()) {
+		if (isLocked())
+			vcstatus = LOCKED;
+		else
+			vcstatus = UNLOCKED;
 	}
 }
 
 
 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;
@@ -1402,8 +1401,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")) {
@@ -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.");
@@ -1515,16 +1515,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.
@@ -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,9 +1577,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);
 
@@ -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,13 +1771,15 @@ 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()));
@@ -1813,6 +1812,8 @@ bool SVN::toggleReadOnlyEnabled()
 
 GIT::GIT(FileName const & m, Buffer * b) : VCS(b)
 {
+	// Here we know that the buffer file is either already in GIT or
+	// about to be registered
 	master_ = m;
 	scanMaster();
 }
@@ -1827,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();
 }
@@ -1867,13 +1850,9 @@ FileName const GIT::findFile(FileName const & file)
 
 void GIT::scanMaster()
 {
-	// vcstatus code other than UNVERSIONED is somewhat superflous,
+	// vcstatus code is somewhat superflous,
 	// until we want to implement read-only toggle for git.
-	FileName f = findFile(owner_->fileName());
-	if (f.empty())
-		vcstatus = UNVERSIONED;
-	else
-		vcstatus = NOLOCKING;
+	vcstatus = NOLOCKING;
 }
 
 
@@ -1957,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.");
@@ -1982,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())
@@ -2001,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;
@@ -2012,7 +1992,6 @@ bool GIT::isCheckInWithConfirmation()
 		FileName(owner_->filePath()));
 
 	docstring diff = tmpf.fileContents("UTF-8");
-	tmpf.removeFile();
 
 	if (diff.empty())
 		return false;
@@ -2032,7 +2011,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")) {
@@ -2155,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;
@@ -2181,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;
@@ -2204,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,9 +2218,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;