From 4e6b8efb100cf43fd2ca27e93bf647c10b7bf4c7 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Tue, 22 Jul 2008 10:17:24 +0000 Subject: [PATCH] scan log also for svn check-in of VCS git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25796 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/VCBackend.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index ff722f0d19..abe23df406 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -443,16 +443,31 @@ void SVN::scanMaster() void SVN::registrer(string const & msg) { - doVCCommand("svn -q add " + quoteName(onlyFilename(owner_->absFileName())), + doVCCommand("svn add -q " + quoteName(onlyFilename(owner_->absFileName())), FileName(owner_->filePath())); } void SVN::checkIn(string const & msg) { - doVCCommand("svn -q commit -m \"" + msg + "\" " - + quoteName(onlyFilename(owner_->absFileName())), + FileName tmpf = FileName::tempName("lyxvcout"); + if (tmpf.empty()){ + LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); + return; + } + + doVCCommand("svn commit -q -m \"" + msg + "\" " + + quoteName(onlyFilename(owner_->absFileName())) + + " 2> " + tmpf.toFilesystemEncoding(), FileName(owner_->filePath())); + + string res = scanLogFile(tmpf); + 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 resolved document.")); + tmpf.erase(); } -- 2.39.2