Support for the URW Garamond LaTeX fonts

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 65e83a33f60450104cf2c96ca2bb1e894c6ffdda..244dff156d166797c314d79d5a220a6a2aa3b272 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -45,25 +45,34 @@ LyXVC::~LyXVC()
 {}
 
 
+bool LyXVC::fileInVC(FileName const & fn)
+{
+       if (!RCS::findFile(fn).empty())
+               return true;
+       if (!CVS::findFile(fn).empty())
+               return true;
+       if (!SVN::findFile(fn).empty())
+               return true;
+       return false;
+}
+
+
 bool LyXVC::file_found_hook(FileName const & fn)
 {
        FileName found_file;
        // Check if file is under RCS
        if (!(found_file = RCS::findFile(fn)).empty()) {
-               vcs.reset(new RCS(found_file));
-               vcs->owner(owner_);
+               vcs.reset(new RCS(found_file, owner_));
                return true;
        }
        // Check if file is under CVS
        if (!(found_file = CVS::findFile(fn)).empty()) {
-               vcs.reset(new CVS(found_file, fn));
-               vcs->owner(owner_);
+               vcs.reset(new CVS(found_file, 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_);
+               vcs.reset(new SVN(found_file, owner_));
                return true;
        }
 
@@ -78,9 +87,10 @@ bool LyXVC::file_not_found_hook(FileName const & fn)
        // 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()) {       
+       bool foundRCS = !RCS::findFile(fn).empty();
+       bool foundCVS = foundRCS ? false : !CVS::findFile(fn).empty();
+       bool foundSVN = (foundRCS || foundCVS) ? false : !SVN::findFile(fn).empty();
+       if (foundRCS || foundCVS || foundSVN) {
                docstring const file = makeDisplayPath(fn.absFileName(), 20);
                docstring const text =
                        bformat(_("Do you want to retrieve the document"
@@ -89,11 +99,17 @@ bool LyXVC::file_not_found_hook(FileName const & fn)
                        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;
+                       // Since the retrieve commands are implemented using
+                       // more general update commands we need to ensure that
+                       // we do not change an existing file by accident.
+                       if (fn.exists())
+                               return false;
+                       if (foundRCS)
+                               return RCS::retrieve(fn);
+                       else if (foundCVS)
+                               return CVS::retrieve(fn);
+                       else
+                               return SVN::retrieve(fn);
                }
        }
        return false;
@@ -127,20 +143,18 @@ bool LyXVC::registrer()
                if (svn_entries.isReadableFile()) {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
                                << to_utf8(filename.displayName()) << " with SVN");
-                       vcs.reset(new SVN(cvs_entries, filename));
+                       vcs.reset(new SVN(cvs_entries, owner_));
 
                } else if (cvs_entries.isReadableFile()) {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
                                << to_utf8(filename.displayName()) << " with CVS");
-                       vcs.reset(new CVS(cvs_entries, filename));
+                       vcs.reset(new CVS(cvs_entries, owner_));
 
                } else {
                        LYXERR(Debug::LYXVC, "LyXVC: registering "
                                << to_utf8(filename.displayName()) << " with RCS");
-                       vcs.reset(new RCS(FileName()));
+                       vcs.reset(new RCS(FileName(), owner_));
                }
-
-               vcs->owner(owner_);
        }
 
        LYXERR(Debug::LYXVC, "LyXVC: registrer");
@@ -162,6 +176,8 @@ bool LyXVC::registrer()
 string LyXVC::checkIn()
 {
        LYXERR(Debug::LYXVC, "LyXVC: checkIn");
+       if (!vcs)
+               return string();
        docstring empty(_("(no log message)"));
        docstring response;
        string log;
@@ -171,6 +187,8 @@ string LyXVC::checkIn()
        if (ok) {
                if (response.empty())
                        response = empty;
+               //shell collisions
+               response = subst(response, from_utf8("\""), from_utf8("\\\""));
                log = vcs->checkIn(to_utf8(response));
 
                // Reserve empty string for cancel button
@@ -185,6 +203,8 @@ string LyXVC::checkIn()
 
 string LyXVC::checkOut()
 {
+       if (!vcs)
+               return string();
        //RCS allows checkOut only in ReadOnly mode
        if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly())
                return string();
@@ -197,6 +217,8 @@ string LyXVC::checkOut()
 string LyXVC::repoUpdate()
 {
        LYXERR(Debug::LYXVC, "LyXVC: repoUpdate");
+       if (!vcs)
+               return string();
        return vcs->repoUpdate();
 }
 
@@ -204,13 +226,17 @@ string LyXVC::repoUpdate()
 string LyXVC::lockingToggle()
 {
        LYXERR(Debug::LYXVC, "LyXVC: toggle locking property");
+       if (!vcs)
+               return string();
        return vcs->lockingToggle();
 }
 
 
-void LyXVC::revert()
+bool LyXVC::revert()
 {
        LYXERR(Debug::LYXVC, "LyXVC: revert");
+       if (!vcs)
+               return false;
 
        docstring const file = owner_->fileName().displayName(20);
        docstring text = bformat(_("Reverting to the stored version of the "
@@ -221,19 +247,22 @@ void LyXVC::revert()
                ret = Alert::prompt(_("Revert to stored version of document?"),
                        text, 0, 1, _("&Revert"), _("&Cancel"));
 
-       if (ret == 0)
-               vcs->revert();
+       return ret == 0 && vcs->revert();
 }
 
 
 void LyXVC::undoLast()
 {
+       if (!vcs)
+               return;
        vcs->undoLast();
 }
 
 
 void LyXVC::toggleReadOnly()
 {
+       if (!vcs)
+               return;
        if (!vcs->toggleReadOnlyEnabled())
                return;
 
@@ -262,12 +291,16 @@ bool LyXVC::inUse() const
 
 string const LyXVC::versionString() const
 {
+       if (!vcs)
+               return string();
        return vcs->versionString();
 }
 
 
 bool LyXVC::locking() const
 {
+       if (!vcs)
+               return false;
        return vcs->status() != VCS::NOLOCKING;
 }