break;
if (lyx_view_->buffer()->lyxvc().inUse()
&& !lyx_view_->buffer()->isReadonly()) {
break;
if (lyx_view_->buffer()->lyxvc().inUse()
&& !lyx_view_->buffer()->isReadonly()) {
- lyx_view_->buffer()->lyxvc().checkIn();
+ setMessage(from_utf8(lyx_view_->buffer()->lyxvc().checkIn()));
if (!ensureBufferClean(view()))
break;
if (lyx_view_->buffer()->lyxvc().inUse()) {
if (!ensureBufferClean(view()))
break;
if (lyx_view_->buffer()->lyxvc().inUse()) {
- lyx_view_->buffer()->lyxvc().checkOut();
+ setMessage(from_utf8(lyx_view_->buffer()->lyxvc().checkOut()));
{
LYXERR(Debug::LYXVC, "LyXVC: checkIn");
docstring response;
{
LYXERR(Debug::LYXVC, "LyXVC: checkIn");
docstring response;
bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
if (ok) {
if (response.empty())
response = _("(no log message)");
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");
}
} else {
LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
}
+string LyXVC::checkOut()
{
//RCS allows checkOut only in ReadOnly mode
{
//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");
LYXERR(Debug::LYXVC, "LyXVC: checkOut");
+ return vcs->checkOut();
/// Register the document as an VC file.
void registrer();
/// Register the document as an VC file.
void registrer();
- /// Unlock and commit changes.
- void checkIn();
+ /// Unlock and commit changes. Returns log.
+ std::string checkIn();
/// Does the current VC supports this operation?
bool checkInEnabled();
/// Does the current VC supports this operation?
bool checkInEnabled();
- /// Lock and prepare to edit document.
- void checkOut();
+ /// Lock/update and prepare to edit document. Returns log.
+ std::string checkOut();
/// Does the current VC supports this operation?
bool checkOutEnabled();
/// Does the current VC supports this operation?
bool checkOutEnabled();
-void RCS::checkIn(string const & msg)
+string RCS::checkIn(string const & msg)
- doVCCommand("ci -q -u -m\"" + msg + "\" "
+ int ret = doVCCommand("ci -q -u -m\"" + msg + "\" "
+ quoteName(onlyFilename(owner_->absFileName())),
FileName(owner_->filePath()));
+ quoteName(onlyFilename(owner_->absFileName())),
FileName(owner_->filePath()));
+ return ret ? string() : "RCS: Proceeded";
}
bool RCS::checkInEnabled()
}
bool RCS::checkInEnabled()
return owner_ && !owner_->isReadonly();
}
return owner_ && !owner_->isReadonly();
}
- doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->absFileName())),
+ int ret = doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->absFileName())),
FileName(owner_->filePath()));
FileName(owner_->filePath()));
+ return ret ? string() : "RCS: Proceeded";
-void CVS::checkIn(string const & msg)
+string CVS::checkIn(string const & msg)
- doVCCommand("cvs -q commit -m \"" + msg + "\" "
+ int ret = doVCCommand("cvs -q commit -m \"" + msg + "\" "
+ quoteName(onlyFilename(owner_->absFileName())),
FileName(owner_->filePath()));
+ quoteName(onlyFilename(owner_->absFileName())),
FileName(owner_->filePath()));
+ return ret ? string() : "CVS: Proceeded";
{
// cvs update or perhaps for cvs this should be a noop
// we need to detect conflict (eg "C" in output)
// before we can do this.
lyxerr << "Sorry not implemented." << endl;
{
// cvs update or perhaps for cvs this should be a noop
// we need to detect conflict (eg "C" in output)
// before we can do this.
lyxerr << "Sorry not implemented." << endl;
-void SVN::checkIn(string const & msg)
+string SVN::checkIn(string const & msg)
{
FileName tmpf = FileName::tempName("lyxvcout");
if (tmpf.empty()){
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
{
FileName tmpf = FileName::tempName("lyxvcout");
if (tmpf.empty()){
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return N_("Error: Could not generate logfile.");
}
doVCCommand("svn commit -m \"" + msg + "\" "
}
doVCCommand("svn commit -m \"" + msg + "\" "
+ " 2> " + tmpf.toFilesystemEncoding(),
FileName(owner_->filePath()));
+ " 2> " + tmpf.toFilesystemEncoding(),
FileName(owner_->filePath()));
- string res = scanLogFile(tmpf);
+ string log;
+ string res = scanLogFile(tmpf, log);
if (!res.empty())
frontend::Alert::error(_("Revision control error."),
_("Error when commiting to repository.\n"
"You have to manually resolve the problem.\n"
"After pressing OK, LyX will reopen the document."));
tmpf.erase();
if (!res.empty())
frontend::Alert::error(_("Revision control error."),
_("Error when commiting to repository.\n"
"You have to manually resolve the problem.\n"
"After pressing OK, LyX will reopen the document."));
tmpf.erase();
// FIXME Correctly return code should be checked instead of this.
// This would need another solution than just plain startscript.
// Hint from Andre': QProcess::readAllStandardError()...
// FIXME Correctly return code should be checked instead of this.
// This would need another solution than just plain startscript.
// Hint from Andre': QProcess::readAllStandardError()...
-string SVN::scanLogFile(FileName const & f)
+string SVN::scanLogFile(FileName const & f, string & status)
{
ifstream ifs(f.toFilesystemEncoding().c_str());
string line;
{
ifstream ifs(f.toFilesystemEncoding().c_str());
string line;
while (ifs) {
getline(ifs, line);
lyxerr << line << "\n";
while (ifs) {
getline(ifs, line);
lyxerr << line << "\n";
- if (prefixIs(line, "C "))
- return line;
- if (contains(line, "Commit failed"))
+ if (!line.empty()) status += line + "; ";
+ if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
+ ifs.close();
{
FileName tmpf = FileName::tempName("lyxvcout");
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
{
FileName tmpf = FileName::tempName("lyxvcout");
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return N_("Error: Could not generate logfile.");
}
doVCCommand("svn update " + quoteName(onlyFilename(owner_->absFileName()))
+ " > " + tmpf.toFilesystemEncoding(),
FileName(owner_->filePath()));
}
doVCCommand("svn update " + quoteName(onlyFilename(owner_->absFileName()))
+ " > " + tmpf.toFilesystemEncoding(),
FileName(owner_->filePath()));
- string res = scanLogFile(tmpf);
+ string log;
+ string res = scanLogFile(tmpf, log);
if (!res.empty())
frontend::Alert::error(_("Revision control error."),
bformat(_("Error when updating from repository.\n"
if (!res.empty())
frontend::Alert::error(_("Revision control error."),
bformat(_("Error when updating from repository.\n"
"After pressing OK, LyX will try to reopen resolved document."),
from_ascii(res)));
tmpf.erase();
"After pressing OK, LyX will try to reopen resolved document."),
from_ascii(res)));
tmpf.erase();
/// register a file for version control
virtual void registrer(std::string const & msg) = 0;
/// register a file for version control
virtual void registrer(std::string const & msg) = 0;
- /// check in the current revision
- virtual void checkIn(std::string const & msg) = 0;
+ /// check in the current revision, returns log
+ virtual std::string checkIn(std::string const & msg) = 0;
// can be this operation processed in the current RCS?
virtual bool checkInEnabled() = 0;
// can be this operation processed in the current RCS?
virtual bool checkInEnabled() = 0;
- /// check out for editing
- virtual void checkOut() = 0;
+ /// check out for editing, returns log
+ virtual std::string checkOut() = 0;
// can be this operation processed in the current RCS?
virtual bool checkOutEnabled() = 0;
/// revert current edits
// can be this operation processed in the current RCS?
virtual bool checkOutEnabled() = 0;
/// revert current edits
virtual void registrer(std::string const & msg);
virtual void registrer(std::string const & msg);
- virtual void checkIn(std::string const & msg);
+ virtual std::string checkIn(std::string const & msg);
virtual bool checkInEnabled();
virtual bool checkInEnabled();
- virtual void checkOut();
+ virtual std::string checkOut();
virtual bool checkOutEnabled();
virtual bool checkOutEnabled();
virtual void registrer(std::string const & msg);
virtual void registrer(std::string const & msg);
- virtual void checkIn(std::string const & msg);
+ virtual std::string checkIn(std::string const & msg);
virtual bool checkInEnabled();
virtual bool checkInEnabled();
- virtual void checkOut();
+ virtual std::string checkOut();
virtual bool checkOutEnabled();
virtual bool checkOutEnabled();
virtual void registrer(std::string const & msg);
virtual void registrer(std::string const & msg);
- virtual void checkIn(std::string const & msg);
+ virtual std::string checkIn(std::string const & msg);
virtual bool checkInEnabled();
virtual bool checkInEnabled();
- virtual void checkOut();
+ virtual std::string checkOut();
virtual bool checkOutEnabled();
virtual bool checkOutEnabled();
protected:
virtual void scanMaster();
protected:
virtual void scanMaster();
- /// Check for error messages in svn output.
- std::string scanLogFile(support::FileName const & f);
+ /// Check for messages in svn output. Returns error.
+ std::string scanLogFile(support::FileName const & f, std::string & status);
private:
support::FileName file_;
private:
support::FileName file_;