X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvc-backend.C;h=c4336d48e7fda94429b2f919bbf1a9fba06c9c3f;hb=dab43e77955e5b21fa556f53143d42e09e439f40;hp=794c81fc4aec00630a3f1f1b519e73547c2d532e;hpb=8b8741cd5d7e960c5663911f8b69972419f6d37b;p=lyx.git

diff --git a/src/vc-backend.C b/src/vc-backend.C
index 794c81fc4a..c4336d48e7 100644
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -17,6 +17,7 @@
 #include "support/path.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/systemcall.h"
 
 #include <fstream>
 
@@ -27,9 +28,9 @@ using std::getline;
 int VCS::doVCCommand(string const & cmd, string const & path)
 {
 	lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
-        Systemcalls one;
+	Systemcall one;
 	Path p(path);
-	int const ret = one.startscript(Systemcalls::System, cmd);
+	int const ret = one.startscript(Systemcall::Wait, cmd);
 	return ret;
 }
 
@@ -69,9 +70,9 @@ string const RCS::find_file(string const & file)
 }
 
 
-void RCS::retrive(string const & file)
+void RCS::retrieve(string const & file)
 {
-	lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrive.\n\t" << file << endl;
+	lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrieve.\n\t" << file << endl;
 	VCS::doVCCommand("co -q -r \""
 			 + file + "\"",
 			 string());
@@ -128,7 +129,7 @@ void RCS::scanMaster()
 					break;
 				}
 			} while (!contains(tmpt, ";"));
-			
+
 		} else if (token == "comment") {
 			// we don't need to read any further than this.
 			read_enough = true;
@@ -149,7 +150,7 @@ void RCS::registrer(string const & msg)
 	cmd += "\" \"";
 	cmd += OnlyFilename(owner_->fileName());
 	cmd += "\"";
-	doVCCommand(cmd, owner_->filepath);
+	doVCCommand(cmd, owner_->filePath());
 	owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
 }
 
@@ -157,7 +158,7 @@ void RCS::registrer(string const & msg)
 void RCS::checkIn(string const & msg)
 {
 	doVCCommand("ci -q -u -m\"" + msg + "\" \""
-		    + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
+		    + OnlyFilename(owner_->fileName()) + "\"", owner_->filePath());
 	owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
 }
 
@@ -166,7 +167,7 @@ void RCS::checkOut()
 {
 	owner_->markLyxClean();
 	doVCCommand("co -q -l \""
-		    + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
+		    + OnlyFilename(owner_->fileName()) + "\"", owner_->filePath());
 	owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
 }
 
@@ -174,7 +175,7 @@ void RCS::checkOut()
 void RCS::revert()
 {
 	doVCCommand("co -f -u" + version() + " \""
-		    + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
+		    + OnlyFilename(owner_->fileName()) + "\"", owner_->filePath());
 	// We ignore changes and just reload!
 	owner_->markLyxClean();
 	owner_->getUser()->owner()
@@ -187,14 +188,14 @@ void RCS::undoLast()
 	lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
 	doVCCommand("rcs -o" + version() + " \""
 		    + OnlyFilename(owner_->fileName()) + "\"",
-		    owner_->filepath);
+		    owner_->filePath());
 }
 
 
 void RCS::getLog(string const & tmpf)
 {
 	doVCCommand("rlog \""
-		    + OnlyFilename(owner_->fileName()) + "\" > " + tmpf, owner_->filepath);
+		    + OnlyFilename(owner_->fileName()) + "\" > " + tmpf, owner_->filePath());
 }
 
 
@@ -279,7 +280,7 @@ void CVS::scanMaster()
 void CVS::registrer(string const & msg)
 {
 	doVCCommand("cvs -q add -m \"" + msg + "\" \""
-		    + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
+		    + OnlyFilename(owner_->fileName()) + "\"", owner_->filePath());
 	owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
 }
 
@@ -288,7 +289,7 @@ void CVS::checkIn(string const & msg)
 {
 	doVCCommand("cvs -q commit -m \"" + msg + "\" \""
 		    + OnlyFilename(owner_->fileName()) + "\"",
-		    owner_->filepath);
+		    owner_->filePath());
 	owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
 }
 
@@ -305,9 +306,9 @@ void CVS::revert()
 	// Reverts to the version in CVS repository and
 	// gets the updated version from the repository.
 	string const fil = OnlyFilename(owner_->fileName());
-	
+
 	doVCCommand("rm -f \"" + fil + "\"; cvs update \"" + fil + "\"",
-		    owner_->filepath);
+		    owner_->filePath());
 	owner_->markLyxClean();
 	owner_->getUser()->owner()
 		->getLyXFunc()->dispatch(LFUN_MENURELOAD);
@@ -327,5 +328,5 @@ void CVS::getLog(string const & tmpf)
 {
 	doVCCommand("cvs log \""
 		    + OnlyFilename(owner_->fileName()) + "\" > " + tmpf,
-		    owner_->filepath);
+		    owner_->filePath());
 }