Merge lp:~jelmer/brz/git-stderr-lines into lp:brz

[Jelmer Vernooij]

Parse stderr from remote git servers when they hang up.

Parse stderr from remote git servers when they hang up.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2020-05-06 02:13:25 +0000
+++ breezy/git/remote.py	2020-06-01 23:00:29 +0000
@@ -211,6 +211,24 @@
     return RemoteGitError(message)
 
 
+def parse_git_hangup(url, e):
+    """Parse the error lines from a git servers stderr on hangup.
+
+    :param url: URL of the remote repository
+    :param e: A HangupException
+    """
+    stderr_lines = getattr(e, 'stderr_lines', None)
+    if not stderr_lines:
+        return e
+    interesting_lines = [
+        line for line in stderr_lines
+        if line and line.replace('=', '')]
+    if len(interesting_lines) == 1:
+        interesting_line = interesting_lines[0]
+        return parse_git_error(url, interesting_line)
+    return RemoteGitError('\n'.join(stderr_lines))
+
+
 class GitSmartTransport(Transport):
 
     def __init__(self, url, _client=None):
@@ -410,6 +428,8 @@
                 prefix=(prefix.encode('utf-8') if prefix else None))
         except GitProtocolError as e:
             raise parse_git_error(self.transport.external_url(), e)
+        except HangupException as e:
+            raise parse_git_hangup(self.transport.external_url(), e)
         finally:
             if pb is not None:
                 pb.finished()
@@ -432,6 +452,8 @@
             return result
         except GitProtocolError as e:
             raise parse_git_error(self.transport.external_url(), e)
+        except HangupException as e:
+            raise parse_git_hangup(self.transport.external_url(), e)
         finally:
             if pb is not None:
                 pb.finished()
@@ -453,6 +475,8 @@
                 generate_pack_data, progress)
         except GitProtocolError as e:
             raise parse_git_error(self.transport.external_url(), e)
+        except HangupException as e:
+            raise parse_git_hangup(self.transport.external_url(), e)
         finally:
             if pb is not None:
                 pb.finished()

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2020-05-06 02:13:25 +0000
+++ breezy/git/tests/test_remote.py	2020-06-01 23:00:29 +0000
@@ -39,6 +39,7 @@
 from ..remote import (
     split_git_url,
     parse_git_error,
+    parse_git_hangup,
     HeadUpdateFailed,
     RemoteGitError,
     RemoteGitBranchFormat,
@@ -46,6 +47,7 @@
     )
 
 from dulwich import porcelain
+from dulwich.errors import HangupException
 from dulwich.repo import Repo as GitRepo
 
 
@@ -142,6 +144,45 @@
         self.assertIsInstance(e, NotBranchError)
 
 
+class ParseHangupTests(TestCase):
+
+    def setUp(self):
+        super(ParseHangupTests, self).setUp()
+        try:
+            HangupException(['foo'])
+        except TypeError:
+            self.skipTest('dulwich version too old')
+
+    def test_not_set(self):
+        self.assertIsInstance(
+            parse_git_hangup('http://', HangupException()), HangupException)
+
+    def test_single_line(self):
+        self.assertEqual(
+            RemoteGitError('foo bar'),
+            parse_git_hangup('http://', HangupException(['foo bar'])))
+
+    def test_multi_lines(self):
+        self.assertEqual(
+            RemoteGitError('foo bar\nbla bla'),
+            parse_git_hangup(
+                'http://', HangupException(['foo bar', 'bla bla'])))
+
+    def test_filter_boring(self):
+        self.assertEqual(
+            RemoteGitError('foo bar'), parse_git_hangup('http://', HangupException(
+                ['=======', 'foo bar', '======'])))
+
+    def test_permission_denied(self):
+        self.assertEqual(
+            PermissionDenied('http://', 'You are not allowed to push code to this project.'),
+            parse_git_hangup(
+                'http://',
+                HangupException(
+                    ['=======',
+                     'You are not allowed to push code to this project.', '', '======'])))
+
+
 class TestRemoteGitBranchFormat(TestCase):
 
     def setUp(self):

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-06-01 13:15:43 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-06-01 23:00:29 +0000
@@ -134,6 +134,9 @@
 * Ignore special files (fifos, block/character devices, sockets)
   when finding changes in Git working trees. (Jelmer Vernooij, #1857244)
 
+* Parse error messages from stderr when a remote Git server
+  hangs up. (Jelmer Vernooij)
+
 
 Bug Fixes
 *********