@@ -38,7 +38,6 @@ branch_pattern = "THIS_SHOULD_MATCH_NOTHING"
3838destination_url = " https://hg.mozilla.org/mozilla-unified/"
3939destination_branch = " NOT_A_VALID_BRANCH"
4040
41-
4241#
4342# AUTOLAND
4443#
@@ -60,26 +59,7 @@ destination_branch = "default"
6059
6160[[tag_mappings ]]
6261source_url = " https://github.com/mozilla-firefox/firefox.git"
63- # <M>_<m>(_<p>...)b<n> BUILD and RELEASE tags to mozilla-beta
64- tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\ d+(_\\ d+)+)b\\ d+_(BUILD\\ d+|RELEASE)$"
65- destination_url = " ssh://hg.mozilla.org/releases/mozilla-beta/"
66- tags_destination_branch = " tags-unified"
67- # Default
68- # tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
69-
70- [[tag_mappings ]]
71- source_url = " https://github.com/mozilla-firefox/firefox.git"
72- # BETA_<M> BASE and END tags to mozilla-beta
73- tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_BETA_(\\ d+)+_(BASE|END)$"
74- destination_url = " ssh://hg.mozilla.org/releases/mozilla-beta/"
75- tags_destination_branch = " tags-unified"
76- # Default
77- # tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
78-
79- [[tag_mappings ]]
80- source_url = " https://github.com/mozilla-firefox/firefox.git"
81- # RELEASE_<M> BASE tags to mozilla-beta
82- tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\ d+)+_BASE$"
62+ tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_.*$"
8363destination_url = " ssh://hg.mozilla.org/releases/mozilla-beta/"
8464tags_destination_branch = " tags-unified"
8565# Default
@@ -96,6 +76,9 @@ branch_pattern = "^(esr\\d+)$"
9676destination_url = " ssh://hg.mozilla.org/releases/mozilla-\\ 1/"
9777destination_branch = " default"
9878
79+ # We can only sync the tags branch to ESR when an ESR-specific tag is added.
80+ # When such a sync happens, all non-ESR tags currently present on that branch
81+ # will also be pushed to the target ESR repo.
9982[[tag_mappings ]]
10083source_url = " https://github.com/mozilla-firefox/firefox.git"
10184# <M>_<m>(_<p>...)esr BUILD and RELEASE tags to mozilla-esr<M>
@@ -106,11 +89,11 @@ tags_destination_branch = "tags-unified"
10689# tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
10790
10891#
109- # relbranches
92+ # ESR relbranches
11093#
11194[[branch_mappings ]]
11295source_url = " https://github.com/mozilla-firefox/firefox.git"
113- # <M>_<m>_X RELBRANCH to mozilla-release matching branch
96+ # ESR_ <M>_<m>_X RELBRANCH to mozilla-esr<M> matching branch
11497branch_pattern = " ^((FIREFOX|DEVEDITION|FIREFOX-ANDROID)_ESR_(\\ d+)(_\\ d+_X)_RELBRANCH)$"
11598destination_url = " ssh://hg.mozilla.org/releases/mozilla-esr\\ 3/"
11699destination_branch = " \\ 1"
@@ -127,22 +110,12 @@ destination_branch = "default"
127110
128111[[tag_mappings ]]
129112source_url = " https://github.com/mozilla-firefox/firefox.git"
130- # NIGHTLY_<M> tags to m-c
131- tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_NIGHTLY_(\\ d+)_(BASE|END)$"
113+ tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_.*$"
132114destination_url = " ssh://hg.mozilla.org/mozilla-central/"
133115tags_destination_branch = " tags-unified"
134116# Default
135117# tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
136118
137- [[tag_mappings ]]
138- source_url = " https://github.com/mozilla-firefox/firefox.git"
139- # BETA_<M>_BASE tags to m-c (in the past, we didn't sync BETA_END, only _BASE)
140- tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_BETA_(\\ d+)_BASE$"
141- destination_url = " ssh://hg.mozilla.org/mozilla-central/"
142- tags_destination_branch = " tags-unified"
143- # Default
144- # tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
145-
146119
147120#
148121# RELEASE
@@ -155,24 +128,14 @@ destination_branch = "default"
155128
156129[[tag_mappings ]]
157130source_url = " https://github.com/mozilla-firefox/firefox.git"
158- # <M>_<m>(_<p>...) BUILD and RELEASE tags to mozilla-release
159- tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\ d+(_\\ d+)+)_(BUILD\\ d+|RELEASE)$"
131+ tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_.*$"
160132destination_url = " ssh://hg.mozilla.org/releases/mozilla-release/"
161133tags_destination_branch = " tags-unified"
162134# # Default
163135# #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
164- #
165- [[tag_mappings ]]
166- source_url = " https://github.com/mozilla-firefox/firefox.git"
167- # RELEASE_<M> BASE and END tags to mozilla-release
168- tag_pattern = " ^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\ d+)+_(BASE|END)$"
169- destination_url = " ssh://hg.mozilla.org/releases/mozilla-release/"
170- tags_destination_branch = " tags-unified"
171- # Default
172- # tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
173136
174137#
175- # relbranches
138+ # RELEASE relbranches
176139#
177140[[branch_mappings ]]
178141source_url = " https://github.com/mozilla-firefox/firefox.git"
0 commit comments