Commit Graph

95 Commits

Author SHA1 Message Date
Stephan Witt
69dd56d6c4 CVS implementation for buffer-info vcs-author, cvs-date and cvs-time
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36148 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:20:42 +00:00
Pavel Sanda
f5123ccfa8 Add comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36003 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 19:54:08 +00:00
Stephan Witt
85b1bba640 in client server mode CVS does not like full path operand for directory operation; LyX is in the repo dir already, so "." is used as target
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35836 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 17:49:45 +00:00
Stephan Witt
c6d4080694 #6396 no dialog when no doc changes were done and check-in or revert is done
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35828 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 13:27:48 +00:00
Stephan Witt
bcbe6ae960 * implementation of status check and use it for checkIn and revert.
helps the user to avoid errors and leads to more informative messages.
* implementation of diff and use it for the repoUpdate operation.
* add the check for merge conflicts in checkOut.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35813 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-25 05:37:04 +00:00
Stephan Witt
db16795b32 whitespace correction
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35627 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 16:01:06 +00:00
Stephan Witt
034ee290b7 add implementation for CVS::checkOut
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35575 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-08 05:40:16 +00:00
Pavel Sanda
1512439fa4 RCS case is more complicated
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35314 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-07 12:12:31 +00:00
Pavel Sanda
8f457065c5 Better debugging
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35311 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-07 11:29:11 +00:00
Peter Kümmel
615d42d357 TR1: use std::tr1 regex with msvc10
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34725 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-29 17:09:40 +00:00
Pavel Sanda
72a6c77a51 support:
frontends:
onlyFilename -> onlyFileName

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34240 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-21 01:19:28 +00:00
Pavel Sanda
62ca7f3ae5 Proper camel case for FileName.absFilename
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34234 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-21 01:19:09 +00:00
Vincent van Ravesteijn
ab76cb0bc9 Typo and style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33717 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-11 19:40:11 +00:00
Vincent van Ravesteijn
039807ed28 Adjust some messages and constify a variable.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33701 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-10 17:03:53 +00:00
Pavel Sanda
74c70e39cb Support revision fetching also for RCS.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33477 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-15 09:05:24 +00:00
Pavel Sanda
3309cdca59 Allow revision to be string.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33474 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-15 07:10:59 +00:00
Pavel Sanda
7929cad343 We need public API
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33446 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 12:16:34 +00:00
Pavel Sanda
c6f6d20cdb Slowly toward version control + comparison
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33443 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 11:07:28 +00:00
Pavel Sanda
d5f77d6dc2 Forgotten. There should be some oneliner for substituting all these.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33442 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 10:16:00 +00:00
Pavel Sanda
91867cc624 Whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33441 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 09:57:54 +00:00
Pavel Sanda
f26f990076 Kill locker() API in VCS
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33438 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 07:21:11 +00:00
Pavel Sanda
89158dad83 Lets start some cleanup of old version() VCS API
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33436 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 06:30:41 +00:00
Pavel Sanda
c0f9fb76a8 SVN info - add author, date, time
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33435 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 05:52:34 +00:00
Pavel Sanda
773d4a8253 Revision info for RCS too.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33434 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 04:28:10 +00:00
Pavel Sanda
7875d1a9ad Tree revision info into InsetInfo. Muhehe.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33431 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 02:31:58 +00:00
Pavel Sanda
4c5ba07a7a Spots from Abdel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33428 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 01:44:13 +00:00
Pavel Sanda
da0bccb62c White space
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33427 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 01:44:08 +00:00
Pavel Sanda
7b227d6899 VCS: Extended API for revision info
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33425 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 01:43:59 +00:00
Pavel Sanda
22b98a7ca4 SVN file revision number
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33424 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 01:43:55 +00:00
Abdelrazak Younes
377cdd5f6c Transfer LyXfunc code to GuiApplication::dispatch() and getStatus(). Now
a lot of simplification is possible. Except some instability period...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33389 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-09 16:11:13 +00:00
Pavel Sanda
51b38ee015 It seems that svn changes its implicit behaviour across versions.
Both commits are for branch too Juergen.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33023 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-14 01:06:21 +00:00
Pavel Sanda
1ec5b915af Next possibility for svn conflict in log parsing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33021 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-14 01:03:42 +00:00
Richard Heck
5261a21e72 Whitespace and typo fix. (That meant: "After LyX presses OK, it will re-
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32954 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-10 19:40:48 +00:00
Pavel Sanda
9d5750e01b Fix typo spotted by Vincent
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32841 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-07 17:06:48 +00:00
Vincent van Ravesteijn
fc91b00bc8 *VCBackend: Code simplification, constify, and adding an article.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32840 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-07 17:02:02 +00:00
Pavel Sanda
a4231446d2 RCS read-only toggling also doesn't work correctly for a long time.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg156626.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32745 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-03 00:07:22 +00:00
Vincent van Ravesteijn
6891e077d0 SVN: Return an empty string when the log message is empty.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32627 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-23 23:06:07 +00:00
Jürgen Spitzmüller
fa7b247485 indicate that we're opening a dialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32430 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-08 08:37:08 +00:00
Pavel Sanda
01f46c0079 Change string
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32420 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-07 23:27:24 +00:00
Pavel Sanda
061b55c5f4 VCS: do not allow to run VCS stuff in parallel with editation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32335 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-04 13:38:34 +00:00
Pavel Sanda
a5e4aea526 VCS: allow displaying diff log
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32180 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-24 22:17:55 +00:00
Pavel Sanda
9755da5440 Comment on stderr issue.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32079 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-19 08:55:21 +00:00
Pavel Sanda
4257aa5e7f Make updating less dangerous, see comments in #6255.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31615 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-14 19:18:06 +00:00
Jürgen Spitzmüller
1f1c3a3ea8 * VCBackend.cpp: typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31607 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-13 08:39:03 +00:00
Pavel Sanda
9467c8a809 Coding style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31549 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-07 00:11:15 +00:00
Pavel Sanda
4f0957c819 Bug #6255 - Update linked files with version control
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31546 a592a061-630c-0410-9148-cb99ea01b6c8
2009-10-06 23:20:52 +00:00
Pavel Sanda
ee863456a1 Save translators work
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30284 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-28 11:14:27 +00:00
Pavel Sanda
5fdfa59131 Cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30270 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-26 12:40:08 +00:00
Pavel Sanda
7355a53a73 Guify setting of svn locking property
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30255 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-25 14:48:11 +00:00
Jürgen Spitzmüller
44e35d1cd4 * VCBackend.cpp:
- some spelling and grammar fixes (a native EN speaker will have to double-check).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28837 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-17 11:06:28 +00:00