Merge lp:~jelmer/brz/simplify-remote-git into lp:brz

[Jelmer Vernooij]

Simplify remote git branch handling.

Simplify remote git branch handling.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

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

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

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

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

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

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/1034/

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

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

=== modified file 'breezy/git/errors.py'
--- breezy/git/errors.py	2020-02-18 01:57:45 +0000
+++ breezy/git/errors.py	2022-08-29 10:50:44 +0000
@@ -26,25 +26,6 @@
     """The base-level exception for bzr-git errors."""
 
 
-class NoSuchRef(BzrGitError):
-    """Raised when a ref can not be found."""
-
-    _fmt = "The ref %(ref)s was not found in the repository at %(location)s."
-
-    def __init__(self, ref, location, present_refs=None):
-        self.ref = ref
-        self.location = location
-        self.present_refs = present_refs
-
-
-def convert_dulwich_error(error):
-    """Convert a Dulwich error to a Bazaar error."""
-
-    if isinstance(error, git_errors.HangupException):
-        raise brz_errors.ConnectionReset(error.msg, "")
-    raise error
-
-
 class NoPushSupport(brz_errors.BzrError):
     _fmt = ("Push is not yet supported from %(source)r to %(target)r "
             "using %(mapping)r for %(revision_id)r. Try dpush instead.")

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2022-08-28 19:41:33 +0000
+++ breezy/git/remote.py	2022-08-29 10:50:44 +0000
@@ -80,7 +80,6 @@
     )
 from .errors import (
     GitSmartRemoteNotSupported,
-    NoSuchRef,
     )
 from .mapping import (
     encode_git_path,
@@ -538,12 +537,12 @@
         refname = self._get_selected_ref(name, ref)
         if refname != b'HEAD' and refname in self.get_refs_container():
             raise AlreadyBranchError(self.user_url)
-        ref_chain, unused_sha = self.get_refs_container().follow(
+        ref_chain, sha = self.get_refs_container().follow(
             self._get_selected_ref(name))
         if ref_chain and ref_chain[0] == b'HEAD' and len(ref_chain) > 1:
             refname = ref_chain[1]
         repo = self.open_repository()
-        return RemoteGitBranch(self, repo, refname)
+        return RemoteGitBranch(self, repo, refname, sha)
 
     def destroy_branch(self, name=None):
         refname = self._get_selected_ref(name)
@@ -601,10 +600,10 @@
             raise NotBranchError(self.root_transport.base,
                                  controldir=self)
         try:
-            ref_chain, unused_sha = self.get_refs_container().follow(ref)
+            ref_chain, sha = self.get_refs_container().follow(ref)
         except SymrefLoop:
             raise BranchReferenceLoop(self)
-        return RemoteGitBranch(self, repo, ref_chain[-1])
+        return RemoteGitBranch(self, repo, ref_chain[-1], sha)
 
     def open_workingtree(self, recommend_upgrade=False):
         raise NotLocalUrl(self.transport.base)
@@ -1045,8 +1044,8 @@
 
 class RemoteGitBranch(GitBranch):
 
-    def __init__(self, controldir, repository, ref):
-        self._sha = None
+    def __init__(self, controldir, repository, ref, sha):
+        self._sha = sha
         super(RemoteGitBranch, self).__init__(controldir, repository, ref,
                                               RemoteGitBranchFormat())
 
@@ -1069,13 +1068,6 @@
 
     @property
     def head(self):
-        if self._sha is not None:
-            return self._sha
-        refs = self.controldir.get_refs_container()
-        try:
-            self._sha = refs[self.ref]
-        except KeyError:
-            raise NoSuchRef(self.ref, self.repository.user_url, refs)
         return self._sha
 
     def _synchronize_history(self, destination, revision_id):