def show_current():
bloom_ls = ls_tree('bloom')
bloom_files = [f for f, t in bloom_ls.iteritems() if t == 'file']
if 'bloom.conf' in bloom_files:
info("Old bloom.conf file detected, up converting...")
convert_old_bloom_conf()
bloom_ls = ls_tree('bloom')
bloom_files = [f for f, t in bloom_ls.iteritems() if t == 'file']
if 'tracks.yaml' in bloom_files:
info(yaml.dump(get_tracks_dict_raw(), indent=2,
default_flow_style=False))
def show_current():
bloom_ls = ls_tree(BLOOM_CONFIG_BRANCH)
bloom_files = [f for f, t in bloom_ls.iteritems() if t == 'file']
if 'bloom.conf' in bloom_files:
info("Old bloom.conf file detected, up converting...")
convert_old_bloom_conf()
bloom_ls = ls_tree(BLOOM_CONFIG_BRANCH)
bloom_files = [f for f, t in bloom_ls.iteritems() if t == 'file']
if 'tracks.yaml' in bloom_files:
info(
yaml.dump(get_tracks_dict_raw(),
indent=2,
default_flow_style=False))
def handle_tree(tree, directory, root_path, version):
for path, kind in tree.items():
if kind == 'directory':
# Path relative to start path
rel_path = os.path.join(directory, path)
# If it is a file, error
if os.path.isfile(rel_path):
error("In patches path '{0}' is a directory".format(rel_path) +
", but it exists in the upstream branch as a file.",
exit=True)
# If it is not already a directory, create it
if not os.path.isdir(rel_path):
info(" Createing directory... '{0}'".format(rel_path))
os.mkdir(rel_path)
# Recurse on the directory
handle_tree(
ls_tree(BLOOM_CONFIG_BRANCH, os.path.join(root_path,
rel_path)), rel_path,
root_path, version)
if kind == 'file':
# Path relative to start path
rel_path = os.path.join(directory, path)
# If the local version is a directory, error
if os.path.isdir(rel_path):
error("In patches path '{0}' is a file, ".format(rel_path) +
"but it exists in the upstream branch as a directory.",
exit=True)
# If the file already exists, warn
if os.path.isfile(rel_path):
warning(" File '{0}' already exists, overwriting...".format(
rel_path))
execute_command('git rm {0}'.format(rel_path), shell=True)
# If package.xml tempalte in version, else grab data
if path in ['stack.xml']:
warning(
" Skipping '{0}' templating, fuerte not supported".format(
rel_path))
if path in ['package.xml']:
info(" Templating '{0}' into upstream branch...".format(
rel_path))
file_data = show(BLOOM_CONFIG_BRANCH,
os.path.join(root_path, rel_path))
file_data = file_data.replace(':{version}', version)
else:
info(" Overlaying '{0}' into upstream branch...".format(
rel_path))
file_data = show(BLOOM_CONFIG_BRANCH,
os.path.join(root_path, rel_path))
# Write file
with open(rel_path, 'wb') as f:
# Python 2 will treat this as an ascii string but
# Python 3 will not re-decode a utf-8 string.
if sys.version_info.major == 2:
file_data = file_data.decode('utf-8').encode('utf-8')
else:
file_data = file_data.encode('utf-8')
f.write(file_data)
# Add it with git
execute_command('git add {0}'.format(rel_path), shell=True)
def check_for_bloom_conf(repository):
bloom_ls = ls_tree('bloom')
if bloom_ls is None:
error("Release repository '{0}' not initialized,".format(repository) +
" please initialize the bloom repository before releasing from it.",
exit=True)
bloom_files = [f for f, t in bloom_ls.iteritems() if t == 'file']
return 'bloom.conf' in bloom_files
def handle_tree(tree, directory, root_path, version):
for path, kind in tree.iteritems():
if kind == 'directory':
# Path relative to start path
rel_path = os.path.join(directory, path)
# If it is a file, error
if os.path.isfile(rel_path):
error("In patches path '{0}' is a directory".format(rel_path) +
", but it exists in the upstream branch as a file.",
exit=True)
# If it is not already a directory, create it
if not os.path.isdir(rel_path):
info(" Createing directory... '{0}'".format(rel_path))
os.mkdir(rel_path)
# Recurse on the directory
handle_tree(ls_tree(BLOOM_CONFIG_BRANCH, os.path.join(root_path, rel_path)),
rel_path, root_path, version)
if kind == 'file':
# Path relative to start path
rel_path = os.path.join(directory, path)
# If the local version is a directory, error
if os.path.isdir(rel_path):
error("In patches path '{0}' is a file, ".format(rel_path) +
"but it exists in the upstream branch as a directory.",
exit=True)
# If the file already exists, warn
if os.path.isfile(rel_path):
warning(" File '{0}' already exists, overwriting..."
.format(rel_path))
execute_command('git rm {0}'.format(rel_path), shell=True)
# If package.xml tempalte in version, else grab data
if path in ['stack.xml']:
warning(" Skipping '{0}' templating, fuerte not supported"
.format(rel_path))
if path in ['package.xml']:
info(" Templating '{0}' into upstream branch..."
.format(rel_path))
file_data = show(BLOOM_CONFIG_BRANCH, os.path.join(root_path, rel_path))
file_data = file_data.replace(':{version}', version)
else:
info(" Overlaying '{0}' into upstream branch..."
.format(rel_path))
file_data = show(BLOOM_CONFIG_BRANCH, os.path.join(root_path, rel_path))
# Write file
with open(rel_path, 'wb') as f:
f.write(file_data)
# Add it with git
execute_command('git add {0}'.format(rel_path), shell=True)
def handle_tree(tree, directory, root_path, version):
for path, kind in tree.iteritems():
if kind == "directory":
# Path relative to start path
rel_path = os.path.join(directory, path)
# If it is a file, error
if os.path.isfile(rel_path):
error(
"In patches path '{0}' is a directory".format(rel_path)
+ ", but it exists in the upstream branch as a file.",
exit=True,
)
# If it is not already a directory, create it
if not os.path.isdir(rel_path):
info(" Createing directory... '{0}'".format(rel_path))
os.mkdir(rel_path)
# Recurse on the directory
handle_tree(ls_tree("bloom", os.path.join(root_path, rel_path)), rel_path, root_path, version)
if kind == "file":
# Path relative to start path
rel_path = os.path.join(directory, path)
# If the local version is a directory, error
if os.path.isdir(rel_path):
error(
"In patches path '{0}' is a file, ".format(rel_path)
+ "but it exists in the upstream branch as a directory.",
exit=True,
)
# If the file already exists, warn
if os.path.isfile(rel_path):
warning(" File '{0}' already exists, overwriting...".format(rel_path))
execute_command("git rm {0}".format(rel_path), shell=True)
# If package.xml tempalte in version, else grab data
if path in ["package.xml", "stack.xml"]:
info(" Templating '{0}' into upstream branch...".format(rel_path))
file_data = show("bloom", os.path.join(root_path, rel_path))
file_data = file_data.replace(":{version}", version)
else:
info(" Overlaying '{0}' into upstream branch...".format(rel_path))
file_data = show("bloom", os.path.join(root_path, rel_path))
# Write file
with open(rel_path, "wb") as f:
f.write(file_data)
# Add it with git
execute_command("git add {0}".format(rel_path), shell=True)
def check_for_bloom_conf(repository):
bloom_ls = ls_tree('bloom')
if bloom_ls is None:
return False
bloom_files = [f for f, t in bloom_ls.items() if t == 'file']
return 'bloom.conf' in bloom_files
def import_upstream(tarball_path, patches_path, version, name, replace):
# Check for a url and download it
url = urlparse(tarball_path)
if url.scheme: # Some scheme like http, https, or file...
tmp_dir = tempfile.mkdtemp()
try:
info("Fetching file from url: '{0}'".format(tarball_path))
req = load_url_to_file_handle(tarball_path)
tarball_path = os.path.join(tmp_dir, os.path.basename(url.path))
with open(tarball_path, 'wb') as f:
chunk_size = 16 * 1024
while True:
chunk = req.read(chunk_size)
if not chunk:
break
f.write(chunk)
return import_upstream(tarball_path, patches_path, version, name, replace)
finally:
shutil.rmtree(tmp_dir)
# If there is not tarball at the given path, fail
if not os.path.exists(tarball_path):
error("Specified archive does not exists: '{0}'".format(tarball_path),
exit=True)
# If either version or name are not provided, guess from archive name
if not version or not name:
# Parse tarball name
tarball_file = os.path.basename(tarball_path)
ending = None
if tarball_file.endswith('.tar.gz'):
ending = '.tar.gz'
elif tarball_file.endswith('.zip'):
ending = '.zip'
else:
error("Cannot detect type of archive: '{0}'"
.format(tarball_file), exit=True)
tarball_file = tarball_file[:-len(ending)]
split_tarball_file = tarball_file.split('-')
if len(split_tarball_file) < 2 and not version or len(split_tarball_file) < 1:
error("Cannot detect name and/or version from archive: '{0}'"
.format(tarball_file), exit=True)
if not name and len(split_tarball_file) == 1:
name = split_tarball_file[0]
elif not name and len(split_tarball_file) == 1:
name = '-'.join(split_tarball_file[:-1])
if not version and len(split_tarball_file) < 2:
error("Cannot detect version from archive: '{0}'"
.format(tarball_file) + " and the version was not spcified.",
exit=True)
version = version if version else split_tarball_file[-1]
# Check if the patches_path (if given) exists
patches_path_dict = None
if patches_path:
patches_path_dict = ls_tree(BLOOM_CONFIG_BRANCH, patches_path)
if not patches_path_dict:
error("Given patches path '{0}' does not exist in bloom branch."
.format(patches_path), exit=True)
# Do version checking
version_check(version)
# Check for existing tags
upstream_tag = 'upstream/{0}'.format(version)
if tag_exists(upstream_tag):
if not replace:
error("Tag '{0}' already exists, use --replace to override it."
.format(upstream_tag), exit=True)
warning("Removing tag: '{0}'".format(upstream_tag))
delete_tag(upstream_tag)
if not get_git_clone_state():
delete_remote_tag(upstream_tag)
name_tag = '{0}/{1}'.format(name or 'upstream', version)
if name_tag != upstream_tag and tag_exists(name_tag):
if not replace:
error("Tag '{0}' already exists, use --replace to override it."
.format(name_tag), exit=True)
warning("Removing tag: '{0}'".format(name_tag))
delete_tag(name_tag)
if not get_git_clone_state():
delete_remote_tag(name_tag)
# If there is not upstream branch, create one
if not branch_exists('upstream'):
info("Creating upstream branch.")
create_branch('upstream', orphaned=True)
else:
track_branches(['upstream'])
# Import the given tarball
info("Importing archive into upstream branch...")
import_tarball(tarball_path, 'upstream', version, name)
# Handle patches_path
if patches_path:
import_patches(patches_path, patches_path_dict, 'upstream', version)
# Create tags
with inbranch('upstream'):
info("Creating tag: '{0}'".format(upstream_tag))
create_tag(upstream_tag)
if name_tag != upstream_tag:
info("Creating tag: '{0}'".format(name_tag))
create_tag(name_tag)
def check_for_bloom_conf(repository):
bloom_ls = ls_tree("bloom")
if bloom_ls is None:
return False
bloom_files = [f for f, t in bloom_ls.items() if t == "file"]
return "bloom.conf" in bloom_files
def execute_branch(src, dst, interactive, directory=None):
"""
Changes to the destination branch, creates branch and patches/branch
if they do not exist.
If the dst branch does not exist yet, then it is created by branching the
current working branch or the specified SRC_BRANCH.
If the patches/dst branch branch does not exist yet then it is created.
If the branches are created successful, then the working branch will be
set to the dst branch, otherwise the working branch will remain unchanged.
:param src: source branch from which to copy
:param dst: destination branch
:param interactive: if True actions are summarized before committing
:param directory: directory in which to preform this action
:raises: subprocess.CalledProcessError if any git calls fail
"""
# Determine if the srouce branch exists
if src is None:
error("No source specified and/or not a branch currently", exit=True)
if branch_exists(src, local_only=False, directory=directory):
if not branch_exists(src, local_only=True, directory=directory):
debug("Tracking source branch: {0}".format(src))
track_branches(src, directory)
elif tag_exists(src):
pass
else:
error("Specified source branch does not exist: {0}".format(src), exit=True)
# Determine if the destination branch needs to be created
create_dst_branch = False
if branch_exists(dst, local_only=False, directory=directory):
if not branch_exists(dst, local_only=True, directory=directory):
debug("Tracking destination branch: {0}".format(dst))
track_branches(dst, directory)
else:
create_dst_branch = True
# Determine if the destination patches branch needs to be created
create_dst_patches_branch = False
dst_patches = "patches/" + dst
if branch_exists(dst_patches, False, directory=directory):
if not branch_exists(dst_patches, True, directory=directory):
track_branches(dst_patches, directory)
else:
create_dst_patches_branch = True
# Summarize
if interactive:
info("Summary of changes:")
if create_dst_branch:
info(
" " * 22
+ "- The specified destination branch, "
+ ansi("boldon")
+ dst
+ ansi("reset")
+ ", does not exist; it will be created from the source "
"branch " + ansi("boldon") + src + ansi("reset")
)
if create_dst_patches_branch:
info(
" " * 22
+ "- The destination patches branch, "
+ ansi("boldon")
+ dst_patches
+ ansi("reset")
+ ", does not exist; it will be created"
)
info(" " * 22 + "- The working branch will be set to " + ansi("boldon") + dst + ansi("reset"))
if not maybe_continue():
error("Answered no to continue, aborting.", exit=True)
# Make changes to the layout
current_branch = get_current_branch(directory)
try:
# Change to the src branch
checkout(src, directory=directory)
# Create the dst branch if needed
if create_dst_branch:
create_branch(dst, changeto=True, directory=directory)
else:
checkout(dst, directory=directory)
# Create the dst patches branch if needed
if create_dst_patches_branch:
create_branch(dst_patches, orphaned=True, directory=directory)
# Create the starting config data if it does not exist
patches_ls = ls_tree(dst_patches, directory=directory)
if "patches.conf" not in patches_ls:
# Patches config not setup, set it up
config = {
"parent": src,
"previous": "",
"base": get_commit_hash(dst, directory=directory),
"trim": "",
"trimbase": "",
}
set_patch_config(dst_patches, config, directory=directory)
else:
config = get_patch_config(dst_patches, directory=directory)
if config["parent"] != src:
warning("Updated parent to '{0}' from '{1}'".format(src, config["parent"]))
config["parent"] = src
config["base"] = get_commit_hash(dst, directory=directory)
set_patch_config(dst_patches, config, directory=directory)
# Command successful, do not switch back to previous branch
current_branch = None
finally:
if current_branch is not None:
checkout(current_branch, directory=directory)
def execute_branch(src, dst, interactive, directory=None):
"""
Changes to the destination branch, creates branch and patches/branch
if they do not exist.
If the dst branch does not exist yet, then it is created by branching the
current working branch or the specified SRC_BRANCH.
If the patches/dst branch branch does not exist yet then it is created.
If the branches are created successful, then the working branch will be
set to the dst branch, otherwise the working branch will remain unchanged.
:param src: source branch from which to copy
:param dst: destination branch
:param interactive: if True actions are summarized before committing
:param directory: directory in which to preform this action
:raises: subprocess.CalledProcessError if any git calls fail
"""
# Determine if the srouce branch exists
if src is None:
error("No source specified and/or not a branch currently", exit=True)
if branch_exists(src, local_only=False, directory=directory):
if not branch_exists(src, local_only=True, directory=directory):
debug("Tracking source branch: {0}".format(src))
track_branches(src, directory)
elif tag_exists(src):
pass
else:
error("Specified source branch does not exist: {0}".format(src),
exit=True)
# Determine if the destination branch needs to be created
create_dst_branch = False
if branch_exists(dst, local_only=False, directory=directory):
if not branch_exists(dst, local_only=True, directory=directory):
debug("Tracking destination branch: {0}".format(dst))
track_branches(dst, directory)
else:
create_dst_branch = True
# Determine if the destination patches branch needs to be created
create_dst_patches_branch = False
dst_patches = 'patches/' + dst
if branch_exists(dst_patches, False, directory=directory):
if not branch_exists(dst_patches, True, directory=directory):
track_branches(dst_patches, directory)
else:
create_dst_patches_branch = True
# Summarize
if interactive:
info("Summary of changes:")
if create_dst_branch:
info(" " * 22 + "- The specified destination branch, " +
ansi('boldon') + dst + ansi('reset') +
", does not exist; it will be created from the source "
"branch " + ansi('boldon') + src + ansi('reset'))
if create_dst_patches_branch:
info(" " * 22 + "- The destination patches branch, " +
ansi('boldon') + dst_patches + ansi('reset') +
", does not exist; it will be created")
info(" " * 22 + "- The working branch will be set to " +
ansi('boldon') + dst + ansi('reset'))
if not maybe_continue():
error("Answered no to continue, aborting.", exit=True)
# Make changes to the layout
current_branch = get_current_branch(directory)
try:
# Change to the src branch
checkout(src, directory=directory)
# Create the dst branch if needed
if create_dst_branch:
create_branch(dst, changeto=True, directory=directory)
else:
checkout(dst, directory=directory)
# Create the dst patches branch if needed
if create_dst_patches_branch:
create_branch(dst_patches, orphaned=True, directory=directory)
# Create the starting config data if it does not exist
patches_ls = ls_tree(dst_patches, directory=directory)
if 'patches.conf' not in patches_ls:
# Patches config not setup, set it up
config = {
'parent': src,
'previous': '',
'base': get_commit_hash(dst, directory=directory),
'trim': '',
'trimbase': ''
}
set_patch_config(dst_patches, config, directory=directory)
else:
config = get_patch_config(dst_patches, directory=directory)
if config['parent'] != src:
warning("Updated parent to '{0}' from '{1}'".format(
src, config['parent']))
config['parent'] = src
config['base'] = get_commit_hash(dst, directory=directory)
set_patch_config(dst_patches, config, directory=directory)
# Command successful, do not switch back to previous branch
current_branch = None
finally:
if current_branch is not None:
checkout(current_branch, directory=directory)
def check_for_bloom_conf(repository):
bloom_ls = ls_tree('bloom')
if bloom_ls is None:
return False
bloom_files = [f for f, t in bloom_ls.items() if t == 'file']
return 'bloom.conf' in bloom_files
def import_upstream(tarball_path, patches_path, version, name, replace):
# If there is not tarball at the given path, fail
if not os.path.exists(tarball_path):
error("Specified archive does not exists: '{0}'".format(tarball_path), exit=True)
# If either version or name are not provided, guess from archive name
if not version or not name:
# Parse tarball name
tarball_file = os.path.basename(tarball_path)
ending = None
if tarball_file.endswith(".tar.gz"):
ending = ".tar.gz"
elif tarball_file.endswith(".zip"):
ending = ".zip"
else:
error("Cannot detect type of archive: '{0}'".format(tarball_file), exit=True)
tarball_file = tarball_file[: -len(ending)]
split_tarball_file = tarball_file.split("-")
if len(split_tarball_file) < 2 and not version or len(split_tarball_file) < 1:
error("Cannot detect name and/or version from archive: '{0}'".format(tarball_file), exit=True)
if not name and len(split_tarball_file) == 1:
name = split_tarball_file[0]
elif not name and len(split_tarball_file) == 1:
name = "-".join(split_tarball_file[:-1])
if not version and len(split_tarball_file) < 2:
error(
"Cannot detect version from archive: '{0}'".format(tarball_file) + " and the version was not spcified.",
exit=True,
)
version = version if version else split_tarball_file[-1]
# Check if the patches_path (if given) exists
patches_path_dict = None
if patches_path:
patches_path_dict = ls_tree("bloom", patches_path)
if not patches_path_dict:
error("Given patches path '{0}' does not exist in bloom branch.".format(patches_path), exit=True)
# Do version checking
version_check(version)
# Check for existing tags
upstream_tag = "upstream/{0}".format(version)
if tag_exists(upstream_tag):
if not replace:
error("Tag '{0}' already exists, use --replace to override it.".format(upstream_tag), exit=True)
warning("Removing tag: '{0}'".format(upstream_tag))
delete_tag(upstream_tag)
if not get_git_clone_state():
delete_remote_tag(upstream_tag)
name_tag = "{0}/{1}".format(name or "upstream", version)
if name_tag != upstream_tag and tag_exists(name_tag):
if not replace:
error("Tag '{0}' already exists, use --replace to override it.".format(name_tag), exit=True)
warning("Removing tag: '{0}'".format(name_tag))
delete_tag(name_tag)
if not get_git_clone_state():
delete_remote_tag(name_tag)
# If there is not upstream branch, create one
if not branch_exists("upstream"):
info("Creating upstream branch.")
create_branch("upstream", orphaned=True)
else:
track_branches(["upstream"])
# Import the given tarball
info("Importing archive into upstream branch...")
import_tarball(tarball_path, "upstream", version, name)
# Handle patches_path
if patches_path:
import_patches(patches_path, patches_path_dict, "upstream", version)
# Create tags
with inbranch("upstream"):
info("Creating tag: '{0}'".format(upstream_tag))
create_tag(upstream_tag)
if name_tag != upstream_tag:
info("Creating tag: '{0}'".format(name_tag))
create_tag(name_tag)