using lyx::support::OnlyFilename;
using lyx::support::OnlyPath;
using lyx::support::Path;
+using lyx::support::QuoteName;
using lyx::support::rtrim;
using lyx::support::split;
using lyx::support::Systemcall;
void RCS::retrieve(string const & file)
{
lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrieve.\n\t" << file << endl;
- VCS::doVCCommand("co -q -r \""
- + file + '"',
+ VCS::doVCCommand("co -q -r " + QuoteName(file),
string());
}
{
string cmd = "ci -q -u -i -t-\"";
cmd += msg;
- cmd += "\" \"";
- cmd += OnlyFilename(owner_->fileName());
- cmd += '"';
+ cmd += "\" ";
+ cmd += QuoteName(OnlyFilename(owner_->fileName()));
doVCCommand(cmd, owner_->filePath());
}
void RCS::checkIn(string const & msg)
{
- doVCCommand("ci -q -u -m\"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("ci -q -u -m\"" + msg + "\" "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
}
void RCS::checkOut()
{
owner_->markClean();
- doVCCommand("co -q -l \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("co -q -l " + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
}
void RCS::revert()
{
- doVCCommand("co -f -u" + version() + " \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("co -f -u" + version() + " "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
// We ignore changes and just reload!
owner_->markClean();
void RCS::undoLast()
{
lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
- doVCCommand("rcs -o" + version() + " \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("rcs -o" + version() + " "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
}
void RCS::getLog(string const & tmpf)
{
- doVCCommand("rlog \""
- + OnlyFilename(owner_->fileName()) + "\" > "
- + tmpf, owner_->filePath());
+ doVCCommand("rlog " + QuoteName(OnlyFilename(owner_->fileName()))
+ + " > " + tmpf,
+ owner_->filePath());
}
void CVS::registrer(string const & msg)
{
- doVCCommand("cvs -q add -m \"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("cvs -q add -m \"" + msg + "\" "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
}
void CVS::checkIn(string const & msg)
{
- doVCCommand("cvs -q commit -m \"" + msg + "\" \""
- + OnlyFilename(owner_->fileName()) + '"',
+ doVCCommand("cvs -q commit -m \"" + msg + "\" "
+ + QuoteName(OnlyFilename(owner_->fileName())),
owner_->filePath());
}
{
// Reverts to the version in CVS repository and
// gets the updated version from the repository.
- string const fil = OnlyFilename(owner_->fileName());
+ string const fil = QuoteName(OnlyFilename(owner_->fileName()));
- doVCCommand("rm -f \"" + fil + "\"; cvs update \"" + fil + '"',
+ doVCCommand("rm -f " + fil + "; cvs update " + fil,
owner_->filePath());
owner_->markClean();
}
void CVS::getLog(string const & tmpf)
{
- doVCCommand("cvs log \""
- + OnlyFilename(owner_->fileName()) + "\" > " + tmpf,
+ doVCCommand("cvs log " + QuoteName(OnlyFilename(owner_->fileName()))
+ + " > " + tmpf,
owner_->filePath());
}