X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=421a748451923bb63b707f4c6f12601e9c08e414;hb=ee863456a1d0a9261228b6ed5cc40069f441d779;hp=3c1185f92cb6326c029f00a62f60ca479ef886a8;hpb=aaa4169ecef44faf63a8f9f0b9471dfb7f83428d;p=lyx.git

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 3c1185f92c..421a748451 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -45,14 +45,18 @@ int VCS::doVCCommandCall(string const & cmd, FileName const & path){
 
 int VCS::doVCCommand(string const & cmd, FileName const & path)
 {
-	owner_->setBusy(true);
+	if (owner_)
+		owner_->setBusy(true);
+
 	int const ret = doVCCommandCall(cmd, path);
-	owner_->setBusy(false);
+
+	if (owner_)
+		owner_->setBusy(false);
 	if (ret)
 		frontend::Alert::error(_("Revision control error."),
 			bformat(_("Some problem occured while running the command:\n"
 				  "'%1$s'."),
-			from_ascii(cmd)));
+			from_utf8(cmd)));
 	return ret;
 }
 
@@ -76,7 +80,7 @@ FileName const RCS::findFile(FileName const & file)
 	FileName tmp(file.absFilename() + ",v");
 	LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
 	if (tmp.isReadableFile()) {
-		LYXERR(Debug::LYXVC, "Yes " << file << " is under rcs.");
+		LYXERR(Debug::LYXVC, "Yes, " << file << " is under rcs.");
 		return tmp;
 	}
 
@@ -84,7 +88,7 @@ FileName const RCS::findFile(FileName const & file)
 	tmp = FileName(addName(addPath(onlyPath(file.absFilename()), "RCS"), file.absFilename()) + ",v");
 	LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
 	if (tmp.isReadableFile()) {
-		LYXERR(Debug::LYXVC, "Yes " << file << " it is under rcs.");
+		LYXERR(Debug::LYXVC, "Yes, " << file << " is under rcs.");
 		return tmp;
 	}
 
@@ -102,7 +106,10 @@ void RCS::retrieve(FileName const & file)
 
 void RCS::scanMaster()
 {
-	LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster.");
+	if (master_.empty())
+		return;
+
+	LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_);
 
 	ifstream ifs(master_.toFilesystemEncoding().c_str());
 
@@ -197,6 +204,18 @@ bool RCS::checkOutEnabled()
 	return owner_ && owner_->isReadonly();
 }
 
+string RCS::lockingToggle()
+{
+	lyxerr << "Sorry, not implemented." << endl;
+	return string();
+}
+
+
+bool RCS::lockingToggleEnabled()
+{
+	return false;
+}
+
 
 void RCS::revert()
 {
@@ -226,7 +245,7 @@ bool RCS::undoLastEnabled()
 void RCS::getLog(FileName const & tmpf)
 {
 	doVCCommand("rlog " + quoteName(onlyFilename(owner_->absFileName()))
-		    + " > " + tmpf.toFilesystemEncoding(),
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 }
 
@@ -349,7 +368,7 @@ string CVS::checkOut()
 	// cvs update or perhaps for cvs this should be a noop
 	// we need to detect conflict (eg "C" in output)
 	// before we can do this.
-	lyxerr << "Sorry not implemented." << endl;
+	lyxerr << "Sorry, not implemented." << endl;
 	return string();
 }
 
@@ -360,6 +379,19 @@ bool CVS::checkOutEnabled()
 }
 
 
+string CVS::lockingToggle()
+{
+	lyxerr << "Sorry, not implemented." << endl;
+	return string();
+}
+
+
+bool CVS::lockingToggleEnabled()
+{
+	return false;
+}
+
+
 void CVS::revert()
 {
 	// Reverts to the version in CVS repository and
@@ -382,7 +414,7 @@ void CVS::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;
+	lyxerr << "Sorry, not implemented." << endl;
 }
 
 
@@ -395,7 +427,7 @@ bool CVS::undoLastEnabled()
 void CVS::getLog(FileName const & tmpf)
 {
 	doVCCommand("cvs log " + quoteName(onlyFilename(owner_->absFileName()))
-		    + " > " + tmpf.toFilesystemEncoding(),
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 }
 
@@ -412,22 +444,24 @@ bool CVS::toggleReadOnlyEnabled()
 
 SVN::SVN(FileName const & m, FileName const & f)
 {
+	owner_ = 0;
 	master_ = m;
 	file_ = f;
+	locked_mode_ = 0;
 	scanMaster();
 }
 
 
 FileName const SVN::findFile(FileName const & file)
 {
-	// First we look for the CVS/Entries in the same dir
+	// First we look for the .svn/entries in the same dir
 	// where we have file.
 	FileName const entries(onlyPath(file.absFilename()) + "/.svn/entries");
 	string const tmpf = onlyFilename(file.absFilename());
 	LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under svn in `" << entries
 			     << "' for `" << tmpf << '\'');
 	if (entries.isReadableFile()) {
-		// Ok we are at least in a CVS dir. Parse the CVS/Entries
+		// Ok we are at least in a SVN dir. Parse the .svn/entries
 		// and see if we can find this file. We do a fast and
 		// dirty parse here.
 		ifstream ifs(entries.toFilesystemEncoding().c_str());
@@ -446,14 +480,61 @@ FileName const SVN::findFile(FileName const & file)
 
 void SVN::scanMaster()
 {
-	// if we want some locking under svn
-	// we need different infrastructure around
-	locker_ = "Unlocked";
-	vcstatus = UNLOCKED;
+	locker_.clear();
+	vcstatus = NOLOCKING;
+	if (checkLockMode()) {
+		if (isLocked()) {
+			locker_ = "Locked";
+			vcstatus = LOCKED;
+		} else {
+			locker_ = "Unlocked";
+			vcstatus = LOCKED;
+		}
+	}
+}
+
+
+bool SVN::checkLockMode()
+{
+	FileName tmpf = FileName::tempName("lyxvcout");
+	if (tmpf.empty()){
+		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+		return N_("Error: Could not generate logfile.");
+	}
+
+	LYXERR(Debug::LYXVC, "Detecting locking mode...");
+	if (doVCCommandCall("svn proplist " + quoteName(file_.onlyFileName())
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		    file_.onlyPath()))
+		return false;
+
+	ifstream ifs(tmpf.toFilesystemEncoding().c_str());
+	string line;
+	bool ret = false;
+
+	while (ifs) {
+		getline(ifs, line);
+		LYXERR(Debug::LYXVC, line);
+		if (contains(line, "svn:needs-lock"))
+			ret = true;
+	}
+	LYXERR(Debug::LYXVC, "Locking enabled: " << ret);
+	ifs.close();
+	locked_mode_ = ret;
+	return ret;
+
+}
+
+
+bool SVN::isLocked() const
+{
+	//refresh file info
+	FileName file(file_.absFilename());
+	return !file.isReadOnly();
 }
 
 
-void SVN::registrer(string const & msg)
+void SVN::registrer(string const & /*msg*/)
 {
 	doVCCommand("svn add -q " + quoteName(onlyFilename(owner_->absFileName())),
 		    FileName(owner_->filePath()));
@@ -470,16 +551,19 @@ string SVN::checkIn(string const & msg)
 
 	doVCCommand("svn commit -m \"" + msg + "\" "
 		    + quoteName(onlyFilename(owner_->absFileName()))
-		    + " 2> " + tmpf.toFilesystemEncoding(),
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 
 	string log;
 	string res = scanLogFile(tmpf, log);
 	if (!res.empty())
 		frontend::Alert::error(_("Revision control error."),
-				_("Error when commiting to repository.\n"
+				_("Error when committing to repository.\n"
 				"You have to manually resolve the problem.\n"
 				"After pressing OK, LyX will reopen the document."));
+	else
+		fileLock(false, tmpf, log);
+
 	tmpf.erase();
 	return "SVN: " + log;
 }
@@ -487,9 +571,13 @@ string SVN::checkIn(string const & msg)
 
 bool SVN::checkInEnabled()
 {
-	return true;
+	if (locked_mode_)
+		return isLocked();
+	else
+		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()...
@@ -506,12 +594,47 @@ string SVN::scanLogFile(FileName const & f, string & status)
 			ifs.close();
 			return line;
 		}
+		if (contains(line, "svn:needs-lock")) {
+			ifs.close();
+			return line;
+		}
 	}
 	ifs.close();
 	return string();
 }
 
 
+void SVN::fileLock(bool lock, FileName const & tmpf, string &status)
+{
+	if (!locked_mode_ || (isLocked() == lock))
+		return;
+
+	string arg = lock ? "lock " : "unlock ";
+	doVCCommand("svn "+ arg + quoteName(onlyFilename(owner_->absFileName()))
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		    FileName(owner_->filePath()));
+
+	ifstream ifs(tmpf.toFilesystemEncoding().c_str());
+	string line;
+	while (ifs) {
+		getline(ifs, line);
+		if (!line.empty()) status += line + "; ";
+	}
+	ifs.close();
+
+	if (!isLocked() && lock)
+		frontend::Alert::error(_("Revision control error."),
+			_("Error when acquiring write lock.\n"
+			"Most probably another user is editing\n"
+			"the current document now!\n"
+			"Also check the access to the repository."));
+	if (isLocked() && !lock)
+		frontend::Alert::error(_("Revision control error."),
+			_("Error when releasing write lock.\n"
+			"Check the access to the repository."));
+}
+
+
 string SVN::checkOut()
 {
 	FileName tmpf = FileName::tempName("lyxvcout");
@@ -521,7 +644,7 @@ string SVN::checkOut()
 	}
 
 	doVCCommand("svn update " + quoteName(onlyFilename(owner_->absFileName()))
-		    + " > " + tmpf.toFilesystemEncoding(),
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 
 	string log;
@@ -531,7 +654,10 @@ string SVN::checkOut()
 			bformat(_("Error when updating from repository.\n"
 				"You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
 				"After pressing OK, LyX will try to reopen resolved document."),
-			from_ascii(res)));
+			from_local8bit(res)));
+
+	fileLock(true, tmpf, log);
+
 	tmpf.erase();
 	return "SVN: " + log;
 }
@@ -539,10 +665,58 @@ string SVN::checkOut()
 
 bool SVN::checkOutEnabled()
 {
-	return true;
+	if (locked_mode_)
+		return !isLocked();
+	else
+		return true;
+}
+
+
+string SVN::lockingToggle()
+{
+	FileName tmpf = FileName::tempName("lyxvcout");
+	if (tmpf.empty()) {
+		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+		return N_("Error: Could not generate logfile.");
+	}
+
+	int ret = doVCCommand("svn proplist " + quoteName(onlyFilename(owner_->absFileName()))
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		    FileName(owner_->filePath()));
+	if (ret)
+		return string();
+
+	string log;
+	string res = scanLogFile(tmpf, log);
+	bool locking = contains(res, "svn:needs-lock");
+	if (!locking)
+		ret = doVCCommand("svn propset svn:needs-lock ON "
+		    + quoteName(onlyFilename(owner_->absFileName()))
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		    FileName(owner_->filePath()));
+	else
+		ret = doVCCommand("svn propdel svn:needs-lock "
+		    + quoteName(onlyFilename(owner_->absFileName()))
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		    FileName(owner_->filePath()));
+	if (ret)
+		return string();
+
+	tmpf.erase();
+	frontend::Alert::warning(_("VCN File Locking"),
+		(locking ? _("Locking property unset.") : _("Locking property set.")) + "\n"
+		+ _("Do not forget to commit the locking property into the repository."),
+		true);
+
+	return string("SVN: ") +  N_("Locking property set.");
 }
 
 
+bool SVN::lockingToggleEnabled()
+{
+	return true;
+}
+
 void SVN::revert()
 {
 	// Reverts to the version in CVS repository and
@@ -560,7 +734,7 @@ void SVN::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;
+	lyxerr << "Sorry, not implemented." << endl;
 }
 
 
@@ -573,7 +747,7 @@ bool SVN::undoLastEnabled()
 void SVN::getLog(FileName const & tmpf)
 {
 	doVCCommand("svn log " + quoteName(onlyFilename(owner_->absFileName()))
-		    + " > " + tmpf.toFilesystemEncoding(),
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 }