#include "VCBackend.h"
#include "Buffer.h"
+#include "DispatchResult.h"
#include "LyX.h"
#include "FuncRequest.h"
#include "support/TempFile.h"
#include <fstream>
+#include <iomanip>
+#include <sstream>
using namespace std;
using namespace lyx::support;
LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
Systemcall one;
support::PathChanger p(path);
- return one.startscript(Systemcall::Wait, cmd, string(), false);
+ return one.startscript(Systemcall::Wait, cmd, string(), string(), false);
}
owner_->setBusy(false);
if (ret && reportError)
frontend::Alert::error(_("Revision control error."),
- bformat(_("Some problem occured while running the command:\n"
+ bformat(_("Some problem occurred while running the command:\n"
"'%1$s'."),
from_utf8(cmd)));
return ret;
// if positive use as the last number in the whole revision string
if (back > 0) {
string base;
- rsplit(version, base , '.' );
- rev = base + "." + rev;
+ rsplit(version, base , '.');
+ rev = base + '.' + rev;
}
if (back == 0)
rev = version;
// in case of backward indexing
if (back < 0) {
string cur, base;
- cur = rsplit(version, base , '.' );
+ cur = rsplit(version, base , '.');
if (!isStrInt(cur))
return false;
int want = convert<int>(cur) + back;
if (want <= 0)
return false;
-
- rev = base + "." + convert<string>(want);
+
+ rev = base + '.' + convert<string>(want);
}
}
LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_);
ifstream ifs(master_.toFilesystemEncoding().c_str());
+ // limit the size of strings we read to avoid memory problems
+ ifs >> setw(65636);
string token;
bool read_enough = false;
bool RCS::checkInEnabled()
{
- return owner_ && !owner_->isReadonly();
+ return owner_ && !owner_->hasReadonlyFlag();
}
bool RCS::checkOutEnabled()
{
- return owner_ && owner_->isReadonly();
+ return owner_ && owner_->hasReadonlyFlag();
}
bool RCS::revert()
{
- if (doVCCommand("co -f -u" + version_ + " "
+ if (doVCCommand("co -f -u" + version_ + ' '
+ quoteName(onlyFileName(owner_->absFileName())),
FileName(owner_->filePath())))
return false;
void RCS::undoLast()
{
LYXERR(Debug::LYXVC, "LyXVC: undoLast");
- doVCCommand("rcs -o" + version_ + " "
+ doVCCommand("rcs -o" + version_ + ' '
+ quoteName(onlyFileName(owner_->absFileName())),
FileName(owner_->filePath()));
}
bool RCS::undoLastEnabled()
{
- return true;
+ return owner_->hasReadonlyFlag();
}
return rev_date_cache_;
case LyXVC::Time:
return rev_time_cache_;
- default: ;
+ default:
+ break;
}
return string();
if (!VCS::makeRCSRevision(version_, rev))
return false;
- TempFile tempfile("lyxvcrev_" + rev + "_");
+ TempFile tempfile("lyxvcrev_" + rev + '_');
tempfile.setAutoRemove(false);
FileName tmpf = tempfile.name();
if (tmpf.empty()) {
return false;
}
- doVCCommand("co -p" + rev + " "
+ doVCCommand("co -p" + rev + ' '
+ quoteName(onlyFileName(owner_->absFileName()))
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
+ tmpf.refresh();
if (tmpf.isFileEmpty())
return false;
if (contains(line, tmpf)) {
// Ok extract the fields.
smatch sm;
-
- regex_match(line, sm, reg);
+ if (!regex_match(line, sm, reg)) {
+ LYXERR(Debug::LYXVC, "\t Cannot parse line. Skipping.");
+ continue;
+ }
//sm[0]; // whole matched string
//sm[1]; // filename
case StatusError:
return _("Cannot retrieve CVS status");
}
- return 0;
+ return docstring();
}
while (ifs) {
string line;
getline(ifs, line);
- LYXERR(Debug::LYXVC, line << "\n");
+ LYXERR(Debug::LYXVC, line << '\n');
if (prefixIs(line, "File:")) {
if (contains(line, "Up-to-date"))
status = UpToDate;
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return;
}
-
- int rc = doVCCommandCallWithOutput("cvs log -r" + version_
- + " " + getTarget(File),
+
+ int rc = doVCCommandCallWithOutput("cvs log -r" + version_
+ + ' ' + getTarget(File),
FileName(owner_->filePath()), tmpf);
if (rc) {
LYXERR(Debug::LYXVC, "cvs log failed with exit code " << rc);
return;
}
-
+
ifstream ifs(tmpf.toFilesystemEncoding().c_str());
static regex const reg("date: (.*) (.*) (.*); author: (.*); state: (.*);(.*)");
while (ifs) {
string line;
getline(ifs, line);
- LYXERR(Debug::LYXVC, line << "\n");
+ LYXERR(Debug::LYXVC, line << '\n');
if (prefixIs(line, "date:")) {
smatch sm;
regex_match(line, sm, reg);
while (ifs) {
string line;
getline(ifs, line);
- LYXERR(Debug::LYXVC, line << "\n");
+ LYXERR(Debug::LYXVC, line << '\n');
if (!line.empty())
status += line + "; ";
if (prefixIs(line, "C ")) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return string();
}
-
+
int rc = update(File, tmpf);
string log;
string const res = scanLogFile(tmpf, log);
from_local8bit(res)));
rc = 0;
}
-
+
return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
}
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return string();
}
-
+
getDiff(Directory, tmpf);
docstring res = tmpf.fileContents("UTF-8");
if (!res.empty()) {
"or you will need to revert back to the repository version."), file);
int ret = frontend::Alert::prompt(_("Changes detected"),
text, 0, 1, _("&Continue"), _("&Abort"), _("View &Log ..."));
- if (ret == 2 ) {
+ if (ret == 2) {
dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
ret = frontend::Alert::prompt(_("Changes detected"),
text, 0, 1, _("&Continue"), _("&Abort"));
hideDialogs("file", 0);
}
- if (ret == 1 )
+ if (ret == 1)
return string();
}
return rev_date_cache_;
case LyXVC::Time:
return rev_time_cache_;
- default: ;
+ default:
+ break;
}
}
return string();
if (!VCS::makeRCSRevision(version_, rev))
return false;
- TempFile tempfile("lyxvcrev_" + rev + "_");
+ TempFile tempfile("lyxvcrev_" + rev + '_');
tempfile.setAutoRemove(false);
FileName tmpf = tempfile.name();
if (tmpf.empty()) {
return false;
}
- doVCCommandWithOutput("cvs update -p -r" + rev + " "
+ doVCCommandWithOutput("cvs update -p -r" + rev + ' '
+ getTarget(File),
FileName(owner_->filePath()), tmpf);
+ tmpf.refresh();
if (tmpf.isFileEmpty())
return false;
while (ifs) {
getline(ifs, line);
- LYXERR(Debug::LYXVC, line << "\n");
- if (!line.empty())
+ LYXERR(Debug::LYXVC, line << '\n');
+ if (!line.empty())
status += line + "; ";
if (prefixIs(line, "C ") || prefixIs(line, "CU ")
|| contains(line, "Commit failed")) {
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
- // Lock error messages go unfortunately on stderr and are unreachible this way.
+ // Lock error messages go unfortunately on stderr and are unreachable this way.
ifstream ifs(tmpf.toFilesystemEncoding().c_str());
string line;
while (ifs) {
"\n\nContinue?"), file);
int ret = frontend::Alert::prompt(_("Changes detected"),
text, 0, 1, _("&Yes"), _("&No"), _("View &Log ..."));
- if (ret == 2 ) {
+ if (ret == 2) {
dispatch(FuncRequest(LFUN_DIALOG_SHOW, "file " + tmpf.absFileName()));
ret = frontend::Alert::prompt(_("Changes detected"),
text, 0, 1, _("&Yes"), _("&No"));
hideDialogs("file", 0);
}
- if (ret == 1 )
+ if (ret == 1)
return string();
}
return string();
frontend::Alert::warning(_("SVN File Locking"),
- (locking ? _("Locking property unset.") : _("Locking property set.")) + "\n"
+ (locking ? _("Locking property unset.") : _("Locking property set.")) + '\n'
+ _("Do not forget to commit the locking property into the repository."),
true);
return rev_date_cache_;
case LyXVC::Time:
return rev_time_cache_;
- default: ;
-
+ default:
+ break;
}
return string();
}
string revname = convert<string>(rev);
- TempFile tempfile("lyxvcrev_" + revname + "_");
+ TempFile tempfile("lyxvcrev_" + revname + '_');
tempfile.setAutoRemove(false);
FileName tmpf = tempfile.name();
if (tmpf.empty()) {
return false;
}
- doVCCommand("svn cat -r " + revname + " "
+ doVCCommand("svn cat -r " + revname + ' '
+ quoteName(onlyFileName(owner_->absFileName()))
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
+ tmpf.refresh();
if (tmpf.isFileEmpty())
return false;
quoteName(fname) + " > " +
quoteName(tmpf.toFilesystemEncoding()),
file.onlyPath());
+ tmpf.refresh();
bool found = !tmpf.isFileEmpty();
LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled"));
return found ? file : FileName();
while (ifs) {
getline(ifs, line);
LYXERR(Debug::LYXVC, line << "\n");
- if (!line.empty())
+ if (!line.empty())
status += line + "; ";
if (prefixIs(line, "C ") || prefixIs(line, "CU ")
|| contains(line, "Commit failed")) {
return rev_date_cache_;
case LyXVC::Time:
return rev_time_cache_;
- default: ;
-
+ default:
+ break;
}
return string();
else
pointer = revis;
- pointer += ":";
+ pointer += ':';
- TempFile tempfile("lyxvcrev_" + revis + "_");
+ TempFile tempfile("lyxvcrev_" + revis + '_');
tempfile.setAutoRemove(false);
FileName tmpf = tempfile.name();
if (tmpf.empty()) {
+ quoteName(onlyFileName(owner_->absFileName()))
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
+ tmpf.refresh();
if (tmpf.isFileEmpty())
return false;
bool GIT::toggleReadOnlyEnabled()
{
- return false;
+ return true;
}