/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: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

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
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
import sys
18
18
from urllib import quote
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'
151
 
            elif key in ('knit', 'metaweave'):
 
147
            if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
 
148
                'pack-0.92', 'pack-0.92-subtree', 'rich-root',
 
149
                'rich-root-pack'):
 
150
                expected = 'dirstate or dirstate-tags or pack-0.92 or'\
 
151
                    ' rich-root or rich-root-pack'
 
152
            if key in ('knit', 'metaweave'):
152
153
                expected = 'knit or metaweave'
153
 
            elif key in ('1.14', '1.14-rich-root'):
154
 
                expected = '1.14 or 1.14-rich-root'
155
154
            self.assertCheckoutDescription(key, expected)
156
155
 
157
156
    def test_describe_branch_format(self):
158
157
        for key in bzrdir.format_registry.keys():
159
158
            if key in bzrdir.format_registry.aliases():
160
159
                continue
161
 
            if bzrdir.format_registry.get_info(key).hidden:
162
 
                continue
163
160
            expected = None
164
161
            if key in ('dirstate', 'knit'):
165
162
                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
163
            self.assertBranchDescription(key, expected)
171
164
 
172
165
    def test_describe_repo_format(self):
173
166
        for key in bzrdir.format_registry.keys():
174
167
            if key in bzrdir.format_registry.aliases():
175
168
                continue
176
 
            if bzrdir.format_registry.get_info(key).hidden:
177
 
                continue
178
169
            expected = None
179
170
            if key in ('dirstate', 'knit', 'dirstate-tags'):
180
171
                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
172
            self.assertRepoDescription(key, expected)
186
173
 
187
174
        format = bzrdir.format_registry.make_bzrdir('metaweave')