X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXVC.cpp;h=5b510ae0f3ac07c7176c5dc3ca602c074aabf893;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=63d26227a638f5b93242a5464b2aaf6aabd6e143;hpb=bb14dc3a00a54f5c44e6d5c203f604153dfc4353;p=lyx.git

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 63d26227a6..5b510ae0f3 100644
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -74,13 +74,13 @@ bool LyXVC::file_found_hook(FileName const & fn)
 
 bool LyXVC::file_not_found_hook(FileName const & fn)
 {
-	// Check if file is under RCS
+	// Check if file is under RCS.
+	// This happens if we are trying to load non existent
+	// file on disk, but existent in ,v version.
+	// Seems there is no reasonable scenario for adding implementation
+	// of retrieve for cvs or svn.
 	if (!RCS::findFile(fn).empty())
 		return true;
-	if (!CVS::findFile(fn).empty())
-		return true;
-	if (!SVN::findFile(fn).empty())
-		return true;
 	return false;
 }
 
@@ -142,25 +142,30 @@ void LyXVC::registrer()
 }
 
 
-void LyXVC::checkIn()
+string LyXVC::checkIn()
 {
 	LYXERR(Debug::LYXVC, "LyXVC: checkIn");
 	docstring response;
+	string log;
 	bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
 	if (ok) {
 		if (response.empty())
 			response = _("(no log message)");
-		vcs->checkIn(to_utf8(response));
+		log = vcs->checkIn(to_utf8(response));
 	} else {
 		LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
 	}
+	return log;
 }
 
 
-void LyXVC::checkOut()
+string LyXVC::checkOut()
 {
+	//RCS allows checkOut only in ReadOnly mode
+	if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
+
 	LYXERR(Debug::LYXVC, "LyXVC: checkOut");
-	vcs->checkOut();
+	return vcs->checkOut();
 }
 
 
@@ -170,8 +175,8 @@ void LyXVC::revert()
 
 	docstring const file = owner_->fileName().displayName(20);
 	docstring text = bformat(_("Reverting to the stored version of the "
-		"document %1$s will lose all current changes.\n\n"
-					     "Do you want to revert to the saved version?"), file);
+				"document %1$s will lose all current changes.\n\n"
+				"Do you want to revert to the older version?"), file);
 	int const ret = Alert::prompt(_("Revert to stored version of document?"),
 		text, 0, 1, _("&Revert"), _("&Cancel"));
 
@@ -188,6 +193,9 @@ void LyXVC::undoLast()
 
 void LyXVC::toggleReadOnly()
 {
+	if (!vcs->toggleReadOnlyEnabled())
+		return;
+
 	switch (vcs->status()) {
 	case VCS::UNLOCKED:
 		LYXERR(Debug::LYXVC, "LyXVC: toggle to locked");