Small fixes noticed by Jean-Marc.

[lyx.git] / src / vc-backend.C

diff --git a/src/vc-backend.C b/src/vc-backend.C
index b23f30e14f0683b0800033dddf63768bbbee0762..81efc9f6ce2a6a7c6e0c085ec47c82d81f6a599e 100644 (file)
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -5,7 +5,6 @@
 #endif
 
 #include <fstream>
-using std::ifstream;
 
 #include "vc-backend.h"
 #include "debug.h"
@@ -13,16 +12,20 @@ using std::ifstream;
 #include "support/LRegex.h"
 #include "support/LSubstring.h"
 #include "support/path.h"
+#include "support/filetools.h"
 #include "buffer.h"
 #include "LyXView.h"
 #include "lyxfunc.h"
 
+using std::endl;
+using std::ifstream;
+using std::getline;
 
-int VCS::doVCCommand(string const & cmd)
+int VCS::doVCCommand(string const & cmd, string const & path)
 {
        lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
         Systemcalls one;
-       Path p(owner_->filepath);
+       Path p(path);
        int ret = one.startscript(Systemcalls::System, cmd);
        return ret;
 }
@@ -35,7 +38,7 @@ RCS::RCS(string const & m)
 }
 
 
-string RCS::find_file(string const & file)
+string const RCS::find_file(string const & file)
 {
        string tmp(file);
        // Check if *,v exists.
@@ -63,6 +66,15 @@ string RCS::find_file(string const & file)
 }
 
 
+void RCS::retrive(string const & file)
+{
+       lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrive.\n\t" << file << endl;
+       VCS::doVCCommand("co -q -r \""
+                        + file + "\"",
+                        string());
+}
+
+
 void RCS::scanMaster()
 {
        lyxerr[Debug::LYXVC] << "LyXVC::RCS: scanMaster." << endl;
@@ -95,7 +107,7 @@ void RCS::scanMaster()
                        // get locker here
                        if (contains(token, ";")) {
                                locker_ = "Unlocked";
-                               vcstat = UNLOCKED;
+                               vcstatus = UNLOCKED;
                                continue;
                        }
                        string tmpt, s1, s2;
@@ -107,7 +119,7 @@ void RCS::scanMaster()
                                // s2 is user, and s1 is version
                                if (s1 == version_) {
                                        locker_ = s2;
-                                       vcstat = LOCKED;
+                                       vcstatus = LOCKED;
                                        break;
                                }
                        } while (!contains(tmpt, ";"));
@@ -133,7 +145,7 @@ void RCS::registrer(string const & msg)
        cmd += "\" \"";
        cmd += OnlyFilename(owner_->fileName());
        cmd += "\"";
-       doVCCommand(cmd);
+       doVCCommand(cmd, owner_->filepath);
        owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
 }
 
@@ -141,7 +153,7 @@ void RCS::registrer(string const & msg)
 void RCS::checkIn(string const & msg)
 {
        doVCCommand("ci -q -u -m\"" + msg + "\" \""
-                   + OnlyFilename(owner_->fileName()) + "\"");
+                   + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
        owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
 }
 
@@ -150,7 +162,7 @@ void RCS::checkOut()
 {
        owner_->markLyxClean();
        doVCCommand("co -q -l \""
-                   + OnlyFilename(owner_->fileName()) + "\"");
+                   + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
        owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
 }
 
@@ -158,7 +170,7 @@ void RCS::checkOut()
 void RCS::revert()
 {
        doVCCommand("co -f -u" + version() + " \""
-                   + OnlyFilename(owner_->fileName()) + "\"");
+                   + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
        // We ignore changes and just reload!
        owner_->markLyxClean();
        owner_->getUser()->owner()
@@ -170,14 +182,14 @@ void RCS::undoLast()
 {
        lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
        doVCCommand("rcs -o" + version() + " \""
-                   + OnlyFilename(owner_->fileName()) + "\"");
+                   + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
 }
 
 
 void RCS::getLog(string const & tmpf)
 {
        doVCCommand("rlog \""
-                   + OnlyFilename(owner_->fileName()) + "\" > " + tmpf);
+                   + OnlyFilename(owner_->fileName()) + "\" > " + tmpf, owner_->filepath);
 }
 
 
@@ -189,7 +201,7 @@ CVS::CVS(string const & m, string const & f)
 }
 
 
-string CVS::find_file(string const & file)
+string const CVS::find_file(string const & file)
 {
        // First we look for the CVS/Entries in the same dir
        // where we have file.
@@ -247,12 +259,12 @@ void CVS::scanMaster()
                                << mod_date << "'" << endl;
                        if (file_date == mod_date) {
                                locker_ = "Unlocked";
-                               vcstat = UNLOCKED;
+                               vcstatus = UNLOCKED;
                        } else {
                                // Here we should also to some more checking
                                // to see if there are conflicts or not.
                                locker_ = "Locked";
-                               vcstat = LOCKED;
+                               vcstatus = LOCKED;
                        }
                        break;
                }
@@ -263,7 +275,7 @@ void CVS::scanMaster()
 void CVS::registrer(string const & msg)
 {
        doVCCommand("cvs -q add -m \"" + msg + "\" \""
-                   + OnlyFilename(owner_->fileName()) + "\"");
+                   + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
        owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
 }
 
@@ -271,7 +283,7 @@ void CVS::registrer(string const & msg)
 void CVS::checkIn(string const & msg)
 {
        doVCCommand("cvs -q commit -m \"" + msg + "\" \""
-                   + OnlyFilename(owner_->fileName()) + "\"");
+                   + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
        owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
 }