Merge lp:~cjwatson/launchpad/mp-revision-id-text-line into lp:launchpad

[Colin Watson]

Declare revision IDs as TextLine, not Text.

This should hopefully stop revision IDs being rendered using enormous text boxes in forms, e.g. on BranchMergeProposal:+merged.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/code/interfaces/branchmergeproposal.py'
--- lib/lp/code/interfaces/branchmergeproposal.py	2016-06-25 08:07:19 +0000
+++ lib/lp/code/interfaces/branchmergeproposal.py	2017-07-26 11:45:31 +0000
@@ -277,7 +277,7 @@
                     'target branch.'), readonly=True))
 
     reviewed_revision_id = exported(
-        Text(
+        TextLine(
             title=_(
                 "The revision id that has been approved by the reviewer.")),
         exported_as='reviewed_revid')
@@ -298,7 +298,7 @@
                 "merge from the source branch (Bazaar only).")))
 
     merged_revision_id = exported(
-        Text(
+        TextLine(
             title=_("Merged Revision ID"), required=False, readonly=True,
             description=_(
                 "The revision ID on the target branch which contains the "
@@ -516,7 +516,7 @@
         status=Choice(
             title=_("The new status of the merge proposal."),
             vocabulary=BranchMergeProposalStatus),
-        revision_id=Text(
+        revision_id=TextLine(
             description=_("An optional parameter for specifying the "
                 "revision of the branch for the status change."),
             required=False))