Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-09 Thread Matěj Cepl
On 2018-04-09, 08:38 GMT, Jaak Ristioja wrote:
> First, technically there is no difference between branches and 
> tags in Subversion [1]. So the tags are not actually tags in 
> SVN in the sense of snapshots, but actually work exactly like 
> branches. Keeping these as git tags in git mirrors is a matter 
> of preference, but it might not work well if these "tags" are 
> ever (accidentally?) updated in SVN.

You are right, and my appreciation of SVN (not very high even 
before, https://youtu.be/4XpnKHJAok8?t=3075 :) ) just decreased 
a bit. I have probably not understood what tag and branch means 
in the SVN world (and I have to admit, I don’t care that much).

> Secondly, your mirror seems to missing some empty directories (the
> BibleTime mirror handles these using the `clone --preserve-empty-dirs`
> workaround documented in `git help svn`):

You are right, that's a bug and I will reclone.

> Thirdly, your mirror is missing the rest of the branches which 
> are present in SVN,

Do you mean CrossWire, sword-1-4-x, sword-1-7-x, sword-1-8-x, 
wdg, and wince? I have them here, I have just never pushed them 
to the gitlab, because I don't need them personally. I could if 
ever anybody asks for it.

> and there's also an extra branch named "czech-locale".

Well, generally, this is not meant as a publicly used mirror, it 
is my private git repo for doing my work on Sword, so this is my 
branch I would love to have merged to the upstream SVN 
eventually.

> Finally, since the commit authorship information in your repository
> seems to have been rewritten, the mirroring is, strictly speaking, not
> that exact. Additionally, if your mirror is synchronized with SVN
> automatically, I doubt the automation can properly rewrite authorship
> information if new users commit to the SVN repository.

I can anytime fix authors.txt file (or whatever svn.authorsfile 
configuration points to) and rerun with 
https://gitlab.com/mcepl/git-svn-tools/blob/master/git-svn-fix-authors

> Concerning preservation of authorship information in Sword++ [2], which
> is based on the [3] mirror, we've opted to use a .mailmap file (git help
> shortlog) instead of rewriting history. I think that updating that file
> poses less problems than rewriting history in a mirror. So the BibleTime
> mirror works well for us.

See above, I just update one line in authors.txt file as well.

Best,

Matěj
-- 
https://matej.ceplovi.cz/blog/, Jabber: mc...@ceplovi.cz
GPG Finger: 3C76 A027 CA45 AD70 98B5  BC1D 7920 5802 880B C9D8
 
[...] sleep is no substitute for caffeine.
  -- Robert Storey in review of Debian
 (when describing re-compilation of kernel :-)


___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-09 Thread Matěj Cepl
On 2018-04-09, 05:31 GMT, Greg Hellings wrote:
> I don't have permissions on SWORD main outside of bindings and 
> the CMakeFiles.

Ah, thank you.

Matěj
-- 
https://matej.ceplovi.cz/blog/, Jabber: mc...@ceplovi.cz
GPG Finger: 3C76 A027 CA45 AD70 98B5  BC1D 7920 5802 880B C9D8
 
The main idea of the pope's asking for forgiveness was not to be
afraid of the truth. DO NOT BE AFRAID OF TRUTH! We have to have
faith in the God's governing power to be able not to be afraid.
-- On NPR The Connection from March 13, 2000


___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-09 Thread Jaak Ristioja
On 09.04.2018 08:08, Matěj Cepl wrote:
> On 2018-04-08, 16:52 GMT, Jaak Ristioja wrote:
>> Sword++ development. This is meant to be an unofficial 
>> read-only mirror, so please don't submit pull requests. If 
>> there are any problems with that mirror, please contact me.
> 
> Oh well, I have already my own git-svn mirror at 
> https://gitlab.com/mcepl/sword (and I believe, better than 
> yours, tags are tags, and I have found all authors and gave them 
> proper names). So, I'll keep my git-send-email configuration 
> up-to-date.

As far as I'm concerned, anyone can use any mirror they want to. :) Your
mirror might be best for your specific use case, but in reply I'd still
like to point out the following:

First, technically there is no difference between branches and tags in
Subversion [1]. So the tags are not actually tags in SVN in the sense of
snapshots, but actually work exactly like branches. Keeping these as git
tags in git mirrors is a matter of preference, but it might not work
well if these "tags" are ever (accidentally?) updated in SVN.

Secondly, your mirror seems to missing some empty directories (the
BibleTime mirror handles these using the `clone --preserve-empty-dirs`
workaround documented in `git help svn`):

  bindings/corba/java/classes
  bindings/objc/SWORD/Release-universal
  bindings/objc/SWORD/build
  bindings/swig/package/attic
  tests/testsuite/tmp

Thirdly, your mirror is missing the rest of the branches which are
present in SVN, the "trunk" branch seems to have been renamed to
"master" and there's also an extra branch named "czech-locale".

Finally, since the commit authorship information in your repository
seems to have been rewritten, the mirroring is, strictly speaking, not
that exact. Additionally, if your mirror is synchronized with SVN
automatically, I doubt the automation can properly rewrite authorship
information if new users commit to the SVN repository.

Concerning preservation of authorship information in Sword++ [2], which
is based on the [3] mirror, we've opted to use a .mailmap file (git help
shortlog) instead of rewriting history. I think that updating that file
poses less problems than rewriting history in a mirror. So the BibleTime
mirror works well for us.


Best regards,
J


[1]
http://svnbook.red-bean.com/en/1.5/svn.branchmerge.tags.html#svn.branchmerge.tags.mksimple
[2] https://github.com/swordxx/swordxx/
[3] https://github.com/bibletime/crosswire-sword-mirror

___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-08 Thread Greg Hellings
I pulled your changes for av11n.py straight from your git mirror and then
just cherry picked them into my master before using dcommit to send them to
SVN.

I don't have permissions on SWORD main outside of bindings and the
CMakeFiles.

--Greg

On Mon, Apr 9, 2018, 00:23 Matěj Cepl  wrote:

> On 2018-04-05, 02:34 GMT, Greg Hellings wrote:
> > Feel free to submit future revisions directly through git.
>
> Ehm, I have to repeat: which git repo? And also, could I ask for
> those Czech locale being updated as well (previous set of
> patches sent to this list), please?
>
> Thank you,
>
> Matěj
> --
> https://matej.ceplovi.cz/blog/, Jabber: mc...@ceplovi.cz
> GPG Finger: 3C76 A027 CA45 AD70 98B5  BC1D 7920 5802 880B C9D8
>
> Of all tyrannies, a tyranny exercised for the good of its
> victims may be the most oppressive. It may be better to live
> under robber barons than under omnipotent moral busybodies. The
> robber baron's cruelty may sometimes sleep, his cupidity may at
> some point be satiated; but those who torment us for our own
> good will torment us without end, for they do so with the
> approval of their consciences.
> -- C. S. Lewis
>
>
> ___
> sword-devel mailing list: sword-devel@crosswire.org
> http://www.crosswire.org/mailman/listinfo/sword-devel
> Instructions to unsubscribe/change your settings at above page
___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-08 Thread Matěj Cepl
On 2018-04-05, 02:34 GMT, Greg Hellings wrote:
> Feel free to submit future revisions directly through git. 

Ehm, I have to repeat: which git repo? And also, could I ask for 
those Czech locale being updated as well (previous set of 
patches sent to this list), please?

Thank you,

Matěj
-- 
https://matej.ceplovi.cz/blog/, Jabber: mc...@ceplovi.cz
GPG Finger: 3C76 A027 CA45 AD70 98B5  BC1D 7920 5802 880B C9D8
 
Of all tyrannies, a tyranny exercised for the good of its
victims may be the most oppressive. It may be better to live
under robber barons than under omnipotent moral busybodies. The
robber baron's cruelty may sometimes sleep, his cupidity may at
some point be satiated; but those who torment us for our own
good will torment us without end, for they do so with the
approval of their consciences.
-- C. S. Lewis


___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-08 Thread Matěj Cepl
On 2018-04-08, 16:52 GMT, Jaak Ristioja wrote:
> Sword++ development. This is meant to be an unofficial 
> read-only mirror, so please don't submit pull requests. If 
> there are any problems with that mirror, please contact me.

Oh well, I have already my own git-svn mirror at 
https://gitlab.com/mcepl/sword (and I believe, better than 
yours, tags are tags, and I have found all authors and gave them 
proper names). So, I'll keep my git-send-email configuration 
up-to-date.

Best,

Matěj
-- 
https://matej.ceplovi.cz/blog/, Jabber: mc...@ceplovi.cz
GPG Finger: 3C76 A027 CA45 AD70 98B5  BC1D 7920 5802 880B C9D8
 
How many Bavarian Illuminati does it take to screw in a light
bulb?
Three: one to screw it in, and one to confuse the issue.


___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-08 Thread Jaak Ristioja
On 05.04.2018 11:45, Matěj Cepl wrote:
> On 2018-04-05, 02:34 GMT, Greg Hellings wrote:
>> Feel free to submit future revisions directly through git. 
> 
> ??? There is some git? I thought 
> https://github.com/refdoc/sword/ could be alive, but 
> https://github.com/refdoc/sword/pull/1 persuaded me otherwise.

If it helps, feel free to base your patches on

  https://github.com/bibletime/crosswire-sword-mirror

which is automatically kept up to date with the Sword SVN repository
(https://crosswire.org/svn/sword/trunk), and is also used as a base for
Sword++ development. This is meant to be an unofficial read-only mirror,
so please don't submit pull requests. If there are any problems with
that mirror, please contact me.

Best regards,
J

___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-05 Thread Matěj Cepl
On 2018-04-05, 02:34 GMT, Greg Hellings wrote:
> Feel free to submit future revisions directly through git. 

??? There is some git? I thought 
https://github.com/refdoc/sword/ could be alive, but 
https://github.com/refdoc/sword/pull/1 persuaded me otherwise.

Blessings,

Matěj
-- 
https://matej.ceplovi.cz/blog/, Jabber: mc...@ceplovi.cz
GPG Finger: 3C76 A027 CA45 AD70 98B5  BC1D 7920 5802 880B C9D8
 
Be pitiful, for every man is fighting a hard battle.
  -- Ian MacLaren, at least 1898


___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-04 Thread Greg Hellings
A little help from Troy reminding me that in SVN I'm the *other* user name
and I've gotten the whole list of patches applied. I used git-svn so I was
able to import them all directly (except the PEP8 one, because I was
tooling around with the SVN client directly on that while bumbling for my
credentials).

Feel free to submit future revisions directly through git. Most of us
around here are, of necessity, at least passingly familiar with the git-svn
bridge. It's clunky and lacks the elegance of direct git, but it does work
- at least for me. I think that Python 3 support is going to have to be
high on the priority list for the engine bindings with Python 2 fading out
in Fedora land in the next two cycles.

--Greg

On Wed, Apr 4, 2018 at 1:52 PM, Greg Hellings 
wrote:

> Well, I'm now not certain if I have commit privileges to that repository.
> I'm pretty sure I have had it in the past, but commit log tells me I'm
> probably hallucinating. And none of my credentials work on that repo.
>
> --Greg
>
> On Wed, Apr 4, 2018 at 11:29 AM, Greg Hellings 
> wrote:
>
>> This hasn't been lost to my memory right now. I have been tearing apart
>> my PC looking for the root cause of intermittent crashes of various
>> intensity (sometimes X/Gnome lock up, sometimes the whole system hard
>> locks) and it appears to be a bad memory slot on the motherboard. As soon
>> as I'm sure of that I'll get the system up again and be able to tackle
>> these patches.
>>
>> --Greg
>>
>> On Sat, Mar 31, 2018 at 1:48 PM, Matěj Cepl  wrote:
>>
>>> On Sat, 31 Mar 2018 12:02:02 -0500, Greg Hellings wrote:
>>> > Personally I'd prefer to see this as a few separate patches.
>>> > Especaially one that separates out the PEP8 stuff from the other
>>> > problems.
>>>
>>> With the greatest pleasure. I was trying to make things as simple as
>>> possible.
>>>
>>> You see, if we were using git (as every civilized project does
>>> these days), I could just point you to the merge/pull request or to my
>>> branch https://gitlab.com/mcepl/sword-tools/tree/fix_av11n_py and be
>>> done with, but alas we are still stuck with SVN.
>>>
>>> Christ is risen (almost here)!
>>>
>>> Matěj
>>>
>>> --
>>> https://matej.ceplovi.cz/blog/, Jabber: mc...@ceplovi.cz
>>> GPG Finger: 3C76 A027 CA45 AD70 98B5  BC1D 7920 5802 880B C9D8
>>>
>>> в чужой монастырь со своим уставом не ходят.
>>> -- Russian proverb (this time actually checked by a native
>>>Russian)
>>>
>>> ___
>>> sword-devel mailing list: sword-devel@crosswire.org
>>> http://www.crosswire.org/mailman/listinfo/sword-devel
>>> Instructions to unsubscribe/change your settings at above page
>>
>>
>>
>
___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-04 Thread Greg Hellings
Well, I'm now not certain if I have commit privileges to that repository.
I'm pretty sure I have had it in the past, but commit log tells me I'm
probably hallucinating. And none of my credentials work on that repo.

--Greg

On Wed, Apr 4, 2018 at 11:29 AM, Greg Hellings 
wrote:

> This hasn't been lost to my memory right now. I have been tearing apart my
> PC looking for the root cause of intermittent crashes of various intensity
> (sometimes X/Gnome lock up, sometimes the whole system hard locks) and it
> appears to be a bad memory slot on the motherboard. As soon as I'm sure of
> that I'll get the system up again and be able to tackle these patches.
>
> --Greg
>
> On Sat, Mar 31, 2018 at 1:48 PM, Matěj Cepl  wrote:
>
>> On Sat, 31 Mar 2018 12:02:02 -0500, Greg Hellings wrote:
>> > Personally I'd prefer to see this as a few separate patches.
>> > Especaially one that separates out the PEP8 stuff from the other
>> > problems.
>>
>> With the greatest pleasure. I was trying to make things as simple as
>> possible.
>>
>> You see, if we were using git (as every civilized project does
>> these days), I could just point you to the merge/pull request or to my
>> branch https://gitlab.com/mcepl/sword-tools/tree/fix_av11n_py and be
>> done with, but alas we are still stuck with SVN.
>>
>> Christ is risen (almost here)!
>>
>> Matěj
>>
>> --
>> https://matej.ceplovi.cz/blog/, Jabber: mc...@ceplovi.cz
>> GPG Finger: 3C76 A027 CA45 AD70 98B5  BC1D 7920 5802 880B C9D8
>>
>> в чужой монастырь со своим уставом не ходят.
>> -- Russian proverb (this time actually checked by a native
>>Russian)
>>
>> ___
>> sword-devel mailing list: sword-devel@crosswire.org
>> http://www.crosswire.org/mailman/listinfo/sword-devel
>> Instructions to unsubscribe/change your settings at above page
>
>
>
___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Re: [sword-devel] Fixes to versification/av11n.py script in sword-tools repo

2018-04-04 Thread Greg Hellings
This hasn't been lost to my memory right now. I have been tearing apart my
PC looking for the root cause of intermittent crashes of various intensity
(sometimes X/Gnome lock up, sometimes the whole system hard locks) and it
appears to be a bad memory slot on the motherboard. As soon as I'm sure of
that I'll get the system up again and be able to tackle these patches.

--Greg

On Sat, Mar 31, 2018 at 1:48 PM, Matěj Cepl  wrote:

> On Sat, 31 Mar 2018 12:02:02 -0500, Greg Hellings wrote:
> > Personally I'd prefer to see this as a few separate patches.
> > Especaially one that separates out the PEP8 stuff from the other
> > problems.
>
> With the greatest pleasure. I was trying to make things as simple as
> possible.
>
> You see, if we were using git (as every civilized project does
> these days), I could just point you to the merge/pull request or to my
> branch https://gitlab.com/mcepl/sword-tools/tree/fix_av11n_py and be
> done with, but alas we are still stuck with SVN.
>
> Christ is risen (almost here)!
>
> Matěj
>
> --
> https://matej.ceplovi.cz/blog/, Jabber: mc...@ceplovi.cz
> GPG Finger: 3C76 A027 CA45 AD70 98B5  BC1D 7920 5802 880B C9D8
>
> в чужой монастырь со своим уставом не ходят.
> -- Russian proverb (this time actually checked by a native
>Russian)
>
> ___
> sword-devel mailing list: sword-devel@crosswire.org
> http://www.crosswire.org/mailman/listinfo/sword-devel
> Instructions to unsubscribe/change your settings at above page
___
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page