Merge lp:~jelmer/brz/more-git-errors into lp:brz

[Jelmer Vernooij]

Handle some more Git error strings and convert them to specific exceptions.

Handle permission denied by GitLab.

[lp:~jelmer/brz/more-git-errors]

7133. By Jelmer Vernooij on 2018-09-28

Handle github PermissionDenied.

7134. By Jelmer Vernooij on 2018-10-06

Handle one more error.

[Martin Packman (gz)]

Looks good, but seem one suggestion inline.

review: Approve

[lp:~jelmer/brz/more-git-errors]

7135. By Jelmer Vernooij on 2018-10-13

Don't use GitLab string.

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2018-09-14 09:56:35 +0000
+++ breezy/git/remote.py	2018-10-13 13:17:02 +0000
@@ -203,6 +203,13 @@
     if message.startswith('access denied or repository not exported:'):
         extra, path = message.split(': ', 1)
         return PermissionDenied(path, extra)
+    if message.endswith('You are not allowed to push code to this project.'):
+        return PermissionDenied(url, message)
+    if message.endswith(' does not appear to be a git repository'):
+        return NotBranchError(url, message)
+    m = re.match(r'Permission to ([^ ]+) denied to ([^ ]+)\.', message)
+    if m:
+        return PermissionDenied(m.group(1), 'denied to %s' % m.group(2))
     # Don't know, just return it to the user as-is
     return RemoteGitError(message)
 
@@ -350,7 +357,7 @@
     def progress(self, text):
         text = text.rstrip(b"\r\n")
         text = text.decode('utf-8')
-        if text.startswith('error: '):
+        if text.lower().startswith('error: '):
             trace.show_error('git: %s', text[len(b'error: '):])
         else:
             trace.mutter("git: %s", text)

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2018-09-12 16:42:02 +0000
+++ breezy/git/tests/test_remote.py	2018-10-13 13:17:02 +0000
@@ -96,6 +96,10 @@
         e = parse_git_error("url", "Repository not found.\n")
         self.assertIsInstance(e, NotBranchError)
 
+    def test_notbrancherror_normal(self):
+        e = parse_git_error("url", "fatal: '/srv/git/lintian-brush' does not appear to be a git repository")
+        self.assertIsInstance(e, NotBranchError)
+
     def test_head_update(self):
         e = parse_git_error("url", "HEAD failed to update\n")
         self.assertIsInstance(e, HeadUpdateFailed)
@@ -106,6 +110,20 @@
             "access denied or repository not exported: /debian/altermime.git")
         self.assertIsInstance(e, PermissionDenied)
 
+    def test_permission_denied_gitlab(self):
+        e = parse_git_error(
+            "url",
+            'GitLab: You are not allowed to push code to this project.\n')
+        self.assertIsInstance(e, PermissionDenied)
+
+    def test_permission_denied_github(self):
+        e = parse_git_error(
+            "url",
+            'Permission to porridge/gaduhistory.git denied to jelmer.')
+        self.assertIsInstance(e, PermissionDenied)
+        self.assertEqual(e.path, 'porridge/gaduhistory.git')
+        self.assertEqual(e.extra, ': denied to jelmer')
+
 
 class TestRemoteGitBranchFormat(TestCase):