git-gerrit 2.0.0__tar.gz → 2.1.0__tar.gz

{git_gerrit-2.0.0/git_gerrit.egg-info → git_gerrit-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: git_gerrit
-Version: 2.0.0
+Version: 2.1.0
 Summary: Gerrit review system command line tools.
 Home-page: https://github.com/meffie/git-gerrit
 Author: Michael Meffie

{git_gerrit-2.0.0 → git_gerrit-2.1.0}/git_gerrit/__init__.py

@@ -23,7 +23,6 @@ Git helpers for the Gerrit code review system, with an emphasis on the Gerrit
 old-style numeric identifiers.
 """
 
-from __future__ import print_function
 from __future__ import unicode_literals
 
 import os
@@ -50,7 +49,7 @@ from git_gerrit.error import GitGerritFormatError
 from git_gerrit.error import GitGerritNotFoundError
 from git_gerrit.error import GitGerritHookDirNotFound
 
-VERSION = "2.0.0"
+VERSION = "2.1.0"
 
 _hush_linter = [
     GitGerritError,
@@ -104,6 +103,18 @@ sed -i '/^Change-Id:/d' "$1"
 """
 
 
+def writeln(*items, out=None, newline=True):
+    """
+    Print items to an output stream.
+    """
+    if out is None:
+        out = sys.stdout
+    message = ' '.join([str(item) for item in items])
+    out.write('{0}'.format(message))
+    if newline:
+        out.write('\n')
+
+
 def _chmod(filename, mode):
     """
     Wrapper for os.chmod(); converts rwx... string to mode bits.
@@ -196,8 +207,9 @@ def cherry_pick(number, branch='origin/master', repodir=None):
             hash = commit['hash']
             break
     if not hash:
-        sys.stderr.write(
-            'Failed to find gerrit number {0} on branch {1}.\n'.format(number, branch)
+        writeln(
+            'Failed to find gerrit number {0} on branch {1}.'.format(number, branch),
+            out=sys.stderr
         )
         return 1
 
@@ -209,10 +221,14 @@ def cherry_pick(number, branch='origin/master', repodir=None):
     env['GERRIT_CHERRY_PICK'] = 'yes'
     code = 0
     try:
-        print(git('cherry-pick', '-x', hash, _env=env))
+        writeln(git('cherry-pick', '-x', hash, _env=env))
     except sh.ErrorReturnCode as e:
-        sys.stderr.write('Failed to cherry-pick {0}\n{1}\n'.format(hash, e.stderr))
+        writeln(
+            'Failed to cherry-pick {0}\n{1}'.format(hash, e.stderr),
+            out=sys.stderr
+        )
         code = e.exit_code
+
     return code
 
 
@@ -261,35 +277,35 @@ def fetch(
     """
     config = Config(repodir)
     git = sh.Command('git').bake(_cwd=repodir, _tty_out=False)
-    print('searching for gerrit {0}'.format(number))
+    writeln('searching for gerrit {0}'.format(number))
     change = current_change(number, repodir)
-    print('found patchset number {0}'.format(change['patchset']))
+    writeln('found patchset number {0}'.format(change['patchset']))
     url = 'https://{0}/{1}'.format(config['host'], config['project'])
 
     if no_branch:
         refs = '{0}'.format(change['ref'])
-        print('fetching {0} patchset {1}'.format(number, change['patchset']))
+        writeln('fetching {0} patchset {1}'.format(number, change['patchset']))
         git.fetch(url, refs, _cwd=repodir)
-        print('fetched {0} to FETCH_HEAD'.format(number))
+        writeln('fetched {0} to FETCH_HEAD'.format(number))
         if checkout:
             git.checkout('FETCH_HEAD', _cwd=repodir)
-            print('checked out FETCH_HEAD')
+            writeln('checked out FETCH_HEAD')
     else:
         if not branch:
-            print('no branch specified')
+            writeln('no branch specified')
             return 1
         branch = branch.format(**change)
         if _branch_exists(branch):
-            print('branch {0} already exists'.format(branch))
+            writeln('branch {0} already exists'.format(branch))
             return 1
         patchset = change['patchset']
         refs = '{0}:{1}'.format(change['ref'], branch)
-        print('fetching {0},{1} to branch {2}'.format(number, patchset, branch))
+        writeln('fetching {0},{1} to branch {2}'.format(number, patchset, branch))
         git.fetch(url, refs, _cwd=repodir)
-        print('fetched {0},{1} to branch {2}'.format(number, patchset, branch))
+        writeln('fetched {0},{1} to branch {2}'.format(number, patchset, branch))
         if checkout:
             git.checkout(branch, _cwd=repodir)
-            print('checked out branch {0}'.format(branch))
+            writeln('checked out branch {0}'.format(branch))
 
 
 def install_hooks():
@@ -305,24 +321,26 @@ def install_hooks():
     # Install the gerrit commit-msg hook.
     commit_msg = os.path.join(hookdir, 'commit-msg')
     if os.path.exists(commit_msg):
-        sys.stdout.write('{0} git hook already present.\n'.format(commit_msg))
+        writeln('{0} git hook already present.'.format(commit_msg))
     else:
         url = 'https://{0}/tools/hooks/commit-msg'.format(config['host'])
-        sys.stdout.write('Downloading git hook to {0} ... '.format(commit_msg))
+        writeln('Downloading git hook to {0} ... '.format(commit_msg),
+                newline=False)
         urlretrieve(url, commit_msg)
         _chmod(commit_msg, 'rwxr-xr-x')
-        sys.stdout.write('done.\n')
+        writeln('done.')
 
     # Install our custom prepare-commit-msg hook for cherry picking gerrits.
     prepare_commit_msg = os.path.join(hookdir, 'prepare-commit-msg')
     if os.path.exists(prepare_commit_msg):
-        sys.stdout.write('%s hook already present.\n' % prepare_commit_msg)
+        writeln('{0} hook already present.'.format(prepare_commit_msg))
     else:
-        sys.stdout.write('Writing file %s ... ' % prepare_commit_msg)
+        writeln('Writing file {0} ... '.format(prepare_commit_msg),
+                newline=False)
         with open(prepare_commit_msg, 'w') as f:
             f.write(GIT_HOOK)
         _chmod(prepare_commit_msg, 'rwxr-xr-x')
-        sys.stdout.write('done.\n')
+        writeln('done.')
 
     return 0
 
@@ -411,31 +429,44 @@ def query(search, limit=None, details=False, repodir=None, **options):
     if 'current_revision' not in options:
         options['current_revision'] = True
 
-    params = [('q', search)]
-    if limit:
-        params.append(('n', limit))
-    for option in options:
-        if options[option] is True:
-            params.append(('o', option.upper()))
-    query = '/changes/?{0}'.format(urlencode(params))
-
-    remote = config.get('remote', default='origin')
-    url = "https://{0}".format(config['host'])
-    gerrit = pygerrit2.rest.GerritRestAPI(url)
-    for change in gerrit.get(query):
-        change['number'] = change['_number']
-        change['hash'] = change['current_revision']  # alias
-        change['patchset'] = change['revisions'][change['current_revision']]['_number']
-        change['ref'] = change['revisions'][change['current_revision']]['ref']
-        change['localref'] = change['ref'].replace('refs/', remote + '/')
-        change['host'] = config['host']
-        change['url'] = "https://{0}/{1}".format(config['host'], change['_number'])
-        if 'topic' not in change:
-            change['topic'] = 'no-topic'  # default for --format "{topic}"
-        if details:
-            change_id = change['change_id']
-            change['details'] = gerrit.get('/changes/{0}/detail'.format(change_id))
-        yield change
+    start = 0
+    more_changes = False
+    while True:  # do ... while more_changes
+        params = [('q', search)]
+        if limit:
+            params.append(('n', (limit - start)))
+        if start:
+            params.append(('S', start))
+        for option in options:
+            if options[option] is True:
+                params.append(('o', option.upper()))
+        query = '/changes/?{0}'.format(urlencode(params))
+
+        remote = config.get('remote', default='origin')
+        url = "https://{0}".format(config['host'])
+        gerrit = pygerrit2.rest.GerritRestAPI(url)
+        for change in gerrit.get(query):
+            start += 1
+            more_changes = change.get('_more_changes', False)
+            change['number'] = change['_number']
+            change['hash'] = change['current_revision']  # alias
+            change['patchset'] = change['revisions'][change['current_revision']]['_number']
+            change['ref'] = change['revisions'][change['current_revision']]['ref']
+            change['localref'] = change['ref'].replace('refs/', remote + '/')
+            change['host'] = config['host']
+            change['url'] = "https://{0}/{1}".format(config['host'], change['_number'])
+            if 'topic' not in change:
+                change['topic'] = 'no-topic'  # default for --format "{topic}"
+            if details:
+                change_id = change['change_id']
+                change['details'] = gerrit.get('/changes/{0}/detail'.format(change_id))
+            yield change
+
+        if limit and start >= limit:
+            break
+
+        if not more_changes:
+            break
 
 
 def update(
@@ -497,7 +528,7 @@ def update(
         changeid = '{0},{1}'.format(number, change['patchset'])
         args.append(changeid)
         if verbose:
-            print('running: ssh', '-p', port, host, 'gerrit', 'review', *args)
+            writeln('running: ssh', '-p', port, host, 'gerrit', 'review', *args)
         ssh('-p', port, host, 'gerrit', 'review', *args)
 
     args = []
@@ -508,7 +539,7 @@ def update(
         arg('branch', branch)
         args.append(number)
         if verbose:
-            print('running: ssh', '-p', port, host, 'gerrit', 'set-reviewers', *args)
+            writeln('running: ssh', '-p', port, host, 'gerrit', 'set-reviewers', *args)
         ssh('-p', port, host, 'gerrit', 'set-reviewers', *args)
 
     return 0

{git_gerrit-2.0.0 → git_gerrit-2.1.0}/git_gerrit/cli.py

@@ -26,6 +26,7 @@ import pprint
 import textwrap
 
 import git_gerrit
+from git_gerrit import writeln
 from git_gerrit.unicode import asciitize, cook
 from git_gerrit.error import GitGerritError, GitGerritFormatError
 
@@ -41,11 +42,6 @@ def commands():
     return cmds
 
 
-def print_error(e):
-    """Display error to stderr."""
-    sys.stderr.write('ERROR: {0}\n'.format(e.message))
-
-
 def print_change(change, template='{number} {subject}', dump=False, out=None):
     """
     Format and print a change to the output stream.  Retry by printing just the
@@ -60,16 +56,13 @@ def print_change(change, template='{number} {subject}', dump=False, out=None):
         None
     """
     template = cook(template)
-    if not out:
-        out = sys.stdout
     for pass_ in (1, 2):
         try:
             if dump:
                 text = pprint.pformat(change)
             else:
                 text = template.format(**change)
-            out.write(text)
-            out.write('\n')
+            writeln(text, out=out)
             return
         except KeyError as e:
             raise GitGerritFormatError(e)
@@ -90,7 +83,7 @@ def git_gerrit_version(argv=None):
         description=git_gerrit_version.__doc__.strip(),
     )
     parser.parse_args(argv)
-    print(git_gerrit.VERSION)
+    writeln(git_gerrit.VERSION)
     return 0
 
 
@@ -131,7 +124,7 @@ git config options:
     try:
         git_gerrit.fetch(number, **args)
     except GitGerritError as e:
-        print_error(e)
+        writeln(str(e), out=sys.stderr)
         return 1
 
 
@@ -179,7 +172,7 @@ Example:
     try:
         git_gerrit.cherry_pick(number, branch)
     except GitGerritError as e:
-        print_error(e)
+        writeln(str(e), out=sys.stderr)
         return 1
 
 
@@ -222,7 +215,7 @@ git config options:
     try:
         git_gerrit.fetch(number, **args)
     except GitGerritError as e:
-        print_error(e)
+        writeln(str(e), out=sys.stderr)
         return 1
 
 
@@ -234,11 +227,11 @@ def git_gerrit_help(argv=None):
         description=git_gerrit_help.__doc__.strip(),
     )
     parser.parse_args(argv)
-    print('\nCommands for gerrit code review:\n')
+    writeln('\nCommands for gerrit code review:\n')
     for name, desc in commands():
-        print('    {0:27}  {1}'.format(name, desc))
-    print('\nShow command details with:\n')
-    print('    git gerrit-<command> -h')
+        writeln('    {0:27}  {1}'.format(name, desc))
+    writeln('\nShow command details with:\n')
+    writeln('    git gerrit-<command> -h')
 
 
 def git_gerrit_install_hooks(argv=None):
@@ -257,7 +250,7 @@ git config options:
     try:
         git_gerrit.install_hooks()
     except GitGerritError as e:
-        print_error(e)
+        writeln(str(e), out=sys.stderr)
         return 1
 
 
@@ -300,7 +293,7 @@ git config options:
         for change in git_gerrit.log(**args):
             print_change(change, template)
     except GitGerritError as e:
-        print_error(e)
+        writeln(str(e), out=sys.stderr)
         return 1
 
 
@@ -357,7 +350,7 @@ git config options:
         for change in git_gerrit.query(search, **args):
             print_change(change, template, dump)
     except GitGerritError as e:
-        print_error(e)
+        writeln(str(e), out=sys.stderr)
         return 1
 
 
@@ -423,18 +416,18 @@ examples:
         for change in git_gerrit.query(search):
             changes.append(change)
     except GitGerritError as e:
-        print_error(e)
+        writeln(str(e), out=sys.stderr)
         return 1
 
     for change in changes:
         try:
             if dryrun:
-                print("Skipping: %s %s" % (change['_number'], change['subject']))
+                writeln("Skipping: %s %s" % (change['_number'], change['subject']))
             else:
-                print("Updating: %s %s" % (change['_number'], change['subject']))
+                writeln("Updating: %s %s" % (change['_number'], change['subject']))
                 git_gerrit.update(change['_number'], **args)
         except GitGerritError as e:
-            print_error(e)
+            writeln(str(e), out=sys.stderr)
             return 1
 
 
@@ -469,5 +462,5 @@ git config options:
         for commit in git_gerrit.unpicked(**args):
             print_change(commit, template)
     except GitGerritError as e:
-        print_error(e)
+        writeln(str(e), out=sys.stderr)
         return 1

{git_gerrit-2.0.0 → git_gerrit-2.1.0}/git_gerrit/config.py

@@ -18,22 +18,20 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-from __future__ import print_function
 from __future__ import unicode_literals
-from sh.contrib import git
-from sh import ErrorReturnCode_1
+import sh
 from git_gerrit.error import GitGerritConfigError
 
 
 class Config:
     def __init__(self, repodir=None):
-        self.repodir = repodir
+        self.git = sh.Command('git').bake(_cwd=repodir, _tty_out=False)
 
     def _get(self, name):
         """Read a config value with 'git config --get'."""
         try:
-            return git.config('--get', 'gerrit.%s' % name, _cwd=self.repodir).rstrip()
-        except ErrorReturnCode_1:
+            return self.git.config('--get', 'gerrit.%s' % name).rstrip()
+        except sh.ErrorReturnCode_1:
             return None
 
     def __getitem__(self, variable):

{git_gerrit-2.0.0 → git_gerrit-2.1.0}/git_gerrit/unicode.py

@@ -20,7 +20,6 @@
 
 """unicode related functions"""
 
-from __future__ import print_function
 from __future__ import unicode_literals
 import sys
 

{git_gerrit-2.0.0 → git_gerrit-2.1.0/git_gerrit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: git_gerrit
-Version: 2.0.0
+Version: 2.1.0
 Summary: Gerrit review system command line tools.
 Home-page: https://github.com/meffie/git-gerrit
 Author: Michael Meffie

{git_gerrit-2.0.0 → git_gerrit-2.1.0}/git_gerrit.egg-info/SOURCES.txt

@@ -13,4 +13,5 @@ git_gerrit.egg-info/dependency_links.txt
 git_gerrit.egg-info/entry_points.txt
 git_gerrit.egg-info/requires.txt
 git_gerrit.egg-info/top_level.txt
-tests/test_help.py
+tests/test_api.py
+tests/test_cli.py

git_gerrit-2.1.0/tests/test_api.py

@@ -0,0 +1,41 @@
+import pytest
+import git_gerrit
+
+
+def test_config(mock_commands):
+    config = git_gerrit.Config()
+    assert config["project"] == "mayhem"
+    assert config["host"] == "gerrit.example.org"
+    assert config.get("remote", "origin") == "origin"
+    with pytest.raises(git_gerrit.error.GitGerritConfigError):
+        config["bogus"]
+
+
+def test_query(output, mock_rest):
+
+    search = "12345"
+    changes = list(git_gerrit.query(search))
+    assert len(changes) == 1
+
+    change = changes[0]
+    assert change["number"] == 12345
+    assert change["hash"] == "0123456789abcdef0123456789abcdef01234567"
+    assert change["patchset"] == 7
+    assert change["ref"] == "refs/changes/45/12345/7"
+    assert change["localref"] == "origin/changes/45/12345/7"
+    assert change["host"] == "gerrit.example.org"
+    assert change["url"] == "https://gerrit.example.org/12345"
+    assert change["topic"] == "no-topic"
+    assert "details" not in change
+
+
+def test_fetch(output, mock_rest):
+    git_gerrit.fetch(12345)
+    assert output[0] == "searching for gerrit 12345"
+    assert output[1] == "found patchset number 7"
+    assert output[2] == "fetching 12345,7 to branch gerrit/12345/7"
+    assert output[3] == "fetched 12345,7 to branch gerrit/12345/7"
+
+
+def test_update(output, mock_rest):
+    git_gerrit.update(12345, message="test")

git_gerrit-2.1.0/tests/test_cli.py

@@ -0,0 +1,55 @@
+import git_gerrit
+import git_gerrit.cli
+
+
+def test_help(argv, output):
+    git_gerrit.cli.git_gerrit_help(argv)
+    assert len(output) > 1
+    assert "Commands for gerrit code review" in output[0]
+
+
+def test_query(argv, output, mock_rest):
+    argv.append("12345")
+    git_gerrit.cli.git_gerrit_query(argv)
+    assert len(output) == 1
+    assert output[0] == "12345 Transmogrify the frobnicator"
+
+
+def test_version(argv, output):
+    git_gerrit.cli.git_gerrit_version(argv)
+    assert len(output) == 1
+    assert output[0] == git_gerrit.VERSION
+
+
+def test_checkout(argv, output, mock_rest):
+    argv.append("12345")
+    git_gerrit.cli.git_gerrit_checkout(argv)
+
+
+def test_cherry_pick(argv, output, mock_rest):
+    argv.append("12345")
+    git_gerrit.cli.git_gerrit_cherry_pick(argv)
+
+
+def test_fetch(argv, output, mock_rest):
+    argv.append("12345")
+    git_gerrit.cli.git_gerrit_fetch(argv)
+
+
+def test_install_hook(argv, output, mock_rest):
+    git_gerrit.cli.git_gerrit_install_hooks(argv)
+
+
+def test_log(argv, output, mock_rest):
+    git_gerrit.cli.git_gerrit_log(argv)
+
+
+def test_unpicked(argv, output, mock_rest):
+    argv.append("stable")
+    git_gerrit.cli.git_gerrit_unpicked(argv)
+
+
+def test_update(argv, output, mock_rest):
+    argv.append("12345")
+    argv.append("--message=test")
+    git_gerrit.cli.git_gerrit_update(argv)

git_gerrit-2.0.0/tests/test_help.py

@@ -1,6 +0,0 @@
-from git_gerrit.cli import git_gerrit_help
-
-
-def test_help():
-    argv = []  # do not use sys.argv
-    git_gerrit_help(argv)