#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <unistd.h>
-
-#include "frontends/Alert.h"
#include "lyxvc.h"
#include "vc-backend.h"
#include "debug.h"
#include "buffer.h"
-#include "BufferView.h"
#include "gettext.h"
+#include "funcrequest.h"
+
+#include "frontends/Alert.h"
+#include "frontends/LyXView.h"
+
#include "support/filetools.h"
#include "support/lyxlib.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
+
+#include <unistd.h>
+
+using namespace lyx::support;
using std::endl;
using std::pair;
+
LyXVC::LyXVC()
{
vcs = 0;
void LyXVC::registrer()
{
- // 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_);
- }
+ string const filename = owner_->fileName();
- // 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);
+ // 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;
}
- // Maybe the save fails, or we answered "no". In both cases,
- // the document will be dirty, and we abort.
- if (!vcs->owner()->isLyxClean()) {
- return;
+ // it is very likely here that the vcs is not created yet...
+ if (!vcs) {
+ string const cvs_entries = "CVS/Entries";
+
+ if (IsFileReadable(cvs_entries)) {
+ lyxerr[Debug::LYXVC]
+ << "LyXVC: registering "
+ << MakeDisplayPath(filename)
+ << " with CVS" << endl;
+ vcs = new CVS(cvs_entries, filename);
+
+ } else {
+ lyxerr[Debug::LYXVC]
+ << "LyXVC: registering "
+ << MakeDisplayPath(filename)
+ << " with RCS" << endl;
+ vcs = new RCS(filename);
+ }
+
+ vcs->owner(owner_);
}
lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
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;
}
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<bool, string> tmp = Alert::askForText(_("LyX VC: Log Message"));
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();
- }
}
}
-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");
lyxerr[Debug::LYXVC] << "Generating logfile " << tmpf << endl;
vcs->getLog(tmpf);
return tmpf;