1999-11-09 23:52:04 +00:00
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include "vc-backend.h"
|
|
|
|
#include "debug.h"
|
2001-12-18 03:30:35 +00:00
|
|
|
#include "buffer.h"
|
2002-05-23 12:08:47 +00:00
|
|
|
#include "frontends/LyXView.h"
|
2002-08-13 17:43:40 +00:00
|
|
|
#include "funcrequest.h"
|
2001-12-18 03:30:35 +00:00
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
#include "support/FileInfo.h"
|
|
|
|
#include "support/path.h"
|
2000-11-08 09:39:46 +00:00
|
|
|
#include "support/filetools.h"
|
2001-07-29 17:39:01 +00:00
|
|
|
#include "support/lstrings.h"
|
2002-02-18 19:13:48 +00:00
|
|
|
#include "support/systemcall.h"
|
2001-12-18 03:30:35 +00:00
|
|
|
|
2002-05-25 00:19:56 +00:00
|
|
|
#include <boost/regex.hpp>
|
|
|
|
|
2001-12-18 03:30:35 +00:00
|
|
|
#include <fstream>
|
1999-11-09 23:52:04 +00:00
|
|
|
|
2003-06-30 23:56:22 +00:00
|
|
|
using namespace lyx::support;
|
|
|
|
|
2002-06-10 07:57:39 +00:00
|
|
|
#ifndef CXX_GLOBAL_CSTD
|
|
|
|
using std::asctime;
|
|
|
|
using std::gmtime;
|
|
|
|
#endif
|
|
|
|
|
2000-03-28 02:18:55 +00:00
|
|
|
using std::endl;
|
|
|
|
using std::ifstream;
|
2000-05-04 10:57:00 +00:00
|
|
|
using std::getline;
|
2002-05-25 00:19:56 +00:00
|
|
|
using boost::regex;
|
|
|
|
using boost::regex_match;
|
2002-11-04 02:12:42 +00:00
|
|
|
|
|
|
|
#ifndef USE_INCLUDED_STRING
|
2002-05-25 00:19:56 +00:00
|
|
|
using boost::smatch;
|
2002-11-04 02:12:42 +00:00
|
|
|
#else
|
|
|
|
using boost::cmatch;
|
|
|
|
#endif
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
|
2000-01-11 08:23:07 +00:00
|
|
|
int VCS::doVCCommand(string const & cmd, string const & path)
|
1999-11-09 23:52:04 +00:00
|
|
|
{
|
|
|
|
lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
|
2002-03-21 17:27:08 +00:00
|
|
|
Systemcall one;
|
2000-01-11 08:23:07 +00:00
|
|
|
Path p(path);
|
2002-02-18 19:13:48 +00:00
|
|
|
int const ret = one.startscript(Systemcall::Wait, cmd);
|
1999-11-09 23:52:04 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
RCS::RCS(string const & m)
|
|
|
|
{
|
|
|
|
master_ = m;
|
|
|
|
scanMaster();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-09-14 17:53:12 +00:00
|
|
|
string const RCS::find_file(string const & file)
|
1999-11-09 23:52:04 +00:00
|
|
|
{
|
|
|
|
string tmp(file);
|
|
|
|
// Check if *,v exists.
|
|
|
|
tmp += ",v";
|
|
|
|
FileInfo f;
|
|
|
|
lyxerr[Debug::LYXVC] << "Checking if file is under rcs: "
|
|
|
|
<< tmp << endl;
|
|
|
|
if (f.newFile(tmp).readable()) {
|
|
|
|
lyxerr[Debug::LYXVC] << "Yes " << file
|
|
|
|
<< " is under rcs." << endl;
|
|
|
|
return tmp;
|
|
|
|
} else {
|
|
|
|
// Check if RCS/*,v exists.
|
|
|
|
tmp = AddName(AddPath(OnlyPath(file), "RCS"), file);
|
|
|
|
tmp += ",v";
|
|
|
|
lyxerr[Debug::LYXVC] << "Checking if file is under rcs: "
|
|
|
|
<< tmp << endl;
|
|
|
|
if (f.newFile(tmp).readable()) {
|
|
|
|
lyxerr[Debug::LYXVC] << "Yes " << file
|
|
|
|
<< " it is under rcs."<< endl;
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return string();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-02-26 10:50:48 +00:00
|
|
|
void RCS::retrieve(string const & file)
|
2000-01-11 08:23:07 +00:00
|
|
|
{
|
2002-02-26 10:50:48 +00:00
|
|
|
lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrieve.\n\t" << file << endl;
|
2000-01-11 08:23:07 +00:00
|
|
|
VCS::doVCCommand("co -q -r \""
|
2002-11-27 10:30:28 +00:00
|
|
|
+ file + '"',
|
2000-01-11 08:23:07 +00:00
|
|
|
string());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
void RCS::scanMaster()
|
|
|
|
{
|
|
|
|
lyxerr[Debug::LYXVC] << "LyXVC::RCS: scanMaster." << endl;
|
|
|
|
|
|
|
|
ifstream ifs(master_.c_str());
|
|
|
|
|
|
|
|
string token;
|
|
|
|
bool read_enough = false;
|
|
|
|
|
|
|
|
while (!read_enough && ifs >> token) {
|
|
|
|
lyxerr[Debug::LYXVC]
|
|
|
|
<< "LyXVC::scanMaster: current lex text: `"
|
2002-11-27 10:30:28 +00:00
|
|
|
<< token << '\'' << endl;
|
1999-11-09 23:52:04 +00:00
|
|
|
|
|
|
|
if (token.empty())
|
|
|
|
continue;
|
|
|
|
else if (token == "head") {
|
|
|
|
// get version here
|
|
|
|
string tmv;
|
|
|
|
ifs >> tmv;
|
2002-07-28 22:50:13 +00:00
|
|
|
tmv = rtrim(tmv, ";");
|
1999-11-09 23:52:04 +00:00
|
|
|
version_ = tmv;
|
|
|
|
lyxerr[Debug::LYXVC] << "LyXVC: version found to be "
|
|
|
|
<< tmv << endl;
|
|
|
|
} else if (contains(token, "access")
|
|
|
|
|| contains(token, "symbols")
|
|
|
|
|| contains(token, "strict")) {
|
|
|
|
// nothing
|
|
|
|
} else if (contains(token, "locks")) {
|
|
|
|
// get locker here
|
|
|
|
if (contains(token, ";")) {
|
|
|
|
locker_ = "Unlocked";
|
2000-05-17 16:42:35 +00:00
|
|
|
vcstatus = UNLOCKED;
|
1999-11-09 23:52:04 +00:00
|
|
|
continue;
|
|
|
|
}
|
2001-08-19 14:06:27 +00:00
|
|
|
string tmpt;
|
|
|
|
string s1;
|
|
|
|
string s2;
|
1999-11-09 23:52:04 +00:00
|
|
|
do {
|
|
|
|
ifs >> tmpt;
|
2002-07-28 22:50:13 +00:00
|
|
|
s1 = rtrim(tmpt, ";");
|
1999-11-09 23:52:04 +00:00
|
|
|
// tmp is now in the format <user>:<version>
|
|
|
|
s1 = split(s1, s2, ':');
|
|
|
|
// s2 is user, and s1 is version
|
|
|
|
if (s1 == version_) {
|
|
|
|
locker_ = s2;
|
2000-05-17 16:42:35 +00:00
|
|
|
vcstatus = LOCKED;
|
1999-11-09 23:52:04 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
} while (!contains(tmpt, ";"));
|
2002-03-21 17:27:08 +00:00
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
} else if (token == "comment") {
|
|
|
|
// we don't need to read any further than this.
|
|
|
|
read_enough = true;
|
|
|
|
} else {
|
|
|
|
// unexpected
|
|
|
|
lyxerr[Debug::LYXVC]
|
|
|
|
<< "LyXVC::scanMaster(): unexpected token"
|
|
|
|
<< endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RCS::registrer(string const & msg)
|
|
|
|
{
|
|
|
|
string cmd = "ci -q -u -i -t-\"";
|
|
|
|
cmd += msg;
|
|
|
|
cmd += "\" \"";
|
1999-12-10 00:07:59 +00:00
|
|
|
cmd += OnlyFilename(owner_->fileName());
|
2002-11-27 10:30:28 +00:00
|
|
|
cmd += '"';
|
2002-01-14 23:31:23 +00:00
|
|
|
doVCCommand(cmd, owner_->filePath());
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RCS::checkIn(string const & msg)
|
|
|
|
{
|
|
|
|
doVCCommand("ci -q -u -m\"" + msg + "\" \""
|
2002-11-27 10:30:28 +00:00
|
|
|
+ OnlyFilename(owner_->fileName()) + '"',
|
|
|
|
owner_->filePath());
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RCS::checkOut()
|
|
|
|
{
|
2002-08-04 23:11:50 +00:00
|
|
|
owner_->markClean();
|
1999-11-09 23:52:04 +00:00
|
|
|
doVCCommand("co -q -l \""
|
2002-11-27 10:30:28 +00:00
|
|
|
+ OnlyFilename(owner_->fileName()) + '"',
|
|
|
|
owner_->filePath());
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RCS::revert()
|
|
|
|
{
|
|
|
|
doVCCommand("co -f -u" + version() + " \""
|
2002-11-27 10:30:28 +00:00
|
|
|
+ OnlyFilename(owner_->fileName()) + '"',
|
|
|
|
owner_->filePath());
|
1999-11-09 23:52:04 +00:00
|
|
|
// We ignore changes and just reload!
|
2002-08-04 23:11:50 +00:00
|
|
|
owner_->markClean();
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RCS::undoLast()
|
|
|
|
{
|
|
|
|
lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
|
|
|
|
doVCCommand("rcs -o" + version() + " \""
|
2002-11-27 10:30:28 +00:00
|
|
|
+ OnlyFilename(owner_->fileName()) + '"',
|
2002-01-14 23:31:23 +00:00
|
|
|
owner_->filePath());
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void RCS::getLog(string const & tmpf)
|
|
|
|
{
|
|
|
|
doVCCommand("rlog \""
|
2002-11-27 10:30:28 +00:00
|
|
|
+ OnlyFilename(owner_->fileName()) + "\" > "
|
|
|
|
+ tmpf, owner_->filePath());
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
CVS::CVS(string const & m, string const & f)
|
|
|
|
{
|
|
|
|
master_ = m;
|
|
|
|
file_ = f;
|
|
|
|
scanMaster();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-09-14 17:53:12 +00:00
|
|
|
string const CVS::find_file(string const & file)
|
1999-11-09 23:52:04 +00:00
|
|
|
{
|
|
|
|
// First we look for the CVS/Entries in the same dir
|
|
|
|
// where we have file.
|
2000-12-10 05:20:36 +00:00
|
|
|
string const dir = OnlyPath(file) + "/CVS/Entries";
|
|
|
|
string const tmpf = "/" + OnlyFilename(file) + "/";
|
1999-11-09 23:52:04 +00:00
|
|
|
lyxerr[Debug::LYXVC] << "LyXVC: checking in `" << dir
|
2002-11-27 10:30:28 +00:00
|
|
|
<< "' for `" << tmpf << '\'' << endl;
|
2000-12-10 05:20:36 +00:00
|
|
|
FileInfo const f(dir);
|
1999-11-09 23:52:04 +00:00
|
|
|
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
|
|
|
|
// dirty parse here.
|
|
|
|
ifstream ifs(dir.c_str());
|
|
|
|
string line;
|
|
|
|
while (getline(ifs, line)) {
|
|
|
|
lyxerr[Debug::LYXVC] << "\tEntries: " << line << endl;
|
|
|
|
if (contains(line, tmpf)) return dir;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return string();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CVS::scanMaster()
|
|
|
|
{
|
|
|
|
lyxerr[Debug::LYXVC] << "LyXVC::CVS: scanMaster. \n Checking: "
|
|
|
|
<< master_ << endl;
|
|
|
|
// Ok now we do the real scan...
|
|
|
|
ifstream ifs(master_.c_str());
|
|
|
|
string tmpf = "/" + OnlyFilename(file_) + "/";
|
2002-11-27 10:30:28 +00:00
|
|
|
lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << '\'' << endl;
|
1999-11-09 23:52:04 +00:00
|
|
|
string line;
|
2002-05-25 00:19:56 +00:00
|
|
|
regex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
|
2001-12-05 08:04:20 +00:00
|
|
|
while (getline(ifs, line)) {
|
1999-11-09 23:52:04 +00:00
|
|
|
lyxerr[Debug::LYXVC] << "\t line: " << line << endl;
|
|
|
|
if (contains(line, tmpf)) {
|
|
|
|
// Ok extract the fields.
|
2002-11-04 02:12:42 +00:00
|
|
|
#ifndef USE_INCLUDED_STRING
|
2002-05-25 00:19:56 +00:00
|
|
|
smatch sm;
|
2002-11-04 02:12:42 +00:00
|
|
|
#else
|
|
|
|
cmatch sm;
|
|
|
|
#endif
|
|
|
|
regex_match(STRCONV(line), sm, reg);
|
2002-05-25 00:19:56 +00:00
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
//sm[0]; // whole matched string
|
|
|
|
//sm[1]; // filename
|
2002-11-04 02:12:42 +00:00
|
|
|
version_ = STRCONV(sm.str(2));
|
|
|
|
string const file_date = STRCONV(sm.str(3));
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
//sm[4]; // options
|
|
|
|
//sm[5]; // tag or tagdate
|
|
|
|
FileInfo fi(file_);
|
2002-01-07 10:17:44 +00:00
|
|
|
// FIXME: must double check file is stattable/existing
|
1999-11-09 23:52:04 +00:00
|
|
|
time_t mod = fi.getModificationTime();
|
2002-07-28 22:50:13 +00:00
|
|
|
string mod_date = rtrim(asctime(gmtime(&mod)), "\n");
|
1999-11-09 23:52:04 +00:00
|
|
|
lyxerr[Debug::LYXVC]
|
|
|
|
<< "Date in Entries: `" << file_date
|
|
|
|
<< "'\nModification date of file: `"
|
2002-11-27 10:30:28 +00:00
|
|
|
<< mod_date << '\'' << endl;
|
1999-11-09 23:52:04 +00:00
|
|
|
if (file_date == mod_date) {
|
|
|
|
locker_ = "Unlocked";
|
2000-05-17 16:42:35 +00:00
|
|
|
vcstatus = UNLOCKED;
|
1999-11-09 23:52:04 +00:00
|
|
|
} else {
|
|
|
|
// Here we should also to some more checking
|
|
|
|
// to see if there are conflicts or not.
|
|
|
|
locker_ = "Locked";
|
2000-05-17 16:42:35 +00:00
|
|
|
vcstatus = LOCKED;
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CVS::registrer(string const & msg)
|
|
|
|
{
|
1999-11-15 12:01:38 +00:00
|
|
|
doVCCommand("cvs -q add -m \"" + msg + "\" \""
|
2002-11-27 10:30:28 +00:00
|
|
|
+ OnlyFilename(owner_->fileName()) + '"',
|
|
|
|
owner_->filePath());
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CVS::checkIn(string const & msg)
|
|
|
|
{
|
1999-11-15 12:01:38 +00:00
|
|
|
doVCCommand("cvs -q commit -m \"" + msg + "\" \""
|
2002-11-27 10:30:28 +00:00
|
|
|
+ OnlyFilename(owner_->fileName()) + '"',
|
2002-01-14 23:31:23 +00:00
|
|
|
owner_->filePath());
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CVS::checkOut()
|
|
|
|
{
|
1999-11-15 12:01:38 +00:00
|
|
|
// cvs update or perhaps for cvs this should be a noop
|
|
|
|
lyxerr << "Sorry not implemented." << endl;
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CVS::revert()
|
|
|
|
{
|
2001-02-20 18:31:33 +00:00
|
|
|
// Reverts to the version in CVS repository and
|
|
|
|
// gets the updated version from the repository.
|
|
|
|
string const fil = OnlyFilename(owner_->fileName());
|
2002-03-21 17:27:08 +00:00
|
|
|
|
2002-11-27 10:30:28 +00:00
|
|
|
doVCCommand("rm -f \"" + fil + "\"; cvs update \"" + fil + '"',
|
2002-01-14 23:31:23 +00:00
|
|
|
owner_->filePath());
|
2002-08-04 23:11:50 +00:00
|
|
|
owner_->markClean();
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CVS::undoLast()
|
|
|
|
{
|
|
|
|
// merge the current with the previous version
|
|
|
|
// in a reverse patch kind of way, so that the
|
|
|
|
// result is to revert the last changes.
|
1999-11-15 12:01:38 +00:00
|
|
|
lyxerr << "Sorry not implemented." << endl;
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-02-20 18:31:33 +00:00
|
|
|
void CVS::getLog(string const & tmpf)
|
1999-11-09 23:52:04 +00:00
|
|
|
{
|
2001-02-20 18:31:33 +00:00
|
|
|
doVCCommand("cvs log \""
|
|
|
|
+ OnlyFilename(owner_->fileName()) + "\" > " + tmpf,
|
2002-01-14 23:31:23 +00:00
|
|
|
owner_->filePath());
|
1999-11-09 23:52:04 +00:00
|
|
|
}
|