git-gerrit 3.2.0__tar.gz → 3.3.0__tar.gz

{git_gerrit-3.2.0/git_gerrit.egg-info → git_gerrit-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git_gerrit
-Version: 3.2.0
+Version: 3.3.0
 Summary: Gerrit review system command line tools.
 Home-page: https://github.com/meffie/git-gerrit
 Author: Michael Meffie
@@ -12,6 +12,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: sh
 Requires-Dist: pygerrit2
@@ -19,6 +20,7 @@ Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
+Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file

git_gerrit-3.3.0/git_gerrit/__version__.py

@@ -0,0 +1 @@
+VERSION = "3.3.0"

{git_gerrit-3.2.0 → git_gerrit-3.3.0}/git_gerrit/cli.py

@@ -460,7 +460,10 @@ def main_git_gerrit_number(argv=None):
             for p in change['cherry_picked_to']:
                 print(p or "")
         elif args.checkout:
-            print(git.git.checkout(change['commit_id'], detach=True))
+            number = change['number']
+            patchset = change['current_patchset']
+            print(f"checking out {number},{patchset}")
+            git.checkout(change['commit_id'])
         elif args.show:
             print(git.git.show(change['commit_id']))
         else:

{git_gerrit-3.2.0 → git_gerrit-3.3.0}/git_gerrit/git.py

@@ -22,6 +22,7 @@
 import os
 import re
 import sh
+import sys
 
 import urllib.request
 
@@ -186,7 +187,17 @@ class Git:
 
     def checkout(self, refname):
         """Run git checkout to checkout a change."""
-        self.git.checkout(refname)
+        try:
+            self.git(
+                "-c",
+                "advice.detachedHead=false",
+                "checkout",
+                refname,
+                _out=sys.stdout,
+                _err=sys.stderr,
+            )
+        except sh.ErrorReturnCode as e:
+            raise GitGerritError(f"Command failed: git checkout: {e.exit_code}")
 
     def log(self, refname=None, **options):
         """Run git log to show changes."""

{git_gerrit-3.2.0 → git_gerrit-3.3.0/git_gerrit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git_gerrit
-Version: 3.2.0
+Version: 3.3.0
 Summary: Gerrit review system command line tools.
 Home-page: https://github.com/meffie/git-gerrit
 Author: Michael Meffie
@@ -12,6 +12,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: sh
 Requires-Dist: pygerrit2
@@ -19,6 +20,7 @@ Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
+Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
 Dynamic: license-file

{git_gerrit-3.2.0 → git_gerrit-3.3.0}/setup.py

@@ -19,6 +19,7 @@ setup(
     version=get_version(),
     description='Gerrit review system command line tools.',
     long_description=open('README.rst').read(),
+    long_description_content_type='text/x-rst',
     author='Michael Meffie',
     author_email='mmeffie@sinenomine.net',
     license='BSD-2-Clause',

git_gerrit-3.2.0/git_gerrit/__version__.py

@@ -1 +0,0 @@
-VERSION = "3.2.0"