X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXVC.cpp;h=5b510ae0f3ac07c7176c5dc3ca602c074aabf893;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=8c98d5ec53b45e54591fed6e2c4304a36a745c26;hpb=d4b9c9755507b3780ec6c62b3444fa85179a4c41;p=lyx.git diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 8c98d5ec53..5b510ae0f3 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -142,28 +142,30 @@ void LyXVC::registrer() } -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; + if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly()) return string(); LYXERR(Debug::LYXVC, "LyXVC: checkOut"); - vcs->checkOut(); + return vcs->checkOut(); } @@ -173,8 +175,8 @@ void LyXVC::revert() 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"));