2003-08-23 00:17:00 +00:00
|
|
|
|
/**
|
2007-04-26 04:41:58 +00:00
|
|
|
|
* \file VCBackend.cpp
|
2003-08-23 00:17:00 +00:00
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
|
*
|
|
|
|
|
* \author Lars Gullik Bj<EFBFBD>nnes
|
|
|
|
|
*
|
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
|
*/
|
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
|
#include <config.h>
|
|
|
|
|
|
2007-04-26 04:41:58 +00:00
|
|
|
|
#include "VCBackend.h"
|
|
|
|
|
#include "Buffer.h"
|
2001-12-18 03:30:35 +00:00
|
|
|
|
|
2008-07-21 11:50:21 +00:00
|
|
|
|
#include "frontends/alert.h"
|
|
|
|
|
|
2008-02-18 07:14:42 +00:00
|
|
|
|
#include "support/debug.h"
|
2000-11-08 09:39:46 +00:00
|
|
|
|
#include "support/filetools.h"
|
2008-07-21 11:50:21 +00:00
|
|
|
|
#include "support/gettext.h"
|
2001-07-29 17:39:01 +00:00
|
|
|
|
#include "support/lstrings.h"
|
2008-02-18 07:14:42 +00:00
|
|
|
|
#include "support/Path.h"
|
Rename files in src/support, step one.
src/support/package.h src/support/Package.h Package
src/support/package.C.in src/support/Package.C.in Package
src/support/path.h src/support/Path.h Path
src/support/fs_extras.h src/support/fs_extras.h NOCLASSES
src/support/RandomAccessList.h src/support/RandomAccessList.h RandomAccessList
src/support/lyxmanip.h src/support/lyxmanip.h NOCLASSES
src/support/rename.C src/support/rename.cpp NOCLASSES
src/support/abort.C src/support/abort.cpp NOCLASSES
src/support/lyxlib.h src/support/lyxlib.h NOCLASSES
src/support/ExceptionMessage.h src/support/ExceptionMessage.h ExceptionMessage
src/support/copy.C src/support/copy.cpp NOCLASSES
src/support/limited_stack.h src/support/limited_stack.h limited_stack
src/support/filefilterlist.C src/support/FileFilterList.cpp ['FileFilterList', 'Filter']
src/support/cow_ptr.h src/support/cow_ptr.h cow_ptr
src/support/os_unix.C src/support/os_unix.cpp NOCLASSES
src/support/socktools.h src/support/socktools.h NOCLASSES
src/support/forkedcontr.h src/support/ForkedcallsController.h ForkedcallsController
src/support/os.h src/support/os.h NOCLASSES
src/support/FileMonitor.h src/support/FileMonitor.h FileMonitor
src/support/copied_ptr.h src/support/copied_ptr.h copied_ptr
src/support/translator.h src/support/Translator.h Translator
src/support/filetools.C src/support/filetools.cpp NOCLASSES
src/support/unlink.C src/support/unlink.cpp NOCLASSES
src/support/os_win32.C src/support/os_win32.cpp GetFolderPath
src/support/lstrings.C src/support/lstrings.cpp NOCLASSES
src/support/qstring_helpers.C src/support/qstring_helpers.cpp NOCLASSES
src/support/getcwd.C src/support/getcwd.cpp NOCLASSES
src/support/systemcall.C src/support/Systemcall.cpp Systemcall
src/support/lyxalgo.h src/support/lyxalgo.h NOCLASSES
src/support/filefilterlist.h src/support/FileFilterList.h ['FileFilterList', 'Filter']
src/support/unicode.C src/support/unicode.cpp IconvProcessor
src/support/userinfo.C src/support/userinfo.cpp NOCLASSES
src/support/lyxtime.C src/support/lyxtime.cpp NOCLASSES
src/support/kill.C src/support/kill.cpp NOCLASSES
src/support/docstring.C src/support/docstring.cpp to_local8bit_failure
src/support/os_cygwin.C src/support/os_cygwin.cpp NOCLASSES
src/support/lyxsum.C src/support/lyxsum.cpp NOCLASSES
src/support/environment.C src/support/environment.cpp NOCLASSES
src/support/filetools.h src/support/filetools.h NOCLASSES
src/support/textutils.C src/support/textutils.cpp NOCLASSES
src/support/mkdir.C src/support/mkdir.cpp NOCLASSES
src/support/forkedcall.C src/support/Forkedcall.cpp ['ForkedProcess', 'Forkedcall']
src/support/tempname.C src/support/tempname.cpp NOCLASSES
src/support/os_win32.h src/support/os_win32.h GetFolderPath
src/support/types.h src/support/types.h NOCLASSES
src/support/lstrings.h src/support/lstrings.h NOCLASSES
src/support/forkedcallqueue.C src/support/ForkedCallQueue.cpp ForkedCallQueue
src/support/qstring_helpers.h src/support/qstring_helpers.h NOCLASSES
src/support/convert.C src/support/convert.cpp NOCLASSES
src/support/filename.C src/support/FileName.cpp ['FileName', 'DocFileName']
src/support/tests/convert.C src/support/tests/convert.cpp NOCLASSES
src/support/tests/filetools.C src/support/tests/filetools.cpp NOCLASSES
src/support/tests/lstrings.C src/support/tests/lstrings.cpp NOCLASSES
src/support/tests/boost.C src/support/tests/boost.cpp NOCLASSES
src/support/docstream.C src/support/docstream.cpp ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/std_istream.h src/support/std_istream.h NOCLASSES
src/support/systemcall.h src/support/Systemcall.h Systemcall
src/support/chdir.C src/support/chdir.cpp NOCLASSES
src/support/std_ostream.h src/support/std_ostream.h NOCLASSES
src/support/unicode.h src/support/unicode.h IconvProcessor
src/support/path.C src/support/Path.cpp Path
src/support/fs_extras.C src/support/fs_extras.cpp NOCLASSES
src/support/userinfo.h src/support/userinfo.h NOCLASSES
src/support/lyxtime.h src/support/lyxtime.h NOCLASSES
src/support/docstring.h src/support/docstring.h to_local8bit_failure
src/support/debugstream.h src/support/debugstream.h basic_debugstream
src/support/environment.h src/support/environment.h NOCLASSES
src/support/textutils.h src/support/textutils.h NOCLASSES
src/support/forkedcall.h src/support/Forkedcall.h ['ForkedProcess', 'Forkedcall']
src/support/socktools.C src/support/socktools.cpp NOCLASSES
src/support/forkedcallqueue.h src/support/ForkedCallQueue.h ForkedCallQueue
src/support/forkedcontr.C src/support/ForkedcallsController.cpp ForkedcallsController
src/support/os.C src/support/os.cpp NOCLASSES
src/support/convert.h src/support/convert.h NOCLASSES
src/support/filename.h src/support/FileName.h ['FileName', 'DocFileName']
src/support/docstream.h src/support/docstream.h ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/FileMonitor.C src/support/FileMonitor.cpp FileMonitor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18024 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 05:12:52 +00:00
|
|
|
|
#include "support/Systemcall.h"
|
2001-12-18 03:30:35 +00:00
|
|
|
|
|
2002-05-25 00:19:56 +00:00
|
|
|
|
#include <boost/regex.hpp>
|
|
|
|
|
|
2001-12-18 03:30:35 +00:00
|
|
|
|
#include <fstream>
|
1999-11-09 23:52:04 +00:00
|
|
|
|
|
2007-12-12 10:16:00 +00:00
|
|
|
|
using namespace std;
|
2007-12-12 18:57:56 +00:00
|
|
|
|
using namespace lyx::support;
|
2007-12-12 10:16:00 +00:00
|
|
|
|
|
|
|
|
|
using boost::regex;
|
|
|
|
|
using boost::regex_match;
|
|
|
|
|
using boost::smatch;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
|
|
namespace lyx {
|
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
|
|
2008-07-29 11:17:20 +00:00
|
|
|
|
int VCS::doVCCommandCall(string const & cmd, FileName const & path){
|
|
|
|
|
LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
|
2002-03-21 17:27:08 +00:00
|
|
|
|
Systemcall one;
|
2007-11-10 13:44:50 +00:00
|
|
|
|
support::PathChanger p(path);
|
2008-07-29 11:17:20 +00:00
|
|
|
|
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);
|
2008-07-21 11:50:21 +00:00
|
|
|
|
if (ret)
|
|
|
|
|
frontend::Alert::error(_("Revision control error."),
|
2008-07-22 10:16:30 +00:00
|
|
|
|
bformat(_("Some problem occured while running the command:\n"
|
2008-07-21 13:20:29 +00:00
|
|
|
|
"'%1$s'."),
|
|
|
|
|
from_ascii(cmd)));
|
1999-11-09 23:52:04 +00:00
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-10-20 10:03:45 +00:00
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
//
|
|
|
|
|
// RCS
|
|
|
|
|
//
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
2006-12-02 16:07:15 +00:00
|
|
|
|
RCS::RCS(FileName const & m)
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
|
|
|
|
master_ = m;
|
|
|
|
|
scanMaster();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-11-25 11:18:16 +00:00
|
|
|
|
FileName const RCS::findFile(FileName const & file)
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
|
|
|
|
// Check if *,v exists.
|
2006-12-02 16:07:15 +00:00
|
|
|
|
FileName tmp(file.absFilename() + ",v");
|
2008-07-20 20:14:40 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
|
2007-11-25 11:18:16 +00:00
|
|
|
|
if (tmp.isReadableFile()) {
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "Yes " << file << " is under rcs.");
|
1999-11-09 23:52:04 +00:00
|
|
|
|
return tmp;
|
|
|
|
|
}
|
2007-11-03 17:56:29 +00:00
|
|
|
|
|
|
|
|
|
// Check if RCS/*,v exists.
|
|
|
|
|
tmp = FileName(addName(addPath(onlyPath(file.absFilename()), "RCS"), file.absFilename()) + ",v");
|
2008-07-20 20:14:40 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under rcs: " << tmp);
|
2007-11-25 11:18:16 +00:00
|
|
|
|
if (tmp.isReadableFile()) {
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "Yes " << file << " it is under rcs.");
|
2007-11-03 17:56:29 +00:00
|
|
|
|
return tmp;
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-02 16:07:15 +00:00
|
|
|
|
return FileName();
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-12-02 16:07:15 +00:00
|
|
|
|
void RCS::retrieve(FileName const & file)
|
2000-01-11 08:23:07 +00:00
|
|
|
|
{
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file);
|
2008-07-29 11:17:20 +00:00
|
|
|
|
doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()),
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName());
|
2000-01-11 08:23:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
|
void RCS::scanMaster()
|
|
|
|
|
{
|
2008-10-27 01:06:24 +00:00
|
|
|
|
if (master_.empty())
|
|
|
|
|
return;
|
|
|
|
|
|
2008-10-27 00:27:31 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_);
|
1999-11-09 23:52:04 +00:00
|
|
|
|
|
2006-12-02 16:07:15 +00:00
|
|
|
|
ifstream ifs(master_.toFilesystemEncoding().c_str());
|
1999-11-09 23:52:04 +00:00
|
|
|
|
|
|
|
|
|
string token;
|
|
|
|
|
bool read_enough = false;
|
|
|
|
|
|
|
|
|
|
while (!read_enough && ifs >> token) {
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC::scanMaster: current lex text: `"
|
|
|
|
|
<< token << '\'');
|
1999-11-09 23:52:04 +00:00
|
|
|
|
|
|
|
|
|
if (token.empty())
|
|
|
|
|
continue;
|
|
|
|
|
else if (token == "head") {
|
|
|
|
|
// get version here
|
|
|
|
|
string tmv;
|
|
|
|
|
ifs >> tmv;
|
2002-07-28 22:50:13 +00:00
|
|
|
|
tmv = rtrim(tmv, ";");
|
1999-11-09 23:52:04 +00:00
|
|
|
|
version_ = tmv;
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC: version found to be " << tmv);
|
1999-11-09 23:52:04 +00:00
|
|
|
|
} else if (contains(token, "access")
|
|
|
|
|
|| contains(token, "symbols")
|
|
|
|
|
|| contains(token, "strict")) {
|
|
|
|
|
// nothing
|
|
|
|
|
} else if (contains(token, "locks")) {
|
|
|
|
|
// get locker here
|
2004-02-01 12:46:14 +00:00
|
|
|
|
if (contains(token, ';')) {
|
1999-11-09 23:52:04 +00:00
|
|
|
|
locker_ = "Unlocked";
|
2000-05-17 16:42:35 +00:00
|
|
|
|
vcstatus = UNLOCKED;
|
1999-11-09 23:52:04 +00:00
|
|
|
|
continue;
|
|
|
|
|
}
|
2001-08-19 14:06:27 +00:00
|
|
|
|
string tmpt;
|
|
|
|
|
string s1;
|
|
|
|
|
string s2;
|
1999-11-09 23:52:04 +00:00
|
|
|
|
do {
|
|
|
|
|
ifs >> tmpt;
|
2002-07-28 22:50:13 +00:00
|
|
|
|
s1 = rtrim(tmpt, ";");
|
1999-11-09 23:52:04 +00:00
|
|
|
|
// tmp is now in the format <user>:<version>
|
|
|
|
|
s1 = split(s1, s2, ':');
|
|
|
|
|
// s2 is user, and s1 is version
|
|
|
|
|
if (s1 == version_) {
|
|
|
|
|
locker_ = s2;
|
2000-05-17 16:42:35 +00:00
|
|
|
|
vcstatus = LOCKED;
|
1999-11-09 23:52:04 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
2004-02-01 12:46:14 +00:00
|
|
|
|
} while (!contains(tmpt, ';'));
|
2002-03-21 17:27:08 +00:00
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
|
} else if (token == "comment") {
|
|
|
|
|
// we don't need to read any further than this.
|
|
|
|
|
read_enough = true;
|
|
|
|
|
} else {
|
|
|
|
|
// unexpected
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC::scanMaster(): unexpected token");
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void RCS::registrer(string const & msg)
|
|
|
|
|
{
|
|
|
|
|
string cmd = "ci -q -u -i -t-\"";
|
|
|
|
|
cmd += msg;
|
2005-03-29 09:35:16 +00:00
|
|
|
|
cmd += "\" ";
|
2007-10-20 10:03:45 +00:00
|
|
|
|
cmd += quoteName(onlyFilename(owner_->absFileName()));
|
2007-04-06 18:03:29 +00:00
|
|
|
|
doVCCommand(cmd, FileName(owner_->filePath()));
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-29 13:14:51 +00:00
|
|
|
|
string RCS::checkIn(string const & msg)
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
2008-07-29 13:14:51 +00:00
|
|
|
|
int ret = doVCCommand("ci -q -u -m\"" + msg + "\" "
|
2007-10-20 10:03:45 +00:00
|
|
|
|
+ quoteName(onlyFilename(owner_->absFileName())),
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
2008-07-29 13:14:51 +00:00
|
|
|
|
return ret ? string() : "RCS: Proceeded";
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-21 01:55:58 +00:00
|
|
|
|
bool RCS::checkInEnabled()
|
|
|
|
|
{
|
|
|
|
|
return owner_ && !owner_->isReadonly();
|
|
|
|
|
}
|
1999-11-09 23:52:04 +00:00
|
|
|
|
|
2008-07-29 13:14:51 +00:00
|
|
|
|
string RCS::checkOut()
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
2002-08-04 23:11:50 +00:00
|
|
|
|
owner_->markClean();
|
2008-07-29 13:14:51 +00:00
|
|
|
|
int ret = doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->absFileName())),
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
2008-07-29 13:14:51 +00:00
|
|
|
|
return ret ? string() : "RCS: Proceeded";
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-21 01:55:58 +00:00
|
|
|
|
bool RCS::checkOutEnabled()
|
|
|
|
|
{
|
|
|
|
|
return owner_ && owner_->isReadonly();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
|
void RCS::revert()
|
|
|
|
|
{
|
2005-03-29 09:35:16 +00:00
|
|
|
|
doVCCommand("co -f -u" + version() + " "
|
2007-10-20 10:03:45 +00:00
|
|
|
|
+ quoteName(onlyFilename(owner_->absFileName())),
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
1999-11-09 23:52:04 +00:00
|
|
|
|
// We ignore changes and just reload!
|
2002-08-04 23:11:50 +00:00
|
|
|
|
owner_->markClean();
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void RCS::undoLast()
|
|
|
|
|
{
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC: undoLast");
|
2005-03-29 09:35:16 +00:00
|
|
|
|
doVCCommand("rcs -o" + version() + " "
|
2007-10-20 10:03:45 +00:00
|
|
|
|
+ quoteName(onlyFilename(owner_->absFileName())),
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-21 01:55:58 +00:00
|
|
|
|
bool RCS::undoLastEnabled()
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-12-02 16:07:15 +00:00
|
|
|
|
void RCS::getLog(FileName const & tmpf)
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
2007-10-20 10:03:45 +00:00
|
|
|
|
doVCCommand("rlog " + quoteName(onlyFilename(owner_->absFileName()))
|
2008-11-16 23:25:29 +00:00
|
|
|
|
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-22 09:00:05 +00:00
|
|
|
|
bool RCS::toggleReadOnlyEnabled()
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-10-20 10:03:45 +00:00
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
//
|
|
|
|
|
// CVS
|
|
|
|
|
//
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
2006-12-02 16:07:15 +00:00
|
|
|
|
CVS::CVS(FileName const & m, FileName const & f)
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
|
|
|
|
master_ = m;
|
|
|
|
|
file_ = f;
|
|
|
|
|
scanMaster();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-11-25 11:18:16 +00:00
|
|
|
|
FileName const CVS::findFile(FileName const & file)
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
|
|
|
|
// First we look for the CVS/Entries in the same dir
|
|
|
|
|
// where we have file.
|
2008-07-20 22:08:32 +00:00
|
|
|
|
FileName const entries(onlyPath(file.absFilename()) + "/CVS/Entries");
|
2006-12-02 16:07:15 +00:00
|
|
|
|
string const tmpf = '/' + onlyFilename(file.absFilename()) + '/';
|
2008-07-21 00:22:43 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under cvs in `" << entries
|
2007-11-15 20:04:51 +00:00
|
|
|
|
<< "' for `" << tmpf << '\'');
|
2008-07-20 22:08:32 +00:00
|
|
|
|
if (entries.isReadableFile()) {
|
1999-11-09 23:52:04 +00:00
|
|
|
|
// Ok we are at least in a CVS dir. Parse the CVS/Entries
|
|
|
|
|
// and see if we can find this file. We do a fast and
|
|
|
|
|
// dirty parse here.
|
2008-07-20 22:08:32 +00:00
|
|
|
|
ifstream ifs(entries.toFilesystemEncoding().c_str());
|
1999-11-09 23:52:04 +00:00
|
|
|
|
string line;
|
|
|
|
|
while (getline(ifs, line)) {
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "\tEntries: " << line);
|
2006-12-02 16:07:15 +00:00
|
|
|
|
if (contains(line, tmpf))
|
2008-07-20 22:08:32 +00:00
|
|
|
|
return entries;
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2006-12-02 16:07:15 +00:00
|
|
|
|
return FileName();
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void CVS::scanMaster()
|
|
|
|
|
{
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC::CVS: scanMaster. \n Checking: " << master_);
|
1999-11-09 23:52:04 +00:00
|
|
|
|
// Ok now we do the real scan...
|
2006-12-02 16:07:15 +00:00
|
|
|
|
ifstream ifs(master_.toFilesystemEncoding().c_str());
|
|
|
|
|
string tmpf = '/' + onlyFilename(file_.absFilename()) + '/';
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\'');
|
1999-11-09 23:52:04 +00:00
|
|
|
|
string line;
|
2003-10-17 18:23:41 +00:00
|
|
|
|
static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
|
2001-12-05 08:04:20 +00:00
|
|
|
|
while (getline(ifs, line)) {
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "\t line: " << line);
|
1999-11-09 23:52:04 +00:00
|
|
|
|
if (contains(line, tmpf)) {
|
|
|
|
|
// Ok extract the fields.
|
2002-05-25 00:19:56 +00:00
|
|
|
|
smatch sm;
|
2003-09-15 11:00:00 +00:00
|
|
|
|
|
|
|
|
|
regex_match(line, sm, reg);
|
2002-05-25 00:19:56 +00:00
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
|
//sm[0]; // whole matched string
|
|
|
|
|
//sm[1]; // filename
|
2003-09-15 11:00:00 +00:00
|
|
|
|
version_ = sm.str(2);
|
|
|
|
|
string const file_date = sm.str(3);
|
2002-11-04 02:12:42 +00:00
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
|
//sm[4]; // options
|
|
|
|
|
//sm[5]; // tag or tagdate
|
2002-01-07 10:17:44 +00:00
|
|
|
|
// FIXME: must double check file is stattable/existing
|
2007-11-03 17:56:29 +00:00
|
|
|
|
time_t mod = file_.lastModified();
|
2002-07-28 22:50:13 +00:00
|
|
|
|
string mod_date = rtrim(asctime(gmtime(&mod)), "\n");
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "Date in Entries: `" << file_date
|
|
|
|
|
<< "'\nModification date of file: `" << mod_date << '\'');
|
2008-07-21 11:18:33 +00:00
|
|
|
|
//FIXME this whole locking bussiness is not working under cvs and the machinery
|
|
|
|
|
// conforms to the ci usage, not cvs.
|
1999-11-09 23:52:04 +00:00
|
|
|
|
if (file_date == mod_date) {
|
|
|
|
|
locker_ = "Unlocked";
|
2000-05-17 16:42:35 +00:00
|
|
|
|
vcstatus = UNLOCKED;
|
1999-11-09 23:52:04 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Here we should also to some more checking
|
|
|
|
|
// to see if there are conflicts or not.
|
|
|
|
|
locker_ = "Locked";
|
2000-05-17 16:42:35 +00:00
|
|
|
|
vcstatus = LOCKED;
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void CVS::registrer(string const & msg)
|
|
|
|
|
{
|
2005-03-29 09:35:16 +00:00
|
|
|
|
doVCCommand("cvs -q add -m \"" + msg + "\" "
|
2007-10-20 10:03:45 +00:00
|
|
|
|
+ quoteName(onlyFilename(owner_->absFileName())),
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-29 13:14:51 +00:00
|
|
|
|
string CVS::checkIn(string const & msg)
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
2008-07-29 13:14:51 +00:00
|
|
|
|
int ret = doVCCommand("cvs -q commit -m \"" + msg + "\" "
|
2007-10-20 10:03:45 +00:00
|
|
|
|
+ quoteName(onlyFilename(owner_->absFileName())),
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
2008-07-29 13:14:51 +00:00
|
|
|
|
return ret ? string() : "CVS: Proceeded";
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-21 01:55:58 +00:00
|
|
|
|
bool CVS::checkInEnabled()
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-29 13:14:51 +00:00
|
|
|
|
string CVS::checkOut()
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
1999-11-15 12:01:38 +00:00
|
|
|
|
// cvs update or perhaps for cvs this should be a noop
|
2008-07-21 18:00:48 +00:00
|
|
|
|
// we need to detect conflict (eg "C" in output)
|
|
|
|
|
// before we can do this.
|
1999-11-15 12:01:38 +00:00
|
|
|
|
lyxerr << "Sorry not implemented." << endl;
|
2008-07-29 13:14:51 +00:00
|
|
|
|
return string();
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-21 01:55:58 +00:00
|
|
|
|
bool CVS::checkOutEnabled()
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1999-11-09 23:52:04 +00:00
|
|
|
|
void CVS::revert()
|
|
|
|
|
{
|
2001-02-20 18:31:33 +00:00
|
|
|
|
// Reverts to the version in CVS repository and
|
|
|
|
|
// gets the updated version from the repository.
|
2007-10-20 10:03:45 +00:00
|
|
|
|
string const fil = quoteName(onlyFilename(owner_->absFileName()));
|
2008-07-22 12:25:54 +00:00
|
|
|
|
// 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,
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
2002-08-04 23:11:50 +00:00
|
|
|
|
owner_->markClean();
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void CVS::undoLast()
|
|
|
|
|
{
|
|
|
|
|
// merge the current with the previous version
|
|
|
|
|
// in a reverse patch kind of way, so that the
|
|
|
|
|
// result is to revert the last changes.
|
1999-11-15 12:01:38 +00:00
|
|
|
|
lyxerr << "Sorry not implemented." << endl;
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-21 01:55:58 +00:00
|
|
|
|
bool CVS::undoLastEnabled()
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-12-02 16:07:15 +00:00
|
|
|
|
void CVS::getLog(FileName const & tmpf)
|
1999-11-09 23:52:04 +00:00
|
|
|
|
{
|
2007-10-20 10:03:45 +00:00
|
|
|
|
doVCCommand("cvs log " + quoteName(onlyFilename(owner_->absFileName()))
|
2008-11-16 23:25:29 +00:00
|
|
|
|
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
|
2007-04-06 18:03:29 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
1999-11-09 23:52:04 +00:00
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
2008-07-22 09:00:05 +00:00
|
|
|
|
bool CVS::toggleReadOnlyEnabled()
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
2008-07-22 08:59:15 +00:00
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
//
|
|
|
|
|
// SVN
|
|
|
|
|
//
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
SVN::SVN(FileName const & m, FileName const & f)
|
|
|
|
|
{
|
|
|
|
|
master_ = m;
|
|
|
|
|
file_ = f;
|
|
|
|
|
scanMaster();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
FileName const SVN::findFile(FileName const & file)
|
|
|
|
|
{
|
|
|
|
|
// First we look for the CVS/Entries in the same dir
|
|
|
|
|
// where we have file.
|
|
|
|
|
FileName const entries(onlyPath(file.absFilename()) + "/.svn/entries");
|
|
|
|
|
string const tmpf = onlyFilename(file.absFilename());
|
|
|
|
|
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under svn in `" << entries
|
|
|
|
|
<< "' for `" << tmpf << '\'');
|
|
|
|
|
if (entries.isReadableFile()) {
|
|
|
|
|
// Ok we are at least in a CVS dir. Parse the CVS/Entries
|
|
|
|
|
// and see if we can find this file. We do a fast and
|
|
|
|
|
// dirty parse here.
|
|
|
|
|
ifstream ifs(entries.toFilesystemEncoding().c_str());
|
|
|
|
|
string line, oldline;
|
|
|
|
|
while (getline(ifs, line)) {
|
|
|
|
|
if (line == "dir" || line == "file")
|
|
|
|
|
LYXERR(Debug::LYXVC, "\tEntries: " << oldline);
|
|
|
|
|
if (oldline == tmpf && line == "file")
|
|
|
|
|
return entries;
|
|
|
|
|
oldline = line;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return FileName();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SVN::scanMaster()
|
|
|
|
|
{
|
|
|
|
|
// if we want some locking under svn
|
|
|
|
|
// we need different infrastructure around
|
|
|
|
|
locker_ = "Unlocked";
|
|
|
|
|
vcstatus = UNLOCKED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-09-16 11:33:07 +00:00
|
|
|
|
void SVN::registrer(string const & /*msg*/)
|
2008-07-22 08:59:15 +00:00
|
|
|
|
{
|
2008-07-22 10:17:24 +00:00
|
|
|
|
doVCCommand("svn add -q " + quoteName(onlyFilename(owner_->absFileName())),
|
2008-07-22 08:59:15 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-29 13:14:51 +00:00
|
|
|
|
string SVN::checkIn(string const & msg)
|
2008-07-22 08:59:15 +00:00
|
|
|
|
{
|
2008-07-22 10:17:24 +00:00
|
|
|
|
FileName tmpf = FileName::tempName("lyxvcout");
|
|
|
|
|
if (tmpf.empty()){
|
|
|
|
|
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
|
2008-07-29 13:14:51 +00:00
|
|
|
|
return N_("Error: Could not generate logfile.");
|
2008-07-22 10:17:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
2008-07-22 13:44:06 +00:00
|
|
|
|
doVCCommand("svn commit -m \"" + msg + "\" "
|
2008-07-22 10:17:24 +00:00
|
|
|
|
+ quoteName(onlyFilename(owner_->absFileName()))
|
2008-11-16 23:25:29 +00:00
|
|
|
|
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
|
2008-07-22 08:59:15 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
2008-07-22 10:17:24 +00:00
|
|
|
|
|
2008-07-29 13:14:51 +00:00
|
|
|
|
string log;
|
|
|
|
|
string res = scanLogFile(tmpf, log);
|
2008-07-22 10:17:24 +00:00
|
|
|
|
if (!res.empty())
|
|
|
|
|
frontend::Alert::error(_("Revision control error."),
|
|
|
|
|
_("Error when commiting to repository.\n"
|
|
|
|
|
"You have to manually resolve the problem.\n"
|
2008-07-22 13:44:06 +00:00
|
|
|
|
"After pressing OK, LyX will reopen the document."));
|
2008-07-22 10:17:24 +00:00
|
|
|
|
tmpf.erase();
|
2008-07-29 13:14:51 +00:00
|
|
|
|
return "SVN: " + log;
|
2008-07-22 08:59:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool SVN::checkInEnabled()
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-22 10:16:54 +00:00
|
|
|
|
// FIXME Correctly return code should be checked instead of this.
|
|
|
|
|
// This would need another solution than just plain startscript.
|
2008-07-22 21:22:44 +00:00
|
|
|
|
// Hint from Andre': QProcess::readAllStandardError()...
|
2008-07-29 13:14:51 +00:00
|
|
|
|
string SVN::scanLogFile(FileName const & f, string & status)
|
2008-07-22 10:16:54 +00:00
|
|
|
|
{
|
|
|
|
|
ifstream ifs(f.toFilesystemEncoding().c_str());
|
|
|
|
|
string line;
|
|
|
|
|
|
2008-07-22 21:22:44 +00:00
|
|
|
|
while (ifs) {
|
|
|
|
|
getline(ifs, line);
|
|
|
|
|
lyxerr << line << "\n";
|
2008-07-29 13:14:51 +00:00
|
|
|
|
if (!line.empty()) status += line + "; ";
|
|
|
|
|
if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
|
|
|
|
|
ifs.close();
|
2008-07-22 10:16:54 +00:00
|
|
|
|
return line;
|
2008-07-29 13:14:51 +00:00
|
|
|
|
}
|
2008-07-22 10:16:54 +00:00
|
|
|
|
}
|
2008-07-29 13:14:51 +00:00
|
|
|
|
ifs.close();
|
2008-07-22 10:16:54 +00:00
|
|
|
|
return string();
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-22 08:59:15 +00:00
|
|
|
|
|
2008-07-29 13:14:51 +00:00
|
|
|
|
string SVN::checkOut()
|
2008-07-22 08:59:15 +00:00
|
|
|
|
{
|
2008-07-22 10:16:54 +00:00
|
|
|
|
FileName tmpf = FileName::tempName("lyxvcout");
|
2008-07-22 21:22:44 +00:00
|
|
|
|
if (tmpf.empty()) {
|
2008-07-22 10:16:54 +00:00
|
|
|
|
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
|
2008-07-29 13:14:51 +00:00
|
|
|
|
return N_("Error: Could not generate logfile.");
|
2008-07-22 10:16:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
doVCCommand("svn update " + quoteName(onlyFilename(owner_->absFileName()))
|
2008-11-16 23:25:29 +00:00
|
|
|
|
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
|
2008-07-22 09:00:41 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
2008-07-22 10:16:54 +00:00
|
|
|
|
|
2008-07-29 13:14:51 +00:00
|
|
|
|
string log;
|
|
|
|
|
string res = scanLogFile(tmpf, log);
|
2008-07-22 10:16:54 +00:00
|
|
|
|
if (!res.empty())
|
|
|
|
|
frontend::Alert::error(_("Revision control error."),
|
|
|
|
|
bformat(_("Error when updating from repository.\n"
|
|
|
|
|
"You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
|
|
|
|
|
"After pressing OK, LyX will try to reopen resolved document."),
|
|
|
|
|
from_ascii(res)));
|
|
|
|
|
tmpf.erase();
|
2008-07-29 13:14:51 +00:00
|
|
|
|
return "SVN: " + log;
|
2008-07-22 08:59:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool SVN::checkOutEnabled()
|
|
|
|
|
{
|
2008-07-22 09:00:41 +00:00
|
|
|
|
return true;
|
2008-07-22 08:59:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SVN::revert()
|
|
|
|
|
{
|
|
|
|
|
// Reverts to the version in CVS repository and
|
|
|
|
|
// gets the updated version from the repository.
|
|
|
|
|
string const fil = quoteName(onlyFilename(owner_->absFileName()));
|
|
|
|
|
|
|
|
|
|
doVCCommand("svn revert -q " + fil,
|
|
|
|
|
FileName(owner_->filePath()));
|
|
|
|
|
owner_->markClean();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SVN::undoLast()
|
|
|
|
|
{
|
|
|
|
|
// merge the current with the previous version
|
|
|
|
|
// in a reverse patch kind of way, so that the
|
|
|
|
|
// result is to revert the last changes.
|
|
|
|
|
lyxerr << "Sorry not implemented." << endl;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool SVN::undoLastEnabled()
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SVN::getLog(FileName const & tmpf)
|
|
|
|
|
{
|
|
|
|
|
doVCCommand("svn log " + quoteName(onlyFilename(owner_->absFileName()))
|
2008-11-16 23:25:29 +00:00
|
|
|
|
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
|
2008-07-22 08:59:15 +00:00
|
|
|
|
FileName(owner_->filePath()));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-22 09:00:05 +00:00
|
|
|
|
bool SVN::toggleReadOnlyEnabled()
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-22 08:59:15 +00:00
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
|
} // namespace lyx
|