Merge lp:~jelmer/brz/git-config into lp:brz/3.1

[Jelmer Vernooij]

Set all required fields in git config.

Set all required fields in git config.

[Jelmer Vernooij (jelmer)]

review: Approve

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

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

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

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

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2021-01-23 02:54:05 +0000
+++ breezy/git/branch.py	2021-03-24 03:17:56 +0000
@@ -156,7 +156,7 @@
                 else:
                     conflicts.append(
                         (tag_name,
-                         self.repository.lookup_foreign_revision_id(peeled),
+                         self.source.branch.repository.lookup_foreign_revision_id(peeled),
                          self.target.branch.repository.lookup_foreign_revision_id(
                              old_refs[ref_name])))
             return ret
@@ -263,7 +263,7 @@
             return updates, conflicts
 
     def _merge_to(self, to_tags, source_tag_refs, overwrite=False,
-                  selector=None):
+                  selector=None, ignore_master=False):
         unpeeled_map = defaultdict(set)
         conflicts = []
         updates = {}
@@ -502,8 +502,9 @@
         if getattr(self.repository, '_git', None):
             cs = self.repository._git.get_config_stack()
             try:
-                return cs.get((b"branch", self.name.encode('utf-8')),
-                        b"nick").decode("utf-8")
+                return cs.get(
+                    (b"branch", self.name.encode('utf-8')),
+                    b"nick").decode("utf-8")
             except KeyError:
                 pass
         return self.name or u"HEAD"
@@ -522,6 +523,9 @@
         return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
                                  self.name)
 
+    def set_last_revision(self, revid):
+        raise NotImplementedError(self.set_last_revision)
+
     def generate_revision_history(self, revid, last_rev=None,
                                   other_branch=None):
         if last_rev is not None:
@@ -597,7 +601,7 @@
         try:
             ref = cs.get((b"branch", remote), b"merge")
         except KeyError:
-            ref = self.ref
+            ref = b'HEAD'
 
         return git_url_to_bzr_url(location.decode('utf-8'), ref=ref)
 
@@ -606,11 +610,6 @@
         cs = self.repository._git.get_config_stack()
         return self._get_related_merge_branch(cs)
 
-    def _write_git_config(self, cs):
-        f = BytesIO()
-        cs.write_to_file(f)
-        self.repository._git._put_named_file('config', f.getvalue())
-
     def set_parent(self, location):
         cs = self.repository._git.get_config()
         remote = self._get_origin(cs)
@@ -618,14 +617,17 @@
         target_url, branch, ref = bzr_url_to_git_url(location)
         location = urlutils.relative_url(this_url, target_url)
         cs.set((b"remote", remote), b"url", location)
-        if branch:
-            cs.set((b"branch", remote), b"merge", branch_name_to_ref(branch))
-        elif ref:
-            cs.set((b"branch", remote), b"merge", ref)
-        else:
-            # TODO(jelmer): Maybe unset rather than setting to HEAD?
-            cs.set((b"branch", remote), b"merge", b'HEAD')
-        self._write_git_config(cs)
+        cs.set((b"remote", remote), b'fetch',
+               b'+refs/heads/*:refs/remotes/%s/*' % remote)
+        if self.name:
+            if branch:
+                cs.set((b"branch", self.name.encode()), b"merge", branch_name_to_ref(branch))
+            elif ref:
+                cs.set((b"branch", self.name.encode()), b"merge", ref)
+            else:
+                # TODO(jelmer): Maybe unset rather than setting to HEAD?
+                cs.set((b"branch", self.name.encode()), b"merge", b'HEAD')
+        self.repository._write_git_config(cs)
 
     def break_lock(self):
         raise NotImplementedError(self.break_lock)

=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2020-07-20 00:29:15 +0000
+++ breezy/git/dir.py	2021-03-24 03:17:56 +0000
@@ -238,13 +238,12 @@
         from ..repository import InterRepository
         from .mapping import default_mapping
         from ..transport.local import LocalTransport
-        if stacked_on is not None:
-            raise _mod_branch.UnstackableBranchFormat(
-                self._format, self.user_url)
         if no_tree:
             format = BareLocalGitControlDirFormat()
         else:
             format = LocalGitControlDirFormat()
+        if stacked_on is not None:
+            raise _mod_branch.UnstackableBranchFormat(format, self.user_url)
         (target_repo, target_controldir, stacking,
          repo_policy) = format.initialize_on_transport_ex(
             transport, use_existing_dir=use_existing_dir,
@@ -264,8 +263,16 @@
         for name, val in viewitems(refs):
             target_git_repo.refs[name] = val
         result_dir = LocalGitDir(transport, target_git_repo, format)
+        result_branch = result_dir.open_branch()
+        try:
+            parent = self.open_branch().get_parent()
+        except brz_errors.InaccessibleParent:
+            pass
+        else:
+            if parent:
+                result_branch.set_parent(parent)
         if revision_id is not None:
-            result_dir.open_branch().set_last_revision(revision_id)
+            result_branch.set_last_revision(revision_id)
         if not no_tree and isinstance(result_dir.root_transport, LocalTransport):
             if result_dir.open_repository().make_working_trees():
                 try:

=== modified file 'breezy/git/repository.py'
--- breezy/git/repository.py	2020-11-23 19:46:21 +0000
+++ breezy/git/repository.py	2021-03-24 03:17:56 +0000
@@ -19,6 +19,8 @@
 
 from __future__ import absolute_import
 
+from io import BytesIO
+
 from .. import (
     check,
     errors,
@@ -264,6 +266,11 @@
         self.start_write_group()
         return builder
 
+    def _write_git_config(self, cs):
+        f = BytesIO()
+        cs.write_to_file(f)
+        self._git._put_named_file('config', f.getvalue())
+
     def get_file_graph(self):
         return _mod_graph.Graph(GitFileParentProvider(
             self._file_change_scanner))

=== modified file 'breezy/tests/per_branch/test_http.py'
--- breezy/tests/per_branch/test_http.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_branch/test_http.py	2021-03-24 03:17:56 +0000
@@ -76,4 +76,4 @@
         # from, even if that branch has an invalid parent.
         branch_b = self.get_branch_with_invalid_parent()
         branch_c = branch_b.controldir.sprout('c').open_branch()
-        self.assertEqual(branch_b.user_url, branch_c.get_parent())
+        self.assertEqual(branch_b.base, branch_c.get_parent())