Merge lp:~kfogel/launchpad/rocketfuel-2a into lp:launchpad

[Karl Fogel]

[Karl Fogel (kfogel)]

This branch tweaks rocketfuel-setup to:

  1. Intialize the repo with --2a.

  2. Bail if Bazaar is less than 1.16.1, since there's no point
     going further if the user can't handle 2a format in a
     reasonably bug-free way.

(We could easily change it to use 1.17 as the threshhold, but I'm not
sure 1.17 will be out in time for rocketfuel-setup being open sourced.)

[Tim Penhey (thumper)]

I'm not sure my bash-foo is good enough to know if you have your bail conditions good enough.

Bazaar 1.17 should be out within a week, so it is up to you what to test. We could always upgrade it later.

review: Approve

=== modified file 'utilities/rocketfuel-setup'
--- utilities/rocketfuel-setup	2009-07-09 17:37:31 +0000
+++ utilities/rocketfuel-setup	2009-07-16 02:21:23 +0000
@@ -4,6 +4,42 @@
 # workstation, from scratch. The script lives in the LP codebase itself,
 # as utilities/rocketfuel-setup
 
+# We require Bazaar 1.16.1 or higher.  
+# So first, grab the output of 'bzr --version' and transform the
+# version line, like "Bazaar (bzr) 1.16.1", into "1 16 1":
+VER_NUMS=`bzr --version | head -1 | sed -e 's/[^.0-9]//g' | sed -e 's/[.]/ /g'`
+# Now stuff each component into its own variable, so we can check sanely.
+MAJOR=0
+MINOR=0
+MICRO=0
+ITER=0
+for VER_COMPONENT in ${VER_NUMS}; do
+  if [ ${ITER} -eq 0 ]; then
+    MAJOR=${VER_COMPONENT}
+  elif [ ${ITER} -eq 1 ]; then
+    MINOR=${VER_COMPONENT}
+  elif [ ${ITER} -eq 2 ]; then
+    MICRO=${VER_COMPONENT}
+  # Ignore anything beyond micro -- nanoversions are irrelevant here.
+  fi
+  ITER=`expr ${ITER} + 1`
+done
+# Check that the version is high enough.
+BAZAAR_BAIL=0
+if [ ${MAJOR} -lt 1 ]; then
+  BAZAAR_BAIL=1
+elif [ ${MINOR} -lt 16 ]; then
+  BAZAAR_BAIL=1
+elif [ ${MINOR} -eq 16 -a ${MICRO} -lt 1 ]; then
+  BAZAAR_BAIL=1
+fi
+if [ ${BAZAAR_BAIL} -ne 0 ]; then
+  echo "ERROR: You don't have a high enough version of Bazaar:"
+  echo "  rocketfuel-setup requires bzr 1.16.1 or higher, but you have bzr ${MAJOR}.${MINOR}.${MICRO}."
+  echo "  Please see http://bazaar-vcs.org/Download to get a newer version."
+  exit 1
+fi
+
 if [ ! -e "$HOME/.rocketfuel-env.sh" ]; then
   echo "# Common environment variables for the rocketfuel-* scripts.
 #
@@ -283,8 +319,8 @@
 mkdir -p $LP_PROJECT_ROOT
 cd $LP_PROJECT_ROOT
 if [ ! -d $LP_SHARED_REPO ]; then
-  # 1.6 format needed for stacking on Launchpad.
-  bzr init-repo --1.6 $LP_SHARED_REPO
+  # 2a format (a.k.a. "brisbane-core") needed for stacking on Launchpad.
+  bzr init-repo --2a $LP_SHARED_REPO
   if [ $? -ne 0 ]; then
     echo "ERROR: Unable to setup local LP repository"
     exit 1