+2001-08-19 Lars Gullik Bjønnes <larsbj@birdstep.com>
+
+ * vc-backend.h (RCS::versionString): add RCS to version
+ (CVS::versionString): add CVS to version
+
+ * vc-backend.C (scanMaster): do not add CVS to version.
+ (scanMaster): do not add RCS to version
+
+ * lyxvc.C (versionString): new method
+
+ * lyxfunc.C (initMiniBuffer): use LyXVC::versionString
+
2001-08-18 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Spacing.C (set): initialize fval
}
-string const & LyXVC::version() const
+//string const & LyXVC::version() const
+//{
+// return vcs->version();
+//}
+
+string const LyXVC::versionString() const
{
- return vcs->version();
+ return vcs->versionString();
}
bool inUse();
/// Returns the version number.
- string const & version() const;
+ //string const & version() const;
+ /// Returns the version number.
+ string const versionString() const;
/// Returns the userid of the person who has locked the doc.
string const & locker() const;
vcstatus = UNLOCKED;
continue;
}
- string tmpt, s1, s2;
+ string tmpt;
+ string s1;
+ string s2;
do {
ifs >> tmpt;
s1 = strip(tmpt, ';');
<< endl;
}
}
- version_ = "RCS: " + version_;
}
LRegex::SubMatches const & sm = reg.exec(line);
//sm[0]; // whole matched string
//sm[1]; // filename
- version_ = "CVS: ";
- version_ += LSubstring(line, sm[2].first,
+ version_ = LSubstring(line, sm[2].first,
sm[2].second);
string file_date = LSubstring(line, sm[3].first,
sm[3].second);
///
virtual void getLog(string const &) = 0;
///
- string const & version() const { return version_; }
+ virtual string const versionString() const = 0;
+ ///
+ string const & version() const {
+ return version_;
+ }
///
string const & locker() const { return locker_; }
///
virtual void undoLast();
///
virtual void getLog(string const &);
+ ///
+ virtual string const versionString() const {
+ return "RCS: " + version_;
+ }
};
virtual void undoLast();
///
virtual void getLog(string const &);
+ ///
+ virtual string const versionString() const {
+ return "CVS: " + version_;
+ }
private:
string file_;
};