Change the "empty layout" to the "plain layout", to try to avoid confusion.

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index e156396fe2cba1c1cf7c86082dfe7e5fd5bee941..5b510ae0f3ac07c7176c5dc3ca602c074aabf893 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -60,6 +60,13 @@ bool LyXVC::file_found_hook(FileName const & fn)
                vcs->owner(owner_);
                return true;
        }
+       // Check if file is under SVN
+       if (!(found_file = SVN::findFile(fn)).empty()) {
+               vcs.reset(new SVN(found_file, fn));
+               vcs->owner(owner_);
+               return true;
+       }
+
        // file is not under any VCS.
        return false;
 }
@@ -67,11 +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;
        return false;
 }
 
@@ -98,8 +107,14 @@ void LyXVC::registrer()
        if (!vcs) {
                //check in the root directory of the document
                FileName const cvs_entries(onlyPath(filename.absFilename()) + "/CVS/Entries");
+               FileName const svn_entries(onlyPath(filename.absFilename()) + "/.svn/entries");
 
-               if (cvs_entries.isReadableFile()) {
+               if (svn_entries.isReadableFile()) {
+                       LYXERR(Debug::LYXVC, "LyXVC: registering "
+                               << to_utf8(filename.displayName()) << " with SVN");
+                       vcs.reset(new SVN(cvs_entries, filename));
+
+               } else if (cvs_entries.isReadableFile()) {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
                                << to_utf8(filename.displayName()) << " with CVS");
                        vcs.reset(new CVS(cvs_entries, filename));
@@ -127,25 +142,30 @@ void LyXVC::registrer()
 }
 
 
-void LyXVC::checkIn()
+string LyXVC::checkIn()
 {
        LYXERR(Debug::LYXVC, "LyXVC: checkIn");
        docstring response;
+       string log;
        bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
        if (ok) {
                if (response.empty())
                        response = _("(no log message)");
-               vcs->checkIn(to_utf8(response));
+               log = vcs->checkIn(to_utf8(response));
        } else {
                LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
        }
+       return log;
 }
 
 
-void LyXVC::checkOut()
+string LyXVC::checkOut()
 {
+       //RCS allows checkOut only in ReadOnly mode
+       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
+
        LYXERR(Debug::LYXVC, "LyXVC: checkOut");
-       vcs->checkOut();
+       return vcs->checkOut();
 }
 
 
@@ -155,8 +175,8 @@ void LyXVC::revert()
 
        docstring const file = owner_->fileName().displayName(20);
        docstring text = bformat(_("Reverting to the stored version of the "
-               "document %1$s will lose all current changes.\n\n"
-                                            "Do you want to revert to the saved version?"), file);
+                               "document %1$s will lose all current changes.\n\n"
+                               "Do you want to revert to the older version?"), file);
        int const ret = Alert::prompt(_("Revert to stored version of document?"),
                text, 0, 1, _("&Revert"), _("&Cancel"));
 
@@ -173,6 +193,9 @@ void LyXVC::undoLast()
 
 void LyXVC::toggleReadOnly()
 {
+       if (!vcs->toggleReadOnlyEnabled())
+               return;
+
        switch (vcs->status()) {
        case VCS::UNLOCKED:
                LYXERR(Debug::LYXVC, "LyXVC: toggle to locked");