+2002-05-31 John Levon <moz@compsoc.man.ac.uk>
+
+ * lyxvc.C: fix bug 416 (make sure buffer is saved before
+ attempt to register it with a VCS)
+
2002-05-30 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* lyx_main.C (init): honor variables LYX_DIR_13x and
void LyXVC::registrer()
{
+ string const filename = owner_->fileName();
+
+ // there must be a file to save
+ if (!IsFileReadable(filename)) {
+ Alert::alert(_("File not saved"),
+ _("You must save the file"),
+ _("before it can be registered."));
+ return;
+ }
+
// it is very likely here that the vcs is not created yet...
if (!vcs) {
string const cvs_entries = "CVS/Entries";
if (IsFileReadable(cvs_entries)) {
lyxerr[Debug::LYXVC]
<< "LyXVC: registering "
- << MakeDisplayPath(owner_->fileName())
+ << MakeDisplayPath(filename)
<< " with CVS" << endl;
- vcs = new CVS(cvs_entries, owner_->fileName());
+ vcs = new CVS(cvs_entries, filename);
} else {
lyxerr[Debug::LYXVC]
<< "LyXVC: registering "
- << MakeDisplayPath(owner_->fileName())
+ << MakeDisplayPath(filename)
<< " with RCS" << endl;
- vcs = new RCS(owner_->fileName());
+ vcs = new RCS(filename);
}
vcs->owner(owner_);
// If the document is changed, we might want to save it
if (!vcs->owner()->isLyxClean() &&
Alert::askQuestion(_("Changes in document:"),
- MakeDisplayPath(vcs->owner()->fileName(), 50),
+ MakeDisplayPath(filename, 50),
_("Save document and proceed?"))) {
vcs->owner()->getUser()->owner()
->getLyXFunc()->dispatch(LFUN_MENUWRITE);