X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.h;h=ab83535ad7f65fd21847ae564d94502293c9590c;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=3f7b6ffa6453c26dc1ae0708d896dd354b20a7ff;hpb=e46613d70bc14d5a4e5833782f912b64e451c25d;p=lyx.git diff --git a/src/VCBackend.h b/src/VCBackend.h index 3f7b6ffa64..ab83535ad7 100644 --- a/src/VCBackend.h +++ b/src/VCBackend.h @@ -34,12 +34,12 @@ public: /// 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; /// revert current edits @@ -118,11 +118,11 @@ 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(); @@ -157,11 +157,11 @@ 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(); @@ -199,11 +199,11 @@ 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(); @@ -223,8 +223,8 @@ 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); private: support::FileName file_;