grammar

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 2b51b4291b908351c2ec6cfcab1cb57b5d7609f5..c7040a84c98a8c0239ee73112784cf9cc3d10d2e 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -3,11 +3,11 @@
  * 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
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Allan Rae
  *
  * Full author contact details are available in file CREDITS.
@@ -91,7 +91,7 @@ void LyXVC::setBuffer(Buffer * buf)
 }
 
 
-void LyXVC::registrer()
+bool LyXVC::registrer()
 {
        FileName const filename = owner_->fileName();
 
@@ -100,7 +100,7 @@ void LyXVC::registrer()
                Alert::error(_("Document not saved"),
                             _("You must save the document "
                                            "before it can be registered."));
-               return;
+               return false;
        }
 
        // it is very likely here that the vcs is not created yet...
@@ -122,7 +122,7 @@ void LyXVC::registrer()
                } else {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
                                << to_utf8(filename.displayName()) << " with RCS");
-                       vcs.reset(new RCS(filename));
+                       vcs.reset(new RCS(FileName()));
                }
 
                vcs->owner(owner_);
@@ -132,38 +132,41 @@ void LyXVC::registrer()
        docstring response;
        bool ok = Alert::askForText(response, _("LyX VC: Initial description"),
                        _("(no initial description)"));
-       if (!ok || response.empty()) {
-               // should we insist on checking response.empty()?
+       if (!ok) {
                LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
-               return;
+               return false;
        }
-
+       if (response.empty())
+               response = _("(no initial description)");
        vcs->registrer(to_utf8(response));
+       return true;
 }
 
 
-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;
+       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
 
        LYXERR(Debug::LYXVC, "LyXVC: checkOut");
-       vcs->checkOut();
+       return vcs->checkOut();
 }
 
 
@@ -203,6 +206,8 @@ void LyXVC::toggleReadOnly()
                LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked");
                checkIn();
                break;
+       case VCS::NOLOCKING:
+               break;
        }
 }