using namespace lyx::support;
-
namespace lyx {
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
}
-bool VCS::checkparentdirs(FileName const & file, std::string const & pathname)
+bool VCS::checkparentdirs(FileName const & file, std::string const & vcsdir)
{
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() ) {
+ 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();
- LYXERR(Debug::LYXVC, "check directory: " << dirname.absFileName());
- tocheck = FileName(addName(dirname.absFileName(),pathname));
- result = tocheck.exists();
- }
- return result;
+ } while (!dirname.empty());
+ return false;
}
-
+
/////////////////////////////////////////////////////////////////////
//
// 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();
}
if (ret)
return LyXVC::ErrorCommand;
log = "RCS: Proceeded";
- return LyXVC::Success;
+ return LyXVC::VCSuccess;
}
// 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;
}
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();
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)) {
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:
SVN::SVN(FileName const & m, Buffer * b) : VCS(b)
{
+ // Here we know that the buffer file is either already in SVN or
+ // about to be registered
master_ = m;
locked_mode_ = 0;
scanMaster();
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()) {
+ if (isLocked())
+ vcstatus = LOCKED;
+ else
+ vcstatus = UNLOCKED;
}
}
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();
}
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()) {
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;
}
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();
}
return FileName();
}
- // --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
- }
+ bool found = !tmpf.isFileEmpty();
tmpf.removeFile();
LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled"));
return found ? file : FileName();
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);
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()) {
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;
}
}
-string GIT::revisionInfo(LyXVC::RevisionInfo const /*info*/)
+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: ;
+
+ }
+
return string();
}
+bool GIT::getFileRevisionInfo()
+{
+ FileName tmpf = FileName::tempName("lyxvcout");
+ 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();
+ tmpf.removeFile();
+ return !rev_file_cache_.empty();
+}
+
+
+bool GIT::getTreeRevisionInfo()
+{
+ FileName tmpf = FileName::tempName("lyxvcout");
+ 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()));
+
+ 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();
+ tmpf.removeFile();
+
+ return !rev_tree_cache_.empty();
+}
+
+
void GIT::getLog(FileName const & tmpf)
{
doVCCommand("git log " + quoteName(onlyFileName(owner_->absFileName()))
}
-bool GIT::prepareFileRevision(string const & /*revis*/, string & /*f*/)
+//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)
{
- return false;
+ // 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 += ":";
+
+ FileName tmpf = FileName::tempName("lyxvcrev_" + revis + "_");
+ 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()));
+ if (tmpf.isFileEmpty())
+ return false;
+
+ f = tmpf.absFileName();
+ return true;
}
bool GIT::prepareFileRevisionEnabled()
{
- return false;
+ return true;
}
projects / lyx.git / blobdiff