rewritten binary branch

366 views
Skip to first unread message

Dustin

unread,
Nov 17, 2008, 1:22:09 AM11/17/08
to memcached

So I finally sat down and figured out how to get branches properly
rewritten. It was very tedious (involved lots of reading commit
messages from way back in the day followed by web searches and stuff),
but I think the results are good. Please take a look at the following
branch and let me know what you guys think:

http://github.com/dustin/memcached/commits/rewritten-bin

In summary, here's what the binary tree looked like:

81 bradfitz <bradfitz@b0b603af-a30f-0410-a34e-baf09ae79d0b>
66 plindner <plindner@b0b603af-a30f-0410-a34e-baf09ae79d0b>
62 dormando <dormando@b0b603af-a30f-0410-a34e-baf09ae79d0b>
41 Toru Maesaka <d...@torum.net>
38 Dustin Sallings <dus...@spy.net>
19 sgrimm <sgrimm@b0b603af-a30f-0410-a34e-baf09ae79d0b>
14 dormando <dorm...@rydia.net>
10 Trond Norbye <tn202803@khepri38.(none)>
7 hachi <ha...@kuiki.net>
6 Aaron Stone <ast...@sixapart.com>
5 Trond Norbye <Trond....@sun.com>
2 Trond Norbye <trond@opensolaris.(none)>
2 Trond Norbye <Trond....@Sun.COM>
1 tmaesaka <mae...@freedom.local>
1 Cosimo Streppone <cos...@opera.com>
1 Eric Lambert <eric.d....@gmail.com>
1 Tomash Brechko <tomash....@gmail.com>
1 Trond Norbye <trond....@sun.com>
1 Trond Norbye <tr...@sunray-srv.norbye.org>
1 acme <acme@b0b603af-a30f-0410-a34e-baf09ae79d0b>
1 dsallings <dsallings@b0b603af-a30f-0410-a34e-baf09ae79d0b>
1 nneul <nneul@b0b603af-a30f-0410-a34e-baf09ae79d0b>
1 sky <sky@b0b603af-a30f-0410-a34e-baf09ae79d0b>

...and here's what it looks like now:

72 Brad Fitzpatrick <br...@danga.com>
54 Paul Lindner <plin...@hi5.com>
45 Dustin Sallings <dus...@spy.net>
44 dormando <dorm...@rydia.net>
40 Toru Maesaka <d...@torum.net>
23 Trond Norbye <Trond....@sun.com>
17 Steven Grimm <sgr...@facebook.com>
11 Tomash Brechko <tomash....@gmail.com>
7 hachi <ha...@kuiki.net>
6 Aaron Stone <ast...@sixapart.com>
6 Brian Aker <br...@tangent.org>
6 Trond Norbye <Trond....@Sun.COM>
3 Chris Goffinet <goff...@yahoo-inc.com>
2 Jean-Francois BUSTARRET <jfbus...@wat.tv>
2 Eric Hodel <drb...@segment7.net>
2 David Bremner <bre...@unb.ca>
2 Evan Miller <emi...@imvu.com>
2 Paolo Borelli <pbor...@katamail.com>
1 Torsten Foertsch <torsten....@gmx.net>
1 js <ebg...@gmail.com>
1 Adam Dixon <adamt...@gmail.com>
1 Artur Bergman <s...@crucially.net>
1 Cosimo Streppone <cos...@opera.com>
1 Dan Christian <dchri...@google.com>
1 Eli Bingham <e...@pandora.com>
1 Eric Lambert <eric.d....@gmail.com>
1 Filipe Laborde <f...@rezox.com>
1 Iain Wade <iw...@optusnet.com.au>
1 Léon Brocard <ac...@astray.com>
1 Maxim Dounin <mdo...@mdounin.ru>
1 Nathan Neulinger <nn...@umr.edu>
1 Paul Querna <ch...@force-elite.com>
1 River Tarnell <ri...@attenuate.org>
1 Steve Peters <st...@fisharerojo.org>
1 Tao Hui <tao...@gmail.com>
1 Thomas van Gulick <tho...@partyflock.nl>
1 Tim Yardley <liq...@haveheart.com>

Notice that people who weren't represented in the authors at all now
are, while retaining svn committers:

http://github.com/dustin/memcached/commit/81f7166d

Dustin

unread,
Nov 17, 2008, 2:07:42 AM11/17/08
to memcached

The previous numbers were commits. We can now also do counts of
actual lines of code in the current base (or any previous revisoin) by
their authors:

Brad Fitzpatrick 4217
Trond Norbye 3859
Paul Lindner 2413
Steven Grimm 2218
Aaron Stone 1942
Toru Maesaka 1636
Dustin Sallings 533
dormando 428
Tomash Brechko 250
hachi 158
Brian Aker 141
Tim Yardley 133
Eric Lambert 82
Jean-Francois BUSTARRET 58
Chris Goffinet 48
Dan Christian 34
Paolo Borelli 33
Evan Miller 30
Adam Dixon 21
David Bremner 20
Filipe Laborde 11
Maxim Dounin 10
Léon Brocard 8
Eric Hodel 8
Eli Bingham 5
Thomas van Gulick 4
Steve Peters 4
Nathan Neulinger 4
Iain Wade 4
Artur Bergman 2
Torsten Foertsch 1
Cosimo Streppone 1


On Nov 16, 10:22 pm, Dustin <dsalli...@gmail.com> wrote:
>   So I finally sat down and figured out how to get branches properly
> rewritten.  It was very tedious (involved lots of reading commit
> messages from way back in the day followed by web searches and stuff),
> but I think the results are good.  Please take a look at the following
> branch and let me know what you guys think:
>
>  http://github.com/dustin/memcached/commits/rewritten-bin
>
>   In summary, here's what the binary tree looked like:
>
>     81  bradfitz <bradfitz@b0b603af-a30f-0410-a34e-baf09ae79d0b>
>     66  plindner <plindner@b0b603af-a30f-0410-a34e-baf09ae79d0b>
>     62  dormando <dormando@b0b603af-a30f-0410-a34e-baf09ae79d0b>
>     41  Toru Maesaka <d...@torum.net>
>     38  Dustin Sallings <dus...@spy.net>
>     19  sgrimm <sgrimm@b0b603af-a30f-0410-a34e-baf09ae79d0b>
>     14  dormando <dorma...@rydia.net>
>     10  Trond Norbye <tn202803@khepri38.(none)>
>      7  hachi <ha...@kuiki.net>
>      6  Aaron Stone <ast...@sixapart.com>
>      5  Trond Norbye <Trond.Nor...@sun.com>
>      2  Trond Norbye <trond@opensolaris.(none)>
>      2  Trond Norbye <Trond.Nor...@Sun.COM>
>      1  tmaesaka <maes...@freedom.local>
>      1  Cosimo Streppone <cos...@opera.com>
>      1  Eric Lambert <eric.d.lamb...@gmail.com>
>      1  Tomash Brechko <tomash.brec...@gmail.com>
>      1  Trond Norbye <trond.nor...@sun.com>
>      1  Trond Norbye <tr...@sunray-srv.norbye.org>
>      1  acme <acme@b0b603af-a30f-0410-a34e-baf09ae79d0b>
>      1  dsallings <dsallings@b0b603af-a30f-0410-a34e-baf09ae79d0b>
>      1  nneul <nneul@b0b603af-a30f-0410-a34e-baf09ae79d0b>
>      1  sky <sky@b0b603af-a30f-0410-a34e-baf09ae79d0b>
>
> ...and here's what it looks like now:
>
>     72  Brad Fitzpatrick <b...@danga.com>
>     54  Paul Lindner <plind...@hi5.com>
>     45  Dustin Sallings <dus...@spy.net>
>     44  dormando <dorma...@rydia.net>
>     40  Toru Maesaka <d...@torum.net>
>     23  Trond Norbye <Trond.Nor...@sun.com>
>     17  Steven Grimm <sgr...@facebook.com>
>     11  Tomash Brechko <tomash.brec...@gmail.com>
>      7  hachi <ha...@kuiki.net>
>      6  Aaron Stone <ast...@sixapart.com>
>      6  Brian Aker <br...@tangent.org>
>      6  Trond Norbye <Trond.Nor...@Sun.COM>
>      3  Chris Goffinet <goffi...@yahoo-inc.com>
>      2  Jean-Francois BUSTARRET <jfbustar...@wat.tv>
>      2  Eric Hodel <drbr...@segment7.net>
>      2  David Bremner <brem...@unb.ca>
>      2  Evan Miller <emil...@imvu.com>
>      2  Paolo Borelli <pbore...@katamail.com>
>      1  Torsten Foertsch <torsten.foert...@gmx.net>
>      1  js <ebgs...@gmail.com>
>      1  Adam Dixon <adamtdi...@gmail.com>
>      1  Artur Bergman <s...@crucially.net>
>      1  Cosimo Streppone <cos...@opera.com>
>      1  Dan Christian <dchrist...@google.com>
>      1  Eli Bingham <e...@pandora.com>
>      1  Eric Lambert <eric.d.lamb...@gmail.com>
>      1  Filipe Laborde <f...@rezox.com>
>      1  Iain Wade <iw...@optusnet.com.au>
>      1  Léon Brocard <a...@astray.com>
>      1  Maxim Dounin <mdou...@mdounin.ru>
>      1  Nathan Neulinger <nn...@umr.edu>
>      1  Paul Querna <c...@force-elite.com>
>      1  River Tarnell <ri...@attenuate.org>
>      1  Steve Peters <st...@fisharerojo.org>
>      1  Tao Hui <taoh...@gmail.com>

Dustin

unread,
Nov 17, 2008, 2:18:03 AM11/17/08
to memcached

On Nov 16, 11:07 pm, Dustin <dsalli...@gmail.com> wrote:
>   The previous numbers were commits.  We can now also do counts of
> actual lines of code in the current base (or any previous revisoin) by
> their authors:

OK, I'm going to stop rambling in this thread after this one. Our
currency in OSS is name recognition, so let's keep these people paid
appropriately. :)

Interesting, if we just include *.c and *.h at the top level:

Steven Grimm 1994
Brad Fitzpatrick 1978
Trond Norbye 1330
Toru Maesaka 993
Paul Lindner 521
Dustin Sallings 459
dormando 216
Brian Aker 139
Tim Yardley 125
Tomash Brechko 92
Not Committed Yet 92
Paolo Borelli 27
David Bremner 10
Adam Dixon 9
Eric Hodel 8
Evan Miller 6
Maxim Dounin 5
Filipe Laborde 4
Jean-Francois BUSTARRET 2

Brad Fitzpatrick

unread,
Nov 17, 2008, 2:22:36 AM11/17/08
to memc...@googlegroups.com, Anatoly Vorobey
Where's Anatoly Vorobey in the list?  He did a ton of the early work on the server with me.

- Brad

Dustin

unread,
Nov 17, 2008, 2:36:14 AM11/17/08
to memcached

On Nov 16, 11:22 pm, "Brad Fitzpatrick" <b...@danga.com> wrote:
> Where's Anatoly Vorobey in the list?  He did a ton of the early work on the
> server with me.

The oldest commit I have is this:

commit b467be471aef973b912cf7e5742860f7817bb089
Author: Brad Fitzpatrick <br...@danga.com>
Date: Thu Mar 23 06:41:44 2006 +0000

moving server stuff down into its own directory

It seems that there's no history with the move, so that's as far back
as I've got.

Brad Fitzpatrick

unread,
Nov 17, 2008, 3:30:03 AM11/17/08
to memc...@googlegroups.com
I still have the cvs histories somewhere, if you really want an archeology/surgery project.

Dustin

unread,
Nov 17, 2008, 4:04:36 AM11/17/08
to memcached

On Nov 17, 12:30 am, "Brad Fitzpatrick" <b...@danga.com> wrote:
> I still have the cvs histories somewhere, if you really want an
> archeology/surgery project.

I pulled the svn history from danga and...spent a bunch more time on
this. I actually meant to write code tonight...

I grafted the last commit before the move to the first commit after
the move with the locations adjusted. That made the ``move'' commit
empty (and I removed empty commits). This gives us a much better
history with the following authors (again, some google searches, so if
some email addresses are wrong, I apologize):

158 Brad Fitzpatrick <br...@danga.com>
52 Paul Lindner <plin...@hi5.com>
45 Dustin Sallings <dus...@spy.net>
44 dormando <dorm...@rydia.net>
40 Toru Maesaka <d...@torum.net>
23 Trond Norbye <Trond....@sun.com>
17 Steven Grimm <sgr...@facebook.com>
15 Anatoly Vorobey <mel...@pobox.com>
11 Tomash Brechko <tomash....@gmail.com>
7 hachi <ha...@kuiki.net>
6 Trond Norbye <Trond....@Sun.COM>
6 Brian Aker <br...@tangent.org>
6 Aaron Stone <ast...@sixapart.com>
5 Evan Martin <mar...@danga.com>
3 Chris Goffinet <goff...@yahoo-inc.com>
3 Andrei Nigmatulin <ani...@monamour.ru>
2 Evan Miller <emi...@imvu.com>
2 Brion Vibber <br...@pobox.com>
2 David Bremner <bre...@unb.ca>
2 Doug Porter <d...@dsp.name>
2 Eric Hodel <drb...@segment7.net>
2 Jay Bonci <jayb...@debian.org>
2 Jean-Francois BUSTARRET <jfbus...@wat.tv>
2 Paolo Borelli <pbor...@katamail.com>
1 Iain Wade <iw...@optusnet.com.au>
1 Jason Titus <jti...@postini.com>
1 Artur Bergman <s...@crucially.net>
1 Adam Dixon <adamt...@gmail.com>
1 Jeff Lawson <jeff_...@ud.com>
1 Lisa Seelye <li...@gentoo.org>
1 Léon Brocard <ac...@astray.com>
1 Maxim Dounin <mdo...@mdounin.ru>
1 Michael Alan Dorman <mdo...@debian.org>
1 Nathan Neulinger <nn...@umr.edu>
1 js <ebg...@gmail.com>
1 Elizabeth Mattijsen <l...@dijkmat.nl>
1 Paul Querna <ch...@force-elite.com>
1 Peter van Dijk <pe...@nextgear.nl>
1 Richard Russo <rus...@msoe.edu>
1 River Tarnell <ri...@attenuate.org>
1 Ryan T. Dean <rtd...@cytherianage.net>
1 Steve Peters <st...@fisharerojo.org>
1 Eli Bingham <e...@pandora.com>
1 Tao Hui <tao...@gmail.com>
1 Ted Schundler <tschu...@gmail.com>
1 Thomas van Gulick <tho...@partyflock.nl>
1 Tim Yardley <liq...@haveheart.com>
1 Don MacAskill <d...@smugmug.com>
1 Torsten Foertsch <torsten....@gmx.net>
1 David Phillips <elec...@gmail.com>
1 Dan Christian <dchri...@google.com>
1 Cosimo Streppone <cos...@opera.com>
1 Eric Lambert <eric.d....@gmail.com>
1 Filipe Laborde <f...@rezox.com>
1 Jamie McCarthy <ja...@mccarthy.vg>

or the following (by line of author from *.[ch] at the top level of
the most recent commit):

Steven Grimm 1995
Brad Fitzpatrick 1682
Trond Norbye 1263
Toru Maesaka 1019
Paul Lindner 510
Dustin Sallings 452
Anatoly Vorobey 303
dormando 196
Brian Aker 140
Tim Yardley 127
Not Committed Yet 92
Tomash Brechko 89
Paolo Borelli 27
Evan Martin 22
Lisa Seelye 16
David Bremner 10
Adam Dixon 9
Jason Titus 8
Eric Hodel 8
Andrei Nigmatulin 7
Evan Miller 6
Elizabeth Mattijsen 6
Maxim Dounin 5
Brion Vibber 5
Filipe Laborde 4
Steve Peters 3
Ryan T. Dean 2
Peter van Dijk 2

Chris Goffinet

unread,
Nov 17, 2008, 4:16:41 AM11/17/08
to memc...@googlegroups.com
Fantastic work. Thanks for doing this Dustin.

--
Chris Goffinet
MyBlogLog Senior Performance Engineer

Yahoo!
San Francisco, CA
United States

Toru Maesaka

unread,
Nov 20, 2008, 9:02:46 PM11/20/08
to memc...@googlegroups.com
Hi!

Sorry it took this long to reply... anyway this is soooo awesome!!
thanks Dustin.

From glancing through that tree, there are several commits that
shouldn't be credited to me. This happened when I brought over the
patches from the stable tree to the binary tree. Here is the hash list
and the author that should be credited:

a4ccd0105294cf4ea7200b46e88bcaa2e81769d7 (Dormando)
2bb81e14df2a90e90c688fc8ddfafbd388c5410e (Dormando)
3a34c127153acb2928c2c873558f842d465a2b18 (Brian Aker)
1a9672f5fa6672cc15e5e1920f7dfcc944b755e9 (Brian Aker)
ac9397d254f0c8204f73d4886b41f3bbfeda23af (Ricky Zhou)
2aeae00b8851dce33d5da1d4dd503669fb4ccb10 (Dormando)
de9106786b650304545f275dc25cc1fb9ff8c156 (Facebook + Dormando)
931ed256e0505b28a40a22caace220b3c4bdf419 (Facebook + Dormando)

Apologies for causing more work but like you say, I'm also a firm
believer in making sure that the right people get credited :)

Cheers,
Toru

Dustin

unread,
Nov 21, 2008, 2:40:49 PM11/21/08
to memcached

On Nov 20, 6:02 pm, "Toru Maesaka" <tmaes...@gmail.com> wrote:
> Hi!
>
> Sorry it took this long to reply... anyway this is soooo awesome!!
> thanks Dustin.
>
> From glancing through that tree, there are several commits that
> shouldn't be credited to me. This happened when I brought over the
> patches from the stable tree to the binary tree. Here is the hash list
> and the author that should be credited:
>
> a4ccd0105294cf4ea7200b46e88bcaa2e81769d7 (Dormando)
> 2bb81e14df2a90e90c688fc8ddfafbd388c5410e (Dormando)
> 3a34c127153acb2928c2c873558f842d465a2b18 (Brian Aker)
> 1a9672f5fa6672cc15e5e1920f7dfcc944b755e9 (Brian Aker)
> ac9397d254f0c8204f73d4886b41f3bbfeda23af (Ricky Zhou)
> 2aeae00b8851dce33d5da1d4dd503669fb4ccb10 (Dormando)
> de9106786b650304545f275dc25cc1fb9ff8c156 (Facebook + Dormando)
> 931ed256e0505b28a40a22caace220b3c4bdf419 (Facebook + Dormando)

Great, thanks a lot. I applied these (the last two are listed as
Dormando unless he or someone else has other author information) this
morning and pushed out a new tree (rewritten, so all the hashes are
invalid again). I also realized I had ended up with a couple of
Trond's again, so I fixed those.

I think this tree's in pretty good shape, but it's fairly isolated.
Once enough people think this is an accurate representation of the
project, I think it would be good to get more development moved over
to this tree.

Does anyone have any concerns about doing this?

Trond Norbye

unread,
Nov 24, 2008, 6:54:16 AM11/24/08
to memc...@googlegroups.com, Dustin Sallings

On Nov 21, 2008, at 8:40 PM, Dustin wrote:
>
> I think this tree's in pretty good shape, but it's fairly isolated.
> Once enough people think this is an accurate representation of the
> project, I think it would be good to get more development moved over
> to this tree.
>
> Does anyone have any concerns about doing this?


Sorry for the late answer, but I have been on vacation and this was
great news!

Great work Dustin! I'll be happy to clone your tree and start working
on that :)

Cheers,

Trond

steve.yen

unread,
Nov 25, 2008, 12:47:22 PM11/25/08
to memcached
Reply all
Reply to author
Forward
0 new messages