}
// file is not under any VCS.
+ vcs.reset(0);
return false;
}
_("(no initial description)"));
if (!ok) {
LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+ vcs.reset(0);
return false;
}
if (response.empty())
docstring empty(_("(no log message)"));
docstring response;
string log;
- bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
+ bool ok = true;
+ if (vcs->isCheckInWithConfirmation())
+ ok = Alert::askForText(response, _("LyX VC: Log Message"));
if (ok) {
if (response.empty())
response = empty;
+ //shell collisions
+ response = subst(response, from_utf8("\""), from_utf8("\\\""));
log = vcs->checkIn(to_utf8(response));
// Reserve empty string for cancel button
}
-void LyXVC::revert()
+bool LyXVC::revert()
{
LYXERR(Debug::LYXVC, "LyXVC: revert");
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 older version?"), file);
- int const ret = Alert::prompt(_("Revert to stored version of document?"),
- text, 0, 1, _("&Revert"), _("&Cancel"));
+ int ret = 0;
+ if (vcs->isRevertWithConfirmation())
+ ret = Alert::prompt(_("Revert to stored version of document?"),
+ text, 0, 1, _("&Revert"), _("&Cancel"));
- if (ret == 0)
- vcs->revert();
+ return ret == 0 && vcs->revert();
}
return vcs && vcs->undoLastEnabled();
}
+
+bool LyXVC::repoUpdateEnabled() const
+{
+ return vcs && vcs->repoUpdateEnabled();
+}
+
+
bool LyXVC::prepareFileRevision(string const & rev, std::string & f)
{
return vcs && vcs->prepareFileRevision(rev, f);