X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxvc.C;h=835408913fea55f57274c2e2cb01f4e54d9aa795;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=40dcf2547d6164aa2f95435f6f3e881dfb9d2ae6;hpb=efe0b0b8eb340b7c34ead8afe5d81b410d5e7865;p=lyx.git diff --git a/src/lyxvc.C b/src/lyxvc.C index 40dcf2547d..835408913f 100644 --- a/src/lyxvc.C +++ b/src/lyxvc.C @@ -1,51 +1,71 @@ -#include - -#ifdef __GNUG__ -#pragma implementation -#endif +/** + * \file lyxvc.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Lars Gullik Bjønnes + * \author Jean-Marc Lasgouttes + * \author Angus Leeming + * \author John Levon + * \author André Pönitz + * \author Allan Rae + * + * Full author contact details are available in file CREDITS. + */ -#include +#include #include "lyxvc.h" #include "vc-backend.h" #include "debug.h" -#include "lyx_gui_misc.h" #include "buffer.h" -#include "BufferView.h" #include "gettext.h" + +#include "frontends/Alert.h" + #include "support/filetools.h" #include "support/lyxlib.h" -#include "LyXView.h" -#include "lyxfunc.h" + + +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; + + LyXVC::LyXVC() { - vcs = 0; owner_ = 0; } +// for the sake of boost::scoped_ptr LyXVC::~LyXVC() -{ - delete vcs; -} +{} -bool LyXVC::file_found_hook(string const & fn) +bool LyXVC::file_found_hook(FileName const & fn) { - string found_file; + FileName found_file; // Check if file is under RCS if (!(found_file = RCS::find_file(fn)).empty()) { - vcs = new RCS(found_file); + 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()) { - vcs = new CVS(found_file, fn); + vcs.reset(new CVS(found_file, fn)); vcs->owner(owner_); return true; } @@ -54,7 +74,7 @@ bool LyXVC::file_found_hook(string const & fn) } -bool LyXVC::file_not_found_hook(string const & fn) +bool LyXVC::file_not_found_hook(FileName const & fn) { // Check if file is under RCS if (!RCS::find_file(fn).empty()) @@ -73,69 +93,62 @@ void LyXVC::buffer(Buffer * buf) void LyXVC::registrer() { + FileName const filename(owner_->fileName()); + + // there must be a file to save + if (!isFileReadable(filename)) { + Alert::error(_("Document not saved"), + _("You must save the document " + "before it can be registered.")); + return; + } + // it is very likely here that the vcs is not created yet... - // so... we use RCS as default, later this should perhaps be - // a lyxrc option. if (!vcs) { - vcs = new RCS(owner_->fileName()); - vcs->owner(owner_); - } - - // If the document is changed, we might want to save it - if (!vcs->owner()->isLyxClean() && - AskQuestion(_("Changes in document:"), - MakeDisplayPath(vcs->owner()->fileName(), 50), - _("Save document and proceed?"))) { - vcs->owner()->getUser()->owner() - ->getLyXFunc()->dispatch(LFUN_MENUWRITE); - } + FileName const cvs_entries(makeAbsPath("CVS/Entries")); + + if (isFileReadable(cvs_entries)) { + lyxerr[Debug::LYXVC] + << "LyXVC: registering " + << to_utf8(makeDisplayPath(filename.absFilename())) + << " with CVS" << endl; + 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)); + } - // Maybe the save fails, or we answered "no". In both cases, - // the document will be dirty, and we abort. - if (!vcs->owner()->isLyxClean()) { - return; + vcs->owner(owner_); } lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl; - pair tmp = - askForText(_("LyX VC: Initial description"), + 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; - WriteAlert(_("Info"), - _("This document has NOT been registered.")); return; } - - vcs->registrer(tmp.second); + + vcs->registrer(to_utf8(tmp.second)); } void LyXVC::checkIn() { - // If the document is changed, we might want to save it - if (!vcs->owner()->isLyxClean() && - AskQuestion(_("Changes in document:"), - MakeDisplayPath(vcs->owner()->fileName(), 50), - _("Save document and proceed?"))) { - vcs->owner()->getUser()->owner() - ->getLyXFunc()->dispatch(LFUN_MENUWRITE); - } - - // Maybe the save fails, or we answered "no". In both cases, - // the document will be dirty, and we abort. - if (!vcs->owner()->isLyxClean()) { - return; - } lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl; - pair tmp = askForText(_("LyX VC: Log Message")); + pair tmp = Alert::askForText(_("LyX VC: Log Message")); if (tmp.first) { if (tmp.second.empty()) { tmp.second = _("(no log message)"); } - vcs->checkIn(tmp.second); + vcs->checkIn(to_utf8(tmp.second)); } else { lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl; } @@ -145,30 +158,24 @@ void LyXVC::checkIn() void LyXVC::checkOut() { lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl; - if (!vcs->owner()->isLyxClean() - && !AskQuestion(_("Changes in document:"), - MakeDisplayPath(vcs->owner()->fileName(), 50), - _("Ignore changes and proceed with check out?"))) { - return; - } vcs->checkOut(); - } void LyXVC::revert() { lyxerr[Debug::LYXVC] << "LyXVC: revert" << endl; - // Here we should check if the buffer is dirty. And if it is - // we should warn the user that reverting will discard all - // changes made since the last check in. - if (AskQuestion(_("When you revert, you will loose all changes made"), - _("to the document since the last check in."), - _("Do you still want to do it?"))) { + 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(); - } } @@ -200,9 +207,14 @@ bool LyXVC::inUse() } -string const & LyXVC::version() const +//string const & LyXVC::version() const +//{ +// return vcs->version(); +//} + +string const LyXVC::versionString() const { - return vcs->version(); + return vcs->versionString(); } @@ -212,13 +224,21 @@ string const & LyXVC::locker() const } -const string LyXVC::getLogFile() const +string const LyXVC::getLogFile() const { if (!vcs) return string(); - string tmpf = lyx::tempName(string(), "lyxvclog"); + FileName const tmpf(tempName(FileName(), "lyxvclog")); + if (tmpf.empty()) { + lyxerr[Debug::LYXVC] << "Could not generate logfile " + << tmpf << endl; + return string(); + } lyxerr[Debug::LYXVC] << "Generating logfile " << tmpf << endl; vcs->getLog(tmpf); - return tmpf; + return tmpf.absFilename(); } + + +} // namespace lyx