Rev 4483: (igc) projects instead of products in lp plugin (Neil in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4483 [merge]
revision-id: pqm at pqm.ubuntu.com-20090626054258-g2uqv0u7c1nwfhe9
parent: pqm at pqm.ubuntu.com-20090626044519-uc47aufeyqmml40o
parent: ian.clatworthy at canonical.com-20090626042030-z5jxeqq3z6ytardt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-26 06:42:58 +0100
message:
  (igc) projects instead of products in lp plugin (Neil
  	Martinsen-Burrell)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
=== modified file 'NEWS'
--- a/NEWS	2009-06-26 01:35:26 +0000
+++ b/NEWS	2009-06-26 05:42:58 +0000
@@ -9,6 +9,15 @@
 In Development
 ##############
 
+Compatibility Breaks
+********************
+
+* ``bzr register-branch`` from the Launchpad plugin now refers to "project"
+  instead of "product" which is the correct Launchpad terminology.  The
+  --product option is deprecated and users should switch to using --project.
+  (Neil Martinsen-Burrell, #238764)
+
+
 New Features
 ************
 

=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- a/bzrlib/plugins/launchpad/__init__.py	2009-04-10 18:56:00 +0000
+++ b/bzrlib/plugins/launchpad/__init__.py	2009-06-19 15:10:17 +0000
@@ -56,7 +56,7 @@
     launchpad.net.  Registration allows the branch to be associated with
     bugs or specifications.
 
-    Before using this command you must register the product to which the
+    Before using this command you must register the project to which the
     branch belongs, and create an account for yourself on launchpad.net.
 
     arguments:
@@ -69,14 +69,18 @@
                     otherwise error.
 
     example:
-        bzr register-branch http://foo.com/bzr/fooproduct.mine \\
-                --product fooproduct
+        bzr register-branch http://foo.com/bzr/fooproject.mine \\
+                --project fooproject
     """
     takes_args = ['public_url?']
     takes_options = [
+         Option('project',
+                'Launchpad project short name to associate with the branch.',
+                unicode),
          Option('product',
-                'Launchpad product short name to associate with the branch.',
-                unicode),
+                'Launchpad product short name to associate with the branch.', 
+                unicode,
+                hidden=True),
          Option('branch-name',
                 'Short name for the branch; '
                 'by default taken from the last component of the url.',
@@ -100,7 +104,8 @@
 
     def run(self,
             public_url=None,
-            product='',
+            project='',
+            product=None,
             branch_name='',
             branch_title='',
             branch_description='',
@@ -119,12 +124,16 @@
             public_url = b.get_public_branch()
             if public_url is None:
                 raise NoPublicBranch(b)
+        if product is not None:
+            project = product
+            trace.note('--product is deprecated; please use --project.')
+
 
         rego = BranchRegistrationRequest(branch_url=public_url,
                                          branch_name=branch_name,
                                          branch_title=branch_title,
                                          branch_description=branch_description,
-                                         product_name=product,
+                                         product_name=project,
                                          author_email=author,
                                          )
         linko = BranchBugLinkRequest(branch_url=public_url,

=== modified file 'bzrlib/plugins/launchpad/lp_registration.py'
--- a/bzrlib/plugins/launchpad/lp_registration.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/plugins/launchpad/lp_registration.py	2009-06-08 02:54:44 +0000
@@ -314,7 +314,7 @@
     def __init__(self, path):
         if not path:
             raise errors.InvalidURL(path=path,
-                                    extra="You must specify a product.")
+                                    extra="You must specify a project.")
         self.path = path
 
     def _request_params(self):