mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 09:15:50 +00:00
Backport fix for bug #6255.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31620 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda
parent
5240e8d67a
commit
f1ed78e722
@ -1485,6 +1485,7 @@ lib_images_files = Split('''
|
||||
vc-check-out.png
|
||||
vc-locking-toggle.png
|
||||
vc-register.png
|
||||
vc-repo-synchro.png
|
||||
vc-revert.png
|
||||
''')
|
||||
|
||||
|
||||
@ -416,6 +416,7 @@ dist_images_DATA = \
|
||||
images/vc-check-out.png \
|
||||
images/vc-locking-toggle.png \
|
||||
images/vc-register.png \
|
||||
images/vc-repo-synchro.png \
|
||||
images/vc-revert.png
|
||||
|
||||
imagesmathdir = $(imagesdir)/math
|
||||
|
||||
@ -112,8 +112,9 @@ End
|
||||
\paperpagestyle headings
|
||||
\tracking_changes true
|
||||
\output_changes false
|
||||
\author "Enrico Forestieri"
|
||||
\author ""
|
||||
\author ""
|
||||
\author "Enrico Forestieri"
|
||||
\end_header
|
||||
|
||||
\begin_body
|
||||
@ -4119,13 +4120,13 @@ push
|
||||
\end_inset
|
||||
|
||||
citations to LyX.
|
||||
\change_deleted 0 1252876894
|
||||
\change_deleted 2 1252876894
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
\change_deleted 0 1252876894
|
||||
\change_deleted 2 1252876894
|
||||
Please note that, at present,
|
||||
\emph on
|
||||
the server does not work natively on Windows
|
||||
@ -4164,14 +4165,14 @@ UserDir
|
||||
\end_inset
|
||||
|
||||
|
||||
\change_inserted 0 1252876936
|
||||
\change_inserted 2 1252876936
|
||||
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252876998
|
||||
\change_inserted 2 1252876998
|
||||
On Windows,
|
||||
\emph on
|
||||
local
|
||||
@ -4182,7 +4183,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252876991
|
||||
\change_inserted 2 1252876991
|
||||
|
||||
\backslash
|
||||
|
||||
@ -4248,7 +4249,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_deleted 0 1252877016
|
||||
\change_deleted 2 1252877016
|
||||
.
|
||||
\change_unchanged
|
||||
lyxpipe.in
|
||||
@ -4262,7 +4263,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_deleted 0 1252877019
|
||||
\change_deleted 2 1252877019
|
||||
.
|
||||
\change_unchanged
|
||||
lyxpipe.out
|
||||
@ -4293,14 +4294,14 @@ status collapsed
|
||||
\end_inset
|
||||
|
||||
|
||||
\change_inserted 0 1252877084
|
||||
\change_inserted 2 1252877084
|
||||
, or
|
||||
\begin_inset Flex CharStyle:Code
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877072
|
||||
\change_inserted 2 1252877072
|
||||
"
|
||||
\backslash
|
||||
|
||||
@ -4349,11 +4350,11 @@ status collapsed
|
||||
If one of the pipes already exists, LyX will assume that another LyX process
|
||||
is already running and will not start the server.
|
||||
|
||||
\change_inserted 0 1252877129
|
||||
\change_inserted 2 1252877129
|
||||
On POSIX (Unix like) systems,
|
||||
\change_deleted 0 1252877142
|
||||
\change_deleted 2 1252877142
|
||||
I
|
||||
\change_inserted 0 1252877142
|
||||
\change_inserted 2 1252877142
|
||||
i
|
||||
\change_unchanged
|
||||
f for some other reason, an unused
|
||||
@ -4369,7 +4370,7 @@ stale
|
||||
If this fails for some reason, you will need to delete the pipes manually
|
||||
and then restart LyX.
|
||||
|
||||
\change_inserted 0 1252877192
|
||||
\change_inserted 2 1252877192
|
||||
On Windows, pipes are deleted by the OS on program termination or crash,
|
||||
so “stale” pipes should not be possible.
|
||||
\change_unchanged
|
||||
@ -5513,26 +5514,26 @@ lyxclient -g %f %l
|
||||
|
||||
\begin_layout Standard
|
||||
Reverse search is triggered by SHIFT-click
|
||||
\change_inserted 0 1252877832
|
||||
\change_inserted 2 1252877832
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subsubsection*
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
YAP (Windows)
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
Launch yap, choose its
|
||||
\begin_inset Flex CharStyle:MenuItem
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
View\SpecialChar \menuseparator
|
||||
Options
|
||||
\end_layout
|
||||
@ -5590,7 +5591,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
lyxeditor.bat
|
||||
\end_layout
|
||||
|
||||
@ -5603,7 +5604,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
lyxeditor.bat
|
||||
\end_layout
|
||||
|
||||
@ -5615,7 +5616,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
%f %l
|
||||
\end_layout
|
||||
|
||||
@ -5628,7 +5629,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
lyxeditor.bat
|
||||
\end_layout
|
||||
|
||||
@ -5643,7 +5644,7 @@ lyxpipe
|
||||
|
||||
\begin_layout LyX-Code
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
@echo off
|
||||
\begin_inset Newline newline
|
||||
\end_inset
|
||||
@ -5673,14 +5674,14 @@ lyxpipe.out
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
Make sure that the LyXServer pipe path you specified in LyX is
|
||||
\begin_inset Flex CharStyle:Code
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
|
||||
\backslash
|
||||
|
||||
@ -5700,7 +5701,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
lyxeditor.bat
|
||||
\end_layout
|
||||
|
||||
@ -5713,7 +5714,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
Preferences\SpecialChar \menuseparator
|
||||
Paths
|
||||
\end_layout
|
||||
@ -5726,26 +5727,26 @@ Paths
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
In yap, reverse search is triggered by double-click.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subsubsection*
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
SumatraPDF (Windows)
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
In order to use SumatraPDF for inverse search, enter
|
||||
\begin_inset Flex CharStyle:Code
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
SumatraPDF -inverse-search "lyxeditor.bat %f %l"
|
||||
\end_layout
|
||||
|
||||
@ -5757,7 +5758,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
Preferences\SpecialChar \menuseparator
|
||||
File Handling\SpecialChar \menuseparator
|
||||
File formats\SpecialChar \menuseparator
|
||||
@ -5772,7 +5773,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
lyxeditor.bat
|
||||
\end_layout
|
||||
|
||||
@ -5786,7 +5787,7 @@ lyxeditor.bat
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
\change_inserted 0 1252877839
|
||||
\change_inserted 2 1252877839
|
||||
Reverse search is triggered by double-click.
|
||||
\change_unchanged
|
||||
|
||||
@ -5798,9 +5799,9 @@ YAP (Cygwin)
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
\change_deleted 0 1252877959
|
||||
\change_deleted 2 1252877959
|
||||
Launch yap
|
||||
\change_inserted 0 1252877972
|
||||
\change_inserted 2 1252877972
|
||||
First of all, make sure that yap is your default DVI viewer in the Windows
|
||||
environment, then launch it
|
||||
\change_unchanged
|
||||
@ -5860,7 +5861,7 @@ Name:
|
||||
\end_inset
|
||||
|
||||
to open a file dialog and navigate to the directory containing the
|
||||
\change_deleted 0 1252878023
|
||||
\change_deleted 2 1252878023
|
||||
batch file
|
||||
\change_unchanged
|
||||
|
||||
@ -5869,9 +5870,9 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_deleted 0 1252878035
|
||||
\change_deleted 2 1252878035
|
||||
lyxeditor.bat
|
||||
\change_inserted 0 1252878039
|
||||
\change_inserted 2 1252878039
|
||||
lyxclient.exe
|
||||
\change_unchanged
|
||||
|
||||
@ -5880,9 +5881,9 @@ lyxclient.exe
|
||||
\end_inset
|
||||
|
||||
|
||||
\change_inserted 0 1252878054
|
||||
\change_inserted 2 1252878054
|
||||
program
|
||||
\change_deleted 0 1252878057
|
||||
\change_deleted 2 1252878057
|
||||
(see below)
|
||||
\change_unchanged
|
||||
.
|
||||
@ -5892,9 +5893,9 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_deleted 0 1252878070
|
||||
\change_deleted 2 1252878070
|
||||
lyxeditor.bat
|
||||
\change_inserted 0 1252878074
|
||||
\change_inserted 2 1252878074
|
||||
lyxclient.exe
|
||||
\change_unchanged
|
||||
|
||||
@ -5908,7 +5909,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252878092
|
||||
\change_inserted 2 1252878092
|
||||
-g
|
||||
\change_unchanged
|
||||
%f %l
|
||||
@ -5917,7 +5918,7 @@ status collapsed
|
||||
\end_inset
|
||||
|
||||
|
||||
\change_inserted 0 1252878278
|
||||
\change_inserted 2 1252878278
|
||||
.
|
||||
In this way, you will be using the
|
||||
\emph on
|
||||
@ -5934,7 +5935,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252878278
|
||||
\change_inserted 2 1252878278
|
||||
bash.exe
|
||||
\end_layout
|
||||
|
||||
@ -5946,7 +5947,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252878278
|
||||
\change_inserted 2 1252878278
|
||||
lyxclient.exe
|
||||
\end_layout
|
||||
|
||||
@ -5958,7 +5959,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252878278
|
||||
\change_inserted 2 1252878278
|
||||
-c 'lyxeditor.sh "%f" %l'
|
||||
\end_layout
|
||||
|
||||
@ -5970,7 +5971,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252878278
|
||||
\change_inserted 2 1252878278
|
||||
%f
|
||||
\end_layout
|
||||
|
||||
@ -5982,7 +5983,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252878278
|
||||
\change_inserted 2 1252878278
|
||||
lyxeditor.sh
|
||||
\end_layout
|
||||
|
||||
@ -5994,7 +5995,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252878278
|
||||
\change_inserted 2 1252878278
|
||||
lyxeditor.sh
|
||||
\end_layout
|
||||
|
||||
@ -6004,7 +6005,7 @@ lyxeditor.sh
|
||||
|
||||
\change_unchanged
|
||||
|
||||
\change_deleted 0 1252878253
|
||||
\change_deleted 2 1252878253
|
||||
if you want to use the shell script above, or as
|
||||
\begin_inset Flex CharStyle:Code
|
||||
status collapsed
|
||||
@ -6062,7 +6063,7 @@ lyxeditor.bat
|
||||
|
||||
\begin_layout LyX-Code
|
||||
|
||||
\change_deleted 0 1252878253
|
||||
\change_deleted 2 1252878253
|
||||
@echo off
|
||||
\begin_inset Newline newline
|
||||
\end_inset
|
||||
@ -6088,7 +6089,7 @@ bash -c 'lyxclient %1 $(cygpath -a "%2") %3'
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
\change_deleted 0 1252878253
|
||||
\change_deleted 2 1252878253
|
||||
You have to make sure that both
|
||||
\begin_inset Flex CharStyle:Code
|
||||
status collapsed
|
||||
@ -6125,15 +6126,15 @@ SumatraPDF (Cygwin)
|
||||
|
||||
\begin_layout Standard
|
||||
In
|
||||
\change_inserted 0 1252878383
|
||||
\change_inserted 2 1252878383
|
||||
order to use
|
||||
\change_unchanged
|
||||
SumatraPDF
|
||||
\change_inserted 0 1252878392
|
||||
\change_inserted 2 1252878392
|
||||
for inverse search
|
||||
\change_unchanged
|
||||
,
|
||||
\change_deleted 0 1252878413
|
||||
\change_deleted 2 1252878413
|
||||
you can set the name of the program that communicates with LyX by simply
|
||||
launching SumatraPDF as
|
||||
\begin_inset Flex CharStyle:Code
|
||||
@ -6258,11 +6259,11 @@ cd $(dirname $1)
|
||||
\end_inset
|
||||
|
||||
SumatraPDF
|
||||
\change_deleted 0 1252878468
|
||||
\change_deleted 2 1252878468
|
||||
.exe
|
||||
\change_unchanged
|
||||
|
||||
\change_inserted 0 1252878472
|
||||
\change_inserted 2 1252878472
|
||||
-inverse-search "lyxclient -g %f %l"
|
||||
\change_unchanged
|
||||
$(basename $1)
|
||||
@ -6272,7 +6273,7 @@ $(basename $1)
|
||||
This is needed because SumatraPDF is a native Windows application and does
|
||||
not understand the posix paths used by the Cygwin version of LyX.
|
||||
|
||||
\change_inserted 0 1252878517
|
||||
\change_inserted 2 1252878517
|
||||
If SumatraPDF is not in your command PATH, use its full posix path in the
|
||||
script above.
|
||||
Again, if you want to use the
|
||||
@ -6289,7 +6290,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252878517
|
||||
\change_inserted 2 1252878517
|
||||
"lyxclient -g %f %l"
|
||||
\end_layout
|
||||
|
||||
@ -6301,7 +6302,7 @@ status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted 0 1252878517
|
||||
\change_inserted 2 1252878517
|
||||
"bash -c 'lyxeditor.sh
|
||||
\backslash
|
||||
"%f
|
||||
@ -18812,7 +18813,24 @@ Control
|
||||
submenu.
|
||||
Please note that if you use password protected access to repository via
|
||||
ssh, you will be asked in terminal window.
|
||||
LyX was tested against SVN 1.4 and 1.5.
|
||||
LyX was tested against SVN 1.5 and 1.6
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
Most of the commands will work with 1.4 too, see
|
||||
\begin_inset CommandInset ref
|
||||
LatexCommand ref
|
||||
reference "sub:SVN-update-from-repo"
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subsubsection
|
||||
@ -18974,6 +18992,122 @@ svn revert -q
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subsubsection
|
||||
\begin_inset CommandInset label
|
||||
LatexCommand label
|
||||
name "sub:SVN-update-from-repo"
|
||||
|
||||
\end_inset
|
||||
|
||||
Synchronization of the local directory checkout from repository
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
Note that this command will work only with subversion
|
||||
\begin_inset Formula $\geqq1.5$
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
All the commands above have one shortcomming - they deal with the current
|
||||
document only.
|
||||
Once your document contains pictures, includes external
|
||||
\begin_inset Flex CharStyle:Code
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
.tex
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
files and so on administration becomes more complicate.
|
||||
LyX now supports updating the whole tree in which resides the document
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
One need to organize the files structure so that all external files are
|
||||
in the same directory or subdirectories of the document.
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
.
|
||||
This become especially useful once you cooperate with people which neither
|
||||
know about subversion management nor they have ambition to commit additional
|
||||
material to the repository.
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
\begin_inset Flex CharStyle:Code
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
Synchronize local directory with repository
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
command updates the whole directory and in case of merge conflicts local
|
||||
version of the files are left, so no unintended data loss occurs.
|
||||
If local changes are detected user is warned before update starts.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Labeling
|
||||
\labelwidthstring 00.00.0000
|
||||
SVN
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
commands:
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
|
||||
\begin_inset Newline newline
|
||||
\end_inset
|
||||
|
||||
|
||||
\begin_inset Flex CharStyle:Code
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
svn diff $path (Ask if changes are detected.)
|
||||
\begin_inset Newline newline
|
||||
\end_inset
|
||||
|
||||
svn update --accept mine-full $path
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
where
|
||||
\begin_inset Flex CharStyle:Code
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
$path
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
stands for the path to the document.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subsubsection
|
||||
|
||||
\family sans
|
||||
|
||||
BIN
lib/images/vc-repo-update.png
Normal file
BIN
lib/images/vc-repo-update.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
@ -71,6 +71,7 @@ Menuset
|
||||
OptItem "Register...|R" "vc-register"
|
||||
OptItem "Check In Changes...|I" "vc-check-in"
|
||||
OptItem "Check Out for Edit|O" "vc-check-out"
|
||||
OptItem "Update local directory from repository|d" "vc-repo-update"
|
||||
OptItem "Revert to Repository Version|R" "vc-revert"
|
||||
OptItem "Undo Last Check In|U" "vc-undo-last"
|
||||
OptItem "Show History...|H" "dialog-show vclog"
|
||||
|
||||
@ -231,6 +231,8 @@ ToolbarSet
|
||||
Item "Revert changes" "vc-revert"
|
||||
Separator
|
||||
Item "Use SVN file locking property" "vc-locking-toggle"
|
||||
Separator
|
||||
Item "Update local directory from repository" "vc-repo-update"
|
||||
End
|
||||
|
||||
Toolbar "math_panels" "Math Panels"
|
||||
|
||||
@ -228,7 +228,7 @@ enum FuncCode
|
||||
LFUN_BUFFER_EXPORT, // Lgb 97-07-29
|
||||
LFUN_LABEL_GOTO, // Ale 970806
|
||||
// 165
|
||||
LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE, // ARRae 971202
|
||||
LFUN_VC_REPO_UPDATE,
|
||||
LFUN_BUFFER_CHKTEX, // Asger 971030
|
||||
LFUN_HYPERLINK_INSERT, // CFO-G 971121
|
||||
LFUN_WORD_FIND_FORWARD, // Etienne 980216
|
||||
@ -427,6 +427,7 @@ enum FuncCode
|
||||
LFUN_MATH_BIGDELIM,
|
||||
LFUN_GRAPHICS_RELOAD, // vfr 20090810
|
||||
LFUN_SCREEN_SHOW_CURSOR, // vfr, 20090325
|
||||
LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE, // ARRae 971202
|
||||
|
||||
LFUN_LASTACTION // end of the table
|
||||
};
|
||||
|
||||
@ -2072,6 +2072,16 @@ void LyXAction::init()
|
||||
* \endvar
|
||||
*/
|
||||
{ LFUN_VC_LOCKING_TOGGLE, "vc-locking-toggle", ReadOnly, System },
|
||||
/*!
|
||||
* \var lyx::FuncCode lyx::LFUN_VC_REPO_UPDATE
|
||||
* \li Action: Update the local archive directory in which resides
|
||||
the current document with the remote repository.
|
||||
* \li Notion: This is currently implemented only for SVN.
|
||||
* \li Syntax: vc-repo-update
|
||||
* \li Origin: sanda, 16 Oct 2009
|
||||
* \endvar
|
||||
*/
|
||||
{ LFUN_VC_REPO_UPDATE, "vc-repo-update", ReadOnly, System },
|
||||
|
||||
/*!
|
||||
* \var lyx::FuncCode lyx::LFUN_CHANGES_TRACK
|
||||
|
||||
@ -582,6 +582,10 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
|
||||
break;
|
||||
}
|
||||
|
||||
case LFUN_VC_REPO_UPDATE:
|
||||
enable = buf->lyxvc().inUse();
|
||||
break;
|
||||
|
||||
case LFUN_VC_COMMAND: {
|
||||
if (cmd.argument().empty())
|
||||
enable = false;
|
||||
@ -1656,6 +1660,15 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
|
||||
theSession().bookmarks().clear();
|
||||
break;
|
||||
|
||||
case LFUN_VC_REPO_UPDATE:
|
||||
LASSERT(lyx_view_ && buffer, /**/);
|
||||
if (ensureBufferClean(view())) {
|
||||
string res = buffer->lyxvc().repoUpdate();
|
||||
setMessage(from_utf8(res));
|
||||
reloadBuffer();
|
||||
}
|
||||
break;
|
||||
|
||||
case LFUN_VC_COMMAND: {
|
||||
string flag = cmd.getArg(0);
|
||||
if (buffer && contains(flag, 'R') && !ensureBufferClean(view()))
|
||||
|
||||
@ -170,6 +170,13 @@ string LyXVC::checkOut()
|
||||
}
|
||||
|
||||
|
||||
string LyXVC::repoUpdate()
|
||||
{
|
||||
LYXERR(Debug::LYXVC, "LyXVC: repoUpdate");
|
||||
return vcs->repoUpdate();
|
||||
}
|
||||
|
||||
|
||||
string LyXVC::lockingToggle()
|
||||
{
|
||||
LYXERR(Debug::LYXVC, "LyXVC: toggle locking property");
|
||||
|
||||
@ -77,6 +77,11 @@ public:
|
||||
/// Does the current VC supports this operation?
|
||||
bool checkOutEnabled();
|
||||
|
||||
/// Synchronize the whole archive with repository
|
||||
std::string repoUpdate();
|
||||
/// Does the current VC supports this operation?
|
||||
bool repoUpdateEnabled();
|
||||
|
||||
/**
|
||||
* Toggle locking property of the edited file,
|
||||
* i.e. whether the file uses locking mechanism.
|
||||
|
||||
@ -36,13 +36,15 @@ using boost::smatch;
|
||||
namespace lyx {
|
||||
|
||||
|
||||
int VCS::doVCCommandCall(string const & cmd, FileName const & path){
|
||||
int VCS::doVCCommandCall(string const & cmd, FileName const & path)
|
||||
{
|
||||
LYXERR(Debug::LYXVC, "doVCCommandCall: " << cmd);
|
||||
Systemcall one;
|
||||
support::PathChanger p(path);
|
||||
return one.startscript(Systemcall::Wait, cmd);
|
||||
}
|
||||
|
||||
|
||||
int VCS::doVCCommand(string const & cmd, FileName const & path)
|
||||
{
|
||||
if (owner_)
|
||||
@ -185,11 +187,13 @@ string RCS::checkIn(string const & msg)
|
||||
return ret ? string() : "RCS: Proceeded";
|
||||
}
|
||||
|
||||
|
||||
bool RCS::checkInEnabled()
|
||||
{
|
||||
return owner_ && !owner_->isReadonly();
|
||||
}
|
||||
|
||||
|
||||
string RCS::checkOut()
|
||||
{
|
||||
owner_->markClean();
|
||||
@ -204,6 +208,20 @@ bool RCS::checkOutEnabled()
|
||||
return owner_ && owner_->isReadonly();
|
||||
}
|
||||
|
||||
|
||||
string RCS::repoUpdate()
|
||||
{
|
||||
lyxerr << "Sorry, not implemented." << endl;
|
||||
return string();
|
||||
}
|
||||
|
||||
|
||||
bool RCS::repoUpdateEnabled()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
string RCS::lockingToggle()
|
||||
{
|
||||
lyxerr << "Sorry, not implemented." << endl;
|
||||
@ -379,6 +397,19 @@ bool CVS::checkOutEnabled()
|
||||
}
|
||||
|
||||
|
||||
string CVS::repoUpdate()
|
||||
{
|
||||
lyxerr << "Sorry, not implemented." << endl;
|
||||
return string();
|
||||
}
|
||||
|
||||
|
||||
bool CVS::repoUpdateEnabled()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
string CVS::lockingToggle()
|
||||
{
|
||||
lyxerr << "Sorry, not implemented." << endl;
|
||||
@ -431,6 +462,7 @@ void CVS::getLog(FileName const & tmpf)
|
||||
FileName(owner_->filePath()));
|
||||
}
|
||||
|
||||
|
||||
bool CVS::toggleReadOnlyEnabled()
|
||||
{
|
||||
return false;
|
||||
@ -672,6 +704,56 @@ bool SVN::checkOutEnabled()
|
||||
}
|
||||
|
||||
|
||||
string SVN::repoUpdate()
|
||||
{
|
||||
FileName tmpf = FileName::tempName("lyxvcout");
|
||||
if (tmpf.empty()) {
|
||||
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
|
||||
return N_("Error: Could not generate logfile.");
|
||||
}
|
||||
|
||||
doVCCommand("svn diff " + quoteName(owner_->filePath())
|
||||
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
|
||||
FileName(owner_->filePath()));
|
||||
docstring res = tmpf.fileContents("UTF-8");
|
||||
if (!res.empty()) {
|
||||
LYXERR(Debug::LYXVC, "Diff detected:\n" << res);
|
||||
docstring const file = from_utf8(owner_->filePath());
|
||||
docstring text = bformat(_("There were detected changes"
|
||||
"in the working directory:\n%1$s\n\n"
|
||||
"In case of file conflict version of the local directory files "
|
||||
"will be preferred."
|
||||
"\n\nContinue?"), file);
|
||||
int const ret = frontend::Alert::prompt(_("Changes detected"),
|
||||
text, 0, 1, _("&Yes"), _("&No"));
|
||||
if (ret) {
|
||||
tmpf.erase();
|
||||
return string();
|
||||
}
|
||||
}
|
||||
|
||||
// Reverting looks too harsh, see bug #6255.
|
||||
// doVCCommand("svn revert -R " + quoteName(owner_->filePath())
|
||||
// + " > " + quoteName(tmpf.toFilesystemEncoding()),
|
||||
// FileName(owner_->filePath()));
|
||||
// res = "Revert log:\n" + tmpf.fileContents("UTF-8");
|
||||
doVCCommand("svn update --accept mine-full " + quoteName(owner_->filePath())
|
||||
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
|
||||
FileName(owner_->filePath()));
|
||||
res += "Update log:\n" + tmpf.fileContents("UTF-8");
|
||||
|
||||
LYXERR(Debug::LYXVC, res);
|
||||
tmpf.erase();
|
||||
return to_utf8(res);
|
||||
}
|
||||
|
||||
|
||||
bool SVN::repoUpdateEnabled()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
string SVN::lockingToggle()
|
||||
{
|
||||
FileName tmpf = FileName::tempName("lyxvcout");
|
||||
@ -717,6 +799,7 @@ bool SVN::lockingToggleEnabled()
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void SVN::revert()
|
||||
{
|
||||
// Reverts to the version in CVS repository and
|
||||
|
||||
@ -43,6 +43,10 @@ public:
|
||||
virtual std::string checkOut() = 0;
|
||||
// can be this operation processed in the current RCS?
|
||||
virtual bool checkOutEnabled() = 0;
|
||||
/// synchronize with repository, returns log
|
||||
virtual std::string repoUpdate() = 0;
|
||||
// can be this operation processed in the current RCS?
|
||||
virtual bool repoUpdateEnabled() = 0;
|
||||
// toggle locking property of the file
|
||||
virtual std::string lockingToggle() = 0;
|
||||
// can be this operation processed in the current RCS?
|
||||
@ -131,6 +135,10 @@ public:
|
||||
|
||||
virtual bool checkOutEnabled();
|
||||
|
||||
virtual std::string repoUpdate();
|
||||
|
||||
virtual bool repoUpdateEnabled();
|
||||
|
||||
virtual std::string lockingToggle();
|
||||
|
||||
virtual bool lockingToggleEnabled();
|
||||
@ -174,6 +182,10 @@ public:
|
||||
|
||||
virtual bool checkOutEnabled();
|
||||
|
||||
virtual std::string repoUpdate();
|
||||
|
||||
virtual bool repoUpdateEnabled();
|
||||
|
||||
virtual std::string lockingToggle();
|
||||
|
||||
virtual bool lockingToggleEnabled();
|
||||
@ -220,6 +232,10 @@ public:
|
||||
|
||||
virtual bool checkOutEnabled();
|
||||
|
||||
virtual std::string repoUpdate();
|
||||
|
||||
virtual bool repoUpdateEnabled();
|
||||
|
||||
virtual std::string lockingToggle();
|
||||
|
||||
virtual bool lockingToggleEnabled();
|
||||
|
||||
@ -57,6 +57,8 @@ What's new
|
||||
- New LFUN inset-select-all allows to select the whole contents of
|
||||
an inset (bug 5991).
|
||||
|
||||
- SVN support: synchronization for the whole directories (bug 6255).
|
||||
|
||||
|
||||
* DOCUMENTATION AND LOCALIZATION
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user