}
-void LyXVC::checkIn()
+string LyXVC::checkIn()
{
LYXERR(Debug::LYXVC, "LyXVC: checkIn");
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));
+ log = vcs->checkIn(to_utf8(response));
} 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();
}
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");