Make the fake sequence for braces highly unlikely (addressing #6478).

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 93c44b3b0fdc98596dc654ea2b258598f3db9b81..b35f6aef5572d78745298a3b1d3a0215c46b40a5 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -79,8 +79,22 @@ bool LyXVC::file_not_found_hook(FileName const & fn)
        // 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 (!RCS::findFile(fn).empty()) {       
+               docstring const file = makeDisplayPath(fn.absFilename(), 20);
+               docstring const text =
+                       bformat(_("Do you want to retrieve the document"
+                                                  " %1$s from version control?"), file);
+               int const ret = Alert::prompt(_("Retrieve from version control?"),
+                       text, 0, 1, _("&Retrieve"), _("&Cancel"));
+
+               if (ret == 0) {
+                       // How can we know _how_ to do the checkout?
+                       // With the current VC support it has to be an RCS
+                       // file since CVS and SVN do not have special ,v files.
+                       RCS::retrieve(fn);
+                       return true;
+               }
+       }
        return false;
 }
 
@@ -146,13 +160,18 @@ bool LyXVC::registrer()
 string LyXVC::checkIn()
 {
        LYXERR(Debug::LYXVC, "LyXVC: checkIn");
+       docstring empty(_("(no log message)"));
        docstring response;
        string log;
        bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
        if (ok) {
                if (response.empty())
-                       response = _("(no log message)");
+                       response = empty;
                log = vcs->checkIn(to_utf8(response));
+
+               // Reserve empty string for cancel button
+               if (log.empty())
+                       log = to_utf8(empty);
        } else {
                LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
        }
@@ -226,7 +245,7 @@ void LyXVC::toggleReadOnly()
 }
 
 
-bool LyXVC::inUse()
+bool LyXVC::inUse() const
 {
        if (vcs)
                return true;
@@ -268,25 +287,25 @@ string const LyXVC::getLogFile() const
 }
 
 
-bool LyXVC::checkOutEnabled()
+bool LyXVC::checkOutEnabled() const
 {
        return vcs && vcs->checkOutEnabled();
 }
 
 
-bool LyXVC::checkInEnabled()
+bool LyXVC::checkInEnabled() const
 {
        return vcs && vcs->checkInEnabled();
 }
 
 
-bool LyXVC::lockingToggleEnabled()
+bool LyXVC::lockingToggleEnabled() const
 {
        return vcs && vcs->lockingToggleEnabled();
 }
 
 
-bool LyXVC::undoLastEnabled()
+bool LyXVC::undoLastEnabled() const
 {
        return vcs && vcs->undoLastEnabled();
 }