X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.h;h=a9bdb84a3353ade2fd01b21b10d15e19d0ad3b30;hb=e45427de389bc188f02ebe0de2c052740dcde09c;hp=c43846ed5ab659cf09ee635a03d309437bb3b06f;hpb=89158dad83efd0777a4659bb11400b5d7b289942;p=lyx.git

diff --git a/src/VCBackend.h b/src/VCBackend.h
index c43846ed5a..a9bdb84a33 100644
--- a/src/VCBackend.h
+++ b/src/VCBackend.h
@@ -67,8 +67,6 @@ public:
 	virtual void getLog(support::FileName const &) = 0;
 	/// return the current version description
 	virtual std::string const versionString() const = 0;
-	/// return the user who has locked the file
-	std::string const & locker() const { return locker_; }
 	/// set the owning buffer
 	void owner(Buffer * b) { owner_ = b; }
 	/// return the owning buffer
@@ -80,6 +78,11 @@ public:
 	virtual bool toggleReadOnlyEnabled() = 0;
 	/// Return revision info specified by the argument.
 	virtual std::string revisionInfo(LyXVC::RevisionInfo const info) = 0;
+
+	virtual bool prepareFileRevision(std::string const & rev, std::string & f) = 0;
+
+	virtual bool prepareFileRevisionEnabled() = 0;
+
 protected:
 	/// parse information from the version file
 	virtual void scanMaster() = 0;
@@ -103,8 +106,6 @@ protected:
 	/// The status of the VC controlled file.
 	VCStatus vcstatus;
 
-	/// The user currently keeping the lock on the VC file.
-	std::string locker_;
 	/// The buffer using this VC
 	Buffer * owner_;
 };
@@ -156,6 +157,10 @@ public:
 
 	virtual std::string revisionInfo(LyXVC::RevisionInfo const info);
 
+	virtual bool prepareFileRevision(std::string const & rev, std::string & f);
+
+	virtual bool prepareFileRevisionEnabled();
+
 protected:
 	virtual void scanMaster();
 private:
@@ -164,6 +169,8 @@ private:
 	 * string or if it must be a float/int.
 	 */
 	std::string version_;
+	/// The user currently keeping the lock on the VC file (or "Unlocked").
+	std::string locker_;
 };
 
 
@@ -211,6 +218,10 @@ public:
 
 	virtual std::string revisionInfo(LyXVC::RevisionInfo const info);
 
+	virtual bool prepareFileRevision(std::string const & rev, std::string & f);
+
+	virtual bool prepareFileRevisionEnabled();
+
 protected:
 	virtual void scanMaster();
 
@@ -218,6 +229,8 @@ private:
 	support::FileName file_;
 	// revision number from scanMaster
 	std::string version_;
+	/// The user currently keeping the lock on the VC file.
+	std::string locker_;
 };
 
 
@@ -265,6 +278,10 @@ public:
 
 	virtual std::string revisionInfo(LyXVC::RevisionInfo const info);
 
+	virtual bool prepareFileRevision(std::string const & rev, std::string & f);
+
+	virtual bool prepareFileRevisionEnabled();
+
 protected:
 	virtual void scanMaster();
 	/// Check for messages in svn output. Returns error.
@@ -287,7 +304,7 @@ private:
 	 * was already unsuccessful.
 	 */
 	bool getFileRevisionInfo();
-	/// cache for file revision number, "?" if already unsuccessful
+	/// cache for file revision number, "?" if already unsuccessful, isNumber==true
 	std::string rev_file_cache_;
 	/// cache for author of last commit
 	std::string rev_author_cache_;