/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_log.py

  • Committer: Vincent Ladeuil
  • Date: 2008-11-21 16:43:53 UTC
  • mto: (3855.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3856.
  • Revision ID: v.ladeuil+lp@free.fr-20081121164353-8d07go33ycibzbwl
Better fix for bug #300055.

* bzrlib/tests/test_log.py:
(TestGetViewRevisions.make_tree_with_many_merges): Hijack the
helper to test for revisions touching file on a more significant
tree.
(TestGetViewRevisions.test_file_id_for_range): Better test to
highlight bug #300055: starting revision is a dotted revno and the
log should start right there, not at the mainline revision where
merging occured. But that uncovers yet another bug...
(TestGetRevisionsTouchingFileID.assertAllRevisionsForFileID):
_filter_revisions_touching_file_id doesn't have a 'direction'
parameter anymore.

* bzrlib/tests/blackbox/test_log.py:
(TestCaseWithoutPropsHandler): Fix line too long.
(TestLog.test_log_with_tags,
TestLogMerges.test_merges_partial_range): Fix whitespaces.

* bzrlib/log.py:
(calculate_view_revisions): Delete gratuitous split line. Push
direction handling closer to the needed point. Delete 'direction'
parameter when calling _filter_revisions_touching_file_id.
(_filter_revisions_touching_file_id): Delete 'direction'
parameter. This was used for calling reverse_by_depth which can't
handle an already reversed list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
29
29
from bzrlib.tests import test_log
30
30
 
31
31
 
32
 
class TestCaseWithoutPropsHandler(ExternalBase, test_log.TestCaseWithoutPropsHandler):
 
32
class TestCaseWithoutPropsHandler(ExternalBase,
 
33
                                  test_log.TestCaseWithoutPropsHandler):
33
34
    pass
34
35
 
35
36
 
170
171
        branch = tree.branch
171
172
        branch.tags.set_tag('tag1', branch.get_rev_id(1))
172
173
        branch.tags.set_tag('tag1.1', branch.get_rev_id(1))
173
 
        branch.tags.set_tag('tag3', branch.last_revision()) 
174
 
        
 
174
        branch.tags.set_tag('tag3', branch.last_revision())
 
175
 
175
176
        log = self.run_bzr("log -r-1")[0]
176
177
        self.assertTrue('tags: tag3' in log)
177
178
 
302
303
 
303
304
    def test_merges_partial_range(self):
304
305
        self._prepare()
305
 
        out,err = self.run_bzr('log -r1.1.1..1.1.2')
 
306
        out, err = self.run_bzr('log -r1.1.1..1.1.2')
306
307
        self.assertEqual('', err)
307
308
        log = normalize_log(out)
308
309
        self.assertEqualDiff(log, """\
339
340
        out,err = self.run_bzr('log --short -r1.1.1..1.1.2', retcode=3)
340
341
        self.assertContainsRe(err, err_msg)
341
342
 
342
 
 
 
343
 
343
344
class TestLogEncodings(TestCaseInTempDir):
344
345
 
345
346
    _mu = u'\xb5'