Merge lp:~jelmer/brz/launchpad-git-push into lp:brz/3.1

[Jelmer Vernooij]

Fix various issues pushing to Launchpad Git repositories.

Fix various issues pushing to Launchpad Git repositories.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2020-07-15 22:39:05 +0000
+++ breezy/git/remote.py	2020-07-28 02:42:32 +0000
@@ -610,11 +610,16 @@
         push_result.branch_push_result = None
         repo = self.find_repository()
         refname = self._get_selected_ref(name)
-        ref_chain, old_sha = self.get_refs_container().follow(refname)
-        if ref_chain:
-            actual_refname = ref_chain[-1]
-        else:
+        try:
+            ref_chain, old_sha = self.get_refs_container().follow(refname)
+        except NotBranchError:
             actual_refname = refname
+            old_sha = None
+        else:
+            if ref_chain:
+                actual_refname = ref_chain[-1]
+            else:
+                actual_refname = refname
         if isinstance(source, GitBranch) and lossy:
             raise errors.LossyPushToSameVCS(source.controldir, self)
         source_store = get_object_store(source.repository)
@@ -634,6 +639,7 @@
                     raise errors.NoRoundtrippingSupport(
                         source, self.open_branch(name=name, nascent_ok=True))
             if not overwrite:
+                old_sha = remote_refs.get(actual_refname)
                 if remote_divergence(old_sha, new_sha, source_store):
                     raise DivergedBranches(
                         source, self.open_branch(name, nascent_ok=True))
 
=== modified file 'breezy/plugins/launchpad/hoster.py'
--- breezy/plugins/launchpad/hoster.py	2020-07-24 17:47:14 +0000
+++ breezy/plugins/launchpad/hoster.py	2020-07-28 02:42:32 +0000
@@ -723,7 +723,8 @@
                 revid=self.source_branch.last_revision())
 
     def create_proposal(self, description, reviewers=None, labels=None,
-                        prerequisite_branch=None, commit_message=None):
+                        prerequisite_branch=None, commit_message=None,
+                        work_in_progress=False, allow_collaboration=False):
         """Perform the submission."""
         if labels:
             raise LabelsUnsupported(self)
@@ -741,7 +742,7 @@
                 merge_prerequisite=prereq_branch_lp,
                 initial_comment=description.strip(),
                 commit_message=commit_message,
-                needs_review=True,
+                needs_review=(not work_in_progress),
                 reviewers=[self.launchpad.people[reviewer].self_link
                            for reviewer in reviewers],
                 review_types=[None for reviewer in reviewers])
 
=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-07-28 01:28:20 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-07-28 02:42:32 +0000
@@ -66,6 +66,10 @@
  * Prevent exceptions during commit when quilt is not installed but
    the tree contains quilt patches. (Jelmer Vernooij)
 
+ * Support pushing to Git repositories that do not yet exist,
+   such as is the case on Launchpad repositories.
+   (Jelmer Vernooij)
+
 Documentation
 *************