+/**
+ * \file vc-backend.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
#include <config.h>
#include "vc-backend.h"
#include "debug.h"
#include "buffer.h"
-#include "BufferView.h"
-#include "frontends/LyXView.h"
-#include "funcrequest.h"
-#include "support/FileInfo.h"
#include "support/path.h"
#include "support/filetools.h"
+#include "support/fs_extras.h"
#include "support/lstrings.h"
#include "support/systemcall.h"
+#include <boost/filesystem/operations.hpp>
#include <boost/regex.hpp>
#include <fstream>
+using lyx::support::AddName;
+using lyx::support::AddPath;
+using lyx::support::contains;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::QuoteName;
+using lyx::support::rtrim;
+using lyx::support::split;
+using lyx::support::Systemcall;
+
+using boost::regex;
+using boost::regex_match;
+using boost::smatch;
+
#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;
+using std::string;
+using std::ifstream;
-#ifndef USE_INCLUDED_STRING
-using boost::smatch;
-#else
-using boost::cmatch;
-#endif
+namespace fs = boost::filesystem;
int VCS::doVCCommand(string const & cmd, string const & path)
}
-void VCS::reload()
-{
- owner_->getUser()->reload();
- /* Watch out ! We have deleted ourselves here
- * via the ->reload() !
- */
-}
-
-
RCS::RCS(string const & m)
{
master_ = m;
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()) {
+ if (fs::is_readable(tmp)) {
lyxerr[Debug::LYXVC] << "Yes " << file
<< " is under rcs." << endl;
return tmp;
tmp += ",v";
lyxerr[Debug::LYXVC] << "Checking if file is under rcs: "
<< tmp << endl;
- if (f.newFile(tmp).readable()) {
+ if (fs::is_readable(tmp)) {
lyxerr[Debug::LYXVC] << "Yes " << file
<< " it is under rcs."<< endl;
return tmp;
void RCS::retrieve(string const & file)
{
lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrieve.\n\t" << file << endl;
- VCS::doVCCommand("co -q -r \""
- + file + '"',
+ VCS::doVCCommand("co -q -r " + QuoteName(file),
string());
}
// nothing
} else if (contains(token, "locks")) {
// get locker here
- if (contains(token, ";")) {
+ if (contains(token, ';')) {
locker_ = "Unlocked";
vcstatus = UNLOCKED;
continue;
vcstatus = LOCKED;
break;
}
- } while (!contains(tmpt, ";"));
+ } while (!contains(tmpt, ';'));
} else if (token == "comment") {
// we don't need to read any further than this.
{
string cmd = "ci -q -u -i -t-\"";
cmd += msg;
- cmd += "\" \"";
- cmd += OnlyFilename(owner_->fileName());
- cmd += '"';
+ cmd += "\" ";
+ cmd += QuoteName(OnlyFilename(owner_->fileName()));
doVCCommand(cmd, owner_->filePath());
- reload();
}
void RCS::checkIn(string const & msg)
{
- doVCCommand("ci -q -u -m\"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("ci -q -u -m\"" + msg + "\" "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
- reload();
}
void RCS::checkOut()
{
owner_->markClean();
- doVCCommand("co -q -l \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("co -q -l " + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
- reload();
}
void RCS::revert()
{
- doVCCommand("co -f -u" + version() + " \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("co -f -u" + version() + " "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
// We ignore changes and just reload!
owner_->markClean();
- reload();
}
void RCS::undoLast()
{
lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
- doVCCommand("rcs -o" + version() + " \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("rcs -o" + version() + " "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
}
void RCS::getLog(string const & tmpf)
{
- doVCCommand("rlog \""
- + OnlyFilename(owner_->fileName()) + "\" > "
- + tmpf, owner_->filePath());
+ doVCCommand("rlog " + QuoteName(OnlyFilename(owner_->fileName()))
+ + " > " + tmpf,
+ owner_->filePath());
}
string const tmpf = "/" + OnlyFilename(file) + "/";
lyxerr[Debug::LYXVC] << "LyXVC: checking in `" << dir
<< "' for `" << tmpf << '\'' << endl;
- FileInfo const f(dir);
- if (f.readable()) {
+ if (fs::is_readable(dir)) {
// 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.
string tmpf = "/" + OnlyFilename(file_) + "/";
lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << '\'' << endl;
string line;
- regex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
+ static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
while (getline(ifs, line)) {
lyxerr[Debug::LYXVC] << "\t line: " << line << endl;
if (contains(line, tmpf)) {
// Ok extract the fields.
-#ifndef USE_INCLUDED_STRING
smatch sm;
-#else
- cmatch sm;
-#endif
- regex_match(STRCONV(line), sm, reg);
+
+ regex_match(line, sm, reg);
//sm[0]; // whole matched string
//sm[1]; // filename
- version_ = STRCONV(sm.str(2));
- string const file_date = STRCONV(sm.str(3));
+ version_ = sm.str(2);
+ string const file_date = 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();
+ time_t mod = fs::last_write_time(file_);
string mod_date = rtrim(asctime(gmtime(&mod)), "\n");
lyxerr[Debug::LYXVC]
<< "Date in Entries: `" << file_date
void CVS::registrer(string const & msg)
{
- doVCCommand("cvs -q add -m \"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("cvs -q add -m \"" + msg + "\" "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
- reload();
}
void CVS::checkIn(string const & msg)
{
- doVCCommand("cvs -q commit -m \"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("cvs -q commit -m \"" + msg + "\" "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
- reload();
}
{
// Reverts to the version in CVS repository and
// gets the updated version from the repository.
- string const fil = OnlyFilename(owner_->fileName());
+ string const fil = QuoteName(OnlyFilename(owner_->fileName()));
- doVCCommand("rm -f \"" + fil + "\"; cvs update \"" + fil + '"',
+ doVCCommand("rm -f " + fil + "; cvs update " + fil,
owner_->filePath());
owner_->markClean();
- reload();
}
void CVS::getLog(string const & tmpf)
{
- doVCCommand("cvs log \""
- + OnlyFilename(owner_->fileName()) + "\" > " + tmpf,
+ doVCCommand("cvs log " + QuoteName(OnlyFilename(owner_->fileName()))
+ + " > " + tmpf,
owner_->filePath());
}
projects / lyx.git / blobdiff