God damn tabular dual head :-/

[lyx.git] / src / VCBackend.cpp

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index ff722f0d1976e86c6dfc0ba7e571105368ba0eb3..ef85a62305a8729a84c37a3b6515c71eeed55603 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -352,14 +352,16 @@ bool CVS::checkOutEnabled()
 
 void CVS::revert()
 {
-       // This is sensitive operation, so at lest some check before
-       if (doVCCommand("cvs --help", FileName(owner_->filePath())))
-               return;
        // Reverts to the version in CVS repository and
        // gets the updated version from the repository.
        string const fil = quoteName(onlyFilename(owner_->absFileName()));
-
-       doVCCommand("rm -f " + fil + "; cvs update " + fil,
+       // This is sensitive operation, so at lest some check about
+       // existence of cvs program and its file
+       if (doVCCommand("cvs log "+ fil, FileName(owner_->filePath())))
+               return;
+       FileName f(owner_->absFileName());
+       f.removeFile();
+       doVCCommand("cvs update " + fil,
                    FileName(owner_->filePath()));
        owner_->markClean();
 }
@@ -443,16 +445,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 -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 the document."));
+       tmpf.erase();
 }
 
 
@@ -463,14 +480,15 @@ bool SVN::checkInEnabled()
 
 // 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)
 {
        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"))
@@ -483,7 +501,7 @@ string SVN::scanLogFile(FileName const & f)
 void SVN::checkOut()
 {
        FileName tmpf = FileName::tempName("lyxvcout");
-       if (tmpf.empty()){
+       if (tmpf.empty()) {
                LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
                return;
        }