X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXVC.cpp;h=01743ecadbfff37e52fb86c64781c51caa3e16dc;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=8d72962ed47923b3d3796a971887519a7154f4e0;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 8d72962ed4..01743ecadb 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -3,11 +3,11 @@ * 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 * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author André Pönitz + * \author André Pönitz * \author Allan Rae * * Full author contact details are available in file CREDITS. @@ -17,29 +17,20 @@ #include "LyXVC.h" #include "VCBackend.h" -#include "debug.h" #include "Buffer.h" -#include "gettext.h" -#include "frontends/Alert.h" +#include "frontends/alert.h" +#include "support/debug.h" #include "support/filetools.h" -#include "support/lyxlib.h" +#include "support/gettext.h" +#include "support/lstrings.h" +using namespace std; +using namespace lyx::support; namespace lyx { -using support::bformat; -using support::FileName; -using support::isFileReadable; -using support::makeAbsPath; -using support::makeDisplayPath; -using support::tempName; - -using std::endl; -using std::string; -using std::pair; - namespace Alert = frontend::Alert; @@ -58,124 +49,181 @@ bool LyXVC::file_found_hook(FileName const & fn) { FileName found_file; // Check if file is under RCS - if (!(found_file = RCS::find_file(fn)).empty()) { + if (!(found_file = RCS::findFile(fn)).empty()) { vcs.reset(new RCS(found_file)); vcs->owner(owner_); return true; } // Check if file is under CVS - if (!(found_file = CVS::find_file(fn)).empty()) { + if (!(found_file = CVS::findFile(fn)).empty()) { vcs.reset(new CVS(found_file, fn)); vcs->owner(owner_); return true; } + // Check if file is under SVN + if (!(found_file = SVN::findFile(fn)).empty()) { + vcs.reset(new SVN(found_file, fn)); + vcs->owner(owner_); + return true; + } + // file is not under any VCS. + vcs.reset(0); return false; } bool LyXVC::file_not_found_hook(FileName const & fn) { - // Check if file is under RCS - if (!RCS::find_file(fn).empty()) - return true; - if (!CVS::find_file(fn).empty()) - return true; + // Check if file is under RCS. + // This happens if we are trying to load non existent + // file on disk, but existent in ,v version. + // Seems there is no reasonable scenario for adding implementation + // of retrieve for cvs or svn. + if (!RCS::findFile(fn).empty()) { + docstring const file = makeDisplayPath(fn.absFileName(), 20); + docstring const text = + bformat(_("Do you want to retrieve the document" + " %1$s from version control?"), file); + int const ret = Alert::prompt(_("Retrieve from version control?"), + text, 0, 1, _("&Retrieve"), _("&Cancel")); + + if (ret == 0) { + // How can we know _how_ to do the checkout? + // With the current VC support it has to be an RCS + // file since CVS and SVN do not have special ,v files. + RCS::retrieve(fn); + return true; + } + } return false; } -void LyXVC::buffer(Buffer * buf) +void LyXVC::setBuffer(Buffer * buf) { owner_ = buf; } -void LyXVC::registrer() +bool LyXVC::registrer() { - FileName const filename(owner_->fileName()); + FileName const filename = owner_->fileName(); // there must be a file to save - if (!isFileReadable(filename)) { + if (!filename.isReadableFile()) { Alert::error(_("Document not saved"), _("You must save the document " "before it can be registered.")); - return; + return false; } // it is very likely here that the vcs is not created yet... if (!vcs) { - FileName const cvs_entries(makeAbsPath("CVS/Entries")); - - if (isFileReadable(cvs_entries)) { - LYXERR(Debug::LYXVC) - << "LyXVC: registering " - << to_utf8(makeDisplayPath(filename.absFilename())) - << " with CVS" << endl; + //check in the root directory of the document + FileName const cvs_entries(onlyPath(filename.absFileName()) + "/CVS/Entries"); + FileName const svn_entries(onlyPath(filename.absFileName()) + "/.svn/entries"); + + if (svn_entries.isReadableFile()) { + LYXERR(Debug::LYXVC, "LyXVC: registering " + << to_utf8(filename.displayName()) << " with SVN"); + vcs.reset(new SVN(cvs_entries, filename)); + + } else if (cvs_entries.isReadableFile()) { + LYXERR(Debug::LYXVC, "LyXVC: registering " + << to_utf8(filename.displayName()) << " with CVS"); vcs.reset(new CVS(cvs_entries, filename)); } else { - LYXERR(Debug::LYXVC) - << "LyXVC: registering " - << to_utf8(makeDisplayPath(filename.absFilename())) - << " with RCS" << endl; - vcs.reset(new RCS(filename)); + LYXERR(Debug::LYXVC, "LyXVC: registering " + << to_utf8(filename.displayName()) << " with RCS"); + vcs.reset(new RCS(FileName())); } vcs->owner(owner_); } - LYXERR(Debug::LYXVC) << "LyXVC: registrer" << endl; - pair tmp = - Alert::askForText(_("LyX VC: Initial description"), - _("(no initial description)")); - if (!tmp.first || tmp.second.empty()) { - // should we insist on checking tmp.second.empty()? - LYXERR(Debug::LYXVC) << "LyXVC: user cancelled" << endl; - return; + LYXERR(Debug::LYXVC, "LyXVC: registrer"); + docstring response; + bool ok = Alert::askForText(response, _("LyX VC: Initial description"), + _("(no initial description)")); + if (!ok) { + LYXERR(Debug::LYXVC, "LyXVC: user cancelled"); + vcs.reset(0); + return false; } - - vcs->registrer(to_utf8(tmp.second)); + if (response.empty()) + response = _("(no initial description)"); + vcs->registrer(to_utf8(response)); + return true; } -void LyXVC::checkIn() +string LyXVC::checkIn() { - - LYXERR(Debug::LYXVC) << "LyXVC: checkIn" << endl; - pair tmp = Alert::askForText(_("LyX VC: Log Message")); - if (tmp.first) { - if (tmp.second.empty()) { - tmp.second = _("(no log message)"); - } - vcs->checkIn(to_utf8(tmp.second)); + LYXERR(Debug::LYXVC, "LyXVC: checkIn"); + docstring empty(_("(no log message)")); + docstring response; + string log; + bool ok = true; + if (vcs->isCheckInWithConfirmation()) + ok = Alert::askForText(response, _("LyX VC: Log Message")); + if (ok) { + if (response.empty()) + response = empty; + //shell collisions + response = subst(response, from_utf8("\""), from_utf8("\\\"")); + log = vcs->checkIn(to_utf8(response)); + + // Reserve empty string for cancel button + if (log.empty()) + log = to_utf8(empty); } else { - LYXERR(Debug::LYXVC) << "LyXVC: user cancelled" << endl; + LYXERR(Debug::LYXVC, "LyXVC: user cancelled"); } + return log; } -void LyXVC::checkOut() +string LyXVC::checkOut() { - LYXERR(Debug::LYXVC) << "LyXVC: checkOut" << endl; + //RCS allows checkOut only in ReadOnly mode + if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) + return string(); - vcs->checkOut(); + LYXERR(Debug::LYXVC, "LyXVC: checkOut"); + return vcs->checkOut(); } -void LyXVC::revert() +string LyXVC::repoUpdate() { - LYXERR(Debug::LYXVC) << "LyXVC: revert" << endl; + LYXERR(Debug::LYXVC, "LyXVC: repoUpdate"); + return vcs->repoUpdate(); +} + + +string LyXVC::lockingToggle() +{ + LYXERR(Debug::LYXVC, "LyXVC: toggle locking property"); + return vcs->lockingToggle(); +} - docstring const file = makeDisplayPath(owner_->fileName(), 20); - docstring text = bformat(_("Reverting to the stored version of the " - "document %1$s will lose all current changes.\n\n" - "Do you want to revert to the saved version?"), file); - int const ret = Alert::prompt(_("Revert to stored version of document?"), - text, 0, 1, _("&Revert"), _("&Cancel")); - if (ret == 0) - vcs->revert(); +bool LyXVC::revert() +{ + LYXERR(Debug::LYXVC, "LyXVC: revert"); + + docstring const file = owner_->fileName().displayName(20); + docstring text = bformat(_("Reverting to the stored version of the " + "document %1$s will lose all current changes.\n\n" + "Do you want to revert to the older version?"), file); + int ret = 0; + if (vcs->isRevertWithConfirmation()) + ret = Alert::prompt(_("Revert to stored version of document?"), + text, 0, 1, _("&Revert"), _("&Cancel")); + + return ret == 0 && vcs->revert(); } @@ -187,40 +235,41 @@ void LyXVC::undoLast() void LyXVC::toggleReadOnly() { + if (!vcs->toggleReadOnlyEnabled()) + return; + switch (vcs->status()) { case VCS::UNLOCKED: - LYXERR(Debug::LYXVC) << "LyXVC: toggle to locked" << endl; + LYXERR(Debug::LYXVC, "LyXVC: toggle to locked"); checkOut(); break; case VCS::LOCKED: - LYXERR(Debug::LYXVC) << "LyXVC: toggle to unlocked" << endl; + LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked"); checkIn(); break; + case VCS::NOLOCKING: + break; } } -bool LyXVC::inUse() +bool LyXVC::inUse() const { - if (vcs) return true; + if (vcs) + return true; return false; } -//string const & LyXVC::version() const -//{ -// return vcs->version(); -//} - string const LyXVC::versionString() const { return vcs->versionString(); } -string const & LyXVC::locker() const +bool LyXVC::locking() const { - return vcs->locker(); + return vcs->status() != VCS::NOLOCKING; } @@ -229,16 +278,65 @@ string const LyXVC::getLogFile() const if (!vcs) return string(); - FileName const tmpf(tempName(FileName(), "lyxvclog")); + FileName const tmpf = FileName::tempName("lyxvclog"); if (tmpf.empty()) { - LYXERR(Debug::LYXVC) << "Could not generate logfile " - << tmpf << endl; + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return string(); } - LYXERR(Debug::LYXVC) << "Generating logfile " << tmpf << endl; + LYXERR(Debug::LYXVC, "Generating logfile " << tmpf); vcs->getLog(tmpf); - return tmpf.absFilename(); + return tmpf.absFileName(); } +string LyXVC::revisionInfo(RevisionInfo const info) const +{ + if (!vcs) + return string(); + + return vcs->revisionInfo(info); +} + + +bool LyXVC::checkOutEnabled() const +{ + return vcs && vcs->checkOutEnabled(); +} + + +bool LyXVC::checkInEnabled() const +{ + return vcs && vcs->checkInEnabled(); +} + + +bool LyXVC::lockingToggleEnabled() const +{ + return vcs && vcs->lockingToggleEnabled(); +} + + +bool LyXVC::undoLastEnabled() const +{ + return vcs && vcs->undoLastEnabled(); +} + + +bool LyXVC::repoUpdateEnabled() const +{ + return vcs && vcs->repoUpdateEnabled(); +} + + +bool LyXVC::prepareFileRevision(string const & rev, std::string & f) +{ + return vcs && vcs->prepareFileRevision(rev, f); +} + + +bool LyXVC::prepareFileRevisionEnabled() +{ + return vcs && vcs->prepareFileRevisionEnabled(); +} + } // namespace lyx