Whitespace.

[lyx.git] / src / VCBackend.h

diff --git a/src/VCBackend.h b/src/VCBackend.h
index ad441c60816edade7d1436d12bb43f7b471ce6ca..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
@@ -65,17 +74,22 @@ public:
        Buffer * owner() const { return owner_; }
        /// return the lock status of this file
        VCStatus status() const { return vcstatus; }
+       /// do we need special handling for read-only toggling?
+       /// (also used for check-out operation)
+       virtual bool toggleReadOnlyEnabled() = 0;
 protected:
        /// parse information from the version file
        virtual void scanMaster() = 0;
 
+       // GUI container for doVCCommandCall
+       int doVCCommand(std::string const & cmd, support::FileName const & path);
        /**
-        * doVCCommand - call out to the version control utility
+        * doVCCommandCall - call out to the version control utility
         * @param cmd the command to execute
         * @param path the path from which to execute
         * @return exit status
         */
-       static int doVCCommand(std::string const & cmd, support::FileName const & path);
+       static int doVCCommandCall(std::string const & cmd, support::FileName const & path);
 
        /**
         * The master VC file. For RCS this is *,v or RCS/ *,v. master should
@@ -113,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();
@@ -133,6 +155,8 @@ public:
                return "RCS: " + version_;
        }
 
+       virtual bool toggleReadOnlyEnabled();
+
 protected:
        virtual void scanMaster();
 };
@@ -150,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();
@@ -170,6 +202,8 @@ public:
                return "CVS: " + version_;
        }
 
+       virtual bool toggleReadOnlyEnabled();
+
 protected:
        virtual void scanMaster();
 
@@ -190,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();
@@ -210,11 +252,23 @@ public:
                return "SVN: " + version_;
        }
 
+       virtual bool toggleReadOnlyEnabled();
+
 protected:
        virtual void scanMaster();
+       /// 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