diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 63d26227a6..1ed30fe663 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -74,13 +74,13 @@ bool LyXVC::file_found_hook(FileName const & fn) bool LyXVC::file_not_found_hook(FileName const & fn) { - // Check if file is under RCS + // Check if file is under RCS. + // This happens if we are trying to load non existent + // file on disk, but existent in ,v version. + // Seems there is no reasonable scenario for adding implementation + // of retrieve for cvs or svn. if (!RCS::findFile(fn).empty()) return true; - if (!CVS::findFile(fn).empty()) - return true; - if (!SVN::findFile(fn).empty()) - return true; return false; } diff --git a/src/LyXVC.h b/src/LyXVC.h index 09998c952f..86d7dcc370 100644 --- a/src/LyXVC.h +++ b/src/LyXVC.h @@ -26,15 +26,14 @@ class Buffer; /** Version Control for LyX. This is the class giving the verison control features to LyX. It is - intended to support different kinds of version control, but at this point - we will only support RCS. Later CVS is a likely candidate for support. + intended to support different kinds of version control. The support in LyX is based loosely upon the version control in GNU Emacs, - but is not as extensive as that one. See examples/VC.lyx for a simple + but is not as extensive as that one. See Extended Manual for a simple tutorial and manual for the use of the version control system in LyX. LyXVC use this algorithm when it searches for VC files: - for RCS it searches for ,v and RCS/,v similar - should be done for CVS. By doing this there doesn't need to be any + for RCS it searches for ,v and RCS/,v similarly + CVS/Entries for cvs and .svn/entries. By doing this there doesn't need to be any special support for VC in the lyx format, and this is especially good when the lyx format will be a subset of LaTeX. */ @@ -46,9 +45,9 @@ public: ~LyXVC(); /** Not a good name perhaps. This function should be called whenever LyX loads a file. This function then checks for a master VC file (for - RCS this is *,v or RCS/ *,v ; for CVS this is CVS/Entries) if this - file is found, the loaded file is assumed to be under controll by VC - (only RCS and CVS so far), and the appropiate actions is taken. + RCS this is *,v or RCS/ *,v ; for CVS this is CVS/Entries and .svn/entries + for SVN) if this file or entry is found, the loaded file is assumed to be + under controll by VC, and the appropiate actions is taken. Returns true if the file is under control by a VCS. */ bool file_found_hook(support::FileName const & fn); @@ -96,7 +95,7 @@ public: /// void toggleReadOnly(); - /// Is the document under administration by RCS? + /// Is the document under administration by VCS? bool inUse(); /// Returns the version number.