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

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-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
22
22
# TODO queue for upgrade:
23
23
# test the error message when upgrading an unknown BzrDir format.
24
24
 
25
 
from .. import (
26
 
    branch,
27
 
    controldir,
28
 
    tests,
29
 
    upgrade,
30
 
    )
31
 
from ..bzr import (
32
 
    branch as bzrbranch,
 
25
import base64
 
26
import os
 
27
import sys
 
28
 
 
29
from bzrlib import (
 
30
    branch as _mod_branch,
 
31
    bzrdir,
 
32
    progress,
 
33
    repository,
33
34
    workingtree,
34
35
    workingtree_4,
35
36
    )
36
 
 
37
 
 
38
 
class TestUpgrade(tests.TestCaseWithTransport):
 
37
import bzrlib.branch
 
38
from bzrlib.branch import Branch
 
39
from bzrlib.tests import TestCaseWithTransport
 
40
from bzrlib.transport import get_transport
 
41
from bzrlib.upgrade import upgrade
 
42
 
 
43
 
 
44
class TestUpgrade(TestCaseWithTransport):
 
45
 
 
46
    def test_build_tree(self):
 
47
        """Test tree-building test helper"""
 
48
        self.build_tree_contents(_upgrade1_template)
 
49
        self.failUnlessExists('foo')
 
50
        self.failUnlessExists('.bzr/README')
 
51
 
 
52
    def test_upgrade_simple(self):
 
53
        """Upgrade simple v0.0.4 format to latest format"""
 
54
        eq = self.assertEquals
 
55
        self.build_tree_contents(_upgrade1_template)
 
56
        upgrade(u'.')
 
57
        control = bzrdir.BzrDir.open('.')
 
58
        b = control.open_branch()
 
59
        # tsk, peeking under the covers.
 
60
        self.failUnless(
 
61
            isinstance(
 
62
                control._format,
 
63
                bzrdir.BzrDirFormat.get_default_format().__class__))
 
64
        rh = b.revision_history()
 
65
        eq(rh,
 
66
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
 
67
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
 
68
        rt = b.repository.revision_tree(rh[0])
 
69
        foo_id = 'foo-20051004035605-91e788d1875603ae'
 
70
        rt.lock_read()
 
71
        try:
 
72
            eq(rt.get_file_text(foo_id), 'initial contents\n')
 
73
        finally:
 
74
            rt.unlock()
 
75
        rt = b.repository.revision_tree(rh[1])
 
76
        rt.lock_read()
 
77
        try:
 
78
            eq(rt.get_file_text(foo_id), 'new contents\n')
 
79
        finally:
 
80
            rt.unlock()
 
81
        # check a backup was made:
 
82
        backup_dir = 'backup.bzr.~1~'
 
83
        transport = get_transport(b.base)
 
84
        transport.stat(backup_dir)
 
85
        transport.stat(backup_dir + '/README')
 
86
        transport.stat(backup_dir + '/branch-format')
 
87
        transport.stat(backup_dir + '/revision-history')
 
88
        transport.stat(backup_dir + '/merged-patches')
 
89
        transport.stat(backup_dir + '/pending-merged-patches')
 
90
        transport.stat(backup_dir + '/pending-merges')
 
91
        transport.stat(backup_dir + '/branch-name')
 
92
        transport.stat(backup_dir + '/branch-lock')
 
93
        transport.stat(backup_dir + '/inventory')
 
94
        transport.stat(backup_dir + '/stat-cache')
 
95
        transport.stat(backup_dir + '/text-store')
 
96
        transport.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
 
97
        transport.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
 
98
        transport.stat(backup_dir + '/inventory-store/')
 
99
        transport.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
100
        transport.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
101
        transport.stat(backup_dir + '/revision-store/')
 
102
        transport.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
103
        transport.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
104
 
 
105
    def test_upgrade_with_ghosts(self):
 
106
        """Upgrade v0.0.4 tree containing ghost references.
 
107
 
 
108
        That is, some of the parents of revisions mentioned in the branch
 
109
        aren't present in the branch's storage.
 
110
 
 
111
        This shouldn't normally happen in branches created entirely in
 
112
        bzr, but can happen in branches imported from baz and arch, or from
 
113
        other systems, where the importer knows about a revision but not
 
114
        its contents."""
 
115
        eq = self.assertEquals
 
116
        self.build_tree_contents(_ghost_template)
 
117
        upgrade(u'.')
 
118
        b = Branch.open(u'.')
 
119
        revision_id = b.revision_history()[1]
 
120
        rev = b.repository.get_revision(revision_id)
 
121
        eq(len(rev.parent_ids), 2)
 
122
        eq(rev.parent_ids[1], 'wibble@wobble-2')
 
123
 
 
124
    def test_upgrade_makes_dir_weaves(self):
 
125
        self.build_tree_contents(_upgrade_dir_template)
 
126
        old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
 
127
        old_repo_format = old_repodir.open_repository()._format
 
128
        upgrade('.')
 
129
        # this is the path to the literal file. As format changes
 
130
        # occur it needs to be updated. FIXME: ask the store for the
 
131
        # path.
 
132
        repo = bzrlib.repository.Repository.open('.')
 
133
        # it should have changed the format
 
134
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
 
135
        # and we should be able to read the names for the file id
 
136
        # 'dir-20051005095101-da1441ea3fa6917a'
 
137
        repo.lock_read()
 
138
        self.addCleanup(repo.unlock)
 
139
        text_keys = repo.texts.keys()
 
140
        dir_keys = [key for key in text_keys if key[0] ==
 
141
                'dir-20051005095101-da1441ea3fa6917a']
 
142
        self.assertNotEqual([], dir_keys)
 
143
 
 
144
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
 
145
        self.build_tree_contents(_upgrade_dir_template)
 
146
        upgrade('.', bzrdir.BzrDirMetaFormat1())
 
147
        tree = workingtree.WorkingTree.open('.')
 
148
        self.assertEqual([tree.branch.revision_history()[-1]],
 
149
            tree.get_parent_ids())
 
150
 
 
151
    def test_upgrade_v6_to_meta_no_workingtree(self):
 
152
        # Some format6 branches do not have checkout files. Upgrading
 
153
        # such a branch to metadir must not setup a working tree.
 
154
        self.build_tree_contents(_upgrade1_template)
 
155
        upgrade('.', bzrdir.BzrDirFormat6())
 
156
        transport = get_transport('.')
 
157
        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
 
158
        self.assertFalse(transport.has('.bzr/stat-cache'))
 
159
        # XXX: upgrade fails if a backup.bzr is already present
 
160
        # -- David Allouche 2006-08-11
 
161
        transport.delete_tree('backup.bzr.~1~')
 
162
        # At this point, we have a format6 branch without checkout files.
 
163
        upgrade('.', bzrdir.BzrDirMetaFormat1())
 
164
        # The upgrade should not have set up a working tree.
 
165
        control = bzrdir.BzrDir.open('.')
 
166
        self.assertFalse(control.has_workingtree())
 
167
        # We have covered the scope of this test, we may as well check that
 
168
        # upgrade has not eaten our data, even if it's a bit redundant with
 
169
        # other tests.
 
170
        self.failUnless(isinstance(control._format, bzrdir.BzrDirMetaFormat1))
 
171
        branch = control.open_branch()
 
172
        self.assertEquals(branch.revision_history(),
 
173
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
 
174
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
39
175
 
40
176
    def test_upgrade_rich_root(self):
41
177
        tree = self.make_branch_and_tree('tree', format='rich-root')
42
 
        tree.commit('first post')
43
 
        upgrade.upgrade('tree')
 
178
        rev_id = tree.commit('first post')
 
179
        upgrade('tree')
44
180
 
45
181
    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())
 
182
        branch = self.make_branch('branch', format='knit')
 
183
        branch.set_revision_history(['AB', 'CD'])
 
184
        branch.set_parent('file:///EF')
 
185
        branch.set_bound_location('file:///GH')
 
186
        branch.set_push_location('file:///IJ')
 
187
        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
 
188
        converter = branch.bzrdir._format.get_converter(target)
 
189
        converter.convert(branch.bzrdir, None)
 
190
        new_branch = _mod_branch.Branch.open(self.get_url('branch'))
 
191
        self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
 
192
        self.assertEqual('CD', new_branch.last_revision())
58
193
        self.assertEqual('file:///EF', new_branch.get_parent())
59
194
        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'))
 
195
        branch_config = new_branch.get_config()._get_branch_data_config()
 
196
        self.assertEqual('file:///IJ',
 
197
            branch_config.get_user_option('push_location'))
62
198
 
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)
 
199
        branch2 = self.make_branch('branch2', format='knit')
 
200
        converter = branch2.bzrdir._format.get_converter(target)
 
201
        converter.convert(branch2.bzrdir, None)
 
202
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
 
203
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
68
204
 
69
205
    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())
 
206
        branch = self.make_branch('branch', format='1.9')
 
207
        target = bzrdir.format_registry.make_bzrdir('1.9')
 
208
        target.set_branch_format(_mod_branch.BzrBranchFormat8())
 
209
        converter = branch.bzrdir._format.get_converter(target)
 
210
        converter.convert(branch.bzrdir, None)
 
211
        branch = _mod_branch.Branch.open(self.get_url('branch'))
 
212
        self.assertIs(branch.__class__, _mod_branch.BzrBranch8)
 
213
        self.assertEqual({}, branch._get_all_reference_info())
78
214
 
79
215
    def test_convert_knit_dirstate_empty(self):
80
216
        # test that asking for an upgrade from knit to dirstate works.
81
217
        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)
 
218
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
219
        converter = tree.bzrdir._format.get_converter(target)
 
220
        converter.convert(tree.bzrdir, None)
85
221
        new_tree = workingtree.WorkingTree.open('tree')
86
222
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
87
 
        self.assertEqual(b'null:', new_tree.last_revision())
 
223
        self.assertEqual('null:', new_tree.last_revision())
88
224
 
89
225
    def test_convert_knit_dirstate_content(self):
90
226
        # smoke test for dirstate conversion: we call dirstate primitives,
91
227
        # and its there that the core logic is tested.
92
228
        tree = self.make_branch_and_tree('tree', format='knit')
93
229
        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)
 
230
        tree.add(['file'], ['file-id'])
 
231
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
232
        converter = tree.bzrdir._format.get_converter(target)
 
233
        converter.convert(tree.bzrdir, None)
98
234
        new_tree = workingtree.WorkingTree.open('tree')
99
235
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
100
 
        self.assertEqual(b'null:', new_tree.last_revision())
 
236
        self.assertEqual('null:', new_tree.last_revision())
101
237
 
102
238
    def test_convert_knit_one_parent_dirstate(self):
103
239
        # test that asking for an upgrade from knit to dirstate works.
104
240
        tree = self.make_branch_and_tree('tree', format='knit')
105
241
        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)
 
242
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
243
        converter = tree.bzrdir._format.get_converter(target)
 
244
        converter.convert(tree.bzrdir, None)
109
245
        new_tree = workingtree.WorkingTree.open('tree')
110
246
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
111
247
        self.assertEqual(rev_id, new_tree.last_revision())
112
248
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
113
 
                     'pending-merges', 'stat-cache']:
114
 
            self.assertPathDoesNotExist('tree/.bzr/checkout/' + path)
 
249
            'pending-merges', 'stat-cache']:
 
250
            self.failIfExists('tree/.bzr/checkout/' + path)
115
251
 
116
252
    def test_convert_knit_merges_dirstate(self):
117
253
        tree = self.make_branch_and_tree('tree', format='knit')
118
 
        tree.commit('first post')
119
 
        merge_tree = tree.controldir.sprout('tree2').open_workingtree()
 
254
        rev_id = tree.commit('first post')
 
255
        merge_tree = tree.bzrdir.sprout('tree2').open_workingtree()
120
256
        rev_id2 = tree.commit('second post')
121
257
        rev_id3 = merge_tree.commit('second merge post')
122
258
        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)
 
259
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
260
        converter = tree.bzrdir._format.get_converter(target)
 
261
        converter.convert(tree.bzrdir, None)
126
262
        new_tree = workingtree.WorkingTree.open('tree')
127
263
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
128
264
        self.assertEqual(rev_id2, new_tree.last_revision())
129
265
        self.assertEqual([rev_id2, rev_id3], new_tree.get_parent_ids())
130
266
        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)
 
267
            'pending-merges', 'stat-cache']:
 
268
            self.failIfExists('tree/.bzr/checkout/' + path)
 
269
 
 
270
 
 
271
_upgrade1_template = \
 
272
     [
 
273
     ('foo', 'new contents\n'),
 
274
     ('.bzr/',),
 
275
     ('.bzr/README',
 
276
      'This is a Bazaar control directory.\n'
 
277
      'Do not change any files in this directory.\n'
 
278
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
 
279
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
 
280
     ('.bzr/revision-history',
 
281
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
 
282
      'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd\n'),
 
283
     ('.bzr/merged-patches', ''),
 
284
     ('.bzr/pending-merged-patches', ''),
 
285
     ('.bzr/branch-name', ''),
 
286
     ('.bzr/branch-lock', ''),
 
287
     ('.bzr/pending-merges', ''),
 
288
     ('.bzr/inventory',
 
289
      '<inventory>\n'
 
290
      '<entry file_id="foo-20051004035605-91e788d1875603ae" kind="file" name="foo" />\n'
 
291
      '</inventory>\n'),
 
292
     ('.bzr/stat-cache',
 
293
      '### bzr hashcache v5\n'
 
294
      'foo// be9f309239729f69a6309e970ef24941d31e042c 13 1128398176 1128398176 303464 770\n'),
 
295
     ('.bzr/text-store/',),
 
296
     ('.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz',
 
297
      '\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'),
 
298
     ('.bzr/text-store/foo-20051004035756-4081373d897c3453.gz',
 
299
      '\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\xcbK-WH\xce\xcf+I\xcd+)\xe6\x02\x00g\xc3\xdf\xc9\r\x00\x00\x00'),
 
300
     ('.bzr/inventory-store/',),
 
301
     ('.bzr/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz',
 
302
      '\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'),
 
303
     ('.bzr/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz',
 
304
      '\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'),
 
305
     ('.bzr/revision-store/',),
 
306
     ('.bzr/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz',
 
307
      '\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'),
 
308
     ('.bzr/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz',
 
309
      '\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')]
 
310
 
 
311
 
 
312
_ghost_template = [
 
313
    ( './foo',
 
314
        'hello\n'
 
315
    ),
 
316
    ( './.bzr/', ),
 
317
    ( './.bzr/README',
 
318
      'This is a Bazaar control directory.\n'
 
319
      'Do not change any files in this directory.\n'
 
320
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
321
    ),
 
322
    ( './.bzr/branch-format',
 
323
        'Bazaar-NG branch, format 0.0.4\n'
 
324
    ),
 
325
    ( './.bzr/branch-lock',
 
326
        ''
 
327
    ),
 
328
    ( './.bzr/branch-name',
 
329
        ''
 
330
    ),
 
331
    ( './.bzr/inventory',
 
332
        '<inventory>\n'
 
333
        '<entry file_id="foo-20051004104918-0379cb7c76354cde" kind="file" name="foo" />\n'
 
334
        '</inventory>\n'
 
335
    ),
 
336
    ( './.bzr/merged-patches',
 
337
        ''
 
338
    ),
 
339
    ( './.bzr/pending-merged-patches',
 
340
        ''
 
341
    ),
 
342
    ( './.bzr/pending-merges',
 
343
        ''
 
344
    ),
 
345
    ( './.bzr/revision-history',
 
346
        'mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\n'
 
347
        'mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\n'
 
348
    ),
 
349
    ( './.bzr/stat-cache',
 
350
        '### bzr hashcache v5\n'
 
351
        'foo// f572d396fae9206628714fb2ce00f72e94f2258f 6 1128422956 1128422956 306900 770\n'
 
352
    ),
 
353
    ( './.bzr/text-store/', ),
 
354
    ( './.bzr/text-store/foo-20051004104921-8de8118a71be45ba.gz',
 
355
        '\x1f\x8b\x08\x081^BC\x00\x03foo-20051004104921-8de8118a71be45ba\x00\xcbH\xcd\xc9\xc9\xe7\x02\x00 0:6\x06\x00\x00\x00'
 
356
    ),
 
357
    ( './.bzr/inventory-store/', ),
 
358
    ( './.bzr/inventory-store/mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b.gz',
 
359
        '\x1f\x8b\x08\x081^BC\x00\x03mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\x00m\x8f\xcb\n'
 
360
        '\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'
 
361
        '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'
 
362
    ),
 
363
    ( './.bzr/inventory-store/mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d.gz',
 
364
        '\x1f\x8b\x08\x08A^BC\x00\x03mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\x00m\x8f\xcb\n'
 
365
        '\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'
 
366
        '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'
 
367
    ),
 
368
    ( './.bzr/revision-store/', ),
 
369
    ( './.bzr/revision-store/mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b.gz',
 
370
        '\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'
 
371
        '\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'
 
372
    ),
 
373
    ( './.bzr/revision-store/mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d.gz',
 
374
        '\x1f\x8b\x08\x08A^BC\x00\x03mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\x00\x9d\x90\xc1j\xc30\x0c\x86\xef}\n'
 
375
        "\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"
 
376
        '\x7fJ+EaM\x83$\xa5n\xbc/a\x91~\xd0\xbd\xfd\x135\n'
 
377
        '\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'
 
378
    ),
 
379
]
 
380
 
 
381
_upgrade_dir_template = [
 
382
    ( './.bzr/', ),
 
383
    ( './.bzr/README',
 
384
      'This is a Bazaar control directory.\n'
 
385
      'Do not change any files in this directory.\n'
 
386
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
387
    ),
 
388
    ( './.bzr/branch-format',
 
389
        'Bazaar-NG branch, format 0.0.4\n'
 
390
    ),
 
391
    ( './.bzr/branch-lock',
 
392
        ''
 
393
    ),
 
394
    ( './.bzr/branch-name',
 
395
        ''
 
396
    ),
 
397
    ( './.bzr/inventory',
 
398
        '<inventory>\n'
 
399
        '<entry file_id="dir-20051005095101-da1441ea3fa6917a" kind="directory" name="dir" />\n'
 
400
        '</inventory>\n'
 
401
    ),
 
402
    ( './.bzr/merged-patches',
 
403
        ''
 
404
    ),
 
405
    ( './.bzr/pending-merged-patches',
 
406
        ''
 
407
    ),
 
408
    ( './.bzr/pending-merges',
 
409
        ''
 
410
    ),
 
411
    ( './.bzr/revision-history',
 
412
        'robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e\n'
 
413
    ),
 
414
    ( './.bzr/stat-cache',
 
415
        '### bzr hashcache v5\n'
 
416
    ),
 
417
    ( './.bzr/text-store/', ),
 
418
    ( './.bzr/inventory-store/', ),
 
419
    ( './.bzr/inventory-store/robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e.gz',
 
420
        '\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'
 
421
        "\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"
 
422
    ),
 
423
    ( './.bzr/revision-store/', ),
 
424
    ( './.bzr/revision-store/robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e.gz',
 
425
        '\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'
 
426
        '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'
 
427
        "+\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"
 
428
        '\xcd\x17\x85\xea\xba\x03l\x01\x00\x00'
 
429
    ),
 
430
    ( './dir/', ),
 
431
]