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;
}
// 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;
}