~maxb/bzr-svn/fetch-svn-rev-info-progress-bar

« back to all changes in this revision

Viewing changes to tests/test_convert.py

  • Committer: Max Bowsher
  • Date: 2010-07-30 22:50:54 UTC
  • mfrom: (3324.1.37 trunk)
  • Revision ID: maxb@f2s.com-20100730225054-un1llcngdofg585w
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
""")
76
76
        load_dumpfile(dumpfile, "d")
77
77
        fs = repos.Repository("d").fs()
78
 
        self.assertEqual("6987ef2d-cd6b-461f-9991-6f1abef3bd59", 
 
78
        self.assertEqual("6987ef2d-cd6b-461f-9991-6f1abef3bd59",
79
79
                fs.get_uuid())
80
80
 
81
81
    def test_loaddumpfile_invalid(self):
123
123
                           all=True, create_shared_repo=True, prefix="bar")
124
124
 
125
125
    def test_sets_parent_urls(self):
126
 
        convert_repository(Repository.open(self.repos_url), "e", 
127
 
                           TrunkLayout(0), 
 
126
        convert_repository(Repository.open(self.repos_url), "e",
 
127
                           TrunkLayout(0),
128
128
                           all=False, create_shared_repo=True)
129
 
        self.assertEquals(self.repos_url+"/trunk", 
 
129
        self.assertEquals(self.repos_url+"/trunk",
130
130
                Branch.open("e/trunk").get_parent())
131
 
        self.assertEquals(self.repos_url+"/branches/abranch", 
 
131
        self.assertEquals(self.repos_url+"/branches/abranch",
132
132
                Branch.open("e/branches/abranch").get_parent())
133
133
 
134
134
    def test_fetch_alive(self):
144
144
        dc.close()
145
145
 
146
146
        oldrepos = Repository.open(self.repos_url)
147
 
        convert_repository(oldrepos, "e", 
148
 
                           TrunkLayout(0), 
 
147
        convert_repository(oldrepos, "e",
 
148
                           TrunkLayout(0),
149
149
                           all=False, create_shared_repo=True)
150
150
        newrepos = Repository.open("e")
151
151
        oldrepos.set_layout(TrunkLayout(0))
176
176
        dc.close()
177
177
 
178
178
        oldrepos = Repository.open(self.repos_url)
179
 
        convert_repository(oldrepos, "e", TrunkLayout(0), 
 
179
        convert_repository(oldrepos, "e", TrunkLayout(0),
180
180
                           all=True, create_shared_repo=True)
181
181
        newrepos = Repository.open("e")
182
182
        self.assertTrue(newrepos.has_revision(
196
196
        dc.close()
197
197
 
198
198
        oldrepos = Repository.open(self.repos_url)
199
 
        convert_repository(oldrepos, "e", TrunkLayout(0), 
 
199
        convert_repository(oldrepos, "e", TrunkLayout(0),
200
200
            create_shared_repo=True,
201
201
            filter_branch=lambda branch: branch.get_branch_path().endswith("somebranch"))
202
202
        self.assertTrue(os.path.exists("e/branches/somebranch"))
206
206
        dir = BzrDir.create("e")
207
207
        dir.create_repository(shared=True)
208
208
 
209
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
209
        convert_repository(Repository.open(self.repos_url), "e",
210
210
                TrunkLayout(0), create_shared_repo=True)
211
211
 
212
212
        self.assertTrue(Repository.open("e").is_shared())
213
213
 
214
214
    def test_shared_import_continue_remove(self):
215
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
215
        convert_repository(Repository.open(self.repos_url), "e",
216
216
                TrunkLayout(0), create_shared_repo=True)
217
217
 
218
218
        dc = self.get_commit_editor()
224
224
        trunk.add_file("trunk/file").modify()
225
225
        dc.close()
226
226
 
227
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
227
        convert_repository(Repository.open(self.repos_url), "e",
228
228
                           TrunkLayout(0), create_shared_repo=True)
229
229
 
230
230
    def test_shared_import_remove_nokeep(self):
231
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
231
        convert_repository(Repository.open(self.repos_url), "e",
232
232
                TrunkLayout(0), create_shared_repo=True)
233
233
 
234
234
        dc = self.get_commit_editor()
237
237
 
238
238
        self.assertTrue(os.path.exists("e/trunk"))
239
239
 
240
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
240
        convert_repository(Repository.open(self.repos_url), "e",
241
241
                           TrunkLayout(0), create_shared_repo=True)
242
242
 
243
243
        self.assertFalse(os.path.exists("e/trunk"))
244
244
 
245
245
    def test_shared_import_continue_with_wt(self):
246
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
246
        convert_repository(Repository.open(self.repos_url), "e",
247
247
                TrunkLayout(0), working_trees=True)
248
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
248
        convert_repository(Repository.open(self.repos_url), "e",
249
249
                TrunkLayout(0), working_trees=True)
250
250
 
251
251
    def test_shared_import_rootlayout_empty(self):
252
252
        dir = BzrDir.create("e")
253
253
        dir.create_repository(shared=True)
254
254
 
255
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
255
        convert_repository(Repository.open(self.repos_url), "e",
256
256
                RootLayout(), create_shared_repo=True)
257
257
 
258
258
    def test_shared_import_with_wt(self):
259
259
        dir = BzrDir.create("e")
260
260
        dir.create_repository(shared=True)
261
261
 
262
 
        convert_repository(Repository.open(self.repos_url), "e", 
263
 
                TrunkLayout(0), create_shared_repo=True, 
 
262
        convert_repository(Repository.open(self.repos_url), "e",
 
263
                TrunkLayout(0), create_shared_repo=True,
264
264
                working_trees=True)
265
265
 
266
266
        self.assertTrue(os.path.isfile(os.path.join(
270
270
        dir = BzrDir.create("e")
271
271
        dir.create_repository(shared=True)
272
272
 
273
 
        convert_repository(Repository.open(self.repos_url), "e", 
274
 
                TrunkLayout(0), create_shared_repo=True, 
 
273
        convert_repository(Repository.open(self.repos_url), "e",
 
274
                TrunkLayout(0), create_shared_repo=True,
275
275
                working_trees=False)
276
276
 
277
277
        self.assertFalse(os.path.isfile(os.path.join(
281
281
        dir = BzrDir.create("e", format=format_registry.make_bzrdir('knit'))
282
282
        dir.create_repository(shared=True)
283
283
 
284
 
        self.assertRaises(IncompatibleRepositories, 
285
 
            lambda: convert_repository(Repository.open(self.repos_url), "e", 
286
 
                TrunkLayout(0), create_shared_repo=True, 
 
284
        self.assertRaises(IncompatibleRepositories,
 
285
            lambda: convert_repository(Repository.open(self.repos_url), "e",
 
286
                TrunkLayout(0), create_shared_repo=True,
287
287
                working_trees=False))
288
288
 
289
289
    def test_shared_import_continue_branch(self):
290
290
        oldrepos = Repository.open(self.repos_url)
291
 
        convert_repository(oldrepos, "e", 
 
291
        convert_repository(oldrepos, "e",
292
292
                TrunkLayout(0), create_shared_repo=True)
293
293
 
294
294
        mapping = oldrepos.get_mapping()
299
299
        dc.close()
300
300
 
301
301
        self.assertEqual(
302
 
                Repository.open(self.repos_url).generate_revision_id(2, "trunk", mapping), 
 
302
                Repository.open(self.repos_url).generate_revision_id(2, "trunk", mapping),
303
303
                Branch.open("e/trunk").last_revision())
304
304
 
305
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
305
        convert_repository(Repository.open(self.repos_url), "e",
306
306
                TrunkLayout(0), create_shared_repo=True)
307
307
 
308
 
        self.assertEqual(Repository.open(self.repos_url).generate_revision_id(3, "trunk", mapping), 
 
308
        self.assertEqual(Repository.open(self.repos_url).generate_revision_id(3, "trunk", mapping),
309
309
                        Branch.open("e/trunk").last_revision())
310
310
 
311
 
 
 
311
 
312
312
    def test_shared_import(self):
313
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
313
        convert_repository(Repository.open(self.repos_url), "e",
314
314
                TrunkLayout(0), create_shared_repo=True)
315
315
 
316
316
        self.assertTrue(Repository.open("e").is_shared())
317
 
    
 
317
 
318
318
    def test_simple(self):
319
319
        convert_repository(Repository.open(self.repos_url), os.path.join(self.test_dir, "e"), TrunkLayout(0))
320
320
        self.assertTrue(os.path.isdir(os.path.join(self.test_dir, "e", "trunk")))
324
324
        self.assertRaises(NoSuchFile, convert_repository, Repository.open(self.repos_url), os.path.join(self.test_dir, "e", "foo", "bar"), TrunkLayout(0))
325
325
 
326
326
    def test_notshared_import(self):
327
 
        convert_repository(Repository.open(self.repos_url), "e", 
 
327
        convert_repository(Repository.open(self.repos_url), "e",
328
328
                           TrunkLayout(0), create_shared_repo=False)
329
329
 
330
330
        self.assertRaises(NotBranchError, Repository.open, "e")
441
441
 
442
442
""")
443
443
        repos = self.load_dumpfile(filename, 'g')
444
 
        convert_repository(repos, os.path.join(self.test_dir, "e"), 
 
444
        convert_repository(repos, os.path.join(self.test_dir, "e"),
445
445
                           TrunkLayout(0))
446
446
        mapping = repos.get_mapping()
447
447
        abspath = self.test_dir
476
476
    def get_commit_editor(self):
477
477
        return super(TestPrefixed, self).get_commit_editor(self.repos_url)
478
478
 
479
 
    def test_convert_simple(self): 
 
479
    def test_convert_simple(self):
480
480
        oldrepos = Repository.open(self.repos_url)
481
 
        convert_repository(oldrepos, "e", TrunkLayout(1), 
 
481
        convert_repository(oldrepos, "e", TrunkLayout(1),
482
482
                prefix="base",
483
483
            create_shared_repo=True)
484
484
        self.assertTrue(os.path.exists("e/trunk"))