X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=5d8e33d4eaeb0951c70c6e357e22e80456729b6f;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=8dcef4332f7d822772d4c3dd5dcd86dd371e4023;hpb=e46613d70bc14d5a4e5833782f912b64e451c25d;p=lyx.git

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 8dcef4332f..5d8e33d4ea 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.
  */
@@ -12,8 +12,11 @@
 
 #include "VCBackend.h"
 #include "Buffer.h"
+#include "LyXFunc.h"
+#include "FuncRequest.h"
 
 #include "frontends/alert.h"
+#include "frontends/Application.h"
 
 #include "support/debug.h"
 #include "support/filetools.h"
@@ -36,23 +39,29 @@ using boost::smatch;
 namespace lyx {
 
 
-int VCS::doVCCommandCall(string const & cmd, FileName const & path){
+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);
+	return one.startscript(Systemcall::Wait, cmd, false);
 }
 
+
 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 +85,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 +93,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 +111,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());
 
@@ -170,23 +182,27 @@ void RCS::registrer(string const & msg)
 }
 
 
-void RCS::checkIn(string const & msg)
+string RCS::checkIn(string const & msg)
 {
-	doVCCommand("ci -q -u -m\"" + msg + "\" "
+	int ret = doVCCommand("ci -q -u -m\"" + msg + "\" "
 		    + quoteName(onlyFilename(owner_->absFileName())),
 		    FileName(owner_->filePath()));
+	return ret ? string() : "RCS: Proceeded";
 }
 
+
 bool RCS::checkInEnabled()
 {
 	return owner_ && !owner_->isReadonly();
 }
 
-void RCS::checkOut()
+
+string RCS::checkOut()
 {
 	owner_->markClean();
-	doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->absFileName())),
+	int ret = doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->absFileName())),
 		    FileName(owner_->filePath()));
+	return ret ? string() : "RCS: Proceeded";
 }
 
 
@@ -196,6 +212,32 @@ bool RCS::checkOutEnabled()
 }
 
 
+string RCS::repoUpdate()
+{
+	lyxerr << "Sorry, not implemented." << endl;
+	return string();
+}
+
+
+bool RCS::repoUpdateEnabled()
+{
+	return false;
+}
+
+
+string RCS::lockingToggle()
+{
+	lyxerr << "Sorry, not implemented." << endl;
+	return string();
+}
+
+
+bool RCS::lockingToggleEnabled()
+{
+	return false;
+}
+
+
 void RCS::revert()
 {
 	doVCCommand("co -f -u" + version() + " "
@@ -224,14 +266,18 @@ bool RCS::undoLastEnabled()
 void RCS::getLog(FileName const & tmpf)
 {
 	doVCCommand("rlog " + quoteName(onlyFilename(owner_->absFileName()))
-		    + " > " + tmpf.toFilesystemEncoding(),
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 }
 
 
 bool RCS::toggleReadOnlyEnabled()
 {
-	return true;
+	// This got broken somewhere along lfuns dispatch reorganization.
+	// reloadBuffer would be needed after this, but thats problematic
+	// since we are inside Buffer::dispatch.
+	// return true;
+	return false;
 }
 
 
@@ -327,11 +373,12 @@ void CVS::registrer(string const & msg)
 }
 
 
-void CVS::checkIn(string const & msg)
+string CVS::checkIn(string const & msg)
 {
-	doVCCommand("cvs -q commit -m \"" + msg + "\" "
+	int ret = doVCCommand("cvs -q commit -m \"" + msg + "\" "
 		    + quoteName(onlyFilename(owner_->absFileName())),
 		    FileName(owner_->filePath()));
+	return ret ? string() : "CVS: Proceeded";
 }
 
 
@@ -341,12 +388,13 @@ bool CVS::checkInEnabled()
 }
 
 
-void CVS::checkOut()
+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();
 }
 
 
@@ -356,6 +404,32 @@ bool CVS::checkOutEnabled()
 }
 
 
+string CVS::repoUpdate()
+{
+	lyxerr << "Sorry, not implemented." << endl;
+	return string();
+}
+
+
+bool CVS::repoUpdateEnabled()
+{
+	return false;
+}
+
+
+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
@@ -378,7 +452,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;
 }
 
 
@@ -391,10 +465,11 @@ bool CVS::undoLastEnabled()
 void CVS::getLog(FileName const & tmpf)
 {
 	doVCCommand("cvs log " + quoteName(onlyFilename(owner_->absFileName()))
-		    + " > " + tmpf.toFilesystemEncoding(),
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 }
 
+
 bool CVS::toggleReadOnlyEnabled()
 {
 	return false;
@@ -408,22 +483,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());
@@ -442,52 +519,109 @@ 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 code is somewhat superflous, until we want
+	// to implement read-only toggle for svn.
+	vcstatus = NOLOCKING;
+	if (checkLockMode()) {
+		if (isLocked()) {
+			locker_ = "Locked";
+			vcstatus = LOCKED;
+		} else {
+			locker_ = "Unlocked";
+			vcstatus = UNLOCKED;
+		}
+	}
 }
 
 
-void SVN::registrer(string const & msg)
+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
+{
+	file_.refresh();
+	return !file_.isReadOnly();
+}
+
+
+void SVN::registrer(string const & /*msg*/)
 {
 	doVCCommand("svn add -q " + quoteName(onlyFilename(owner_->absFileName())),
 		    FileName(owner_->filePath()));
 }
 
 
-void SVN::checkIn(string const & msg)
+string SVN::checkIn(string const & msg)
 {
 	FileName tmpf = FileName::tempName("lyxvcout");
 	if (tmpf.empty()){
 		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
-		return;
+		return N_("Error: Could not generate logfile.");
 	}
 
 	doVCCommand("svn commit -m \"" + msg + "\" "
 		    + quoteName(onlyFilename(owner_->absFileName()))
-		    + " 2> " + tmpf.toFilesystemEncoding(),
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 
-	string res = scanLogFile(tmpf);
+	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 log.empty() ? string() : "SVN: " + log;
 }
 
 
 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()...
-string SVN::scanLogFile(FileName const & f)
+string SVN::scanLogFile(FileName const & f, string & status)
 {
 	ifstream ifs(f.toFilesystemEncoding().c_str());
 	string line;
@@ -495,39 +629,187 @@ string SVN::scanLogFile(FileName const & f)
 	while (ifs) {
 		getline(ifs, line);
 		lyxerr << line << "\n";
-		if (prefixIs(line, "C "))
+		if (!line.empty()) status += line + "; ";
+		if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
+			ifs.close();
 			return line;
-		if (contains(line, "Commit failed"))
+		}
+		if (contains(line, "svn:needs-lock")) {
+			ifs.close();
 			return line;
+		}
 	}
+	ifs.close();
 	return string();
 }
 
 
-void SVN::checkOut()
+void SVN::fileLock(bool lock, FileName const & tmpf, string &status)
+{
+	if (!locked_mode_ || (isLocked() == lock))
+		return;
+
+	string const arg = lock ? "lock " : "unlock ";
+	doVCCommand("svn "+ arg + quoteName(onlyFilename(owner_->absFileName()))
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
+		    FileName(owner_->filePath()));
+
+	// Lock error messages go unfortunately on stderr and are unreachible this way.
+	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");
 	if (tmpf.empty()) {
 		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
-		return;
+		return N_("Error: Could not generate logfile.");
 	}
 
 	doVCCommand("svn update " + quoteName(onlyFilename(owner_->absFileName()))
-		    + " > " + tmpf.toFilesystemEncoding(),
+		    + " > " + quoteName(tmpf.toFilesystemEncoding()),
 		    FileName(owner_->filePath()));
 
-	string res = scanLogFile(tmpf);
+	string log;
+	string res = scanLogFile(tmpf, log);
 	if (!res.empty())
 		frontend::Alert::error(_("Revision control error."),
 			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)));
+				"After pressing OK, LyX will try to reopen the resolved document."),
+			from_local8bit(res)));
+
+	fileLock(true, tmpf, log);
+
 	tmpf.erase();
+	return log.empty() ? string() : "SVN: " + log;
 }
 
 
 bool SVN::checkOutEnabled()
+{
+	if (locked_mode_)
+		return !isLocked();
+	else
+		return true;
+}
+
+
+string SVN::repoUpdate()
+{
+	FileName tmpf = FileName::tempName("lyxvcout");
+	if (tmpf.empty()) {
+		LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+		return N_("Error: Could not generate logfile.");
+	}
+
+	doVCCommand("svn diff " + quoteName(owner_->filePath())
+	+ " > " + quoteName(tmpf.toFilesystemEncoding()),
+	FileName(owner_->filePath()));
+	docstring res = tmpf.fileContents("UTF-8");
+	if (!res.empty()) {
+		LYXERR(Debug::LYXVC, "Diff detected:\n" << res);
+		docstring const file = from_utf8(owner_->filePath());
+		docstring text = bformat(_("There were detected changes "
+		                "in the working directory:\n%1$s\n\n"
+				"In case of file conflict version of the local directory files "
+				"will be preferred."
+				"\n\nContinue?"), file);
+		int ret = frontend::Alert::prompt(_("Changes detected"),
+				text, 0, 1, _("&Yes"), _("&No"), _("View &Log ..."));
+		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.erase();
+			return string();
+		}
+	}
+
+	// Reverting looks too harsh, see bug #6255.
+	// doVCCommand("svn revert -R " + quoteName(owner_->filePath())
+	// + " > " + quoteName(tmpf.toFilesystemEncoding()),
+	// FileName(owner_->filePath()));
+	// res = "Revert log:\n" + tmpf.fileContents("UTF-8");
+	doVCCommand("svn update --accept mine-full " + quoteName(owner_->filePath())
+	+ " > " + quoteName(tmpf.toFilesystemEncoding()),
+	FileName(owner_->filePath()));
+	res += "Update log:\n" + tmpf.fileContents("UTF-8");
+
+	LYXERR(Debug::LYXVC, res);
+	tmpf.erase();
+	return to_utf8(res);
+}
+
+
+bool SVN::repoUpdateEnabled()
+{
+	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;
 }
@@ -550,7 +832,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;
 }
 
 
@@ -563,7 +845,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()));
 }