/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/selftest/test_upgrade.py

[merge] robertc's integration, updated tests to check for retcode=3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_upgrade.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005 by 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
"""Tests for upgrade of old trees.
18
18
 
19
 
This file contains canned versions of some old trees, which are instantiated
 
19
This file contains canned versions of some old trees, which are instantiated 
20
20
and then upgraded to the new format."""
21
21
 
22
 
# TODO queue for upgrade:
23
 
# test the error message when upgrading an unknown BzrDir format.
24
 
 
25
 
from .. import (
26
 
    branch,
27
 
    controldir,
28
 
    tests,
29
 
    upgrade,
30
 
    )
31
 
from ..bzr import (
32
 
    branch as bzrbranch,
33
 
    workingtree,
34
 
    workingtree_4,
35
 
    )
36
 
 
37
 
 
38
 
class TestUpgrade(tests.TestCaseWithTransport):
39
 
 
40
 
    def test_upgrade_rich_root(self):
41
 
        tree = self.make_branch_and_tree('tree', format='rich-root')
42
 
        tree.commit('first post')
43
 
        upgrade.upgrade('tree')
44
 
 
45
 
    def test_convert_branch5_branch6(self):
46
 
        b = self.make_branch('branch', format='knit')
47
 
        b._set_revision_history([b'CD'])
48
 
        b.set_parent('file:///EF')
49
 
        b.set_bound_location('file:///GH')
50
 
        b.set_push_location('file:///IJ')
51
 
        target = controldir.format_registry.make_controldir(
52
 
            'dirstate-with-subtree')
53
 
        converter = b.controldir._format.get_converter(target)
54
 
        converter.convert(b.controldir, None)
55
 
        new_branch = branch.Branch.open(self.get_url('branch'))
56
 
        self.assertIs(new_branch.__class__, bzrbranch.BzrBranch6)
57
 
        self.assertEqual(b'CD', new_branch.last_revision())
58
 
        self.assertEqual('file:///EF', new_branch.get_parent())
59
 
        self.assertEqual('file:///GH', new_branch.get_bound_location())
60
 
        branch_config = new_branch.get_config_stack()
61
 
        self.assertEqual('file:///IJ', branch_config.get('push_location'))
62
 
 
63
 
        b2 = self.make_branch('branch2', format='knit')
64
 
        converter = b2.controldir._format.get_converter(target)
65
 
        converter.convert(b2.controldir, None)
66
 
        b2 = branch.Branch.open(self.get_url('branch'))
67
 
        self.assertIs(b2.__class__, bzrbranch.BzrBranch6)
68
 
 
69
 
    def test_convert_branch7_branch8(self):
70
 
        b = self.make_branch('branch', format='1.9')
71
 
        target = controldir.format_registry.make_controldir('1.9')
72
 
        target.set_branch_format(bzrbranch.BzrBranchFormat8())
73
 
        converter = b.controldir._format.get_converter(target)
74
 
        converter.convert(b.controldir, None)
75
 
        b = branch.Branch.open(self.get_url('branch'))
76
 
        self.assertIs(b.__class__, bzrbranch.BzrBranch8)
77
 
        self.assertEqual({}, b._get_all_reference_info())
78
 
 
79
 
    def test_convert_knit_dirstate_empty(self):
80
 
        # test that asking for an upgrade from knit to dirstate works.
81
 
        tree = self.make_branch_and_tree('tree', format='knit')
82
 
        target = controldir.format_registry.make_controldir('dirstate')
83
 
        converter = tree.controldir._format.get_converter(target)
84
 
        converter.convert(tree.controldir, None)
85
 
        new_tree = workingtree.WorkingTree.open('tree')
86
 
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
87
 
        self.assertEqual(b'null:', new_tree.last_revision())
88
 
 
89
 
    def test_convert_knit_dirstate_content(self):
90
 
        # smoke test for dirstate conversion: we call dirstate primitives,
91
 
        # and its there that the core logic is tested.
92
 
        tree = self.make_branch_and_tree('tree', format='knit')
93
 
        self.build_tree(['tree/file'])
94
 
        tree.add(['file'], [b'file-id'])
95
 
        target = controldir.format_registry.make_controldir('dirstate')
96
 
        converter = tree.controldir._format.get_converter(target)
97
 
        converter.convert(tree.controldir, None)
98
 
        new_tree = workingtree.WorkingTree.open('tree')
99
 
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
100
 
        self.assertEqual(b'null:', new_tree.last_revision())
101
 
 
102
 
    def test_convert_knit_one_parent_dirstate(self):
103
 
        # test that asking for an upgrade from knit to dirstate works.
104
 
        tree = self.make_branch_and_tree('tree', format='knit')
105
 
        rev_id = tree.commit('first post')
106
 
        target = controldir.format_registry.make_controldir('dirstate')
107
 
        converter = tree.controldir._format.get_converter(target)
108
 
        converter.convert(tree.controldir, None)
109
 
        new_tree = workingtree.WorkingTree.open('tree')
110
 
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
111
 
        self.assertEqual(rev_id, new_tree.last_revision())
112
 
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
113
 
                     'pending-merges', 'stat-cache']:
114
 
            self.assertPathDoesNotExist('tree/.bzr/checkout/' + path)
115
 
 
116
 
    def test_convert_knit_merges_dirstate(self):
117
 
        tree = self.make_branch_and_tree('tree', format='knit')
118
 
        tree.commit('first post')
119
 
        merge_tree = tree.controldir.sprout('tree2').open_workingtree()
120
 
        rev_id2 = tree.commit('second post')
121
 
        rev_id3 = merge_tree.commit('second merge post')
122
 
        tree.merge_from_branch(merge_tree.branch)
123
 
        target = controldir.format_registry.make_controldir('dirstate')
124
 
        converter = tree.controldir._format.get_converter(target)
125
 
        converter.convert(tree.controldir, None)
126
 
        new_tree = workingtree.WorkingTree.open('tree')
127
 
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
128
 
        self.assertEqual(rev_id2, new_tree.last_revision())
129
 
        self.assertEqual([rev_id2, rev_id3], new_tree.get_parent_ids())
130
 
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
131
 
                     'pending-merges', 'stat-cache']:
132
 
            self.assertPathDoesNotExist('tree/.bzr/checkout/' + path)
133
 
 
134
 
 
135
 
class TestSmartUpgrade(tests.TestCaseWithTransport):
136
 
 
137
 
    from_format = controldir.format_registry.make_controldir("pack-0.92")
138
 
    to_format = controldir.format_registry.make_controldir("2a")
139
 
 
140
 
    def make_standalone_branch(self):
141
 
        wt = self.make_branch_and_tree("branch1", format=self.from_format)
142
 
        return wt.controldir
143
 
 
144
 
    def test_upgrade_standalone_branch(self):
145
 
        control = self.make_standalone_branch()
146
 
        tried, worked, issues = upgrade.smart_upgrade(
147
 
            [control], format=self.to_format)
148
 
        self.assertLength(1, tried)
149
 
        self.assertEqual(tried[0], control)
150
 
        self.assertLength(1, worked)
151
 
        self.assertEqual(worked[0], control)
152
 
        self.assertLength(0, issues)
153
 
        self.assertPathExists('branch1/backup.bzr.~1~')
154
 
        self.assertEqual(control.open_repository()._format,
155
 
                         self.to_format._repository_format)
156
 
 
157
 
    def test_upgrade_standalone_branch_cleanup(self):
158
 
        control = self.make_standalone_branch()
159
 
        tried, worked, issues = upgrade.smart_upgrade(
160
 
            [control], format=self.to_format, clean_up=True)
161
 
        self.assertLength(1, tried)
162
 
        self.assertEqual(tried[0], control)
163
 
        self.assertLength(1, worked)
164
 
        self.assertEqual(worked[0], control)
165
 
        self.assertLength(0, issues)
166
 
        self.assertPathExists('branch1')
167
 
        self.assertPathExists('branch1/.bzr')
168
 
        self.assertPathDoesNotExist('branch1/backup.bzr.~1~')
169
 
        self.assertEqual(control.open_repository()._format,
170
 
                         self.to_format._repository_format)
171
 
 
172
 
    def make_repo_with_branches(self):
173
 
        repo = self.make_repository('repo', shared=True,
174
 
                                    format=self.from_format)
175
 
        # Note: self.make_branch() always creates a new repo at the location
176
 
        # so we need to avoid using that here ...
177
 
        controldir.ControlDir.create_branch_convenience(
178
 
            "repo/branch1", format=self.from_format)
179
 
        b2 = controldir.ControlDir.create_branch_convenience(
180
 
            "repo/branch2", format=self.from_format)
181
 
        return repo.controldir
182
 
 
183
 
    def test_upgrade_repo_with_branches(self):
184
 
        control = self.make_repo_with_branches()
185
 
        tried, worked, issues = upgrade.smart_upgrade(
186
 
            [control], format=self.to_format)
187
 
        self.assertLength(3, tried)
188
 
        self.assertEqual(tried[0], control)
189
 
        self.assertLength(3, worked)
190
 
        self.assertEqual(worked[0], control)
191
 
        self.assertLength(0, issues)
192
 
        self.assertPathExists('repo/backup.bzr.~1~')
193
 
        self.assertPathExists('repo/branch1/backup.bzr.~1~')
194
 
        self.assertPathExists('repo/branch2/backup.bzr.~1~')
195
 
        self.assertEqual(control.open_repository()._format,
196
 
                         self.to_format._repository_format)
197
 
        b1 = branch.Branch.open('repo/branch1')
198
 
        self.assertEqual(b1._format, self.to_format._branch_format)
199
 
 
200
 
    def test_upgrade_repo_with_branches_cleanup(self):
201
 
        control = self.make_repo_with_branches()
202
 
        tried, worked, issues = upgrade.smart_upgrade(
203
 
            [control], format=self.to_format, clean_up=True)
204
 
        self.assertLength(3, tried)
205
 
        self.assertEqual(tried[0], control)
206
 
        self.assertLength(3, worked)
207
 
        self.assertEqual(worked[0], control)
208
 
        self.assertLength(0, issues)
209
 
        self.assertPathExists('repo')
210
 
        self.assertPathExists('repo/.bzr')
211
 
        self.assertPathDoesNotExist('repo/backup.bzr.~1~')
212
 
        self.assertPathDoesNotExist('repo/branch1/backup.bzr.~1~')
213
 
        self.assertPathDoesNotExist('repo/branch2/backup.bzr.~1~')
214
 
        self.assertEqual(control.open_repository()._format,
215
 
                         self.to_format._repository_format)
216
 
        b1 = branch.Branch.open('repo/branch1')
217
 
        self.assertEqual(b1._format, self.to_format._branch_format)
 
22
import base64
 
23
import os
 
24
import sys
 
25
 
 
26
from bzrlib.selftest import TestCase, TestCaseInTempDir
 
27
from bzrlib.branch import Branch
 
28
from bzrlib.revision import is_ancestor
 
29
from bzrlib.upgrade import upgrade
 
30
from bzrlib.selftest.treeshape import build_tree_contents
 
31
 
 
32
 
 
33
class TestUpgrade(TestCaseInTempDir):
 
34
    
 
35
    def test_build_tree(self):
 
36
        """Test tree-building test helper"""
 
37
        build_tree_contents(_upgrade1_template)
 
38
        self.failUnlessExists('foo')
 
39
        self.failUnlessExists('.bzr/README')
 
40
 
 
41
    def test_upgrade_simple(self):
 
42
        """Upgrade simple v0.0.4 format to v6"""
 
43
        eq = self.assertEquals
 
44
        build_tree_contents(_upgrade1_template)
 
45
        upgrade('.')
 
46
        b = Branch.open('.')
 
47
        eq(b._branch_format, 6)
 
48
        rh = b.revision_history()
 
49
        eq(rh,
 
50
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
 
51
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
 
52
        t = b.revision_tree(rh[0])
 
53
        foo_id = 'foo-20051004035605-91e788d1875603ae'
 
54
        eq(t.get_file_text(foo_id), 'initial contents\n')
 
55
        t = b.revision_tree(rh[1])
 
56
        eq(t.get_file_text(foo_id), 'new contents\n')
 
57
 
 
58
    def test_upgrade_with_ghosts(self):
 
59
        """Upgrade v0.0.4 tree containing ghost references.
 
60
 
 
61
        That is, some of the parents of revisions mentioned in the branch
 
62
        aren't present in the branches storage. 
 
63
 
 
64
        This shouldn't normally happen in branches created entirely in 
 
65
        bzr but can happen in imports from baz and arch, or from other  
 
66
        systems, where the importer knows about a revision but not 
 
67
        its contents."""
 
68
        eq = self.assertEquals
 
69
        build_tree_contents(_ghost_template)
 
70
        upgrade('.')
 
71
        b = Branch.open('.')
 
72
        revision_id = b.revision_history()[1]
 
73
        rev = b.get_revision(revision_id)
 
74
        eq(len(rev.parent_ids), 2)
 
75
        eq(rev.parent_ids[1], 'wibble@wobble-2')
 
76
 
 
77
    def test_upgrade_makes_dir_weaves(self):
 
78
        build_tree_contents(_upgrade_dir_template)
 
79
        upgrade('.')
 
80
        # this is the path to the literal file. As format changes 
 
81
        # occur it needs to be updated. FIXME: ask the store for the
 
82
        # path.
 
83
        self.failUnlessExists(
 
84
            '.bzr/weaves/de/dir-20051005095101-da1441ea3fa6917a.weave')
 
85
 
 
86
 
 
87
_upgrade1_template = \
 
88
     [
 
89
     ('foo', 'new contents\n'),
 
90
     ('.bzr/',),
 
91
     ('.bzr/README',
 
92
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
 
93
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
 
94
     ('.bzr/revision-history',
 
95
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
 
96
      'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd\n'),
 
97
     ('.bzr/merged-patches', ''),
 
98
     ('.bzr/pending-merged-patches', ''),
 
99
     ('.bzr/branch-name', ''),
 
100
     ('.bzr/branch-lock', ''),
 
101
     ('.bzr/pending-merges', ''),
 
102
     ('.bzr/inventory',
 
103
      '<inventory>\n'
 
104
      '<entry file_id="foo-20051004035605-91e788d1875603ae" kind="file" name="foo" />\n'
 
105
      '</inventory>\n'),
 
106
     ('.bzr/stat-cache',
 
107
      '### bzr hashcache v5\n'
 
108
      'foo// be9f309239729f69a6309e970ef24941d31e042c 13 1128398176 1128398176 303464 770\n'),
 
109
     ('.bzr/text-store/',),
 
110
     ('.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz',
 
111
      '\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'),
 
112
     ('.bzr/text-store/foo-20051004035756-4081373d897c3453.gz',
 
113
      '\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\xcbK-WH\xce\xcf+I\xcd+)\xe6\x02\x00g\xc3\xdf\xc9\r\x00\x00\x00'),
 
114
     ('.bzr/inventory-store/',),
 
115
     ('.bzr/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz',
 
116
      '\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'),
 
117
     ('.bzr/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz',
 
118
      '\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'),
 
119
     ('.bzr/revision-store/',),
 
120
     ('.bzr/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz',
 
121
      '\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'),
 
122
     ('.bzr/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz',
 
123
      '\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')]
 
124
 
 
125
 
 
126
_ghost_template = [
 
127
    ( './foo',
 
128
        'hello\n'
 
129
    ),
 
130
    ( './.bzr/', ),
 
131
    ( './.bzr/README',
 
132
        'This is a Bazaar-NG control directory.\n'
 
133
        'Do not change any files in this directory.\n'
 
134
    ),
 
135
    ( './.bzr/branch-format',
 
136
        'Bazaar-NG branch, format 0.0.4\n'
 
137
    ),
 
138
    ( './.bzr/branch-lock',
 
139
        ''
 
140
    ),
 
141
    ( './.bzr/branch-name',
 
142
        ''
 
143
    ),
 
144
    ( './.bzr/inventory',
 
145
        '<inventory>\n'
 
146
        '<entry file_id="foo-20051004104918-0379cb7c76354cde" kind="file" name="foo" />\n'
 
147
        '</inventory>\n'
 
148
    ),
 
149
    ( './.bzr/merged-patches',
 
150
        ''
 
151
    ),
 
152
    ( './.bzr/pending-merged-patches',
 
153
        ''
 
154
    ),
 
155
    ( './.bzr/pending-merges',
 
156
        ''
 
157
    ),
 
158
    ( './.bzr/revision-history',
 
159
        'mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\n'
 
160
        'mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\n'
 
161
    ),
 
162
    ( './.bzr/stat-cache',
 
163
        '### bzr hashcache v5\n'
 
164
        'foo// f572d396fae9206628714fb2ce00f72e94f2258f 6 1128422956 1128422956 306900 770\n'
 
165
    ),
 
166
    ( './.bzr/text-store/', ),
 
167
    ( './.bzr/text-store/foo-20051004104921-8de8118a71be45ba.gz',
 
168
        '\x1f\x8b\x08\x081^BC\x00\x03foo-20051004104921-8de8118a71be45ba\x00\xcbH\xcd\xc9\xc9\xe7\x02\x00 0:6\x06\x00\x00\x00'
 
169
    ),
 
170
    ( './.bzr/inventory-store/', ),
 
171
    ( './.bzr/inventory-store/mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b.gz',
 
172
        '\x1f\x8b\x08\x081^BC\x00\x03mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\x00m\x8f\xcb\n'
 
173
        '\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'
 
174
        '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'
 
175
    ),
 
176
    ( './.bzr/inventory-store/mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d.gz',
 
177
        '\x1f\x8b\x08\x08A^BC\x00\x03mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\x00m\x8f\xcb\n'
 
178
        '\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'
 
179
        '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'
 
180
    ),
 
181
    ( './.bzr/revision-store/', ),
 
182
    ( './.bzr/revision-store/mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b.gz',
 
183
        '\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'
 
184
        '\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'
 
185
    ),
 
186
    ( './.bzr/revision-store/mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d.gz',
 
187
        '\x1f\x8b\x08\x08A^BC\x00\x03mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\x00\x9d\x90\xc1j\xc30\x0c\x86\xef}\n'
 
188
        "\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"
 
189
        '\x7fJ+EaM\x83$\xa5n\xbc/a\x91~\xd0\xbd\xfd\x135\n'
 
190
        '\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'
 
191
    ),
 
192
]
 
193
 
 
194
_upgrade_dir_template = [
 
195
    ( './.bzr/', ),
 
196
    ( './.bzr/README',
 
197
        'This is a Bazaar-NG control directory.\n'
 
198
        'Do not change any files in this directory.\n'
 
199
    ),
 
200
    ( './.bzr/branch-format',
 
201
        'Bazaar-NG branch, format 0.0.4\n'
 
202
    ),
 
203
    ( './.bzr/branch-lock',
 
204
        ''
 
205
    ),
 
206
    ( './.bzr/branch-name',
 
207
        ''
 
208
    ),
 
209
    ( './.bzr/inventory',
 
210
        '<inventory>\n'
 
211
        '<entry file_id="dir-20051005095101-da1441ea3fa6917a" kind="directory" name="dir" />\n'
 
212
        '</inventory>\n'
 
213
    ),
 
214
    ( './.bzr/merged-patches',
 
215
        ''
 
216
    ),
 
217
    ( './.bzr/pending-merged-patches',
 
218
        ''
 
219
    ),
 
220
    ( './.bzr/pending-merges',
 
221
        ''
 
222
    ),
 
223
    ( './.bzr/revision-history',
 
224
        'robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e\n'
 
225
    ),
 
226
    ( './.bzr/stat-cache',
 
227
        '### bzr hashcache v5\n'
 
228
    ),
 
229
    ( './.bzr/text-store/', ),
 
230
    ( './.bzr/inventory-store/', ),
 
231
    ( './.bzr/inventory-store/robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e.gz',
 
232
        '\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'
 
233
        "\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"
 
234
    ),
 
235
    ( './.bzr/revision-store/', ),
 
236
    ( './.bzr/revision-store/robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e.gz',
 
237
        '\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'
 
238
        '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'
 
239
        "+\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"
 
240
        '\xcd\x17\x85\xea\xba\x03l\x01\x00\x00'
 
241
    ),
 
242
    ( './dir/', ),
 
243
]