← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-04 18:51:39 UTC
  • mfrom: (2961.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
Authentication ring implementation (read-only)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
67
67
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
68
68
        rt = b.repository.revision_tree(rh[0])
69
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()
 
70
        eq(rt.get_file_text(foo_id), 'initial contents\n')
75
71
        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()
 
72
        eq(rt.get_file_text(foo_id), 'new contents\n')
81
73
        # check a backup was made:
82
74
        transport = get_transport(b.base)
83
 
        transport.stat('backup.bzr')
84
 
        transport.stat('backup.bzr/README')
85
 
        transport.stat('backup.bzr/branch-format')
86
 
        transport.stat('backup.bzr/revision-history')
87
 
        transport.stat('backup.bzr/merged-patches')
88
 
        transport.stat('backup.bzr/pending-merged-patches')
89
 
        transport.stat('backup.bzr/pending-merges')
90
 
        transport.stat('backup.bzr/branch-name')
91
 
        transport.stat('backup.bzr/branch-lock')
92
 
        transport.stat('backup.bzr/inventory')
93
 
        transport.stat('backup.bzr/stat-cache')
94
 
        transport.stat('backup.bzr/text-store')
95
 
        transport.stat('backup.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
96
 
        transport.stat('backup.bzr/text-store/foo-20051004035756-4081373d897c3453.gz')
97
 
        transport.stat('backup.bzr/inventory-store/')
98
 
        transport.stat('backup.bzr/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
99
 
        transport.stat('backup.bzr/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
100
 
        transport.stat('backup.bzr/revision-store/')
101
 
        transport.stat('backup.bzr/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
102
 
        transport.stat('backup.bzr/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
75
        transport.stat('.bzr.backup')
 
76
        transport.stat('.bzr.backup/README')
 
77
        transport.stat('.bzr.backup/branch-format')
 
78
        transport.stat('.bzr.backup/revision-history')
 
79
        transport.stat('.bzr.backup/merged-patches')
 
80
        transport.stat('.bzr.backup/pending-merged-patches')
 
81
        transport.stat('.bzr.backup/pending-merges')
 
82
        transport.stat('.bzr.backup/branch-name')
 
83
        transport.stat('.bzr.backup/branch-lock')
 
84
        transport.stat('.bzr.backup/inventory')
 
85
        transport.stat('.bzr.backup/stat-cache')
 
86
        transport.stat('.bzr.backup/text-store')
 
87
        transport.stat('.bzr.backup/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
 
88
        transport.stat('.bzr.backup/text-store/foo-20051004035756-4081373d897c3453.gz')
 
89
        transport.stat('.bzr.backup/inventory-store/')
 
90
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
91
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
92
        transport.stat('.bzr.backup/revision-store/')
 
93
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
94
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
103
95
 
104
96
    def test_upgrade_with_ghosts(self):
105
97
        """Upgrade v0.0.4 tree containing ghost references.
133
125
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
134
126
        # and we should be able to read the names for the file id 
135
127
        # 'dir-20051005095101-da1441ea3fa6917a'
136
 
        repo.lock_read()
137
 
        self.addCleanup(repo.unlock)
138
 
        text_keys = repo.texts.keys()
139
 
        dir_keys = [key for key in text_keys if key[0] ==
140
 
                'dir-20051005095101-da1441ea3fa6917a']
141
 
        self.assertNotEqual([], dir_keys)
 
128
        self.assertNotEqual(
 
129
            [],
 
130
            repo.weave_store.get_weave(
 
131
                'dir-20051005095101-da1441ea3fa6917a',
 
132
                repo.get_transaction()))
142
133
 
143
134
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
144
135
        self.build_tree_contents(_upgrade_dir_template)
154
145
        upgrade('.', bzrdir.BzrDirFormat6())
155
146
        transport = get_transport('.')
156
147
        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
157
 
        self.assertFalse(transport.has('.bzr/stat-cache'))
158
 
        # XXX: upgrade fails if a backup.bzr is already present
 
148
        assert not transport.has('.bzr/stat-cache')
 
149
        # XXX: upgrade fails if a .bzr.backup is already present
159
150
        # -- David Allouche 2006-08-11
160
 
        transport.delete_tree('backup.bzr')
 
151
        transport.delete_tree('.bzr.backup')
161
152
        # At this point, we have a format6 branch without checkout files.
162
153
        upgrade('.', bzrdir.BzrDirMetaFormat1())
163
154
        # The upgrade should not have set up a working tree.
257
248
     ('foo', 'new contents\n'),
258
249
     ('.bzr/',),
259
250
     ('.bzr/README',
260
 
      'This is a Bazaar control directory.\n'
261
 
      'Do not change any files in this directory.\n'
262
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
 
251
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
263
252
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
264
253
     ('.bzr/revision-history',
265
254
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
299
288
    ),
300
289
    ( './.bzr/', ),
301
290
    ( './.bzr/README',
302
 
      'This is a Bazaar control directory.\n'
303
 
      'Do not change any files in this directory.\n'
304
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
291
        'This is a Bazaar-NG control directory.\n'
 
292
        'Do not change any files in this directory.\n'
305
293
    ),
306
294
    ( './.bzr/branch-format',
307
295
        'Bazaar-NG branch, format 0.0.4\n'
365
353
_upgrade_dir_template = [
366
354
    ( './.bzr/', ),
367
355
    ( './.bzr/README',
368
 
      'This is a Bazaar control directory.\n'
369
 
      'Do not change any files in this directory.\n'
370
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
356
        'This is a Bazaar-NG control directory.\n'
 
357
        'Do not change any files in this directory.\n'
371
358
    ),
372
359
    ( './.bzr/branch-format',
373
360
        'Bazaar-NG branch, format 0.0.4\n'