Merge branch fix/issues/108 into devel

Author: guyzmo

git_repo/repo.py

@@ -15,12 +15,12 @@
     {self} [--path=<path>] [-v...] <target> clone <user>/<repo> [<repo> [<branch>]]
     {self} [--path=<path>] [-v...] <target> add <user>/<repo> [<name>] [--tracking=<branch>] [-a]
     {self} [--path=<path>] [-v...] <target> request (list|ls)
-    {self} [--path=<path>] [-v...] <target> request fetch <request>
+    {self} [--path=<path>] [-v...] <target> request fetch <request> [-f]
     {self} [--path=<path>] [-v...] <target> request create <title> [--message=<message>]
     {self} [--path=<path>] [-v...] <target> request create <local_branch> <title> [--message=<message>]
     {self} [--path=<path>] [-v...] <target> request create <remote_branch> <local_branch> <title> [--message=<message>]
     {self} [--path=<path>] [-v...] <target> request <user>/<repo> (list|ls)
-    {self} [--path=<path>] [-v...] <target> request <user>/<repo> fetch <request>
+    {self} [--path=<path>] [-v...] <target> request <user>/<repo> fetch <request> [-f]
     {self} [--path=<path>] [-v...] <target> request <user>/<repo> create <title> [--branch=<remote>] [--message=<message>]
     {self} [--path=<path>] [-v...] <target> request <user>/<repo> create <local_branch> <title> [--branch=<remote>] [--message=<message>]
     {self} [--path=<path>] [-v...] <target> request <user>/<repo> create <remote_branch> <local_branch> <title> [--branch=<remote>] [--message=<message>]
@@ -428,7 +428,7 @@ def do_request_create(self):
     @register_action('request', 'fetch')
     def do_request_fetch(self):
         service = self.get_service()
-        new_branch = service.request_fetch(self.user_name, self.repo_name, self.request)
+        new_branch = service.request_fetch(self.user_name, self.repo_name, self.request, force=self.force)
         log.info('Successfully fetched request id `{}` of `{}` into `{}`!'.format(
             self.request,
             self.repo_slug,

git_repo/services/ext/github.py

@@ -283,7 +283,7 @@ def request_list(self, user, repo):
         for pull in repository.iter_pulls():
             yield ( str(pull.number), pull.title, pull.links['html'] )
 
-    def request_fetch(self, user, repo, request, pull=False):
+    def request_fetch(self, user, repo, request, pull=False, force=False):
         if pull:
             raise NotImplementedError('Pull operation on requests for merge are not yet supported')
         try:
@@ -293,7 +293,8 @@ def request_fetch(self, user, repo, request, pull=False):
                     self.fetch(
                         remote,
                         'pull/{}/head'.format(request),
-                        local_branch_name
+                        local_branch_name,
+                        force=force
                     )
                     return local_branch_name
             else:

git_repo/services/ext/gitlab.py

@@ -307,7 +307,7 @@ def request_list(self, user, repo):
                         )
                     )
 
-    def request_fetch(self, user, repo, request, pull=False):
+    def request_fetch(self, user, repo, request, pull=False, force=False):
         if pull:
             raise NotImplementedError('Pull operation on requests for merge are not yet supported')
         try:
@@ -317,7 +317,8 @@ def request_fetch(self, user, repo, request, pull=False):
                     self.fetch(
                         remote,
                        'merge_requests/{}/head'.format(request),
-                        local_branch_name
+                        local_branch_name,
+                        force
                     )
                     return local_branch_name
             else:

git_repo/services/service.py

@@ -216,14 +216,15 @@ def pull(self, remote, branch=None):
             remote.pull(progress=pb)
         print()
 
-    def fetch(self, remote, remote_branch, local_branch):
+    def fetch(self, remote, remote_branch, local_branch, force=False):
         '''Pull a repository
         :param remote: git-remote instance
         :param branch: name of the branch to pull
         '''
         pb = ProgressBar()
         pb.setup(self.name)
-        remote.fetch(':'.join([remote_branch, local_branch]), progress=pb)
+        remote.fetch(':'.join([remote_branch, local_branch]),
+                update_head_ok=True, force=force, progress=pb)
         print()
 
     def clone(self, user, repo, branch='master', rw=True):
@@ -420,7 +421,7 @@ def request_list(self, user, repo): #pragma: no cover
         '''
         raise NotImplementedError
 
-    def request_fetch(self, user, repo, request, pull=False): #pragma: no cover
+    def request_fetch(self, user, repo, request, pull=False, force=False): #pragma: no cover
         '''Fetches given request as a branch, and switch if pull is true
 
         :param repo: name of the repository to create

tests/helpers.py

@@ -661,7 +661,7 @@ def action_request_fetch(self, namespace, repository, request, pull=False, fail=
             with self.mockup_git(namespace, repository):
                 self.set_mock_popen_commands([
                     ('git version', b'git version 2.8.0', b'', 0),
-                    ('git fetch --progress -v {0} {2}/{1}/head:{3}/{1}'.format(
+                    ('git fetch --progress --update-head-ok -v {0} {2}/{1}/head:{3}/{1}'.format(
                             self.service.name,
                             request,
                             remote_branch,

tests/integration/test_main.py

@@ -366,7 +366,7 @@ def test_request_fetch__request(self, capsys, caplog):
                 args={'<request>': '42'})
         out, err = capsys.readouterr()
         assert ('guyzmo', 'git-repo', '42') == seen_args
-        assert {} == extra_args
+        assert {'force': False} == extra_args
         assert out == ''
         assert 'Successfully fetched request id `42` of `guyzmo/git-repo` into `pr/42`!' in caplog.text
 
@@ -378,7 +378,7 @@ def test_request_fetch__request(self, capsys, caplog):
     #     seen_args, extra_args = self.main_request_fetch(rc=0, args={'<request>': '42'})
     #     out, err = capsys.readouterr()
     #     assert ('guyzmo', 'git-repo', '42') == seen_args
-    #     assert {} == extra_args
+    #     assert {'force': False} == extra_args
     #     assert out == ''
     #     assert 'Successfully fetched request id `42` of `guyzmo/git-repo` into `pr/42`!' in caplog.text
 
@@ -389,7 +389,7 @@ def test_request_fetch__request__no_repo_slug__https(self, capsys, caplog):
         seen_args, extra_args = self.main_request_fetch(rc=0, args={'<request>': '42'})
         out, err = capsys.readouterr()
         assert ('guyzmo', 'git-repo', '42') == seen_args
-        assert {} == extra_args
+        assert {'force': False} == extra_args
         assert out == ''
         assert 'Successfully fetched request id `42` of `guyzmo/git-repo` into `pr/42`!' in caplog.text
 
@@ -400,7 +400,7 @@ def test_request_fetch__bad_request(self, capsys, caplog):
                 args={'<request>': 'bad', '--verbose': 0})
         out, err = capsys.readouterr()
         assert ('guyzmo', 'git-repo', 'bad') == seen_args
-        assert {} == extra_args
+        assert {'force': False} == extra_args
         assert out == ''
         assert 'Fatal error: bad request for merge!' in caplog.text
 
@@ -554,7 +554,7 @@ def test_request_fetch__no_repo_slug(self, capsys, caplog):
                 args={'<request>': '42'})
         out, err = capsys.readouterr()
         assert ('guyzmo', 'git-repo', '42') == seen_args
-        assert {} == extra_args
+        assert {'force': False} == extra_args
         assert out == ''
         assert 'Successfully fetched request id `42` of `guyzmo/git-repo` into `pr/42`!' in caplog.text