diff -Nru legit-1.2.0/debian/changelog legit-1.2.0.post0/debian/changelog --- legit-1.2.0/debian/changelog 2019-12-13 03:00:41.000000000 +0000 +++ legit-1.2.0.post0/debian/changelog 2020-04-05 07:19:27.000000000 +0000 @@ -1,3 +1,12 @@ +legit (1.2.0.post0-1) unstable; urgency=medium + + * New upstream version 1.2.0.post0 + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + * Bump Standards-Version to 4.5.0 + + -- TANIGUCHI Takaki Sun, 05 Apr 2020 16:19:27 +0900 + legit (1.2.0-2) unstable; urgency=medium * d/control: Add python3-crayons to Depends. diff -Nru legit-1.2.0/debian/control legit-1.2.0.post0/debian/control --- legit-1.2.0/debian/control 2019-12-13 03:00:41.000000000 +0000 +++ legit-1.2.0.post0/debian/control 2020-04-05 07:19:27.000000000 +0000 @@ -8,7 +8,7 @@ python3-setuptools, python3-docutils, dh-python -Standards-Version: 4.4.1 +Standards-Version: 4.5.0 Homepage: https://github.com/frostming/legit Vcs-Git: https://salsa.debian.org/python-team/applications/legit.git Vcs-Browser: https://salsa.debian.org/python-team/applications/legit diff -Nru legit-1.2.0/debian/upstream/metadata legit-1.2.0.post0/debian/upstream/metadata --- legit-1.2.0/debian/upstream/metadata 2019-12-13 03:00:41.000000000 +0000 +++ legit-1.2.0.post0/debian/upstream/metadata 2020-04-05 07:19:27.000000000 +0000 @@ -1 +1,4 @@ -Repository: https://github.com/frostming/legit +Bug-Database: https://github.com/frostming/legit/issues +Bug-Submit: https://github.com/frostming/legit/issues/new +Repository: https://github.com/frostming/legit.git +Repository-Browse: https://github.com/frostming/legit diff -Nru legit-1.2.0/extra/bash-completion/legit legit-1.2.0.post0/extra/bash-completion/legit --- legit-1.2.0/extra/bash-completion/legit 2019-07-19 05:44:11.000000000 +0000 +++ legit-1.2.0.post0/extra/bash-completion/legit 2019-07-20 05:10:41.000000000 +0000 @@ -1,65 +1,65 @@ -_legit() -{ - local cur prev opts - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - opts="branches publish switch sync unpublish" - local running=`git for-each-ref --format='%(refname:short)' --sort='refname:short' refs/heads` - - case "${prev}" in - sy|sync) - COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) - return 0 - ;; - sw|switch) - COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) - return 0 - ;; - pub|publish) - COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) - return 0 - ;; - unp|unpublish|rs) - local running=$(for x in `git ls-remote 2>/dev/null | grep refs/heads | awk '{ print $2 }' | sed -e 's/refs\/heads\///g'`; do echo ${x} ; done ) - COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) - return 0 - ;; - *) - ;; - esac - - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 -} - -complete -F _legit legit - - - - - -_git_unpublish() -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local running=$(for x in `git ls-remote 2>/dev/null | grep refs/heads | awk '{ print $2 }' | sed -e 's/refs\/heads\///g'`; do echo ${x} ; done ) - COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) - return 0 -} - -_complete_with_git_branch() -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local running=`git for-each-ref --format='%(refname:short)' --sort='refname:short' refs/heads` - COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) - return 0 -} - -function _git_sync { _complete_with_git_branch; } -function _git_switch { _complete_with_git_branch; } -function _git_publish { _complete_with_git_branch; } - -complete -F _git_sync git-sync -complete -F _git_switch git-switch -complete -F _git_publish git-publish -complete -F _git_unpublish git-unpublish +_legit() +{ + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + opts="branches publish switch sync unpublish" + local running=`git for-each-ref --format='%(refname:short)' --sort='refname:short' refs/heads` + + case "${prev}" in + sy|sync) + COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) + return 0 + ;; + sw|switch) + COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) + return 0 + ;; + pub|publish) + COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) + return 0 + ;; + unp|unpublish|rs) + local running=$(for x in `git ls-remote 2>/dev/null | grep refs/heads | awk '{ print $2 }' | sed -e 's/refs\/heads\///g'`; do echo ${x} ; done ) + COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) + return 0 + ;; + *) + ;; + esac + + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 +} + +complete -F _legit legit + + + + + +_git_unpublish() +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local running=$(for x in `git ls-remote 2>/dev/null | grep refs/heads | awk '{ print $2 }' | sed -e 's/refs\/heads\///g'`; do echo ${x} ; done ) + COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) + return 0 +} + +_complete_with_git_branch() +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local running=`git for-each-ref --format='%(refname:short)' --sort='refname:short' refs/heads` + COMPREPLY=( $(compgen -W "${running}" -- ${cur}) ) + return 0 +} + +function _git_sync { _complete_with_git_branch; } +function _git_switch { _complete_with_git_branch; } +function _git_publish { _complete_with_git_branch; } + +complete -F _git_sync git-sync +complete -F _git_switch git-switch +complete -F _git_publish git-publish +complete -F _git_unpublish git-unpublish diff -Nru legit-1.2.0/legit/bootstrap.py legit-1.2.0.post0/legit/bootstrap.py --- legit-1.2.0/legit/bootstrap.py 2019-07-19 05:44:11.000000000 +0000 +++ legit-1.2.0.post0/legit/bootstrap.py 2019-07-20 05:10:41.000000000 +0000 @@ -1,68 +1,68 @@ -# -*- coding: utf-8 -*- - -""" -legit.bootstrap -~~~~~~~~~~~~~~~ - -This module boostraps the Legit runtime. -""" - - -from clint import resources -from clint.textui import colored -import crayons -from six.moves import configparser - -from .settings import legit_settings - -resources.init('kennethreitz', 'legit') - -try: - config_file = resources.user.open('config.ini', 'r') -except IOError: - resources.user.write('config.ini', '') - config_file = resources.user.open('config.ini', 'r') - - -# Load existing configuration. -config = configparser.ConfigParser() -try: - # `read_file()` added in Python 3.2 - config.read_file(config_file) -except AttributeError: - config.readfp(config_file) - - -# Populate if needed. -if not config.has_section('legit'): - config.add_section('legit') - - -modified = False - -# Set defaults if they are missing. -# Add everything to settings object. -for (k, v, _) in legit_settings.config_defaults: - if not config.has_option('legit', k): - modified = True - config.set('legit', k, v) - setattr(legit_settings, k, v) - else: - val = config.get('legit', k) - - # Map boolean strings. - if val.lower() in ('true', '1', 'yep', 'sure'): - val = True - elif val.lower() in ('false', '0', 'nope', 'nadda', 'nah'): - val = False - - setattr(legit_settings, k, val) - -if modified: - config_file = resources.user.open('config.ini', 'w') - config.write(config_file) - - -if legit_settings.disable_colors: - crayons.disable() - colored.DISABLE_COLOR = True +# -*- coding: utf-8 -*- + +""" +legit.bootstrap +~~~~~~~~~~~~~~~ + +This module boostraps the Legit runtime. +""" + + +from clint import resources +from clint.textui import colored +import crayons +from six.moves import configparser + +from .settings import legit_settings + +resources.init('kennethreitz', 'legit') + +try: + config_file = resources.user.open('config.ini', 'r') +except IOError: + resources.user.write('config.ini', '') + config_file = resources.user.open('config.ini', 'r') + + +# Load existing configuration. +config = configparser.ConfigParser() +try: + # `read_file()` added in Python 3.2 + config.read_file(config_file) +except AttributeError: + config.readfp(config_file) + + +# Populate if needed. +if not config.has_section('legit'): + config.add_section('legit') + + +modified = False + +# Set defaults if they are missing. +# Add everything to settings object. +for (k, v, _) in legit_settings.config_defaults: + if not config.has_option('legit', k): + modified = True + config.set('legit', k, v) + setattr(legit_settings, k, v) + else: + val = config.get('legit', k) + + # Map boolean strings. + if val.lower() in ('true', '1', 'yep', 'sure'): + val = True + elif val.lower() in ('false', '0', 'nope', 'nadda', 'nah'): + val = False + + setattr(legit_settings, k, val) + +if modified: + config_file = resources.user.open('config.ini', 'w') + config.write(config_file) + + +if legit_settings.disable_colors: + crayons.disable() + colored.DISABLE_COLOR = True diff -Nru legit-1.2.0/legit/cli.py legit-1.2.0.post0/legit/cli.py --- legit-1.2.0/legit/cli.py 2019-12-10 08:34:06.000000000 +0000 +++ legit-1.2.0.post0/legit/cli.py 2020-03-08 13:49:38.000000000 +0000 @@ -123,7 +123,7 @@ raise click.BadArgumentUsage('Please specify a branch to switch to') scm.stash_log() - status_log(scm.checkout_branch, 'Switching to {0}.'.format( + status_log(scm.checkout_branch, 'Switching to {}.'.format( crayons.yellow(to_branch)), to_branch) scm.unstash_log() @@ -153,7 +153,7 @@ original_branch = scm.get_current_branch_name() else: raise click.BadArgumentUsage( - "Branch {0} does not exist. Use an existing branch." + "Branch {} does not exist. Use an existing branch." .format(crayons.yellow(branch))) else: # Sync current branch. @@ -171,7 +171,7 @@ ctx.invoke(switch, to_branch=original_branch, verbose=verbose, fake=fake) else: raise click.BadArgumentUsage( - "Branch {0} is not published. Publish before syncing." + "Branch {} is not published. Publish before syncing." .format(crayons.yellow(branch))) @@ -192,20 +192,20 @@ branch = scm.get_current_branch_name() scm.display_available_branches() if to_branch is None: - click.echo("Using current branch {0}".format(crayons.yellow(branch))) + click.echo("Using current branch {}".format(crayons.yellow(branch))) else: click.echo( - "Branch {0} not found, using current branch {1}" + "Branch {} not found, using current branch {}" .format(crayons.red(to_branch), crayons.yellow(branch))) branch_names = scm.get_branch_names(local=False) if branch in branch_names: raise click.BadArgumentUsage( - "Branch {0} is already published. Use a branch that is not published." + "Branch {} is already published. Use a branch that is not published." .format(crayons.yellow(branch))) - status_log(scm.publish_branch, 'Publishing {0}.'.format( + status_log(scm.publish_branch, 'Publishing {}.'.format( crayons.yellow(branch)), branch) @@ -230,10 +230,10 @@ if branch not in branch_names: raise click.BadArgumentUsage( - "Branch {0} is not published. Use a branch that is published." + "Branch {} is not published. Use a branch that is published." .format(crayons.yellow(branch))) - status_log(scm.unpublish_branch, 'Unpublishing {0}.'.format( + status_log(scm.unpublish_branch, 'Unpublishing {}.'.format( crayons.yellow(branch)), branch) @@ -281,7 +281,7 @@ if click.confirm('\n{}Install aliases above?'.format('FAKE ' if fake else ''), default=fake): for alias in aliases: cmd = '!{} {}'.format(program, alias) - system_command = 'git config --global --replace-all alias.{0} "{1}"'.format(alias, cmd) + system_command = 'git config --global --replace-all alias.{} "{}"'.format(alias, cmd) verbose_echo(system_command, verbose, fake) if not fake: os.system(system_command) @@ -297,7 +297,7 @@ # Add deprecated aliases aliases.extend(['graft', 'harvest', 'sprout', 'resync', 'settings', 'install', 'uninstall']) for alias in aliases: - system_command = 'git config --global --unset-all alias.{0}'.format(alias) + system_command = 'git config --global --unset-all alias.{}'.format(alias) verbose_echo(system_command, verbose, fake) if not fake: os.system(system_command) @@ -324,7 +324,7 @@ def handle_abort(aborted, type=None): - click.echo('{0} {1}'.format(crayons.red('Error:'), aborted.message)) + click.echo('{} {}'.format(crayons.red('Error:'), aborted.message)) click.echo(str(aborted.log)) if type == 'merge': click.echo('Unfortunately, there was a merge conflict.' diff -Nru legit-1.2.0/legit/core.py legit-1.2.0.post0/legit/core.py --- legit-1.2.0/legit/core.py 2019-12-10 08:34:06.000000000 +0000 +++ legit-1.2.0.post0/legit/core.py 2020-03-14 14:39:44.000000000 +0000 @@ -8,8 +8,9 @@ """ from . import bootstrap + del bootstrap -__version__ = '1.2.0' -__author__ = 'Kenneth Reitz' -__license__ = 'BSD' +__version__ = "1.2.0post0" +__author__ = "Kenneth Reitz" +__license__ = "BSD" diff -Nru legit-1.2.0/legit/__init__.py legit-1.2.0.post0/legit/__init__.py --- legit-1.2.0/legit/__init__.py 2019-07-19 05:44:11.000000000 +0000 +++ legit-1.2.0.post0/legit/__init__.py 2019-07-20 05:10:41.000000000 +0000 @@ -1,3 +1,3 @@ -# -*- coding: utf-8 -*- - -from .core import * # noqa +# -*- coding: utf-8 -*- + +from .core import * # noqa diff -Nru legit-1.2.0/legit/scm.py legit-1.2.0.post0/legit/scm.py --- legit-1.2.0/legit/scm.py 2019-10-01 12:54:26.000000000 +0000 +++ legit-1.2.0.post0/legit/scm.py 2020-03-08 13:49:38.000000000 +0000 @@ -100,11 +100,11 @@ if ( (('Legit' in stash) and - ('On {0}:'.format(branch) in stash) and + ('On {}:'.format(branch) in stash) and (verb in stash) ) or (('GitHub' in stash) and - ('On {0}:'.format(branch) in stash) and + ('On {}:'.format(branch) in stash) and (verb in stash) ) ): @@ -133,7 +133,7 @@ self.git_exec(['fetch', self.remote.name]) - return self.smart_merge('{0}/{1}'.format(self.remote.name, branch), + return self.smart_merge('{}/{}'.format(self.remote.name, branch), self.smart_merge_enabled()) def smart_merge_enabled(self): @@ -148,7 +148,7 @@ from_branch = self.get_current_branch_name() merges = self.git_exec( - ['log', '--merges', '{0}..{1}'.format(branch, from_branch)]) + ['log', '--merges', '{}..{}'.format(branch, from_branch)]) if allow_rebase: verb = 'merge' if merges.count('commit') else 'rebase' @@ -166,7 +166,7 @@ except GitCommandError as why: log = self.git_exec([verb, '--abort']) abort('Merge failed. Reverting.', - log='{0}\n{1}'.format(why, log), type='merge') + log='{}\n{}'.format(why, log), type='merge') def pull_rebase(self): reader = self.repo.config_reader() @@ -205,7 +205,7 @@ try: return self.git_exec( - ['push', self.remote.name, ':{0}'.format(branch)]) + ['push', self.remote.name, ':{}'.format(branch)]) except GitCommandError: _, _, log = self.git_exec( ['fetch', self.remote.name, '--prune'], @@ -241,7 +241,7 @@ if fallback_enabled(reader): return self.get_default_remote() else: - click.echo('Remote "{0}" does not exist!'.format(remote_name)) + click.echo('Remote "{}" does not exist!'.format(remote_name)) will_aborted = click.confirm( '\nPress `Y` to abort now,\n' + '`n` to use default remote and turn fallback on for this repo:') diff -Nru legit-1.2.0/legit/utils.py legit-1.2.0.post0/legit/utils.py --- legit-1.2.0/legit/utils.py 2019-12-10 08:34:06.000000000 +0000 +++ legit-1.2.0.post0/legit/utils.py 2020-03-08 13:49:38.000000000 +0000 @@ -70,7 +70,7 @@ """Format the help string.""" help = help.replace('Options:', str(black('Options:', bold=True))) - help = help.replace('Usage: legit', str('Usage: {0}'.format(black('legit', bold=True)))) + help = help.replace('Usage: legit', str('Usage: {}'.format(black('legit', bold=True)))) help = help.replace(' switch', str(crayons.green(' switch', bold=True))) help = help.replace(' sync', str(crayons.green(' sync', bold=True))) @@ -82,25 +82,25 @@ additional_help = \ """Usage Examples: Switch to specific branch: -$ {0} +$ {} Sync current branch with remote: -$ {1} +$ {} Sync current code with a specific remote branch: -$ {2} +$ {} Publish current branch to remote: -$ {3} +$ {} Publish a specific branch to remote: -$ {4} +$ {} Unpublish a specific branch from remote: -$ {5} +$ {} List branches matching wildcard pattern: -$ {6} +$ {} Commands:""".format( crayons.red('legit switch '), diff -Nru legit-1.2.0/legit.egg-info/PKG-INFO legit-1.2.0.post0/legit.egg-info/PKG-INFO --- legit-1.2.0/legit.egg-info/PKG-INFO 2019-12-10 08:39:04.000000000 +0000 +++ legit-1.2.0.post0/legit.egg-info/PKG-INFO 2020-03-14 14:40:11.000000000 +0000 @@ -1,136 +1,137 @@ -Metadata-Version: 1.2 -Name: legit -Version: 1.2.0 -Summary: Git for Humans. -Home-page: https://github.com/frostming/legit -Author: Kenneth Reitz -Author-email: me@kennethreitz.com -License: BSD -Description: .. -*-restructuredtext-*- - - Legit: Git for Humans - ===================== - - Inspired by GitHub for Mac. - - - The Concept - ----------- - - `GitHub for Mac `_ is not just a Git client. - - This `comment `_ on Hacker News - says it best: - - They haven't re-created the git CLI tool in a GUI, they've created something different. They've created a tool that makes Git more accessible. Little things like auto-stashing when you switch branches will confuse git veterans, but it will make Git much easier to grok for newcomers because of the assumptions it makes about your Git workflow. - - Why not bring this innovation back to the command line? - - - The Interface - ------------- - - ``switch `` - Switches to specified branch. - Defaults to current branch. - Automatically stashes and unstashes any changes. (alias: ``sw``) - - ``sync []`` - Synchronizes the given branch. Defaults to current branch. - Stash, Fetch, Auto-Merge/Rebase, Push, and Unstash. - You can only sync published branches. (alias: ``sy``) - - ``publish []`` - Publishes specified branch to the remote. (alias: ``pub``) - - ``unpublish `` - Removes specified branch from the remote. (alias: ``unp``) - - ``undo`` - Un-does the last commit in git history. (alias: ``un``) - - ``branches []`` - Display a list of available branches. - Allows wildcard pattern matching of branch name. - - - The Installation - ---------------- - - .. image:: https://img.shields.io/pypi/v/legit.svg - :target: https://pypi.python.org/pypi/legit/ - - .. image:: https://img.shields.io/travis/frostming/legit/master.svg - :target: https://travis-ci.org/frostming/legit/ - - .. image:: https://img.shields.io/coveralls/github/frostming/legit.svg - :target: https://coveralls.io/r/frostming/legit/ - - .. image:: https://repl.it/badge/github/frostming/legit - :target: https://repl.it/github/frostming/legit - - - From `PyPI `_ with the Python package manager:: - - pip install legit - - Or download a standalone Windows executable from `GitHub Releases `_. - - To install the cutting edge version from the git repository:: - - git clone https://github.com/frostming/legit.git - cd legit - python setup.py install - - Note: if you encountered `Permission denied`, - prepend `sudo` before the `pip` or `python setup.py` command. - - You'll then have the wonderful ``legit`` command available. Run it within - a repository. - - To view usage and examples, run ``legit`` with no commands or options:: - - legit - - To install the git aliases, run the following command:: - - legit --install - - To uninstall the git aliases, run the following command:: - - legit --uninstall - - - Command Options - --------------- - - All legit commands support ``--verbose`` and ``--fake`` options. - - In order to view the git commands invoked by legit, use the ``--verbose`` option:: - - legit sync --verbose - - If you want to see the git commands used by legit but don't want them invoked, use the ``--fake`` option:: - - legit publish --fake - - - Caveats - ------- - - - All remote operations are carried out by the remote identified in ``$ git config legit.remote remotename`` - - If a ``stash pop`` merge fails, Legit stops. I'd like to add checking for a failed merge, and undo the command with friendly error reporting. - -Platform: UNKNOWN -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: Natural Language :: English -Classifier: License :: OSI Approved :: BSD License -Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 -Classifier: Programming Language :: Python :: 3.6 -Classifier: Programming Language :: Python :: 3.7 -Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.* +Metadata-Version: 1.2 +Name: legit +Version: 1.2.0.post0 +Summary: Git for Humans. +Home-page: https://github.com/frostming/legit +Author: Kenneth Reitz +Author-email: me@kennethreitz.com +License: BSD +Description: .. -*-restructuredtext-*- + + Legit: Git for Humans + ===================== + + Inspired by GitHub for Mac. + + + The Concept + ----------- + + `GitHub for Mac `_ is not just a Git client. + + This `comment `_ on Hacker News + says it best: + + They haven't re-created the git CLI tool in a GUI, they've created something different. They've created a tool that makes Git more accessible. Little things like auto-stashing when you switch branches will confuse git veterans, but it will make Git much easier to grok for newcomers because of the assumptions it makes about your Git workflow. + + Why not bring this innovation back to the command line? + + + The Interface + ------------- + + ``switch `` + Switches to specified branch. + Defaults to current branch. + Automatically stashes and unstashes any changes. (alias: ``sw``) + + ``sync []`` + Synchronizes the given branch. Defaults to current branch. + Stash, Fetch, Auto-Merge/Rebase, Push, and Unstash. + You can only sync published branches. (alias: ``sy``) + + ``publish []`` + Publishes specified branch to the remote. (alias: ``pub``) + + ``unpublish `` + Removes specified branch from the remote. (alias: ``unp``) + + ``undo`` + Un-does the last commit in git history. (alias: ``un``) + + ``branches []`` + Display a list of available branches. + Allows wildcard pattern matching of branch name. + + + The Installation + ---------------- + + .. image:: https://img.shields.io/pypi/v/legit.svg + :target: https://pypi.python.org/pypi/legit/ + + .. image:: https://img.shields.io/travis/frostming/legit/master.svg + :target: https://travis-ci.org/frostming/legit/ + + .. image:: https://img.shields.io/coveralls/github/frostming/legit.svg + :target: https://coveralls.io/r/frostming/legit/ + + .. image:: https://repl.it/badge/github/frostming/legit + :target: https://repl.it/github/frostming/legit + + + From `PyPI `_ with the Python package manager:: + + pip install legit + + Or download a standalone Windows executable from `GitHub Releases `_. + + To install the cutting edge version from the git repository:: + + git clone https://github.com/frostming/legit.git + cd legit + python setup.py install + + Note: if you encountered `Permission denied`, + prepend `sudo` before the `pip` or `python setup.py` command. + + You'll then have the wonderful ``legit`` command available. Run it within + a repository. + + To view usage and examples, run ``legit`` with no commands or options:: + + legit + + To install the git aliases, run the following command:: + + legit --install + + To uninstall the git aliases, run the following command:: + + legit --uninstall + + + Command Options + --------------- + + All legit commands support ``--verbose`` and ``--fake`` options. + + In order to view the git commands invoked by legit, use the ``--verbose`` option:: + + legit sync --verbose + + If you want to see the git commands used by legit but don't want them invoked, use the ``--fake`` option:: + + legit publish --fake + + + Caveats + ------- + + - All remote operations are carried out by the remote identified in ``$ git config legit.remote remotename`` + - If a ``stash pop`` merge fails, Legit stops. I'd like to add checking for a failed merge, and undo the command with friendly error reporting. + +Platform: UNKNOWN +Classifier: Development Status :: 5 - Production/Stable +Classifier: Intended Audience :: Developers +Classifier: Natural Language :: English +Classifier: License :: OSI Approved :: BSD License +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 2 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.* diff -Nru legit-1.2.0/MANIFEST.in legit-1.2.0.post0/MANIFEST.in --- legit-1.2.0/MANIFEST.in 2019-07-19 05:44:11.000000000 +0000 +++ legit-1.2.0.post0/MANIFEST.in 2019-07-19 12:45:09.000000000 +0000 @@ -1,2 +1,2 @@ -include reqs.txt README.rst LICENSE -recursive-include extra * +include reqs.txt README.rst LICENSE +recursive-include extra * diff -Nru legit-1.2.0/PKG-INFO legit-1.2.0.post0/PKG-INFO --- legit-1.2.0/PKG-INFO 2019-12-10 08:39:04.000000000 +0000 +++ legit-1.2.0.post0/PKG-INFO 2020-03-14 14:40:11.000000000 +0000 @@ -1,136 +1,137 @@ -Metadata-Version: 1.2 -Name: legit -Version: 1.2.0 -Summary: Git for Humans. -Home-page: https://github.com/frostming/legit -Author: Kenneth Reitz -Author-email: me@kennethreitz.com -License: BSD -Description: .. -*-restructuredtext-*- - - Legit: Git for Humans - ===================== - - Inspired by GitHub for Mac. - - - The Concept - ----------- - - `GitHub for Mac `_ is not just a Git client. - - This `comment `_ on Hacker News - says it best: - - They haven't re-created the git CLI tool in a GUI, they've created something different. They've created a tool that makes Git more accessible. Little things like auto-stashing when you switch branches will confuse git veterans, but it will make Git much easier to grok for newcomers because of the assumptions it makes about your Git workflow. - - Why not bring this innovation back to the command line? - - - The Interface - ------------- - - ``switch `` - Switches to specified branch. - Defaults to current branch. - Automatically stashes and unstashes any changes. (alias: ``sw``) - - ``sync []`` - Synchronizes the given branch. Defaults to current branch. - Stash, Fetch, Auto-Merge/Rebase, Push, and Unstash. - You can only sync published branches. (alias: ``sy``) - - ``publish []`` - Publishes specified branch to the remote. (alias: ``pub``) - - ``unpublish `` - Removes specified branch from the remote. (alias: ``unp``) - - ``undo`` - Un-does the last commit in git history. (alias: ``un``) - - ``branches []`` - Display a list of available branches. - Allows wildcard pattern matching of branch name. - - - The Installation - ---------------- - - .. image:: https://img.shields.io/pypi/v/legit.svg - :target: https://pypi.python.org/pypi/legit/ - - .. image:: https://img.shields.io/travis/frostming/legit/master.svg - :target: https://travis-ci.org/frostming/legit/ - - .. image:: https://img.shields.io/coveralls/github/frostming/legit.svg - :target: https://coveralls.io/r/frostming/legit/ - - .. image:: https://repl.it/badge/github/frostming/legit - :target: https://repl.it/github/frostming/legit - - - From `PyPI `_ with the Python package manager:: - - pip install legit - - Or download a standalone Windows executable from `GitHub Releases `_. - - To install the cutting edge version from the git repository:: - - git clone https://github.com/frostming/legit.git - cd legit - python setup.py install - - Note: if you encountered `Permission denied`, - prepend `sudo` before the `pip` or `python setup.py` command. - - You'll then have the wonderful ``legit`` command available. Run it within - a repository. - - To view usage and examples, run ``legit`` with no commands or options:: - - legit - - To install the git aliases, run the following command:: - - legit --install - - To uninstall the git aliases, run the following command:: - - legit --uninstall - - - Command Options - --------------- - - All legit commands support ``--verbose`` and ``--fake`` options. - - In order to view the git commands invoked by legit, use the ``--verbose`` option:: - - legit sync --verbose - - If you want to see the git commands used by legit but don't want them invoked, use the ``--fake`` option:: - - legit publish --fake - - - Caveats - ------- - - - All remote operations are carried out by the remote identified in ``$ git config legit.remote remotename`` - - If a ``stash pop`` merge fails, Legit stops. I'd like to add checking for a failed merge, and undo the command with friendly error reporting. - -Platform: UNKNOWN -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: Natural Language :: English -Classifier: License :: OSI Approved :: BSD License -Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 -Classifier: Programming Language :: Python :: 3.6 -Classifier: Programming Language :: Python :: 3.7 -Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.* +Metadata-Version: 1.2 +Name: legit +Version: 1.2.0.post0 +Summary: Git for Humans. +Home-page: https://github.com/frostming/legit +Author: Kenneth Reitz +Author-email: me@kennethreitz.com +License: BSD +Description: .. -*-restructuredtext-*- + + Legit: Git for Humans + ===================== + + Inspired by GitHub for Mac. + + + The Concept + ----------- + + `GitHub for Mac `_ is not just a Git client. + + This `comment `_ on Hacker News + says it best: + + They haven't re-created the git CLI tool in a GUI, they've created something different. They've created a tool that makes Git more accessible. Little things like auto-stashing when you switch branches will confuse git veterans, but it will make Git much easier to grok for newcomers because of the assumptions it makes about your Git workflow. + + Why not bring this innovation back to the command line? + + + The Interface + ------------- + + ``switch `` + Switches to specified branch. + Defaults to current branch. + Automatically stashes and unstashes any changes. (alias: ``sw``) + + ``sync []`` + Synchronizes the given branch. Defaults to current branch. + Stash, Fetch, Auto-Merge/Rebase, Push, and Unstash. + You can only sync published branches. (alias: ``sy``) + + ``publish []`` + Publishes specified branch to the remote. (alias: ``pub``) + + ``unpublish `` + Removes specified branch from the remote. (alias: ``unp``) + + ``undo`` + Un-does the last commit in git history. (alias: ``un``) + + ``branches []`` + Display a list of available branches. + Allows wildcard pattern matching of branch name. + + + The Installation + ---------------- + + .. image:: https://img.shields.io/pypi/v/legit.svg + :target: https://pypi.python.org/pypi/legit/ + + .. image:: https://img.shields.io/travis/frostming/legit/master.svg + :target: https://travis-ci.org/frostming/legit/ + + .. image:: https://img.shields.io/coveralls/github/frostming/legit.svg + :target: https://coveralls.io/r/frostming/legit/ + + .. image:: https://repl.it/badge/github/frostming/legit + :target: https://repl.it/github/frostming/legit + + + From `PyPI `_ with the Python package manager:: + + pip install legit + + Or download a standalone Windows executable from `GitHub Releases `_. + + To install the cutting edge version from the git repository:: + + git clone https://github.com/frostming/legit.git + cd legit + python setup.py install + + Note: if you encountered `Permission denied`, + prepend `sudo` before the `pip` or `python setup.py` command. + + You'll then have the wonderful ``legit`` command available. Run it within + a repository. + + To view usage and examples, run ``legit`` with no commands or options:: + + legit + + To install the git aliases, run the following command:: + + legit --install + + To uninstall the git aliases, run the following command:: + + legit --uninstall + + + Command Options + --------------- + + All legit commands support ``--verbose`` and ``--fake`` options. + + In order to view the git commands invoked by legit, use the ``--verbose`` option:: + + legit sync --verbose + + If you want to see the git commands used by legit but don't want them invoked, use the ``--fake`` option:: + + legit publish --fake + + + Caveats + ------- + + - All remote operations are carried out by the remote identified in ``$ git config legit.remote remotename`` + - If a ``stash pop`` merge fails, Legit stops. I'd like to add checking for a failed merge, and undo the command with friendly error reporting. + +Platform: UNKNOWN +Classifier: Development Status :: 5 - Production/Stable +Classifier: Intended Audience :: Developers +Classifier: Natural Language :: English +Classifier: License :: OSI Approved :: BSD License +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 2 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Requires-Python: >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.* diff -Nru legit-1.2.0/setup.cfg legit-1.2.0.post0/setup.cfg --- legit-1.2.0/setup.cfg 2019-12-10 08:39:04.000000000 +0000 +++ legit-1.2.0.post0/setup.cfg 2020-03-14 14:40:11.000000000 +0000 @@ -1,10 +1,10 @@ -[bdist_wheel] -universal = 1 - -[tool:pytest] -addopts = -v -x --ignore=setup.py --cov=legit - -[egg_info] -tag_build = -tag_date = 0 - +[bdist_wheel] +universal = 1 + +[tool:pytest] +addopts = -v -x --ignore=setup.py --cov=legit + +[egg_info] +tag_build = +tag_date = 0 + diff -Nru legit-1.2.0/setup.py legit-1.2.0.post0/setup.py --- legit-1.2.0/setup.py 2019-12-10 08:34:06.000000000 +0000 +++ legit-1.2.0.post0/setup.py 2020-03-08 13:49:38.000000000 +0000 @@ -26,7 +26,7 @@ @staticmethod def status(s): """Prints things in bold.""" - print('\033[1m{0}\033[0m'.format(s)) + print('\033[1m{}\033[0m'.format(s)) def initialize_options(self): pass @@ -42,7 +42,7 @@ pass self.status('Building Source and Wheel (universal) distribution...') - os.system('{0} setup.py sdist bdist_wheel --universal'.format(sys.executable)) + os.system('{} setup.py sdist bdist_wheel --universal'.format(sys.executable)) self.status('Uploading the package to PyPI via Twine...') os.system('twine upload dist/*') @@ -93,6 +93,7 @@ "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", ], entry_points={"console_scripts": ["legit = legit.cli:cli"]}, cmdclass={"publish": UploadCommand}