Rev 6476: (jelmer) Update documentation to mention command hooks landed in bzr 2.6 in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6476 [merge]
revision-id: pqm at pqm.ubuntu.com-20120225152853-nz1w2gsfv7lc1yq4
parent: pqm at pqm.ubuntu.com-20120224131939-1xmcon49f1wzfzyz
parent: bsd at acm.org-20120225141319-siks2mh58b91ep5v
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2012-02-25 15:28:53 +0000
message:
  (jelmer) Update documentation to mention command hooks landed in bzr 2.6
   rather than 2.5. (Brian de Alwis)
modified:
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2012-01-23 15:02:51 +0000
+++ b/bzrlib/commands.py	2012-02-25 14:13:19 +0000
@@ -794,10 +794,10 @@
             (1, 17))
         self.add_hook('pre_command',
             "Called prior to executing a command. Called with the command "
-            "object.", (2, 5))
+            "object.", (2, 6))
         self.add_hook('post_command',
             "Called after executing a command. Called with the command "
-            "object.", (2, 5))
+            "object.", (2, 6))
 
 Command.hooks = CommandHooks()
 

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2012-02-24 12:50:51 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2012-02-25 14:13:19 +0000
@@ -162,10 +162,6 @@
 
 * New HPSS call for ``BzrDir.get_branches``. (Jelmer Vernooij, #894460)
 
-* Two new command hooks, ``pre_command`` and ``post_command``,
-  provide notification before and after a command has been run.
-  (Brian de Alwis, Jelmer Vernooij)
-
 Bug Fixes
 *********
 

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-02-20 17:38:11 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-02-25 14:13:19 +0000
@@ -34,6 +34,10 @@
 * Avoid 'Invalid range access' errors when whole files are retrieved with
   transport.http.get() . (Vincent Ladeuil, #924746)
 
+* Two new command hooks, ``pre_command`` and ``post_command``,
+  provide notification before and after a command has been run.
+  (Brian de Alwis, Jelmer Vernooij)
+
 Bug Fixes
 *********