Hello community, here is the log from the commit of package git-review for openSUSE:Factory checked in at 2013-09-11 11:36:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-review (Old) and /work/SRC/openSUSE:Factory/.git-review.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-review" Changes: -------- --- /work/SRC/openSUSE:Factory/git-review/git-review.changes 2013-06-05 17:39:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git-review.new/git-review.changes 2013-09-11 11:36:24.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 11 06:54:23 UTC 2013 - [email protected] + +- Add patch git-review-username.diff to prefer .gitconfig username + (see https://review.openstack.org/46015) +- Update to version 1.23: + Expand multiple commit submission warning. + +------------------------------------------------------------------- Old: ---- git-review-1.22.tar.gz New: ---- git-review-1.23.tar.gz git-review-username.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-review.spec ++++++ --- /var/tmp/diff_new_pack.qfcvd2/_old 2013-09-11 11:36:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qfcvd2/_new 2013-09-11 11:36:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: git-review -Version: 1.22 +Version: 1.23 Release: 0 Summary: Tool to submit code to Gerrit License: Apache-2.0 @@ -25,6 +25,7 @@ Url: https://launchpad.net/git-review Source0: http://pypi.python.org/packages/source/g/git-review/git-review-%{version}.tar.gz Source1: git-review.conf +Patch1: git-review-username.diff BuildRequires: python-devel BuildRequires: python-distribute BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +48,7 @@ %prep %setup -q -n git-review-%{version} +%patch1 -p0 %build python setup.py build ++++++ git-review-1.22.tar.gz -> git-review-1.23.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-1.22/PKG-INFO new/git-review-1.23/PKG-INFO --- old/git-review-1.22/PKG-INFO 2013-05-31 21:18:45.000000000 +0200 +++ new/git-review-1.23/PKG-INFO 2013-08-15 19:27:26.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: git-review -Version: 1.22 +Version: 1.23 Summary: Tool to submit code to Gerrit Home-page: https://launchpad.net/git-review Author: OpenStack, LLC. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-1.22/git-review new/git-review-1.23/git-review --- old/git-review-1.22/git-review 2013-05-31 21:18:41.000000000 +0200 +++ new/git-review-1.23/git-review 2013-08-15 19:27:22.000000000 +0200 @@ -25,6 +25,7 @@ import shlex import subprocess import sys +import textwrap import time if sys.version < '3': @@ -44,7 +45,7 @@ from distutils import version as du_version -version = "1.22" +version = "1.23" VERBOSE = False UPDATE = False @@ -100,6 +101,10 @@ return self.__doc__ % self.e +def printwrap(unwrapped): + print('\n'.join(textwrap.wrap(unwrapped))) + + def parse_review_number(review): parts = review.split(',') if len(parts) < 2: @@ -349,8 +354,9 @@ if asked_for_username: print() - print("This repository is now set up for use with git-review.") - print("You can set the default username for future repositories with:") + printwrap("This repository is now set up for use with git-review. " + "You can set the default username for future repositories " + "with:") print(' git config --global --add gitreview.username "%s"' % username) print() @@ -386,7 +392,10 @@ if parsed_url.scheme == "ssh" and port is None: port = 22 - return (hostname, username, str(port), project_name) + if port is not None: + port = str(port) + + return (hostname, username, port, project_name) def check_color_support(): @@ -470,9 +479,9 @@ if hostname is False or port is False or project is False: # This means there was no .gitreview file - print("No '.gitreview' file found in this repository.") - print("We don't know where your gerrit is. Please manually create ") - print("a remote named \"%s\" and try again." % remote) + printwrap("No '.gitreview' file found in this repository. We don't " + "know where your gerrit is. Please manually create a remote " + "named \"%s\" and try again." % remote) sys.exit(1) # Gerrit remote not present, try to add it @@ -480,8 +489,8 @@ add_remote(hostname, port, project, remote) except Exception: print(sys.exc_info()[2]) - print("We don't know where your gerrit is. Please manually create ") - print("a remote named \"%s\" and try again." % remote) + printwrap("We don't know where your gerrit is. Please manually create " + "a remote named \"%s\" and try again." % remote) raise @@ -561,23 +570,25 @@ sys.exit(1) output_lines = len(output.split("\n")) if output_lines == 1 and not have_hook: - print("Your change was committed before the commit hook was installed") - print("Amending the commit to add a gerrit change id") + printwrap("Your change was committed before the commit hook was " + "installed. Amending the commit to add a gerrit change id.") run_command("git commit --amend", GIT_EDITOR='true') elif output_lines == 0: - print("No changes between HEAD and %s/%s." % (remote, branch)) - print("Submitting for review would be pointless.") + printwrap("No changes between HEAD and %s/%s. Submitting for review " + "would be pointless." % (remote, branch)) sys.exit(1) elif output_lines > 1: if not yes: - print("You have more than one commit" - " that you are about to submit.") - print("The outstanding commits are:\n\n%s\n" % output) - print("Is this really what you meant to do?") - yes_no = do_input("Type 'yes' to confirm: ") + printwrap("You are about to submit multiple commits. This is " + "expected if you are submitting a commit that is " + "dependent on one or more in-review commits. Otherwise " + "you should consider squashing your changes into one " + "commit before submitting.") + print("\nThe outstanding commits are:\n\n%s\n\n" + "Do you really want to submit the above commits?" % output) + yes_no = do_input("Type 'yes' to confirm, other to cancel: ") if yes_no.lower().strip() != "yes": print("Aborting.") - print("Please rebase/squash your changes and try again") sys.exit(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-1.22/git_review.egg-info/PKG-INFO new/git-review-1.23/git_review.egg-info/PKG-INFO --- old/git-review-1.22/git_review.egg-info/PKG-INFO 2013-05-31 21:18:45.000000000 +0200 +++ new/git-review-1.23/git_review.egg-info/PKG-INFO 2013-08-15 19:27:26.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: git-review -Version: 1.22 +Version: 1.23 Summary: Tool to submit code to Gerrit Home-page: https://launchpad.net/git-review Author: OpenStack, LLC. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-review-1.22/tox.ini new/git-review-1.23/tox.ini --- old/git-review-1.22/tox.ini 2013-05-31 21:18:41.000000000 +0200 +++ new/git-review-1.23/tox.ini 2013-08-15 19:27:22.000000000 +0200 @@ -5,9 +5,8 @@ setenv = VIRTUAL_ENV={envdir} [testenv:pep8] -deps = flake8 - argparse - hacking +deps = argparse + hacking<0.6 commands = flake8 [testenv:sdist] ++++++ git-review-username.diff ++++++ --- git-review.~1~ 2013-05-31 21:18:41.000000000 +0200 +++ git-review 2013-09-11 08:50:22.772026825 +0200 @@ -319,9 +319,9 @@ """Adds a gerrit remote.""" asked_for_username = False - username = os.getenv("USERNAME") + username = git_config_get_value("gitreview", "username") if not username: - username = git_config_get_value("gitreview", "username") + username = os.getenv("USERNAME") if not username: username = os.getenv("USER") if port is None: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
