Whitespace.

[lyx.git] / src / VCBackend.h

diff --git a/src/VCBackend.h b/src/VCBackend.h
index 3f7b6ffa6453c26dc1ae0708d896dd354b20a7ff..dbcd84ca8151016dd84db7f979f94a7ca5f8952e 100644 (file)
--- a/src/VCBackend.h
+++ b/src/VCBackend.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -27,21 +27,30 @@ public:
        /// the status of the managed file
        enum VCStatus {
                UNLOCKED,
-               LOCKED
+               LOCKED,
+               NOLOCKING
        };
 
        virtual ~VCS() {}
 
        /// register a file for version control
        virtual void registrer(std::string const & msg) = 0;
-       /// check in the current revision
-       virtual void checkIn(std::string const & msg) = 0;
+       /// check in the current revision, returns log
+       virtual std::string checkIn(std::string const & msg) = 0;
        // can be this operation processed in the current RCS?
        virtual bool checkInEnabled() = 0;
-       /// check out for editing
-       virtual void checkOut() = 0;
+       /// check out for editing, returns log
+       virtual std::string checkOut() = 0;
        // can be this operation processed in the current RCS?
        virtual bool checkOutEnabled() = 0;
+       /// synchronize with repository, returns log
+       virtual std::string repoUpdate() = 0;
+       // can be this operation processed in the current RCS?
+       virtual bool repoUpdateEnabled() = 0;
+       // toggle locking property of the file
+       virtual std::string lockingToggle() = 0;
+       // can be this operation processed in the current RCS?
+       virtual bool lockingToggleEnabled() = 0;
        /// revert current edits
        virtual void revert() = 0;
        /// FIXME
@@ -118,14 +127,22 @@ public:
 
        virtual void registrer(std::string const & msg);
 
-       virtual void checkIn(std::string const & msg);
+       virtual std::string checkIn(std::string const & msg);
 
        virtual bool checkInEnabled();
 
-       virtual void checkOut();
+       virtual std::string checkOut();
 
        virtual bool checkOutEnabled();
 
+       virtual std::string repoUpdate();
+
+       virtual bool repoUpdateEnabled();
+
+       virtual std::string lockingToggle();
+
+       virtual bool lockingToggleEnabled();
+
        virtual void revert();
 
        virtual void undoLast();
@@ -157,14 +174,22 @@ public:
 
        virtual void registrer(std::string const & msg);
 
-       virtual void checkIn(std::string const & msg);
+       virtual std::string checkIn(std::string const & msg);
 
        virtual bool checkInEnabled();
 
-       virtual void checkOut();
+       virtual std::string checkOut();
 
        virtual bool checkOutEnabled();
 
+       virtual std::string repoUpdate();
+
+       virtual bool repoUpdateEnabled();
+
+       virtual std::string lockingToggle();
+
+       virtual bool lockingToggleEnabled();
+
        virtual void revert();
 
        virtual void undoLast();
@@ -199,14 +224,22 @@ public:
 
        virtual void registrer(std::string const & msg);
 
-       virtual void checkIn(std::string const & msg);
+       virtual std::string checkIn(std::string const & msg);
 
        virtual bool checkInEnabled();
 
-       virtual void checkOut();
+       virtual std::string checkOut();
 
        virtual bool checkOutEnabled();
 
+       virtual std::string repoUpdate();
+
+       virtual bool repoUpdateEnabled();
+
+       virtual std::string lockingToggle();
+
+       virtual bool lockingToggleEnabled();
+
        virtual void revert();
 
        virtual void undoLast();
@@ -223,11 +256,19 @@ public:
 
 protected:
        virtual void scanMaster();
-       /// Check for error messages in svn output.
-       std::string scanLogFile(support::FileName const & f);
+       /// Check for messages in svn output. Returns error.
+       std::string scanLogFile(support::FileName const & f, std::string & status);
+       /// checks locking policy and setup locked_mode_
+       bool checkLockMode();
+       /// is the loaded file locked?
+       bool isLocked() const;
+       /// acquire/release write lock for the current file
+       void fileLock(bool lock, support::FileName const & tmpf, std::string & status);
 
 private:
        support::FileName file_;
+       /// is the loaded file under locking policy?
+       bool locked_mode_;
 };
 
 } // namespace lyx