X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxvc.C;h=039e4554356281cec5228e9dcd7a97f6502f6721;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=4ac6398c5f34350b19aa8708b5ac90cb2d64d3f8;hpb=a8d4bcd2fa1d9d7055c80e9d5dd8d7dab6ef3ed3;p=lyx.git diff --git a/src/lyxvc.C b/src/lyxvc.C index 4ac6398c5f..039e455435 100644 --- a/src/lyxvc.C +++ b/src/lyxvc.C @@ -1,39 +1,50 @@ -#include +/** + * \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. + */ -#ifdef __GNUG__ -#pragma implementation -#endif +#include #include "lyxvc.h" #include "vc-backend.h" #include "debug.h" #include "buffer.h" -#include "BufferView.h" -#include "lyxfunc.h" #include "gettext.h" #include "frontends/Alert.h" -#include "frontends/LyXView.h" #include "support/filetools.h" #include "support/lyxlib.h" -#include +using lyx::support::bformat; +using lyx::support::IsFileReadable; +using lyx::support::MakeDisplayPath; +using lyx::support::tempName; using std::endl; +using std::string; using std::pair; + 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) @@ -41,13 +52,13 @@ bool LyXVC::file_found_hook(string const & fn) string 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; } @@ -75,6 +86,16 @@ void LyXVC::buffer(Buffer * buf) void LyXVC::registrer() { + string 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... if (!vcs) { string const cvs_entries = "CVS/Entries"; @@ -82,36 +103,21 @@ void LyXVC::registrer() if (IsFileReadable(cvs_entries)) { lyxerr[Debug::LYXVC] << "LyXVC: registering " - << MakeDisplayPath(owner_->fileName()) + << MakeDisplayPath(filename) << " with CVS" << endl; - vcs = new CVS(cvs_entries, owner_->fileName()); + vcs.reset(new CVS(cvs_entries, filename)); } else { lyxerr[Debug::LYXVC] << "LyXVC: registering " - << MakeDisplayPath(owner_->fileName()) + << MakeDisplayPath(filename) << " with RCS" << endl; - vcs = new RCS(owner_->fileName()); + vcs.reset(new RCS(filename)); } vcs->owner(owner_); } - // If the document is changed, we might want to save it - if (!vcs->owner()->isLyxClean() && - Alert::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: registrer" << endl; pair tmp = Alert::askForText(_("LyX VC: Initial description"), @@ -119,8 +125,6 @@ void LyXVC::registrer() if (!tmp.first || tmp.second.empty()) { // should we insist on checking tmp.second.empty()? lyxerr[Debug::LYXVC] << "LyXVC: user cancelled" << endl; - Alert::alert(_("Info"), - _("This document has NOT been registered.")); return; } @@ -130,20 +134,6 @@ void LyXVC::registrer() void LyXVC::checkIn() { - // If the document is changed, we might want to save it - if (!vcs->owner()->isLyxClean() && - Alert::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 = Alert::askForText(_("LyX VC: Log Message")); @@ -161,30 +151,24 @@ void LyXVC::checkIn() void LyXVC::checkOut() { lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl; - if (!vcs->owner()->isLyxClean() - && !Alert::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 (Alert::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?"))) { + string const file = MakeDisplayPath(owner_->fileName(), 20); + string 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(); - } } @@ -233,12 +217,17 @@ 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"); + string tmpf = tempName(string(), "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;