X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=bf117d249462f3e94d3b4d8b0afae8da2f1afddf;hb=6891e077d05ea1cd5c95d35d95066b8b7fb3fa68;hp=1726b921ef7fefa897e1c72f727d11fc89eb65cb;hpb=b89cc942eb458284f40f4d4e7db58890c3288979;p=lyx.git diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 1726b921ef..bf117d2494 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * * Full author contact details are available in file CREDITS. */ @@ -11,12 +11,18 @@ #include #include "VCBackend.h" -#include "support/debug.h" #include "Buffer.h" +#include "LyXFunc.h" +#include "FuncRequest.h" -#include "support/Path.h" +#include "frontends/alert.h" +#include "frontends/Application.h" + +#include "support/debug.h" #include "support/filetools.h" +#include "support/gettext.h" #include "support/lstrings.h" +#include "support/Path.h" #include "support/Systemcall.h" #include @@ -33,12 +39,29 @@ using boost::smatch; namespace lyx { -int VCS::doVCCommand(string const & cmd, FileName const & path) +int VCS::doVCCommandCall(string const & cmd, FileName const & path) { - LYXERR(Debug::LYXVC, "doVCCommand: " << cmd); + LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd); Systemcall one; support::PathChanger p(path); - int const ret = one.startscript(Systemcall::Wait, cmd); + return one.startscript(Systemcall::Wait, cmd, false); +} + + +int VCS::doVCCommand(string const & cmd, FileName const & path) +{ + if (owner_) + owner_->setBusy(true); + + int const ret = doVCCommandCall(cmd, path); + + if (owner_) + owner_->setBusy(false); + if (ret) + frontend::Alert::error(_("Revision control error."), + bformat(_("Some problem occured while running the command:\n" + "'%1$s'."), + from_utf8(cmd))); return ret; } @@ -60,17 +83,17 @@ 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); + LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp); if (tmp.isReadableFile()) { - LYXERR(Debug::LYXVC, "Yes " << file << " is under rcs."); + 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); + LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp); if (tmp.isReadableFile()) { - LYXERR(Debug::LYXVC, "Yes " << file << " it is under rcs."); + LYXERR(Debug::LYXVC, "Yes, " << file << " is under rcs."); return tmp; } @@ -81,14 +104,17 @@ FileName const RCS::findFile(FileName const & file) void RCS::retrieve(FileName const & file) { LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file); - VCS::doVCCommand("co -q -r " + quoteName(file.toFilesystemEncoding()), + doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()), FileName()); } void RCS::scanMaster() { - LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster."); + if (master_.empty()) + return; + + LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_); ifstream ifs(master_.toFilesystemEncoding().c_str()); @@ -156,19 +182,59 @@ void RCS::registrer(string const & msg) } -void RCS::checkIn(string const & msg) +string RCS::checkIn(string const & msg) { - doVCCommand("ci -q -u -m\"" + msg + "\" " + int ret = doVCCommand("ci -q -u -m\"" + msg + "\" " + quoteName(onlyFilename(owner_->absFileName())), FileName(owner_->filePath())); + return ret ? string() : "RCS: Proceeded"; } -void RCS::checkOut() +bool RCS::checkInEnabled() +{ + return owner_ && !owner_->isReadonly(); +} + + +string RCS::checkOut() { owner_->markClean(); - doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->absFileName())), + int ret = doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->absFileName())), FileName(owner_->filePath())); + return ret ? string() : "RCS: Proceeded"; +} + + +bool RCS::checkOutEnabled() +{ + return owner_ && owner_->isReadonly(); +} + + +string RCS::repoUpdate() +{ + lyxerr << "Sorry, not implemented." << endl; + return string(); +} + + +bool RCS::repoUpdateEnabled() +{ + return false; +} + + +string RCS::lockingToggle() +{ + lyxerr << "Sorry, not implemented." << endl; + return string(); +} + + +bool RCS::lockingToggleEnabled() +{ + return false; } @@ -191,14 +257,26 @@ void RCS::undoLast() } +bool RCS::undoLastEnabled() +{ + return true; +} + + void RCS::getLog(FileName const & tmpf) { doVCCommand("rlog " + quoteName(onlyFilename(owner_->absFileName())) - + " > " + tmpf.toFilesystemEncoding(), + + " > " + quoteName(tmpf.toFilesystemEncoding()), FileName(owner_->filePath())); } +bool RCS::toggleReadOnlyEnabled() +{ + return true; +} + + ///////////////////////////////////////////////////////////////////// // // CVS @@ -217,20 +295,20 @@ 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"); + FileName const entries(onlyPath(file.absFilename()) + "/CVS/Entries"); string const tmpf = '/' + onlyFilename(file.absFilename()) + '/'; - LYXERR(Debug::LYXVC, "LyXVC: checking in `" << dir + LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under cvs in `" << entries << "' for `" << tmpf << '\''); - if (dir.isReadableDirectory()) { + if (entries.isReadableFile()) { // 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()); + ifstream ifs(entries.toFilesystemEncoding().c_str()); string line; while (getline(ifs, line)) { LYXERR(Debug::LYXVC, "\tEntries: " << line); if (contains(line, tmpf)) - return dir; + return entries; } } return FileName(); @@ -266,6 +344,8 @@ void CVS::scanMaster() string mod_date = rtrim(asctime(gmtime(&mod)), "\n"); LYXERR(Debug::LYXVC, "Date in Entries: `" << file_date << "'\nModification date of file: `" << mod_date << '\''); + //FIXME this whole locking bussiness is not working under cvs and the machinery + // conforms to the ci usage, not cvs. if (file_date == mod_date) { locker_ = "Unlocked"; vcstatus = UNLOCKED; @@ -289,18 +369,60 @@ void CVS::registrer(string const & msg) } -void CVS::checkIn(string const & msg) +string CVS::checkIn(string const & msg) { - doVCCommand("cvs -q commit -m \"" + msg + "\" " + int ret = doVCCommand("cvs -q commit -m \"" + msg + "\" " + quoteName(onlyFilename(owner_->absFileName())), FileName(owner_->filePath())); + return ret ? string() : "CVS: Proceeded"; } -void CVS::checkOut() +bool CVS::checkInEnabled() +{ + return true; +} + + +string CVS::checkOut() { // cvs update or perhaps for cvs this should be a noop - lyxerr << "Sorry not implemented." << endl; + // we need to detect conflict (eg "C" in output) + // before we can do this. + lyxerr << "Sorry, not implemented." << endl; + return string(); +} + + +bool CVS::checkOutEnabled() +{ + return false; +} + + +string CVS::repoUpdate() +{ + lyxerr << "Sorry, not implemented." << endl; + return string(); +} + + +bool CVS::repoUpdateEnabled() +{ + return false; +} + + +string CVS::lockingToggle() +{ + lyxerr << "Sorry, not implemented." << endl; + return string(); +} + + +bool CVS::lockingToggleEnabled() +{ + return false; } @@ -309,8 +431,13 @@ void CVS::revert() // Reverts to the version in CVS repository and // gets the updated version from the repository. string const fil = quoteName(onlyFilename(owner_->absFileName())); - - doVCCommand("rm -f " + fil + "; cvs update " + fil, + // This is sensitive operation, so at lest some check about + // existence of cvs program and its file + if (doVCCommand("cvs log "+ fil, FileName(owner_->filePath()))) + return; + FileName f(owner_->absFileName()); + f.removeFile(); + doVCCommand("cvs update " + fil, FileName(owner_->filePath())); owner_->markClean(); } @@ -321,16 +448,407 @@ void CVS::undoLast() // merge the current with the previous version // in a reverse patch kind of way, so that the // result is to revert the last changes. - lyxerr << "Sorry not implemented." << endl; + lyxerr << "Sorry, not implemented." << endl; +} + + +bool CVS::undoLastEnabled() +{ + return false; } void CVS::getLog(FileName const & tmpf) { doVCCommand("cvs log " + quoteName(onlyFilename(owner_->absFileName())) - + " > " + tmpf.toFilesystemEncoding(), + + " > " + quoteName(tmpf.toFilesystemEncoding()), FileName(owner_->filePath())); } +bool CVS::toggleReadOnlyEnabled() +{ + return false; +} + +///////////////////////////////////////////////////////////////////// +// +// SVN +// +///////////////////////////////////////////////////////////////////// + +SVN::SVN(FileName const & m, FileName const & f) +{ + owner_ = 0; + master_ = m; + file_ = f; + locked_mode_ = 0; + scanMaster(); +} + + +FileName const SVN::findFile(FileName const & file) +{ + // First we look for the .svn/entries in the same dir + // where we have file. + FileName const entries(onlyPath(file.absFilename()) + "/.svn/entries"); + string const tmpf = onlyFilename(file.absFilename()); + LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under svn in `" << entries + << "' for `" << tmpf << '\''); + if (entries.isReadableFile()) { + // Ok we are at least in a SVN dir. Parse the .svn/entries + // and see if we can find this file. We do a fast and + // dirty parse here. + ifstream ifs(entries.toFilesystemEncoding().c_str()); + string line, oldline; + while (getline(ifs, line)) { + if (line == "dir" || line == "file") + LYXERR(Debug::LYXVC, "\tEntries: " << oldline); + if (oldline == tmpf && line == "file") + return entries; + oldline = line; + } + } + return FileName(); +} + + +void SVN::scanMaster() +{ + locker_.clear(); + vcstatus = NOLOCKING; + if (checkLockMode()) { + if (isLocked()) { + locker_ = "Locked"; + vcstatus = LOCKED; + } else { + locker_ = "Unlocked"; + vcstatus = LOCKED; + } + } +} + + +bool SVN::checkLockMode() +{ + FileName tmpf = FileName::tempName("lyxvcout"); + if (tmpf.empty()){ + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return N_("Error: Could not generate logfile."); + } + + LYXERR(Debug::LYXVC, "Detecting locking mode..."); + if (doVCCommandCall("svn proplist " + quoteName(file_.onlyFileName()) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + file_.onlyPath())) + return false; + + ifstream ifs(tmpf.toFilesystemEncoding().c_str()); + string line; + bool ret = false; + + while (ifs) { + getline(ifs, line); + LYXERR(Debug::LYXVC, line); + if (contains(line, "svn:needs-lock")) + ret = true; + } + LYXERR(Debug::LYXVC, "Locking enabled: " << ret); + ifs.close(); + locked_mode_ = ret; + return ret; + +} + + +bool SVN::isLocked() const +{ + //refresh file info + FileName file(file_.absFilename()); + return !file.isReadOnly(); +} + + +void SVN::registrer(string const & /*msg*/) +{ + doVCCommand("svn add -q " + quoteName(onlyFilename(owner_->absFileName())), + FileName(owner_->filePath())); +} + + +string SVN::checkIn(string const & msg) +{ + FileName tmpf = FileName::tempName("lyxvcout"); + if (tmpf.empty()){ + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return N_("Error: Could not generate logfile."); + } + + doVCCommand("svn commit -m \"" + msg + "\" " + + quoteName(onlyFilename(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + + string log; + string res = scanLogFile(tmpf, log); + if (!res.empty()) + frontend::Alert::error(_("Revision control error."), + _("Error when committing to repository.\n" + "You have to manually resolve the problem.\n" + "After pressing OK, LyX will reopen the document.")); + else + fileLock(false, tmpf, log); + + tmpf.erase(); + return log.empty() ? string() : "SVN: " + log; +} + + +bool SVN::checkInEnabled() +{ + if (locked_mode_) + return isLocked(); + else + return true; +} + + +// FIXME Correctly return code should be checked instead of this. +// This would need another solution than just plain startscript. +// Hint from Andre': QProcess::readAllStandardError()... +string SVN::scanLogFile(FileName const & f, string & status) +{ + ifstream ifs(f.toFilesystemEncoding().c_str()); + string line; + + while (ifs) { + getline(ifs, line); + lyxerr << line << "\n"; + if (!line.empty()) status += line + "; "; + if (prefixIs(line, "C ") || contains(line, "Commit failed")) { + ifs.close(); + return line; + } + if (contains(line, "svn:needs-lock")) { + ifs.close(); + return line; + } + } + ifs.close(); + return string(); +} + + +void SVN::fileLock(bool lock, FileName const & tmpf, string &status) +{ + if (!locked_mode_ || (isLocked() == lock)) + return; + + string arg = lock ? "lock " : "unlock "; + doVCCommand("svn "+ arg + quoteName(onlyFilename(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + + // Lock error messages go unfortunately on stderr and are unreachible this way. + ifstream ifs(tmpf.toFilesystemEncoding().c_str()); + string line; + while (ifs) { + getline(ifs, line); + if (!line.empty()) status += line + "; "; + } + ifs.close(); + + if (!isLocked() && lock) + frontend::Alert::error(_("Revision control error."), + _("Error when acquiring write lock.\n" + "Most probably another user is editing\n" + "the current document now!\n" + "Also check the access to the repository.")); + if (isLocked() && !lock) + frontend::Alert::error(_("Revision control error."), + _("Error when releasing write lock.\n" + "Check the access to the repository.")); +} + + +string SVN::checkOut() +{ + FileName tmpf = FileName::tempName("lyxvcout"); + if (tmpf.empty()) { + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return N_("Error: Could not generate logfile."); + } + + doVCCommand("svn update " + quoteName(onlyFilename(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + + string log; + string res = scanLogFile(tmpf, log); + if (!res.empty()) + frontend::Alert::error(_("Revision control error."), + bformat(_("Error when updating from repository.\n" + "You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n" + "After pressing OK, LyX will try to reopen resolved document."), + from_local8bit(res))); + + fileLock(true, tmpf, log); + + tmpf.erase(); + return log.empty() ? string() : "SVN: " + log; +} + + +bool SVN::checkOutEnabled() +{ + if (locked_mode_) + return !isLocked(); + else + return true; +} + + +string SVN::repoUpdate() +{ + FileName tmpf = FileName::tempName("lyxvcout"); + if (tmpf.empty()) { + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return N_("Error: Could not generate logfile."); + } + + doVCCommand("svn diff " + quoteName(owner_->filePath()) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + docstring res = tmpf.fileContents("UTF-8"); + if (!res.empty()) { + LYXERR(Debug::LYXVC, "Diff detected:\n" << res); + docstring const file = from_utf8(owner_->filePath()); + docstring text = bformat(_("There were detected changes " + "in the working directory:\n%1$s\n\n" + "In case of file conflict version of the local directory files " + "will be preferred." + "\n\nContinue?"), file); + int ret = frontend::Alert::prompt(_("Changes detected"), + text, 0, 1, _("&Yes"), _("&No"), _("View &Log ...")); + if (ret == 2 ) { + dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFilename())); + ret = frontend::Alert::prompt(_("Changes detected"), + text, 0, 1, _("&Yes"), _("&No")); + hideDialogs("file", 0); + } + if (ret == 1 ) { + tmpf.erase(); + return string(); + } + } + + // Reverting looks too harsh, see bug #6255. + // doVCCommand("svn revert -R " + quoteName(owner_->filePath()) + // + " > " + quoteName(tmpf.toFilesystemEncoding()), + // FileName(owner_->filePath())); + // res = "Revert log:\n" + tmpf.fileContents("UTF-8"); + doVCCommand("svn update --accept mine-full " + quoteName(owner_->filePath()) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + res += "Update log:\n" + tmpf.fileContents("UTF-8"); + + LYXERR(Debug::LYXVC, res); + tmpf.erase(); + return to_utf8(res); +} + + +bool SVN::repoUpdateEnabled() +{ + return true; +} + + +string SVN::lockingToggle() +{ + FileName tmpf = FileName::tempName("lyxvcout"); + if (tmpf.empty()) { + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return N_("Error: Could not generate logfile."); + } + + int ret = doVCCommand("svn proplist " + quoteName(onlyFilename(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + if (ret) + return string(); + + string log; + string res = scanLogFile(tmpf, log); + bool locking = contains(res, "svn:needs-lock"); + if (!locking) + ret = doVCCommand("svn propset svn:needs-lock ON " + + quoteName(onlyFilename(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + else + ret = doVCCommand("svn propdel svn:needs-lock " + + quoteName(onlyFilename(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); + if (ret) + return string(); + + tmpf.erase(); + frontend::Alert::warning(_("VCN File Locking"), + (locking ? _("Locking property unset.") : _("Locking property set.")) + "\n" + + _("Do not forget to commit the locking property into the repository."), + true); + + return string("SVN: ") + N_("Locking property set."); +} + + +bool SVN::lockingToggleEnabled() +{ + return true; +} + + +void SVN::revert() +{ + // Reverts to the version in CVS repository and + // gets the updated version from the repository. + string const fil = quoteName(onlyFilename(owner_->absFileName())); + + doVCCommand("svn revert -q " + fil, + FileName(owner_->filePath())); + owner_->markClean(); +} + + +void SVN::undoLast() +{ + // merge the current with the previous version + // in a reverse patch kind of way, so that the + // result is to revert the last changes. + lyxerr << "Sorry, not implemented." << endl; +} + + +bool SVN::undoLastEnabled() +{ + return false; +} + + +void SVN::getLog(FileName const & tmpf) +{ + doVCCommand("svn log " + quoteName(onlyFilename(owner_->absFileName())) + + " > " + quoteName(tmpf.toFilesystemEncoding()), + FileName(owner_->filePath())); +} + + +bool SVN::toggleReadOnlyEnabled() +{ + return false; +} + + } // namespace lyx