#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;
+
+namespace lyx {
+
+using support::addName;
+using support::addPath;
+using support::contains;
+using support::onlyFilename;
+using support::onlyPath;
+using support::quoteName;
+using support::rtrim;
+using support::split;
+using support::Systemcall;
using boost::regex;
using boost::regex_match;
{
lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
Systemcall one;
- Path p(path);
+ support::Path p(path);
int const ret = one.startscript(Systemcall::Wait, cmd);
return ret;
}
string const RCS::find_file(string const & file)
{
- string tmp(file);
+ string tmp = file;
// Check if *,v exists.
tmp += ",v";
lyxerr[Debug::LYXVC] << "Checking if file is under rcs: "
return tmp;
} else {
// Check if RCS/*,v exists.
- tmp = AddName(AddPath(OnlyPath(file), "RCS"), file);
+ tmp = addName(addPath(onlyPath(file), "RCS"), file);
tmp += ",v";
lyxerr[Debug::LYXVC] << "Checking if file is under rcs: "
<< tmp << endl;
void RCS::retrieve(string const & file)
{
lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrieve.\n\t" << file << endl;
- VCS::doVCCommand("co -q -r " + QuoteName(file),
+ VCS::doVCCommand("co -q -r " + quoteName(file),
string());
}
string cmd = "ci -q -u -i -t-\"";
cmd += msg;
cmd += "\" ";
- cmd += QuoteName(OnlyFilename(owner_->fileName()));
+ cmd += quoteName(onlyFilename(owner_->fileName()));
doVCCommand(cmd, owner_->filePath());
}
void RCS::checkIn(string const & msg)
{
doVCCommand("ci -q -u -m\"" + msg + "\" "
- + QuoteName(OnlyFilename(owner_->fileName())),
+ + quoteName(onlyFilename(owner_->fileName())),
owner_->filePath());
}
void RCS::checkOut()
{
owner_->markClean();
- doVCCommand("co -q -l " + QuoteName(OnlyFilename(owner_->fileName())),
+ doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->fileName())),
owner_->filePath());
}
void RCS::revert()
{
doVCCommand("co -f -u" + version() + " "
- + QuoteName(OnlyFilename(owner_->fileName())),
+ + quoteName(onlyFilename(owner_->fileName())),
owner_->filePath());
// We ignore changes and just reload!
owner_->markClean();
{
lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
doVCCommand("rcs -o" + version() + " "
- + QuoteName(OnlyFilename(owner_->fileName())),
+ + quoteName(onlyFilename(owner_->fileName())),
owner_->filePath());
}
void RCS::getLog(string const & tmpf)
{
- doVCCommand("rlog " + QuoteName(OnlyFilename(owner_->fileName()))
- + " > " + tmpf,
+ doVCCommand("rlog " + quoteName(onlyFilename(owner_->fileName()))
+ + " > " + tmpf,
owner_->filePath());
}
{
// First we look for the CVS/Entries in the same dir
// where we have file.
- string const dir = OnlyPath(file) + "/CVS/Entries";
- string const tmpf = "/" + OnlyFilename(file) + "/";
+ string const dir = onlyPath(file) + "/CVS/Entries";
+ string const tmpf = "/" + onlyFilename(file) + "/";
lyxerr[Debug::LYXVC] << "LyXVC: checking in `" << dir
<< "' for `" << tmpf << '\'' << endl;
if (fs::is_readable(dir)) {
<< master_ << endl;
// Ok now we do the real scan...
ifstream ifs(master_.c_str());
- string tmpf = "/" + OnlyFilename(file_) + "/";
+ string tmpf = "/" + onlyFilename(file_) + "/";
lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << '\'' << endl;
string line;
static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
void CVS::registrer(string const & msg)
{
doVCCommand("cvs -q add -m \"" + msg + "\" "
- + QuoteName(OnlyFilename(owner_->fileName())),
+ + quoteName(onlyFilename(owner_->fileName())),
owner_->filePath());
}
void CVS::checkIn(string const & msg)
{
doVCCommand("cvs -q commit -m \"" + msg + "\" "
- + QuoteName(OnlyFilename(owner_->fileName())),
+ + quoteName(onlyFilename(owner_->fileName())),
owner_->filePath());
}
{
// Reverts to the version in CVS repository and
// gets the updated version from the repository.
- string const fil = QuoteName(OnlyFilename(owner_->fileName()));
+ string const fil = quoteName(onlyFilename(owner_->fileName()));
doVCCommand("rm -f " + fil + "; cvs update " + fil,
owner_->filePath());
void CVS::getLog(string const & tmpf)
{
- doVCCommand("cvs log " + QuoteName(OnlyFilename(owner_->fileName()))
+ doVCCommand("cvs log " + quoteName(onlyFilename(owner_->fileName()))
+ " > " + tmpf,
owner_->filePath());
}
+
+
+} // namespace lyx