git_merge_all.py

#!/usr/bin/env python2
# -*- coding: utf-8 -*-
import argparse
import utils.cli.git_utils as gpull
from utils.cli.output import out, blue, yellow, green, bold, red
from utils.config import Config

__author__ = 'Kevin Dubois'
__version__ = '0.0.1'


class GitMergeAll(object):
    def __init__(self):
        """instantiate default variables to be used in the class"""
        self.gitutils = gpull.GitUtils()
        config = Config()
        self.default_working_dir = config.get_default_merge_dir()

    def main(self):
        """Parse arguments and then call the appropriate function(s)."""

        parser = argparse.ArgumentParser(description="""Merge one branch (-b) to another (-t)""")

        parser.add_argument('-b', '--branch', nargs='?', metavar="branch", required=True,
                            help="""branch to merge from""")

        parser.add_argument('-t', '--to_branch', nargs='?', metavar="to_branch", required=True,
                            help="""branch to merge into""")

        parser.add_argument('-o', '--one-way', nargs='?', metavar="one_way", required=False, default="True",
                            help="""Merge branch one way, or both ways if False""")

        parser.add_argument('-w', '--working-dir', nargs='?', metavar="working_dir", required=False, default=None,
                            help="""Working Directory (to stage the merge)""")

        args = parser.parse_args()

        if args.working_dir is None:
            args.working_dir = self.default_working_dir

        try:
            self.merge_branches(args.branch, args.to_branch, args.one_way, args.working_dir)

        except Exception as e:
            out(0, red(e))

    def merge_branches(self, branch, to_branch, one_way=True, working_dir='var/release'):

        if one_way is False:
            # first  merge to branch into the working branch
            out(1, blue("Pulling from {} and merging into {}".format(to_branch, branch)))
            output = self.gitutils.git_merge_all(to_branch, branch. working_dir)

            if output is False:
                raise Exception("Aborting!! Could not run shell command :(")

        # Merge the from branch into the destination branch
        out(1, blue("Pulling from {} and merging into {}".format(branch, to_branch)))
        output = self.gitutils.git_merge_all(branch, to_branch, working_dir)

        if output is False:
            raise Exception("Aborting!! Could not run shell command :(")

        return True


if __name__ == "__main__":
    try:
        StagePusher = GitMergeAll()
        StagePusher.main()
    except KeyboardInterrupt:
        out(0, "Stopped by user.")