Merge lp:~tom.prince/twisted-trac-integration/bzr-release-branches into lp:twisted-trac-integration

[Tom Prince]

I think this will properly mirror the release branches as well.

I'll see about doing some tests locally later.

[lp:~tom.prince/twisted-trac-integration/bzr-release-branches]

71. By Tom Prince on 2012-10-30

Merge trunk.

72. By Tom Prince on 2012-12-07

Fix bug 1087580: Don't crash if a test case isn't provided.

73. By Tom Prince on 2012-12-07

force-builds: Remove unused constant.

74. By Tom Prince on 2013-03-08

Add initial git-mirroring setup.

75. By Tom Prince on 2013-03-08

Add reamde, and options.

76. By Tom Prince on 2013-03-08

Fixes.

- python 2.6 support
- typo
- ~ idempotency wrt refs/svn/releases

77. By Tom Prince on 2013-03-08

typo

[Thomas Herve (therve)]

Looks good! I think you introduced some tabs which would be good to remove. +1.

review: Approve

[lp:~tom.prince/twisted-trac-integration/bzr-release-branches]

78. By Jean-Paul Calderone on 2013-03-27

Add the currently deployed Twisted svn post-commit hook

79. By Jean-Paul Calderone on 2013-03-27

Add the currently deployed Twisted svn pre-commit hook

80. By Tom Prince on 2013-03-27

Add disown-tickets.py to repo.

81. By Jean-Paul Calderone <exarkun@top> on 2013-04-02

Support release branches in the bzr mirroring code

=== modified file 'svn-hooks/bzr/incremental-bzr-update.sh'
--- svn-hooks/bzr/incremental-bzr-update.sh	2012-09-24 19:43:39 +0000
+++ svn-hooks/bzr/incremental-bzr-update.sh	2012-09-25 02:33:22 +0000
@@ -9,6 +9,7 @@
 
 TRUNK_FOLDER="trunk/"
 BRANCHES_FOLDER="branches/"
+RELEASE_FOLDER="releases/"
 SVNLOOK_BIN=`which svnlook`
 BZR_BIN=`which bzr`
 MKDIR_BIN=`which mkdir`
@@ -66,6 +67,12 @@
     then
         $MKDIR_BIN -p $branches_path
     fi
+
+    release_branches_path=${BZR_MIRROR_ROOT}${BRANCHES_FOLDER}${RELEASE_FOLDER}
+    if [ ! -d $release_branches_path ]
+    then
+        $MKDIR_BIN -p $release_branches_path
+    fi
 }
 
 
@@ -221,10 +228,18 @@
     if [[ "$path" = ${BRANCHES_FOLDER}* ]]
     then
         branch_name=${path##${BRANCHES_FOLDER}}
-        branch_name=${branch_name%%/*}
+        if [[ "$branch_name" == ${RELEASE_FOLDER}* ]]
+	then
+            release_name=${branch_name##${RELEASE_FOLDER}}
+            release_name=${release_name%%/*}
+            branch_name=${RELEASE_FOLDER}$branch_name
+        else
+            branch_name=${branch_name%%/*}
+        fi
 
         # Look for changes to root branches (add/delete).
-        if [[ "$path" =~ ${BRANCHES_FOLDER}[^/]+/$ ]]
+        if [[ "$path" =~ ${BRANCHES_FOLDER}[^/]+/$
+	   || "$path" =~ ${BRANCHES_FOLDER}${RELEASE_FOLDER}[^/]+/$ ]]
         then
             if [[ "$action" = "A" ]]
             then

=== modified file 'svn-hooks/bzr/monolithic-bzr-update.sh'
--- svn-hooks/bzr/monolithic-bzr-update.sh	2012-09-24 19:43:39 +0000
+++ svn-hooks/bzr/monolithic-bzr-update.sh	2012-09-25 02:33:22 +0000
@@ -12,7 +12,8 @@
 
 # Update or add remote branches.
 remote_branches=`svn ls ${REMOTE_BASE_URL}/branches`
-for remote_branch in $remote_branches
+remote_release_branches=`svn ls ${REMOTE_BASE_URL}/branches/releases | sed -e 's,^,releases/,'`
+for remote_branch in $remote_branches $remote_release_branches
 do
         # Skip the directory containing release branches - it, itself, is not a branch.
         if [ $remote_branch == "releases" ]; then
@@ -32,8 +33,13 @@
 
 # Delete local branches that are no longer used on the server.
 local_branches=`ls -1`
-for local_branch in $local_branches
+local_release_branches=`ls -1 releases | sed -e 's,^,releases/,'`
+for local_branch in $local_branches $local_release_branches
 do
+        # Skip the directory containing release branches - it, itself, is not a branch.
+        if [ $local_branch == "releases" ]; then
+	        continue
+	fi
         if [[ $remote_branches == *$local_branch* ]]; then
                 echo '* Branch exists' `pwd`/$local_branch
         else