Merge lp:~jelmer/brz/lock-contention into lp:brz/3.2

[Jelmer Vernooij]

Raise LockContention error from remote Git.

Raise LockContention error from remote Git.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/118/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/119/

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2022-02-18 00:33:13 +0000
+++ breezy/git/remote.py	2022-03-08 15:36:32 +0000
@@ -39,6 +39,7 @@
     DivergedBranches,
     InProcessTransport,
     InvalidRevisionId,
+    LockContention,
     NoSuchFile,
     NoSuchRevision,
     NoSuchTag,
@@ -389,12 +390,15 @@
 
     def __init__(self, pb):
         self.pb = pb
+        self.errors = []
 
     def progress(self, text):
         text = text.rstrip(b"\r\n")
         text = text.decode('utf-8', 'surrogateescape')
         if text.lower().startswith('error: '):
-            trace.show_error('git: %s', text[len(b'error: '):])
+            error = text[len(b'error: '):]
+            self.errors.append(error)
+            trace.show_error('git: %s', error)
         else:
             trace.mutter("git: %s", text)
             g = self._GIT_PROGRESS_PARTIAL_RE.match(text)
@@ -410,6 +414,9 @@
                     trace.note("%s", text)
 
 
+_LOCK_REF_ERROR_MATCHER = re.compile(b'cannot lock ref \'(.*)\': (.*)')
+
+
 class RemoteGitDir(GitDir):
 
     def __init__(self, transport, format, client, client_path):
@@ -480,8 +487,10 @@
     def send_pack(self, get_changed_refs, generate_pack_data, progress=None):
         if progress is None:
             pb = ui.ui_factory.nested_progress_bar()
-            progress = DefaultProgressReporter(pb).progress
+            progress_reporter = DefaultProgressReporter(pb)
+            progress = progress_reporter.progress
         else:
+            progress_reporter = None
             pb = None
 
         def get_changed_refs_wrapper(remote_refs):
@@ -489,9 +498,18 @@
                 update_refs_container(self._refs, remote_refs)
             return get_changed_refs(remote_refs)
         try:
-            return self._client.send_pack(
+            result = self._client.send_pack(
                 self._client_path, get_changed_refs_wrapper,
                 generate_pack_data, progress)
+            for ref, msg in list(result.ref_status.items()):
+                if msg:
+                    result.ref_status[ref] = RemoteGitError(msg=msg)
+            if progress_reporter:
+                for error in progress_reporter.errors:
+                    m = _LOCK_REF_ERROR_MATCHER.match(error)
+                    if m:
+                        result.ref_status[m.group(1)] = LockContention(m.group(1), m.group(2))
+            return result
         except HangupException as e:
             raise parse_git_hangup(self.transport.external_url(), e)
         except GitProtocolError as e:
@@ -527,7 +545,7 @@
         result = self.send_pack(get_changed_refs, generate_pack_data)
         error = result.ref_status.get(refname)
         if error:
-            raise RemoteGitError(error)
+            raise error
 
     @property
     def user_url(self):
@@ -686,7 +704,7 @@
             new_refs = dw_result.refs
             error = dw_result.ref_status.get(actual_refname)
             if error:
-                raise RemoteGitError(error)
+                raise error
             for ref, error in dw_result.ref_status.items():
                 if error:
                     trace.warning('unable to open ref %s: %s',
@@ -1015,7 +1033,7 @@
             get_changed_refs, generate_pack_data)
         error = result.ref_status.get(ref)
         if error:
-            raise RemoteGitError(error)
+            raise error
 
 
 class RemoteGitBranch(GitBranch):
@@ -1103,7 +1121,7 @@
             get_changed_refs, generate_pack_data)
         error = result.ref_status.get(self.ref)
         if error:
-            raise RemoteGitError(error)
+            raise error
         self._sha = sha