Merge lp:~abentley/launchpad/version-revno into lp:launchpad

[Aaron Bentley]

Better default recipe.

= Summary =
Provide a default recipe whose debian version is different for different
builds.

== Proposed fix ==
Use 0+{revno} as the default debian version template. This will cause the
debversion to change every time the base branch is updated. Using 0 as the
version number guarantees it won't interfere with legitimate packages.

Users can (and will be encouraged to) supply their own version instead.

== Pre-implementation notes ==
Discussed possible template strings with james westby

== Implementation details ==
The tests have lots of slashes because they're using regular expresions, and
+, { and } are special characters in regular expressions.

== Tests ==
bin/test sourcepackagerecipe

== Demo and Q/A ==
Create a new recipe. Its version string should be 0+{revno}.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/code/browser/tests/test_sourcepackagerecipe.py
  lib/lp/code/interfaces/sourcepackagerecipe.py

== Pyflakes notices ==

lib/lp/code/browser/tests/test_sourcepackagerecipe.py
    258: local variable 'recipe_fings' is assigned to but never used

== Pylint notices ==

lib/lp/code/interfaces/sourcepackagerecipe.py
    164: [C0322, ISourcePackageRecipe.requestBuild] Operator not preceded by a space
    distroseries=Reference(schema=IDistroSeries),
    ^
    )
    @export_write_operation()
    def requestBuild(archive, distroseries, requester, pocket):

[Paul Hummer (rockstar)]

<rockstar> abentley, is {revno} special to bzr-builder?
<abentley> rockstar, yes.
<rockstar> abentley, ah great, so we don't need the MANIFEST at all.
<abentley> rockstar, huh?
<rockstar> abentley, we were talking about doing this ourselves, but we needed access to the MANIFEST to get to the bzr revno.
<abentley> rockstar, we'll still need manifests to abort duplicate builds, because {revno} is only evaluated once the build has started.
<rockstar> abentley, ah, okay.

review: Approve (code)

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-06-17 01:56:33 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-06-17 13:19:26 +0000
@@ -110,12 +110,12 @@
             Recipe information
             Owner: Master Chef
             Base branch: lp://dev/~chef/ratatouille/veggies
-            Debian version: 1.0
+            Debian version: 0\+\{revno\}
             Distribution series: Secret Squirrel
             .*
 
             Recipe contents
-            # bzr-builder format 0.2 deb-version 1.0
+            # bzr-builder format 0.2 deb-version 0\+\{revno\}
             lp://dev/~chef/ratatouille/veggies"""
         main_text = extract_text(find_main_content(browser.contents))
         self.assertTextMatchesExpressionIgnoreWhitespace(
@@ -276,12 +276,12 @@
             Recipe information
             Owner: Master Chef
             Base branch: lp://dev/~chef/ratatouille/meat
-            Debian version: 1.0
+            Debian version: 0\+\{revno\}
             Distribution series: Mumbly Midget
             .*
 
             Recipe contents
-            # bzr-builder format 0.2 deb-version 1.0
+            # bzr-builder format 0.2 deb-version 0\+\{revno\}
             lp://dev/~chef/ratatouille/meat"""
         main_text = extract_text(find_main_content(browser.contents))
         self.assertTextMatchesExpressionIgnoreWhitespace(
@@ -383,12 +383,12 @@
             Recipe information
             Owner: Master Chef
             Base branch: lp://dev/~chef/ratatouille/meat
-            Debian version: 1.0
+            Debian version: 0\+\{revno\}
             Distribution series: Mumbly Midget
             .*
 
             Recipe contents
-            # bzr-builder format 0.2 deb-version 1.0
+            # bzr-builder format 0.2 deb-version 0\+\{revno\}
             lp://dev/~chef/ratatouille/meat"""
         main_text = extract_text(find_main_content(browser.contents))
         self.assertTextMatchesExpressionIgnoreWhitespace(
@@ -415,7 +415,7 @@
             Recipe information
             Owner: Master Chef
             Base branch: lp://dev/~chef/chocolate/cake
-            Debian version: 1.0
+            Debian version: 0\+\{revno\}
             Distribution series: Secret Squirrel
 
             Build records
@@ -424,7 +424,7 @@
             Request build\(s\)
 
             Recipe contents
-            # bzr-builder format 0.2 deb-version 1.0
+            # bzr-builder format 0.2 deb-version 0\+\{revno\}
             lp://dev/~chef/chocolate/cake""", self.getMainText(recipe))
 
     def test_index_no_builds(self):

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2010-06-11 05:05:52 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2010-06-17 13:19:26 +0000
@@ -40,7 +40,7 @@
 
 
 MINIMAL_RECIPE_TEXT = dedent(u'''\
-    # bzr-builder format 0.2 deb-version 1.0
+    # bzr-builder format 0.2 deb-version 0+{revno}
     %s
     ''')
 

=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
--- lib/lp/code/model/tests/test_recipebuilder.py	2010-05-27 17:55:16 +0000
+++ lib/lp/code/model/tests/test_recipebuilder.py	2010-06-17 13:19:26 +0000
@@ -145,7 +145,7 @@
            'author_name': u'Joe User',
            'archive_purpose': 'PPA',
            'ogrecomponent': 'universe',
-           'recipe_text': '# bzr-builder format 0.2 deb-version 1.0\n'
+           'recipe_text': '# bzr-builder format 0.2 deb-version 0+{revno}\n'
                           'lp://dev/~joe/someapp/pkg\n',
            'archives': expected_archives,
            'distroseries_name': job.build.distroseries.name,
@@ -174,7 +174,7 @@
            'author_name': u'Joe User',
            'archive_purpose': 'PPA',
            'ogrecomponent': 'universe',
-           'recipe_text': '# bzr-builder format 0.2 deb-version 1.0\n'
+           'recipe_text': '# bzr-builder format 0.2 deb-version 0+{revno}\n'
                           'lp://dev/~joe/someapp/pkg\n',
            'archives': expected_archives,
            'distroseries_name': job.build.distroseries.name,