Merge lp:~jelmer/brz/parse-git-error into lp:brz

[Jelmer Vernooij]

Improve error parsing for git repositories a bit.

Improve error parsing for git repositories a bit.

[Martin Packman (gz)]

Looks reasonable, thanks!

review: Approve

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2018-08-04 17:32:58 +0000
+++ breezy/git/remote.py	2018-09-11 19:38:53 +0000
@@ -45,6 +45,7 @@
     NotBranchError,
     NotLocalUrl,
     NoWorkingTree,
+    PermissionDenied,
     UninitializableFormat,
     )
 from ..revisiontree import RevisionTree
@@ -175,6 +176,16 @@
     _fmt = "Remote server error: %(msg)s"
 
 
+class HeadUpdateFailed(BzrError):
+
+    _fmt = ("Unable to update remote HEAD branch. To update the master "
+            "branch, specify the URL %(base_url)s,branch=master.")
+
+    def __init__(self, base_url):
+        super(HeadUpdateFailed, self).__init__()
+        self.base_url = base_url
+
+
 def parse_git_error(url, message):
     """Parse a remote git server error and return a bzr exception.
 
@@ -182,13 +193,15 @@
     :param message: Message sent by the remote git server
     """
     message = str(message).strip()
-    if message.startswith("Could not find Repository "):
+    if (message.startswith("Could not find Repository ") or
+        message == 'Repository not found.'):
         return NotBranchError(url, message)
     if message == "HEAD failed to update":
         base_url, _ = urlutils.split_segment_parameters(url)
-        raise BzrError(
-            ("Unable to update remote HEAD branch. To update the master "
-             "branch, specify the URL %s,branch=master.") % base_url)
+        return HeadUpdateFailed(base_url)
+    if message.startswith('access denied or repository not exported:'):
+        extra, path = message.split(': ', 1)
+        return PermissionDenied(path, extra)
     # Don't know, just return it to the user as-is
     return RemoteGitError(message)
 
 
=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2018-08-04 17:32:58 +0000
+++ breezy/git/tests/test_remote.py	2018-09-11 19:38:53 +0000
@@ -29,6 +29,7 @@
     DivergedBranches,
     NotBranchError,
     NoSuchTag,
+    PermissionDenied,
     )
 
 from ...tests import (
@@ -41,6 +42,8 @@
 from ..remote import (
     split_git_url,
     parse_git_error,
+    HeadUpdateFailed,
+    RemoteGitError,
     RemoteGitBranchFormat,
     )
 
@@ -79,12 +82,26 @@
 
     def test_unknown(self):
         e = parse_git_error("url", "foo")
-        self.assertIsInstance(e, BzrError)
+        self.assertIsInstance(e, RemoteGitError)
 
     def test_notbrancherror(self):
         e = parse_git_error("url", "\n Could not find Repository foo/bar")
         self.assertIsInstance(e, NotBranchError)
 
+    def test_notbrancherror_github(self):
+        e = parse_git_error("url", "Repository not found.\n")
+        self.assertIsInstance(e, NotBranchError)
+
+    def test_head_update(self):
+        e = parse_git_error("url", "HEAD failed to update\n")
+        self.assertIsInstance(e, HeadUpdateFailed)
+
+    def test_permission_dnied(self):
+        e = parse_git_error(
+            "url",
+            "access denied or repository not exported: /debian/altermime.git")
+        self.assertIsInstance(e, PermissionDenied)
+
 
 class TestRemoteGitBranchFormat(TestCase):