A note from the interim Git maintainer

A note from the interim Git maintainer

[Shawn O. Pearce]

As mentioned recently by Junio, Junio is away on family leave and
a much deserved vacation until ~Oct 6th.  Until he gets back I am
offering up my services as patch monkey to keep us moving along.

My tree is being published here:

  git:    git://repo.or.cz/git/spearce.git
		  repo.or.cz/srv/git/git/spearce.git
          http://repo.or.cz/r/git/spearce.git

  gitweb: http://repo.or.cz/w/git/spearce.git


The usual maint/master/next/pu stuff applies.  I'm basically just
picking up from where Junio left off.

I would appreciate it if anyone who normally tracks Junio's "next"
or "master" branch for their production work can switch over to my
next (or master) branch for the next few weeks.  Something about
many eyeballs and fewer bugs.

Patches can be CC'd to me, or just sent to the list.  If I have
dropped something, please feel free to give me a gentle prod.

I know that I am quite behind on git-gui patches. I think I'm going
to spend the better part of today just on Git to get everything
caught up.

-- 
Shawn.

Re: A note from the interim Git maintainer

[Mike Ralphson]

2008/9/24 Shawn O. Pearce <spearce@spearce.org>:
> My tree is being published here:
>
>  git:    git://repo.or.cz/git/spearce.git
>                  repo.or.cz/srv/git/git/spearce.git
>          http://repo.or.cz/r/git/spearce.git
>
>  gitweb: http://repo.or.cz/w/git/spearce.git
>
> The usual maint/master/next/pu stuff applies.  I'm basically just
> picking up from where Junio left off.
>
> I would appreciate it if anyone who normally tracks Junio's "next"
> or "master" branch for their production work can switch over to my
> next (or master) branch for the next few weeks.  Something about
> many eyeballs and fewer bugs.

Now there are new commits in this tree, Gitbuild
[http://repo.or.cz/w/git/gitbuild.git] has spearce/master,
spearce/maint and spearce/next branches and I'm currently running my
automated AIX test builds on these branches and pushing the relevant
tags along.

Jeff, if you want to switch your BSD builds to Shawn's tree too, I
made and pushed a tiny change to the gitbuild.sh script to allow for
the spearce/{branch} format becoming spearce_{branch} in the tag
names.

Cheers, Mike

Re: A note from the interim Git maintainer

[Jeff King]

On Fri, Sep 26, 2008 at 02:24:31PM +0100, Mike Ralphson wrote:

> Jeff, if you want to switch your BSD builds to Shawn's tree too, I
> made and pushed a tiny change to the gitbuild.sh script to allow for
> the spearce/{branch} format becoming spearce_{branch} in the tag
> names.

Thanks, that's a good idea. I'm building Shawn's master (on my todo is
adding the other branches, too, but I need to tweak my script or tweak
gitbuild.sh and switch to it).

-Peff

Re: A note from the interim Git maintainer

[Mike Ralphson]

2008/9/26 Jeff King <peff@peff.net>
>
> On Fri, Sep 26, 2008 at 02:24:31PM +0100, Mike Ralphson wrote:
>
> > Jeff, if you want to switch your BSD builds to Shawn's tree too, I
> > made and pushed a tiny change to the gitbuild.sh script to allow for
> > the spearce/{branch} format becoming spearce_{branch} in the tag
> > names.
>
> Thanks, that's a good idea. I'm building Shawn's master (on my todo is
> adding the other branches, too, but I need to tweak my script or tweak
> gitbuild.sh and switch to it).

Feel free to push changes to gitbuild.sh, including getting rid of
anything which looks environment-specific.

Mike

obscure platform autobuilders

[Jeff King]

On Mon, Sep 29, 2008 at 08:51:29AM +0100, Mike Ralphson wrote:

> Feel free to push changes to gitbuild.sh, including getting rid of
> anything which looks environment-specific.

I actually went a step further and revamped the architecture a bit.
Check out the "platform" branch in gitbuild.git. My goal was to try to
include more information in the gitbuild repository about exactly what
goes into the test setup for each platform.

I'm currently building, testing, and pushing FreeBSD 6.1 and Solaris 2.8
with it (you can see the copious tests I am skipping in
jk/solaris/config).

If you like this approach, please go ahead and add an "mr/aix" profile
with your setup. See the README for details, and let me know if you have
questions.  The script is a mish-mash of yours, mine, and some extra
rewrites. I wouldn't be surprised if it needs a tweak or two. :)

-Peff

Re: obscure platform autobuilders

[Mike Ralphson]

2008/10/1 Jeff King <peff@peff.net>:
> On Mon, Sep 29, 2008 at 08:51:29AM +0100, Mike Ralphson wrote:
>> Feel free to push changes to gitbuild.sh, including getting rid of
>> anything which looks environment-specific.
>
> I actually went a step further and revamped the architecture a bit.
> Check out the "platform" branch in gitbuild.git. My goal was to try to
> include more information in the gitbuild repository about exactly what
> goes into the test setup for each platform.

Very nice!

> I'm currently building, testing, and pushing FreeBSD 6.1 and Solaris 2.8
> with it (you can see the copious tests I am skipping in
> jk/solaris/config).

My googling led me to think that INTERNAL_QSORT would be a good idea
on at least some versions of Solaris... it may depend on the fs
though.

> If you like this approach, please go ahead and add an "mr/aix" profile
> with your setup. See the README for details, and let me know if you have
> questions.  The script is a mish-mash of yours, mine, and some extra
> rewrites. I wouldn't be surprised if it needs a tweak or two. :)

How about this - let me know if ok, and I'll push it.

diff --git a/README b/README
index 184de11..e91037f 100644
--- a/README
+++ b/README
@@ -10,7 +10,8 @@ several files:
   - 'config', a shell script sourced by the build script to override any
     variables. See below for more information.

-  - 'branches', a list of branches, one per line, to build and test
+  - 'branches', a list of branches, one per line, to build and test.
+    Lines starting with # are treated as comments

   - 'gitconfig'; if this file exists, it will be used as the .git/config
     of the built and tested repository. This file should define a remote
@@ -18,7 +19,16 @@ several files:
     should be published (i.e., repo.or.cz:/srv/git/git/gitbuild.git).

   - 'config.mak'; if this file exists, it will be used as the config.mak
-    file for building git
+    file for building git. If it is not present, but there is a
+    config.mak file in your project directory, it is copied here to
+    prevent it being removed by 'git clean'
+
+  - 'catch', a shell script sourced by the build script if an error
+    occurs. It is passed the failing command-line in its arguments
+
+  - 'finally', a shell script sourced by the build script at the end
+    of the process. It is passed the exit code of build.sh as its
+    argument

 The convention for platform directory names is "$initials/$platform".  A
 build should be initiated from the platform directory. E.g., by putting
@@ -42,6 +52,9 @@ the variables are:

   - make; the command to invoke make. If not set, defaults to "gmake".

+  - project; the path to the directory to build in. If not set, defaults
+             to ./project relative to the starting directory
+
   - path_build; the PATH to use while building git. If not set, the
                 PATH is left alone.

@@ -52,8 +65,8 @@ Invoking build.sh
 =================

 Generally build.sh is invoked without any options, which means it should
-build all branches one after the other. However, it can be invoked with
-a branch name to build and test just a single branch.
+build all specified branches one after the other. However, it can be
+invoked with a branch name to build and test just a single branch.

 The 'project' directory need not be set up beforehand. If it does not
 exist, it will be created as an empty git repository automatically. As
 diff --git a/build.sh b/build.sh
index b318af2..0967ff3 100755
--- a/build.sh
+++ b/build.sh
@@ -9,6 +9,7 @@ root=$PWD
 initials=`dirname $PWD 2>/dev/null`; initials=`basename $initials 2>/dev/null`
 name=`basename $PWD 2>/dev/null`
 make=gmake
+project=project
 . ./config
 name=`echo $name | sed 's/[^A-Za-z0-9.-]/-/g'`

@@ -19,6 +20,8 @@ try() {
    0) ;;
    *) echo >&2 "build failed: $*"
       cat >&2 "$log"
+      test -f $root/catch && . $root/catch $*
+      test -f $root/finally && . $root/finally 1
       exit 1
       ;;
  esac
@@ -36,6 +39,7 @@ build_branch() {
   rm -f "$log"

   try git checkout -f -q $branch
+  test -f config.mak && test ! -f $root/config.mak && try cp config.mak $root/
   try git clean -d -f -q -x
   test -f $root/config.mak && try cp $root/config.mak config.mak

@@ -59,22 +63,23 @@ build_branch() {
 log=$root/log.build
 rm -f "$log"

-if ! test -d project; then
-  try mkdir project
-  try cd project
+if ! test -d $project; then
+  try mkdir $project
+  try cd $project
   try git init
 else
-  try cd project
+  try cd $project
 fi

 test -f $root/gitconfig && try cp $root/gitconfig .git/config
 try git remote update

 if test -z "$1"; then
-  for i in `cat "$root/branches"`; do
+  for i in `cat "$root/branches" | grep -v '^#'`; do
     build_branch $i || exit 1
   done
 else
   build_branch $1
 fi
+test -f $root/finally && . $root/finally 0
 exit 0

Re: obscure platform autobuilders

[Jeff King]

On Wed, Oct 01, 2008 at 11:46:43AM +0100, Mike Ralphson wrote:

> My googling led me to think that INTERNAL_QSORT would be a good idea
> on at least some versions of Solaris... it may depend on the fs
> though.

I thought it was purely a performance enhancement. Should it affect the
test results?

> How about this - let me know if ok, and I'll push it.

It mostly looks good, though I would have split it into several distinct
commits for readability. A few comments below.

> -  - 'branches', a list of branches, one per line, to build and test
> +  - 'branches', a list of branches, one per line, to build and test.
> +    Lines starting with # are treated as comments

Makes sense.

>    - 'config.mak'; if this file exists, it will be used as the config.mak
> -    file for building git
> +    file for building git. If it is not present, but there is a
> +    config.mak file in your project directory, it is copied here to
> +    prevent it being removed by 'git clean'

I'm not sure I agree with this. My goal was to treat the project
directory as nothing more than a cache, with the gitbuild repo as the
master source driving the tests. So this works backwards to that.

One of the things I was (and am) considering is rather than doing
checkout/clean, to simply export each branch to a new directory and
build from there. Then the "project" repo could actually be bare.

How is this feature intended to be used? It looks like it would
basically be invoked one time, when running this script on an existing
gitbuild setup. So it saves one manual step of copying your config.mak
to the platform directory. But you still have to manually inspect, add,
and commit that config.mak file.

> +  - 'catch', a shell script sourced by the build script if an error
> +    occurs. It is passed the failing command-line in its arguments
> +
> +  - 'finally', a shell script sourced by the build script at the end
> +    of the process. It is passed the exit code of build.sh as its
> +    argument

These look like sensible hooks.

> +  - project; the path to the directory to build in. If not set, defaults
> +             to ./project relative to the starting directory
> +

I am accomplishing the same thing with a symlink, but I think this is
probably cleaner.

> +if ! test -d $project; then
> +  try mkdir $project
> +  try cd $project

Quotes around $project? I'm not sure how robust the rest of the script
is to paths with spaces (which I personally consider insane).

> -  for i in `cat "$root/branches"`; do
> +  for i in `cat "$root/branches" | grep -v '^#'`; do

Useless use of cat. :)

  grep -v ^# < "$root/branches"

-Peff