← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Whitebox tests for annotate functionality."""
18
18
 
306
306
                                 ''.join('\t'.join(l) for l in actual))
307
307
 
308
308
    def test_annotate_duplicate_lines(self):
309
 
        # XXX: Should this be a per_repository test?
 
309
        # XXX: Should this be a repository_implementations test?
310
310
        tree1 = self.create_duplicate_lines_tree()
311
311
        repo = tree1.branch.repository
312
312
        repo.lock_read()
475
475
        tree1.add(['b'], ['b-id'])
476
476
        tree1.commit('b', rev_id='rev-2',
477
477
                     committer='Committer <committer@example.com>',
478
 
                     authors=['Author <author@example.com>'],
 
478
                     author='Author <author@example.com>',
479
479
                     timestamp=1166046000.00, timezone=0)
480
480
 
481
481
        tree1.lock_read()
502
502
    def test_reannotate(self):
503
503
        self.annotateEqual(parent_1, [parent_1], new_1, 'blahblah')
504
504
        self.annotateEqual(expected_2_1, [parent_2], new_1, 'blahblah')
505
 
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2,
 
505
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2, 
506
506
                           'blahblah')
507
507
 
508
508
    def test_reannotate_no_parents(self):