Changes between Version 12 and Version 13 of MercurialBranches

Timestamp:

Dec 3, 2010, 6:04:26 PM (14 years ago)

Author:

Russell Keith-Magee

Comment:

Added my own variant on the backport script.

MercurialBranches

@@ -73 +73 @@
    where 1.2.X is a directory under 'releases/' in the Subversion repo, and 13643 is a hg revision ID.  The change is already committed to the local repo, but not 'pushed', so you can still rollback if changes need to be made.
 
+=== An alternate approach ===
+
+Another way of doing the same thing: Use the --filter option to the transplant extension. This requires the use of a Python script. Put the following in backport.py, and stick it in a tools directory somewhere:
+{{{
+#!python
+#!/usr/bin/python
+import os
+import sys
+
+msg = sys.argv[1]
+patch = sys.argv[2]
+
+print
+msg_file = open(msg, 'r')
+outlines = []
+firstline = True
+for raw_line in msg_file:
+    line = raw_line.strip()
+    if firstline:
+        if line.startswith('#'):
+            outlines.append(line)
+        else:
+            firstline = False
+            print 'MERGING: %s' % line
+            outlines.append('[1.2.X] %s' % line)
+    else:
+        outlines.append(line)
+msg_file.close()
+
+svn_revision = os.environ.get('SVNMERGE_REVISION',None)
+if svn_revision is None:
+    svn_revision = raw_input('SVN Revision: ')
+else:
+    print "SVN Revision:", svn_revision
+outlines.append('')
+outlines.append('Backport of r%s from trunk.' % svn_revision)
+
+# And write the updated message file.
+msg_file = open(msg,'w')
+for line in outlines:
+    print >> msg_file, line
+msg_file.close()
+
+# In case of a clash, write the filename of the message file
+print "Log message written to",msg
+}}}
+
+Then, use the following shell script to do the actual backport:
+{{{
+#!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
+unset SVNMERGE_REVISION
+}}}
+
+If you call this script 'hg_backport', then 
+
+The command line is like:
+{{{
+#!sh
+hg_backport 13643
+}}}
+Any hg revision ID can be used as the argument; since the most common usage pattern is to backport the most recent svn commit on trunk, you can use 'tip':
+{{{
+#!sh
+hg_backport tip
+}}}
+
+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 ===
 
 If you make two commits, and only want to push the first, you will have some trouble, since the !HgSubversion extensions doesn't support specifying revisions with the `hg push` command when pushing to a Subversion repository. Nice solutions to this welcome!
+