#include "support/lstrings.h"
#include "support/PathChanger.h"
#include "support/Systemcall.h"
-#include "support/regex.h"
+#include "support/TempFile.h"
#include <fstream>
+#include <iomanip>
+#include <regex>
+#include <sstream>
using namespace std;
using namespace lyx::support;
-
namespace lyx {
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);
}
if (owner_)
owner_->setBusy(false);
- if (ret && reportError)
+ if (ret && reportError) {
+ docstring rcsmsg;
+ if (prefixIs(cmd, "ci "))
+ rcsmsg = "\n" + _("Check whether the GNU RCS package is installed on your system.");
frontend::Alert::error(_("Revision control error."),
- bformat(_("Some problem occured while running the command:\n"
- "'%1$s'."),
+ bformat(_("Some problem occurred while running the command:\n"
+ "'%1$s'.") + rcsmsg,
from_utf8(cmd)));
+ }
return ret;
}
bool VCS::makeRCSRevision(string const &version, string &revis) const
{
string rev = revis;
-
+
if (isStrInt(rev)) {
int back = convert<int>(rev);
// 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);
}
}
}
-bool VCS::checkparentdirs(FileName const & file, std::string const & pathname)
+FileName VCS::checkParentDirs(FileName const & start, std::string const & file)
{
- FileName dirname = file.onlyPath();
- FileName tocheck = FileName(addName(dirname.absFileName(),pathname));
- LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
- bool result = tocheck.exists();
- while ( !result && !dirname.empty() ) {
- //this construct because of #8295
+ FileName dirname = start.onlyPath();
+ do {
+ FileName tocheck = FileName(addPathName(dirname.absFileName(), file));
+ LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
+ if (tocheck.exists())
+ return tocheck;
+ // this construct because of #8295
dirname = FileName(dirname.absFileName()).parentPath();
- LYXERR(Debug::LYXVC, "check directory: " << dirname.absFileName());
- tocheck = FileName(addName(dirname.absFileName(),pathname));
- result = tocheck.exists();
- }
- return result;
+ } while (!dirname.empty());
+ return FileName();
}
-
+
/////////////////////////////////////////////////////////////////////
//
// RCS
RCS::RCS(FileName const & m, Buffer * b) : VCS(b)
{
+ // Here we know that the buffer file is either already in RCS or
+ // about to be registered
master_ = m;
scanMaster();
}
{
LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file);
// The caller ensures that file does not exist, so no need to check that.
- return doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()),
- FileName()) == 0;
+ int const ret = doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()));
+ return ret == 0;
}
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;
// get locker here
if (contains(token, ';')) {
locker_ = "Unlocked";
- vcstatus = UNLOCKED;
+ vcstatus_ = UNLOCKED;
continue;
}
string tmpt;
// s2 is user, and s1 is version
if (s1 == version_) {
locker_ = s2;
- vcstatus = LOCKED;
+ vcstatus_ = LOCKED;
break;
}
} while (!contains(tmpt, ';'));
if (ret)
return LyXVC::ErrorCommand;
log = "RCS: Proceeded";
- return LyXVC::Success;
+ return LyXVC::VCSuccess;
}
bool RCS::checkInEnabled()
{
- return owner_ && !owner_->isReadonly();
+ return owner_ && !owner_->hasReadonlyFlag();
}
// if (getDiff(file, diff) && diff.empty())
// return false;
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return true;
FileName(owner_->filePath()));
docstring diff = tmpf.fileContents("UTF-8");
- tmpf.removeFile();
if (diff.empty())
return false;
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();
}
// This got broken somewhere along lfuns dispatch reorganization.
// reloadBuffer would be needed after this, but thats problematic
// since we are inside Buffer::dispatch.
- // return return status() != UNVERSIONED;
+ // return true;
return false;
}
return rev_date_cache_;
case LyXVC::Time:
return rev_time_cache_;
- default: ;
+ default:
+ break;
}
return string();
bool RCS::getRevisionInfo()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return false;
if (!VCS::makeRCSRevision(version_, rev))
return false;
- FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_");
+ TempFile tempfile("lyxvcrev_" + rev + '_');
+ tempfile.setAutoRemove(false);
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
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;
CVS::CVS(FileName const & m, Buffer * b) : VCS(b)
{
+ // Here we know that the buffer file is either already in CVS or
+ // about to be registered
master_ = m;
have_rev_info_ = false;
scanMaster();
{
// First we look for the CVS/Entries in the same dir
// where we have file.
+ // Note that it is not necessary to search parent directories, since
+ // there will be a CVS/Entries file in every subdirectory.
FileName const entries(onlyPath(file.absFileName()) + "/CVS/Entries");
string const tmpf = '/' + onlyFileName(file.absFileName()) + '/';
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under cvs in `" << entries
LYXERR(Debug::LYXVC, "LyXVC::CVS: scanMaster. \n Checking: " << master_);
// Ok now we do the real scan...
ifstream ifs(master_.toFilesystemEncoding().c_str());
- string name = onlyFileName(owner_->absFileName());
- string tmpf = '/' + name + '/';
+ string const name = onlyFileName(owner_->absFileName());
+ string const tmpf = '/' + name + '/';
LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\'');
string line;
static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
- vcstatus = UNVERSIONED;
while (getline(ifs, line)) {
LYXERR(Debug::LYXVC, "\t line: " << line);
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
//sm[5]; // tag or tagdate
FileName file(owner_->absFileName());
if (file.isReadableFile()) {
- time_t mod = file.lastModified();
- string mod_date = rtrim(asctime(gmtime(&mod)), "\n");
+ time_t const mod = file.lastModified();
+ string const mod_date = rtrim(asctime(gmtime(&mod)), "\n");
LYXERR(Debug::LYXVC, "Date in Entries: `" << file_date
<< "'\nModification date of file: `" << mod_date << '\'');
if (file.isReadOnly()) {
// readonly checkout is unlocked
- vcstatus = UNLOCKED;
+ vcstatus_ = UNLOCKED;
} else {
FileName bdir(addPath(master_.onlyPath().absFileName(),"Base"));
FileName base(addName(bdir.absFileName(),name));
// if base version is existent "cvs edit" was used to lock
- vcstatus = base.isReadableFile() ? LOCKED : NOLOCKING;
+ vcstatus_ = base.isReadableFile() ? LOCKED : NOLOCKING;
}
} else {
- vcstatus = NOLOCKING;
+ vcstatus_ = NOLOCKING;
}
break;
}
case StatusError:
return _("Cannot retrieve CVS status");
}
- return 0;
+ return docstring();
}
CVS::CvsStatus CVS::getStatus()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return StatusError;
if (doVCCommandCallWithOutput("cvs status " + getTarget(File),
FileName(owner_->filePath()), tmpf)) {
- tmpf.removeFile();
return StatusError;
}
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;
status = NeedsCheckout;
}
}
- tmpf.removeFile();
return status;
}
if (have_rev_info_)
return;
have_rev_info_ = true;
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
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) {
- tmpf.removeFile();
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);
- //sm[0]; // whole matched string
- rev_date_cache_ = sm[1];
- rev_time_cache_ = sm[2];
- //sm[3]; // GMT offset
- rev_author_cache_ = sm[4];
+ if (regex_match(line, sm, reg)) {
+ //sm[0]; // whole matched string
+ rev_date_cache_ = sm[1];
+ rev_time_cache_ = sm[2];
+ //sm[3]; // GMT offset
+ rev_author_cache_ = sm[4];
+ } else
+ LYXERR(Debug::LYXVC, "\tCannot parse line. Skipping.");
break;
}
}
- tmpf.removeFile();
if (rev_author_cache_.empty())
LYXERR(Debug::LYXVC,
"Could not retrieve revision info for " << version_ <<
int CVS::edit()
{
- vcstatus = LOCKED;
+ vcstatus_ = LOCKED;
return doVCCommand("cvs -q edit " + getTarget(File),
FileName(owner_->filePath()));
}
int CVS::unedit()
{
- vcstatus = UNLOCKED;
+ vcstatus_ = UNLOCKED;
return doVCCommand("cvs -q unedit " + getTarget(File),
FileName(owner_->filePath()));
}
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 ")) {
CvsStatus status = getStatus();
switch (status) {
case UpToDate:
- if (vcstatus != NOLOCKING)
+ if (vcstatus_ != NOLOCKING)
if (unedit())
return LyXVC::ErrorCommand;
log = "CVS: Proceeded";
- return LyXVC::Success;
+ return LyXVC::VCSuccess;
case LocallyModified:
case LocallyAdded: {
int rc = doVCCommand("cvs -q commit -m \"" + msg + "\" "
if (rc)
return LyXVC::ErrorCommand;
log = "CVS: Proceeded";
- return LyXVC::Success;
+ return LyXVC::VCSuccess;
}
case NeedsMerge:
case NeedsCheckout:
bool CVS::checkInEnabled()
{
- if (vcstatus != NOLOCKING)
+ if (vcstatus_ != NOLOCKING)
return isLocked();
else
return true;
string CVS::checkOut()
{
- if (vcstatus != NOLOCKING && edit())
+ if (vcstatus_ != NOLOCKING && edit())
return string();
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
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;
}
-
- tmpf.removeFile();
+
return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
}
bool CVS::checkOutEnabled()
{
- if (vcstatus != NOLOCKING)
+ if (vcstatus_ != NOLOCKING)
return !isLocked();
else
return true;
string CVS::repoUpdate()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
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);
+ hideDialogs("file", nullptr);
}
- if (ret == 1 ) {
- tmpf.removeFile();
+ if (ret == 1)
return string();
- }
}
int rc = update(Directory, tmpf);
file, from_local8bit(sres)));
rc = 0;
}
-
- tmpf.removeFile();
return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
}
CvsStatus status = getStatus();
switch (status) {
case UpToDate:
- if (vcstatus != NOLOCKING)
+ if (vcstatus_ != NOLOCKING)
return 0 == unedit();
break;
case NeedsMerge:
return rev_date_cache_;
case LyXVC::Time:
return rev_time_cache_;
- default: ;
+ default:
+ break;
}
}
return string();
if (!VCS::makeRCSRevision(version_, rev))
return false;
- FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_");
+ TempFile tempfile("lyxvcrev_" + rev + '_');
+ tempfile.setAutoRemove(false);
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
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;
//
/////////////////////////////////////////////////////////////////////
-SVN::SVN(FileName const & m, Buffer * b) : VCS(b)
+SVN::SVN(Buffer * b) : VCS(b)
{
- master_ = m;
- locked_mode_ = 0;
+ // Here we know that the buffer file is either already in SVN or
+ // about to be registered
+ locked_mode_ = false;
scanMaster();
}
-FileName const SVN::findFile(FileName const & file)
+bool SVN::findFile(FileName const & file)
{
// First we check the existence of repository meta data.
- if (!VCS::checkparentdirs(file, ".svn")) {
+ if (VCS::checkParentDirs(file, ".svn").empty()) {
LYXERR(Debug::LYXVC, "Cannot find SVN meta data for " << file);
- return FileName();
+ return false;
}
// Now we check the status of the file.
- FileName tmpf = FileName::tempName("lyxvcout");
- if (tmpf.empty()) {
- LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return FileName();
- }
-
string const fname = onlyFileName(file.absFileName());
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under svn control for `" << fname << '\'');
- bool found = 0 == doVCCommandCall("svn info " + quoteName(fname)
- + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ bool found = 0 == doVCCommandCall("svn info " + quoteName(fname),
file.onlyPath());
- tmpf.removeFile();
LYXERR(Debug::LYXVC, "SVN control: " << (found ? "enabled" : "disabled"));
- return found ? file : FileName();
+ return found;
}
void SVN::scanMaster()
{
- // vcstatus code other than UNVERSIONED is somewhat superflous,
+ // vcstatus code is somewhat superflous,
// until we want to implement read-only toggle for svn.
- FileName f = findFile(owner_->fileName());
- if (f.empty()) {
- vcstatus = UNVERSIONED;
- } else {
- vcstatus = NOLOCKING;
- if (checkLockMode()) {
- if (isLocked())
- vcstatus = LOCKED;
- else
- vcstatus = UNLOCKED;
- }
- }
+ vcstatus_ = NOLOCKING;
+ if (checkLockMode())
+ vcstatus_ = isLocked() ? LOCKED : UNLOCKED;
}
bool SVN::checkLockMode()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()){
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return false;
void SVN::registrer(string const & /*msg*/)
{
- doVCCommand("svn add -q " + quoteName(onlyFileName(owner_->absFileName())),
+ doVCCommand("svn add -q --parents " + quoteName(onlyFileName(owner_->absFileName())),
FileName(owner_->filePath()));
}
f.push_back(owner_->fileName());
f.push_back(newFile);
string log;
- if (checkIn(f, msg, log) != LyXVC::Success) {
+ if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
cmd = "svn revert -q " +
quoteName(onlyFileName(owner_->absFileName())) + ' ' +
quoteName(relFile);
return string();
vector<support::FileName> f(1, newFile);
string log;
- if (checkIn(f, msg, log) == LyXVC::Success)
+ if (checkIn(f, msg, log) == LyXVC::VCSuccess)
return log;
return string();
}
LyXVC::CommandResult
SVN::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()){
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
log = N_("Error: Could not generate logfile.");
os << " > " << quoteName(tmpf.toFilesystemEncoding());
LyXVC::CommandResult ret =
doVCCommand(os.str(), FileName(owner_->filePath())) ?
- LyXVC::ErrorCommand : LyXVC::Success;
+ LyXVC::ErrorCommand : LyXVC::VCSuccess;
string res = scanLogFile(tmpf, log);
if (!res.empty()) {
if (!fileLock(false, tmpf, log))
ret = LyXVC::ErrorCommand;
- tmpf.removeFile();
if (!log.empty())
log.insert(0, "SVN: ");
- if (ret == LyXVC::Success && log.empty())
+ if (ret == LyXVC::VCSuccess && log.empty())
log = "SVN: Proceeded";
return ret;
}
{
// FIXME one day common getDiff and perhaps OpMode for all backends
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return true;
FileName(owner_->filePath()));
docstring diff = tmpf.fileContents("UTF-8");
- tmpf.removeFile();
if (diff.empty())
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) {
string SVN::checkOut()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return N_("Error: Could not generate logfile.");
fileLock(true, tmpf, log);
- tmpf.removeFile();
return log.empty() ? string() : "SVN: " + log;
}
string SVN::repoUpdate()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return N_("Error: Could not generate logfile.");
"\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);
+ hideDialogs("file", nullptr);
}
- if (ret == 1 ) {
- tmpf.removeFile();
+ if (ret == 1)
return string();
- }
}
// Reverting looks too harsh, see bug #6255.
res += "Update log:\n" + tmpf.fileContents("UTF-8");
LYXERR(Debug::LYXVC, res);
- tmpf.removeFile();
return to_utf8(res);
}
string SVN::lockingToggle()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return N_("Error: Could not generate logfile.");
if (ret)
return string();
- tmpf.removeFile();
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();
bool SVN::getFileRevisionInfo()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return false;
}
ifs.close();
- tmpf.removeFile();
return !rev.empty();
}
bool SVN::getTreeRevisionInfo()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return false;
string line;
getline(ifs, line);
ifs.close();
- tmpf.removeFile();
rev_tree_cache_ = line;
return !line.empty();
}
string revname = convert<string>(rev);
- FileName tmpf = FileName::tempName("lyxvcrev_" + revname + "_");
+ TempFile tempfile("lyxvcrev_" + revname + '_');
+ tempfile.setAutoRemove(false);
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
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;
//
/////////////////////////////////////////////////////////////////////
-GIT::GIT(FileName const & m, Buffer * b) : VCS(b)
+GIT::GIT(Buffer * b) : VCS(b)
{
- master_ = m;
+ // Here we know that the buffer file is either already in GIT or
+ // about to be registered
scanMaster();
}
-FileName const GIT::findFile(FileName const & file)
+bool GIT::findFile(FileName const & file)
{
// First we check the existence of repository meta data.
- if (!VCS::checkparentdirs(file, ".git")) {
+ if (VCS::checkParentDirs(file, ".git").empty()) {
LYXERR(Debug::LYXVC, "Cannot find GIT meta data for " << file);
- return FileName();
+ return false;
}
// Now we check the status of the file.
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return FileName();
+ return false;
}
- // --porcelain selects a format that is supposed to be stable across
- // git versions
string const fname = onlyFileName(file.absFileName());
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under git control for `"
<< fname << '\'');
- bool found = 0 == doVCCommandCall("git status --porcelain " +
- quoteName(fname) + " > " +
- quoteName(tmpf.toFilesystemEncoding()),
+ doVCCommandCall("git ls-files " +
+ quoteName(fname) + " > " +
+ quoteName(tmpf.toFilesystemEncoding()),
file.onlyPath());
- if (found)
- {
- // The output contains a line starting with "??" for unknown
- // files, no line for known unmodified files and a line
- // starting with "M" or something else for modified/deleted
- // etc. files.
- ifstream ifs(tmpf.toFilesystemEncoding().c_str());
- string test;
- if ((ifs >> test))
- found = (test != "??");
- // else is no error
- }
- tmpf.removeFile();
+ tmpf.refresh();
+ bool found = !tmpf.isFileEmpty();
LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled"));
- return found ? file : FileName();
+ return found;
}
void GIT::scanMaster()
{
- // vcstatus code other than UNVERSIONED is somewhat superflous,
+ // vcstatus code is somewhat superflous,
// until we want to implement read-only toggle for git.
- FileName f = findFile(owner_->fileName());
- if (f.empty())
- vcstatus = UNVERSIONED;
- else
- vcstatus = NOLOCKING;
+ vcstatus_ = NOLOCKING;
}
f.push_back(owner_->fileName());
f.push_back(newFile);
string log;
- if (checkIn(f, msg, log) != LyXVC::Success) {
+ if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
cmd = "git checkout -q " +
quoteName(onlyFileName(owner_->absFileName())) + ' ' +
quoteName(relFile);
LyXVC::CommandResult
GIT::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()){
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
log = N_("Error: Could not generate logfile.");
os << " > " << quoteName(tmpf.toFilesystemEncoding());
LyXVC::CommandResult ret =
doVCCommand(os.str(), FileName(owner_->filePath())) ?
- LyXVC::ErrorCommand : LyXVC::Success;
+ LyXVC::ErrorCommand : LyXVC::VCSuccess;
string res = scanLogFile(tmpf, log);
if (!res.empty()) {
ret = LyXVC::ErrorCommand;
}
- tmpf.removeFile();
if (!log.empty())
log.insert(0, "GIT: ");
- if (ret == LyXVC::Success && log.empty())
+ if (ret == LyXVC::VCSuccess && log.empty())
log = "GIT: Proceeded";
return ret;
}
{
// FIXME one day common getDiff and perhaps OpMode for all backends
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return true;
FileName(owner_->filePath()));
docstring diff = tmpf.fileContents("UTF-8");
- tmpf.removeFile();
if (diff.empty())
return false;
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")) {
// fill the rest of the attributes for a single file
if (rev_file_cache_.empty())
- if (!getFileRevisionInfo())
+ if (!getFileRevisionInfo()) {
rev_file_cache_ = "?";
+ rev_file_abbrev_cache_ = "?";
+ }
switch (info) {
case LyXVC::File:
if (rev_file_cache_ == "?")
return string();
return rev_file_cache_;
+ case LyXVC::FileAbbrev:
+ if (rev_file_abbrev_cache_ == "?")
+ return string();
+ return rev_file_abbrev_cache_;
case LyXVC::Author:
return rev_author_cache_;
case LyXVC::Date:
return rev_date_cache_;
case LyXVC::Time:
return rev_time_cache_;
- default: ;
-
+ default:
+ break;
}
return string();
bool GIT::getFileRevisionInfo()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return false;
}
- doVCCommand("git log -n 1 --pretty=format:%H%n%an%n%ai " + quoteName(onlyFileName(owner_->absFileName()))
+ doVCCommand("git log -n 1 --pretty=format:%H%n%h%n%an%n%ai " + quoteName(onlyFileName(owner_->absFileName()))
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
if (ifs)
getline(ifs, rev_file_cache_);
+ if (ifs)
+ getline(ifs, rev_file_abbrev_cache_);
if (ifs)
getline(ifs, rev_author_cache_);
if (ifs) {
}
ifs.close();
- tmpf.removeFile();
return !rev_file_cache_.empty();
}
bool GIT::getTreeRevisionInfo()
{
- FileName tmpf = FileName::tempName("lyxvcout");
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return false;
}
- doVCCommand("git log -n 1 --pretty=format:%H . > " + quoteName(tmpf.toFilesystemEncoding()),
- FileName(owner_->filePath()));
+ doVCCommand("git describe --abbrev --dirty --long > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()),
+ false); //git describe returns $?=128 when no tag found (but git repo still exists)
if (tmpf.empty())
return false;
ifstream ifs(tmpf.toFilesystemEncoding().c_str());
getline(ifs, rev_tree_cache_);
ifs.close();
- tmpf.removeFile();
return !rev_tree_cache_.empty();
}
else
pointer = revis;
- pointer += ":";
+ pointer += ':';
- if (rev <= 0)
- if (!getFileRevisionInfo())
- return false;
-
- FileName tmpf = FileName::tempName("lyxvcrev_" + revis + "_");
+ TempFile tempfile("lyxvcrev_" + revis + '_');
+ tempfile.setAutoRemove(false);
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return false;
+ quoteName(onlyFileName(owner_->absFileName()))
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
+ tmpf.refresh();
if (tmpf.isFileEmpty())
return false;
bool GIT::toggleReadOnlyEnabled()
{
- return false;
+ return true;
}
projects / lyx.git / blobdiff