skilleter-thingy 0.0.38__py3-none-any.whl → 0.0.39__py3-none-any.whl

git_hold.py

@@ -1,154 +0,0 @@
-#!/usr/bin/env python3
-"""Archive one or more branches by tagging the branch then deleting it
-   The branch tag is 'archive/BRANCH_NAME'"""
-
-import sys
-import argparse
-import fnmatch
-
-import thingy.colour as colour
-import thingy.git as git
-
-################################################################################
-# Prefix for tags representing archived branches
-
-ARCHIVE_PREFIX = 'archive/'
-
-################################################################################
-
-def archive_tag_name(branch):
-    """Return the tag name for an archive branch"""
-
-    return f'{ARCHIVE_PREFIX}{branch}'
-
-################################################################################
-
-def archive_branch_name(tag):
-    """Return the branch name for an archive tag"""
-
-    if not tag.startswith(ARCHIVE_PREFIX):
-        raise git.GitError(f'{tag} is not an archive tag')
-
-    return tag[len(ARCHIVE_PREFIX):]
-
-################################################################################
-
-def archive_tags():
-    """Return the list of current archive tags"""
-
-    return [tag for tag in git.tags() if tag.startswith(ARCHIVE_PREFIX)]
-
-################################################################################
-
-def archive_branches(branches):
-    """Archive one or more branches"""
-
-    tags = archive_tags()
-    current_branch = git.branch()
-
-    for branch in branches:
-        if not git.isbranch(branch):
-            colour.error(f'[RED:ERROR:] Branch {branch} does not exist')
-
-        if archive_tag_name(branch) in tags:
-            colour.error(f'[RED:ERROR:] An archive tag already exists for branch {branch}')
-
-        if branch == current_branch:
-            colour.error(f'[RED:ERROR:] Cannot archive the current branch')
-
-    for branch in branches:
-        tag_name = archive_tag_name(branch)
-
-        git.set_tag(tag_name, branch)
-        git.delete_branch(branch, force=True)
-
-    for remote in git.remotes():
-        git.push(repository=remote, tags=True)
-
-################################################################################
-
-def list_archive_branches(branches):
-    """List archive branches, optionally only those matching entries in the
-       branches parameter"""
-
-    tags = archive_tags()
-
-    if branches:
-        report = set()
-
-        for branch in branches:
-            for tag in tags:
-                branch_name = archive_branch_name(tag)
-                if branch_name not in report and fnmatch.fnmatch(branch_name, branch):
-                    report.add(branch_name)
-    else:
-        report = set(tags)
-
-    for branch_name in sorted(report):
-        print(branch_name)
-
-################################################################################
-
-def restore_archive_branches(branches):
-    """Restore archived branches"""
-
-    tags = archive_tags()
-
-    for branch in branches:
-        if not archive_tag_name(branch) in tags:
-            colour.error(f'[RED:ERROR:] Archive branch {branch} does not exist')
-
-    archive_tag_names = []
-
-    for branch in branches:
-        archive_tag = archive_tag_name(branch)
-        archive_tag_names.append(archive_tag)
-
-        git.checkout(branch, commit=archive_tag)
-        git.delete_tag(archive_tag)
-
-    for remote in git.remotes():
-        git.push(repository=remote, delete=True, refspec=archive_tag_names)
-
-################################################################################
-
-def main():
-    """Main function"""
-
-    parser = argparse.ArgumentParser(description='Archive, list or recover one or more Git branches')
-    parser.add_argument('--list', '-l', action='store_true', help='List archived branches')
-    parser.add_argument('--restore', '-r', action='store_true', help='Restore archived branches')
-    parser.add_argument('branches', nargs='*', help='Branches')
-
-    args = parser.parse_args()
-
-    if args.list and args.restore:
-        colour.error('[RED:ERROR:] The list and restore options cannot be specified together')
-
-    if not args.branches and not args.list:
-        colour.error('[RED:ERROR:] No branches specified')
-
-    if args.list:
-        list_archive_branches(args.branches)
-    elif args.restore:
-        restore_archive_branches(args.branches)
-    else:
-        archive_branches(args.branches)
-
-################################################################################
-
-def git_hold():
-    """Entry point"""
-
-    try:
-        main()
-
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    git_hold()

git_mr.py

@@ -1,92 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Push to Gitlab and create a merge request at the same time """
-################################################################################
-
-import logging
-import sys
-import argparse
-
-import thingy.git as git
-import thingy.colour as colour
-
-################################################################################
-
-DESCRIPTION = 'Push a feature branch to GitLab and create a merge request'
-
-################################################################################
-
-def parse_arguments():
-    """ Parse and return command line arguments """
-
-    parser = argparse.ArgumentParser(description=DESCRIPTION, formatter_class=argparse.RawTextHelpFormatter)
-
-    parser.add_argument('--debug', action='store_true', help='Enable debug output')
-    parser.add_argument('-f', '--force', action='store_true', help='Force-push the branch')
-    parser.add_argument('--parent', '-p', action='store', help='Override the default parent and specify the branch to merge onto')
-    parser.add_argument('--reviewer', '-r', action='store', help='Specify the name of the reviewer for the merge request')
-    parser.add_argument('--keep', '-k', action='store_true', help='Keep the source branch after the merge (default is to delete it).')
-
-    args = parser.parse_args()
-
-    # Enable logging if requested
-
-    if args.debug:
-        logging.basicConfig(level=logging.INFO)
-
-    return args
-
-################################################################################
-
-def main():
-    """ Main function - parse the command line and perform the pushing """
-
-    args = parse_arguments()
-
-    if args.parent:
-        parents = [args.parent]
-    else:
-        parents, _ = git.parents()
-
-        if len(parents) > 1:
-            parent_list = ', '.join(parents)
-            colour.error(
-                f'Branch has multiple potential parents: [BLUE]{parent_list}[NORMAL]. Use the [BLUE]--parent[NORMAL] option to specify the appropriate one.')
-        elif not parents:
-            colour.error('Unable to determine parent branch. Use the [BLUE]--parent[NORMAL] option to specify the appropriate one.')
-
-    options = ['merge_request.create', f'merge_request.target={parents[0]}']
-
-    if args.reviewer:
-        options.append(f'merge_request.assign={args.reviewer}')
-
-    if not args.keep:
-        options.append('merge_request.remove_source_branch')
-
-    logging.debug('Running git push with:')
-    logging.debug('  force: %s', args.force)
-    logging.debug('  push options: %s', options)
-
-    result = git.push(force_with_lease=args.force, push_options=options)
-
-    for text in result:
-        print(text)
-
-################################################################################
-
-def git_mr():
-    """Entry point"""
-
-    try:
-        main()
-
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    git_mr()

git_parent.py

@@ -1,77 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Attempt to determine the parent branch of a commit by tracking down
-the branch commit history and looking for other branches that share
-the same commit. Can optionally ignore feature branches and/or report
-the distance to the potential parent.
-"""
-
-import argparse
-import sys
-
-import thingy.git as git
-import thingy.colour as colour
-
-################################################################################
-
-def main():
-    """ Main function """
-
-    parser = argparse.ArgumentParser(description='Attempt to determine the parent branch for the specified branch (defaulting to the current one)')
-    parser.add_argument('-a', '--all', action='store_true', help='Include feature branches as possible parents')
-    parser.add_argument('-v', '--verbose', action='store_true', help='Report verbose results (includes number of commits between branch and parent)')
-    parser.add_argument('branch', action='store', nargs='?', type=str, default='HEAD', help='Branch, commit or commit')
-
-    args = parser.parse_args()
-
-    try:
-        if args.all:
-            any_parents, any_distance = git.parents(args.branch)
-        else:
-            any_parents = []
-
-        parents, distance = git.parents(args.branch, ignore='feature/*')
-
-        # If we have feature and non-feature branch candidates, decide which to report
-        # (one or both) based on distance.
-
-        if parents and any_parents:
-            if any_distance < distance:
-                parents = any_parents
-                distance = any_distance
-            elif any_distance == distance:
-                for more in any_parents:
-                    if more not in parents:
-                        parents.append(more)
-
-    except git.GitError as exc:
-        colour.error(f'[RED:ERROR:] {exc.msg}', status=exc.status)
-
-    if parents:
-        if args.verbose:
-            if len(parents) == 1:
-                colour.write(f'Parent branch [BLUE:{parents[0]}] is [BLUE:{distance}] commits away from [BLUE:{args.branch}]')
-            else:
-                colour.write(f'Parent branches [BLUE:%s] are [BLUE:{distance}] commits away from [BLUE:{args.branch}[' % (', '.join(parents)))
-        else:
-            print(', '.join(parents))
-    else:
-        colour.error('[RED:Could not determine parent branch]\n')
-
-################################################################################
-
-def git_parent():
-    """Entry point"""
-
-    try:
-        main()
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    git_parent()