mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-26 14:15:32 +00:00
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
This commit is contained in:
parent
9fdbf7eff5
commit
4e6b8efb10
@ -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();
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user