Merge lp:~jelmer/brz/interbranch-update-references into lp:brz

[Jelmer Vernooij]

Support importing tree reference info from Git.

Move the update_references method to InterBranch.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2019-10-19 23:18:56 +0000
+++ breezy/branch.py	2020-01-18 15:06:59 +0000
@@ -1281,18 +1281,7 @@
     def update_references(self, target):
         if not getattr(self._format, 'supports_reference_locations', False):
             return
-        reference_dict = self._get_all_reference_info()
-        if len(reference_dict) == 0:
-            return
-        old_base = self.base
-        new_base = target.base
-        target_reference_dict = target._get_all_reference_info()
-        for tree_path, (branch_location, file_id) in viewitems(reference_dict):
-            branch_location = urlutils.rebase_url(branch_location,
-                                                  old_base, new_base)
-            target_reference_dict.setdefault(
-                tree_path, (branch_location, file_id))
-        target._set_all_reference_info(target_reference_dict)
+        return InterBranch.get(self, target).update_references()
 
     def check(self, refs):
         """Check consistency of the branch.
@@ -2119,6 +2108,11 @@
         """
         raise NotImplementedError(self.fetch)
 
+    def update_references(self):
+        """Import reference information from source to target.
+        """
+        raise NotImplementedError(self.update_references)
+
 
 def _fix_overwrite_type(overwrite):
     if isinstance(overwrite, bool):
@@ -2155,8 +2149,8 @@
                      be truncated to end with revision_id.
         """
         with self.source.lock_read(), self.target.lock_write():
-            self.source.update_references(self.target)
             self.source._synchronize_history(self.target, revision_id)
+            self.update_references()
             try:
                 parent = self.source.get_parent()
             except errors.InaccessibleParent as e:
@@ -2325,7 +2319,6 @@
         result.source_branch = self.source
         result.target_branch = self.target
         result.old_revno, result.old_revid = self.target.last_revision_info()
-        self.source.update_references(self.target)
         overwrite = _fix_overwrite_type(overwrite)
         if result.old_revid != stop_revision:
             # We assume that during 'push' this repository is closer than
@@ -2337,6 +2330,7 @@
             result.tag_updates, result.tag_conflicts = (
                 self.source.tags.merge_to(
                     self.target.tags, "tags" in overwrite))
+        self.update_references()
         result.new_revno, result.new_revid = self.target.last_revision_info()
         return result
 
@@ -2372,7 +2366,6 @@
         with self.source.lock_read():
             # We assume that during 'pull' the target repository is closer than
             # the source one.
-            self.source.update_references(self.target)
             graph = self.target.repository.get_graph(self.source.repository)
             # TODO: Branch formats should have a flag that indicates
             # that revno's are expensive, and pull() should honor that flag.
@@ -2389,6 +2382,7 @@
                 self.source.tags.merge_to(
                     self.target.tags, "tags" in overwrite,
                     ignore_master=not merge_tags_to_master))
+            self.update_references()
             result.new_revno, result.new_revid = (
                 self.target.last_revision_info())
             if _hook_master:
@@ -2402,5 +2396,21 @@
                     hook(result)
             return result
 
+    def update_references(self):
+        if not getattr(self.source._format, 'supports_reference_locations', False):
+            return
+        reference_dict = self.source._get_all_reference_info()
+        if len(reference_dict) == 0:
+            return
+        old_base = self.source.base
+        new_base = self.target.base
+        target_reference_dict = self.target._get_all_reference_info()
+        for tree_path, (branch_location, file_id) in viewitems(reference_dict):
+            branch_location = urlutils.rebase_url(branch_location,
+                                                  old_base, new_base)
+            target_reference_dict.setdefault(
+                tree_path, (branch_location, file_id))
+        self.target._set_all_reference_info(target_reference_dict)
+
 
 InterBranch.register_optimiser(GenericInterBranch)

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2020-01-16 23:24:40 +0000
+++ breezy/git/branch.py	2020-01-18 15:06:59 +0000
@@ -22,6 +22,11 @@
 from io import BytesIO
 from collections import defaultdict
 
+from dulwich.config import (
+    ConfigFile as GitConfigFile,
+    parse_submodules,
+    )
+
 from dulwich.objects import (
     NotCommitError,
     ZERO_SHA,
@@ -980,6 +985,20 @@
             other_branch=self.source)
         return head, refs
 
+    def update_references(self, revid=None):
+        if revid is None:
+            revid = self.target.last_revision()
+        tree = self.target.repository.revision_tree(revid)
+        try:
+            with tree.get_file('.gitmodules') as f:
+                for path, url, section in parse_submodules(
+                        GitConfigFile.from_file(f)):
+                    self.target.set_reference_info(
+                        path.decode('utf-8'), url.decode('utf-8'),
+                        tree.path2id(path.decode('utf-8')))
+        except errors.NoSuchFile:
+            pass
+
     def _basic_pull(self, stop_revision, overwrite, run_hooks,
                     _override_hook_target, _hook_master):
         if overwrite is True:
@@ -1007,6 +1026,7 @@
                 result.tag_conflicts = tags_ret
             (result.new_revno, result.new_revid) = \
                 self.target.last_revision_info()
+            self.update_references(revid=result.new_revid)
             if _hook_master:
                 result.master_branch = _hook_master
                 result.local_branch = result.target_branch
@@ -1075,6 +1095,7 @@
             self.target.tags, "tags" in overwrite, ignore_master=True)
         (result.tag_updates, result.tag_conflicts) = tags_ret
         result.new_revno, result.new_revid = self.target.last_revision_info()
+        self.update_references(revid=result.new_revid)
         return result