backport.bash output

backport.sh

#!/bin/sh
 
tags="
latest_2013.06.03:/tmp/old.patch
latest_2013.08.12:/tmp/old.patch
latest_2013.11.04:/tmp/old.patch
latest_2014.02.10:/tmp/new.patch
latest_2014.04.14:/tmp/new.patch
latest_2014.06.02:/tmp/new.patch
latest_2014.08.11:/tmp/new.patch
latest_2014.10.06:/tmp/new.patch
"
 
hg update stable
new_stable=`hg --debug id -i`
 
for tagandpatch in $tags; do
    array=(${tagandpatch//:/ })
    tag=${array[0]}
    patch=${array[1]}
    echo ""
    echo "[$tag]"
    echo ""

    hg update $tag &&
    patch -p1 < $patch &&
    hg diff &&
    hg ci -m 'Bugfix: Skip extra wrapping around template-style macros.' -u 'John Chilton <jmchilton@gmail.com>'
    new_latest=`hg --debug id -i` 
    new_latest_short=`hg id -i`
    hg update $new_stable &&
    awk "{ if (\$2 == \"$tag\") print \"$new_latest\",\$2; else print \$0; }" .hgtags >.hgtags.new &&
    mv .hgtags.new .hgtags &&
    hg diff &&
    hg ci -m "Update tag ${tag} for changeset ${new_latest_short}" &&
    hg merge &&
    hg ci -m "Merge head created for backport bug fix on $tag"
    new_stable=`hg --debug id -i`
done

gistfile1.txt

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

[latest_2013.06.03]

2431 files updated, 0 files merged, 1272 files removed, 0 files unresolved
patching file lib/galaxy/tools/__init__.py
diff -r 19e56e66b0b3 lib/galaxy/tools/__init__.py
--- a/lib/galaxy/tools/__init__.py      Tue Jan 13 10:26:40 2015 -0500
+++ b/lib/galaxy/tools/__init__.py      Thu Jan 15 16:01:02 2015 -0500
@@ -2575,7 +2575,7 @@
         Note: this method follows the style of the similar populate calls, in that param_dict is modified in-place.
         """
         # chromInfo is a filename, do not sanitize it.
-        skip = [ 'chromInfo' ]
+        skip = [ 'chromInfo' ] + self.template_macro_params.keys()
         if not self.options or self.options.sanitize:
             for key, value in param_dict.items():
                 if key not in skip:
created new head
2201 files updated, 0 files merged, 1502 files removed, 0 files unresolved
diff -r f7235d0ad14f .hgtags
--- a/.hgtags   Thu Jan 15 13:20:34 2015 -0500
+++ b/.hgtags   Thu Jan 15 16:01:05 2015 -0500
@@ -13,7 +13,7 @@
 9c323aad4ffdd65a3deb06a4a36f6b2c5115a60f latest_2013.01.13
 b986c184be88947b5d1d90be7f36cfd2627dd938 latest_2013.02.08
 dec9431d66b837a208e2f060d90afd913c721227 latest_2013.04.01
-19e56e66b0b344c6e2afa4541f6988e4fdb9af29 latest_2013.06.03
+aae74ee09e4667e270750711327c8167e1dfae05 latest_2013.06.03
 cee903b8b3eee9145627ee89742555dac581791e latest_2013.08.12
 7d5aa19a166cba9039e15f338a1e3fc924c43d3a latest_2013.11.04
 0c000cc2f9c05bf4c1c2bc3a10215014fd64e696 latest_2014.02.10
merging lib/galaxy/tools/__init__.py
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

[latest_2013.08.12]

2449 files updated, 0 files merged, 1214 files removed, 0 files unresolved
patching file lib/galaxy/tools/__init__.py
Hunk #1 succeeded at 2585 (offset 10 lines).
diff -r cee903b8b3ee lib/galaxy/tools/__init__.py
--- a/lib/galaxy/tools/__init__.py      Tue Jan 13 10:26:56 2015 -0500
+++ b/lib/galaxy/tools/__init__.py      Thu Jan 15 16:01:13 2015 -0500
@@ -2585,7 +2585,7 @@
         Note: this method follows the style of the similar populate calls, in that param_dict is modified in-place.
         """
         # chromInfo is a filename, do not sanitize it.
-        skip = [ 'chromInfo' ]
+        skip = [ 'chromInfo' ] + self.template_macro_params.keys()
         if not self.options or self.options.sanitize:
             for key, value in param_dict.items():
                 if key not in skip:
created new head
2153 files updated, 0 files merged, 1510 files removed, 0 files unresolved
diff -r 8b183b869448 .hgtags
--- a/.hgtags   Thu Jan 15 16:01:11 2015 -0500
+++ b/.hgtags   Thu Jan 15 16:01:15 2015 -0500
@@ -14,7 +14,7 @@
 b986c184be88947b5d1d90be7f36cfd2627dd938 latest_2013.02.08
 dec9431d66b837a208e2f060d90afd913c721227 latest_2013.04.01
 aae74ee09e4667e270750711327c8167e1dfae05 latest_2013.06.03
-cee903b8b3eee9145627ee89742555dac581791e latest_2013.08.12
+db967a25c5db969ee4b3e138fe2be4d979665bdf latest_2013.08.12
 7d5aa19a166cba9039e15f338a1e3fc924c43d3a latest_2013.11.04
 0c000cc2f9c05bf4c1c2bc3a10215014fd64e696 latest_2014.02.10
 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
merging lib/galaxy/tools/__init__.py
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

[latest_2013.11.04]

1901 files updated, 0 files merged, 1060 files removed, 0 files unresolved
patching file lib/galaxy/tools/__init__.py
Hunk #1 succeeded at 2592 (offset 17 lines).
diff -r 7d5aa19a166c lib/galaxy/tools/__init__.py
--- a/lib/galaxy/tools/__init__.py      Tue Jan 13 10:27:09 2015 -0500
+++ b/lib/galaxy/tools/__init__.py      Thu Jan 15 16:01:18 2015 -0500
@@ -2592,7 +2592,7 @@
         Note: this method follows the style of the similar populate calls, in that param_dict is modified in-place.
         """
         # chromInfo is a filename, do not sanitize it.
-        skip = [ 'chromInfo' ]
+        skip = [ 'chromInfo' ] + self.template_macro_params.keys()
         if not self.options or self.options.sanitize:
             for key, value in param_dict.items():
                 if key not in skip:
created new head
1920 files updated, 0 files merged, 1041 files removed, 0 files unresolved
diff -r cb12cb063a9b .hgtags
--- a/.hgtags   Thu Jan 15 16:01:17 2015 -0500
+++ b/.hgtags   Thu Jan 15 16:01:20 2015 -0500
@@ -15,7 +15,7 @@
 dec9431d66b837a208e2f060d90afd913c721227 latest_2013.04.01
 aae74ee09e4667e270750711327c8167e1dfae05 latest_2013.06.03
 db967a25c5db969ee4b3e138fe2be4d979665bdf latest_2013.08.12
-7d5aa19a166cba9039e15f338a1e3fc924c43d3a latest_2013.11.04
+52a18b44474f017fce92850fb3892a4f76a7374a latest_2013.11.04
 0c000cc2f9c05bf4c1c2bc3a10215014fd64e696 latest_2014.02.10
 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
 f3fc4602e22b39468d780b955a1a05caf867a7e9 latest_2014.08.11
merging lib/galaxy/tools/__init__.py
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

[latest_2014.02.10]

1197 files updated, 0 files merged, 787 files removed, 0 files unresolved
patching file lib/galaxy/tools/evaluation.py
Hunk #1 succeeded at 323 (offset -59 lines).
diff -r 0c000cc2f9c0 lib/galaxy/tools/evaluation.py
--- a/lib/galaxy/tools/evaluation.py    Tue Jan 13 10:27:19 2015 -0500
+++ b/lib/galaxy/tools/evaluation.py    Thu Jan 15 16:01:23 2015 -0500
@@ -323,7 +323,7 @@
         Note: this method follows the style of the similar populate calls, in that param_dict is modified in-place.
         """
         # chromInfo is a filename, do not sanitize it.
-        skip = [ 'chromInfo' ]
+        skip = [ 'chromInfo' ] + self.tool.template_macro_params.keys()
         if not self.tool or not self.tool.options or self.tool.options.sanitize:
             for key, value in param_dict.items():
                 if key not in skip:
created new head
1629 files updated, 0 files merged, 355 files removed, 0 files unresolved
diff -r 4dc0e41df66e .hgtags
--- a/.hgtags   Thu Jan 15 16:01:22 2015 -0500
+++ b/.hgtags   Thu Jan 15 16:01:25 2015 -0500
@@ -16,7 +16,7 @@
 aae74ee09e4667e270750711327c8167e1dfae05 latest_2013.06.03
 db967a25c5db969ee4b3e138fe2be4d979665bdf latest_2013.08.12
 52a18b44474f017fce92850fb3892a4f76a7374a latest_2013.11.04
-0c000cc2f9c05bf4c1c2bc3a10215014fd64e696 latest_2014.02.10
+746db2bf4da081a7491b5a4602aeadd2611b3b1d latest_2014.02.10
 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
 f3fc4602e22b39468d780b955a1a05caf867a7e9 latest_2014.08.11
 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
merging lib/galaxy/tools/evaluation.py
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

[latest_2014.04.14]

1197 files updated, 0 files merged, 785 files removed, 0 files unresolved
patching file lib/galaxy/tools/evaluation.py
Hunk #1 succeeded at 323 (offset -59 lines).
diff -r 8f9dcac03369 lib/galaxy/tools/evaluation.py
--- a/lib/galaxy/tools/evaluation.py    Tue Jan 13 10:27:27 2015 -0500
+++ b/lib/galaxy/tools/evaluation.py    Thu Jan 15 16:01:26 2015 -0500
@@ -323,7 +323,7 @@
         Note: this method follows the style of the similar populate calls, in that param_dict is modified in-place.
         """
         # chromInfo is a filename, do not sanitize it.
-        skip = [ 'chromInfo' ]
+        skip = [ 'chromInfo' ] + self.tool.template_macro_params.keys()
         if not self.tool or not self.tool.options or self.tool.options.sanitize:
             for key, value in param_dict.items():
                 if key not in skip:
created new head
1627 files updated, 0 files merged, 355 files removed, 0 files unresolved
diff -r d9cdccfc0225 .hgtags
--- a/.hgtags   Thu Jan 15 16:01:25 2015 -0500
+++ b/.hgtags   Thu Jan 15 16:01:28 2015 -0500
@@ -9,7 +9,7 @@
 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14
 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02
 9bce3f426863f8ba88062f67c7efc1836e82ee7c latest_2014.06.02
-8f9dcac033694e4cabcf5daae5cca1cfefbe967f latest_2014.04.14
+b2c0570f52e18d8661ca1d80c42867e4b036f22b latest_2014.04.14
 9c323aad4ffdd65a3deb06a4a36f6b2c5115a60f latest_2013.01.13
 b986c184be88947b5d1d90be7f36cfd2627dd938 latest_2013.02.08
 dec9431d66b837a208e2f060d90afd913c721227 latest_2013.04.01
merging lib/galaxy/tools/evaluation.py
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

[latest_2014.06.02]

1098 files updated, 0 files merged, 532 files removed, 0 files unresolved
patching file lib/galaxy/tools/evaluation.py
Hunk #1 succeeded at 348 (offset -34 lines).
diff -r 9bce3f426863 lib/galaxy/tools/evaluation.py
--- a/lib/galaxy/tools/evaluation.py    Wed Jan 14 17:07:37 2015 -0500
+++ b/lib/galaxy/tools/evaluation.py    Thu Jan 15 16:01:30 2015 -0500
@@ -348,7 +348,7 @@
         Note: this method follows the style of the similar populate calls, in that param_dict is modified in-place.
         """
         # chromInfo is a filename, do not sanitize it.
-        skip = [ 'chromInfo' ]
+        skip = [ 'chromInfo' ] + self.tool.template_macro_params.keys()
         if not self.tool or not self.tool.options or self.tool.options.sanitize:
             for key, value in param_dict.items():
                 if key not in skip:
created new head
1385 files updated, 0 files merged, 245 files removed, 0 files unresolved
diff -r ae4d7fb3f647 .hgtags
--- a/.hgtags   Thu Jan 15 16:01:29 2015 -0500
+++ b/.hgtags   Thu Jan 15 16:01:31 2015 -0500
@@ -8,7 +8,7 @@
 5e605ed6069fe4c5ca9875e95e91b2713499e8ca release_2014.02.10
 9e53251b0b7e93b9563008a2b112f2e815a04bbc release_2014.04.14
 7e257c7b10badb65772b1528cb61d58175a42e47 release_2014.06.02
-9bce3f426863f8ba88062f67c7efc1836e82ee7c latest_2014.06.02
+c52dc4c72b77e4b0849a596b6d05e4341236642a latest_2014.06.02
 b2c0570f52e18d8661ca1d80c42867e4b036f22b latest_2014.04.14
 9c323aad4ffdd65a3deb06a4a36f6b2c5115a60f latest_2013.01.13
 b986c184be88947b5d1d90be7f36cfd2627dd938 latest_2013.02.08
merging lib/galaxy/tools/evaluation.py
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

[latest_2014.08.11]

837 files updated, 0 files merged, 421 files removed, 0 files unresolved
patching file lib/galaxy/tools/evaluation.py
Hunk #1 succeeded at 348 (offset -34 lines).
diff -r f3fc4602e22b lib/galaxy/tools/evaluation.py
--- a/lib/galaxy/tools/evaluation.py    Wed Jan 14 17:07:46 2015 -0500
+++ b/lib/galaxy/tools/evaluation.py    Thu Jan 15 16:01:33 2015 -0500
@@ -348,7 +348,7 @@
         Note: this method follows the style of the similar populate calls, in that param_dict is modified in-place.
         """
         # chromInfo is a filename, do not sanitize it.
-        skip = [ 'chromInfo' ]
+        skip = [ 'chromInfo' ] + self.tool.template_macro_params.keys()
         if not self.tool or not self.tool.options or self.tool.options.sanitize:
             for key, value in param_dict.items():
                 if key not in skip:
created new head
1153 files updated, 0 files merged, 105 files removed, 0 files unresolved
diff -r 4b8e3b14abc5 .hgtags
--- a/.hgtags   Thu Jan 15 16:01:32 2015 -0500
+++ b/.hgtags   Thu Jan 15 16:01:34 2015 -0500
@@ -18,7 +18,7 @@
 52a18b44474f017fce92850fb3892a4f76a7374a latest_2013.11.04
 746db2bf4da081a7491b5a4602aeadd2611b3b1d latest_2014.02.10
 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
-f3fc4602e22b39468d780b955a1a05caf867a7e9 latest_2014.08.11
+6d6d7f8b321725a21a96ce21e7d18a3a66f7b72e latest_2014.08.11
 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
 9bd6f8b5b8153db752f4e61ed62f2b6c01ae4a11 latest_2014.10.06
 2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
merging lib/galaxy/tools/evaluation.py
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

[latest_2014.10.06]

330 files updated, 0 files merged, 102 files removed, 0 files unresolved
patching file lib/galaxy/tools/evaluation.py
Hunk #1 succeeded at 348 (offset -34 lines).
diff -r 9bd6f8b5b815 lib/galaxy/tools/evaluation.py
--- a/lib/galaxy/tools/evaluation.py    Wed Jan 14 17:07:54 2015 -0500
+++ b/lib/galaxy/tools/evaluation.py    Thu Jan 15 16:01:35 2015 -0500
@@ -348,7 +348,7 @@
         Note: this method follows the style of the similar populate calls, in that param_dict is modified in-place.
         """
         # chromInfo is a filename, do not sanitize it.
-        skip = [ 'chromInfo' ]
+        skip = [ 'chromInfo' ] + self.tool.template_macro_params.keys()
         if not self.tool or not self.tool.options or self.tool.options.sanitize:
             for key, value in param_dict.items():
                 if key not in skip:
created new head
413 files updated, 0 files merged, 19 files removed, 0 files unresolved
diff -r 464f7083f431 .hgtags
--- a/.hgtags   Thu Jan 15 16:01:34 2015 -0500
+++ b/.hgtags   Thu Jan 15 16:01:36 2015 -0500
@@ -20,6 +20,6 @@
 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
 6d6d7f8b321725a21a96ce21e7d18a3a66f7b72e latest_2014.08.11
 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-9bd6f8b5b8153db752f4e61ed62f2b6c01ae4a11 latest_2014.10.06
+782fa60fc65488aea0c618d723e9a63d42caf865 latest_2014.10.06
 2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
 3b559c4b9399236ae2a76ea1f061fcd660e76ed5 latest_2015.01.13
merging lib/galaxy/tools/evaluation.py
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)