X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvc-backend.C;h=3225bc18ba9a42d5261395c1f5b8275bddb84c63;hb=5e3b997b852fc96eef2387934b600262d3037745;hp=4b9218348e4d26d78f5ee36c457250cf04e4d1cd;hpb=9bc730abdb60f9c7959f7d2bba5601e023983c23;p=lyx.git diff --git a/src/vc-backend.C b/src/vc-backend.C index 4b9218348e..3225bc18ba 100644 --- a/src/vc-backend.C +++ b/src/vc-backend.C @@ -1,22 +1,44 @@ +/** + * \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 #include "vc-backend.h" #include "debug.h" #include "buffer.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 #include #include -using namespace lyx::support; +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; @@ -24,16 +46,11 @@ 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) @@ -58,20 +75,19 @@ string const RCS::find_file(string const & file) 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; } 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; - if (f.newFile(tmp).readable()) { + if (fs::is_readable(tmp)) { lyxerr[Debug::LYXVC] << "Yes " << file << " it is under rcs."<< endl; return tmp; @@ -84,8 +100,7 @@ string const RCS::find_file(string const & file) 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()); } @@ -120,7 +135,7 @@ void RCS::scanMaster() // nothing } else if (contains(token, "locks")) { // get locker here - if (contains(token, ";")) { + if (contains(token, ';')) { locker_ = "Unlocked"; vcstatus = UNLOCKED; continue; @@ -139,7 +154,7 @@ void RCS::scanMaster() vcstatus = LOCKED; break; } - } while (!contains(tmpt, ";")); + } while (!contains(tmpt, ';')); } else if (token == "comment") { // we don't need to read any further than this. @@ -158,17 +173,16 @@ void RCS::registrer(string const & msg) { 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()); } 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()); } @@ -176,16 +190,15 @@ void RCS::checkIn(string const & msg) void RCS::checkOut() { owner_->markClean(); - doVCCommand("co -q -l \"" - + OnlyFilename(owner_->fileName()) + '"', + doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->fileName())), owner_->filePath()); } 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(); @@ -195,17 +208,17 @@ void RCS::revert() 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()); } @@ -221,12 +234,11 @@ string const CVS::find_file(string const & file) { // 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; - 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. @@ -247,31 +259,27 @@ void CVS::scanMaster() << 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; - 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 @@ -294,16 +302,16 @@ void CVS::scanMaster() 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()); } 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()); } @@ -319,9 +327,9 @@ void CVS::revert() { // 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(); } @@ -338,7 +346,7 @@ void CVS::undoLast() void CVS::getLog(string const & tmpf) { - doVCCommand("cvs log \"" - + OnlyFilename(owner_->fileName()) + "\" > " + tmpf, + doVCCommand("cvs log " + quoteName(onlyFilename(owner_->fileName())) + + " > " + tmpf, owner_->filePath()); }