Merge lp:~cjwatson/launchpad/fix-git-prerequisite into lp:launchpad

[Colin Watson]

Handle prerequisites in Git-based merge proposals.

Handle prerequisites in Git-based merge proposals.

The corresponding turnip change is now live on qastaging, and there's what should be an XS ticket (RT#86272) to upgrade production.

[Colin Watson (cjwatson)]

And I've fixed the conflicts now, whoops.

[Colin Watson (cjwatson)]

The corresponding turnip change has now been rolled out to production, so this should be good to go now.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposal.py'
--- lib/lp/code/browser/tests/test_branchmergeproposal.py	2015-10-05 17:02:20 +0000
+++ lib/lp/code/browser/tests/test_branchmergeproposal.py	2015-11-11 18:30:32 +0000
@@ -11,6 +11,7 @@
     timedelta,
     )
 from difflib import unified_diff
+import re
 
 from lazr.lifecycle.event import ObjectModifiedEvent
 from lazr.restful.interfaces import IJSONRequestCache
@@ -1484,6 +1485,29 @@
         self.assertThat(browser.contents, HTMLContains(expected_meta))
 
 
+class TestBranchMergeProposalBrowserView(BrowserTestCase):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_prerequisite_bzr(self):
+        # A prerequisite branch is rendered in the Bazaar case.
+        branch = self.factory.makeProductBranch()
+        identity = branch.identity
+        bmp = self.factory.makeBranchMergeProposal(prerequisite_branch=branch)
+        text = self.getMainText(bmp, '+index')
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            'Prerequisite: ' + re.escape(identity), text)
+
+    def test_prerequisite_git(self):
+        # A prerequisite reference is rendered in the Git case.
+        [ref] = self.factory.makeGitRefs()
+        identity = ref.identity
+        bmp = self.factory.makeBranchMergeProposalForGit(prerequisite_ref=ref)
+        text = self.getMainText(bmp, '+index')
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            'Prerequisite: ' + re.escape(identity), text)
+
+
 class TestBranchMergeProposalChangeStatusView(TestCaseWithFactory):
     """Test the +edit-status view."""
 

=== modified file 'lib/lp/code/model/diff.py'
--- lib/lp/code/model/diff.py	2015-07-09 20:06:17 +0000
+++ lib/lp/code/model/diff.py	2015-11-11 18:30:32 +0000
@@ -450,22 +450,15 @@
                 path = "%s:%s" % (
                     target_repository.getInternalPath(),
                     source_repository.getInternalPath())
-            # XXX cjwatson 2015-04-30: Add prerequisite handling once turnip
-            # supports it.
             response = getUtility(IGitHostingClient).getMergeDiff(
-                path, bmp.target_git_ref.commit_sha1,
-                bmp.source_git_ref.commit_sha1)
-            source_revision_id = bmp.source_git_ref.commit_sha1
-            target_revision_id = bmp.target_git_ref.commit_sha1
-            if bmp.prerequisite_git_ref is not None:
-                prerequisite_revision_id = bmp.prerequisite_git_ref.commit_sha1
-            else:
-                prerequisite_revision_id = None
+                path, bmp.target_git_commit_sha1, bmp.source_git_commit_sha1,
+                prerequisite=bmp.prerequisite_git_commit_sha1)
             conflicts = u"".join(
                 u"Conflict in %s\n" % path for path in response['conflicts'])
             preview = cls.create(
-                bmp, response['patch'].encode('utf-8'), source_revision_id,
-                target_revision_id, prerequisite_revision_id, conflicts,
+                bmp, response['patch'].encode('utf-8'),
+                bmp.source_git_commit_sha1, bmp.target_git_commit_sha1,
+                bmp.prerequisite_git_commit_sha1, conflicts,
                 strip_prefix_segments=1)
         del get_property_cache(bmp).preview_diffs
         del get_property_cache(bmp).preview_diff

=== modified file 'lib/lp/code/model/githosting.py'
--- lib/lp/code/model/githosting.py	2015-10-05 04:57:16 +0000
+++ lib/lp/code/model/githosting.py	2015-11-11 18:30:32 +0000
@@ -125,15 +125,17 @@
                 "Failed to get commit details from Git repository: %s" %
                 unicode(e))
 
-    def getMergeDiff(self, path, base, head, logger=None):
+    def getMergeDiff(self, path, base, head, prerequisite=None, logger=None):
         """See `IGitHostingClient`."""
         try:
             if logger is not None:
                 logger.info(
                     "Requesting merge diff for %s from %s to %s" % (
                         path, base, head))
-            return self._get(
-                "/repo/%s/compare-merge/%s:%s" % (path, base, head))
+            url = "/repo/%s/compare-merge/%s:%s" % (path, base, head)
+            if prerequisite is not None:
+                url += "?sha1_prerequisite=%s" % prerequisite
+            return self._get(url)
         except Exception as e:
             raise GitRepositoryScanFault(
                 "Failed to get merge diff from Git repository: %s" %

=== modified file 'lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt'
--- lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2015-06-10 10:25:28 +0000
+++ lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2015-11-11 18:30:32 +0000
@@ -110,7 +110,7 @@
       <td tal:content="structure context/merge_target/fmt:link">lp:~foo/bar/baz</td>
     </tr>
     <tr id="summary-row-a-prerequisite-branch"
-        tal:condition="context/prerequisite_branch">
+        tal:condition="context/merge_prerequisite">
       <th>Prerequisite:</th>
       <td tal:content="structure context/merge_prerequisite/fmt:link">lp:~foo/bar/baz</td>
     </tr>