👍 Merge branch devel ; 🔖 Version bump to 1.8.1

🚒 Bugfixes

* Fixed race condition for gitlab initialisation (cf #97)
* Fixed request create behaviour with github (cf #94)

Signed-off-by: Guyzmo <[email protected]>

Author: guyzmo

VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

git_repo/repo.py

@@ -169,26 +169,29 @@ def init(self): # pragma: no cover
         if 'GIT_WORK_TREE' in os.environ.keys() or 'GIT_DIR' in os.environ.keys():
             del os.environ['GIT_WORK_TREE']
 
-    def _guess_repo_slug(self, repository, service):
+    def _guess_repo_slug(self, repository, service, resolve_targets=None):
         config = repository.config_reader()
-        target = service.name
+        if resolve_targets:
+            targets = [target.format(service=service.name) for target in resolve_targets]
+        else:
+            targets = (service.name, 'upstream', 'origin')
         for remote in repository.remotes:
-            if remote.name in (target, 'upstream', 'origin'):
+            if remote.name in targets:
                 for url in remote.urls:
                     if url.startswith('https'):
                         if url.endswith('.git'):
                             url = url[:-4]
                         *_, user, name = url.split('/')
                         self.set_repo_slug('/'.join([user, name]))
-                        break
+                        return
                     elif url.startswith('git@'):
                         if url.endswith('.git'):
                             url = url[:-4]
                         _, repo_slug = url.split(':')
                         self.set_repo_slug(repo_slug)
-                        break
+                        return
 
-    def get_service(self, lookup_repository=True):
+    def get_service(self, lookup_repository=True, resolve_targets=None):
         if not lookup_repository:
             service = RepositoryService.get_service(None, self.target)
             service.connect()
@@ -203,7 +206,7 @@ def get_service(self, lookup_repository=True):
                 raise FileNotFoundError('Cannot find path to the repository.')
             service = RepositoryService.get_service(repository, self.target)
             if not self.repo_name:
-                self._guess_repo_slug(repository, service)
+                self._guess_repo_slug(repository, service, resolve_targets)
         return service
 
     '''Argument storage'''
@@ -408,13 +411,14 @@ def do_request_list(self):
 
     @register_action('request', 'create')
     def do_request_create(self):
-        service = self.get_service()
+        service = self.get_service(resolve_targets=('upstream', '{service}', 'origin'))
         new_request = service.request_create(self.user_name,
                 self.repo_name,
                 self.local_branch,
                 self.remote_branch,
                 self.title,
-                self.message)
+                self.message,
+                self.repo_slug != None)
         log.info('Successfully created request of `{local}` onto `{}:{remote}`, with id `{ref}`!'.format(
             '/'.join([self.user_name, self.repo_name]),
             **new_request)

git_repo/services/ext/github.py

@@ -231,29 +231,50 @@ def gist_delete(self, gist_id):
             raise ResourceNotFoundError('Could not find gist')
         gist.delete()
 
-    def request_create(self, user, repo, local_branch, remote_branch, title, description=None):
+    def request_create(self, user, repo, from_branch, onto_branch, title, description=None, auto_slug=False):
         repository = self.gh.repository(user, repo)
         if not repository:
             raise ResourceNotFoundError('Could not find repository `{}/{}`!'.format(user, repo))
-        if not remote_branch:
-            remote_branch =  self.repository.active_branch.name
-        if not local_branch:
-            local_branch = repository.master_branch or 'master'
+        # when no repo slug has been given to `git-repo X request create`
+        if auto_slug:
+            # then chances are current repository is a fork of the target
+            # repository we want to push to
+            if repository.fork:
+                user = repository.parent.owner.login
+                repo = repository.parent.name
+                from_branch = from_branch or repository.parent.default_branch
+        # if no onto branch has been defined, take the default one
+        # with a fallback on master
+        if not from_branch:
+            from_branch = self.repository.active_branch.name
+        # if no from branch has been defined, chances are we want to push
+        # the branch we're currently working on
+        if not onto_branch:
+            onto_branch = repository.default_branch or 'master'
+        if self.username != repository.owner.login:
+            from_branch = ':'.join([self.username, from_branch])
         try:
             request = repository.create_pull(title,
-                    base=local_branch,
-                    head=':'.join([user, remote_branch]),
+                    base=onto_branch,
+                    head=from_branch,
                     body=description)
         except github3.models.GitHubError as err:
             if err.code == 422:
                 if err.message == 'Validation Failed':
                     for error in err.errors:
                         if 'message' in error:
                             raise ResourceError(error['message'])
+                        if error.get('code', '') == 'invalid':
+                            if error.get('field', '') == 'head':
+                                raise ResourceError(
+                                        'Invalid source branch. ' \
+                                        'Check it has been pushed first.')
+                            if error.get('field', '') == 'base':
+                                raise ResourceError( 'Invalid target branch.')
                     raise ResourceError("Unhandled formatting error: {}".format(err.errors))
             raise ResourceError(err.message)
 
-        return {'local': local_branch, 'remote': remote_branch, 'ref': request.number}
+        return {'local': from_branch, 'remote': onto_branch, 'ref': request.number}
 
     def request_list(self, user, repo):
         repository = self.gh.repository(user, repo)

git_repo/services/ext/gitlab.py

@@ -19,10 +19,11 @@ class GitlabService(RepositoryService):
     fqdn = 'gitlab.com'
 
     def __init__(self, *args, **kwarg):
+        self.gl = gitlab.Gitlab(self.url_ro)
         super().__init__(*args, **kwarg)
-        self.gl = gitlab.Gitlab(self.url_ro, ssl_verify=not self.insecure)
 
     def connect(self):
+        self.gl.ssl_verify = not self.insecure
         self.gl.set_url(self.url_ro)
         self.gl.set_token(self._privatekey)
         self.gl.token_auth()
@@ -266,7 +267,7 @@ def gist_delete(self, snippet):
 
         return snippet.delete()
 
-    def request_create(self, user, repo, local_branch, remote_branch, title, description=None):
+    def request_create(self, user, repo, local_branch, remote_branch, title, description=None, auto_slug=False):
         try:
             repository = self.gl.projects.get('/'.join([user, repo]))
             if not repository:

git_repo/services/service.py

@@ -78,7 +78,7 @@ def store_config(cls, config, **kwarg):
             section = 'gitrepo "{}"'.format(cls.name)
             for option, value in kwarg.items():
                 if option not in cls.config_options:
-                    raise ArgumentError('Option {} is invalid and cannot be setup.')
+                    raise ArgumentError('Option {} is invalid and cannot be setup.'.format(option))
                 config.set_value(section, option, value)
 
     @classmethod
@@ -120,7 +120,7 @@ def get_service(cls, repository, command):
             if 'type' not in config:
                 raise ValueError('Missing service type for custom service.')
             if config['type'] not in cls.service_map:
-                raise ValueError('Service type {} does not exists.')
+                raise ValueError('Service type {} does not exists.'.format(config['type']))
             service = cls.service_map.get(config['type'], cls)
 
         cls._current = service(repository, config)
@@ -429,6 +429,9 @@ def request_fetch(self, user, repo, request, pull=False): #pragma: no cover
         '''
         raise NotImplementedError
 
+    def request_create(self, user, repo, from_branch, onto_branch, title, description=None, auto_slug=False):
+        raise NotImplementedError
+
     @property
     def user(self): #pragma: no cover
         raise NotImplementedError

tests/integration/cassettes/test_bitbucket_test_00_fork.json

@@ -94,4 +94,4 @@
     }
   ],
   "recorded_with": "betamax/0.5.1"
-}
+}

tests/integration/cassettes/test_bitbucket_test_01_create.json

@@ -93,4 +93,4 @@
     }
   ],
   "recorded_with": "betamax/0.5.1"
-}
+}

tests/integration/cassettes/test_bitbucket_test_02_delete.json

@@ -92,4 +92,4 @@
     }
   ],
   "recorded_with": "betamax/0.5.1"
-}
+}

tests/integration/cassettes/test_bitbucket_test_03_delete_nouser.json

@@ -92,4 +92,4 @@
     }
   ],
   "recorded_with": "betamax/0.5.1"
-}
+}

tests/integration/cassettes/test_bitbucket_test_04_clone.json

@@ -47,4 +47,4 @@
     }
   ],
   "recorded_with": "betamax/0.5.1"
-}
+}