def post_merge(dst_branch, database, squash):
merge_info = git.reflog(False)[0]
res = re.search(r".*: merge (\w+):.*", merge_info)
if res:
src_branch = res.group(1)
logging.info("Branch '%s' was merged with us, '%s'", src_branch, dst_branch)
logging.debug("Amalgamating patches from branch '%s' into one SQL file, and importing.", src_branch)
patches = [patch for patch in list_applied_patches(src_branch, database) if (
patch not in list_merged_patches(src_branch, dst_branch, database) and
patch not in list_ignored_patches(src_branch, database) and
patch not in list_patches_resulting_from_merge(dst_branch, src_branch, database))]
if not patches:
logging.info("No patches to apply.")
return
output_file = NamedTemporaryFile(suffix=".sql", delete=False)
for patch in patches:
with open(patch, "r") as patchfile:
output_file.write(patchfile.read())
output_file.flush()
try:
apply_patch(database, output_file.name, True)
if dst_branch == "master":
base_dir = os.path.join("sql", "development", database)
patch_filename = free_patch_name()
else:
base_dir = os.path.join(".git", "gitdb", "patches", dst_branch, database)
patch_filename = free_patch_name()
patch_name = os.path.join(base_dir, patch_filename)
makedirs(base_dir)
shutil.copy(output_file.name, patch_name)
add_patch_to_db(dst_branch, database, patch_name)
add_merged_patches(patches, patch_name, src_branch, dst_branch, database)
if dst_branch == "master":
# If we are on master, add the SQL file and amend the commit.
git.add(patch_name)
git.amend_commit()
except MySqlException:
# Rollback occured.
logging.error("SQL patch did not apply cleanly. This means that while the files in branch %s will have been updated, the database %s is not. Please bring the database to a consistent state manually (you can use the SQL information stored in %s for help), then run:", dst_branch, database, output_file.name)
logging.error("foobar")
else:
handle_pull(dst_branch, database)
def post_checkout_branch(branch, database, old_head_ref, new_head_ref):
"""\
Handle a switch in branches. Fun times ahead.
"""
if get_last_branch() == branch:
logging.warning("Already on branch %s.", branch)
return
# Still a work in progress
#check_branch_rename(branch, database)
if not exists_database(database + branch):
# The branched DB doesn't exist, create it from our current copy.
# XXX: This has problems! Currently we only support branching from the current branch...
# I think I can solve this by searching through all the branches, and finding the corresponding name
# for old_ref.
src_branch = get_last_branch()
copy_database(database, database + branch)
# Create the "base.sql" file for this branch - any changes to the branch will be relative to its starting
# point - and NOT to production.
create_base_sql(branch, database)
patches = [patch for patch in list_applied_patches(src_branch, database) if patch not in list_merged_patches(src_branch, branch, database) and patch not in list_ignored_patches(src_branch, database)]
add_merged_patches(patches, 'base.sql', src_branch, branch, database)
# XXX: Use reflog here rather to get the last branch.
rename_database(database, database + get_last_branch())
rename_database(database + branch, database)
set_last_branch(branch)
add_event_to_db(database, "branch-change", time.time())