== Demo and Q/A ==
Create a branch merge proposal. It should show a notice saying the diff is
being updated. After a few minutes, the diff should appear and the message
should go away. Now push new changes to the source branch. The message should
reappear.
= Launchpad lint =
There is lint here, but not of it seems very rational.
Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.
lib/lp/code/interfaces/branchmergeproposal.py
27: [F0401] Unable to import 'lazr.lifecycle.event' (No module named lifecycle)
42: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
43: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)
309: [C0322, IBranchMergeProposal.setStatus] Operator not preceded by a space
title=_("The new status of the merge proposal."),
^
vocabulary=BranchMergeProposalStatus),
revision_id=Text(
description=_("An optional parameter for specifying the "
"revision of the branch for the status change."),
required=False))
@export_write_operation()
def setStatus(status, user, revision_id):
459: [C0322, IBranchMergeProposal.createComment] Operator not preceded by a space
parent=Reference(schema=Interface))
^
@call_with(owner=REQUEST_USER)
@export_factory_operation(Interface, [])
def createComment(owner, subject, content=None, vote=None,
review_type=None, parent=None):
490: [C0322, IBranchMergeProposal.updatePreviewDiff] Operator not preceded by a space
target_revision_id=TextLine(), prerequisite_revision_id=TextLine(),
^
conflicts=Text())
@export_write_operation()
def updatePreviewDiff(diff_content, source_revision_id,
target_revision_id, prerequisite_revision_id=None,
conflicts=None):
lib/lp/code/model/branchmergeproposaljob.py
20: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
21: [F0401] Unable to import 'lazr.enum' (No module named enum)
= Summary =
Fix bug #336936 "Show something on the merge proposal page while diff is being
generated".
== Proposed fix ==
Add a notice similar to the one about branch scanning
== Pre-implementation notes ==
None.
== Implementation details ==
== Tests == eproposals -t xx-branch- merge-proposals
bin/test -t test_branchmerg
== Demo and Q/A ==
Create a branch merge proposal. It should show a notice saying the diff is
being updated. After a few minutes, the diff should appear and the message
should go away. Now push new changes to the source branch. The message should
reappear.
= Launchpad lint =
There is lint here, but not of it seems very rational.
Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.
Linting changed files: /launchpad/ icing/style. css code/configure. zcml code/browser/ branchmergeprop osal.py code/interfaces /branchmergepro posal.py code/model/ branchmergeprop osal.py code/model/ branchmergeprop osaljob. py code/model/ tests/test_ branchmergeprop osals.py code/stories/ branches/ xx-branch- merge-proposals .txt code/templates/ branchmergeprop osal-index. pt
lib/canonical
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
lib/lp/
== Pylint notices ==
lib/lp/ code/interfaces /branchmergepro posal.py .event' (No module named lifecycle) fields' (No module named restful) declarations' (No module named restful) posal.setStatus ] Operator not preceded by a space BranchMergeProp osalStatus) , id=Text( =_("An optional parameter for specifying the " False)) write_operation () posal.createCom ment] Operator not preceded by a space Reference( schema= Interface) ) with(owner= REQUEST_ USER)
27: [F0401] Unable to import 'lazr.lifecycle
42: [F0401] Unable to import 'lazr.restful.
43: [F0401] Unable to import 'lazr.restful.
309: [C0322, IBranchMergePro
title=_("The new status of the merge proposal."),
^
vocabulary=
revision_
description
"revision of the branch for the status change."),
required=
@export_
def setStatus(status, user, revision_id):
459: [C0322, IBranchMergePro
parent=
^
@call_
@export_ factory_ operation( Interface, []) owner, subject, content=None, vote=None, type=None, parent=None): posal.updatePre viewDiff] Operator not preceded by a space revision_ id=TextLine( ), prerequisite_ revision_ id=TextLine( ), Text()) write_operation () ff(diff_ content, source_revision_id, revision_ id, prerequisite_ revision_ id=None, None):
def createComment(
review_
490: [C0322, IBranchMergePro
target_
^
conflicts=
@export_
def updatePreviewDi
target_
conflicts=
lib/lp/ code/model/ branchmergeprop osaljob. py
20: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
21: [F0401] Unable to import 'lazr.enum' (No module named enum)