* 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.
// 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())
- return true;
+ 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::registrer()
+bool LyXVC::registrer()
{
FileName const filename = owner_->fileName();
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...
} else {
LYXERR(Debug::LYXVC, "LyXVC: registering "
<< to_utf8(filename.displayName()) << " with RCS");
- vcs.reset(new RCS(filename));
+ vcs.reset(new RCS(FileName()));
}
vcs->owner(owner_);
docstring response;
bool ok = Alert::askForText(response, _("LyX VC: Initial description"),
_("(no initial description)"));
- if (!ok || response.empty()) {
- // should we insist on checking response.empty()?
+ if (!ok) {
LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
- return;
+ return false;
}
-
+ 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");
+ docstring empty(_("(no log message)"));
docstring response;
+ string log;
bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
if (ok) {
if (response.empty())
- response = _("(no log message)");
- vcs->checkIn(to_utf8(response));
+ response = empty;
+ 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");
}
+ return log;
}
-void LyXVC::checkOut()
+string LyXVC::checkOut()
{
+ //RCS allows checkOut only in ReadOnly mode
+ if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string();
+
LYXERR(Debug::LYXVC, "LyXVC: checkOut");
- vcs->checkOut();
+ return vcs->checkOut();
+}
+
+
+string LyXVC::repoUpdate()
+{
+ LYXERR(Debug::LYXVC, "LyXVC: repoUpdate");
+ return vcs->repoUpdate();
+}
+
+
+string LyXVC::lockingToggle()
+{
+ LYXERR(Debug::LYXVC, "LyXVC: toggle locking property");
+ return vcs->lockingToggle();
}
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 saved version?"), file);
+ "document %1$s will lose all current changes.\n\n"
+ "Do you want to revert to the older version?"), file);
int const ret = Alert::prompt(_("Revert to stored version of document?"),
text, 0, 1, _("&Revert"), _("&Cancel"));
void LyXVC::toggleReadOnly()
{
+ if (!vcs->toggleReadOnlyEnabled())
+ return;
+
switch (vcs->status()) {
case VCS::UNLOCKED:
LYXERR(Debug::LYXVC, "LyXVC: toggle to locked");
LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked");
checkIn();
break;
+ case VCS::NOLOCKING:
+ break;
}
}
-bool LyXVC::inUse()
+bool LyXVC::inUse() const
{
if (vcs)
return true;
}
-bool LyXVC::checkOutEnabled()
+bool LyXVC::checkOutEnabled() const
{
return vcs && vcs->checkOutEnabled();
}
-bool LyXVC::checkInEnabled()
+bool LyXVC::checkInEnabled() const
{
return vcs && vcs->checkInEnabled();
}
-bool LyXVC::undoLastEnabled()
+bool LyXVC::lockingToggleEnabled() const
+{
+ return vcs && vcs->lockingToggleEnabled();
+}
+
+
+bool LyXVC::undoLastEnabled() const
{
return vcs && vcs->undoLastEnabled();
}