Merge lp:~ian-clatworthy/bzr/422415 into lp:bzr/2.0

[Ian Clatworthy]

[Ian Clatworthy (ian-clatworthy)]

2-minute fix to clean up 'bzr help hooks' a little.

[Vincent Ladeuil (vila)]

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-08-31 00:25:33 +0000
+++ NEWS	2009-09-01 12:35:11 +0000
@@ -24,6 +24,9 @@
   that has a ghost in the mainline ancestry.
   (John Arbash Meinel, #419241)
 
+* Help on hooks no longer says 'Not deprecated' for hooks that are
+  currently supported. (Ian Clatworthy, #422415)
+
 Documentation
 *************
 

=== modified file 'bzrlib/hooks.py'
--- bzrlib/hooks.py	2009-06-10 03:31:01 +0000
+++ bzrlib/hooks.py	2009-09-01 12:35:11 +0000
@@ -219,9 +219,7 @@
         strings.append('Introduced in: %s' % introduced_string)
         if self.deprecated:
             deprecated_string = _format_version_tuple(self.deprecated)
-        else:
-            deprecated_string = 'Not deprecated'
-        strings.append('Deprecated in: %s' % deprecated_string)
+            strings.append('Deprecated in: %s' % deprecated_string)
         strings.append('')
         strings.extend(textwrap.wrap(self.__doc__,
             break_long_words=False))

=== modified file 'bzrlib/tests/test_hooks.py'
--- bzrlib/tests/test_hooks.py	2009-04-06 22:31:35 +0000
+++ bzrlib/tests/test_hooks.py	2009-09-01 12:35:11 +0000
@@ -80,7 +80,6 @@
             "~~~~~~~~~~~~~~~\n"
             "\n"
             "Introduced in: 1.4\n"
-            "Deprecated in: Not deprecated\n"
             "\n"
             "Invoked after the tip of a branch changes. Called with a\n"
             "ChangeBranchTipParams object.\n"
@@ -89,7 +88,6 @@
             "~~~~~~~~~~~~~~\n"
             "\n"
             "Introduced in: 1.6\n"
-            "Deprecated in: Not deprecated\n"
             "\n"
             "Invoked before the tip of a branch changes. Called with a\n"
             "ChangeBranchTipParams object. Hooks should raise TipChangeRejected to\n"
@@ -133,7 +131,6 @@
             "~~~~~~~~~~~~~~~\n"
             "\n"
             "Introduced in: 0.15\n"
-            "Deprecated in: Not deprecated\n"
             "\n"
             "Invoked after changing the tip of a branch object. Called with a\n"
             "bzrlib.branch.PostChangeBranchTipParams object\n", hook.docs())