+/**
+ * \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 <config.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 <unistd.h>
-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;
-/* WARNING: Several of the vcs-> methods end up
- * deleting this object via BufferView::reload() !
- */
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;
}
}
-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())
}
-bool LyXVC::ensureClean()
-{
- if (owner_->isClean())
- return true;
-
- string const file = MakeDisplayPath(owner_->fileName(), 30);
- string text = bformat(_("The document %1$s has unsaved changes.\n\n"
- "Do you want to save the document?"), file);
- int const ret = Alert::prompt(_("Save changed document?"),
- text, 0, 1, _("&Save"), _("&Cancel"));
-
- if (ret == 0) {
- vcs->owner()->getUser()->owner()->dispatch(FuncRequest(LFUN_MENUWRITE));
- }
-
- return owner_->isClean();
-}
-
-
void LyXVC::registrer()
{
- string const filename = owner_->fileName();
+ FileName const filename(owner_->fileName());
// there must be a file to save
- if (!IsFileReadable(filename)) {
+ if (!isFileReadable(filename)) {
Alert::error(_("Document not saved"),
- _("You must save the document "
- "before it can be registered."));
+ _("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";
+ FileName const cvs_entries(makeAbsPath("CVS/Entries"));
- if (IsFileReadable(cvs_entries)) {
- lyxerr[Debug::LYXVC]
+ if (isFileReadable(cvs_entries)) {
+ LYXERR(Debug::LYXVC)
<< "LyXVC: registering "
- << MakeDisplayPath(filename)
+ << to_utf8(makeDisplayPath(filename.absFilename()))
<< " with CVS" << endl;
- vcs = new CVS(cvs_entries, filename);
+ vcs.reset(new CVS(cvs_entries, filename));
} else {
- lyxerr[Debug::LYXVC]
+ LYXERR(Debug::LYXVC)
<< "LyXVC: registering "
- << MakeDisplayPath(filename)
+ << to_utf8(makeDisplayPath(filename.absFilename()))
<< " with RCS" << endl;
- vcs = new RCS(filename);
+ vcs.reset(new RCS(filename));
}
vcs->owner(owner_);
}
- // Maybe the save fails, or we answered "no". In both cases,
- // the document will be dirty, and we abort.
- if (!ensureClean())
- return;
-
- lyxerr[Debug::LYXVC] << "LyXVC: registrer" << endl;
- pair<bool, string> tmp =
+ LYXERR(Debug::LYXVC) << "LyXVC: registrer" << endl;
+ pair<bool, docstring> 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;
+ LYXERR(Debug::LYXVC) << "LyXVC: user cancelled" << endl;
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()->isClean()) {
- vcs->owner()->getUser()->owner()
- ->dispatch(FuncRequest(LFUN_MENUWRITE));
- }
-
- // Maybe the save fails, or we answered "no". In both cases,
- // the document will be dirty, and we abort.
- if (!vcs->owner()->isClean())
- return;
- lyxerr[Debug::LYXVC] << "LyXVC: checkIn" << endl;
- pair<bool, string> tmp = Alert::askForText(_("LyX VC: Log Message"));
+ LYXERR(Debug::LYXVC) << "LyXVC: checkIn" << endl;
+ pair<bool, docstring> 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;
+ LYXERR(Debug::LYXVC) << "LyXVC: user cancelled" << endl;
}
}
void LyXVC::checkOut()
{
- lyxerr[Debug::LYXVC] << "LyXVC: checkOut" << endl;
- if (!ensureClean())
- return;
+ LYXERR(Debug::LYXVC) << "LyXVC: checkOut" << endl;
vcs->checkOut();
}
void LyXVC::revert()
{
- lyxerr[Debug::LYXVC] << "LyXVC: revert" << endl;
+ LYXERR(Debug::LYXVC) << "LyXVC: revert" << endl;
- string const file = MakeDisplayPath(owner_->fileName(), 20);
- string text = bformat(_("Reverting to the stored version of the "
+ 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);
+ "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"));
{
switch (vcs->status()) {
case VCS::UNLOCKED:
- lyxerr[Debug::LYXVC] << "LyXVC: toggle to locked" << endl;
+ LYXERR(Debug::LYXVC) << "LyXVC: toggle to locked" << endl;
checkOut();
break;
case VCS::LOCKED:
- lyxerr[Debug::LYXVC] << "LyXVC: toggle to unlocked" << endl;
+ LYXERR(Debug::LYXVC) << "LyXVC: toggle to unlocked" << endl;
checkIn();
break;
}
if (!vcs)
return string();
- string tmpf = tempName(string(), "lyxvclog");
- lyxerr[Debug::LYXVC] << "Generating logfile " << tmpf << endl;
+ 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