anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-17 02:05:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,781 Commits 31 Branches 172 Tags 630 MiB
b670990bc1
Commit Graph

51 Commits

Author SHA1 Message Date
Yuriy Skalko
cb52dd2e42 Add override in VCBackend 2020-10-12 15:14:55 +02:00
Pavel Sanda
a6634f5bb3 git VCS: add support for short hashes in inset info ("Abbreviated revision"). 
Fixes bug #11620.

Patch from Joel Kulesza.
 2019-07-28 22:01:17 +02:00
Richard Heck
51aebc9327 Fix whitespace at EOL. 2017-07-03 13:46:30 -04:00
Jean-Marc Lasgouttes
82808fea04 Set window title according to platform UI 
The window title is built from the current file name and its
mofidication state. We use our own code instead of the automatic title
bar provided when windowFileName() is set because

1/ Qt does not keep the full path name
2/ Qt does not yield a nice application name

The "read only" and "version control" status are shown in the status bar:

* for read only we use the tab read only emblem (with the right size)
* for version control, we show the name of the backend (using a new
  vcname() method of the backend).

The iconText() of the view is not updated anymore, since this is
deprecated in Qt5.
 2016-09-08 15:59:44 +02:00
Stephan Witt
63e982191e correct whitespace 2016-02-20 06:39:32 +01:00
Georg Baum
699a6db9fa Add some missing member variable initializations 
These were all found by cppcheck. Even in constructors that are there "only
because of std containers" the class should be initialized correctly. You can
never know whether such an object does not get used, and then a nice crash
caused by dereferencing a NULL-pointer is better than undefined behaviour.
 2015-09-13 19:47:21 +02:00
Pavel Sanda
fb16e5cca1 Make parameter more readable. 2013-04-13 21:56:52 -07:00
Georg Baum
ceb2303e2b Remove partial support for non-buffer files in VCS 
This reverts a small part of 0526eb9d and gets rid of the double calls of
SVN::findFile() and GIT::findFile(). Please note that git detection does
currently not work because of 26dd4d0c.
 2013-04-10 22:31:38 +02: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
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
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
b07383b026 improve documentation 2012-11-13 21:53:13 +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
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
04e6076ebb Comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36162 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-11-06 12:32:47 +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
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
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
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
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
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
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
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
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
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
Pavel Sanda
edd6631e25 VCS: constify, thanks Andre 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28314 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-02-01 23:23:01 +00:00
Pavel Sanda
7ff5bd4c54 VCS: adjust internal structure 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28303 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-01-31 18:01:48 +00:00
Pavel Sanda
6c412e9e90 VCS: add svn locking mechanism 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28302 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-01-31 17:10:56 +00:00
André Pönitz
f1cba8ff64 more latin1..utf8 schanges. all of src/* should be utf8 now 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27425 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-11-14 15:58:50 +00:00
Pavel Sanda
aaa4169ece VCS: Towards statusbar info. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25976 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-29 13:14:51 +00:00
Pavel Sanda
e46613d70b When statusbar is not reachable, show at least we _do_ something. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25971 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-29 11:17:20 +00:00
Pavel Sanda
9fdbf7eff5 scanLog for checkout svn in VCS. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25795 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-22 10:16:54 +00:00
Pavel Sanda
f625f3e0dc Implement checkout for svn. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25788 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-22 09:00:41 +00:00
Pavel Sanda
38edfeb537 toggleReadOnly belongs only to RCS, not CVS. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25787 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-22 09:00:05 +00:00
Pavel Sanda
bb14dc3a00 VCS svn support, partly fixes http://bugzilla.lyx.org/show_bug.cgi?id=2574. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25785 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-22 08:59:15 +00:00
Pavel Sanda
4b00e7f527 This should bring cvs revision control to usable state. 
LyXVC API was too narrow to master both cvs and rcs, so we have to change interface.

We still need one more operation for cvs update, but i need to sleep sometimes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25750 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-07-21 01:55:58 +00:00
André Pönitz
d95451ae5c s/isFileReadable/isReadableFile; 
introduce isReadableDirectory
replace isReadable by either isReadableFile or isReadableDirectory
remove isReadable


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21769 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-25 11:18:16 +00:00
André Pönitz
f762cbf3c6 mainly cosmetics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21079 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-20 10:03:45 +00:00
Bo Peng
138b23fac8 Rename files in src/support, step one. 
src/support/package.h                              src/support/Package.h    Package
src/support/package.C.in                           src/support/Package.C.in  Package
src/support/path.h                                 src/support/Path.h    Path
src/support/fs_extras.h                            src/support/fs_extras.h NOCLASSES
src/support/RandomAccessList.h                     src/support/RandomAccessList.h    RandomAccessList
src/support/lyxmanip.h                             src/support/lyxmanip.h NOCLASSES
src/support/rename.C                               src/support/rename.cpp  NOCLASSES
src/support/abort.C                                src/support/abort.cpp  NOCLASSES
src/support/lyxlib.h                               src/support/lyxlib.h NOCLASSES
src/support/ExceptionMessage.h                     src/support/ExceptionMessage.h    ExceptionMessage
src/support/copy.C                                 src/support/copy.cpp  NOCLASSES
src/support/limited_stack.h                        src/support/limited_stack.h    limited_stack
src/support/filefilterlist.C                       src/support/FileFilterList.cpp    ['FileFilterList', 'Filter']
src/support/cow_ptr.h                              src/support/cow_ptr.h    cow_ptr
src/support/os_unix.C                              src/support/os_unix.cpp  NOCLASSES
src/support/socktools.h                            src/support/socktools.h NOCLASSES
src/support/forkedcontr.h                          src/support/ForkedcallsController.h    ForkedcallsController
src/support/os.h                                   src/support/os.h NOCLASSES
src/support/FileMonitor.h                          src/support/FileMonitor.h    FileMonitor
src/support/copied_ptr.h                           src/support/copied_ptr.h    copied_ptr
src/support/translator.h                           src/support/Translator.h    Translator
src/support/filetools.C                            src/support/filetools.cpp  NOCLASSES
src/support/unlink.C                               src/support/unlink.cpp  NOCLASSES
src/support/os_win32.C                             src/support/os_win32.cpp    GetFolderPath
src/support/lstrings.C                             src/support/lstrings.cpp  NOCLASSES
src/support/qstring_helpers.C                      src/support/qstring_helpers.cpp  NOCLASSES
src/support/getcwd.C                               src/support/getcwd.cpp  NOCLASSES
src/support/systemcall.C                           src/support/Systemcall.cpp    Systemcall
src/support/lyxalgo.h                              src/support/lyxalgo.h NOCLASSES
src/support/filefilterlist.h                       src/support/FileFilterList.h    ['FileFilterList', 'Filter']
src/support/unicode.C                              src/support/unicode.cpp    IconvProcessor
src/support/userinfo.C                             src/support/userinfo.cpp  NOCLASSES
src/support/lyxtime.C                              src/support/lyxtime.cpp  NOCLASSES
src/support/kill.C                                 src/support/kill.cpp  NOCLASSES
src/support/docstring.C                            src/support/docstring.cpp    to_local8bit_failure
src/support/os_cygwin.C                            src/support/os_cygwin.cpp  NOCLASSES
src/support/lyxsum.C                               src/support/lyxsum.cpp  NOCLASSES
src/support/environment.C                          src/support/environment.cpp  NOCLASSES
src/support/filetools.h                            src/support/filetools.h NOCLASSES
src/support/textutils.C                            src/support/textutils.cpp  NOCLASSES
src/support/mkdir.C                                src/support/mkdir.cpp  NOCLASSES
src/support/forkedcall.C                           src/support/Forkedcall.cpp    ['ForkedProcess', 'Forkedcall']
src/support/tempname.C                             src/support/tempname.cpp  NOCLASSES
src/support/os_win32.h                             src/support/os_win32.h    GetFolderPath
src/support/types.h                                src/support/types.h NOCLASSES
src/support/lstrings.h                             src/support/lstrings.h NOCLASSES
src/support/forkedcallqueue.C                      src/support/ForkedCallQueue.cpp    ForkedCallQueue
src/support/qstring_helpers.h                      src/support/qstring_helpers.h NOCLASSES
src/support/convert.C                              src/support/convert.cpp  NOCLASSES
src/support/filename.C                             src/support/FileName.cpp    ['FileName', 'DocFileName']
src/support/tests/convert.C                        src/support/tests/convert.cpp  NOCLASSES
src/support/tests/filetools.C                      src/support/tests/filetools.cpp  NOCLASSES
src/support/tests/lstrings.C                       src/support/tests/lstrings.cpp  NOCLASSES
src/support/tests/boost.C                          src/support/tests/boost.cpp  NOCLASSES
src/support/docstream.C                            src/support/docstream.cpp    ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/std_istream.h                          src/support/std_istream.h NOCLASSES
src/support/systemcall.h                           src/support/Systemcall.h    Systemcall
src/support/chdir.C                                src/support/chdir.cpp  NOCLASSES
src/support/std_ostream.h                          src/support/std_ostream.h NOCLASSES
src/support/unicode.h                              src/support/unicode.h    IconvProcessor
src/support/path.C                                 src/support/Path.cpp    Path
src/support/fs_extras.C                            src/support/fs_extras.cpp  NOCLASSES
src/support/userinfo.h                             src/support/userinfo.h NOCLASSES
src/support/lyxtime.h                              src/support/lyxtime.h NOCLASSES
src/support/docstring.h                            src/support/docstring.h    to_local8bit_failure
src/support/debugstream.h                          src/support/debugstream.h    basic_debugstream
src/support/environment.h                          src/support/environment.h NOCLASSES
src/support/textutils.h                            src/support/textutils.h NOCLASSES
src/support/forkedcall.h                           src/support/Forkedcall.h    ['ForkedProcess', 'Forkedcall']
src/support/socktools.C                            src/support/socktools.cpp  NOCLASSES
src/support/forkedcallqueue.h                      src/support/ForkedCallQueue.h    ForkedCallQueue
src/support/forkedcontr.C                          src/support/ForkedcallsController.cpp    ForkedcallsController
src/support/os.C                                   src/support/os.cpp  NOCLASSES
src/support/convert.h                              src/support/convert.h NOCLASSES
src/support/filename.h                             src/support/FileName.h    ['FileName', 'DocFileName']
src/support/docstream.h                            src/support/docstream.h    ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/FileMonitor.C                          src/support/FileMonitor.cpp    FileMonitor



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18024 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-26 05:12:52 +00:00