X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.h;h=2ee076f2e1d0b2b4ad8ad70a587a4dfa1e6e0419;hb=f758894c2fc78f33be0c8bd60c2fd0a1f470056e;hp=636cd9d4708c905745119289198a5b030f694c9f;hpb=82808fea04315fd323ec074e8ad7865d190987d4;p=lyx.git diff --git a/src/VCBackend.h b/src/VCBackend.h index 636cd9d470..2ee076f2e1 100644 --- a/src/VCBackend.h +++ b/src/VCBackend.h @@ -106,7 +106,7 @@ public: /// Check the directory of file and all parent directories /// for the existence of repository-info like .git or .svn static bool checkparentdirs(support::FileName const & file, std::string const & vcsdir); - + protected: /// parse information from the version file virtual void scanMaster() = 0; @@ -114,7 +114,7 @@ protected: /// Prepare a version identifier suitable for RCS and CVS. /// If needed converts last or relative number to the absolute revision. bool makeRCSRevision(std::string const &version, std::string &revis) const; - + /// GUI container for doVCCommandCall int doVCCommand(std::string const & cmd, support::FileName const & path, bool reportError = true); /** @@ -279,7 +279,7 @@ public: virtual void getLog(support::FileName const &); - /// Check for messages in cvs output. + /// Check for messages in cvs output. /// Returns conflict line. std::string scanLogFile(support::FileName const & f, std::string & status); @@ -334,7 +334,7 @@ private: static int doVCCommandCallWithOutput(std::string const & cmd, support::FileName const & path, support::FileName const & output); - + /// return the quoted pathname if Directory or filename if File virtual std::string const getTarget(OperationMode opmode) const; /// collect the diff of file or directory against repository @@ -560,6 +560,8 @@ private: bool getFileRevisionInfo(); /// cache for file revision number, "?" if already unsuccessful, isNumber==true std::string rev_file_cache_; + /// cache for abbreviated file revision number, "?" if already unsuccessful, isNumber==true + std::string rev_file_abbrev_cache_; /// cache for author of last commit std::string rev_author_cache_; /// cache for date of last commit