Rev 6527: (jelmer) Remove deprecated annotate_file function. (Jelmer Vernooij) 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: 6527 [merge]
revision-id: pqm at pqm.ubuntu.com-20120626130108-ii918gx210vciviu
parent: pqm at pqm.ubuntu.com-20120620154857-e8a2fxwsgdxm87y1
parent: jelmer at samba.org-20120626121456-maeix7f8kllyqa7a
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2012-06-26 13:01:08 +0000
message:
  (jelmer) Remove deprecated annotate_file function. (Jelmer Vernooij)
modified:
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
  bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/annotate.py'
--- a/bzrlib/annotate.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/annotate.py	2012-06-26 12:14:56 +0000
@@ -47,32 +47,6 @@
     CURRENT_REVISION,
     Revision,
     )
-from bzrlib.symbol_versioning import (
-    deprecated_function,
-    deprecated_in,
-    )
-
-
- at deprecated_function(deprecated_in((2, 4, 0)))
-def annotate_file(branch, rev_id, file_id, verbose=False, full=False,
-                  to_file=None, show_ids=False):
-    """Annotate file_id at revision rev_id in branch.
-
-    The branch should already be read_locked() when annotate_file is called.
-
-    :param branch: The branch to look for revision numbers and history from.
-    :param rev_id: The revision id to annotate.
-    :param file_id: The file_id to annotate.
-    :param verbose: Show all details rather than truncating to ensure
-        reasonable text width.
-    :param full: XXXX Not sure what this does.
-    :param to_file: The file to output the annotation to; if None stdout is
-        used.
-    :param show_ids: Show revision ids in the annotation output.
-    """
-    tree = branch.repository.revision_tree(rev_id)
-    annotate_file_tree(tree, file_id, to_file, verbose=verbose,
-        full=full, show_ids=show_ids, branch=branch)
 
 
 def annotate_file_tree(tree, file_id, to_file, verbose=False, full=False,

=== modified file 'bzrlib/tests/test_annotate.py'
--- a/bzrlib/tests/test_annotate.py	2011-05-03 13:53:46 +0000
+++ b/bzrlib/tests/test_annotate.py	2012-06-26 12:14:56 +0000
@@ -302,19 +302,6 @@
                                   '1.1.1 barry at f | third\n',
                                   builder.get_branch(), 'a-id', 'rev-3')
 
-    def test_annotate_file(self):
-        builder = self.create_merged_trees()
-
-        to_file = StringIO()
-        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
-            annotate.annotate_file, builder.get_branch(),
-                'rev-3', 'a-id', to_file=to_file)
-
-        self.assertAnnotateEqualDiff('1     joe at foo | first\n'
-                                     '2     joe at foo | second\n'
-                                     '1.1.1 barry at f | third\n',
-                                     to_file.getvalue())
-
     def test_annotate_limits_dotted_revnos(self):
         """Annotate should limit dotted revnos to a depth of 12"""
         builder = self.create_deeply_merged_trees()

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-04-17 12:18:27 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-06-26 12:14:56 +0000
@@ -58,6 +58,9 @@
 .. Changes that may require updates in plugins or other code that uses
    bzrlib.
 
+* The previously deprecated ``bzrlib.annotate.annotate_file`` function
+  has been removed. (Jelmer Vernooij)
+
 Internals
 *********