#pragma implementation
#endif
-#include <fstream>
-
#include "vc-backend.h"
#include "debug.h"
+#include "buffer.h"
+#include "BufferView.h"
+#include "LyXView.h"
+#include "lyxfunc.h"
+
#include "support/FileInfo.h"
#include "support/LRegex.h"
#include "support/LSubstring.h"
#include "support/path.h"
-#include "buffer.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
+#include "support/systemcall.h"
+
+#include <fstream>
+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);
- int ret = one.startscript(Systemcalls::System, cmd);
+ Systemcall one;
+ Path p(path);
+ int const ret = one.startscript(Systemcall::Wait, cmd);
return ret;
}
}
-string RCS::find_file(string const & file)
+string const RCS::find_file(string const & file)
{
string tmp(file);
// Check if *,v exists.
}
+void RCS::retrieve(string const & file)
+{
+ lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrieve.\n\t" << file << endl;
+ VCS::doVCCommand("co -q -r \""
+ + file + "\"",
+ string());
+}
+
+
void RCS::scanMaster()
{
lyxerr[Debug::LYXVC] << "LyXVC::RCS: scanMaster." << endl;
// get locker here
if (contains(token, ";")) {
locker_ = "Unlocked";
- vcstat = UNLOCKED;
+ vcstatus = UNLOCKED;
continue;
}
- string tmpt, s1, s2;
+ string tmpt;
+ string s1;
+ string s2;
do {
ifs >> tmpt;
s1 = strip(tmpt, ';');
// s2 is user, and s1 is version
if (s1 == version_) {
locker_ = s2;
- vcstat = LOCKED;
+ vcstatus = LOCKED;
break;
}
} while (!contains(tmpt, ";"));
-
+
} else if (token == "comment") {
// we don't need to read any further than this.
read_enough = true;
<< endl;
}
}
- version_ = "RCS: " + version_;
}
string cmd = "ci -q -u -i -t-\"";
cmd += msg;
cmd += "\" \"";
- cmd += OnlyFilename(owner_->getFileName());
+ cmd += OnlyFilename(owner_->fileName());
cmd += "\"";
- doVCCommand(cmd);
- owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
+ 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_->getFileName()) + "\"");
- owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
+ + OnlyFilename(owner_->fileName()) + "\"", owner_->filePath());
+ owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
}
{
owner_->markLyxClean();
doVCCommand("co -q -l \""
- + OnlyFilename(owner_->getFileName()) + "\"");
- owner_->getUser()->owner()->getLyXFunc()->Dispatch("buffer-reload");
+ + OnlyFilename(owner_->fileName()) + "\"", owner_->filePath());
+ owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
}
void RCS::revert()
{
doVCCommand("co -f -u" + version() + " \""
- + OnlyFilename(owner_->getFileName()) + "\"");
+ + OnlyFilename(owner_->fileName()) + "\"", owner_->filePath());
// We ignore changes and just reload!
owner_->markLyxClean();
owner_->getUser()->owner()
- ->getLyXFunc()->Dispatch("buffer-reload");
+ ->getLyXFunc()->dispatch(LFUN_MENURELOAD);
}
{
lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
doVCCommand("rcs -o" + version() + " \""
- + OnlyFilename(owner_->getFileName()) + "\"");
+ + OnlyFilename(owner_->fileName()) + "\"",
+ owner_->filePath());
}
void RCS::getLog(string const & tmpf)
{
doVCCommand("rlog \""
- + OnlyFilename(owner_->getFileName()) + "\" > " + tmpf);
+ + OnlyFilename(owner_->fileName()) + "\" > " + tmpf, owner_->filePath());
}
}
-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.
- string dir = OnlyPath(file);
- string tmpf = "/" + OnlyFilename(file) + "/";
- dir += "/CVS/Entries";
+ string const dir = OnlyPath(file) + "/CVS/Entries";
+ string const tmpf = "/" + OnlyFilename(file) + "/";
lyxerr[Debug::LYXVC] << "LyXVC: checking in `" << dir
<< "' for `" << tmpf << "'" << endl;
- FileInfo f(dir);
+ FileInfo const f(dir);
if (f.readable()) {
// Ok we are at least in a CVS dir. Parse the CVS/Entries
// and see if we can find this file. We do a fast and
string tmpf = "/" + OnlyFilename(file_) + "/";
lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << "'" << endl;
string line;
- while(getline(ifs, line)) {
+ LRegex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
+ while (getline(ifs, line)) {
lyxerr[Debug::LYXVC] << "\t line: " << line << endl;
if (contains(line, tmpf)) {
// Ok extract the fields.
- LRegex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
LRegex::SubMatches const & sm = reg.exec(line);
//sm[0]; // whole matched string
//sm[1]; // filename
- version_ = "CVS: ";
- version_ += LSubstring(line, sm[2].first,
+ version_ = LSubstring(line, sm[2].first,
sm[2].second);
string file_date = LSubstring(line, sm[3].first,
sm[3].second);
//sm[4]; // options
//sm[5]; // tag or tagdate
FileInfo fi(file_);
+ // FIXME: must double check file is stattable/existing
time_t mod = fi.getModificationTime();
string mod_date = strip(asctime(gmtime(&mod)), '\n');
lyxerr[Debug::LYXVC]
<< 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;
}
-#if 0
- for (LRegex::SubMatches::const_iterator cit = sm.begin();
- cit != sm.end(); ++cit) {
- if ((*cit).first != string::npos)
- lyxerr << string(line, (*cit).first,
- (*cit).second) << endl;
- }
-#endif
break;
}
}
void CVS::registrer(string const & msg)
{
- // cvs add
+ doVCCommand("cvs -q add -m \"" + msg + "\" \""
+ + OnlyFilename(owner_->fileName()) + "\"", owner_->filePath());
+ owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
}
void CVS::checkIn(string const & msg)
{
- // cvs commit
+ doVCCommand("cvs -q commit -m \"" + msg + "\" \""
+ + OnlyFilename(owner_->fileName()) + "\"",
+ owner_->filePath());
+ owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
}
void CVS::checkOut()
{
- // cvs update
+ // cvs update or perhaps for cvs this should be a noop
+ lyxerr << "Sorry not implemented." << endl;
}
void CVS::revert()
{
- // not sure how to do this...
- // rm file
- // cvs update
+ // 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_->markLyxClean();
+ owner_->getUser()->owner()
+ ->getLyXFunc()->dispatch(LFUN_MENURELOAD);
}
// merge the current with the previous version
// in a reverse patch kind of way, so that the
// result is to revert the last changes.
+ lyxerr << "Sorry not implemented." << endl;
}
-void CVS::getLog(string const &)
+void CVS::getLog(string const & tmpf)
{
+ doVCCommand("cvs log \""
+ + OnlyFilename(owner_->fileName()) + "\" > " + tmpf,
+ owner_->filePath());
}
projects / lyx.git / blobdiff