Merge lp:~salgado/launchpad-work-items-tracker/linaro-use-lp-workitems-property into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Guilherme Salgado]

Change lp_import_blueprint_workitems to get work items from the workitems_text
API property instead of the whiteboard.

Soon we'll be migrating all work items in LP from the whiteboard to a new
field. This will allow us to implement things like
https://dev.launchpad.net/Projects/WorkItems in Launchpad.

Because of that, lp-wi-tracker will have to extract work items from the new
property (workitems_text), which uses the existing format for work items.

[Mattias Backman (mabac)]

> Because of that, lp-wi-tracker will have to extract work items from the new
> property (workitems_text), which uses the existing format for work items.

It just struck me that we don't use exactly the same format. I thought it would be redundant to have the leading "Work items:" line in the Work Items text area, so I omitted that. Perhaps we should tweak workitems_text to include that line for work item blocks that are not milestoned.

If we don't do that we need to do

    if bp.workitems_text:
        in_workitems_block = True
        for l in bp.workitems_text.splitlines():
            if not in_workitems_block:

so we assume we're in a workitems_block from the beginning of the workitems_text field. If there are no non-milestoned work items, the field would of course start with a "Work items for 2012.x:" line but then the entire bp should be retargetted.

review: Needs Fixing

[lp:~salgado/launchpad-work-items-tracker/linaro-use-lp-workitems-property]

334. By Guilherme Salgado on 2012-03-09

Pull work items from both the whiteboard and the new .workitems_text property

[Mattias Backman (mabac)]

Looks good to me.

review: Approve

[Mattias Backman (mabac)]

I see that it has been running on staging for a while too, so there should be no problems.

=== modified file 'collect'
--- collect	2012-02-01 18:15:21 +0000
+++ collect	2012-03-09 16:53:19 +0000
@@ -209,11 +209,16 @@
         model_bp, model_bp.milestone_name, collector.lp, people_cache=people_cache,
         error_collector=error_collector)
 
-    if bp.whiteboard:
-        for l in bp.whiteboard.splitlines():
-
-            if (not in_workitems_block
-                and not in_meta_block and not in_complexity_block):
+    # Get work items from both the whiteboard and the new workitems_text
+    # property. Once the migration is completed and nobody's using the
+    # whiteboard for work items we can change this to pull work items only
+    # from bp.workitems_text.
+    workitems_text = bp.whiteboard
+    if getattr(bp, 'workitems_text', '') != '':
+        workitems_text += "\n" + bp.workitems_text
+    if workitems_text:
+        for l in workitems_text.splitlines():
+            if not in_workitems_block:
                 m = work_items_re.search(l)
                 if m:
                     in_workitems_block = True
@@ -221,10 +226,6 @@
                     milestone = milestone_extract(m.group(1), valid_milestones)
                     dbg('  ... setting milestone to ' + str(milestone))
                     parser.milestone_name = milestone or parser.blueprint.milestone_name
-                if meta_re.search(l):
-                    in_meta_block = True
-                if complexity_re.search(l):
-                    in_complexity_block = True
                 continue
 
             if in_workitems_block:
@@ -237,6 +238,15 @@
                 if workitem is not None:
                     work_items.append(workitem)
 
+    if bp.whiteboard:
+        for l in bp.whiteboard.splitlines():
+            if not in_meta_block and not in_complexity_block:
+                if meta_re.search(l):
+                    in_meta_block = True
+                if complexity_re.search(l):
+                    in_complexity_block = True
+                continue
+
             if in_meta_block:
                 dbg("\tmeta line (raw): '%s'" % (l.strip()))
                 if not l.strip():