New XHTML math options. Format change.

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 93c44b3b0fdc98596dc654ea2b258598f3db9b81..5d3a49fdd935e29e07e36f2c6da73e7b3c9395e1 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;
 }
 
@@ -106,8 +120,8 @@ bool LyXVC::registrer()
        // it is very likely here that the vcs is not created yet...
        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");
+               FileName const cvs_entries(onlyPath(filename.absFileName()) + "/CVS/Entries");
+               FileName const svn_entries(onlyPath(filename.absFileName()) + "/.svn/entries");
 
                if (svn_entries.isReadableFile()) {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
@@ -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");
        }
@@ -163,7 +182,8 @@ string LyXVC::checkIn()
 string LyXVC::checkOut()
 {
        //RCS allows checkOut only in ReadOnly mode
-       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
+       if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly())
+               return string();
 
        LYXERR(Debug::LYXVC, "LyXVC: checkOut");
        return vcs->checkOut();
@@ -226,7 +246,7 @@ void LyXVC::toggleReadOnly()
 }
 
 
-bool LyXVC::inUse()
+bool LyXVC::inUse() const
 {
        if (vcs)
                return true;
@@ -234,21 +254,15 @@ bool LyXVC::inUse()
 }
 
 
-//string const & LyXVC::version() const
-//{
-//     return vcs->version();
-//}
-
-
 string const LyXVC::versionString() const
 {
        return vcs->versionString();
 }
 
 
-string const & LyXVC::locker() const
+bool LyXVC::locking() const
 {
-       return vcs->locker();
+       return vcs->status() != VCS::NOLOCKING;
 }
 
 
@@ -264,32 +278,51 @@ string const LyXVC::getLogFile() const
        }
        LYXERR(Debug::LYXVC, "Generating logfile " << tmpf);
        vcs->getLog(tmpf);
-       return tmpf.absFilename();
+       return tmpf.absFileName();
+}
+
+
+std::string LyXVC::revisionInfo(RevisionInfo const info)
+{
+       if (!vcs)
+               return string();
+
+       return vcs->revisionInfo(info);
 }
 
 
-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();
 }
 
+bool LyXVC::prepareFileRevision(string const & rev, std::string & f)
+{
+       return vcs && vcs->prepareFileRevision(rev, f);
+}
+
+
+bool LyXVC::prepareFileRevisionEnabled()
+{
+       return vcs && vcs->prepareFileRevisionEnabled();
+}
 
 } // namespace lyx