Merge lp:~jelmer/brz/update-refs into lp:brz/3.1

[Jelmer Vernooij]

Fix handling of some git fetches.

Fix handling of some git fetches.

[Jelmer Vernooij (jelmer)]

review: Approve

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

Project setup failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/768/

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2020-11-21 23:31:28 +0000
+++ breezy/git/branch.py	2021-01-23 02:57:05 +0000
@@ -1455,13 +1455,26 @@
             for k, v in viewitems(self.source.tags.get_tag_dict()):
                 ret.append((None, v))
         ret.append((None, stop_revision))
-        try:
-            revidmap = self.interrepo.fetch_revs(ret, lossy=lossy, limit=limit)
-        except NoPushSupport:
-            raise errors.NoRoundtrippingSupport(self.source, self.target)
-        return _mod_repository.FetchResult(revidmap={
-            old_revid: new_revid
-            for (old_revid, (new_sha, new_revid)) in revidmap.items()})
+        if getattr(self.interrepo, 'fetch_revs', None):
+            try:
+                revidmap = self.interrepo.fetch_revs(ret, lossy=lossy, limit=limit)
+            except NoPushSupport:
+                raise errors.NoRoundtrippingSupport(self.source, self.target)
+            return _mod_repository.FetchResult(revidmap={
+                old_revid: new_revid
+                for (old_revid, (new_sha, new_revid)) in revidmap.items()})
+        else:
+            def determine_wants(refs):
+                wants = []
+                for git_sha, revid in ret:
+                    if git_sha is None:
+                        git_sha, mapping = self.target.lookup_bzr_revision_id(revid)
+                    wants.append(git_sha)
+                return wants
+
+            self.interrepo.fetch_objects(
+                determine_wants, lossy=lossy, limit=limit)
+            return _mod_repository.FetchResult()
 
     def pull(self, overwrite=False, stop_revision=None, local=False,
              possible_transports=None, run_hooks=True, _stop_revno=None,

=== modified file 'breezy/git/interrepo.py'
--- breezy/git/interrepo.py	2020-11-21 23:31:28 +0000
+++ breezy/git/interrepo.py	2021-01-23 02:57:05 +0000
@@ -655,7 +655,7 @@
 
         def determine_wants(heads):
             old_refs = dict([(k, (v, None))
-                             for (k, v) in viewitems(heads.as_dict())])
+                             for (k, v) in viewitems(heads)])
             new_refs = update_refs(old_refs)
             ref_changes.update(new_refs)
             return [sha1 for (sha1, bzr_revid) in viewvalues(new_refs)]
@@ -807,9 +807,9 @@
         def git_update_refs(old_refs):
             ret = {}
             self.old_refs = {
-                k: (v, None) for (k, v) in viewitems(old_refs)}
+                k: (v, None) for (k, v) in old_refs.items()}
             new_refs = update_refs(self.old_refs)
-            for name, (gitid, revid) in viewitems(new_refs):
+            for name, (gitid, revid) in new_refs.items():
                 if gitid is None:
                     gitid = self.source_store._lookup_revision_sha1(revid)
                 if not overwrite: