X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FVCBackend.cpp;h=ca603c9e1f8ed89c1c3ea9cd35ed045815485c41;hb=fd5adacef25eb40f813dedd961920c353448213a;hp=a6ce1c36f9554c816473fe596a5a45fdb6341138;hpb=2f9ef2b98a6170d4c890ce3325ddc3ad9105bbad;p=features.git diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index a6ce1c36f9..ca603c9e1f 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -26,15 +26,17 @@ #include "support/lstrings.h" #include "support/PathChanger.h" #include "support/Systemcall.h" -#include "support/regex.h" +#include "support/TempFile.h" #include +#include +#include +#include using namespace std; using namespace lyx::support; - namespace lyx { @@ -43,7 +45,7 @@ int VCS::doVCCommandCall(string const & cmd, FileName const & path) 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); } @@ -56,11 +58,15 @@ int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError 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; } @@ -68,14 +74,14 @@ int VCS::doVCCommand(string const & cmd, FileName const & path, bool reportError bool VCS::makeRCSRevision(string const &version, string &revis) const { string rev = revis; - + if (isStrInt(rev)) { int back = convert(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; @@ -83,14 +89,14 @@ bool VCS::makeRCSRevision(string const &version, string &revis) const // 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(cur) + back; if (want <= 0) return false; - - rev = base + "." + convert(want); + + rev = base + '.' + convert(want); } } @@ -99,23 +105,21 @@ bool VCS::makeRCSRevision(string const &version, string &revis) const } -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 @@ -124,6 +128,8 @@ bool VCS::checkparentdirs(FileName const & file, std::string const & pathname) 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(); } @@ -155,8 +161,8 @@ bool RCS::retrieve(FileName const & file) { 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; } @@ -168,6 +174,8 @@ void RCS::scanMaster() 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; @@ -193,7 +201,7 @@ void RCS::scanMaster() // get locker here if (contains(token, ';')) { locker_ = "Unlocked"; - vcstatus = UNLOCKED; + vcstatus_ = UNLOCKED; continue; } string tmpt; @@ -207,7 +215,7 @@ void RCS::scanMaster() // s2 is user, and s1 is version if (s1 == version_) { locker_ = s2; - vcstatus = LOCKED; + vcstatus_ = LOCKED; break; } } while (!contains(tmpt, ';')); @@ -276,13 +284,13 @@ LyXVC::CommandResult RCS::checkIn(string const & msg, string & log) 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(); } @@ -293,7 +301,8 @@ bool RCS::isCheckInWithConfirmation() // 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; @@ -304,7 +313,6 @@ bool RCS::isCheckInWithConfirmation() FileName(owner_->filePath())); docstring diff = tmpf.fileContents("UTF-8"); - tmpf.removeFile(); if (diff.empty()) return false; @@ -324,7 +332,7 @@ string RCS::checkOut() bool RCS::checkOutEnabled() { - return owner_ && owner_->isReadonly(); + return owner_ && owner_->hasReadonlyFlag(); } @@ -359,7 +367,7 @@ bool RCS::lockingToggleEnabled() bool RCS::revert() { - if (doVCCommand("co -f -u" + version_ + " " + if (doVCCommand("co -f -u" + version_ + ' ' + quoteName(onlyFileName(owner_->absFileName())), FileName(owner_->filePath()))) return false; @@ -379,7 +387,7 @@ bool RCS::isRevertWithConfirmation() void RCS::undoLast() { LYXERR(Debug::LYXVC, "LyXVC: undoLast"); - doVCCommand("rcs -o" + version_ + " " + doVCCommand("rcs -o" + version_ + ' ' + quoteName(onlyFileName(owner_->absFileName())), FileName(owner_->filePath())); } @@ -387,7 +395,7 @@ void RCS::undoLast() bool RCS::undoLastEnabled() { - return true; + return owner_->hasReadonlyFlag(); } @@ -404,7 +412,7 @@ bool RCS::toggleReadOnlyEnabled() // 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; } @@ -425,7 +433,8 @@ string RCS::revisionInfo(LyXVC::RevisionInfo const info) return rev_date_cache_; case LyXVC::Time: return rev_time_cache_; - default: ; + default: + break; } return string(); @@ -434,7 +443,8 @@ string RCS::revisionInfo(LyXVC::RevisionInfo const info) 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; @@ -481,16 +491,19 @@ bool RCS::prepareFileRevision(string const &revis, string & f) 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; @@ -513,6 +526,8 @@ bool RCS::prepareFileRevisionEnabled() 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(); @@ -523,6 +538,8 @@ FileName const CVS::findFile(FileName const & 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 @@ -548,19 +565,20 @@ void CVS::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(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 @@ -571,21 +589,21 @@ void CVS::scanMaster() //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; } @@ -634,7 +652,7 @@ docstring CVS::toString(CvsStatus status) const case StatusError: return _("Cannot retrieve CVS status"); } - return 0; + return docstring(); } @@ -657,7 +675,8 @@ int CVS::doVCCommandCallWithOutput(std::string const & cmd, 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; @@ -665,7 +684,6 @@ CVS::CvsStatus CVS::getStatus() if (doVCCommandCallWithOutput("cvs status " + getTarget(File), FileName(owner_->filePath()), tmpf)) { - tmpf.removeFile(); return StatusError; } @@ -675,7 +693,7 @@ CVS::CvsStatus CVS::getStatus() 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; @@ -689,7 +707,6 @@ CVS::CvsStatus CVS::getStatus() status = NeedsCheckout; } } - tmpf.removeFile(); return status; } @@ -698,40 +715,41 @@ void CVS::getRevisionInfo() 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_ << @@ -795,7 +813,7 @@ void CVS::getDiff(OperationMode opmode, FileName const & tmpf) int CVS::edit() { - vcstatus = LOCKED; + vcstatus_ = LOCKED; return doVCCommand("cvs -q edit " + getTarget(File), FileName(owner_->filePath())); } @@ -803,7 +821,7 @@ int CVS::edit() int CVS::unedit() { - vcstatus = UNLOCKED; + vcstatus_ = UNLOCKED; return doVCCommand("cvs -q unedit " + getTarget(File), FileName(owner_->filePath())); } @@ -824,7 +842,7 @@ string CVS::scanLogFile(FileName const & f, string & status) 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 ")) { @@ -842,11 +860,11 @@ LyXVC::CommandResult CVS::checkIn(string const & msg, string & log) 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 + "\" " @@ -855,7 +873,7 @@ LyXVC::CommandResult CVS::checkIn(string const & msg, string & log) if (rc) return LyXVC::ErrorCommand; log = "CVS: Proceeded"; - return LyXVC::Success; + return LyXVC::VCSuccess; } case NeedsMerge: case NeedsCheckout: @@ -884,7 +902,7 @@ bool CVS::isLocked() const bool CVS::checkInEnabled() { - if (vcstatus != NOLOCKING) + if (vcstatus_ != NOLOCKING) return isLocked(); else return true; @@ -900,14 +918,15 @@ bool CVS::isCheckInWithConfirmation() 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); @@ -919,15 +938,14 @@ string CVS::checkOut() 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; @@ -936,12 +954,13 @@ bool CVS::checkOutEnabled() 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()) { @@ -953,16 +972,14 @@ string CVS::repoUpdate() "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); @@ -980,8 +997,6 @@ string CVS::repoUpdate() file, from_local8bit(sres))); rc = 0; } - - tmpf.removeFile(); return rc ? string() : log.empty() ? "CVS: Proceeded" : "CVS: " + log; } @@ -1020,7 +1035,7 @@ bool CVS::revert() CvsStatus status = getStatus(); switch (status) { case UpToDate: - if (vcstatus != NOLOCKING) + if (vcstatus_ != NOLOCKING) return 0 == unedit(); break; case NeedsMerge: @@ -1095,7 +1110,8 @@ string CVS::revisionInfo(LyXVC::RevisionInfo const info) return rev_date_cache_; case LyXVC::Time: return rev_time_cache_; - default: ; + default: + break; } } return string(); @@ -1108,15 +1124,18 @@ bool CVS::prepareFileRevision(string const & revis, string & f) 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; @@ -1137,62 +1156,47 @@ bool CVS::prepareFileRevisionEnabled() // ///////////////////////////////////////////////////////////////////// -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; @@ -1241,7 +1245,7 @@ bool SVN::retrieve(FileName const & file) 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())); } @@ -1274,7 +1278,7 @@ string SVN::rename(support::FileName const & newFile, string const & msg) 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); @@ -1306,7 +1310,7 @@ string SVN::copy(support::FileName const & newFile, string const & msg) return string(); vector f(1, newFile); string log; - if (checkIn(f, msg, log) == LyXVC::Success) + if (checkIn(f, msg, log) == LyXVC::VCSuccess) return log; return string(); } @@ -1322,7 +1326,8 @@ LyXVC::CommandResult SVN::checkIn(string const & msg, string & log) LyXVC::CommandResult SVN::checkIn(vector 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."); @@ -1336,7 +1341,7 @@ SVN::checkIn(vector const & f, string const & msg, string & l 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()) { @@ -1350,10 +1355,9 @@ SVN::checkIn(vector const & f, string const & msg, string & l 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; } @@ -1372,7 +1376,8 @@ bool SVN::isCheckInWithConfirmation() { // 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; @@ -1383,7 +1388,6 @@ bool SVN::isCheckInWithConfirmation() FileName(owner_->filePath())); docstring diff = tmpf.fileContents("UTF-8"); - tmpf.removeFile(); if (diff.empty()) return false; @@ -1402,8 +1406,8 @@ string SVN::scanLogFile(FileName const & f, string & status) 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")) { @@ -1430,7 +1434,7 @@ bool SVN::fileLock(bool lock, FileName const & tmpf, string &status) + " > " + 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) { @@ -1458,7 +1462,8 @@ bool SVN::fileLock(bool lock, FileName const & tmpf, string &status) 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."); @@ -1479,7 +1484,6 @@ string SVN::checkOut() fileLock(true, tmpf, log); - tmpf.removeFile(); return log.empty() ? string() : "SVN: " + log; } @@ -1495,7 +1499,8 @@ bool SVN::checkOutEnabled() 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."); @@ -1515,16 +1520,14 @@ string SVN::repoUpdate() "\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. @@ -1538,7 +1541,6 @@ string SVN::repoUpdate() res += "Update log:\n" + tmpf.fileContents("UTF-8"); LYXERR(Debug::LYXVC, res); - tmpf.removeFile(); return to_utf8(res); } @@ -1551,7 +1553,8 @@ bool SVN::repoUpdateEnabled() 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."); @@ -1579,9 +1582,8 @@ string SVN::lockingToggle() 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); @@ -1660,8 +1662,8 @@ string SVN::revisionInfo(LyXVC::RevisionInfo const info) return rev_date_cache_; case LyXVC::Time: return rev_time_cache_; - default: ; - + default: + break; } return string(); @@ -1670,7 +1672,8 @@ string SVN::revisionInfo(LyXVC::RevisionInfo const info) 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; @@ -1716,14 +1719,14 @@ bool SVN::getFileRevisionInfo() } 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; @@ -1740,7 +1743,6 @@ bool SVN::getTreeRevisionInfo() string line; getline(ifs, line); ifs.close(); - tmpf.removeFile(); rev_tree_cache_ = line; return !line.empty(); @@ -1774,16 +1776,19 @@ bool SVN::prepareFileRevision(string const & revis, string & f) } string revname = convert(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; @@ -1811,64 +1816,49 @@ bool SVN::toggleReadOnlyEnabled() // ///////////////////////////////////////////////////////////////////// -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; } @@ -1916,7 +1906,7 @@ string GIT::rename(support::FileName const & newFile, string const & msg) 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); @@ -1952,7 +1942,8 @@ LyXVC::CommandResult GIT::checkIn(string const & msg, string & log) LyXVC::CommandResult GIT::checkIn(vector 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."); @@ -1966,7 +1957,7 @@ GIT::checkIn(vector const & f, string const & msg, string & l 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()) { @@ -1977,10 +1968,9 @@ GIT::checkIn(vector const & f, string const & msg, string & l 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; } @@ -1996,7 +1986,8 @@ bool GIT::isCheckInWithConfirmation() { // 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; @@ -2007,7 +1998,6 @@ bool GIT::isCheckInWithConfirmation() FileName(owner_->filePath())); docstring diff = tmpf.fileContents("UTF-8"); - tmpf.removeFile(); if (diff.empty()) return false; @@ -2027,7 +2017,7 @@ string GIT::scanLogFile(FileName const & f, string & status) 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")) { @@ -2112,12 +2102,108 @@ bool GIT::undoLastEnabled() } -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_ = "?"; + 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: + 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%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_file_abbrev_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())) @@ -2126,21 +2212,59 @@ void GIT::getLog(FileName const & tmpf) } -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(revis); + + // revision and filename + string pointer; + + // go back for "minus" revisions + if (rev <= 0) + pointer = "HEAD~" + convert(-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 false; + return true; } bool GIT::toggleReadOnlyEnabled() { - return false; + return true; }