* 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.
*/
/// 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
/// 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
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();
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();
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();
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