~bzr-pqm/bzr/bzr.dev

5784.1.4 by Martin Pool
Update weave format tests to avoid failIf, failUnless, etc
1
# Copyright (C) 2006-2011 Canonical Ltd
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
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
16
17
"""Tests for the weave-era BzrDir formats.
18
19
For interface contract tests, see tests/per_bzr_dir.
20
"""
21
5582.10.91 by Jelmer Vernooij
Fix some tests.
22
import os
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
23
import sys
24
25
from bzrlib import (
26
    branch,
27
    bzrdir,
5582.10.91 by Jelmer Vernooij
Fix some tests.
28
    errors,
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
29
    repository,
30
    upgrade,
5582.10.91 by Jelmer Vernooij
Fix some tests.
31
    urlutils,
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
32
    workingtree,
33
    )
34
from bzrlib.osutils import (
5582.10.91 by Jelmer Vernooij
Fix some tests.
35
    getcwd,
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
36
    )
5582.10.92 by Jelmer Vernooij
Move more weave code.
37
from bzrlib.tests.test_bundle import V4BundleTester
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
38
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
39
from bzrlib.tests import (
40
    TestCaseWithTransport,
41
    )
42
5582.10.91 by Jelmer Vernooij
Fix some tests.
43
from bzrlib.plugins.weave_fmt.branch import (
44
    BzrBranchFormat4,
45
    )
46
from bzrlib.plugins.weave_fmt.bzrdir import (
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
47
    BzrDirFormat5,
48
    BzrDirFormat6,
49
    )
50
51
52
class TestFormat5(TestCaseWithTransport):
53
    """Tests specific to the version 5 bzrdir format."""
54
55
    def test_same_lockfiles_between_tree_repo_branch(self):
56
        # this checks that only a single lockfiles instance is created
57
        # for format 5 objects
58
        dir = BzrDirFormat5().initialize(self.get_url())
59
        def check_dir_components_use_same_lock(dir):
60
            ctrl_1 = dir.open_repository().control_files
61
            ctrl_2 = dir.open_branch().control_files
62
            ctrl_3 = dir.open_workingtree()._control_files
63
            self.assertTrue(ctrl_1 is ctrl_2)
64
            self.assertTrue(ctrl_2 is ctrl_3)
65
        check_dir_components_use_same_lock(dir)
66
        # and if we open it normally.
67
        dir = bzrdir.BzrDir.open(self.get_url())
68
        check_dir_components_use_same_lock(dir)
69
70
    def test_can_convert(self):
71
        # format 5 dirs are convertable
72
        dir = BzrDirFormat5().initialize(self.get_url())
73
        self.assertTrue(dir.can_convert_format())
74
75
    def test_needs_conversion(self):
76
        # format 5 dirs need a conversion if they are not the default,
77
        # and they aren't
78
        dir = BzrDirFormat5().initialize(self.get_url())
79
        # don't need to convert it to itself
80
        self.assertFalse(dir.needs_format_conversion(BzrDirFormat5()))
81
        # do need to convert it to the current default
82
        self.assertTrue(dir.needs_format_conversion(
83
            bzrdir.BzrDirFormat.get_default_format()))
84
85
86
class TestFormat6(TestCaseWithTransport):
87
    """Tests specific to the version 6 bzrdir format."""
88
89
    def test_same_lockfiles_between_tree_repo_branch(self):
90
        # this checks that only a single lockfiles instance is created
91
        # for format 6 objects
92
        dir = BzrDirFormat6().initialize(self.get_url())
93
        def check_dir_components_use_same_lock(dir):
94
            ctrl_1 = dir.open_repository().control_files
95
            ctrl_2 = dir.open_branch().control_files
96
            ctrl_3 = dir.open_workingtree()._control_files
97
            self.assertTrue(ctrl_1 is ctrl_2)
98
            self.assertTrue(ctrl_2 is ctrl_3)
99
        check_dir_components_use_same_lock(dir)
100
        # and if we open it normally.
101
        dir = bzrdir.BzrDir.open(self.get_url())
102
        check_dir_components_use_same_lock(dir)
103
104
    def test_can_convert(self):
105
        # format 6 dirs are convertable
106
        dir = BzrDirFormat6().initialize(self.get_url())
107
        self.assertTrue(dir.can_convert_format())
108
109
    def test_needs_conversion(self):
110
        # format 6 dirs need an conversion if they are not the default.
111
        dir = BzrDirFormat6().initialize(self.get_url())
112
        self.assertTrue(dir.needs_format_conversion(
113
            bzrdir.BzrDirFormat.get_default_format()))
114
115
116
class TestBreakLockOldBranch(TestCaseWithTransport):
117
118
    def test_break_lock_format_5_bzrdir(self):
119
        # break lock on a format 5 bzrdir should just return
120
        self.make_branch_and_tree('foo', format=BzrDirFormat5())
121
        out, err = self.run_bzr('break-lock foo')
122
        self.assertEqual('', out)
123
        self.assertEqual('', err)
124
125
126
_upgrade1_template = \
127
     [
128
     ('foo', 'new contents\n'),
129
     ('.bzr/',),
130
     ('.bzr/README',
131
      'This is a Bazaar control directory.\n'
132
      'Do not change any files in this directory.\n'
133
      'See http://bazaar.canonical.com/ for more information about Bazaar.\n'),
134
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
135
     ('.bzr/revision-history',
136
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
137
      'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd\n'),
138
     ('.bzr/merged-patches', ''),
139
     ('.bzr/pending-merged-patches', ''),
140
     ('.bzr/branch-name', ''),
141
     ('.bzr/branch-lock', ''),
142
     ('.bzr/pending-merges', ''),
143
     ('.bzr/inventory',
144
      '<inventory>\n'
145
      '<entry file_id="foo-20051004035605-91e788d1875603ae" kind="file" name="foo" />\n'
146
      '</inventory>\n'),
147
     ('.bzr/stat-cache',
148
      '### bzr hashcache v5\n'
149
      'foo// be9f309239729f69a6309e970ef24941d31e042c 13 1128398176 1128398176 303464 770\n'),
150
     ('.bzr/text-store/',),
151
     ('.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz',
152
      '\x1f\x8b\x08\x00[\xfdAC\x02\xff\xcb\xcc\xcb,\xc9L\xccQH\xce\xcf+I\xcd+)\xe6\x02\x00\xdd\xcc\xf90\x11\x00\x00\x00'),
153
     ('.bzr/text-store/foo-20051004035756-4081373d897c3453.gz',
154
      '\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\xcbK-WH\xce\xcf+I\xcd+)\xe6\x02\x00g\xc3\xdf\xc9\r\x00\x00\x00'),
155
     ('.bzr/inventory-store/',),
156
     ('.bzr/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz',
157
      '\x1f\x8b\x08\x00[\xfdAC\x02\xffm\x8f\xcd\n\xc20\x10\x84\xef>E\xc8\xbdt7?M\x02\xad\xaf"\xa1\x99`P[\xa8E\xacOo\x14\x05\x0f\xdef\xe1\xfbv\x98\xbeL7L\xeb\xbcl\xfb]_\xc3\xb2\x89\\\xce8\x944\xc8<\xcf\x8d"\xb2LdH\xdb\x8el\x13\x18\xce\xfb\xc4\xde\xd5SGHq*\xd3\x0b\xad\x8e\x14S\xbc\xe0\xadI\xb1\xe2\xbe\xfe}\xc2\xdc\xb0\rL\xc6#\xa4\xd1\x8d*\x99\x0f}=F\x1e$8G\x9d\xa0\x02\xa1rP9\x01c`FV\xda1qg\x98"\x02}\xa5\xf2\xa8\x95\xec\xa4h\xeb\x80\xf6g\xcd\x13\xb3\x01\xcc\x98\xda\x00\x00\x00'),
158
     ('.bzr/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz',
159
      '\x1f\x8b\x08\x00\xc4\xfdAC\x02\xffm\x8f\xc1\n\xc20\x10D\xef~E\xc8\xbd\xb8\x9bM\x9a,\xb4\xfe\x8a\xc4f\x83Am\xa1\x16\xb1~\xbdQ\x14<x\x9b\x81y3LW\xc6\x9b\x8c\xcb4\xaf\xbbMW\xc5\xbc\xaa\\\xce\xb2/\xa9\xd7y\x9a\x1a\x03\xe0\x10\xc0\x02\xb9\x16\\\xc3(>\x84\x84\xc1WKQ\xb4:\x95\xf1\x15\xad\x8cVc\xbc\xc8\x1b\xd3j\x91\xfb\xf2\xaf\xa4r\x8d\x85\x80\xe4)\x05\xf6\x03YG\x9f\xf4\xf5\x18\xb1\xd7\x07\xe1L\xc0\x86\xd8\x1b\xce-\xc7\xb6:a\x0f\x92\x8de\x8b\x89P\xc0\x9a\xe1\x0b\x95G\x9d\xc4\xda\xb1\xad\x07\xb6?o\x9e\xb5\xff\xf0\xf9\xda\x00\x00\x00'),
160
     ('.bzr/revision-store/',),
161
     ('.bzr/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz',
162
      '\x1f\x8b\x08\x00[\xfdAC\x02\xff\x9d\x8eKj\xc30\x14E\xe7^\x85\xd0 \xb3$\xefI\xd1\x8f\xd8\xa6\x1b(t\x07E?\xbb\x82H\n\xb2\x1ahW\xdfB1\x14:\xeb\xf4r\xee\xbdgl\xf1\x91\xb6T\x0b\xf15\xe7\xd4{l\x13}\xb6\xad\xa7B^j\xbd\x91\xc3\xad_\xb3\xbb?m\xf5\xbd\xf9\xb8\xb4\xba\x9eJ\xec\x87\xb5_)I\xe5\x11K\xaf\xed\xe35\x85\x89\xfe\xa5\x8e\x0c@ \xc0\x05\xb8\x90\x88GT\xd2\xa1\x14\xfc\xe2@K\xc7\xfd\xef\x85\xed\xcd\xe2D\x95\x8d\x1a\xa47<\x02c2\xb0 \xbc\xd0\x8ay\xa3\xbcp\x8a\x83\x12A3\xb7XJv\xef\x7f_\xf7\x94\xe3\xd6m\xbeO\x14\x91in4*<\x812\x88\xc60\xfc\x01>k\x89\x13\xe5\x12\x00\xe8<\x8c\xdf\x8d\xcd\xaeq\xb6!\x90\xa5\xd6\xf1\xbc\x07\xc3x\xde\x85\xe6\xe1\x0b\xc8\x8a\x98\x03T\x01\x00\x00'),
163
     ('.bzr/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz',
164
      '\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\x9d\x90Kj\x031\x0c\x86\xf79\xc5\xe0Ev\xe9\xc8o\x9b\xcc\x84^\xa0\xd0\x1b\x14\xbf&5d\xec`\xbb\x81\xf6\xf45\x84\xa4\x81\xaeZ\xa1\x85\x84^\xdf\xaf\xa9\x84K\xac1\xa7\xc1\xe5u\x8d\xad\x852\xa3\x17SZL\xc3k\xce\xa7a{j\xfb\xd5\x9e\x9fk\xfe(.,%\x1f\x9fRh\xdbc\xdb\xa3!\xa6KH-\x97\xcf\xb7\xe8g\xf4\xbbkG\x008\x06`@\xb9\xe4bG(_\x88\x95\xde\xf9n\xca\xfb\xc7\r\xf5\xdd\xe0\x19\xa9\x85)\x81\xf5"\xbd\x04j\xb8\x02b\xa8W\\\x0b\xc9\x14\xf4\xbc\xbb\xd7\xd6H4\xdc\xb8\xff}\xba\xc55\xd4f\xd6\xf3\x8c0&\x8ajE\xa4x\xe2@\xa5\xa6\x9a\xf3k\xc3WNaFT\x00\x00:l\xa6>Q\xcd1\x1cjp9\xf9;\xc34\xde\n\x9b\xe9lJWT{t\',a\xf9\x0b\xae\xc0x\x87\xa5\xb0Xp\xca,(a\xa9{\xd0{}\xd4\x12\x04(\xc5\xbb$\xc5$V\xceaI\x19\x01\xa2\x1dh\xed\x82d\x8c.\xccr@\xc3\xd8Q\xc6\x1f\xaa\xf1\xb6\xe8\xb0\xf9\x06QR\r\xf9\xfc\x01\x00\x00')]
165
166
167
_ghost_template = [
168
    ( './foo',
169
        'hello\n'
170
    ),
171
    ( './.bzr/', ),
172
    ( './.bzr/README',
173
      'This is a Bazaar control directory.\n'
174
      'Do not change any files in this directory.\n'
175
      'See http://bazaar.canonical.com/ for more information about Bazaar.\n'
176
    ),
177
    ( './.bzr/branch-format',
178
        'Bazaar-NG branch, format 0.0.4\n'
179
    ),
180
    ( './.bzr/branch-lock',
181
        ''
182
    ),
183
    ( './.bzr/branch-name',
184
        ''
185
    ),
186
    ( './.bzr/inventory',
187
        '<inventory>\n'
188
        '<entry file_id="foo-20051004104918-0379cb7c76354cde" kind="file" name="foo" />\n'
189
        '</inventory>\n'
190
    ),
191
    ( './.bzr/merged-patches',
192
        ''
193
    ),
194
    ( './.bzr/pending-merged-patches',
195
        ''
196
    ),
197
    ( './.bzr/pending-merges',
198
        ''
199
    ),
200
    ( './.bzr/revision-history',
201
        'mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\n'
202
        'mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\n'
203
    ),
204
    ( './.bzr/stat-cache',
205
        '### bzr hashcache v5\n'
206
        'foo// f572d396fae9206628714fb2ce00f72e94f2258f 6 1128422956 1128422956 306900 770\n'
207
    ),
208
    ( './.bzr/text-store/', ),
209
    ( './.bzr/text-store/foo-20051004104921-8de8118a71be45ba.gz',
210
        '\x1f\x8b\x08\x081^BC\x00\x03foo-20051004104921-8de8118a71be45ba\x00\xcbH\xcd\xc9\xc9\xe7\x02\x00 0:6\x06\x00\x00\x00'
211
    ),
212
    ( './.bzr/inventory-store/', ),
213
    ( './.bzr/inventory-store/mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b.gz',
214
        '\x1f\x8b\x08\x081^BC\x00\x03mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\x00m\x8f\xcb\n'
215
        '\xc20\x10E\xf7~E\xc8\xbe83\xcd\x13\xaa\xbf"yL0\xa8-\xd4"\xd6\xaf7\x8a\x82\x0bw\xb38\xe7\xde;C\x1do<.\xd3\xbc\xee7C;\xe6U\x94z\xe6C\xcd;Y\xa6\xa9#\x00\x8d\x00\n'
216
        'Ayt\x1d\xf4\xd6\xa7h\x935\xbdV)\xb3\x14\xa7:\xbe\xd0\xe6H1\x86\x0b\xbf5)\x16\xbe/\x7fC\x08;\x97\xd9!\xba`1\xb2\xd21|\xe8\xeb1`\xe3\xb5\xa5\xdc{S\x02{\x02c\xc8YT%Rb\x80b\x89\xbd*D\xda\x95\xafT\x1f\xad\xd2H\xb1m\xfb\xb7?\xcf<\x01W}\xb5\x8b\xd9\x00\x00\x00'
217
    ),
218
    ( './.bzr/inventory-store/mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d.gz',
219
        '\x1f\x8b\x08\x08A^BC\x00\x03mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\x00m\x8f\xcb\n'
220
        '\xc20\x10E\xf7~E\xc8\xbe83\xcd\x13\xaa\xbf"yL0\xa8-\xd4"\xd6\xaf7\x8a\x82\x0bw\xb38\xe7\xde;C\x1do<.\xd3\xbc\xee7C;\xe6U\x94z\xe6C\xcd;Y\xa6\xa9#\x00\x8d\x00\n'
221
        'Ayt\x1d\xf4\xd6\xa7h\x935\xbdV)\xb3\x14\xa7:\xbe\xd0\xe6H1\x86\x0b\xbf5)\x16\xbe/\x7fC\x08;\x97\xd9!\xba`1\xb2\xd21|\xe8\xeb1`\xe3\xb5\xa5\xdc{S\x02{\x02c\xc8YT%Rb\x80b\x89\xbd*D\xda\x95\xafT\x1f\xad\xd2H\xb1m\xfb\xb7?\xcf<\x01W}\xb5\x8b\xd9\x00\x00\x00'
222
    ),
223
    ( './.bzr/revision-store/', ),
224
    ( './.bzr/revision-store/mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b.gz',
225
        '\x1f\x8b\x08\x081^BC\x00\x03mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\x00\x9d\x8eMj\xc30\x14\x84\xf7>\x85\xd0"\xbb$\xef\xc9\xb6,\x11\xdb\xf4\x02\x85\xde\xa0\xe8\xe7\xd9\x11\xc4R\x90\xd4@{\xfa\x06\x8a\xa1\xd0]\x97\x03\xdf\xcc|c\xa6G(!E\xe6\xd2\xb6\x85Z)O\xfc\xd5\xe4\x1a"{K\xe9\xc6\x0e\xb7z\xd9\xec\xfd\xa5\xa4\x8f\xech\xc9i=E\xaa\x87\xb5^8\x0b\xf1A\xb1\xa6\xfc\xf9\x1e\xfc\xc4\xffRG\x01\xd0#@\x87\xd0i\x81G\xa3\x95%!\x06\xe5}\x0bv\xb0\xbf\x17\xca\xd5\xe0\xc4-\xa0\xb1\x8b\xb6`\xc0I\xa4\xc5\xf4\x9el\xef\x95v [\x94\xcf\x8e\xd5\xcay\xe4l\xf7\xfe\xf7u\r'
226
        '\x1b\x95j\xb6\xfb\xc4\x11\x85\xea\x84\xd0\x12O\x03t\x83D\xad\xc4\x0f\xf0\x95"M\xbc\x95\x00\xc0\xe7f|6\x8aYi^B.u<\xef\xb1\x19\xcf\xbb\xce\xdc|\x038=\xc7\xe6R\x01\x00\x00'
227
    ),
228
    ( './.bzr/revision-store/mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d.gz',
229
        '\x1f\x8b\x08\x08A^BC\x00\x03mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\x00\x9d\x90\xc1j\xc30\x0c\x86\xef}\n'
230
        "\xe3Coie'\xb1c\x9a\x94\xbe\xc0`o0,[N\x03M\\\x1c\xafe{\xfae\x94n\x85\xc1`;Y\x88O\xd2\xff\xb9Mt\x19\xe6!N\xcc\xc5q\x1cr\xa6\xd4\xf1'\x9b\xf20\xb1\xe7\x18Ol}\xca\xbb\x11\xcf\x879\xbe&G!\xc5~3Q^\xf7y\xc7\xd90]h\xca1\xbd\xbd\x0c\xbe\xe3?\xa9B\x02\xd4\x02\xa0\x12P\x99R\x17\xce\xa0\xb6\x1a\x83s\x80(\xa5\x7f\xdc0\x1f\xad\xe88\x82\xb0\x18\x0c\x82\x05\xa7\x04\x05[{\xc2\xda7\xc6\x81*\x85B\x8dh\x1a\xe7\x05g\xf7\xdc\xff>\x9d\x87\x91\xe6l\xc7s\xc7\x85\x90M%\xa5\xd1z#\x85\xa8\x9b\x1a\xaa\xfa\x06\xbc\xc7\x89:^*\x00\xe0\xfbU\xbbL\xcc\xb6\xa7\xfdH\xa9'\x16\x03\xeb\x8fq\xce\xed\xf6\xde_\xb5g\x9b\x16\xa1y\xa9\xbe\x02&\n"
231
        '\x7fJ+EaM\x83$\xa5n\xbc/a\x91~\xd0\xbd\xfd\x135\n'
232
        '\xd0\x9a`\x0c*W\x1aR\xc1\x94du\x08(\t\xb0\x91\xdeZ\xa3\x9cU\x9cm\x7f\x8dr\x1d\x10Ot\xb8\xc6\xcf\xa7\x907|\xfb-\xb1\xbd\xd3\xfb\xd5\x07\xeeD\xee\x08*\x02\x00\x00'
233
    ),
234
]
235
236
_upgrade_dir_template = [
237
    ( './.bzr/', ),
238
    ( './.bzr/README',
239
      'This is a Bazaar control directory.\n'
240
      'Do not change any files in this directory.\n'
241
      'See http://bazaar.canonical.com/ for more information about Bazaar.\n'
242
    ),
243
    ( './.bzr/branch-format',
244
        'Bazaar-NG branch, format 0.0.4\n'
245
    ),
246
    ( './.bzr/branch-lock',
247
        ''
248
    ),
249
    ( './.bzr/branch-name',
250
        ''
251
    ),
252
    ( './.bzr/inventory',
253
        '<inventory>\n'
254
        '<entry file_id="dir-20051005095101-da1441ea3fa6917a" kind="directory" name="dir" />\n'
255
        '</inventory>\n'
256
    ),
257
    ( './.bzr/merged-patches',
258
        ''
259
    ),
260
    ( './.bzr/pending-merged-patches',
261
        ''
262
    ),
263
    ( './.bzr/pending-merges',
264
        ''
265
    ),
266
    ( './.bzr/revision-history',
267
        'robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e\n'
268
    ),
269
    ( './.bzr/stat-cache',
270
        '### bzr hashcache v5\n'
271
    ),
272
    ( './.bzr/text-store/', ),
273
    ( './.bzr/inventory-store/', ),
274
    ( './.bzr/inventory-store/robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e.gz',
275
        '\x1f\x8b\x08\x00\x0c\xa2CC\x02\xff\xb3\xc9\xcc+K\xcd+\xc9/\xaa\xb4\xe3\xb2\x012\x8a*\x15\xd22sR\xe33Sl\x95R2\x8bt\x8d\x0c\x0cL\r'
276
        "\x81\xd8\xc0\x12H\x19\xea\xa6$\x1a\x9a\x98\x18\xa6&\x1a\xa7%\x9aY\x1a\x9a'*)dg\xe6A\x94\xa6&\x83LQR\xc8K\xccM\x05\x0b()\xe8\x03\xcd\xd4G\xb2\x00\x00\xc2<\x94\xb1m\x00\x00\x00"
277
    ),
278
    ( './.bzr/revision-store/', ),
279
    ( './.bzr/revision-store/robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e.gz',
280
        '\x1f\x8b\x08\x00\x0c\xa2CC\x02\xff\xa5OKj\xc30\x14\xdc\xfb\x14B\x8b\xec\x92<I\xd6\xc7\xc42\x85\xde\xa0\x17(\xb6\xf4\x9c\n'
281
        'l\xa9H"\x90\x9c\xbe\xa6\xa9\xa1\x9b\xae\xbax\x0c\xcc\xe71\xd3g\xbc\x85\x12R$.\xadk\xa8\x15\xb3\xa5oi\xc2\\\xc9kZ\x96\x10\x0b9,\xf5\x92\xbf)\xf7\xf2\x83O\xe5\x14\xb1\x1e\xae\xf5BI\x887\x8c5\xe5\xfb{\xf0\x96\xfei>r\x00\xc9\xb6\x83n\x03sT\xa0\xe4<y\x83\xda\x1b\xc54\xfe~T>Ff\xe9\xcc:\xdd\x8e\xa6E\xc7@\xa2\x82I\xaaNL\xbas\\313)\x00\xb9\xe6\xe0(\xd9\x87\xfc\xb7A\r'
282
        "+\x96:\xae\x9f\x962\xc6\x8d\x04i\x949\x01\x97R\xb7\x1d\x17O\xc3#E\xb4T(\x00\xa0C\xd3o\x892^q\x18\xbd'>\xe4\xfe\xbc\x13M\x7f\xde{\r"
283
        '\xcd\x17\x85\xea\xba\x03l\x01\x00\x00'
284
    ),
285
    ( './dir/', ),
286
]
287
288
289
class TestUpgrade(TestCaseWithTransport):
290
291
    def test_upgrade_v6_to_meta_no_workingtree(self):
292
        # Some format6 branches do not have checkout files. Upgrading
293
        # such a branch to metadir must not setup a working tree.
294
        self.build_tree_contents(_upgrade1_template)
295
        upgrade.upgrade('.', BzrDirFormat6())
296
        t = self.get_transport('.')
297
        t.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
298
        self.assertFalse(t.has('.bzr/stat-cache'))
299
        t.delete_tree('backup.bzr.~1~')
300
        # At this point, we have a format6 branch without checkout files.
301
        upgrade.upgrade('.', bzrdir.BzrDirMetaFormat1())
302
        # The upgrade should not have set up a working tree.
303
        control = bzrdir.BzrDir.open('.')
304
        self.assertFalse(control.has_workingtree())
305
        # We have covered the scope of this test, we may as well check that
306
        # upgrade has not eaten our data, even if it's a bit redundant with
307
        # other tests.
5784.1.4 by Martin Pool
Update weave format tests to avoid failIf, failUnless, etc
308
        self.assertIsInstance(control._format, bzrdir.BzrDirMetaFormat1)
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
309
        b = control.open_branch()
6165.4.26 by Jelmer Vernooij
Fix locking.
310
        self.addCleanup(b.lock_read().unlock)
6165.4.25 by Jelmer Vernooij
Fix plugin use of revision_history.
311
        self.assertEquals(b._revision_history(),
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
312
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
313
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
314
315
    def test_upgrade_simple(self):
316
        """Upgrade simple v0.0.4 format to latest format"""
317
        eq = self.assertEquals
318
        self.build_tree_contents(_upgrade1_template)
319
        upgrade.upgrade(u'.')
320
        control = bzrdir.BzrDir.open('.')
321
        b = control.open_branch()
322
        # tsk, peeking under the covers.
5784.1.4 by Martin Pool
Update weave format tests to avoid failIf, failUnless, etc
323
        self.assertIsInstance(
324
            control._format,
325
            bzrdir.BzrDirFormat.get_default_format().__class__)
6165.4.26 by Jelmer Vernooij
Fix locking.
326
        self.addCleanup(b.lock_read().unlock)
6165.4.25 by Jelmer Vernooij
Fix plugin use of revision_history.
327
        rh = b._revision_history()
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
328
        eq(rh,
329
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
330
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
331
        rt = b.repository.revision_tree(rh[0])
332
        foo_id = 'foo-20051004035605-91e788d1875603ae'
333
        rt.lock_read()
334
        try:
335
            eq(rt.get_file_text(foo_id), 'initial contents\n')
336
        finally:
337
            rt.unlock()
338
        rt = b.repository.revision_tree(rh[1])
339
        rt.lock_read()
340
        try:
341
            eq(rt.get_file_text(foo_id), 'new contents\n')
342
        finally:
343
            rt.unlock()
344
        # check a backup was made:
345
        backup_dir = 'backup.bzr.~1~'
346
        t = self.get_transport('.')
347
        t.stat(backup_dir)
348
        t.stat(backup_dir + '/README')
349
        t.stat(backup_dir + '/branch-format')
350
        t.stat(backup_dir + '/revision-history')
351
        t.stat(backup_dir + '/merged-patches')
352
        t.stat(backup_dir + '/pending-merged-patches')
353
        t.stat(backup_dir + '/pending-merges')
354
        t.stat(backup_dir + '/branch-name')
355
        t.stat(backup_dir + '/branch-lock')
356
        t.stat(backup_dir + '/inventory')
357
        t.stat(backup_dir + '/stat-cache')
358
        t.stat(backup_dir + '/text-store')
359
        t.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
360
        t.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
361
        t.stat(backup_dir + '/inventory-store/')
362
        t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
363
        t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
364
        t.stat(backup_dir + '/revision-store/')
365
        t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
366
        t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
367
368
    def test_upgrade_with_ghosts(self):
369
        """Upgrade v0.0.4 tree containing ghost references.
370
371
        That is, some of the parents of revisions mentioned in the branch
372
        aren't present in the branch's storage.
373
374
        This shouldn't normally happen in branches created entirely in
375
        bzr, but can happen in branches imported from baz and arch, or from
376
        other systems, where the importer knows about a revision but not
377
        its contents."""
378
        eq = self.assertEquals
379
        self.build_tree_contents(_ghost_template)
380
        upgrade.upgrade(u'.')
381
        b = branch.Branch.open(u'.')
6165.4.26 by Jelmer Vernooij
Fix locking.
382
        self.addCleanup(b.lock_read().unlock)
6165.4.25 by Jelmer Vernooij
Fix plugin use of revision_history.
383
        revision_id = b._revision_history()[1]
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
384
        rev = b.repository.get_revision(revision_id)
385
        eq(len(rev.parent_ids), 2)
386
        eq(rev.parent_ids[1], 'wibble@wobble-2')
387
388
    def test_upgrade_makes_dir_weaves(self):
389
        self.build_tree_contents(_upgrade_dir_template)
390
        old_repodir = bzrdir.BzrDir.open_unsupported('.')
391
        old_repo_format = old_repodir.open_repository()._format
392
        upgrade.upgrade('.')
393
        # this is the path to the literal file. As format changes
394
        # occur it needs to be updated. FIXME: ask the store for the
395
        # path.
396
        repo = repository.Repository.open('.')
397
        # it should have changed the format
398
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
399
        # and we should be able to read the names for the file id
400
        # 'dir-20051005095101-da1441ea3fa6917a'
401
        repo.lock_read()
402
        self.addCleanup(repo.unlock)
403
        text_keys = repo.texts.keys()
404
        dir_keys = [key for key in text_keys if key[0] ==
405
                'dir-20051005095101-da1441ea3fa6917a']
406
        self.assertNotEqual([], dir_keys)
407
408
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
409
        self.build_tree_contents(_upgrade_dir_template)
410
        upgrade.upgrade('.', bzrdir.BzrDirMetaFormat1())
411
        tree = workingtree.WorkingTree.open('.')
6165.4.26 by Jelmer Vernooij
Fix locking.
412
        self.addCleanup(tree.lock_read().unlock)
6165.4.25 by Jelmer Vernooij
Fix plugin use of revision_history.
413
        self.assertEqual([tree.branch._revision_history()[-1]],
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
414
            tree.get_parent_ids())
415
416
417
class SFTPBranchTest(TestCaseWithSFTPServer):
418
    """Test some stuff when accessing a bzr Branch over sftp"""
419
420
    def test_lock_file(self):
421
        # old format branches use a special lock file on sftp.
422
        b = self.make_branch('', format=BzrDirFormat6())
423
        b = branch.Branch.open(self.get_url())
5784.1.4 by Martin Pool
Update weave format tests to avoid failIf, failUnless, etc
424
        self.assertPathExists('.bzr/')
425
        self.assertPathExists('.bzr/branch-format')
426
        self.assertPathExists('.bzr/branch-lock')
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
427
5784.1.4 by Martin Pool
Update weave format tests to avoid failIf, failUnless, etc
428
        self.assertPathDoesNotExist('.bzr/branch-lock.write-lock')
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
429
        b.lock_write()
5784.1.4 by Martin Pool
Update weave format tests to avoid failIf, failUnless, etc
430
        self.assertPathExists('.bzr/branch-lock.write-lock')
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
431
        b.unlock()
5784.1.4 by Martin Pool
Update weave format tests to avoid failIf, failUnless, etc
432
        self.assertPathDoesNotExist('.bzr/branch-lock.write-lock')
5712.4.1 by Jelmer Vernooij
Move weave-era BzrDir directories to a separate file.
433
434
435
class TestInfo(TestCaseWithTransport):
436
437
    def test_info_locking_oslocks(self):
438
        if sys.platform == "win32":
439
            self.skip("don't use oslocks on win32 in unix manner")
440
        # This test tests old (all-in-one, OS lock using) behaviour which
441
        # simply cannot work on windows (and is indeed why we changed our
442
        # design. As such, don't try to remove the thisFailsStrictLockCheck
443
        # call here.
444
        self.thisFailsStrictLockCheck()
445
446
        tree = self.make_branch_and_tree('branch',
447
                                         format=BzrDirFormat6())
448
449
        # Test all permutations of locking the working tree, branch and repository
450
        # XXX: Well not yet, as we can't query oslocks yet. Currently, it's
451
        # implemented by raising NotImplementedError and get_physical_lock_status()
452
        # always returns false. This makes bzr info hide the lock status.  (Olaf)
453
        # W B R
454
455
        # U U U
456
        out, err = self.run_bzr('info -v branch')
457
        self.assertEqualDiff(
458
"""Standalone tree (format: weave)
459
Location:
460
  branch root: %s
461
462
Format:
463
       control: All-in-one format 6
464
  working tree: Working tree format 2
465
        branch: Branch format 4
466
    repository: %s
467
468
In the working tree:
469
         0 unchanged
470
         0 modified
471
         0 added
472
         0 removed
473
         0 renamed
474
         0 unknown
475
         0 ignored
476
         0 versioned subdirectories
477
478
Branch history:
479
         0 revisions
480
481
Repository:
482
         0 revisions
483
""" % ('branch', tree.branch.repository._format.get_format_description(),
484
       ), out)
485
        self.assertEqual('', err)
486
        # L L L
487
        tree.lock_write()
488
        out, err = self.run_bzr('info -v branch')
489
        self.assertEqualDiff(
490
"""Standalone tree (format: weave)
491
Location:
492
  branch root: %s
493
494
Format:
495
       control: All-in-one format 6
496
  working tree: Working tree format 2
497
        branch: Branch format 4
498
    repository: %s
499
500
In the working tree:
501
         0 unchanged
502
         0 modified
503
         0 added
504
         0 removed
505
         0 renamed
506
         0 unknown
507
         0 ignored
508
         0 versioned subdirectories
509
510
Branch history:
511
         0 revisions
512
513
Repository:
514
         0 revisions
515
""" % ('branch', tree.branch.repository._format.get_format_description(),
516
       ), out)
517
        self.assertEqual('', err)
518
        tree.unlock()
519
520
5582.10.91 by Jelmer Vernooij
Fix some tests.
521
class TestBranchFormat4(TestCaseWithTransport):
522
    """Tests specific to branch format 4"""
523
524
    def test_no_metadir_support(self):
525
        url = self.get_url()
526
        bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
527
        bdir.create_repository()
528
        self.assertRaises(errors.IncompatibleFormat,
529
            BzrBranchFormat4().initialize, bdir)
530
531
    def test_supports_bzrdir_6(self):
532
        url = self.get_url()
5582.10.97 by Jelmer Vernooij
Fix import of BzrDirFormat6 after merge.
533
        bdir = BzrDirFormat6().initialize(url)
5582.10.91 by Jelmer Vernooij
Fix some tests.
534
        bdir.create_repository()
535
        BzrBranchFormat4().initialize(bdir)
536
537
538
class TestBoundBranch(TestCaseWithTransport):
539
540
    def setUp(self):
541
        super(TestBoundBranch, self).setUp()
542
        self.build_tree(['master/', 'child/'])
543
        self.make_branch_and_tree('master')
544
        self.make_branch_and_tree('child',
545
                        format=bzrdir.format_registry.make_bzrdir('weave'))
546
        os.chdir('child')
547
548
    def test_bind_format_6_bzrdir(self):
549
        # bind on a format 6 bzrdir should error
550
        out,err = self.run_bzr('bind ../master', retcode=3)
551
        self.assertEqual('', out)
552
        # TODO: jam 20060427 Probably something like this really should
553
        #       print out the actual path, rather than the URL
554
        cwd = urlutils.local_path_to_url(getcwd())
555
        self.assertEqual('bzr: ERROR: To use this feature you must '
556
                         'upgrade your branch at %s/.\n' % cwd, err)
557
558
    def test_unbind_format_6_bzrdir(self):
559
        # bind on a format 6 bzrdir should error
560
        out,err = self.run_bzr('unbind', retcode=3)
561
        self.assertEqual('', out)
562
        cwd = urlutils.local_path_to_url(getcwd())
563
        self.assertEqual('bzr: ERROR: To use this feature you must '
564
                         'upgrade your branch at %s/.\n' % cwd, err)
565
566
567
class TestInit(TestCaseWithTransport):
568
569
    def test_init_weave(self):
570
        # --format=weave should be accepted to allow interoperation with
571
        # old releases when desired.
572
        out, err = self.run_bzr('init --format=weave')
573
        self.assertEqual("""Created a standalone tree (format: weave)\n""",
574
            out)
575
        self.assertEqual('', err)
5582.10.92 by Jelmer Vernooij
Move more weave code.
576
577
578
class V4WeaveBundleTester(V4BundleTester):
579
580
    def bzrdir_format(self):
581
        return 'metaweave'