Merge ~canonical-launchpad-branches/launchpad/+git/launchpad-old:git-fixes into ~canonical-launchpad-branches/launchpad/+git/launchpad-old:master

[William Grant]

Fix everything.

Unmerged commits

cb1a8ce... by William Grant on 2015-05-01

Fix Git JSON previewdiff rendering.

f845dc9... by William Grant on 2015-04-30

Fix non-ASCII git diffs.

65f027f... by William Grant on 2015-04-30

Fix codereviewcomment rendering OOPS for git MPs.

diff --git a/lib/lp/code/interfaces/branch.py b/lib/lp/code/interfaces/branch.py
index 0dce432..e96bb82 100644
--- a/lib/lp/code/interfaces/branch.py
+++ b/lib/lp/code/interfaces/branch.py
@@ -358,11 +358,12 @@ class IBranchView(IHasOwner, IHasBranchTarget, IHasMergeProposals,
              description=_("Unique name of the branch, including the "
                            "owner and project names.")))
 
-    displayname = exported(
+    display_name = exported(
         Text(title=_('Display name'), readonly=True,
              description=_(
-                "The branch unique_name.")),
-        exported_as='display_name')
+                "The branch unique_name.")))
+
+    displayname = Attribute("Display name (deprecated)")
 
     code_reviewer = Attribute(
         "The reviewer if set, otherwise the owner of the branch.")
diff --git a/lib/lp/code/model/branch.py b/lib/lp/code/model/branch.py
index db2a16e..3528b9e 100644
--- a/lib/lp/code/model/branch.py
+++ b/lib/lp/code/model/branch.py
@@ -675,10 +675,12 @@ class Branch(SQLBase, BzrIdentityMixin):
         return safe_open('lp-internal', self.getInternalBzrUrl())
 
     @property
-    def displayname(self):
+    def display_name(self):
         """See `IBranch`."""
         return self.bzr_identity
 
+    displayname = display_name
+
     @property
     def code_reviewer(self):
         """See `IBranch`."""
diff --git a/lib/lp/code/model/codereviewcomment.py b/lib/lp/code/model/codereviewcomment.py
index 04177c0..623cbb3 100644
--- a/lib/lp/code/model/codereviewcomment.py
+++ b/lib/lp/code/model/codereviewcomment.py
@@ -95,8 +95,8 @@ class CodeReviewComment(SQLBase):
     @property
     def title(self):
         return ('Comment on proposed merge of %(source)s into %(target)s' %
-            {'source': self.branch_merge_proposal.source_branch.displayname,
-             'target': self.branch_merge_proposal.target_branch.displayname,
+            {'source': self.branch_merge_proposal.merge_source.display_name,
+             'target': self.branch_merge_proposal.merge_source.display_name,
             })
 
     @property
diff --git a/lib/lp/code/model/diff.py b/lib/lp/code/model/diff.py
index e809ee2..9b72dfc 100644
--- a/lib/lp/code/model/diff.py
+++ b/lib/lp/code/model/diff.py
@@ -12,6 +12,7 @@ __all__ = [
 
 from contextlib import nested
 from cStringIO import StringIO
+from operator import attrgetter
 import sys
 from uuid import uuid1
 
@@ -471,8 +472,9 @@ class PreviewDiff(Storm):
             conflicts = u"".join(
                 u"Conflict in %s\n" % path for path in response['conflicts'])
             preview = cls.create(
-                bmp, response['patch'], source_revision_id, target_revision_id,
-                prerequisite_revision_id, conflicts, strip_prefix_segments=1)
+                bmp, response['patch'].encode('utf-8'), source_revision_id,
+                target_revision_id, prerequisite_revision_id, conflicts,
+                strip_prefix_segments=1)
         del get_property_cache(bmp).preview_diffs
         del get_property_cache(bmp).preview_diff
         return preview
@@ -513,18 +515,14 @@ class PreviewDiff(Storm):
         # A preview diff is stale if the revision ids used to make the diff
         # are different from the tips of the source or target branches.
         bmp = self.branch_merge_proposal
-        if (self.source_revision_id != bmp.source_branch.last_scanned_id or
-            self.target_revision_id != bmp.target_branch.last_scanned_id):
-            # This is the simple frequent case.
+        get_id = attrgetter(
+            'last_scanned_id' if bmp.source_branch else 'commit_sha1')
+        if (self.source_revision_id != get_id(bmp.merge_source) or
+            self.target_revision_id != get_id(bmp.merge_target)):
             return True
-
-        # More complex involves the prerequisite branch too.
-        if (bmp.prerequisite_branch is not None and
-            (self.prerequisite_revision_id !=
-             bmp.prerequisite_branch.last_scanned_id)):
-            return True
-        else:
-            return False
+        return (
+            bmp.merge_prerequisite is not None and
+            self.prerequisite_revision_id != get_id(bmp.merge_prerequisite))
 
     def getFileByName(self, filename):
         """See `IPreviewDiff`."""