fix bug #6584

[lyx.git] / src / LyXVC.h

diff --git a/src/LyXVC.h b/src/LyXVC.h
index 0d9c826d5a66e8b96de209fc44fead55d369b631..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,7 +98,7 @@ public:
        bool lockingToggleEnabled() const;
 
        /// Revert to last version
-       void revert();
+       bool revert();
 
        /// Undo last check-in.
        void undoLast();
@@ -110,8 +110,12 @@ public:
         * 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(int rev, std::string & f);
+       bool prepareFileRevision(std::string const & rev, std::string & f);
        /// Does the current VC supports this operation?
        bool prepareFileRevisionEnabled();
 
@@ -143,6 +147,7 @@ public:
 
        // type of the revision information
        enum RevisionInfo {
+               Unknown = 0,
                File = 1,
                Tree = 2,
                Author = 3,
@@ -155,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 revisionInfo(RevisionInfo const info);
+       std::string revisionInfo(RevisionInfo const info) const;
 
 private:
        ///