зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1677557 - Remove gecko_migration.py; r=jlorenzo
Remove unused mozharness script. See the discussion in https://phabricator.services.mozilla.com/D97200 I can find no in-tree references to gecko_migration.py, but 'mach try release' still uses some of the merge_day configs, https://searchfox.org/mozilla-central/rev/3e1a721bce1da3ae04675539b39a4e95b25a046d/tools/tryselect/selectors/release.py#130 I removed the configs not matching the choices at https://searchfox.org/mozilla-central/rev/3e1a721bce1da3ae04675539b39a4e95b25a046d/tools/tryselect/selectors/release.py#44 Differential Revision: https://phabricator.services.mozilla.com/D151154
This commit is contained in:
Geoff Brown
Родитель
d31f3e431d
Коммит
e94eea3418
|
|
@ -1,32 +0,0 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
from __future__ import absolute_import
|
||||
import os
|
||||
|
||||
ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
|
||||
|
||||
config = {
|
||||
"log_name": "bump_central",
|
||||
"version_files": [
|
||||
{"file": "browser/config/version.txt", "suffix": ""},
|
||||
{"file": "browser/config/version_display.txt", "suffix": "b1"},
|
||||
{"file": "config/milestone.txt", "suffix": ""},
|
||||
],
|
||||
"vcs_share_base": os.path.join(ABS_WORK_DIR, "hg-shared"),
|
||||
"to_repo_url": "https://hg.mozilla.org/mozilla-central",
|
||||
"end_tag": "FIREFOX_NIGHTLY_%(major_version)s_END",
|
||||
"virtualenv_modules": [
|
||||
"requests==2.8.1",
|
||||
],
|
||||
"require_remove_locales": False,
|
||||
"requires_head_merge": False,
|
||||
"migration_behavior": "bump_and_tag_central", # like esr_bump.py, needed for key validation
|
||||
"default_actions": [
|
||||
"clean-repos",
|
||||
"pull",
|
||||
"set_push_to_ssh",
|
||||
"bump_and_tag_central",
|
||||
],
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
from __future__ import absolute_import
|
||||
import os
|
||||
|
||||
ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
|
||||
config = {
|
||||
"vcs_share_base": os.path.join(ABS_WORK_DIR, "hg-shared"),
|
||||
"log_name": "bump_esr",
|
||||
"version_files": [
|
||||
{"file": "browser/config/version.txt", "suffix": ""},
|
||||
{"file": "browser/config/version_display.txt", "suffix": ""},
|
||||
{"file": "config/milestone.txt", "suffix": ""},
|
||||
],
|
||||
"to_repo_url": "https://hg.mozilla.org/releases/mozilla-esr60",
|
||||
"migration_behavior": "bump_second_digit",
|
||||
"require_remove_locales": False,
|
||||
"requires_head_merge": False,
|
||||
"default_actions": ["clean-repos", "pull", "set_push_to_ssh", "bump_second_digit"],
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# Use this script in conjunction with aurora_to_beta.py.
|
||||
# mozharness/scripts/merge_day/gecko_migration.py -c \
|
||||
# mozharness/configs/merge_day/aurora_to_beta.py -c
|
||||
# mozharness/configs/merge_day/staging_beta_migration.py ...
|
||||
from __future__ import absolute_import
|
||||
import os
|
||||
|
||||
ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
|
||||
|
||||
config = {
|
||||
"log_name": "staging_beta",
|
||||
"vcs_share_base": os.path.join(ABS_WORK_DIR, "hg-shared"),
|
||||
"from_repo_url": "ssh://hg.mozilla.org/releases/mozilla-aurora",
|
||||
"to_repo_url": "ssh://hg.mozilla.org/users/stage-ffxbld/mozilla-beta",
|
||||
"base_tag": "FIREFOX_BETA_%(major_version)s_BASE",
|
||||
"end_tag": "FIREFOX_BETA_%(major_version)s_END",
|
||||
"migration_behavior": "aurora_to_beta",
|
||||
}
|
||||
|
|
@ -1,566 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
# lint_ignore=E501
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
# You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
# ***** END LICENSE BLOCK *****
|
||||
""" gecko_migration.py
|
||||
|
||||
Merge day script for gecko (mozilla-central -> mozilla-beta,
|
||||
mozilla-beta -> mozilla-release).
|
||||
|
||||
Ported largely from
|
||||
http://hg.mozilla.org/build/tools/file/084bc4e2fc76/release/beta2release.py
|
||||
and
|
||||
http://hg.mozilla.org/build/tools/file/084bc4e2fc76/release/merge_helper.py
|
||||
"""
|
||||
|
||||
from __future__ import absolute_import
|
||||
import os
|
||||
import pprint
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
|
||||
|
||||
from mozharness.base.errors import HgErrorList
|
||||
from mozharness.base.python import VirtualenvMixin, virtualenv_config_options
|
||||
from mozharness.base.vcs.vcsbase import MercurialScript
|
||||
from mozharness.mozilla.automation import AutomationMixin
|
||||
from mozharness.mozilla.repo_manipulation import MercurialRepoManipulationMixin
|
||||
|
||||
VALID_MIGRATION_BEHAVIORS = (
|
||||
"beta_to_release",
|
||||
"central_to_beta",
|
||||
"release_to_esr",
|
||||
"bump_second_digit",
|
||||
"bump_and_tag_central",
|
||||
)
|
||||
|
||||
|
||||
# GeckoMigration {{{1
|
||||
class GeckoMigration(
|
||||
MercurialScript, VirtualenvMixin, AutomationMixin, MercurialRepoManipulationMixin
|
||||
):
|
||||
config_options = [
|
||||
[
|
||||
[
|
||||
"--hg-user",
|
||||
],
|
||||
{
|
||||
"action": "store",
|
||||
"dest": "hg_user",
|
||||
"type": "string",
|
||||
"default": "ffxbld <release@mozilla.com>",
|
||||
"help": "Specify what user to use to commit to hg.",
|
||||
},
|
||||
],
|
||||
[
|
||||
[
|
||||
"--ssh-user",
|
||||
],
|
||||
{
|
||||
"action": "store",
|
||||
"dest": "ssh_user",
|
||||
"type": "string",
|
||||
"default": "ffxbld-merge",
|
||||
"help": "The user to push to hg.mozilla.org as.",
|
||||
},
|
||||
],
|
||||
[
|
||||
[
|
||||
"--remove-locale",
|
||||
],
|
||||
{
|
||||
"action": "extend",
|
||||
"dest": "remove_locales",
|
||||
"type": "string",
|
||||
"help": "Comma separated list of locales to remove from the 'to' repo.",
|
||||
},
|
||||
],
|
||||
]
|
||||
gecko_repos = None
|
||||
|
||||
def __init__(self, require_config_file=True):
|
||||
super(GeckoMigration, self).__init__(
|
||||
config_options=virtualenv_config_options + self.config_options,
|
||||
all_actions=[
|
||||
"clobber",
|
||||
"create-virtualenv",
|
||||
"clean-repos",
|
||||
"pull",
|
||||
"set_push_to_ssh",
|
||||
"migrate",
|
||||
"bump_second_digit",
|
||||
"bump_and_tag_central",
|
||||
"commit-changes",
|
||||
"push",
|
||||
],
|
||||
default_actions=[
|
||||
"clean-repos",
|
||||
"pull",
|
||||
"set_push_to_ssh",
|
||||
"migrate",
|
||||
],
|
||||
require_config_file=require_config_file,
|
||||
)
|
||||
self.run_sanity_check()
|
||||
|
||||
# Helper methods {{{1
|
||||
def run_sanity_check(self):
|
||||
"""Verify the configs look sane before proceeding."""
|
||||
message = ""
|
||||
if self.config["migration_behavior"] not in VALID_MIGRATION_BEHAVIORS:
|
||||
message += "%s must be one of %s!\n" % (
|
||||
self.config["migration_behavior"],
|
||||
VALID_MIGRATION_BEHAVIORS,
|
||||
)
|
||||
if self.config["migration_behavior"] == "beta_to_release":
|
||||
if (
|
||||
self.config.get("require_remove_locales")
|
||||
and not self.config.get("remove_locales")
|
||||
and "migrate" in self.actions
|
||||
):
|
||||
message += "You must specify --remove-locale!\n"
|
||||
else:
|
||||
if self.config.get("require_remove_locales") or self.config.get(
|
||||
"remove_locales"
|
||||
):
|
||||
self.warning(
|
||||
"--remove-locale isn't valid unless you're using beta_to_release "
|
||||
"migration_behavior!\n"
|
||||
)
|
||||
if message:
|
||||
self.fatal(message)
|
||||
|
||||
def query_abs_dirs(self):
|
||||
"""Allow for abs_from_dir and abs_to_dir"""
|
||||
if self.abs_dirs:
|
||||
return self.abs_dirs
|
||||
dirs = super(GeckoMigration, self).query_abs_dirs()
|
||||
for k in ("from", "to"):
|
||||
url = self.config.get("%s_repo_url" % k)
|
||||
if url:
|
||||
dir_name = self.get_filename_from_url(url)
|
||||
self.info("adding %s" % dir_name)
|
||||
self.abs_dirs["abs_%s_dir" % k] = os.path.join(
|
||||
dirs["abs_work_dir"], dir_name
|
||||
)
|
||||
return self.abs_dirs
|
||||
|
||||
def query_repos(self):
|
||||
"""Build a list of repos to clone."""
|
||||
if self.gecko_repos:
|
||||
return self.gecko_repos
|
||||
self.info("Building gecko_repos list...")
|
||||
dirs = self.query_abs_dirs()
|
||||
self.gecko_repos = []
|
||||
for k in ("from", "to"):
|
||||
repo_key = "%s_repo_url" % k
|
||||
url = self.config.get(repo_key)
|
||||
if url:
|
||||
self.gecko_repos.append(
|
||||
{
|
||||
"repo": url,
|
||||
"branch": self.config.get("%s_repo_branch" % (k,), "default"),
|
||||
"dest": dirs["abs_%s_dir" % k],
|
||||
"vcs": "hg",
|
||||
# "hg" vcs uses robustcheckout extension requires the use of a share
|
||||
# but having a share breaks migration logic when merging repos.
|
||||
# Solution: tell hg vcs to create a unique share directory for each
|
||||
# gecko repo. see mozharness/base/vcs/mercurial.py for implementation
|
||||
"use_vcs_unique_share": True,
|
||||
}
|
||||
)
|
||||
else:
|
||||
self.warning("Skipping %s" % repo_key)
|
||||
self.info(pprint.pformat(self.gecko_repos))
|
||||
return self.gecko_repos
|
||||
|
||||
def query_commit_dirs(self):
|
||||
dirs = self.query_abs_dirs()
|
||||
commit_dirs = [dirs["abs_to_dir"]]
|
||||
return commit_dirs
|
||||
|
||||
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):
|
||||
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 set_push_to_ssh(self):
|
||||
push_dirs = [d for d in self.query_push_dirs() if d is not None]
|
||||
for cwd in push_dirs:
|
||||
repo_url = self.read_repo_hg_rc(cwd).get("paths", "default")
|
||||
username = self.config.get("ssh_user", "")
|
||||
# Add a trailing @ to the username if it exists, otherwise it gets
|
||||
# mushed up with the hostname.
|
||||
if username:
|
||||
username += "@"
|
||||
push_dest = repo_url.replace("https://", "ssh://" + username)
|
||||
|
||||
if not push_dest.startswith("ssh://"):
|
||||
raise Exception(
|
||||
'Warning: path "{}" is not supported. Protocol must be ssh'
|
||||
)
|
||||
|
||||
self.edit_repo_hg_rc(cwd, "paths", "default-push", push_dest)
|
||||
|
||||
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):
|
||||
"""Shortcut to get the revision for the to repo"""
|
||||
dirs = self.query_abs_dirs()
|
||||
return self.query_hg_revision(dirs["abs_to_dir"])
|
||||
|
||||
def hg_merge_via_debugsetparents(
|
||||
self, cwd, old_head, new_head, preserve_tags=True, user=None
|
||||
):
|
||||
"""Merge 2 heads avoiding non-fastforward commits"""
|
||||
hg = self.query_exe("hg", return_type="list")
|
||||
cmd = hg + ["debugsetparents", new_head, old_head]
|
||||
self.run_command(cmd, cwd=cwd, error_list=HgErrorList, halt_on_failure=True)
|
||||
self.hg_commit(
|
||||
cwd,
|
||||
message="Merge old head via |hg debugsetparents %s %s|. "
|
||||
"CLOSED TREE DONTBUILD a=release" % (new_head, old_head),
|
||||
user=user,
|
||||
)
|
||||
if preserve_tags:
|
||||
# I don't know how to do this elegantly.
|
||||
# I'm reverting .hgtags to old_head, then appending the new tags
|
||||
# from new_head to .hgtags, and hoping nothing goes wrong.
|
||||
# I'd rather not write patch files from scratch, so this seems
|
||||
# like a slightly more complex but less objectionable method?
|
||||
self.info("Trying to preserve tags from before debugsetparents...")
|
||||
dirs = self.query_abs_dirs()
|
||||
patch_file = os.path.join(dirs["abs_work_dir"], "patch_file")
|
||||
self.run_command(
|
||||
subprocess.list2cmdline(
|
||||
hg + ["diff", "-r", old_head, ".hgtags", "-U9", ">", patch_file]
|
||||
),
|
||||
cwd=cwd,
|
||||
)
|
||||
self.run_command(
|
||||
["patch", "-R", "-p1", "-i", patch_file],
|
||||
cwd=cwd,
|
||||
halt_on_failure=True,
|
||||
)
|
||||
tag_diff = self.read_from_file(patch_file)
|
||||
with self.opened(os.path.join(cwd, ".hgtags"), open_mode="a") as (fh, err):
|
||||
if err:
|
||||
self.fatal("Can't append to .hgtags!")
|
||||
for n, line in enumerate(tag_diff.splitlines()):
|
||||
# The first 4 lines of a patch are headers, so we ignore them.
|
||||
if n < 5:
|
||||
continue
|
||||
# Even after that, the only lines we really care about are
|
||||
# additions to the file.
|
||||
# TODO: why do we only care about additions? I couldn't
|
||||
# figure that out by reading this code.
|
||||
if not line.startswith("+"):
|
||||
continue
|
||||
line = line.replace("+", "")
|
||||
(changeset, tag) = line.split(" ")
|
||||
if len(changeset) != 40:
|
||||
continue
|
||||
fh.write("%s\n" % line)
|
||||
out = self.get_output_from_command(["hg", "status", ".hgtags"], cwd=cwd)
|
||||
if out:
|
||||
self.hg_commit(
|
||||
cwd,
|
||||
message="Preserve old tags after debugsetparents. "
|
||||
"CLOSED TREE DONTBUILD a=release",
|
||||
user=user,
|
||||
)
|
||||
else:
|
||||
self.info(".hgtags file is identical, no need to commit")
|
||||
|
||||
def remove_locales(self, file_name, locales):
|
||||
"""Remove locales from shipped-locales (m-r only)"""
|
||||
contents = self.read_from_file(file_name)
|
||||
new_contents = ""
|
||||
for line in contents.splitlines():
|
||||
locale = line.split()[0]
|
||||
if locale not in locales:
|
||||
new_contents += "%s\n" % line
|
||||
else:
|
||||
self.info("Removed locale: %s" % locale)
|
||||
self.write_to_file(file_name, new_contents)
|
||||
|
||||
def touch_clobber_file(self, cwd):
|
||||
clobber_file = os.path.join(cwd, "CLOBBER")
|
||||
contents = self.read_from_file(clobber_file)
|
||||
new_contents = ""
|
||||
for line in contents.splitlines():
|
||||
line = line.strip()
|
||||
if line.startswith("#") or line == "":
|
||||
new_contents += "%s\n" % line
|
||||
new_contents += "Merge day clobber"
|
||||
self.write_to_file(clobber_file, new_contents)
|
||||
|
||||
def bump_version(
|
||||
self,
|
||||
cwd,
|
||||
curr_version,
|
||||
next_version,
|
||||
curr_suffix,
|
||||
next_suffix,
|
||||
bump_major=False,
|
||||
use_config_suffix=False,
|
||||
):
|
||||
"""Bump versions (m-c, m-b).
|
||||
|
||||
At some point we may want to unhardcode these filenames into config
|
||||
"""
|
||||
curr_weave_version = str(int(curr_version) + 2)
|
||||
next_weave_version = str(int(curr_weave_version) + 1)
|
||||
for f in self.config["version_files"]:
|
||||
from_ = "%s.0%s" % (curr_version, curr_suffix)
|
||||
if use_config_suffix:
|
||||
to = "%s.0%s%s" % (next_version, next_suffix, f["suffix"])
|
||||
else:
|
||||
to = "%s.0%s" % (next_version, next_suffix)
|
||||
self.replace(os.path.join(cwd, f["file"]), from_, to)
|
||||
|
||||
# only applicable for m-c
|
||||
if bump_major:
|
||||
self.replace(
|
||||
os.path.join(cwd, "xpcom/components/Module.h"),
|
||||
"static const unsigned int kVersion = %s;" % curr_version,
|
||||
"static const unsigned int kVersion = %s;" % next_version,
|
||||
)
|
||||
self.replace(
|
||||
os.path.join(cwd, "services/sync/modules/constants.js"),
|
||||
'WEAVE_VERSION: "1.%s.0"' % curr_weave_version,
|
||||
'WEAVE_VERSION: "1.%s.0"' % next_weave_version,
|
||||
)
|
||||
|
||||
# Branch-specific workflow helper methods {{{1
|
||||
def bump_and_tag_central(self):
|
||||
"""No migrating. Just tag, bump version, and clobber mozilla-central.
|
||||
|
||||
Like bump_esr logic, to_dir is the target repo. In this case: mozilla-central. It's
|
||||
needed due to the way this script is designed. There is no "from_dir" that we are
|
||||
migrating from.
|
||||
"""
|
||||
dirs = self.query_abs_dirs()
|
||||
curr_mc_version = self.get_version(dirs["abs_to_dir"])[0]
|
||||
next_mc_version = str(int(curr_mc_version) + 1)
|
||||
to_fx_major_version = self.get_version(dirs["abs_to_dir"])[0]
|
||||
end_tag = self.config["end_tag"] % {"major_version": to_fx_major_version}
|
||||
base_to_rev = self.query_to_revision()
|
||||
|
||||
# tag m-c again since there are csets between tagging during m-c->m-b merge
|
||||
# e.g.
|
||||
# m-c tag during m-c->m-b migration: FIREFOX_BETA_60_BASE
|
||||
# m-c tag we are doing in this method now: FIREFOX_NIGHTLY_60_END
|
||||
# context: https://bugzilla.mozilla.org/show_bug.cgi?id=1431363#c14
|
||||
self.hg_tag(
|
||||
dirs["abs_to_dir"],
|
||||
end_tag,
|
||||
user=self.config["hg_user"],
|
||||
revision=base_to_rev,
|
||||
force=True,
|
||||
)
|
||||
self.bump_version(
|
||||
dirs["abs_to_dir"],
|
||||
curr_mc_version,
|
||||
next_mc_version,
|
||||
"a1",
|
||||
"a1",
|
||||
bump_major=True,
|
||||
use_config_suffix=False,
|
||||
)
|
||||
# touch clobber files
|
||||
self.touch_clobber_file(dirs["abs_to_dir"])
|
||||
|
||||
def central_to_beta(self, end_tag):
|
||||
"""mozilla-central -> mozilla-beta behavior.
|
||||
|
||||
We could have all of these individually toggled by flags, but
|
||||
by separating into workflow methods we can be more precise about
|
||||
what happens in each workflow, while allowing for things like
|
||||
staging beta user repo migrations.
|
||||
"""
|
||||
dirs = self.query_abs_dirs()
|
||||
next_mb_version = self.get_version(dirs["abs_to_dir"])[0]
|
||||
self.bump_version(
|
||||
dirs["abs_to_dir"],
|
||||
next_mb_version,
|
||||
next_mb_version,
|
||||
"a1",
|
||||
"",
|
||||
use_config_suffix=True,
|
||||
)
|
||||
self.apply_replacements()
|
||||
# touch clobber files
|
||||
self.touch_clobber_file(dirs["abs_to_dir"])
|
||||
|
||||
def beta_to_release(self, *args, **kwargs):
|
||||
"""mozilla-beta -> mozilla-release behavior.
|
||||
|
||||
We could have all of these individually toggled by flags, but
|
||||
by separating into workflow methods we can be more precise about
|
||||
what happens in each workflow, while allowing for things like
|
||||
staging beta user repo migrations.
|
||||
"""
|
||||
dirs = self.query_abs_dirs()
|
||||
# Reset display_version.txt
|
||||
for f in self.config["copy_files"]:
|
||||
self.copyfile(
|
||||
os.path.join(dirs["abs_to_dir"], f["src"]),
|
||||
os.path.join(dirs["abs_to_dir"], f["dst"]),
|
||||
)
|
||||
|
||||
self.apply_replacements()
|
||||
if self.config.get("remove_locales"):
|
||||
self.remove_locales(
|
||||
os.path.join(dirs["abs_to_dir"], "browser/locales/shipped-locales"),
|
||||
self.config["remove_locales"],
|
||||
)
|
||||
self.touch_clobber_file(dirs["abs_to_dir"])
|
||||
|
||||
def release_to_esr(self, *args, **kwargs):
|
||||
"""mozilla-release -> mozilla-esrNN behavior."""
|
||||
dirs = self.query_abs_dirs()
|
||||
self.apply_replacements()
|
||||
self.touch_clobber_file(dirs["abs_to_dir"])
|
||||
next_esr_version = self.get_version(dirs["abs_to_dir"])[0]
|
||||
self.bump_version(
|
||||
dirs["abs_to_dir"],
|
||||
next_esr_version,
|
||||
next_esr_version,
|
||||
"",
|
||||
"",
|
||||
use_config_suffix=True,
|
||||
)
|
||||
|
||||
def apply_replacements(self):
|
||||
dirs = self.query_abs_dirs()
|
||||
for f, from_, to in self.config["replacements"]:
|
||||
self.replace(os.path.join(dirs["abs_to_dir"], f), from_, to)
|
||||
|
||||
def pull_from_repo(self, from_dir, to_dir, revision=None, branch=None):
|
||||
"""Pull from one repo to another."""
|
||||
hg = self.query_exe("hg", return_type="list")
|
||||
cmd = hg + ["pull"]
|
||||
if revision:
|
||||
cmd.extend(["-r", revision])
|
||||
cmd.append(from_dir)
|
||||
self.run_command(
|
||||
cmd,
|
||||
cwd=to_dir,
|
||||
error_list=HgErrorList,
|
||||
halt_on_failure=True,
|
||||
)
|
||||
cmd = hg + ["update", "-C"]
|
||||
if branch or revision:
|
||||
cmd.extend(["-r", branch or revision])
|
||||
self.run_command(
|
||||
cmd,
|
||||
cwd=to_dir,
|
||||
error_list=HgErrorList,
|
||||
halt_on_failure=True,
|
||||
)
|
||||
|
||||
# Actions {{{1
|
||||
def bump_second_digit(self, *args, **kwargs):
|
||||
"""Bump second digit.
|
||||
|
||||
ESR need only the second digit bumped as a part of merge day."""
|
||||
dirs = self.query_abs_dirs()
|
||||
version = self.get_version(dirs["abs_to_dir"])
|
||||
curr_version = ".".join(version)
|
||||
next_version = list(version)
|
||||
# bump the second digit
|
||||
next_version[1] = str(int(next_version[1]) + 1)
|
||||
# Take major+minor and append '0' accordng to Firefox version schema.
|
||||
# 52.0 will become 52.1.0, not 52.1
|
||||
next_version = ".".join(next_version[:2] + ["0"])
|
||||
for f in self.config["version_files"]:
|
||||
self.replace(
|
||||
os.path.join(dirs["abs_to_dir"], f["file"]),
|
||||
curr_version,
|
||||
next_version + f["suffix"],
|
||||
)
|
||||
self.touch_clobber_file(dirs["abs_to_dir"])
|
||||
|
||||
def pull(self):
|
||||
"""Clone the gecko repos"""
|
||||
repos = self.query_repos()
|
||||
super(GeckoMigration, self).pull(repos=repos)
|
||||
|
||||
def migrate(self):
|
||||
"""Perform the migration."""
|
||||
dirs = self.query_abs_dirs()
|
||||
from_fx_major_version = self.get_version(dirs["abs_from_dir"])[0]
|
||||
to_fx_major_version = self.get_version(dirs["abs_to_dir"])[0]
|
||||
base_from_rev = self.query_from_revision()
|
||||
base_to_rev = self.query_to_revision()
|
||||
base_tag = self.config["base_tag"] % {"major_version": from_fx_major_version}
|
||||
self.hg_tag( # tag the base of the from repo
|
||||
dirs["abs_from_dir"],
|
||||
base_tag,
|
||||
user=self.config["hg_user"],
|
||||
revision=base_from_rev,
|
||||
)
|
||||
new_from_rev = self.query_from_revision()
|
||||
self.info("New revision %s" % new_from_rev)
|
||||
pull_revision = None
|
||||
if not self.config.get("pull_all_branches"):
|
||||
pull_revision = new_from_rev
|
||||
self.pull_from_repo(
|
||||
dirs["abs_from_dir"],
|
||||
dirs["abs_to_dir"],
|
||||
revision=pull_revision,
|
||||
branch="default",
|
||||
)
|
||||
if self.config.get("requires_head_merge") is not False:
|
||||
self.hg_merge_via_debugsetparents(
|
||||
dirs["abs_to_dir"],
|
||||
old_head=base_to_rev,
|
||||
new_head=new_from_rev,
|
||||
user=self.config["hg_user"],
|
||||
)
|
||||
|
||||
end_tag = self.config.get("end_tag") # tag the end of the to repo
|
||||
if end_tag:
|
||||
end_tag = end_tag % {"major_version": to_fx_major_version}
|
||||
self.hg_tag(
|
||||
dirs["abs_to_dir"],
|
||||
end_tag,
|
||||
user=self.config["hg_user"],
|
||||
revision=base_to_rev,
|
||||
force=True,
|
||||
)
|
||||
# Call beta_to_release etc.
|
||||
if not hasattr(self, self.config["migration_behavior"]):
|
||||
self.fatal(
|
||||
"Don't know how to proceed with migration_behavior %s !"
|
||||
% self.config["migration_behavior"]
|
||||
)
|
||||
getattr(self, self.config["migration_behavior"])(end_tag=end_tag)
|
||||
self.info(
|
||||
"Verify the diff, and apply any manual changes, such as disabling features, "
|
||||
"and --commit-changes"
|
||||
)
|
||||
|
||||
|
||||
# __main__ {{{1
|
||||
if __name__ == "__main__":
|
||||
GeckoMigration().run_and_exit()
|
||||
Загрузка…
Ссылка в новой задаче