Adding the capability to paste as simple unformatted text.

[lyx.git] / src / LyXVC.h

diff --git a/src/LyXVC.h b/src/LyXVC.h
index f3e591fa03349a12091b7f2b09ac790cb2756056..55de93f103ff8f9f38d02031c1ea7017f6581f67 100644 (file)
--- a/src/LyXVC.h
+++ b/src/LyXVC.h
@@ -25,7 +25,7 @@ class VCS;
 class Buffer;
 
 /** Version Control for LyX.
-    This is the class giving the verison control features to LyX. It is
+    This is the class giving the version control features to LyX. It is
     intended to support different kinds of version control.
     The support in LyX is based loosely upon the version control in GNU Emacs,
     but is not as extensive as that one. See Extended Manual for a simple
@@ -98,12 +98,26 @@ public:
        bool lockingToggleEnabled() const;
 
        /// Revert to last version
-       void revert();
+       bool revert();
 
        /// Undo last check-in.
        void undoLast();
        /// Does the current VC supports this operation?
        bool undoLastEnabled() const;
+       /**
+        * Prepare revision rev of the file into newly created temporary file
+        * and save the filename into parameter f.
+        * Parameter rev can be either revision number or negative number
+        * which is interpreted as how many revision back from the current
+        * one do we want. rev=0 is reserved for the last (committed) revision.
+        * We need rev to be string, since in various VCS revision is not integer.
+        * If RCS addressed by a single number, it is automatically used
+        * as the last number in the whole revision specification (it applies
+        * for retrieving normal revisions (rev>0) or backtracking (rev<0).
+        */
+       bool prepareFileRevision(std::string const & rev, std::string & f);
+       /// Does the current VC supports this operation?
+       bool prepareFileRevisionEnabled();
 
        /**
         * Generate a log file and return the filename.
@@ -123,29 +137,22 @@ public:
        /// Is the document under administration by VCS?
        bool inUse() const;
 
-       /// FIXME Either rename or kill, we have revisionInfo now.
-       /// Returns the version number.
-       //std::string const & version() const;
-       /// Returns the version number.
+       /// Returns the RCS + version number for messages
        std::string const versionString() const;
 
        /**
-        * Returns the userid of the person who has locked the doc.
-        * FIXME This property is descendant from the original VCS
-        * and used in RCS for user id or "unlocked" strings.
-        * It would be problem to use this under SVN since getting
-        * the locker would need connection to server any time we
-        * load document. SVN currently (mis)uses this as a signal
-        * for locking state, as we do not have API for vcstatus().
-        * The RCS code for user id parsing is working but we don't display
-        * it anywhere. One possibility is to provide proper vcstatus()
-        * interface and kill the whole locker thing.
+        * Returns whether we use locking for the given file.
         */
-       std::string const & locker() const;
+       bool locking() const;
 
        // type of the revision information
        enum RevisionInfo {
-               File = 1
+               Unknown = 0,
+               File = 1,
+               Tree = 2,
+               Author = 3,
+               Date = 4,
+               Time = 5
        };
 
        /**
@@ -153,7 +160,7 @@ public:
         * Its safe to call it regardless VCS is in usage or this
         * info is (un)available. Returns empty string in such a case.
         */
-       std::string const revisionInfo(RevisionInfo const info);
+       std::string revisionInfo(RevisionInfo const info) const;
 
 private:
        ///