namespace lyx {
-int VCS::doVCCommand(string const & cmd, FileName const & path)
-{
- LYXERR(Debug::LYXVC, "doVCCommand: " << cmd);
+int VCS::doVCCommandCall(string const & cmd, FileName const & path){
+ LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
Systemcall one;
support::PathChanger p(path);
- int const ret = one.startscript(Systemcall::Wait, cmd);
+ return one.startscript(Systemcall::Wait, cmd);
+}
+
+int VCS::doVCCommand(string const & cmd, FileName const & path)
+{
+ owner_->setBusy(true);
+ int const ret = doVCCommandCall(cmd, path);
+ owner_->setBusy(false);
if (ret)
frontend::Alert::error(_("Revision control error."),
bformat(_("Some problem occured while running the command:\n"
void RCS::retrieve(FileName const & file)
{
LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file);
- VCS::doVCCommand("co -q -r " + quoteName(file.toFilesystemEncoding()),
+ doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()),
FileName());
}
}
-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()));
+ return ret ? string() : "RCS: Proceeded";
}
bool RCS::checkInEnabled()
return owner_ && !owner_->isReadonly();
}
-void RCS::checkOut()
+string RCS::checkOut()
{
owner_->markClean();
- doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->absFileName())),
+ int ret = doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->absFileName())),
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()));
+ return ret ? string() : "CVS: Proceeded";
}
}
-void CVS::checkOut()
+string CVS::checkOut()
{
// 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;
+ return string();
}
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();
}
}
-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);
- return;
+ return N_("Error: Could not generate logfile.");
}
- doVCCommand("svn commit -q -m \"" + msg + "\" "
+ doVCCommand("svn commit -m \"" + msg + "\" "
+ quoteName(onlyFilename(owner_->absFileName()))
+ " 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 resolved document."));
+ "After pressing OK, LyX will reopen the document."));
tmpf.erase();
+ return "SVN: " + log;
}
// FIXME Correctly return code should be checked instead of this.
// This would need another solution than just plain startscript.
-string SVN::scanLogFile(FileName const & f)
+// Hint from Andre': QProcess::readAllStandardError()...
+string SVN::scanLogFile(FileName const & f, string & status)
{
ifstream ifs(f.toFilesystemEncoding().c_str());
string line;
- while (ifs){
- getline(ifs,line);
- lyxerr<<line<<"\n";
- if (prefixIs(line, "C "))
- return line;
- if (contains(line, "Commit failed"))
+ while (ifs) {
+ getline(ifs, line);
+ lyxerr << line << "\n";
+ if (!line.empty()) status += line + "; ";
+ if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
+ ifs.close();
return line;
+ }
}
+ ifs.close();
return string();
}
-void SVN::checkOut()
+string SVN::checkOut()
{
FileName tmpf = FileName::tempName("lyxvcout");
- if (tmpf.empty()){
+ if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return;
+ return N_("Error: Could not generate logfile.");
}
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"
"After pressing OK, LyX will try to reopen resolved document."),
from_ascii(res)));
tmpf.erase();
+ return "SVN: " + log;
}