X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=0d96692328b871293101e6492b27c3985a6a6d54;hb=9337d73f1f9a6d4dae2e239e9f679a7452660c40;hp=3527fb2eee2fae53331ebd838a41bacca9bf772a;hpb=cf7b2384791c7c37c57df3a2352165405fc21c67;p=lyx.git diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 3527fb2eee..0d96692328 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -11,52 +11,33 @@ #include #include "VCBackend.h" -#include "debug.h" #include "Buffer.h" -#include "support/Path.h" +#include "support/debug.h" #include "support/filetools.h" #include "support/lstrings.h" +#include "support/Path.h" #include "support/Systemcall.h" #include #include - -namespace lyx { - -using support::addName; -using support::addPath; -using support::contains; -using support::FileName; -using support::onlyFilename; -using support::onlyPath; -using support::quoteName; -using support::rtrim; -using support::split; -using support::Systemcall; +using namespace std; +using namespace lyx::support; 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::getline; -using std::string; -using std::ifstream; +namespace lyx { int VCS::doVCCommand(string const & cmd, FileName const & path) { - LYXERR(Debug::LYXVC) << "doVCCommand: " << cmd << endl; + LYXERR(Debug::LYXVC, "doVCCommand: " << cmd); Systemcall one; - support::Path p(path); + support::PathChanger p(path); int const ret = one.startscript(Systemcall::Wait, cmd); return ret; } @@ -75,25 +56,21 @@ RCS::RCS(FileName const & m) } -FileName const RCS::find_file(FileName const & file) +FileName const RCS::findFile(FileName const & file) { // Check if *,v exists. FileName tmp(file.absFilename() + ",v"); - LYXERR(Debug::LYXVC) << "Checking if file is under rcs: " - << tmp << endl; - if (tmp.isReadable()) { - LYXERR(Debug::LYXVC) << "Yes " << file - << " is under rcs." << endl; + LYXERR(Debug::LYXVC, "Checking if file is under rcs: " << tmp); + if (tmp.isReadableFile()) { + LYXERR(Debug::LYXVC, "Yes " << file << " is under rcs."); return tmp; } // Check if RCS/*,v exists. tmp = FileName(addName(addPath(onlyPath(file.absFilename()), "RCS"), file.absFilename()) + ",v"); - LYXERR(Debug::LYXVC) << "Checking if file is under rcs: " - << tmp << endl; - if (tmp.isReadable()) { - LYXERR(Debug::LYXVC) << "Yes " << file - << " it is under rcs."<< endl; + LYXERR(Debug::LYXVC, "Checking if file is under rcs: " << tmp); + if (tmp.isReadableFile()) { + LYXERR(Debug::LYXVC, "Yes " << file << " it is under rcs."); return tmp; } @@ -103,7 +80,7 @@ FileName const RCS::find_file(FileName const & file) void RCS::retrieve(FileName const & file) { - LYXERR(Debug::LYXVC) << "LyXVC::RCS: retrieve.\n\t" << file << endl; + LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file); VCS::doVCCommand("co -q -r " + quoteName(file.toFilesystemEncoding()), FileName()); } @@ -111,7 +88,7 @@ void RCS::retrieve(FileName const & file) void RCS::scanMaster() { - LYXERR(Debug::LYXVC) << "LyXVC::RCS: scanMaster." << endl; + LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster."); ifstream ifs(master_.toFilesystemEncoding().c_str()); @@ -119,9 +96,8 @@ void RCS::scanMaster() bool read_enough = false; while (!read_enough && ifs >> token) { - LYXERR(Debug::LYXVC) - << "LyXVC::scanMaster: current lex text: `" - << token << '\'' << endl; + LYXERR(Debug::LYXVC, "LyXVC::scanMaster: current lex text: `" + << token << '\''); if (token.empty()) continue; @@ -131,8 +107,7 @@ void RCS::scanMaster() ifs >> tmv; tmv = rtrim(tmv, ";"); version_ = tmv; - LYXERR(Debug::LYXVC) << "LyXVC: version found to be " - << tmv << endl; + LYXERR(Debug::LYXVC, "LyXVC: version found to be " << tmv); } else if (contains(token, "access") || contains(token, "symbols") || contains(token, "strict")) { @@ -165,9 +140,7 @@ void RCS::scanMaster() read_enough = true; } else { // unexpected - LYXERR(Debug::LYXVC) - << "LyXVC::scanMaster(): unexpected token" - << endl; + LYXERR(Debug::LYXVC, "LyXVC::scanMaster(): unexpected token"); } } } @@ -211,7 +184,7 @@ void RCS::revert() void RCS::undoLast() { - LYXERR(Debug::LYXVC) << "LyXVC: undoLast" << endl; + LYXERR(Debug::LYXVC, "LyXVC: undoLast"); doVCCommand("rcs -o" + version() + " " + quoteName(onlyFilename(owner_->absFileName())), FileName(owner_->filePath())); @@ -240,22 +213,22 @@ CVS::CVS(FileName const & m, FileName const & f) } -FileName const CVS::find_file(FileName const & file) +FileName const CVS::findFile(FileName const & file) { // First we look for the CVS/Entries in the same dir // where we have file. FileName const dir(onlyPath(file.absFilename()) + "/CVS/Entries"); string const tmpf = '/' + onlyFilename(file.absFilename()) + '/'; - LYXERR(Debug::LYXVC) << "LyXVC: checking in `" << dir - << "' for `" << tmpf << '\'' << endl; - if (dir.isReadable()) { + LYXERR(Debug::LYXVC, "LyXVC: checking in `" << dir + << "' for `" << tmpf << '\''); + if (dir.isReadableDirectory()) { // 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.toFilesystemEncoding().c_str()); string line; while (getline(ifs, line)) { - LYXERR(Debug::LYXVC) << "\tEntries: " << line << endl; + LYXERR(Debug::LYXVC, "\tEntries: " << line); if (contains(line, tmpf)) return dir; } @@ -266,16 +239,15 @@ FileName const CVS::find_file(FileName const & file) void CVS::scanMaster() { - LYXERR(Debug::LYXVC) << "LyXVC::CVS: scanMaster. \n Checking: " - << master_ << endl; + LYXERR(Debug::LYXVC, "LyXVC::CVS: scanMaster. \n Checking: " << master_); // Ok now we do the real scan... ifstream ifs(master_.toFilesystemEncoding().c_str()); string tmpf = '/' + onlyFilename(file_.absFilename()) + '/'; - LYXERR(Debug::LYXVC) << "\tlooking for `" << tmpf << '\'' << endl; + LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\''); string line; static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)"); while (getline(ifs, line)) { - LYXERR(Debug::LYXVC) << "\t line: " << line << endl; + LYXERR(Debug::LYXVC, "\t line: " << line); if (contains(line, tmpf)) { // Ok extract the fields. smatch sm; @@ -292,10 +264,8 @@ void CVS::scanMaster() // FIXME: must double check file is stattable/existing time_t mod = file_.lastModified(); string mod_date = rtrim(asctime(gmtime(&mod)), "\n"); - LYXERR(Debug::LYXVC) - << "Date in Entries: `" << file_date - << "'\nModification date of file: `" - << mod_date << '\'' << endl; + LYXERR(Debug::LYXVC, "Date in Entries: `" << file_date + << "'\nModification date of file: `" << mod_date << '\''); if (file_date == mod_date) { locker_ = "Unlocked"; vcstatus = UNLOCKED;