/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_annotate.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:36:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511083616-b8fjb19zomwupid0
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
278
278
        os.chdir('branch')
279
279
        out, err = self.run_bzr('annotate empty')
280
280
        self.assertEqual('', out)
281
 
 
282
 
    def test_annotate_directory(self):
283
 
        """Test --directory option"""
284
 
        wt = self.make_branch_and_tree('a')
285
 
        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
286
 
        wt.add(['hello.txt'])
287
 
        wt.commit('commit', committer='test@user')
288
 
        out, err = self.run_bzr('annotate -d a hello.txt')
289
 
        self.assertEqualDiff('1   test@us | my helicopter\n', out)