#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
+#include "support/TempFile.h"
using namespace std;
using namespace lyx::support;
}
-// for the sake of boost::scoped_ptr
-LyXVC::~LyXVC()
-{}
+docstring LyXVC::vcstatus() const
+{
+ if (!vcs)
+ return docstring();
+ if (locking())
+ return bformat(_("%1$s lock"), from_ascii(vcs->vcname()));
+ else
+ return from_ascii(vcs->vcname());
+}
bool LyXVC::fileInVC(FileName const & fn)
return true;
if (!SVN::findFile(fn).empty())
return true;
+ if (!GIT::findFile(fn).empty())
+ return true;
return false;
}
vcs.reset(new SVN(found_file, owner_));
return true;
}
+ // Check if file is under GIT
+ if (!(found_file = GIT::findFile(fn)).empty()) {
+ vcs.reset(new GIT(found_file, owner_));
+ return true;
+ }
// file is not under any VCS.
vcs.reset(0);
bool foundRCS = !RCS::findFile(fn).empty();
bool foundCVS = foundRCS ? false : !CVS::findFile(fn).empty();
bool foundSVN = (foundRCS || foundCVS) ? false : !SVN::findFile(fn).empty();
- if (foundRCS || foundCVS || foundSVN) {
+ bool foundGIT = (foundRCS || foundCVS || foundSVN) ? false : !GIT::findFile(fn).empty();
+ if (foundRCS || foundCVS || foundSVN || foundGIT) {
docstring const file = makeDisplayPath(fn.absFileName(), 20);
docstring const text =
bformat(_("Do you want to retrieve the document"
return RCS::retrieve(fn);
else if (foundCVS)
return CVS::retrieve(fn);
- else
+ else if (foundSVN)
return SVN::retrieve(fn);
+ else
+ return GIT::retrieve(fn);
}
}
return false;
//check in the root directory of the document
FileName const cvs_entries(onlyPath(filename.absFileName()) + "/CVS/Entries");
FileName const svn_entries(onlyPath(filename.absFileName()) + "/.svn/entries");
+ FileName const git_index(onlyPath(filename.absFileName()) + "/.git/index");
+
+ if (git_index.isReadableFile()) {
+ LYXERR(Debug::LYXVC, "LyXVC: registering "
+ << to_utf8(filename.displayName()) << " with GIT");
+ vcs.reset(new GIT(git_index, owner_));
- if (svn_entries.isReadableFile()) {
+ } else if (svn_entries.isReadableFile()) {
LYXERR(Debug::LYXVC, "LyXVC: registering "
<< to_utf8(filename.displayName()) << " with SVN");
- vcs.reset(new SVN(cvs_entries, owner_));
+ vcs.reset(new SVN(svn_entries, owner_));
} else if (cvs_entries.isReadableFile()) {
LYXERR(Debug::LYXVC, "LyXVC: registering "
}
-string LyXVC::checkIn()
+string LyXVC::rename(FileName const & fn)
+{
+ LYXERR(Debug::LYXVC, "LyXVC: rename");
+ if (!vcs || fileInVC(fn))
+ return string();
+ docstring response;
+ bool ok = Alert::askForText(response, _("LyX VC: Log message"),
+ _("(no log message)"));
+ if (!ok) {
+ LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+ return string();
+ }
+ if (response.empty())
+ response = _("(no log message)");
+ string ret = vcs->rename(fn, to_utf8(response));
+ return ret;
+}
+
+
+string LyXVC::copy(FileName const & fn)
+{
+ LYXERR(Debug::LYXVC, "LyXVC: copy");
+ if (!vcs || fileInVC(fn))
+ return string();
+ docstring response;
+ bool ok = Alert::askForText(response, _("LyX VC: Log message"),
+ _("(no log message)"));
+ if (!ok) {
+ LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+ return string();
+ }
+ if (response.empty())
+ response = _("(no log message)");
+ string ret = vcs->copy(fn, to_utf8(response));
+ return ret;
+}
+
+
+LyXVC::CommandResult LyXVC::checkIn(string & log)
{
LYXERR(Debug::LYXVC, "LyXVC: checkIn");
if (!vcs)
- return string();
+ return ErrorBefore;
docstring empty(_("(no log message)"));
docstring response;
- string log;
bool ok = true;
if (vcs->isCheckInWithConfirmation())
ok = Alert::askForText(response, _("LyX VC: Log Message"));
response = empty;
//shell collisions
response = subst(response, from_ascii("\""), from_ascii("\\\""));
- log = vcs->checkIn(to_utf8(response));
-
- // Reserve empty string for cancel button
- if (log.empty())
- log = to_utf8(empty);
+ return vcs->checkIn(to_utf8(response), log);
} else {
LYXERR(Debug::LYXVC, "LyXVC: user cancelled");
+ return Cancelled;
}
- return log;
}
if (!vcs)
return string();
//RCS allows checkOut only in ReadOnly mode
- if (vcs->toggleReadOnlyEnabled() && !owner_->isReadonly())
+ if (vcs->toggleReadOnlyEnabled() && !owner_->hasReadonlyFlag())
return string();
LYXERR(Debug::LYXVC, "LyXVC: checkOut");
}
-void LyXVC::toggleReadOnly()
+string LyXVC::toggleReadOnly()
{
if (!vcs)
- return;
+ return string();
if (!vcs->toggleReadOnlyEnabled())
- return;
+ return string();
switch (vcs->status()) {
case VCS::UNLOCKED:
LYXERR(Debug::LYXVC, "LyXVC: toggle to locked");
- checkOut();
- break;
- case VCS::LOCKED:
+ return checkOut();
+ case VCS::LOCKED: {
LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked");
- checkIn();
- break;
+ string log;
+ if (checkIn(log) != VCSuccess)
+ return string();
+ return log;
+ }
case VCS::NOLOCKING:
- break;
+ Buffer * b = vcs->owner();
+ bool const newstate = !b->hasReadonlyFlag();
+ string result = "LyXVC: toggle to ";
+ result += (newstate ? "readonly" : "readwrite");
+ LYXERR(Debug::LYXVC, result);
+ b->setReadonly(newstate);
+ return result;
}
+ return string();
}
if (!vcs)
return string();
- FileName const tmpf = FileName::tempName("lyxvclog");
+ TempFile tempfile("lyxvclog");
+ tempfile.setAutoRemove(false);
+ FileName const tmpf = tempfile.name();
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return string();
}
+bool LyXVC::renameEnabled() const
+{
+ if (!inUse())
+ return false;
+ return vcs->renameEnabled();
+}
+
+
+bool LyXVC::copyEnabled() const
+{
+ if (!inUse())
+ return false;
+ return vcs->copyEnabled();
+}
+
+
bool LyXVC::checkOutEnabled() const
{
return vcs && vcs->checkOutEnabled();
}
+bool LyXVC::isCheckInWithConfirmation() const
+{
+ return vcs && vcs->isCheckInWithConfirmation();
+}
+
+
bool LyXVC::lockingToggleEnabled() const
{
return vcs && vcs->lockingToggleEnabled();
projects / lyx.git / blobdiff