Bug 1289153 - merge scripts should pass --new-branch for m-r push r=jlund a=release DONTBUILD
authorRail Aliiev <rail@mozilla.com>
Mon, 25 Jul 2016 11:24:53 -0400
changeset 348580 251fccc1f62bf0eac569ef4f6717fea61ebadb27
parent 348579 66498480fe6516aa48f8e7265d09b03122d17d7a
child 348635 215d196020ff91ba64d3c3965135daa8d2b3972f
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlund, release
bugs1289153
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1289153 - merge scripts should pass --new-branch for m-r push r=jlund a=release DONTBUILD MozReview-Commit-ID: Ftb6NTMM5Wz
testing/mozharness/scripts/merge_day/gecko_migration.py
--- a/testing/mozharness/scripts/merge_day/gecko_migration.py
+++ b/testing/mozharness/scripts/merge_day/gecko_migration.py
@@ -177,17 +177,21 @@ class GeckoMigration(MercurialScript, Ba
     def query_commit_message(self):
         return "Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release"
 
     def query_push_dirs(self):
         dirs = self.query_abs_dirs()
         return dirs.get('abs_from_dir'), dirs.get('abs_to_dir')
 
     def query_push_args(self, cwd):
-        return ['-r', '.']
+        if cwd == self.query_abs_dirs()['abs_to_dir'] and \
+                self.config['migration_behavior'] == 'beta_to_release':
+            return ['--new-branch', '-r', '.']
+        else:
+            return ['-r', '.']
 
     def query_from_revision(self):
         """ Shortcut to get the revision for the from repo
             """
         dirs = self.query_abs_dirs()
         return self.query_hg_revision(dirs['abs_from_dir'])
 
     def query_to_revision(self):