Merge lp:~leonardr/launchpad/get-field-uri into lp:launchpad

[Leonard Richardson]

[Leonard Richardson (leonardr)]

This branch adds a new Javascript utility function, get_field_uri(). This function lets you get the URI to a field resource, given an entry resource and a field name.

In addition to unit tests of the new function, this branch adds two tests that make sure patch() works on a field resource.

This branch also gets rid of the client_parse_xml_entry method, which is not used within Launchpad and which was a bad idea in the first place.

You'll get one Javascript failure when running the Windmill tests, but that's a failure currently in trunk; it's not introduced by this branch.

[Paul Hummer (rockstar)]

review: Approve

[lp:~leonardr/launchpad/get-field-uri]

9493. By Leonard Richardson on 2009-09-28

Merge from trunk.

=== modified file 'lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt'
--- lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt	2009-09-28 12:59:33 +0000
+++ lib/canonical/launchpad/pagetests/packaging/xx-sourcepackage-packaging.txt	2009-09-28 17:34:42 +0000
@@ -6,6 +6,7 @@
   >>> user_browser.open(
   ...     "http://launchpad.dev/ubuntu/warty/+source/mozilla/+packaging")
 
+<<<<<<< TREE
   >>> print_location(user_browser.contents)
   Hierarchy: Ubuntu > 4.10 > ...mozilla... source package > Upstream links
   Tabs:
@@ -17,6 +18,19 @@
   * Answers - http://answers.launchpad.dev/ubuntu/warty/+source/mozilla
   Main heading: Upstream links for ...mozilla... source package in Warty
 
+=======
+  >>> print_location(user_browser.contents)
+  Hierarchy: Ubuntu > 4.10 > ...mozilla... source package > Upstream links
+  Tabs:
+  * Overview (selected) - http://launchpad.dev/ubuntu/warty/+source/mozilla
+  * Branches - http://code.launchpad.dev/ubuntu/warty/+source/mozilla
+  * Bugs - http://bugs.launchpad.dev/ubuntu/warty/+source/mozilla
+  * Blueprints - not linked
+  * Translations - http://translations.launchpad.dev/ubuntu/warty/+source/mozilla
+  * Answers - http://answers.launchpad.dev/ubuntu/warty/+source/mozilla
+  Main heading: Upstream links for mozilla in Ubuntu Warty
+
+>>>>>>> MERGE-SOURCE
   >>> print extract_text(
   ...     find_tags_by_class(user_browser.contents, 'informational')[0])
   Launchpad doesn&#8217;t know which project and series this package
 
=== modified file 'lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt'
=== modified file 'lib/lp/soyuz/stories/packaging/package-pages-navigation.txt'
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt'
--- lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt	2009-09-28 12:59:33 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt	2009-09-28 17:34:42 +0000
@@ -4,6 +4,7 @@
 
   >>> user_browser.open(
   ...     "http://launchpad.dev/ubuntu/hoary/+source/pmount/+changelog")
+<<<<<<< TREE
   >>> print_location(user_browser.contents)
   Hierarchy: Ubuntu > 5.04 > ...pmount... source package > Change log
   Tabs:
@@ -18,6 +19,22 @@
 
   >>> print extract_text(
   ...     find_tag_by_id(user_browser.contents, 'changelogs'))
+=======
+  >>> print_location(user_browser.contents)
+  Hierarchy: Ubuntu > 5.04 > ...pmount... source package > Change log
+  Tabs:
+  * Overview (selected) - http://launchpad.dev/ubuntu/hoary/+source/pmount
+  * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/pmount
+  * Bugs - http://bugs.launchpad.dev/ubuntu/hoary/+source/pmount
+  * Blueprints - not linked
+  * Translations - http://translations.launchpad.dev/ubuntu/hoary/+source/pmount
+  * Answers - http://answers.launchpad.dev/ubuntu/hoary/+source/pmount
+  Main heading: Change logs for pmount in Ubuntu Hoary
+
+
+  >>> print extract_text(
+  ...     find_tag_by_id(user_browser.contents, 'changelogs'))
+>>>>>>> MERGE-SOURCE
   This is a placeholder changelog for pmount 0.1-2
   pmount (0.1-1) hoary; urgency=low
   * Fix description (Malone #1)
 
=== modified file 'lib/lp/translations/browser/configure.zcml'
=== modified file 'lib/lp/translations/model/translationimportqueue.py'