commit f298072012ada424e0a8c823b0b980db91c058e1
Author: Pavel Sanda <[email protected]>
Date: Tue Mar 9 11:56:34 2021 +0100
Revert 7e5c42593e4.
https://www.mail-archive.com/[email protected]/msg215733.html
Main issue is git log does not return >0 when file does not exists.
Other possible issues to check - cvs might want to connect to server
with cvs log. In large git archives reaching the proper record might take
longer time than ls-files.
---
src/VCBackend.cpp | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index b20a586..3e8fc44 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -536,19 +536,25 @@ CVS::CVS(FileName const & m, Buffer * b) : VCS(b)
FileName const CVS::findFile(FileName const & file)
{
- LYXERR(Debug::LYXVC, "LyXVC: Checking if "
- << onlyFileName(file.absFileName()) << "is under cvs");
- // First we look for the CVS/Entries in the same dir where we have file.
+ // 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
+ << "' for `" << tmpf << '\'');
if (entries.isReadableFile()) {
- // We are in a CVS-managed directory
- // See if the file is known to CVS
- string const cmd = "cvs log " +
quoteName(file.toFilesystemEncoding());
- int const ret = doVCCommandCall(cmd, file.onlyPath());
- if (ret == 0)
- return entries;
+ // 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;
+ while (getline(ifs, line)) {
+ LYXERR(Debug::LYXVC, "\tEntries: " << line);
+ if (contains(line, tmpf))
+ return entries;
+ }
}
return FileName();
}
@@ -1826,13 +1832,23 @@ bool GIT::findFile(FileName const & file)
return false;
}
- // Now we check if the file is known to git.
+ // 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 false;
+ }
+
string const fname = onlyFileName(file.absFileName());
LYXERR(Debug::LYXVC, "LyXVC: Checking if file is under git control for
`"
<< fname << '\'');
- int const ret = doVCCommandCall("git log -n 0 " + quoteName(fname),
+ doVCCommandCall("git ls-files " +
+ quoteName(fname) + " > " +
+ quoteName(tmpf.toFilesystemEncoding()),
file.onlyPath());
- bool const found = (ret == 0);
+ tmpf.refresh();
+ bool found = !tmpf.isFileEmpty();
LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" :
"disabled"));
return found;
}
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
