← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_info.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_info.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007-2010 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
146
148
            expected = None
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'
 
149
            if key in ('pack-0.92',):
 
150
                expected = 'pack-0.92'
155
151
            elif key in ('knit', 'metaweave'):
156
152
                expected = 'knit or metaweave'
157
153
            elif key in ('1.14', '1.14-rich-root'):
167
163
            expected = None
168
164
            if key in ('dirstate', 'knit'):
169
165
                expected = 'dirstate or knit'
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'
 
166
            elif key in ('1.14',):
 
167
                expected = '1.14'
 
168
            elif key in ('1.14-rich-root',):
 
169
                expected = '1.14-rich-root'
174
170
            self.assertBranchDescription(key, expected)
175
171
 
176
172
    def test_describe_repo_format(self):
182
178
            expected = None
183
179
            if key in ('dirstate', 'knit', 'dirstate-tags'):
184
180
                expected = 'dirstate or dirstate-tags or knit'
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'
 
181
            elif key in ('1.14',):
 
182
                expected = '1.14'
 
183
            elif key in ('1.14-rich-root',):
 
184
                expected = '1.14-rich-root'
189
185
            self.assertRepoDescription(key, expected)
190
186
 
191
187
        format = bzrdir.format_registry.make_bzrdir('metaweave')