Changes between Version 13 and Version 14 of MercurialBranches

Timestamp:

Dec 3, 2010, 10:36:15 PM (14 years ago)

Author:

Russell Keith-Magee

Comment:

Overcame my own laziness and made branch detection automatic in my version of the backport script

MercurialBranches

@@ -86 +86 @@
 
 print
+branch = os.environ.get('DJANGO_BRANCH',None)
+if branch is None:
+    branch = raw_input('Backport branch: ')
+else:
+    print "Backport branch:", branch
+
 msg_file = open(msg, 'r')
 outlines = []
@@ -97 +103 @@
             firstline = False
             print 'MERGING: %s' % line
-            outlines.append('[1.2.X] %s' % line)
+            outlines.append('[%s] %s' % (branch, line))
     else:
         outlines.append(line)
@@ -123 +129 @@
 {{{
 #!sh
-#!/bin/bash
 export SVNMERGE_REVISION=`hg svn info -r $1 | egrep '^Revision' | cut -f 2 -d ' '`
-hg transplant $1 --filter /path/to/backport.py
+export DJANGO_BRANCH=`hg branch | cut -f 2 -d '/'`
+hg transplant $1 --filter commit.py
 unset SVNMERGE_REVISION
+unset DJANGO_BRANCH
 }}}
 
@@ -142 +149 @@
 }}}
 
-This script needs to be manually updated after every release, because the [1.2.X] string is hardcoded. This is mostly due to my (Russell's) own laziness -- it would be trivial to update the script to pull the branch identifier from the output of `hg branch`.
-
 === Gotchas ===