🚧Support for add (noargs) and add upstreamm

Author: guyzmo

git_repo/repo.py

@@ -258,13 +258,14 @@ def do_list(self):
     @register_action('add')
     def do_remote_add(self):
         service = self.get_service()
-        service.add(self.repo_name, self.user_name,
+        remote, user, repo = service.add(self.repo_name, self.user_name,
                     name=self.remote_name,
                     tracking=self.tracking,
-                    alone=self.alone)
-        log.info('Successfully added `{}` as remote named `{}`'.format(
-            self.repo_slug,
-            self.remote_name or service.name)
+                    alone=self.alone,
+                    auto_slug=self._auto_slug)
+        log.info('Successfully added `{}/{}` as remote named `{}`'.format(
+            user, repo,
+            remote.name)
         )
         return 0
 

git_repo/services/ext/bitbucket.py

@@ -467,6 +467,15 @@ def get_auth_token(cls, login, password, prompt=None):
 
         return password, username
 
+    def get_parent_project_url(self, user, project, rw=True):
+        project = self.get_repository(user, project)
+        if not project and not project.parent:
+            return None
+        return self.format_path(
+            repository=project.parent.name,
+            namespace=project.parent.owner.login,
+            rw=True)
+
     @property
     def user(self):
         try:

git_repo/services/ext/github.py

@@ -356,6 +356,15 @@ def get_auth_token(cls, login, password, prompt=None):
             else:
                 raise err
 
+    def get_parent_project_url(self, user, project, rw=True):
+        parent = self.gh.repository(user, project).parent
+        if not parent:
+            return None
+        return self.format_path(
+                repository=parent.name,
+                namespace=parent.owner.login,
+                rw=rw)
+
     @property
     def user(self):
         return self.gh.user().login

git_repo/services/ext/gitlab.py

@@ -362,6 +362,15 @@ def request_fetch(self, user, repo, request, pull=False, force=False):
                 raise ResourceNotFoundError('Could not find opened request #{}'.format(request)) from err
             raise err
 
+    def get_parent_project_url(self, user, project, rw=True):
+        parent = self.gl.projects.get(onto_project.forked_from_project['id'])
+        if not parent:
+            return None
+        return self.format_path(
+                repository=parent.path,
+                namespace=parent.namespace.path,
+                rw=rw)
+
     @property
     def user(self):
         return self.gl.user.username

git_repo/services/service.py

@@ -102,15 +102,7 @@ def guess_repo_slug(cls, repository, service, resolve_targets=None):
         for remote in repository.remotes:
             if remote.name in targets:
                 for url in remote.urls:
-                    if url.endswith('.git'):
-                        url = url[:-4]
-                    # strip http://, https:// and ssh://
-                    if '://' in url:
-                        *_, user, name = url.split('/')
-                        return '/'.join([user, name])
-                    # scp-style URL
-                    elif '@' in url and ':' in url:
-                        return url.split(':')[-1]
+                    return cls.convert_url_into_slug(url)
         return None
 
     @classmethod
@@ -341,7 +333,7 @@ def clone(self, user, repo, branch='master', rw=True):
         remote = self.add(user=user, repo=repo, tracking=True, rw=rw)
         self.pull(remote, branch)
 
-    def add(self, repo, user=None, name=None, tracking=False, alone=False, rw=True):
+    def add(self, repo, user=None, name=None, tracking=False, alone=False, rw=True, auto_slug=False):
         '''Adding repository as remote
 
         :param repo: Name slug of the repository to add
@@ -357,7 +349,47 @@ def add(self, repo, user=None, name=None, tracking=False, alone=False, rw=True):
         It also creates an *all* remote that contains all the remotes added by
         this tool, to make it possible to push to all remotes at once.
         '''
-        name = name or self.name
+        # git vcs add upstream
+        if repo == 'upstream':
+            try:
+                slug = self.convert_url_into_slug(self.repository.remote(self.name).url)
+                if not slug:
+                    raise ValueError()
+            except ValueError:
+                raise ResourceNotFoundError('No existing remote for {} to find an upstream of'.format(self.name))
+
+            url = self.get_parent_project_url(*slug.split('/'))
+            if not url:
+                raise ResourceNotFoundError('No upstream on {} found for this project.'.format(self.name))
+            slug = self.convert_url_into_slug(url)
+            if not slug:
+                raise ResourceNotFoundError('No upstream on {} found for this project.'.format(self.name))
+            user, repo = slug.split('/')
+            name = 'upstream'
+            alone = True
+            auto_slug = False
+
+        # git vcs add
+        if auto_slug and not name:
+            remote_urls = set()
+            for remote in self.repository.remotes:
+                for url in remote.urls:
+                    if self.fqdn in url:
+                        remote_urls.add(self.convert_url_into_slug(url))
+            remote_urls = list(remote_urls)
+            for idx, url in enumerate(remote_urls, 1):
+                print("[{:d}] {}".format(idx, url))
+            try:
+                remote_url = int(input('Please choose an slug to use as \'{}\' remote: '.format(self.name)))
+            except ValueError:
+                raise ArgumentError('Please enter a valid integer value.')
+            if remote_url < 1 or remote_url > idx:
+                raise ArgumentError('Please enter one of the suggested choices.')
+            user, repo = remote_urls[remote_url-1].split('/')
+            name = self.name
+
+        if not name:
+            name = self.name
 
         if not user:
             if '/' in repo:
@@ -394,9 +426,10 @@ def add(self, repo, user=None, name=None, tracking=False, alone=False, rw=True):
                     # set that branch as tracking
                     branch.set_tracking_branch(remote.refs[0])
                     break
-            return remote
         else:
-            return self.repository.create_remote(name, self.format_path(repo, user, rw=rw))
+            remote = self.repository.create_remote(name, self.format_path(repo, user, rw=rw))
+
+        return remote, user, repo
 
 
     def run_fork(self, user, repo, branch):
@@ -531,6 +564,10 @@ def request_fetch(self, user, repo, request, pull=False, force=False): #pragma:
     def request_create(self, user, repo, from_branch, onto_branch, title, description=None, auto_slug=False):
         raise NotImplementedError
 
+    @property
+    def get_parent_project_url(self, user, repo, rw=True): #pragma: no cover
+        raise NotImplementedError
+
     @property
     def user(self): #pragma: no cover
         raise NotImplementedError