🚧 Refactors get_project_default_branch interface

Author: guyzmo

git_repo/services/ext/bitbucket.py

@@ -240,6 +240,10 @@ def gist_delete(self, gist_id):
                 raise ResourceNotFoundError("Could not find snippet {}.".format(gist_id)) from err
             raise ResourceError("Couldn't delete snippet: {}".format(err)) from err
 
+    @staticmethod
+    def get_project_default_branch(project):
+        return project.mainbranch.get('name', 'master')
+
     def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=None, description=None, auto_slug=False, edit=None):
         try:
             onto_project = self.get_repository(onto_user, onto_repo)
@@ -270,10 +274,7 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=N
             # if no from branch has been defined, chances are we want to push
             # the branch we're currently working on
             if not onto_branch:
-                try:
-                    onto_branch = next(onto_project.branches()).name
-                except StopIteration:
-                    onto_branch = 'master'
+                onto_branch = self.get_project_default_branch(onto_project)
 
             from_target = '{}:{}'.format(from_user, from_branch)
             onto_target = '{}/{}:{}'.format(onto_user, onto_project, onto_branch)

git_repo/services/ext/github.py

@@ -231,6 +231,10 @@ def gist_delete(self, gist_id):
             raise ResourceNotFoundError('Could not find gist')
         gist.delete()
 
+    @staticmethod
+    def get_project_default_branch(project):
+        return project.default_branch or 'master'
+
     def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=None, description=None, auto_slug=False, edit=None):
         onto_project = self.gh.repository(onto_user, onto_repo)
 
@@ -266,7 +270,7 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=N
         # 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 = onto_project.default_branch or 'master'
+            onto_branch = self.get_project_default_branch(onto_project)
 
         from_target = '{}:{}'.format(from_user, from_branch)
         onto_target = '{}/{}:{}'.format(onto_user, onto_project, onto_branch)

git_repo/services/ext/gitlab.py

@@ -257,6 +257,10 @@ def gist_delete(self, snippet):
 
         return snippet.delete()
 
+    @staticmethod
+    def get_project_default_branch(project):
+        return project.default_branch or 'master'
+
     def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=None, description=None, auto_slug=False, edit=None):
         try:
             onto_project = self.gl.projects.get('/'.join([onto_user, onto_repo]))
@@ -292,7 +296,7 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=N
             # 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 = onto_project.default_branch or 'master'
+                onto_branch = self.get_project_default_branch(onto_project)
 
             onto_target = '{}/{}:{}'.format(onto_user, onto_project.name, onto_branch)
 

git_repo/services/ext/gogs.py

@@ -116,6 +116,11 @@ def get_auth_token(cls, login, password, prompt=None):
         token = gg.create_token(auth, name, login)
         return token.token
 
+    @staticmethod
+    def get_project_default_branch(project):
+        # TODO get default branch
+        return 'master'
+
     @property
     def user(self):
         return self.gg.username

git_repo/services/service.py

@@ -329,7 +329,10 @@ def clone(self, user, repo, branch='master', rw=True):
         '''
         log.info('Cloning {}…'.format(repo))
 
-        remote = self.add(user=user, repo=repo, tracking=True, rw=rw)
+        if not branch:
+            project = self.get_repository(user, repo)
+            branch = self.get_project_default_branch(project)
+
         self.pull(remote, branch)
 
     def add(self, repo, user=None, name=None, tracking=False, alone=False, rw=True, auto_slug=False):