← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~blr/launchpad/inferred-vcs-revert-export into lp:launchpad

 

Bayard 'kit' Randel has proposed merging lp:~blr/launchpad/inferred-vcs-revert-export into lp:launchpad.

Commit message:
Revert Product.inferred_vcs export.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~blr/launchpad/inferred-vcs-revert-export/+merge/263312

Revert Product.inferred_vcs export as it has little utility in the API and some unfortunate performance implications (JSON cache).
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~blr/launchpad/inferred-vcs-revert-export into lp:launchpad.
=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposallisting.py'
--- lib/lp/code/browser/tests/test_branchmergeproposallisting.py	2015-06-25 07:39:40 +0000
+++ lib/lp/code/browser/tests/test_branchmergeproposallisting.py	2015-06-30 03:46:40 +0000
@@ -265,7 +265,7 @@
         with StormStatementRecorder() as recorder:
             self.getViewBrowser(
                 product, '+merges', rootsite='code', user=product.owner)
-        self.assertThat(recorder, HasQueryCount(Equals(42)))
+        self.assertThat(recorder, HasQueryCount(Equals(41)))
 
     def test_query_count_git(self):
         product = self.factory.makeProduct()
@@ -280,7 +280,7 @@
         with StormStatementRecorder() as recorder:
             self.getViewBrowser(
                 product, '+merges', rootsite='code', user=product.owner)
-        self.assertThat(recorder, HasQueryCount(Equals(40)))
+        self.assertThat(recorder, HasQueryCount(Equals(38)))
 
     def test_productseries_bzr(self):
         target = self.factory.makeBranch()

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2015-06-24 21:14:20 +0000
+++ lib/lp/registry/interfaces/product.py	2015-06-30 03:46:40 +0000
@@ -761,13 +761,12 @@
             description=_(
                 "Version control system for this project's code.")))
 
-    inferred_vcs = exported(
-        Choice(
-            title=_("Inferred VCS"),
-            readonly=True,
-            vocabulary=VCSType,
-            description=_(
-                "Inferred version control system for this project's code.")))
+    inferred_vcs = Choice(
+        title=_("Inferred VCS"),
+        readonly=True,
+        vocabulary=VCSType,
+        description=_(
+            "Inferred version control system for this project's code."))
 
     def getAllowedBugInformationTypes():
         """Get the information types that a bug in this project can have.

=== modified file 'lib/lp/registry/stories/webservice/xx-project-registry.txt'
--- lib/lp/registry/stories/webservice/xx-project-registry.txt	2015-06-25 07:39:40 +0000
+++ lib/lp/registry/stories/webservice/xx-project-registry.txt	2015-06-30 03:46:40 +0000
@@ -168,7 +168,6 @@
     freshmeat_project: None
     homepage_url: None
     icon_link: u'http://.../firefox/icon'
-    inferred_vcs: u'Bazaar'
     information_type: u'Public'
     is_permitted: True
     license_approved: False


Follow ups