#include "VCBackend.h"
#include "Buffer.h"
+#include "DispatchResult.h"
#include "LyX.h"
#include "FuncRequest.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Systemcall.h"
#include "support/regex.h"
+#include "support/TempFile.h"
#include <fstream>
+#include <iomanip>
+#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, 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" + _("Perhaps the RCS package is not 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;
+ }
+ if (back == 0)
+ rev = version;
+ // we care about the last number from revision string
+ // in case of backward indexing
+ if (back < 0) {
+ string cur, 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);
+ }
+ }
+
+ revis = rev;
+ return true;
+}
+
+
+bool VCS::checkparentdirs(FileName const & file, std::string const & vcsdir)
+{
+ FileName dirname = file.onlyPath();
+ do {
+ FileName tocheck = FileName(addName(dirname.absFileName(), vcsdir));
+ LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
+ if (tocheck.exists())
+ return true;
+ //this construct because of #8295
+ dirname = FileName(dirname.absFileName()).parentPath();
+ } while (!dirname.empty());
+ return false;
+}
+
+
/////////////////////////////////////////////////////////////////////
//
// RCS
//
/////////////////////////////////////////////////////////////////////
-RCS::RCS(FileName const & m)
+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();
}
}
-void RCS::retrieve(FileName const & file)
+bool RCS::retrieve(FileName const & file)
{
LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file);
- doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()),
- FileName());
+ // The caller ensures that file does not exist, so no need to check that.
+ return doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()),
+ FileName()) == 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;
}
-string RCS::checkIn(string const & msg)
+bool RCS::renameEnabled()
+{
+ return false;
+}
+
+
+string RCS::rename(support::FileName const & /*newFile*/, string const & /*msg*/)
+{
+ // not implemented, since a left-over file.lyx,v would be confusing.
+ return string();
+}
+
+
+bool RCS::copyEnabled()
+{
+ return true;
+}
+
+
+string RCS::copy(support::FileName const & newFile, string const & msg)
+{
+ // RCS has no real copy command, so we create a poor mans version
+ support::FileName const oldFile(owner_->absFileName());
+ if (!oldFile.copyTo(newFile))
+ return string();
+ FileName path(oldFile.onlyPath());
+ string relFile(to_utf8(newFile.relPath(path.absFileName())));
+ string cmd = "ci -q -u -i -t-\"";
+ cmd += msg;
+ cmd += "\" ";
+ cmd += quoteName(relFile);
+ return doVCCommand(cmd, path) ? string() : "RCS: Proceeded";
+}
+
+
+LyXVC::CommandResult RCS::checkIn(string const & msg, string & log)
{
int ret = doVCCommand("ci -q -u -m\"" + msg + "\" "
+ quoteName(onlyFileName(owner_->absFileName())),
FileName(owner_->filePath()));
- return ret ? string() : "RCS: Proceeded";
+ if (ret)
+ return LyXVC::ErrorCommand;
+ log = "RCS: Proceeded";
+ 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.erase();
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();
}
return false;
}
+
string RCS::revisionInfo(LyXVC::RevisionInfo const info)
{
if (info == LyXVC::File)
return version_;
+ // fill the rest of the attributes for a single file
+ if (rev_date_cache_.empty())
+ if (!getRevisionInfo())
+ return string();
+
+ switch (info) {
+ case LyXVC::Author:
+ return rev_author_cache_;
+ case LyXVC::Date:
+ return rev_date_cache_;
+ case LyXVC::Time:
+ return rev_time_cache_;
+ default:
+ break;
+ }
+
return string();
}
-bool RCS::prepareFileRevision(string const &revis, string & f)
+bool RCS::getRevisionInfo()
{
- string rev = revis;
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
+ if (tmpf.empty()) {
+ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return false;
+ }
+ doVCCommand("rlog -r " + quoteName(onlyFileName(owner_->absFileName()))
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()));
- 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;
- }
- if (back == 0)
- rev = version_;
- // we care about the last number from revision string
- // in case of backward indexing
- if (back < 0) {
- string cur, base;
- cur = rsplit(version_, base , '.' );
- if (!isStrInt(cur))
- return false;
- int want = convert<int>(cur) + back;
- if (want <= 0)
- return false;
+ if (tmpf.empty())
+ return false;
+
+ ifstream ifs(tmpf.toFilesystemEncoding().c_str());
+ string line;
+
+ // we reached to the entry, i.e. after initial log message
+ bool entry=false;
+ // line with critical info, e.g:
+ //"date: 2011/07/02 11:02:54; author: sanda; state: Exp; lines: +17 -2"
+ string result;
- rev = base + "." + convert<string>(want);
+ while (ifs) {
+ getline(ifs, line);
+ LYXERR(Debug::LYXVC, line);
+ if (entry && prefixIs(line, "date:")) {
+ result = line;
+ break;
}
+ if (prefixIs(line, "revision"))
+ entry = true;
}
+ if (result.empty())
+ return false;
+
+ rev_date_cache_ = token(result, ' ', 1);
+ rev_time_cache_ = rtrim(token(result, ' ', 2), ";");
+ rev_author_cache_ = trim(token(token(result, ';', 1), ':', 1));
+
+ return !rev_author_cache_.empty();
+}
- FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_");
+bool RCS::prepareFileRevision(string const &revis, string & f)
+{
+ string rev = revis;
+ if (!VCS::makeRCSRevision(version_, rev))
+ return false;
+
+ TempFile tempfile("lyxvcrev_" + rev + '_');
+ tempfile.setAutoRemove(false);
+ FileName tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return N_("Error: Could not generate logfile.");
+ 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, FileName const & f)
+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;
- file_ = f;
have_rev_info_ = false;
scanMaster();
}
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(file_.absFileName());
+ string name = onlyFileName(owner_->absFileName());
string tmpf = '/' + name + '/';
LYXERR(Debug::LYXVC, "\tlooking for `" << tmpf << '\'');
string 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[4]; // options
//sm[5]; // tag or tagdate
- if (file_.isReadableFile()) {
- time_t mod = file_.lastModified();
+ FileName file(owner_->absFileName());
+ if (file.isReadableFile()) {
+ time_t mod = file.lastModified();
string mod_date = rtrim(asctime(gmtime(&mod)), "\n");
LYXERR(Debug::LYXVC, "Date in Entries: `" << file_date
<< "'\nModification date of file: `" << mod_date << '\'');
- if (file_.isReadOnly()) {
+ if (file.isReadOnly()) {
// readonly checkout is unlocked
vcstatus = UNLOCKED;
} else {
}
+bool CVS::retrieve(FileName const & file)
+{
+ LYXERR(Debug::LYXVC, "LyXVC::CVS: retrieve.\n\t" << file);
+ // The caller ensures that file does not exist, so no need to check that.
+ return doVCCommandCall("cvs -q update " + quoteName(file.toFilesystemEncoding()),
+ file.onlyPath()) == 0;
+}
+
+
string const CVS::getTarget(OperationMode opmode) const
{
switch(opmode) {
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);
break;
}
}
- tmpf.removeFile();
if (rev_author_cache_.empty())
LYXERR(Debug::LYXVC,
"Could not retrieve revision info for " << version_ <<
}
+bool CVS::renameEnabled()
+{
+ return true;
+}
+
+
+string CVS::rename(support::FileName const & newFile, string const & msg)
+{
+ // CVS has no real rename command, so we create a poor mans version
+ support::FileName const oldFile(owner_->absFileName());
+ string ret = copy(newFile, msg);
+ if (ret.empty())
+ return ret;
+ string cmd = "cvs -q remove -m \"" + msg + "\" " +
+ quoteName(oldFile.onlyFileName());
+ FileName path(oldFile.onlyPath());
+ return doVCCommand(cmd, path) ? string() : ret;
+}
+
+
+bool CVS::copyEnabled()
+{
+ return true;
+}
+
+
+string CVS::copy(support::FileName const & newFile, string const & msg)
+{
+ // CVS has no real copy command, so we create a poor mans version
+ support::FileName const oldFile(owner_->absFileName());
+ if (!oldFile.copyTo(newFile))
+ return string();
+ FileName path(oldFile.onlyPath());
+ string relFile(to_utf8(newFile.relPath(path.absFileName())));
+ string cmd("cvs -q add -m \"" + msg + "\" " + quoteName(relFile));
+ return doVCCommand(cmd, path) ? string() : "CVS: Proceeded";
+}
+
+
void CVS::getDiff(OperationMode opmode, FileName const & tmpf)
{
doVCCommandWithOutput("cvs diff " + getTarget(opmode),
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 ")) {
ifs.close();
return string();
}
-
-
-string CVS::checkIn(string const & msg)
+
+
+LyXVC::CommandResult CVS::checkIn(string const & msg, string & log)
{
CvsStatus status = getStatus();
switch (status) {
case UpToDate:
if (vcstatus != NOLOCKING)
- unedit();
- return "CVS: Proceeded";
+ if (unedit())
+ return LyXVC::ErrorCommand;
+ log = "CVS: Proceeded";
+ return LyXVC::VCSuccess;
case LocallyModified:
case LocallyAdded: {
int rc = doVCCommand("cvs -q commit -m \"" + msg + "\" "
+ getTarget(File),
FileName(owner_->filePath()));
- return rc ? string() : "CVS: Proceeded";
+ if (rc)
+ return LyXVC::ErrorCommand;
+ log = "CVS: Proceeded";
+ return LyXVC::VCSuccess;
}
case NeedsMerge:
case NeedsCheckout:
toString(status)));
break;
}
- return string();
+ return LyXVC::ErrorBefore;
}
{
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.erase();
+
return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log;
}
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()) {
docstring const file = from_utf8(owner_->filePath());
docstring text = bformat(_("There were detected changes "
"in the working directory:\n%1$s\n\n"
- "In case of file conflict you have to resolve them "
- "manually or revert to repository version later."), file);
+ "Possible file conflicts must be then resolved manually "
+ "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 ) {
- 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;
}
return rev_date_cache_;
case LyXVC::Time:
return rev_time_cache_;
- default: ;
+ default:
+ break;
}
}
return string();
}
-bool CVS::prepareFileRevision(string const &, string &)
+bool CVS::prepareFileRevision(string const & revis, string & f)
{
- return false;
+ string rev = revis;
+ if (!VCS::makeRCSRevision(version_, rev))
+ return false;
+
+ 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 + ' '
+ + getTarget(File),
+ FileName(owner_->filePath()), tmpf);
+ tmpf.refresh();
+ if (tmpf.isFileEmpty())
+ return false;
+
+ f = tmpf.absFileName();
+ return true;
}
bool CVS::prepareFileRevisionEnabled()
{
- return false;
+ return true;
}
//
/////////////////////////////////////////////////////////////////////
-SVN::SVN(FileName const & m, FileName const & f)
+SVN::SVN(FileName const & m, Buffer * b) : VCS(b)
{
- owner_ = 0;
+ // Here we know that the buffer file is either already in SVN or
+ // about to be registered
master_ = m;
- file_ = f;
locked_mode_ = 0;
scanMaster();
}
FileName const SVN::findFile(FileName const & file)
{
- // First we look for the .svn/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 SVN dir. Parse the .svn/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;
- }
+ // First we check the existence of repository meta data.
+ if (!VCS::checkparentdirs(file, ".svn")) {
+ LYXERR(Debug::LYXVC, "Cannot find SVN meta data for " << file);
+ return FileName();
}
- return FileName();
+
+ // Now we check the status of the file.
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
+ 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()),
+ file.onlyPath());
+ LYXERR(Debug::LYXVC, "SVN control: " << (found ? "enabled" : "disabled"));
+ return found ? file : FileName();
}
void SVN::scanMaster()
{
- // vcstatus code is somewhat superflous, until we want
- // to implement read-only toggle for svn.
+ // vcstatus code is somewhat superflous,
+ // until we want to implement read-only toggle for svn.
vcstatus = NOLOCKING;
if (checkLockMode()) {
- if (isLocked()) {
+ if (isLocked())
vcstatus = LOCKED;
- } else {
+ else
vcstatus = 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 N_("Error: Could not generate logfile.");
+ return false;
}
LYXERR(Debug::LYXVC, "Detecting locking mode...");
- if (doVCCommandCall("svn proplist " + quoteName(file_.onlyFileName())
+ if (doVCCommandCall("svn proplist " + quoteName(onlyFileName(owner_->absFileName()))
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
- file_.onlyPath()))
+ FileName(owner_->filePath())))
return false;
ifstream ifs(tmpf.toFilesystemEncoding().c_str());
string line;
bool ret = false;
- while (ifs) {
+ while (ifs && !ret) {
getline(ifs, line);
LYXERR(Debug::LYXVC, line);
if (contains(line, "svn:needs-lock"))
bool SVN::isLocked() const
{
- file_.refresh();
- return !file_.isReadOnly();
+ FileName file(owner_->absFileName());
+ file.refresh();
+ return !file.isReadOnly();
+}
+
+
+bool SVN::retrieve(FileName const & file)
+{
+ LYXERR(Debug::LYXVC, "LyXVC::SVN: retrieve.\n\t" << file);
+ // The caller ensures that file does not exist, so no need to check that.
+ return doVCCommandCall("svn update -q --non-interactive " + quoteName(file.onlyFileName()),
+ file.onlyPath()) == 0;
}
}
-string SVN::checkIn(string const & msg)
+bool SVN::renameEnabled()
+{
+ return true;
+}
+
+
+string SVN::rename(support::FileName const & newFile, string const & msg)
+{
+ // svn move does not require a log message, since it does not commit.
+ // In LyX we commit immediately afterwards, otherwise it could be
+ // confusing to the user to have two uncommitted files.
+ FileName path(owner_->filePath());
+ string relFile(to_utf8(newFile.relPath(path.absFileName())));
+ string cmd("svn move -q " + quoteName(onlyFileName(owner_->absFileName())) +
+ ' ' + quoteName(relFile));
+ if (doVCCommand(cmd, path)) {
+ cmd = "svn revert -q " +
+ quoteName(onlyFileName(owner_->absFileName())) + ' ' +
+ quoteName(relFile);
+ doVCCommand(cmd, path);
+ if (newFile.exists())
+ newFile.removeFile();
+ return string();
+ }
+ vector<support::FileName> f;
+ f.push_back(owner_->fileName());
+ f.push_back(newFile);
+ string log;
+ if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
+ cmd = "svn revert -q " +
+ quoteName(onlyFileName(owner_->absFileName())) + ' ' +
+ quoteName(relFile);
+ doVCCommand(cmd, path);
+ if (newFile.exists())
+ newFile.removeFile();
+ return string();
+ }
+ return log;
+}
+
+
+bool SVN::copyEnabled()
+{
+ return true;
+}
+
+
+string SVN::copy(support::FileName const & newFile, string const & msg)
+{
+ // svn copy does not require a log message, since it does not commit.
+ // In LyX we commit immediately afterwards, otherwise it could be
+ // confusing to the user to have an uncommitted file.
+ FileName path(owner_->filePath());
+ string relFile(to_utf8(newFile.relPath(path.absFileName())));
+ string cmd("svn copy -q " + quoteName(onlyFileName(owner_->absFileName())) +
+ ' ' + quoteName(relFile));
+ if (doVCCommand(cmd, path))
+ return string();
+ vector<support::FileName> f(1, newFile);
+ string log;
+ if (checkIn(f, msg, log) == LyXVC::VCSuccess)
+ return log;
+ return string();
+}
+
+
+LyXVC::CommandResult SVN::checkIn(string const & msg, string & log)
+{
+ vector<support::FileName> f(1, owner_->fileName());
+ return checkIn(f, msg, log);
+}
+
+
+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);
- return N_("Error: Could not generate logfile.");
+ log = N_("Error: Could not generate logfile.");
+ return LyXVC::ErrorBefore;
}
- doVCCommand("svn commit -m \"" + msg + "\" "
- + quoteName(onlyFileName(owner_->absFileName()))
- + " > " + quoteName(tmpf.toFilesystemEncoding()),
- FileName(owner_->filePath()));
+ ostringstream os;
+ os << "svn commit -m \"" << msg << '"';
+ for (size_t i = 0; i < f.size(); ++i)
+ os << ' ' << quoteName(f[i].onlyFileName());
+ os << " > " << quoteName(tmpf.toFilesystemEncoding());
+ LyXVC::CommandResult ret =
+ doVCCommand(os.str(), FileName(owner_->filePath())) ?
+ LyXVC::ErrorCommand : LyXVC::VCSuccess;
- string log;
string res = scanLogFile(tmpf, log);
- if (!res.empty())
+ if (!res.empty()) {
frontend::Alert::error(_("Revision control error."),
_("Error when committing to repository.\n"
"You have to manually resolve the problem.\n"
"LyX will reopen the document after you press OK."));
+ ret = LyXVC::ErrorCommand;
+ }
else
- fileLock(false, tmpf, log);
+ if (!fileLock(false, tmpf, log))
+ ret = LyXVC::ErrorCommand;
- tmpf.erase();
- return log.empty() ? string() : "SVN: " + log;
+ if (!log.empty())
+ log.insert(0, "SVN: ");
+ 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.erase();
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")) {
}
-void SVN::fileLock(bool lock, FileName const & tmpf, string &status)
+bool SVN::fileLock(bool lock, FileName const & tmpf, string &status)
{
if (!locked_mode_ || (isLocked() == lock))
- return;
+ return true;
string const arg = lock ? "lock " : "unlock ";
doVCCommand("svn "+ arg + quoteName(onlyFileName(owner_->absFileName()))
+ " > " + 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) {
}
ifs.close();
- if (!isLocked() && lock)
+ if (isLocked() == lock)
+ return true;
+
+ if (lock)
frontend::Alert::error(_("Revision control error."),
_("Error while acquiring write lock.\n"
"Another user is most probably editing\n"
"the current document now!\n"
"Also check the access to the repository."));
- if (isLocked() && !lock)
+ else
frontend::Alert::error(_("Revision control error."),
_("Error while releasing write lock.\n"
"Check the access to the repository."));
+ return false;
}
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.erase();
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);
}
- if (ret == 1 ) {
- tmpf.erase();
+ 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.erase();
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.erase();
- frontend::Alert::warning(_("VCN File Locking"),
- (locking ? _("Locking property unset.") : _("Locking property set.")) + "\n"
+ frontend::Alert::warning(_("SVN File Locking"),
+ (locking ? _("Locking property unset.") : _("Locking property set.")) + '\n'
+ _("Do not forget to commit the locking property into the repository."),
true);
- return string("SVN: ") + N_("Locking property set.");
+ return string("SVN: ") + (locking ?
+ N_("Locking property unset.") : N_("Locking property set."));
}
string SVN::revisionInfo(LyXVC::RevisionInfo const info)
{
if (info == LyXVC::Tree) {
- if (rev_tree_cache_.empty())
- if (!getTreeRevisionInfo())
- rev_tree_cache_ = "?";
- if (rev_tree_cache_ == "?")
- return string();
+ if (rev_tree_cache_.empty())
+ if (!getTreeRevisionInfo())
+ rev_tree_cache_ = "?";
+ if (rev_tree_cache_ == "?")
+ return string();
- return rev_tree_cache_;
+ return rev_tree_cache_;
}
// fill the rest of the attributes for a single file
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 N_("Error: Could not generate logfile.");
+ return false;
}
doVCCommand("svn info --xml " + quoteName(onlyFileName(owner_->absFileName()))
}
ifs.close();
- tmpf.erase();
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 N_("Error: Could not generate logfile.");
+ return false;
}
doVCCommand("svnversion -n . > " + quoteName(tmpf.toFilesystemEncoding()),
string line;
getline(ifs, line);
ifs.close();
- tmpf.erase();
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 N_("Error: Could not generate logfile.");
+ 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::GIT(FileName const & m, Buffer * b) : VCS(b)
+{
+ // Here we know that the buffer file is either already in GIT or
+ // about to be registered
+ master_ = m;
+ scanMaster();
+}
+
+
+FileName const GIT::findFile(FileName const & file)
+{
+ // First we check the existence of repository meta data.
+ if (!VCS::checkparentdirs(file, ".git")) {
+ LYXERR(Debug::LYXVC, "Cannot find GIT meta data for " << file);
+ return FileName();
+ }
+
+ // Now we check the status of the file.
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
+ 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 git control for `"
+ << fname << '\'');
+ doVCCommandCall("git ls-files " +
+ 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();
+}
+
+
+void GIT::scanMaster()
+{
+ // vcstatus code is somewhat superflous,
+ // until we want to implement read-only toggle for git.
+ vcstatus = NOLOCKING;
+}
+
+
+bool GIT::retrieve(FileName const & file)
+{
+ LYXERR(Debug::LYXVC, "LyXVC::GIT: retrieve.\n\t" << file);
+ // The caller ensures that file does not exist, so no need to check that.
+ return doVCCommandCall("git checkout -q " + quoteName(file.onlyFileName()),
+ file.onlyPath()) == 0;
+}
+
+
+void GIT::registrer(string const & /*msg*/)
+{
+ doVCCommand("git add " + quoteName(onlyFileName(owner_->absFileName())),
+ FileName(owner_->filePath()));
+}
+
+
+bool GIT::renameEnabled()
+{
+ return true;
+}
+
+
+string GIT::rename(support::FileName const & newFile, string const & msg)
+{
+ // git mv does not require a log message, since it does not commit.
+ // In LyX we commit immediately afterwards, otherwise it could be
+ // confusing to the user to have two uncommitted files.
+ FileName path(owner_->filePath());
+ string relFile(to_utf8(newFile.relPath(path.absFileName())));
+ string cmd("git mv " + quoteName(onlyFileName(owner_->absFileName())) +
+ ' ' + quoteName(relFile));
+ if (doVCCommand(cmd, path)) {
+ cmd = "git checkout -q " +
+ quoteName(onlyFileName(owner_->absFileName())) + ' ' +
+ quoteName(relFile);
+ doVCCommand(cmd, path);
+ if (newFile.exists())
+ newFile.removeFile();
+ return string();
+ }
+ vector<support::FileName> f;
+ f.push_back(owner_->fileName());
+ f.push_back(newFile);
+ string log;
+ if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
+ cmd = "git checkout -q " +
+ quoteName(onlyFileName(owner_->absFileName())) + ' ' +
+ quoteName(relFile);
+ doVCCommand(cmd, path);
+ if (newFile.exists())
+ newFile.removeFile();
+ return string();
+ }
+ return log;
+}
+
+
+bool GIT::copyEnabled()
+{
+ return false;
+}
+
+
+string GIT::copy(support::FileName const & /*newFile*/, string const & /*msg*/)
+{
+ // git does not support copy with history preservation
+ return string();
+}
+
+
+LyXVC::CommandResult GIT::checkIn(string const & msg, string & log)
+{
+ vector<support::FileName> f(1, owner_->fileName());
+ return checkIn(f, msg, log);
+}
+
+
+LyXVC::CommandResult
+GIT::checkIn(vector<support::FileName> const & f, string const & msg, string & log)
+{
+ 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.");
+ return LyXVC::ErrorBefore;
+ }
+
+ ostringstream os;
+ os << "git commit -m \"" << msg << '"';
+ for (size_t i = 0; i < f.size(); ++i)
+ os << ' ' << quoteName(f[i].onlyFileName());
+ os << " > " << quoteName(tmpf.toFilesystemEncoding());
+ LyXVC::CommandResult ret =
+ doVCCommand(os.str(), FileName(owner_->filePath())) ?
+ LyXVC::ErrorCommand : LyXVC::VCSuccess;
+
+ string res = scanLogFile(tmpf, log);
+ if (!res.empty()) {
+ frontend::Alert::error(_("Revision control error."),
+ _("Error when committing to repository.\n"
+ "You have to manually resolve the problem.\n"
+ "LyX will reopen the document after you press OK."));
+ ret = LyXVC::ErrorCommand;
+ }
+
+ if (!log.empty())
+ log.insert(0, "GIT: ");
+ if (ret == LyXVC::VCSuccess && log.empty())
+ log = "GIT: Proceeded";
+ return ret;
+}
+
+
+bool GIT::checkInEnabled()
+{
+ return true;
+}
+
+
+bool GIT::isCheckInWithConfirmation()
+{
+ // FIXME one day common getDiff and perhaps OpMode for all backends
+
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
+ if (tmpf.empty()) {
+ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return true;
+ }
+
+ doVCCommandCall("git diff " + quoteName(owner_->absFileName())
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()));
+
+ docstring diff = tmpf.fileContents("UTF-8");
+
+ if (diff.empty())
+ return false;
+
+ return true;
+}
+
+
+// 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 GIT::scanLogFile(FileName const & f, string & status)
+{
+ ifstream ifs(f.toFilesystemEncoding().c_str());
+ string line;
+
+ while (ifs) {
+ getline(ifs, line);
+ LYXERR(Debug::LYXVC, line << "\n");
+ if (!line.empty())
+ status += line + "; ";
+ if (prefixIs(line, "C ") || prefixIs(line, "CU ")
+ || contains(line, "Commit failed")) {
+ ifs.close();
+ return line;
+ }
+ }
+ ifs.close();
+ return string();
+}
+
+
+string GIT::checkOut()
+{
+ return string();
+}
+
+
+bool GIT::checkOutEnabled()
+{
+ return false;
+}
+
+
+string GIT::repoUpdate()
+{
+ return string();
+}
+
+
+bool GIT::repoUpdateEnabled()
+{
+ return false;
+}
+
+
+string GIT::lockingToggle()
+{
+ return string();
+}
+
+
+bool GIT::lockingToggleEnabled()
+{
+ return false;
+}
+
+
+bool GIT::revert()
+{
+ // Reverts to the version in GIT repository and
+ // gets the updated version from the repository.
+ string const fil = quoteName(onlyFileName(owner_->absFileName()));
+
+ if (doVCCommand("git checkout -q " + fil,
+ FileName(owner_->filePath())))
+ return false;
+ owner_->markClean();
+ return true;
+}
+
+
+bool GIT::isRevertWithConfirmation()
+{
+ //FIXME owner && diff
+ return true;
+}
+
+
+void GIT::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 GIT::undoLastEnabled()
+{
+ return false;
+}
+
+
+string GIT::revisionInfo(LyXVC::RevisionInfo const info)
+{
+ if (info == LyXVC::Tree) {
+ if (rev_tree_cache_.empty())
+ if (!getTreeRevisionInfo())
+ rev_tree_cache_ = "?";
+ if (rev_tree_cache_ == "?")
+ return string();
+
+ return rev_tree_cache_;
+ }
+
+ // fill the rest of the attributes for a single file
+ if (rev_file_cache_.empty())
+ if (!getFileRevisionInfo())
+ rev_file_cache_ = "?";
+
+ switch (info) {
+ case LyXVC::File:
+ if (rev_file_cache_ == "?")
+ return string();
+ return rev_file_cache_;
+ case LyXVC::Author:
+ return rev_author_cache_;
+ case LyXVC::Date:
+ return rev_date_cache_;
+ case LyXVC::Time:
+ return rev_time_cache_;
+ default:
+ break;
+ }
+
+ return string();
+}
+
+
+bool GIT::getFileRevisionInfo()
+{
+ 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()))
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()));
+
+ if (tmpf.empty())
+ return false;
+
+ ifstream ifs(tmpf.toFilesystemEncoding().c_str());
+
+ if (ifs)
+ getline(ifs, rev_file_cache_);
+ if (ifs)
+ getline(ifs, rev_author_cache_);
+ if (ifs) {
+ string line;
+ getline(ifs, line);
+ rev_time_cache_ = split(line, rev_date_cache_, ' ');
+ }
+
+ ifs.close();
+ return !rev_file_cache_.empty();
+}
+
+
+bool GIT::getTreeRevisionInfo()
+{
+ TempFile tempfile("lyxvcout");
+ FileName tmpf = tempfile.name();
+ if (tmpf.empty()) {
+ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return false;
+ }
+
+ 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;
+
+ // only first line in case something bad happens.
+ ifstream ifs(tmpf.toFilesystemEncoding().c_str());
+ getline(ifs, rev_tree_cache_);
+ ifs.close();
+
+ return !rev_tree_cache_.empty();
+}
+
+
+void GIT::getLog(FileName const & tmpf)
+{
+ doVCCommand("git log " + quoteName(onlyFileName(owner_->absFileName()))
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()));
+}
+
+
+//at this moment we don't accept revision SHA, but just number of revision steps back
+//GUI and infrastucture needs to be changed first
+bool GIT::prepareFileRevision(string const & revis, string & f)
+{
+ // anything positive means we got hash, not "0" or minus revision
+ int rev = 1;
+
+ // hash is rarely number and should be long
+ if (isStrInt(revis) && revis.length()<20)
+ rev = convert<int>(revis);
+
+ // revision and filename
+ string pointer;
+
+ // go back for "minus" revisions
+ if (rev <= 0)
+ pointer = "HEAD~" + convert<string>(-rev);
+ // normal hash
+ else
+ pointer = revis;
+
+ pointer += ':';
+
+ TempFile tempfile("lyxvcrev_" + revis + '_');
+ tempfile.setAutoRemove(false);
+ FileName tmpf = tempfile.name();
+ if (tmpf.empty()) {
+ LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
+ return false;
+ }
+
+ doVCCommand("git show " + pointer + "./"
+ + quoteName(onlyFileName(owner_->absFileName()))
+ + " > " + quoteName(tmpf.toFilesystemEncoding()),
+ FileName(owner_->filePath()));
+ tmpf.refresh();
+ if (tmpf.isFileEmpty())
+ return false;
+
+ f = tmpf.absFileName();
+ return true;
+}
+
+
+bool GIT::prepareFileRevisionEnabled()
+{
+ return true;
+}
+
+
+bool GIT::toggleReadOnlyEnabled()
+{
+ return true;
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff