#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "vc-backend.h"
#include "debug.h"
#include "buffer.h"
-#include "BufferView.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
+#include "frontends/LyXView.h"
+#include "funcrequest.h"
#include "support/FileInfo.h"
-#include "support/LRegex.h"
-#include "support/LSubstring.h"
#include "support/path.h"
#include "support/filetools.h"
#include "support/lstrings.h"
+#include "support/systemcall.h"
+
+#include <boost/regex.hpp>
#include <fstream>
+using namespace lyx::support;
+
+#ifndef CXX_GLOBAL_CSTD
+using std::asctime;
+using std::gmtime;
+#endif
+
using std::endl;
using std::ifstream;
using std::getline;
+using boost::regex;
+using boost::regex_match;
+
+#ifndef USE_INCLUDED_STRING
+using boost::smatch;
+#else
+using boost::cmatch;
+#endif
+
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 + "\"",
+ + file + '"',
string());
}
while (!read_enough && ifs >> token) {
lyxerr[Debug::LYXVC]
<< "LyXVC::scanMaster: current lex text: `"
- << token << "'" << endl;
+ << token << '\'' << endl;
if (token.empty())
continue;
// get version here
string tmv;
ifs >> tmv;
- tmv = strip(tmv, ';');
+ tmv = rtrim(tmv, ";");
version_ = tmv;
lyxerr[Debug::LYXVC] << "LyXVC: version found to be "
<< tmv << endl;
string s2;
do {
ifs >> tmpt;
- s1 = strip(tmpt, ';');
+ s1 = rtrim(tmpt, ";");
// tmp is now in the format <user>:<version>
s1 = split(s1, s2, ':');
// s2 is user, and s1 is version
break;
}
} while (!contains(tmpt, ";"));
-
+
} else if (token == "comment") {
// we don't need to read any further than this.
read_enough = true;
cmd += msg;
cmd += "\" \"";
cmd += OnlyFilename(owner_->fileName());
- cmd += "\"";
- doVCCommand(cmd, owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
+ cmd += '"';
+ doVCCommand(cmd, owner_->filePath());
}
void RCS::checkIn(string const & msg)
{
doVCCommand("ci -q -u -m\"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
+ + OnlyFilename(owner_->fileName()) + '"',
+ owner_->filePath());
}
void RCS::checkOut()
{
- owner_->markLyxClean();
+ owner_->markClean();
doVCCommand("co -q -l \""
- + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
+ + OnlyFilename(owner_->fileName()) + '"',
+ owner_->filePath());
}
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()
- ->getLyXFunc()->dispatch(LFUN_MENURELOAD);
+ owner_->markClean();
}
{
lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
doVCCommand("rcs -o" + version() + " \""
- + OnlyFilename(owner_->fileName()) + "\"",
- owner_->filepath);
+ + OnlyFilename(owner_->fileName()) + '"',
+ owner_->filePath());
}
void RCS::getLog(string const & tmpf)
{
doVCCommand("rlog \""
- + OnlyFilename(owner_->fileName()) + "\" > " + tmpf, owner_->filepath);
+ + OnlyFilename(owner_->fileName()) + "\" > "
+ + tmpf, owner_->filePath());
}
string const dir = OnlyPath(file) + "/CVS/Entries";
string const tmpf = "/" + OnlyFilename(file) + "/";
lyxerr[Debug::LYXVC] << "LyXVC: checking in `" << dir
- << "' for `" << tmpf << "'" << endl;
+ << "' for `" << tmpf << '\'' << endl;
FileInfo const f(dir);
if (f.readable()) {
// Ok we are at least in a CVS dir. Parse the CVS/Entries
// Ok now we do the real scan...
ifstream ifs(master_.c_str());
string tmpf = "/" + OnlyFilename(file_) + "/";
- lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << "'" << endl;
+ lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << '\'' << endl;
string line;
- LRegex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
+ regex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
while (getline(ifs, line)) {
lyxerr[Debug::LYXVC] << "\t line: " << line << endl;
if (contains(line, tmpf)) {
// Ok extract the fields.
- LRegex::SubMatches const & sm = reg.exec(line);
+#ifndef USE_INCLUDED_STRING
+ smatch sm;
+#else
+ cmatch sm;
+#endif
+ regex_match(STRCONV(line), sm, reg);
+
//sm[0]; // whole matched string
//sm[1]; // filename
- version_ = LSubstring(line, sm[2].first,
- sm[2].second);
- string file_date = LSubstring(line, sm[3].first,
- sm[3].second);
+ version_ = STRCONV(sm.str(2));
+ string const file_date = STRCONV(sm.str(3));
+
//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');
+ string mod_date = rtrim(asctime(gmtime(&mod)), "\n");
lyxerr[Debug::LYXVC]
<< "Date in Entries: `" << file_date
<< "'\nModification date of file: `"
- << mod_date << "'" << endl;
+ << mod_date << '\'' << endl;
if (file_date == mod_date) {
locker_ = "Unlocked";
vcstatus = UNLOCKED;
void CVS::registrer(string const & msg)
{
doVCCommand("cvs -q add -m \"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + "\"", owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
+ + OnlyFilename(owner_->fileName()) + '"',
+ owner_->filePath());
}
void CVS::checkIn(string const & msg)
{
doVCCommand("cvs -q commit -m \"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + "\"",
- owner_->filepath);
- owner_->getUser()->owner()->getLyXFunc()->dispatch(LFUN_MENURELOAD);
+ + OnlyFilename(owner_->fileName()) + '"',
+ owner_->filePath());
}
// 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);
+
+ doVCCommand("rm -f \"" + fil + "\"; cvs update \"" + fil + '"',
+ owner_->filePath());
+ owner_->markClean();
}
{
doVCCommand("cvs log \""
+ OnlyFilename(owner_->fileName()) + "\" > " + tmpf,
- owner_->filepath);
+ owner_->filePath());
}
projects / lyx.git / blobdiff