Changes between Version 16 and Version 17 of MercurialBranches

Timestamp:

Feb 17, 2011, 6:27:12 AM (14 years ago)

Author:

Luke Plant

Comment:

--

MercurialBranches

@@ -35 +35 @@
 function usage {
     echo "Usage: hg_backport <branch> <hgrevision>";
+    echo "   or: hg_backport <branch> --svnrev <svnrevision>";
 }
 
-if [ $# -ne 2 ]
+if [ $# -lt 2 ]
 then
         usage;
@@ -43 +44 @@
 fi
 
-SHORTBRANCH="$1"
-BRANCH="releases/$SHORTBRANCH" # we only backport to release branches.
-HGREV="$2"
-
 hg st -a -r -m | grep '' > /dev/null && { echo "Working directory not clean - exiting" > /dev/stderr; exit 1; }
 
-SVNREV=`hg svn info -r $HGREV | egrep '^Revision' | cut -f 2 -d ' '`
-if [ "x$SVNREV" = "x" ]
+SHORTBRANCH="$1"
+BRANCH="releases/$SHORTBRANCH"
+if [ "$2" = "--svnrev" ]
 then
-        echo "Can't find svn rev";
+    SVNREV="$3"
+    HGREV=`hg log -r "svnrev($SVNREV)" --template '{rev}'`
+    if [ "x$HGREV" = "x" ]
+    then
+        echo "Can't find hg rev"
+        exit 1;
+    fi
+else
+    HGREV="$2"
+    SVNREV=`hg svn info -r $HGREV | egrep '^Revision' | cut -f 2 -d ' '`
+    if [ "x$SVNREV" = "x" ]
+    then
+        echo "Can't find svn rev";
         exit 1;
+    fi
 fi
 
 echo "Backporting Subversion revision $SVNREV"
 hg update $BRANCH || exit 1;
-# Make a commit message first in case the transplant fails.
-hg log -r $HGREV --template "[$SHORTBRANCH] {desc}\n\nBackport of [$SVNREV] from trunk\n" > hg-commit-message.txt || exit 1
+# Make a commit message first in case the transplant fails
+hg log -r $HGREV --template "[$SHORTBRANCH] {desc}\n\nBackport of [$SVNREV] from trunk.\n" > hg-commit-message.txt || exit 1
 hg transplant $HGREV || exit 1;
 # Modify the commit message
@@ -66 +77 @@
 echo "Backport committed."
    }}}
-   The command line is like:
+   The command line is like one of the following:
    {{{
 #!sh
 hg_backport 1.2.X 13643
+hg_backport 1.2.X --svnrev 13237
 }}}
-   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.
+   where 1.2.X is a directory under 'releases/' in the Subversion repo, 13643 is a hg revision ID, and 13237 is a Subversion 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 ===
@@ -152 +164 @@
 
 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!
-