anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed some bugs in the version control handling

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2553 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-08-19 14:06:27 +00:00
parent 03add3957a
commit 35058c638e
5 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ChangeLog
View File

@ -1,3 +1,15 @@
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

9
src/lyxvc.C
View File

@ -200,9 +200,14 @@ bool LyXVC::inUse()
}
string const & LyXVC::version() const
//string const & LyXVC::version() const
//{
// return vcs->version();
//}
string const LyXVC::versionString() const
{
return vcs->version();
return vcs->versionString();
}

4
src/lyxvc.h
View File

@ -82,7 +82,9 @@ public:
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;

8
src/vc-backend.C
View File

@ -112,7 +112,9 @@ void RCS::scanMaster()
vcstatus = UNLOCKED;
continue;
}
string tmpt, s1, s2;
string tmpt;
string s1;
string s2;
do {
ifs >> tmpt;
s1 = strip(tmpt, ';');
@ -136,7 +138,6 @@ void RCS::scanMaster()
<< endl;
}
}
version_ = "RCS: " + version_;
}
@ -245,8 +246,7 @@ void CVS::scanMaster()
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);

14
src/vc-backend.h
View File

@ -39,7 +39,11 @@ public:
///
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_; }
///
@ -96,6 +100,10 @@ public:
virtual void undoLast();
///
virtual void getLog(string const &);
///
virtual string const versionString() const {
return "RCS: " + version_;
}
};
@ -121,6 +129,10 @@ public:
virtual void undoLast();
///
virtual void getLog(string const &);
///
virtual string const versionString() const {
return "CVS: " + version_;
}
private:
string file_;
};