X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXVC.cpp;h=01743ecadbfff37e52fb86c64781c51caa3e16dc;hb=981e958b9d63930c83b1adced65b75b3d857ac97;hp=741abf9854b10320942831ee011fe81be3ee0c0d;hpb=de5aab29d4abb0db702e7fe6f1370c5169b56e4f;p=lyx.git

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 741abf9854..01743ecadb 100644
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -68,6 +68,7 @@ bool LyXVC::file_found_hook(FileName const & fn)
 	}
 
 	// file is not under any VCS.
+	vcs.reset(0);
 	return false;
 }
 
@@ -148,6 +149,7 @@ bool LyXVC::registrer()
 			_("(no initial description)"));
 	if (!ok) {
 		LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+		vcs.reset(0);
 		return false;
 	}
 	if (response.empty())
@@ -163,10 +165,14 @@ string LyXVC::checkIn()
 	docstring empty(_("(no log message)"));
 	docstring response;
 	string log;
-	bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
+	bool ok = true;
+	if (vcs->isCheckInWithConfirmation())
+		ok = Alert::askForText(response, _("LyX VC: Log Message"));
 	if (ok) {
 		if (response.empty())
 			response = empty;
+		//shell collisions
+		response = subst(response, from_utf8("\""), from_utf8("\\\""));
 		log = vcs->checkIn(to_utf8(response));
 
 		// Reserve empty string for cancel button
@@ -204,7 +210,7 @@ string LyXVC::lockingToggle()
 }
 
 
-void LyXVC::revert()
+bool LyXVC::revert()
 {
 	LYXERR(Debug::LYXVC, "LyXVC: revert");
 
@@ -212,11 +218,12 @@ void LyXVC::revert()
 	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 older version?"), file);
-	int const ret = Alert::prompt(_("Revert to stored version of document?"),
-		text, 0, 1, _("&Revert"), _("&Cancel"));
+	int ret = 0;
+	if (vcs->isRevertWithConfirmation())
+		ret = Alert::prompt(_("Revert to stored version of document?"),
+			text, 0, 1, _("&Revert"), _("&Cancel"));
 
-	if (ret == 0)
-		vcs->revert();
+	return ret == 0 && vcs->revert();
 }