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

  • Committer: John Arbash Meinel
  • Date: 2009-06-12 18:05:15 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090612180515-t0cwbjsnve094oik
Add a failing test for handling nodes that are in the same linear chain.

It fails because the ancestry skipping causes us to miss the fact that the two nodes
are actually directly related. We could check at the beginning, as the 
code used to do, but I think that will be incomplete for the more-than-two
heads cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_info.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
143
143
                # We don't require that experimental formats support checkouts
144
144
                # or describe correctly in the UI.
145
145
                continue
146
 
            if bzrdir.format_registry.get_info(key).hidden:
147
 
                continue
148
146
            expected = None
149
 
            if key in ('pack-0.92',):
150
 
                expected = 'pack-0.92'
 
147
            if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
 
148
                'pack-0.92', 'pack-0.92-subtree', 'rich-root',
 
149
                'rich-root-pack', '1.6', '1.6.1-rich-root',
 
150
                '1.9', '1.9-rich-root'):
 
151
                expected = '1.6 or 1.6.1-rich-root or ' \
 
152
                    '1.9 or 1.9-rich-root or ' \
 
153
                    'dirstate or dirstate-tags or pack-0.92 or'\
 
154
                    ' rich-root or rich-root-pack'
151
155
            elif key in ('knit', 'metaweave'):
152
156
                expected = 'knit or metaweave'
153
157
            elif key in ('1.14', '1.14-rich-root'):
163
167
            expected = None
164
168
            if key in ('dirstate', 'knit'):
165
169
                expected = 'dirstate or knit'
166
 
            elif key in ('1.14',):
167
 
                expected = '1.14'
168
 
            elif key in ('1.14-rich-root',):
169
 
                expected = '1.14-rich-root'
 
170
            elif key in ('1.9', '1.14'):
 
171
                expected = '1.14 or 1.9'
 
172
            elif key in ('1.9-rich-root', '1.14-rich-root'):
 
173
                expected = '1.14-rich-root or 1.9-rich-root'
170
174
            self.assertBranchDescription(key, expected)
171
175
 
172
176
    def test_describe_repo_format(self):
178
182
            expected = None
179
183
            if key in ('dirstate', 'knit', 'dirstate-tags'):
180
184
                expected = 'dirstate or dirstate-tags or knit'
181
 
            elif key in ('1.14',):
182
 
                expected = '1.14'
183
 
            elif key in ('1.14-rich-root',):
184
 
                expected = '1.14-rich-root'
 
185
            elif key in ('1.9', '1.14'):
 
186
                expected = '1.14 or 1.9'
 
187
            elif key in ('1.9-rich-root', '1.14-rich-root'):
 
188
                expected = '1.14-rich-root or 1.9-rich-root'
185
189
            self.assertRepoDescription(key, expected)
186
190
 
187
191
        format = bzrdir.format_registry.make_bzrdir('metaweave')