[MERGE] Bug #122656: better error message for bzr ann 'doesn't exist'

[James Westby]

# Bazaar merge directive format 1
# revision_id: jw+debian at jameswestby.net-20070628191100-\
#   7jkrxku0fv7n7ju1
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: 5b4a3734e8127b21f95f6a5e876fa41c676edb75
# timestamp: 2007-06-28 20:12:49 +0100
# message: [MERGE] Bug #122656: better error message for bzr ann\
#    'doesn't exist'
# 
# Bazaar revision bundle v0.9
#
# message:
#   Display a useful error message when annotating a non-existant file (#122656)
#   
#   
# committer: James Westby <jw+debian at jameswestby.net>
# date: Thu 2007-06-28 20:11:00.780999899 +0100

=== modified file NEWS
--- NEWS
+++ NEWS
@@ -5,6 +5,10 @@
     * Do not suppress pipe errors, etc. in non-display commands
       (Alexander Belchenko, #87178)
 
+    * Display a useful error message when the user requests to annotate
+      a file that is not present in the specified revision.
+      (James Westby, #122656)
+
   IMPROVEMENTS:
 
     * The --lsprof-file option now dumps a text rendering of the profiling

=== modified file bzrlib/builtins.py
--- bzrlib/builtins.py
+++ bzrlib/builtins.py
@@ -3142,6 +3142,10 @@
             else:
                 revision_id = revision[0].in_history(branch).rev_id
             file_id = tree.path2id(relpath)
+            if file_id is None:
+              raise errors.BzrCommandError("The file '%s' is not present "
+                                           "in the "
+                                           "specified revision" % relpath)
             tree = branch.repository.revision_tree(revision_id)
             file_version = tree.inventory[file_id].revision
             annotate_file(branch, file_version, file_id, long, all, sys.stdout,

=== modified file bzrlib/tests/blackbox/test_annotate.py
--- bzrlib/tests/blackbox/test_annotate.py
+++ bzrlib/tests/blackbox/test_annotate.py
@@ -156,3 +156,16 @@
         os.chdir('tree')
         out, err = self.run_bzr('annotate', 'empty')
         self.assertEqual('', out)
+
+    def test_annotate_nonexistant_file(self):
+        tree = self.make_branch_and_tree('tree')
+        self.build_tree(['tree/file'])
+        tree.add(['file'])
+        tree.commit('add a file')
+
+        os.chdir('tree')
+        out, err = self.run_bzr("annotate doesnotexist", retcode=3)
+        self.assertEqual('', out)
+        self.assertEqual("bzr: ERROR: The file 'doesnotexist' is not "
+                         "present in the specified revision\n", err)
+

=== modified directory  // last-changed:jw+debian at jameswestby.net-2007062819110
... 0-7jkrxku0fv7n7ju1
# revision id: jw+debian at jameswestby.net-20070628191100-7jkrxku0fv7n7ju1
# sha1: 5b4a3734e8127b21f95f6a5e876fa41c676edb75
# inventory sha1: 5e6c9979b793e54319b1c3d42fb7c39757bf00e8
# parent ids:
#   pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
# base id: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
# properties:
#   branch-nick: bzr.dev