Pure HTML output for math macros.

[lyx.git] / src / VCBackend.cpp

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index e90ddcd87610950db94cfd2b1eb4464e92b8e44a..5bbc1746b417ae0dd2720dbb4c575a4d8076e637 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -290,15 +290,52 @@ string RCS::revisionInfo(LyXVC::RevisionInfo const info)
 }
 
 
-bool RCS::prepareFileRevision(int, std::string &)
+bool RCS::prepareFileRevision(string const &revis, string & f)
 {
-       return false;
+       string rev = revis;
+
+       if (isStrInt(rev)) {
+               int back = convert<int>(rev);
+               if (back > 0)
+                       return false;
+               if (back == 0)
+                       rev = version_;
+               // we care about the last number from revision string
+               // in case of backward indexing
+               if (back < 0) {
+                       string cur, base;
+                       cur = rsplit(version_, base , '.' );
+                       if (!isStrInt(cur))
+                               return false;
+                       int want = convert<int>(cur) + back;
+                       if (want <= 0)
+                               return false;
+
+                       rev = base + "." + convert<string>(want);
+               }
+       }
+
+       FileName tmpf = FileName::tempName("lyxvcrev");
+       if (tmpf.empty()) {
+               LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+               return N_("Error: Could not generate logfile.");
+       }
+
+       doVCCommand("co -p" + rev + " "
+                     + quoteName(onlyFilename(owner_->absFileName()))
+                     + " > " + quoteName(tmpf.toFilesystemEncoding()),
+               FileName(owner_->filePath()));
+       if (tmpf.isFileEmpty())
+               return false;
+
+       f = tmpf.absFilename();
+       return true;
 }
 
 
 bool RCS::prepareFileRevisionEnabled()
 {
-       return false;
+       return true;
 }
 
 
@@ -375,7 +412,7 @@ void CVS::scanMaster()
                                locker_ = "Unlocked";
                                vcstatus = UNLOCKED;
                        } else {
-                               // Here we should also to some more checking
+                               // Here we should also do some more checking
                                // to see if there are conflicts or not.
                                locker_ = "Locked";
                                vcstatus = LOCKED;
@@ -505,7 +542,7 @@ string CVS::revisionInfo(LyXVC::RevisionInfo const info)
 }
 
 
-bool CVS::prepareFileRevision(int, std::string &)
+bool CVS::prepareFileRevision(string const &, string &)
 {
        return false;
 }
@@ -706,13 +743,13 @@ void SVN::fileLock(bool lock, FileName const & tmpf, string &status)
 
        if (!isLocked() && lock)
                frontend::Alert::error(_("Revision control error."),
-                       _("Error when acquiring write lock.\n"
-                       "Most probably another user is editing\n"
+                       _("Error while acquiring write lock.\n"
+                       "Another user is most probably editing\n"
                        "the current document now!\n"
                        "Also check the access to the repository."));
        if (isLocked() && !lock)
                frontend::Alert::error(_("Revision control error."),
-                       _("Error when releasing write lock.\n"
+                       _("Error while releasing write lock.\n"
                        "Check the access to the repository."));
 }
 
@@ -730,7 +767,7 @@ string SVN::checkOut()
                    FileName(owner_->filePath()));
 
        string log;
-       string res = scanLogFile(tmpf, log);
+       string const res = scanLogFile(tmpf, log);
        if (!res.empty())
                frontend::Alert::error(_("Revision control error."),
                        bformat(_("Error when updating from repository.\n"
@@ -1006,8 +1043,12 @@ void SVN::getLog(FileName const & tmpf)
 }
 
 
-bool SVN::prepareFileRevision(int rev, string & f)
+bool SVN::prepareFileRevision(string const & revis, string & f)
 {
+       if (!isStrInt(revis))
+               return false;
+
+       int rev = convert<int>(revis);
        if (rev <= 0)
                if (!getFileRevisionInfo())
                        return false;