Kōrerorero

Fixing whitespace when applying patches with git

The way the Koha project works is that we require any patch to be signed off at least by 2 people, usually 3, ideally even more. So we do a lot of applying of patches. Using git-bz this is very easy, but occasionally when applying a patch you spot whitespace errors and if you are like me, you want to fix them, and if you are also like me, you are lazy.

What I have done is set these 2 options

git config --global core.whitespace trailing-space,space-before-tab
git config --global apply.whitespace fix

So this is what used to happen:

% git checkout -b 5729 kc/master
Previous HEAD position was 288c1a7... Bug 7139 : 
Log addition and deletion of circulation messages
Branch 5729 set up to track remote branch master from kc.
Switched to a new branch '5729'
% git bz apply 5729
bugs.koha-community.org
Bug 5729 - Add coins information to the intranet

Bug 5729 - Add CoinS to intranet
Apply? [yn] y

Applying: Bug 5729 - Add CoinS to intranet
/home/chrisc/git/catalyst-koha/.git/rebase-apply/patch:61: trailing whitespace.
[% END %]
/home/chrisc/git/catalyst-koha/.git/rebase-apply/patch:76: trailing whitespace.
[% END %]
/home/chrisc/git/catalyst-koha/.git/rebase-apply/patch:91: trailing whitespace.
[% END %]
warning: 3 lines add whitespace errors.

And now with the config set

% git bz apply 5729
bugs.koha-community.org
Bug 5729 - Add coins information to the intranet

Bug 5729 - Add CoinS to intranet
Apply? [yn] y

Applying: Bug 5729 - Add CoinS to intranet
/home/chrisc/git/catalyst-koha/.git/rebase-apply/patch:61: trailing whitespace.
    [% END %]
/home/chrisc/git/catalyst-koha/.git/rebase-apply/patch:76: trailing whitespace.
[% END %]
/home/chrisc/git/catalyst-koha/.git/rebase-apply/patch:91: trailing whitespace.
    [% END %]
warning: 3 lines applied after fixing whitespace errors.

Patch applied with the whitespace fix I can now test then signoff

git commit --amend -s

And attach to the bug

git bz attach -e 5729 HEAD

Statistics for Koha 3.4.7

Another bug fix release, this time on the 3.4.x stable branch. Released

Processed 49 changesets from 14 developers
12 employers found
A total of 6632 lines added, 2138 removed (delta 4494)

Developers with the most changesets
Chris Cormack	10	20.4%
Chris Nighswonger	6	12.2%
Ian Walls	6	12.2%
Paul Poulain	5	10.2%
Frédérick Capovilla	5	10.2%
Katrin Fischer	4	8.2%
Owen Leonard	3	6.1%
Frédéric Demians	2	4.1%
Liz Rea	2	4.1%
Maxime Pelletier	2	4.1%
Salvador Zaragoza Rubio	1	2.0%
Joy Nelson	1	2.0%
Nahuel ANGELINETTI	1	2.0%
Marcel de Rooy	1	2.0%

Developers with the most changed lines
Frédérick Capovilla	5913	88.7%
Chris Nighswonger	388	5.8%
Chris Cormack	178	2.7%
Owen Leonard	34	0.5%
Katrin Fischer	33	0.5%
Nahuel ANGELINETTI	25	0.4%
Paul Poulain	20	0.3%
Ian Walls	15	0.2%
Frédéric Demians	14	0.2%
Liz Rea	13	0.2%
Marcel de Rooy	13	0.2%
Maxime Pelletier	8	0.1%
Salvador Zaragoza Rubio	1	0.0%
Joy Nelson	1	0.0%

Developers with the most lines removed
Owen Leonard	21	1.0%
Frédéric Demians	3	0.1%

Developers with the most signoffs (total 107)
Chris Nighswonger	46	43.0%
Paul Poulain	29	27.1%
Chris Cormack	8	7.5%
Katrin Fischer	7	6.5%
Owen Leonard	3	2.8%
Liz Rea	3	2.8%
Julian Maurice	3	2.8%
Nicole C. Engard	3	2.8%
Frère Sébastien Marie	1	0.9%
Magnus Enger	1	0.9%
Brendan	1	0.9%
Piotr Wejman	1	0.9%
Ian Walls	1	0.9%

Developers with the most reviews (total 0)

Developers with the most test credits (total 0)

Developers who gave the most tested-by credits (total 0)

Developers with the most report credits (total 0)

Developers who gave the most report credits (total 0)

Top changeset contributors by employer
Catalyst	10	20.4%
Libeo	7	14.3%
ByWater-Solutions	7	14.3%
Foundations	6	12.2%
Biblibre	6	12.2%
BSZ-BW	4	8.2%
ACPL	3	6.1%
Tamil	2	4.1%
NEKLS	2	4.1%
MASmedios	1	2.0%
Rijksmuseum	1	2.0%

Top lines changed by employer
Libeo	5921	88.8%
Foundations	389	5.8%
Catalyst	180	2.7%
Biblibre	45	0.7%
ACPL	37	0.6%
BSZ-BW	33	0.5%
ByWater-Solutions	19	0.3%
Tamil	14	0.2%
NEKLS	13	0.2%
Rijksmuseum	13	0.2%
MASmedios	1	0.0%

Employers with the most signoffs (total 107)
Foundations	46	43.0%
Biblibre	32	29.9%
Catalyst	8	7.5%
BSZ-BW	7	6.5%
ByWater-Solutions	5	4.7%
ACPL	3	2.8%
NEKLS	2	1.9%
Libriotech	1	0.9%
wizzyrea@gmail.com	1	0.9%
semarie-koha@latrappe.fr	1	0.9%
ropuch@bagno.be	1	0.9%

Employers with the most hackers (total 14)
Biblibre	2	14.3%
ByWater-Solutions	2	14.3%
Libeo	2	14.3%
Foundations	1	7.1%
Catalyst	1	7.1%
BSZ-BW	1	7.1%
ACPL	1	7.1%
NEKLS	1	7.1%
Tamil	1	7.1%
Rijksmuseum	1	7.1%
MASmedios	1	7.1%

Chicken pox induced random facts

I was signing off some patches today, as my chicken pox ridden son slumbered beside me (as you do) and I thought, I wonder how many have been signed off since we explicitly moved to tracking them.

Luckily Bugzilla keeps all that kind of information, so I was able to find out that since November 30 2010, 1171 patches have been signed off. A pretty impressive little fact I reckon.

The busiest month in the last year was April 2011, with 452 commits from 40 different authors. There have been 86 different authors committing to code to Koha in 2011, with 159 in total over the history of the project.

So, we are looking for number 160 .. could that be you?

Statistics for 3.6.1

Koha 3.6.1 was released a few days ago, it was a bugfix release with a couple of security fixes, here are the statistics for it. (Not including the translation files)

Koha releases bugfix releases once a month (well actually 2 per month at the moment one for 3.4.x and one for 3.6.x) and one feature release every 6 months. So these stats are just for the 3.6.x stable branch over the last month.

Processed 54 changesets from 15 developers
12 employers found
A total of 6478 lines added, 2171 removed (delta 4307)

Developers with the most changesets
Chris Cormack	12	22.2%
Ian Walls	7	13.0%
Owen Leonard	6	11.1%
Paul Poulain	5	9.3%
Frédérick Capovilla	5	9.3%
Chris Nighswonger	4	7.4%
Katrin Fischer	4	7.4%
Frédéric Demians	2	3.7%
Liz Rea	2	3.7%
Maxime Pelletier	2	3.7%
Julian Maurice	1	1.9%
Salvador Zaragoza Rubio	1	1.9%
Joy Nelson	1	1.9%
Nahuel ANGELINETTI	1	1.9%
Marcel de Rooy	1	1.9%

Developers with the most changed lines
Frédérick Capovilla	5913	90.7%
Chris Nighswonger	203	3.1%
Chris Cormack	188	2.9%
Owen Leonard	56	0.9%
Katrin Fischer	33	0.5%
Nahuel ANGELINETTI	25	0.4%
Ian Walls	20	0.3%
Paul Poulain	20	0.3%
Frédéric Demians	14	0.2%
Liz Rea	13	0.2%
Marcel de Rooy	13	0.2%
Maxime Pelletier	8	0.1%
Julian Maurice	1	0.0%
Salvador Zaragoza Rubio	1	0.0%
Joy Nelson	1	0.0%

Developers with the most lines removed
Owen Leonard	28	1.3%
Frédéric Demians	3	0.1%

Developers with the most signoffs (total 125)
Chris Nighswonger	52	41.6%
Paul Poulain	33	26.4%
Katrin Fischer	12	9.6%
Chris Cormack	9	7.2%
Owen Leonard	3	2.4%
Liz Rea	3	2.4%
Julian Maurice	3	2.4%
Nicole C. Engard	3	2.4%
Frère Sébastien Marie	1	0.8%
Jared Camins-Esakov	1	0.8%
Magnus Enger	1	0.8%
Brendan	1	0.8%
François Charbonnier	1	0.8%
Piotr Wejman	1	0.8%
Ian Walls	1	0.8%

Developers with the most reviews (total 0)

Developers with the most test credits (total 0)

Developers who gave the most tested-by credits (total 0)

Developers with the most report credits (total 0)

Developers who gave the most report credits (total 0)

Top changeset contributors by employer
Catalyst	12	22.2%
ByWater-Solutions	8	14.8%
Biblibre	7	13.0%
ACPL	6	11.1%
frederick.capovilla@libeo.com	5	9.3%
BSZ-BW	4	7.4%
Foundations	4	7.4%
maxime.pelletier@libeo.com	2	3.7%
Tamil	2	3.7%
NEKLS	2	3.7%
salvazm@masmedios.com	1	1.9%
Rijksmuseum	1	1.9%

Top lines changed by employer
frederick.capovilla@libeo.com	5913	90.7%
Foundations	204	3.1%
Catalyst	192	2.9%
ACPL	59	0.9%
Biblibre	46	0.7%
BSZ-BW	33	0.5%
ByWater-Solutions	24	0.4%
Tamil	14	0.2%
NEKLS	13	0.2%
Rijksmuseum	13	0.2%
maxime.pelletier@libeo.com	8	0.1%
salvazm@masmedios.com	1	0.0%

Employers with the most signoffs (total 125)
Foundations	52	41.6%
Biblibre	37	29.6%
BSZ-BW	12	9.6%
Catalyst	9	7.2%
ByWater-Solutions	5	4.0%
ACPL	3	2.4%
NEKLS	2	1.6%
Libriotech	1	0.8%
wizzyrea@gmail.com	1	0.8%
semarie-koha@latrappe.fr	1	0.8%
ropuch@bagno.be	1	0.8%
jcamins@cpbibliography.com	1	0.8%

Employers with the most hackers (total 15)
Biblibre	3	20.0%
ByWater-Solutions	2	13.3%
Foundations	1	6.7%
BSZ-BW	1	6.7%
Catalyst	1	6.7%
ACPL	1	6.7%
NEKLS	1	6.7%
frederick.capovilla@libeo.com	1	6.7%
Tamil	1	6.7%
Rijksmuseum	1	6.7%
maxime.pelletier@libeo.com	1	6.7%
salvazm@masmedios.com	1	6.7%

Unsung heroes of Koha – 22

The go it aloners

For every Library that contracts with a support company to get Koha installed and migrated, I estimate there are 4 who go it alone. It still amazes me how many Koha installs there are around the world.

On the mailing list we usually only hear from those having issues, its not until you do trawl around the net a bit that you discover how many Koha users there are. One of my current favourites are the public libraries of the Philippines. The National Library there is rolling out Koha to every public library in the philipines. That is a lot of libraries, all done with inhouse support/expertise.

So well done to all those users who do it themselves, pop on the mailing list or irc sometime and say hi.

Random things you could overhear at our house

Chris: Why are you in that plastic bag?
Kahu: I’m trying to sleep.
Chris: Go sleep in your bed, not in a giant plastic bag
Kahu: Oh yeah.

Laurel: Atarau, stop driving your car into my face

Chris: If you eat this medicine I’ll give you $100
Atarau: Araarrgh bleargh *spit* *spit*

Chris: Ok, I tried to hide the medicine in his spaghetti.

Kahu (when opening his presents): Oh a book of Maori words, that’s just what I wanted!!

(Never mind the huge car garage and the cool marble game he just got, nope the dictionary is his favourite)

Tonsils and Adenoids are gone

Yesterday Te Po Atarau had his tonsils and adenoids removed as well as his right ear drained. He came through the operations fine and stayed in overnight to sleep off the anaesthetic but is coming home today. Here is a quick picture I snapped with my phone of him trying to eat an ice block but mostly just falling asleep.

Unsung Heroes 21 – The people behind es.koha-community.org

I figure while I’m mentioning internationalisation, it would be fitting to mention all the people behind http://es.koha-community.org/. I am not going to name names, because I will miss one of them, but they do a great job of keeping it up to date, and providing valuable information to the Spanish speaking users of Koha.

I suspect the same people are behind the translation of the manuals and Koha itself into Spanish. Well done to them all, and keep up the great work.

Statistics for the 3.4.6 release

3.4.6 is a minor release (bugfix releases are released monthly) the release notes can be read at http://koha-community.org/koha-3-4-6/

Here are the statistics for it.

Processed 127 changesets from 30 developers
22 employers found
A total of 7718 lines added, 6369 removed (delta 1349)

Developers with the most changesets
Ian Walls	18	14.2%
Chris Cormack	17	13.4%
Owen Leonard	12	9.4%
Paul Poulain	11	8.7%
Marcel de Rooy	10	7.9%
Robin Sheat	7	5.5%
Frédéric Demians	7	5.5%
Chris Nighswonger	6	4.7%
Srdjan Jankovic	6	4.7%
Liz Rea	4	3.1%
Katrin Fischer	3	2.4%
Frédérick Capovilla	2	1.6%
Magnus Enger	2	1.6%
Maxime Pelletier	2	1.6%
Colin Campbell	2	1.6%
D Ruth Bavousett	2	1.6%
Mason James	2	1.6%
Jonathan Druart	2	1.6%
Matthias Meusburger	1	0.8%
Nicole C. Engard	1	0.8%
Jared Camins-Esakov	1	0.8%
Greg Barniskis	1	0.8%
Galen Charlton	1	0.8%
Juan Romay Sieira	1	0.8%
Larry Baerveldt	1	0.8%
Janusz Kaczmarek	1	0.8%
Meenakshi.R	1	0.8%
Joy Nelson	1	0.8%
MJ Ray	1	0.8%
Alex Arnaud	1	0.8%

Developers with the most changed lines
Chris Cormack	5369	68.4%
Srdjan Jankovic	507	6.5%
Janusz Kaczmarek	339	4.3%
Frédéric Demians	284	3.6%
Chris Nighswonger	238	3.0%
Owen Leonard	186	2.4%
Marcel de Rooy	170	2.2%
Robin Sheat	150	1.9%
Ian Walls	129	1.6%
Frédérick Capovilla	90	1.1%
MJ Ray	82	1.0%
Paul Poulain	67	0.9%
Katrin Fischer	36	0.5%
Mason James	20	0.3%
Maxime Pelletier	18	0.2%
Jonathan Druart	18	0.2%
Magnus Enger	13	0.2%
Liz Rea	12	0.2%
D Ruth Bavousett	11	0.1%
Galen Charlton	11	0.1%
Colin Campbell	9	0.1%
Greg Barniskis	7	0.1%
Joy Nelson	3	0.0%
Matthias Meusburger	2	0.0%
Jared Camins-Esakov	2	0.0%
Nicole C. Engard	1	0.0%
Juan Romay Sieira	1	0.0%
Larry Baerveldt	1	0.0%
Meenakshi.R	1	0.0%
Alex Arnaud	1	0.0%

Developers with the most lines removed
Frédéric Demians	24	0.4%
MJ Ray	18	0.3%
Colin Campbell	5	0.1%
Paul Poulain	4	0.1%
Katrin Fischer	3	0.0%
Maxime Pelletier	3	0.0%
Magnus Enger	3	0.0%

Developers with the most signoffs (total 381)
Chris Nighswonger	121	31.8%
Chris Cormack	105	27.6%
Ian Walls	48	12.6%
Paul Poulain	22	5.8%
Katrin Fischer	22	5.8%
Nicole C. Engard	14	3.7%
Owen Leonard	10	2.6%
Frédéric Demians	7	1.8%
Liz Rea	7	1.8%
Magnus Enger	4	1.0%
Jared Camins-Esakov	3	0.8%
Galen Charlton	3	0.8%
Nicole Engard	2	0.5%
Robin Sheat	2	0.5%
Alex Arnaud	1	0.3%
Ian Bays	1	0.3%
Henri-Damien LAURENT	1	0.3%
Steven Callender	1	0.3%
Julian Maurice	1	0.3%
Amit Gupta	1	0.3%
Brendan	1	0.3%
Melia Meggs	1	0.3%
Ulrich Kleiber	1	0.3%
D Ruth Bavousett	1	0.3%
Marcel de Rooy	1	0.3%

Developers with the most reviews (total 0)

Developers with the most test credits (total 0)

Developers who gave the most tested-by credits (total 0)

Developers with the most report credits (total 0)

Developers who gave the most report credits (total 0)

Top changeset contributors by employer
Catalyst	30	23.6%
ByWater-Solutions	23	18.1%
Biblibre	15	11.8%
ACPL	12	9.4%
Rijksmuseum	10	7.9%
Tamil	7	5.5%
Foundations	6	4.7%
NEKLS	4	3.1%
BSZ-BW	3	2.4%
Libriotech	2	1.6%
KohaAloha	2	1.6%
maxime.pelletier@libeo.com	2	1.6%
PTFS-Europe	2	1.6%
juan.sieira@xercode.es	1	0.8%
frederick.capovilla@sys-tech.net	1	0.8%
mjr@phonecoop.coop	1	0.8%
gbarniskis@gmail.com	1	0.8%
frederick.capovilla@libeo.com	1	0.8%
meenakshi.r@osslabs.biz	1	0.8%
januszop@gmail.com	1	0.8%
Equinox	1	0.8%
jcamins@cpbibliography.com	1	0.8%

Top lines changed by employer
Catalyst	6033	76.8%
januszop@gmail.com	339	4.3%
Tamil	298	3.8%
Foundations	242	3.1%
ACPL	186	2.4%
Rijksmuseum	176	2.2%
ByWater-Solutions	155	2.0%
Biblibre	119	1.5%
frederick.capovilla@libeo.com	86	1.1%
mjr@phonecoop.coop	82	1.0%
BSZ-BW	40	0.5%
KohaAloha	20	0.3%
maxime.pelletier@libeo.com	18	0.2%
Libriotech	13	0.2%
NEKLS	12	0.2%
Equinox	11	0.1%
PTFS-Europe	9	0.1%
gbarniskis@gmail.com	7	0.1%
frederick.capovilla@sys-tech.net	4	0.1%
jcamins@cpbibliography.com	2	0.0%
juan.sieira@xercode.es	1	0.0%
meenakshi.r@osslabs.biz	1	0.0%

Employers with the most signoffs (total 381)
Foundations	121	31.8%
Catalyst	107	28.1%
ByWater-Solutions	65	17.1%
Biblibre	25	6.6%
BSZ-BW	23	6.0%
ACPL	10	2.6%
Tamil	7	1.8%
NEKLS	6	1.6%
Libriotech	4	1.0%
Equinox	4	1.0%
jcamins@cpbibliography.com	3	0.8%
nengard@gmail.com	2	0.5%
Rijksmuseum	1	0.3%
PTFS-Europe	1	0.3%
amit.gupta@osslabs.biz	1	0.3%
wizzyrea@gmail.com	1	0.3%

Employers with the most hackers (total 31)
ByWater-Solutions	5	16.1%
Biblibre	4	12.9%
Catalyst	3	9.7%
Foundations	1	3.2%
BSZ-BW	1	3.2%
ACPL	1	3.2%
Tamil	1	3.2%
NEKLS	1	3.2%
Libriotech	1	3.2%
Equinox	1	3.2%
jcamins@cpbibliography.com	1	3.2%
Rijksmuseum	1	3.2%
PTFS-Europe	1	3.2%
januszop@gmail.com	1	3.2%
frederick.capovilla@libeo.com	1	3.2%
mjr@phonecoop.coop	1	3.2%
KohaAloha	1	3.2%
maxime.pelletier@libeo.com	1	3.2%
gbarniskis@gmail.com	1	3.2%
frederick.capovilla@sys-tech.net	1	3.2%
juan.sieira@xercode.es	1	3.2%
meenakshi.r@osslabs.biz	1	3.2%

Unsung heroes 20 – Georgia Katsarou

Following on from the translator theme, Georgia Katsarou has done a huge amount of work on the Greek translation of Koha. As well as that, she has spent lots of time on translating the Koha manual into Greek. If that wasn’t enough she also runs http://kohaprojectgr.greeklis.org/ which is a very valuable resource for people seeking more information about Koha.

I bet for a lot of you, she really is unsung, but she is definitely a hero (heroine?). I know I’ve said this again and again, but it is the people around Koha, not the software (although that’s pretty good too), that make it a great project to work on.