[LyX/master] DocBook: add a layout tag to tell whether an item is the abstract or not.

Richard Kimberly Heck rikiheck at lyx.org
Tue Aug 4 05:04:49 UTC 2020


On 8/3/20 5:06 PM, Scott Kostyshak wrote:
> On Mon, Aug 03, 2020 at 11:02:28PM +0200, Thibaut Cuvelier wrote:
>> On Mon, 3 Aug 2020 at 19:45, Scott Kostyshak <skostysh at lyx.org> wrote:
>>
>>> On Mon, Aug 03, 2020 at 12:08:51PM -0400, Richard Kimberly Heck wrote:
>>>> On 8/3/20 10:57 AM, Thibaut Cuvelier wrote:
>>>>> On Mon, 3 Aug 2020 at 16:41, Scott Kostyshak <skostysh at lyx.org
>>>>> <mailto:skostysh at lyx.org>> wrote:
>>>>>
>>>>>     On Mon, Aug 03, 2020 at 04:29:57PM +0200, Kornel Benko wrote:
>>>>>     > Am Mon,  3 Aug 2020 15:39:49 +0200 (CEST)
>>>>>     > schrieb Thibaut Cuvelier <tcuvelier at lyx.org
>>>>>     <mailto:tcuvelier at lyx.org>>:
>>>>>     >
>>>>>     > > commit 5ccd63eff6731a972f1d65d855859a65fe8e3a5b
>>>>>     > > Author: Thibaut Cuvelier <tcuvelier at lyx.org
>>>>>     <mailto:tcuvelier at lyx.org>>
>>>>>     > > Date:   Mon Aug 3 16:04:26 2020 +0200
>>>>>     > >
>>>>>     > >     DocBook: add a layout tag to tell whether an item is the
>>>>>     abstract or not.
>>>>>     > > ---
>>>>>     > >  .../docbook/bibliography_precooked_aastex.xml      |  221
>>>>>     ++++++++---------
>>>>>     > >  lib/layouts/aastex.layout                          |    3 -
>>>>>     > >  lib/layouts/stdstruct.inc                          |    3 +-
>>>>>     > >  lib/scripts/layout2layout.py                       |    2 +-
>>>>>     > >  src/Layout.cpp                                     |    8 +
>>>>>     > >  src/Layout.h                                       |    9 +-
>>>>>     > >  src/output_docbook.cpp                             |  265
>>>>>     ++++++++++++--------
>>>>>     > >  src/xml.h                                          |    2 +
>>>>>     > >  8 files changed, 283 insertions(+), 230 deletions(-)
>>>>>     >
>>>>>     > Thibaut, could you please test the exports before commit?
>>>>>     >
>>>>>     > Some of the last commits are the reason for
>>>>>     >
>>>>>     > 1.) extrem slowness
>>>>>     > 2.) many endless loops
>>>>>     > 3.) 54% tests passed, 162 tests failed out of 350
>>>>>
>>>>>     +1
>>>>>     An alternative would be to do work on a branch, then when you are
>>>>>     ready
>>>>>     do all the testing at once and then after the testing looks good
>>> merge
>>>>>     to master.
>>>>>
>>>>>     I think that some projects are not as strict, but here on master
>>>>>     we like
>>>>>     to keep it useable. This makes it easier to test master.  Also, it
>>>>>     makes
>>>>>     it easier to bisect other bugs that have nothing to do with a
>>> commit
>>>>>     that broke something else.
>>>>>
>>>>>     Thank you very much to Thibaut for all of your work!
>>>>>
>>>>>     And thank you to Kornel for spending so much time on the tests.
>>>>>
>>>>>
>>>>> Working on a branch would be the best solution, indeed. May I do a
>>>>> force push to remove those commits from master?
>>>> Just revert them, I'd think.
>>> +1
>>>
>>> For a branch, if Thibaut would like to share the branch before pushing,
>>> perhaps the "features" remote would be the right place? In normal times,
>>> I would be interested in pulling your branch (from features), and
>>> running the tests to see if there are any regressions. However, these
>>> days I do not have the time to offer this.
>>>
>> I've just reverted many commits, and put them back in a branch locally.
>> However, the Git server does not accept new branches (or I'm doing
>> something wrong):
>>
>> $ git push --set-upstream official feature/docbook
>> Enumerating objects: 104, done.
>> Counting objects: 100% (104/104), done.
>> Delta compression using up to 12 threads
>> Compressing objects: 100% (87/87), done.
>> Writing objects: 100% (87/87), 15.74 KiB | 848.00 KiB/s, done.
>> Total 87 (delta 76), reused 0 (delta 0), pack-reused 0
>> remote: C refs/heads/feature/docbook lyx tcuvelier DENIED by fallthru
>> remote: error: hook declined to update refs/heads/feature/docbook
>> To git.lyx.org:lyx
>>  ! [remote rejected]       feature/docbook -> feature/docbook (hook
>> declined)
>> error: failed to push some refs to 'git.lyx.org:lyx'
> Thanks for being responsive to feedback and for your time on that,
> Thibaut. I'm not sure how to set up your access for the features remote.
> I have the following settings:
>
> features	git at git.lyx.org:features.git (fetch)
> features	git at git.lyx.org:features.git (push)
>
> I don't know if this information is up-to-date:
>
> https://wiki.lyx.org/Devel/LyXGit#toc3

I would expect it to be, but if not, we can fix it.

Riki




More information about the lyx-devel mailing list