The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 1a48d5a96712c72879487542e3f1a7e61ce3f78c Author: Georg Baum <[email protected]> Date: Sun Feb 3 19:21:54 2013 +0100 Dot not swallow log messages diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 3920f23..f5124ab 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -2253,8 +2253,11 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr) switch (func.action()) { case LFUN_BUFFER_TOGGLE_READ_ONLY: - if (lyxvc().inUse()) - lyxvc().toggleReadOnly(); + if (lyxvc().inUse()) { + string log = lyxvc().toggleReadOnly(); + if (!log.empty()) + dr.setMessage(log); + } else setReadonly(!isReadonly()); break; diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 8ef5439..d51a905 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -259,25 +259,24 @@ void LyXVC::undoLast() } -void LyXVC::toggleReadOnly() +string LyXVC::toggleReadOnly() { if (!vcs) - return; + return string(); if (!vcs->toggleReadOnlyEnabled()) - return; + return string(); switch (vcs->status()) { case VCS::UNLOCKED: LYXERR(Debug::LYXVC, "LyXVC: toggle to locked"); - checkOut(); - break; + return checkOut(); case VCS::LOCKED: LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked"); - checkIn(); - break; + return checkIn(); case VCS::NOLOCKING: break; } + return string(); } diff --git a/src/LyXVC.h b/src/LyXVC.h index 860a880..5904f19 100644 --- a/src/LyXVC.h +++ b/src/LyXVC.h @@ -135,7 +135,7 @@ public: * keep things in synchro once we would allow user to toggle * read-only flags. */ - void toggleReadOnly(); + std::string toggleReadOnly(); /// Is the document under administration by VCS? bool inUse() const; commit e82cc5d498244b0d0f0571249f12480e1f514355 Author: Georg Baum <[email protected]> Date: Sun Feb 3 17:03:08 2013 +0100 Fix typos diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index dfbf656..f9cf459 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -144,7 +144,7 @@ Additional LyX Features \end_layout \begin_layout Subtitle -Version 2.0.x +Version 2.1.x \end_layout \begin_layout Author @@ -18966,7 +18966,7 @@ man rcsintro Before you begin to use the version control features in LyX, you should be familiar with RCS/CVS/SVN usage. The implementation in LyX assumes a recent version of the GNU RCS or CVS/SVN - packageâno guarantees are made for older versions. + package â no guarantees are made for older versions. Most of the log messages are not currently displayed after operations â you can check them in the Messages pane if unsure. Regular users of version control will appreciate VC toolbar, which can @@ -19099,7 +19099,6 @@ When you are finished editing a file, you check in your changes. This is stored in the history log. The version number is bumped, your changes are applied to the master RCS file, the document is unlocked and set to Read-Only mode. - \end_layout \begin_layout Standard @@ -19120,7 +19119,6 @@ By doing this you lock the document so that only you can edit it. You will usually continue editing for a while and when you are finished you check in your changes. The status line is changed to reflect that you have locked the file. - \end_layout \begin_layout Standard @@ -19157,7 +19155,6 @@ Undo Last Checkin This makes as if the last check in never happened. No changes are made to the document loaded into LyX, but the last version is removed from the master RCS file. - \end_layout \begin_layout Standard @@ -19197,7 +19194,7 @@ LyX supports RCS version number, author name, date and time of last commit. rlog -r <file-name> \family default . - For other details see + See \begin_inset CommandInset ref LatexCommand ref reference "sub:VCS-Revision-Information" @@ -19244,7 +19241,7 @@ If you start from scratch with CVS you have to create your repository and If your documents are under revision control and others are using the same repository problems arise when different changes to the same document at the same location happen. - Standard CVS repositories doesn't operate with a file locking mechanism. + Standard CVS repositories don't operate with a file locking mechanism. This may be surprising, but conflicts only occur if people disagree on the proper content of the same part of a document. So, if co-workers are used to communicate regularly, these conflicts occur @@ -19717,6 +19714,27 @@ cvs log "<file-name>" is shown in a browser. \end_layout +\begin_layout Subsubsection +Revision info +\end_layout + +\begin_layout Standard +LyX supports CVS version number, author name, date and time of last commit. + All those are extracted from +\family typewriter +cvs log -r <file-name> +\family default +. + See +\begin_inset CommandInset ref +LatexCommand ref +reference "sub:VCS-Revision-Information" + +\end_inset + + for details. +\end_layout + \begin_layout Subsection SVN commands in LyX \end_layout @@ -19772,7 +19790,6 @@ R egister \family default item is not visible. - \end_layout \begin_layout Standard @@ -19783,7 +19800,6 @@ This command registers in SVN your document ONLY in case you have already \family default file exists). This means you have to checkout the archive by yourself. - \end_layout \begin_layout Standard @@ -19812,7 +19828,6 @@ Read man svn \family default to understand the switches. - \end_layout \begin_layout Subsubsection @@ -19897,7 +19912,6 @@ Revert To Repository Version This will discard all changes made to the document since the last check in. You get a warning before changes are discarded. - \end_layout \begin_layout Standard diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp index 244dff1..8ef5439 100644 --- a/src/LyXVC.cpp +++ b/src/LyXVC.cpp @@ -188,7 +188,7 @@ string LyXVC::checkIn() if (response.empty()) response = empty; //shell collisions - response = subst(response, from_utf8("\""), from_utf8("\\\"")); + response = subst(response, from_ascii("\""), from_ascii("\\\"")); log = vcs->checkIn(to_utf8(response)); // Reserve empty string for cancel button diff --git a/src/LyXVC.h b/src/LyXVC.h index a860bda..860a880 100644 --- a/src/LyXVC.h +++ b/src/LyXVC.h @@ -79,17 +79,17 @@ public: /// Unlock and commit changes. Returns log. std::string checkIn(); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool checkInEnabled() const; /// Lock/update and prepare to edit document. Returns log. std::string checkOut(); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool checkOutEnabled() const; /// Synchronize the whole archive with repository std::string repoUpdate(); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool repoUpdateEnabled() const; /** @@ -105,7 +105,7 @@ public: /// Undo last check-in. void undoLast(); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool undoLastEnabled() const; /** * Prepare revision rev of the file into newly created temporary file @@ -119,7 +119,7 @@ public: * for retrieving normal revisions (rev>0) or backtracking (rev<0). */ bool prepareFileRevision(std::string const & rev, std::string & f); - /// Does the current VC supports this operation? + /// Does the current VC support this operation? bool prepareFileRevisionEnabled(); /** diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 9841707..3e1bca6 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -154,7 +154,7 @@ FileName const RCS::findFile(FileName const & file) bool RCS::retrieve(FileName const & file) { LYXERR(Debug::LYXVC, "LyXVC::RCS: retrieve.\n\t" << file); - // The caller ensures that file does not exists, so no need to check that. + // The caller ensures that file does not exist, so no need to check that. return doVCCommandCall("co -q -r " + quoteName(file.toFilesystemEncoding()), FileName()) == 0; } @@ -557,7 +557,7 @@ void CVS::scanMaster() bool CVS::retrieve(FileName const & file) { LYXERR(Debug::LYXVC, "LyXVC::CVS: retrieve.\n\t" << file); - // The caller ensures that file does not exists, so no need to check that. + // The caller ensures that file does not exist, so no need to check that. return doVCCommandCall("cvs -q update " + quoteName(file.toFilesystemEncoding()), file.onlyPath()) == 0; } @@ -1145,7 +1145,7 @@ bool SVN::isLocked() const bool SVN::retrieve(FileName const & file) { LYXERR(Debug::LYXVC, "LyXVC::SVN: retrieve.\n\t" << file); - // The caller ensures that file does not exists, so no need to check that. + // The caller ensures that file does not exist, so no need to check that. return doVCCommandCall("svn update -q --non-interactive " + quoteName(file.onlyFileName()), file.onlyPath()) == 0; } @@ -1403,12 +1403,13 @@ string SVN::lockingToggle() return string(); tmpf.erase(); - frontend::Alert::warning(_("VCN File Locking"), + frontend::Alert::warning(_("SVN File Locking"), (locking ? _("Locking property unset.") : _("Locking property set.")) + "\n" + _("Do not forget to commit the locking property into the repository."), true); - return string("SVN: ") + N_("Locking property set."); + return string("SVN: ") + (locking ? + N_("Locking property unset.") : N_("Locking property set.")); } commit bab0da786b7c876d534226bdfb72357ff58c8223 Author: Georg Baum <[email protected]> Date: Sun Feb 3 16:36:45 2013 +0100 Regenerate LFUNs.lyx diff --git a/lib/doc/LFUNs.lyx b/lib/doc/LFUNs.lyx index be3d439..127775f 100644 --- a/lib/doc/LFUNs.lyx +++ b/lib/doc/LFUNs.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 444 +\lyxformat 459 \begin_document \begin_header \textclass article @@ -45,6 +45,8 @@ \use_package mathdots 0 \use_package mathtools 0 \use_package mhchem 1 +\use_package stackrel 0 +\use_package stmaryrd 0 \use_package undertilde 0 \cite_engine basic \cite_engine_type numerical @@ -81,7 +83,7 @@ \begin_body \begin_layout Section* -LFUNs documentation automatically generated 2012-09-29 +LFUNs documentation automatically generated 2013-02-03 \end_layout \begin_layout Standard @@ -466,7 +468,11 @@ Action Inserts an argument (short title) inset. \end_layout \begin_layout Description -Syntax argument-insert +Syntax argument-insert <argument nr> +\end_layout + +\begin_layout Description +Params <argument nr>: see layout declarations \end_layout \begin_layout Description @@ -4806,7 +4812,7 @@ Sample Remove all index insets: \begin_inset Newline newline \end_inset - inset-forall Index delete-char-forward + inset-forall Index char-delete-forward \begin_inset Newline newline \end_inset @@ -4937,12 +4943,17 @@ Action Set language from the current cursor position. \end_layout \begin_layout Description -Syntax language <LANG> +Syntax language <LANG> [set] \end_layout \begin_layout Description Params <LANG>: Requested language. Look in lib/languages for the list. + "language reset" or "language" (without param) reset to the document language. + set: If used, the language will be set to the specified language. + Otherwise, the language will be toggled (i.e., if the current language is + LANG, switch to the document language or the default language, if LANG + is the document language). \end_layout \begin_layout Description @@ -6284,21 +6295,24 @@ LFUN_BUFFER_FORALL \end_layout \begin_layout Description -Action Applies a command to all visible, hidden, or both types of buffers - in the active window. +Action Applies a command to all non-hidden buffers. +\end_layout + +\begin_layout Description +Notion a buffer is `hidden' if it is internally open in LyX, but not visible + in any window. \end_layout \begin_layout Description -Syntax buffer-forall [<BUFFER-TYPE>] <LFUN-COMMAND> +Syntax buffer-forall <LFUN-COMMAND> \end_layout \begin_layout Description -Params <BUFFER-TYPE>: <visible|hidden|both default:> default: visible <LFUN-COMM -AND>: The command that is to be applied to the buffers. +Params <LFUN-COMMAND>: The command to be applied to the buffers. \end_layout \begin_layout Description -Sample Close all Notes in all visible documents: +Sample Close all Notes in buffers: \begin_inset Newline newline \end_inset @@ -6306,15 +6320,15 @@ Sample Close all Notes in all visible documents: \begin_inset Newline newline \end_inset -Toggle change tracking on all documents: +Toggle change tracking on buffers: \begin_inset Newline newline \end_inset - buffer-forall both changes-track + buffer-forall changes-track \begin_inset Newline newline \end_inset -Toggle read-only for all visible documents: +Toggle read-only for buffers: \begin_inset Newline newline \end_inset @@ -6322,15 +6336,15 @@ Toggle read-only for all visible documents: \begin_inset Newline newline \end_inset -Show statistics for each document: +Show statistics for individual buffers: \begin_inset Newline newline \end_inset - buffer-forall both statistics + buffer-forall statistics \begin_inset Newline newline \end_inset -Activate the branch named "Solutions" in all visible documents: +Activate the branch named "Solutions" in buffers: \begin_inset Newline newline \end_inset @@ -6338,7 +6352,7 @@ Activate the branch named "Solutions" in all visible documents: \begin_inset Newline newline \end_inset -Export all visible documents to PDF (pdflatex): +Export buffers to PDF (pdflatex): \begin_inset Newline newline \end_inset @@ -7048,6 +7062,55 @@ Origin rgh, 27 May 2008 \end_layout \begin_layout Subsection* +LFUN_BRANCH_MASTER_ACTIVATE +\end_layout + +\begin_layout Description +Action Activate the branch in the master buffer. +\end_layout + +\begin_layout Description +Syntax branch-master-activate <BRANCH> +\end_layout + +\begin_layout Description +Params <BRANCH>: The branch to activate +\end_layout + +\begin_layout Description +Sample lyx -x "branch-activate answers" -e pdf2 finalexam.lyx +\begin_inset Newline newline +\end_inset + +could be used to export a pdf with the answers branch included without one's + having to open LyX and activate the branch manually. +\end_layout + +\begin_layout Description +Origin spitz, 30 Sep 2012 +\end_layout + +\begin_layout Subsection* +LFUN_BRANCH_MASTER_DEACTIVATE +\end_layout + +\begin_layout Description +Action De-activate the branch in the master buffer. +\end_layout + +\begin_layout Description +Syntax branch-master-deactivate <BRANCH> +\end_layout + +\begin_layout Description +Params <BRANCH>: The branch to deactivate +\end_layout + +\begin_layout Description +Origin spitz, 30 Sep 2012 +\end_layout + +\begin_layout Subsection* LFUN_BRANCHES_RENAME \end_layout @@ -7115,7 +7178,8 @@ LFUN_LABEL_INSERT_AS_REF \end_layout \begin_layout Description -Action Inserts the label as a cross-reference at the position of the cursor. +Action Inserts the label (in ToC pane) as a cross-reference at the position + of the cursor. \end_layout \begin_layout Description @@ -7187,5 +7251,21 @@ Syntax inset-copy-as Origin vfr, 18 Apr 2010 \end_layout +\begin_layout Subsection* +LFUN_ENVIRONMENT_SPLIT +\end_layout + +\begin_layout Description +Action Splits the current environment with a Separator. +\end_layout + +\begin_layout Description +Syntax environment-split +\end_layout + +\begin_layout Description +Origin spitz, 23 Dec 2012 +\end_layout + \end_body \end_document ----------------------------------------------------------------------- Summary of changes: lib/doc/Additional.lyx | 36 ++++++++++----- lib/doc/LFUNs.lyx | 118 ++++++++++++++++++++++++++++++++++++++++-------- src/Buffer.cpp | 7 ++- src/LyXVC.cpp | 15 +++--- src/LyXVC.h | 12 +++--- src/VCBackend.cpp | 11 +++-- 6 files changed, 148 insertions(+), 51 deletions(-) hooks/post-receive -- The LyX Source Repository
