X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvc-backend.C;h=5fb8f6bb921d24fbd3c93246978a327cd4e8af48;hb=0657a91fd08e9c31d7f9e6be26055cc5050e5f8b;hp=5c3e6f3731074ba2f3d9c3a5f4a873d9fdb63c7a;hpb=92d522b7f1be6046adcac062c558bbf0bf021612;p=lyx.git diff --git a/src/vc-backend.C b/src/vc-backend.C index 5c3e6f3731..5fb8f6bb92 100644 --- a/src/vc-backend.C +++ b/src/vc-backend.C @@ -1,23 +1,47 @@ +/** + * \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 "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 #include #include -using namespace lyx::support; + +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 boost::regex; +using boost::regex_match; +using boost::smatch; #ifndef CXX_GLOBAL_CSTD using std::asctime; @@ -25,77 +49,59 @@ 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) { 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; } -void VCS::reload() -{ - owner_->getUser()->reload(); - /* Watch out ! We have deleted ourselves here - * via the ->reload() ! - */ -} - - -RCS::RCS(string const & m) +RCS::RCS(FileName const & m) { master_ = m; scanMaster(); } -string const RCS::find_file(string const & file) +FileName const RCS::find_file(FileName const & file) { - string tmp(file); // Check if *,v exists. - tmp += ",v"; - FileInfo f; + FileName tmp(file.absFilename() + ",v"); lyxerr[Debug::LYXVC] << "Checking if file is under rcs: " << tmp << endl; - if (f.newFile(tmp).readable()) { + if (fs::is_readable(tmp.toFilesystemEncoding())) { 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"; + tmp = FileName(addName(addPath(onlyPath(file.absFilename()), "RCS"), file.absFilename()) + ",v"); lyxerr[Debug::LYXVC] << "Checking if file is under rcs: " << tmp << endl; - if (f.newFile(tmp).readable()) { + if (fs::is_readable(tmp.toFilesystemEncoding())) { lyxerr[Debug::LYXVC] << "Yes " << file << " it is under rcs."<< endl; return tmp; } } - return string(); + return FileName(); } -void RCS::retrieve(string const & file) +void RCS::retrieve(FileName 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.toFilesystemEncoding()), string()); } @@ -104,7 +110,7 @@ void RCS::scanMaster() { lyxerr[Debug::LYXVC] << "LyXVC::RCS: scanMaster." << endl; - ifstream ifs(master_.c_str()); + ifstream ifs(master_.toFilesystemEncoding().c_str()); string token; bool read_enough = false; @@ -130,7 +136,7 @@ void RCS::scanMaster() // nothing } else if (contains(token, "locks")) { // get locker here - if (contains(token, ";")) { + if (contains(token, ';')) { locker_ = "Unlocked"; vcstatus = UNLOCKED; continue; @@ -149,7 +155,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. @@ -168,62 +174,56 @@ 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()); - 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) +void RCS::getLog(FileName const & tmpf) { - doVCCommand("rlog \"" - + OnlyFilename(owner_->fileName()) + "\" > " - + tmpf, owner_->filePath()); + doVCCommand("rlog " + quoteName(onlyFilename(owner_->fileName())) + + " > " + tmpf.toFilesystemEncoding(), + owner_->filePath()); } -CVS::CVS(string const & m, string const & f) +CVS::CVS(FileName const & m, FileName const & f) { master_ = m; file_ = f; @@ -231,27 +231,27 @@ CVS::CVS(string const & m, string const & f) } -string const CVS::find_file(string const & file) +FileName const CVS::find_file(FileName 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) + "/"; + FileName const dir(onlyPath(file.absFilename()) + "/CVS/Entries"); + string const tmpf = '/' + onlyFilename(file.absFilename()) + '/'; lyxerr[Debug::LYXVC] << "LyXVC: checking in `" << dir << "' for `" << tmpf << '\'' << endl; - FileInfo const f(dir); - if (f.readable()) { + if (fs::is_readable(dir.toFilesystemEncoding())) { // 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()); + ifstream ifs(dir.toFilesystemEncoding().c_str()); string line; while (getline(ifs, line)) { lyxerr[Debug::LYXVC] << "\tEntries: " << line << endl; - if (contains(line, tmpf)) return dir; + if (contains(line, tmpf)) + return dir; } } - return string(); + return FileName(); } @@ -260,32 +260,28 @@ 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_) + "/"; + ifstream ifs(master_.toFilesystemEncoding().c_str()); + string tmpf = '/' + onlyFilename(file_.absFilename()) + '/'; 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_.toFilesystemEncoding()); string mod_date = rtrim(asctime(gmtime(&mod)), "\n"); lyxerr[Debug::LYXVC] << "Date in Entries: `" << file_date @@ -308,19 +304,17 @@ 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()); - 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(); } @@ -335,12 +329,11 @@ 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(); - reload(); } @@ -353,9 +346,12 @@ void CVS::undoLast() } -void CVS::getLog(string const & tmpf) +void CVS::getLog(FileName const & tmpf) { - doVCCommand("cvs log \"" - + OnlyFilename(owner_->fileName()) + "\" > " + tmpf, + doVCCommand("cvs log " + quoteName(onlyFilename(owner_->fileName())) + + " > " + tmpf.toFilesystemEncoding(), owner_->filePath()); } + + +} // namespace lyx