X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXVC.cpp;h=741abf9854b10320942831ee011fe81be3ee0c0d;hb=5142d1c86ada8df7451534402e2a1716678ee8b7;hp=173756f9e7a14b2c2ca5713d5208ff3b11eb258f;hpb=495daad2770a842b442fe9c34b26dbb538cc70ff;p=lyx.git

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 173756f9e7..741abf9854 100644
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -80,7 +80,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 +120,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 "
@@ -182,7 +182,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();
@@ -259,9 +260,9 @@ string const LyXVC::versionString() const
 }
 
 
-string const & LyXVC::locker() const
+bool LyXVC::locking() const
 {
-	return vcs->locker();
+	return vcs->status() != VCS::NOLOCKING;
 }
 
 
@@ -277,11 +278,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();
@@ -314,4 +315,21 @@ bool LyXVC::undoLastEnabled() const
 }
 
 
+bool LyXVC::repoUpdateEnabled() const
+{
+	return vcs && vcs->repoUpdateEnabled();
+}
+	
+	
+bool LyXVC::prepareFileRevision(string const & rev, std::string & f)
+{
+	return vcs && vcs->prepareFileRevision(rev, f);
+}
+
+
+bool LyXVC::prepareFileRevisionEnabled()
+{
+	return vcs && vcs->prepareFileRevisionEnabled();
+}
+
 } // namespace lyx