Fix bug #6649 - fix texrow structure generated by InsetIndex

[lyx.git] / src / VCBackend.h

diff --git a/src/VCBackend.h b/src/VCBackend.h
index 43b2e1d2ea5484b9569e4655bb04bd989dbc32be..a9bdb84a3353ade2fd01b21b10d15e19d0ad3b30 100644 (file)
--- a/src/VCBackend.h
+++ b/src/VCBackend.h
@@ -5,6 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Lars Gullik Bjønnes
+ * \author Pavel Sanda
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -66,10 +67,6 @@ public:
        virtual void getLog(support::FileName const &) = 0;
        /// return the current version description
        virtual std::string const versionString() const = 0;
-       /// return the current version
-       std::string const & version() const { return version_; }
-       /// 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
@@ -81,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;
@@ -104,14 +106,6 @@ protected:
        /// The status of the VC controlled file.
        VCStatus vcstatus;
 
-       /**
-        * The version of the VC file. I am not sure if this can be a
-        * string or if it must be a float/int.
-        */
-       std::string version_;
-
-       /// The user currently keeping the lock on the VC file.
-       std::string locker_;
        /// The buffer using this VC
        Buffer * owner_;
 };
@@ -163,8 +157,20 @@ 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:
+       /**
+        * The version of the VC file. I am not sure if this can be a
+        * 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_;
 };
 
 
@@ -212,11 +218,19 @@ 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:
        support::FileName file_;
+       // revision number from scanMaster
+       std::string version_;
+       /// The user currently keeping the lock on the VC file.
+       std::string locker_;
 };
 
 
@@ -257,13 +271,17 @@ public:
        virtual void getLog(support::FileName const &);
 
        virtual std::string const versionString() const {
-               return "SVN: " + version_;
+               return "SVN: " + rev_file_cache_;
        }
 
        virtual bool toggleReadOnlyEnabled();
 
        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.
@@ -279,10 +297,25 @@ private:
        support::FileName file_;
        /// is the loaded file under locking policy?
        bool locked_mode_;
-       /// real code for obtaining file revision info
-       std::string getFileRevisionInfo();
-       /// cache for file revision number, "?" if already unsuccessful
+       /**
+        * Real code for obtaining file revision info. Fills all file-related caches
+        * and returns true if successfull.
+        * "?" is stored in rev_file_cache_ as a signal if request for obtaining info
+        * was already unsuccessful.
+        */
+       bool getFileRevisionInfo();
+       /// 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_;
+       /// cache for date of last commit
+       std::string rev_date_cache_;
+       /// cache for time of last commit
+       std::string rev_time_cache_;
+       /// fills rev_tree_cache_, returns true if successfull.
+       bool getTreeRevisionInfo();
+       /// cache for tree revision number, "?" if already unsuccessful
+       std::string rev_tree_cache_;
 };
 
 } // namespace lyx