X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXVC.cpp;h=01743ecadbfff37e52fb86c64781c51caa3e16dc;hb=612109bb6e5e61ba3c3693696f329eac3a288b5b;hp=168bf55782cec6867d915c2ef152f635948414ec;hpb=3309cdca59e1db68c42fc572f9540c56565ef0e0;p=lyx.git

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 168bf55782..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;
 }
 
@@ -80,7 +81,7 @@ bool LyXVC::file_not_found_hook(FileName const & fn)
 	// Seems there is no reasonable scenario for adding implementation
 	// of retrieve for cvs or svn.
 	if (!RCS::findFile(fn).empty()) {	
-		docstring const file = makeDisplayPath(fn.absFilename(), 20);
+		docstring const file = makeDisplayPath(fn.absFileName(), 20);
 		docstring const text =
 			bformat(_("Do you want to retrieve the document"
 						   " %1$s from version control?"), file);
@@ -120,8 +121,8 @@ bool LyXVC::registrer()
 	// it is very likely here that the vcs is not created yet...
 	if (!vcs) {
 		//check in the root directory of the document
-		FileName const cvs_entries(onlyPath(filename.absFilename()) + "/CVS/Entries");
-		FileName const svn_entries(onlyPath(filename.absFilename()) + "/.svn/entries");
+		FileName const cvs_entries(onlyPath(filename.absFileName()) + "/CVS/Entries");
+		FileName const svn_entries(onlyPath(filename.absFileName()) + "/.svn/entries");
 
 		if (svn_entries.isReadableFile()) {
 			LYXERR(Debug::LYXVC, "LyXVC: registering "
@@ -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
@@ -182,7 +188,8 @@ string LyXVC::checkIn()
 string LyXVC::checkOut()
 {
 	//RCS allows checkOut only in ReadOnly mode
-	if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
+	if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly())
+		return string();
 
 	LYXERR(Debug::LYXVC, "LyXVC: checkOut");
 	return vcs->checkOut();
@@ -203,7 +210,7 @@ string LyXVC::lockingToggle()
 }
 
 
-void LyXVC::revert()
+bool LyXVC::revert()
 {
 	LYXERR(Debug::LYXVC, "LyXVC: revert");
 
@@ -211,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();
 }
 
 
@@ -277,11 +285,11 @@ string const LyXVC::getLogFile() const
 	}
 	LYXERR(Debug::LYXVC, "Generating logfile " << tmpf);
 	vcs->getLog(tmpf);
-	return tmpf.absFilename();
+	return tmpf.absFileName();
 }
 
 
-std::string LyXVC::revisionInfo(RevisionInfo const info)
+string LyXVC::revisionInfo(RevisionInfo const info) const
 {
 	if (!vcs)
 		return string();
@@ -313,6 +321,13 @@ bool LyXVC::undoLastEnabled() const
 	return vcs && vcs->undoLastEnabled();
 }
 
+
+bool LyXVC::repoUpdateEnabled() const
+{
+	return vcs && vcs->repoUpdateEnabled();
+}
+	
+	
 bool LyXVC::prepareFileRevision(string const & rev, std::string & f)
 {
 	return vcs && vcs->prepareFileRevision(rev, f);