#include "support/path.h"
#include "support/filetools.h"
#include "support/lstrings.h"
+#include "support/systemcall.h"
#include <fstream>
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;
}
}
-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());
cmd += "\" \"";
cmd += OnlyFilename(owner_->fileName());
cmd += "\"";
- doVCCommand(cmd, owner_->filepath);
+ doVCCommand(cmd, owner_->filePath());
owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
}
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);
}
{
owner_->markLyxClean();
doVCCommand("co -q -l \""
- + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
+ + OnlyFilename(owner_->fileName()) + "\"", owner_->filePath());
owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
}
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()
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());
}
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);
}
{
doVCCommand("cvs -q commit -m \"" + msg + "\" \""
+ OnlyFilename(owner_->fileName()) + "\"",
- owner_->filepath);
+ owner_->filePath());
owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
}
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);
{
doVCCommand("cvs log \""
+ OnlyFilename(owner_->fileName()) + "\" > " + tmpf,
- owner_->filepath);
+ owner_->filePath());
}