X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=0e10aaafca0a7ba72698c0c5459dda2893a3e8de;hb=5a8b8ba8e11360a716465b9c6c7c0dc48f37f552;hp=e4bc3f2fc6391fc47a0ed703edcbf9465903099b;hpb=0526eb9d47008ba8d63452a32e8cdc73a272b7f1;p=lyx.git

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index e4bc3f2fc6..0e10aaafca 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,7 +68,7 @@ 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
@@ -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();
 }
@@ -246,6 +246,12 @@ string RCS::rename(support::FileName const & /*newFile*/, string const & /*msg*/
 }
 
 
+bool RCS::copyEnabled()
+{
+	return true;
+}
+
+
 string RCS::copy(support::FileName const & newFile, string const & msg)
 {
 	// RCS has no real copy command, so we create a poor mans version
@@ -270,7 +276,7 @@ LyXVC::CommandResult RCS::checkIn(string const & msg, string & log)
 	if (ret)
 		return LyXVC::ErrorCommand;
 	log = "RCS: Proceeded";
-	return LyXVC::Success;
+	return LyXVC::VCSuccess;
 }
 
 
@@ -287,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;
@@ -298,7 +305,6 @@ bool RCS::isCheckInWithConfirmation()
 		FileName(owner_->filePath()));
 
 	docstring diff = tmpf.fileContents("UTF-8");
-	tmpf.removeFile();
 
 	if (diff.empty())
 		return false;
@@ -398,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;
 }
 
@@ -428,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;
@@ -475,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;
@@ -507,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();
@@ -547,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)) {
@@ -651,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;
@@ -659,7 +670,6 @@ CVS::CvsStatus CVS::getStatus()
 
 	if (doVCCommandCallWithOutput("cvs status " + getTarget(File),
 		FileName(owner_->filePath()), tmpf)) {
-		tmpf.removeFile();
 		return StatusError;
 	}
 
@@ -683,7 +693,6 @@ CVS::CvsStatus CVS::getStatus()
 				status = NeedsCheckout;
 		}
 	}
-	tmpf.removeFile();
 	return status;
 }
 
@@ -692,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;
@@ -702,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;
 	}
@@ -725,7 +734,6 @@ void CVS::getRevisionInfo()
 			break;
 		}
 	}
-	tmpf.removeFile();
 	if (rev_author_cache_.empty())
 		LYXERR(Debug::LYXVC,
 		   "Could not retrieve revision info for " << version_ <<
@@ -761,6 +769,12 @@ string CVS::rename(support::FileName const & newFile, string const & msg)
 }
 
 
+bool CVS::copyEnabled()
+{
+	return true;
+}
+
+
 string CVS::copy(support::FileName const & newFile, string const & msg)
 {
 	// CVS has no real copy command, so we create a poor mans version
@@ -834,7 +848,7 @@ LyXVC::CommandResult CVS::checkIn(string const & msg, string & log)
 			if (unedit())
 				return LyXVC::ErrorCommand;
 		log = "CVS: Proceeded";
-		return LyXVC::Success;
+		return LyXVC::VCSuccess;
 	case LocallyModified:
 	case LocallyAdded: {
 		int rc = doVCCommand("cvs -q commit -m \"" + msg + "\" "
@@ -843,7 +857,7 @@ LyXVC::CommandResult CVS::checkIn(string const & msg, string & log)
 		if (rc)
 			return LyXVC::ErrorCommand;
 		log = "CVS: Proceeded";
-		return LyXVC::Success;
+		return LyXVC::VCSuccess;
 	}
 	case NeedsMerge:
 	case NeedsCheckout:
@@ -890,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();
@@ -908,7 +923,6 @@ string CVS::checkOut()
 		rc = 0;
 	}
 	
-	tmpf.removeFile();
 	return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
 }
 
@@ -924,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();
@@ -947,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);
@@ -968,8 +981,6 @@ string CVS::repoUpdate()
 				file, from_local8bit(sres)));
 		rc = 0;
 	}
-	
-	tmpf.removeFile();
 
 	return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
 }
@@ -1096,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;
@@ -1127,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();
@@ -1142,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();
@@ -1160,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;
@@ -1261,7 +1273,7 @@ string SVN::rename(support::FileName const & newFile, string const & msg)
 	f.push_back(owner_->fileName());
 	f.push_back(newFile);
 	string log;
-	if (checkIn(f, msg, log) != LyXVC::Success) {
+	if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
 		cmd = "svn revert -q " +
 			quoteName(onlyFileName(owner_->absFileName())) + ' ' +
 			quoteName(relFile);
@@ -1274,6 +1286,12 @@ string SVN::rename(support::FileName const & newFile, string const & msg)
 }
 
 
+bool SVN::copyEnabled()
+{
+	return true;
+}
+
+
 string SVN::copy(support::FileName const & newFile, string const & msg)
 {
 	// svn copy does not require a log message, since it does not commit.
@@ -1287,7 +1305,7 @@ string SVN::copy(support::FileName const & newFile, string const & msg)
 		return string();
 	vector<support::FileName> f(1, newFile);
 	string log;
-	if (checkIn(f, msg, log) == LyXVC::Success)
+	if (checkIn(f, msg, log) == LyXVC::VCSuccess)
 		return log;
 	return string();
 }
@@ -1303,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.");
@@ -1317,7 +1336,7 @@ SVN::checkIn(vector<support::FileName> const & f, string const & msg, string & l
 	os << " > " << quoteName(tmpf.toFilesystemEncoding());
 	LyXVC::CommandResult ret =
 		doVCCommand(os.str(), FileName(owner_->filePath())) ?
-			LyXVC::ErrorCommand : LyXVC::Success;
+			LyXVC::ErrorCommand : LyXVC::VCSuccess;
 
 	string res = scanLogFile(tmpf, log);
 	if (!res.empty()) {
@@ -1331,10 +1350,9 @@ 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::Success && log.empty())
+	if (ret == LyXVC::VCSuccess && log.empty())
 		log = "SVN: Proceeded";
 	return ret;
 }
@@ -1353,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;
@@ -1364,7 +1383,6 @@ bool SVN::isCheckInWithConfirmation()
 		FileName(owner_->filePath()));
 
 	docstring diff = tmpf.fileContents("UTF-8");
-	tmpf.removeFile();
 
 	if (diff.empty())
 		return false;
@@ -1439,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.");
@@ -1460,7 +1479,6 @@ string SVN::checkOut()
 
 	fileLock(true, tmpf, log);
 
-	tmpf.removeFile();
 	return log.empty() ? string() : "SVN: " + log;
 }
 
@@ -1476,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.");
@@ -1502,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.
@@ -1519,7 +1536,6 @@ string SVN::repoUpdate()
 	res += "Update log:\n" + tmpf.fileContents("UTF-8");
 
 	LYXERR(Debug::LYXVC, res);
-	tmpf.removeFile();
 	return to_utf8(res);
 }
 
@@ -1532,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.");
@@ -1560,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."),
@@ -1616,13 +1632,13 @@ bool SVN::undoLastEnabled()
 string SVN::revisionInfo(LyXVC::RevisionInfo const info)
 {
 	if (info == LyXVC::Tree) {
-			if (rev_tree_cache_.empty())
-				if (!getTreeRevisionInfo())
-					rev_tree_cache_ = "?";
-			if (rev_tree_cache_ == "?")
-				return string();
+		if (rev_tree_cache_.empty())
+			if (!getTreeRevisionInfo())
+				rev_tree_cache_ = "?";
+		if (rev_tree_cache_ == "?")
+			return string();
 
-			return rev_tree_cache_;
+		return rev_tree_cache_;
 	}
 
 	// fill the rest of the attributes for a single file
@@ -1651,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;
@@ -1697,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;
@@ -1721,7 +1738,6 @@ bool SVN::getTreeRevisionInfo()
 	string line;
 	getline(ifs, line);
 	ifs.close();
-	tmpf.removeFile();
 
 	rev_tree_cache_ = line;
 	return !line.empty();
@@ -1755,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;
@@ -1786,4 +1804,452 @@ bool SVN::toggleReadOnlyEnabled()
 }
 
 
+/////////////////////////////////////////////////////////////////////
+//
+// GIT
+//
+/////////////////////////////////////////////////////////////////////
+
+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();
+}
+
+
+FileName const GIT::findFile(FileName const & file)
+{
+	// First we check the existence of repository meta data.
+	if (!VCS::checkparentdirs(file, ".git")) {
+		LYXERR(Debug::LYXVC, "Cannot find GIT meta data for " << file);
+		return FileName();
+	}
+
+	// Now we check the status of the file.
+	TempFile tempfile("lyxvcout");
+	FileName tmpf = tempfile.name();
+	if (tmpf.empty()) {
+		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+		return FileName();
+	}
+
+	string const fname = onlyFileName(file.absFileName());
+	LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under git control for `"
+			<< fname << '\'');
+	doVCCommandCall("git ls-files " +
+			quoteName(fname) + " > " +
+			quoteName(tmpf.toFilesystemEncoding()),
+			file.onlyPath());
+	bool found = !tmpf.isFileEmpty();
+	LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled"));
+	return found ? file : FileName();
+}
+
+
+void GIT::scanMaster()
+{
+	// vcstatus code is somewhat superflous,
+	// until we want to implement read-only toggle for git.
+	vcstatus = NOLOCKING;
+}
+
+
+bool GIT::retrieve(FileName const & file)
+{
+	LYXERR(Debug::LYXVC, "LyXVC::GIT: retrieve.\n\t" << file);
+	// The caller ensures that file does not exist, so no need to check that.
+	return doVCCommandCall("git checkout -q " + quoteName(file.onlyFileName()),
+	                       file.onlyPath()) == 0;
+}
+
+
+void GIT::registrer(string const & /*msg*/)
+{
+	doVCCommand("git add " + quoteName(onlyFileName(owner_->absFileName())),
+		    FileName(owner_->filePath()));
+}
+
+
+bool GIT::renameEnabled()
+{
+	return true;
+}
+
+
+string GIT::rename(support::FileName const & newFile, string const & msg)
+{
+	// git mv does not require a log message, since it does not commit.
+	// In LyX we commit immediately afterwards, otherwise it could be
+	// confusing to the user to have two uncommitted files.
+	FileName path(owner_->filePath());
+	string relFile(to_utf8(newFile.relPath(path.absFileName())));
+	string cmd("git mv " + quoteName(onlyFileName(owner_->absFileName())) +
+	           ' ' + quoteName(relFile));
+	if (doVCCommand(cmd, path)) {
+		cmd = "git checkout -q " +
+			quoteName(onlyFileName(owner_->absFileName())) + ' ' +
+			quoteName(relFile);
+		doVCCommand(cmd, path);
+		if (newFile.exists())
+			newFile.removeFile();
+		return string();
+	}
+	vector<support::FileName> f;
+	f.push_back(owner_->fileName());
+	f.push_back(newFile);
+	string log;
+	if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
+		cmd = "git checkout -q " +
+			quoteName(onlyFileName(owner_->absFileName())) + ' ' +
+			quoteName(relFile);
+		doVCCommand(cmd, path);
+		if (newFile.exists())
+			newFile.removeFile();
+		return string();
+	}
+	return log;
+}
+
+
+bool GIT::copyEnabled()
+{
+	return false;
+}
+
+
+string GIT::copy(support::FileName const & /*newFile*/, string const & /*msg*/)
+{
+	// git does not support copy with history preservation
+	return string();
+}
+
+
+LyXVC::CommandResult GIT::checkIn(string const & msg, string & log)
+{
+	vector<support::FileName> f(1, owner_->fileName());
+	return checkIn(f, msg, log);
+}
+
+
+LyXVC::CommandResult
+GIT::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
+{
+	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.");
+		return LyXVC::ErrorBefore;
+	}
+
+	ostringstream os;
+	os << "git commit -m \"" << msg << '"';
+	for (size_t i = 0; i < f.size(); ++i)
+		os << ' ' << quoteName(f[i].onlyFileName());
+	os << " > " << quoteName(tmpf.toFilesystemEncoding());
+	LyXVC::CommandResult ret =
+		doVCCommand(os.str(), FileName(owner_->filePath())) ?
+			LyXVC::ErrorCommand : LyXVC::VCSuccess;
+
+	string res = scanLogFile(tmpf, log);
+	if (!res.empty()) {
+		frontend::Alert::error(_("Revision control error."),
+				_("Error when committing to repository.\n"
+				"You have to manually resolve the problem.\n"
+				"LyX will reopen the document after you press OK."));
+		ret = LyXVC::ErrorCommand;
+	}
+
+	if (!log.empty())
+		log.insert(0, "GIT: ");
+	if (ret == LyXVC::VCSuccess && log.empty())
+		log = "GIT: Proceeded";
+	return ret;
+}
+
+
+bool GIT::checkInEnabled()
+{
+	return true;
+}
+
+
+bool GIT::isCheckInWithConfirmation()
+{
+	// FIXME one day common getDiff and perhaps OpMode for all backends
+
+	TempFile tempfile("lyxvcout");
+	FileName tmpf = tempfile.name();
+	if (tmpf.empty()) {
+		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+		return true;
+	}
+
+	doVCCommandCall("git diff " + quoteName(owner_->absFileName())
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		FileName(owner_->filePath()));
+
+	docstring diff = tmpf.fileContents("UTF-8");
+
+	if (diff.empty())
+		return false;
+
+	return true;
+}
+
+
+// FIXME Correctly return code should be checked instead of this.
+// This would need another solution than just plain startscript.
+// Hint from Andre': QProcess::readAllStandardError()...
+string GIT::scanLogFile(FileName const & f, string & status)
+{
+	ifstream ifs(f.toFilesystemEncoding().c_str());
+	string line;
+
+	while (ifs) {
+		getline(ifs, line);
+		LYXERR(Debug::LYXVC, line << "\n");
+		if (!line.empty()) 
+			status += line + "; ";
+		if (prefixIs(line, "C ") || prefixIs(line, "CU ")
+					 || contains(line, "Commit failed")) {
+			ifs.close();
+			return line;
+		}
+	}
+	ifs.close();
+	return string();
+}
+
+
+string GIT::checkOut()
+{
+	return string();
+}
+
+
+bool GIT::checkOutEnabled()
+{
+	return false;
+}
+
+
+string GIT::repoUpdate()
+{
+	return string();
+}
+
+
+bool GIT::repoUpdateEnabled()
+{
+	return false;
+}
+
+
+string GIT::lockingToggle()
+{
+	return string();
+}
+
+
+bool GIT::lockingToggleEnabled()
+{
+	return false;
+}
+
+
+bool GIT::revert()
+{
+	// Reverts to the version in GIT repository and
+	// gets the updated version from the repository.
+	string const fil = quoteName(onlyFileName(owner_->absFileName()));
+
+	if (doVCCommand("git checkout -q " + fil,
+		    FileName(owner_->filePath())))
+		return false;
+	owner_->markClean();
+	return true;
+}
+
+
+bool GIT::isRevertWithConfirmation()
+{
+	//FIXME owner && diff
+	return true;
+}
+
+
+void GIT::undoLast()
+{
+	// merge the current with the previous version
+	// in a reverse patch kind of way, so that the
+	// result is to revert the last changes.
+	lyxerr << "Sorry, not implemented." << endl;
+}
+
+
+bool GIT::undoLastEnabled()
+{
+	return false;
+}
+
+
+string GIT::revisionInfo(LyXVC::RevisionInfo const info)
+{
+	if (info == LyXVC::Tree) {
+		if (rev_tree_cache_.empty())
+			if (!getTreeRevisionInfo())
+				rev_tree_cache_ = "?";
+		if (rev_tree_cache_ == "?")
+			return string();
+
+		return rev_tree_cache_;
+	}
+
+	// fill the rest of the attributes for a single file
+	if (rev_file_cache_.empty())
+		if (!getFileRevisionInfo())
+			rev_file_cache_ = "?";
+
+	switch (info) {
+		case LyXVC::File:
+			if (rev_file_cache_ == "?")
+				return string();
+			return rev_file_cache_;
+		case LyXVC::Author:
+			return rev_author_cache_;
+		case LyXVC::Date:
+			return rev_date_cache_;
+		case LyXVC::Time:
+			return rev_time_cache_;
+		default: ;
+
+	}
+
+	return string();
+}
+
+
+bool GIT::getFileRevisionInfo()
+{
+	TempFile tempfile("lyxvcout");
+	FileName tmpf = tempfile.name();
+	if (tmpf.empty()) {
+		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+		return false;
+	}
+
+	doVCCommand("git log -n 1 --pretty=format:%H%n%an%n%ai " + quoteName(onlyFileName(owner_->absFileName()))
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		    FileName(owner_->filePath()));
+
+	if (tmpf.empty())
+		return false;
+
+	ifstream ifs(tmpf.toFilesystemEncoding().c_str());
+
+	if (ifs)
+		getline(ifs, rev_file_cache_);
+	if (ifs)
+		getline(ifs, rev_author_cache_);
+	if (ifs) {
+		string line;
+		getline(ifs, line);
+		rev_time_cache_ = split(line, rev_date_cache_, ' ');
+	}
+
+	ifs.close();
+	return !rev_file_cache_.empty();
+}
+
+
+bool GIT::getTreeRevisionInfo()
+{
+	TempFile tempfile("lyxvcout");
+	FileName tmpf = tempfile.name();
+	if (tmpf.empty()) {
+		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+		return false;
+	}
+
+	doVCCommand("git describe --abbrev --dirty --long > " + quoteName(tmpf.toFilesystemEncoding()),
+		    FileName(owner_->filePath()));
+
+	if (tmpf.empty())
+		return false;
+
+	// only first line in case something bad happens.
+	ifstream ifs(tmpf.toFilesystemEncoding().c_str());
+	getline(ifs, rev_tree_cache_);
+	ifs.close();
+
+	return !rev_tree_cache_.empty();
+}
+
+
+void GIT::getLog(FileName const & tmpf)
+{
+	doVCCommand("git log " + quoteName(onlyFileName(owner_->absFileName()))
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		    FileName(owner_->filePath()));
+}
+
+
+//at this moment we don't accept revision SHA, but just number of revision steps back
+//GUI and infrastucture needs to be changed first
+bool GIT::prepareFileRevision(string const & revis, string & f)
+{
+	// anything positive means we got hash, not "0" or minus revision
+	int rev = 1;
+
+	// hash is rarely number and should be long
+	if (isStrInt(revis) && revis.length()<20)
+		rev = convert<int>(revis);
+
+	// revision and filename
+	string pointer;
+
+	// go back for "minus" revisions
+	if (rev <= 0)
+		pointer = "HEAD~" + convert<string>(-rev);
+	// normal hash
+	else
+		pointer = revis;
+
+	pointer += ":";
+
+	TempFile tempfile("lyxvcrev_" + revis + "_");
+	tempfile.setAutoRemove(false);
+	FileName tmpf = tempfile.name();
+	if (tmpf.empty()) {
+		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+		return false;
+	}
+
+	doVCCommand("git show " + pointer + "./"
+	              + quoteName(onlyFileName(owner_->absFileName()))
+		      + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		FileName(owner_->filePath()));
+	if (tmpf.isFileEmpty())
+		return false;
+
+	f = tmpf.absFileName();
+	return true;
+}
+
+
+bool GIT::prepareFileRevisionEnabled()
+{
+	return true;
+}
+
+
+bool GIT::toggleReadOnlyEnabled()
+{
+	return false;
+}
+
+
 } // namespace lyx