Commit Graph

121 Commits

Author SHA1 Message Date
Pavel Sanda
f7d47a803d git typo 2013-02-17 23:30:07 -08:00
Pavel Sanda
8ef1e2b9df Git VCS: use describe for tree revision info. 2013-02-17 23:22:50 -08:00
Pavel Sanda
6ba3e8d408 Leftover from SVN. 2013-02-09 19:50:06 -08:00
Pavel Sanda
75090250d4 Add very simple revision comparison for git.
At this moment we do not allow comparison between arbitrary hashes,
but except GUI the code is ready.
Thanks to the powerful way of git addressing we could even ask
for comparisons like '-2 weeks back' if someone wants to play
with GuiCompareHistory.
2013-02-09 19:35:22 -08:00
Georg Baum
22b7ad2b0a Implement revision info for git 2013-02-08 21:02:37 +01:00
Georg Baum
2f9ef2b98a Implement very basic git support
Only the local index is considered, no remote repo. Also getting the revision
(aka commit hash) is missing. How push and pull could be integrated with the
LyX VCS interface needs to be discussed, but the implemented functionality was
quite straight forward.
2013-02-06 22:07:31 +01:00
Georg Baum
0526eb9d47 Implement VCS copy and rename
The advantage of having this in LyX is the intelligent file name handling
of included files. Implementation as discussed on the list, but ensure also
that an attempt to use locked files fails.
2013-02-06 20:38:54 +01:00
Georg Baum
067fbe49cd Correctly delete temp files
FileName::erase() only clears the file name, if you want to delete the file
you need to call FileName::removeFile().
2013-02-06 20:38:54 +01:00
Jean-Marc Lasgouttes
14e01a92a4 Rename Path.h to PathChanger.h (actual name of the class) 2013-02-06 11:51:06 +01:00
Georg Baum
d33450a592 Fix inconsistent VCS checkin return values
It is not possible to transport the different error/abort/success conditions
of a VCS checkin through a simple empty or nonempty string. Therefore it was
no wonder that the return values were used inconsistently for different VCS.
Now the log and return status are decoupled, and all VCS are handled
consistently. This is a prerequisite for proper locking detection of the
upcoming rename command.
2013-02-04 22:01:59 +01:00
Georg Baum
e82cc5d498 Fix typos 2013-02-03 19:55:44 +01:00
Georg Baum
9d99d3dbea Implement extractFromVC() for CVS and SVN.
Both cvs and svn are able to retrieve non-existing files from repository,
but this was only implemented for rcs. This is a prerequisite for the
planned move and copy VCV operations. I also improved error schecking and
used extractFromVC() also for files specified on the command line if they
do not exist (in GUI mode, it was already the case in non-GUI mode).
2012-11-15 22:01:19 +01:00
Georg Baum
56e3d2153f Get rid of redundant CVS/SVN file_ member
It did always point to the buffer's file name, so it is not needed and it was
not used in most cases anyway. Instead, ensure that owner_ is always set and
cannot be changed later.
2012-11-13 21:44:36 +01:00
Lars Gullik Bjønnes
6b2232a29c src/*.cpp: reformatting to increase consistency 2012-10-28 17:42:07 +01:00
Pavel Sanda
f4fe5a8fa0 Another attempt at #8295.
This bug occur only at certain Qt versions and systems and we do
not really understand what is going on.

Quoting Stephan - the parent path of "." e.g. never should be ".".
The inconsistency between the name of FileName and the internal QFileInfo
state looks very dangerous.
2012-08-16 20:33:43 +02:00
Stephan Witt
2ecc895775 ensure VCS::checkparentdirs() starts with an absolute path (ticket #8295) 2012-08-16 13:47:27 +02:00
Stephan Witt
4f1fb3f6d1 add debug messages to VCS::checkparentdirs (ticket #8295) 2012-08-15 17:50:24 +02:00
Stephan Witt
8be18455fd #7855 subversion 1.7.x support: use svn info to check if a file is under version control; this works for 1.6.x too; to avoid excessive forks of child processes check for the existence of a .svn directory in current dir and parent directories
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40911 a592a061-630c-0410-9148-cb99ea01b6c8
2012-03-11 11:12:12 +00:00
Pavel Sanda
d958d89b35 VCS: RCS implementation for date and author insetinfo was missing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39231 a592a061-630c-0410-9148-cb99ea01b6c8
2011-07-02 13:08:36 +00:00
Pavel Sanda
c5220d3945 VCS: copy-paste error, these functions return bool.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39228 a592a061-630c-0410-9148-cb99ea01b6c8
2011-07-02 11:43:51 +00:00
Enrico Forestieri
1717ef203c Introduce the possibility of setting a prefix for the TEXINPUTS environment
variable. This is done in the preferences, much like as the PATH prefix.
A single '.' in the paths will get replaced with the current document dir
and also non-absolute paths will be prefixed with that dir.

The default semantics of TEXINPUTS apply, such that, for example, if a
path is terminated with a double slash, all subdirectories will be also
searched by both the TeX engine and ancillary programs such as dvi
previewers or dvips. As an example, if the prefix is set to ".:figs", the
TEXINPUTS variable will be set as ".:<docdir>:<docdir>/figs:$ORIGTEXINPUTS",
where <docdir> is the document directory.

The initial '.' is necessary to address the actual current dir (this will
be the temp dir at preview time), while if TEXINPUTS was initially unset,
such that $ORIGTEXINPUTS is empty, a colon (or semicolon on Windows) will
end the path list. This is very important, because we don't want to replace
the system directories but to complement them and, in order to do that, an
empty element has to be present in the list. Indeed, according to the
TEXINPUTS semantics, an empty element means the standard search path.
This works whether TEXINPUTS is originally set or not, because if the
original TEXINPUTS starts with a colon (meaning that the standard search
path is wanted there) we will have an empty element at that point,
otherwise the final colon will simply serve as a path separator.

Of course, on Windows a ';' has to be used as a path separator. LyX will
take care of transforming the platform path list into one understandable
by the TeX engine. For example, this will be the case for a Cygwin version
of LyX using a native Windows TeX engine or viceversa. I tested all of
this and it works for me.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38681 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 23:25:51 +00:00
Pavel Sanda
d4fb2ac2ac Stephan, I changed this string since the previous version was strange.
If you have better version, improve it ;)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36611 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-30 00:23:34 +00:00
Stephan Witt
2c7a7e72c2 implementation for "Compare with older revision" for CVS, correct return value of SVN::prepareFileRevision for failure to create tmp file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36161 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 12:18:09 +00:00
Stephan Witt
ba00acbd65 check for user cancel or errors on vcs revert before reload of buffer in LFUN_VC_REVERT
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36160 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 11:54:08 +00:00
Pavel Sanda
c9332413e5 Quickfix closing #6396.
sleep sleep


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36154 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 02:38:35 +00:00
Pavel Sanda
69520456e0 Fix RCS part of #6396. Btw revert is slightly broken now...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36153 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 02:21:04 +00:00
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