if (ret && reportError) {
docstring rcsmsg;
if (prefixIs(cmd, "ci "))
- rcsmsg = "\n" + _("Perhaps the RCS package is not installed on your system?");
+ rcsmsg = "\n" + _("Check whether the GNU RCS package is installed on your system.");
frontend::Alert::error(_("Revision control error."),
bformat(_("Some problem occurred while running the command:\n"
"'%1$s'.") + rcsmsg,
FileName VCS::checkParentDirs(FileName const & start, std::string const & file)
{
- static FileName empty;
FileName dirname = start.onlyPath();
do {
FileName tocheck = FileName(addPathName(dirname.absFileName(), file));
// this construct because of #8295
dirname = FileName(dirname.absFileName()).parentPath();
} while (!dirname.empty());
- return empty;
+ return FileName();
}
{
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;
}
//
/////////////////////////////////////////////////////////////////////
-SVN::SVN(FileName const & m, Buffer * b) : VCS(b)
+SVN::SVN(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_ = 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").empty()) {
LYXERR(Debug::LYXVC, "Cannot find SVN meta data for " << file);
- return FileName();
+ return false;
}
// Now we check the status of the file.
bool found = 0 == doVCCommandCall("svn info " + quoteName(fname),
file.onlyPath());
LYXERR(Debug::LYXVC, "SVN control: " << (found ? "enabled" : "disabled"));
- return found ? file : FileName();
+ return found;
}
// vcstatus code is somewhat superflous,
// until we want to implement read-only toggle for svn.
vcstatus_ = NOLOCKING;
- if (checkLockMode()) {
- if (isLocked())
- vcstatus_ = LOCKED;
- else
- vcstatus_ = UNLOCKED;
- }
+ if (checkLockMode())
+ vcstatus_ = isLocked() ? LOCKED : UNLOCKED;
}
//
/////////////////////////////////////////////////////////////////////
-GIT::GIT(FileName const & m, Buffer * b) : VCS(b)
+GIT::GIT(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)
+bool GIT::findFile(FileName const & file)
{
// First we check the existence of repository meta data.
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 = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
- return FileName();
+ return false;
}
string const fname = onlyFileName(file.absFileName());
tmpf.refresh();
bool found = !tmpf.isFileEmpty();
LYXERR(Debug::LYXVC, "GIT control: " << (found ? "enabled" : "disabled"));
- return found ? file : FileName();
+ return found;
}