← Back to branch summary

~ubuntu-branches/debian/sid/bzr-svn/sid

« back to all changes in this revision

Viewing changes to tests/mapping_implementations/test_repository.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2009-06-03 16:30:56 UTC
  • mfrom: (1.3.1 upstream) (3.1.8 karmic)
  • Revision ID: james.westby@ubuntu.com-20090603163056-296clrwflq0oqzwb
Tags: 0.6.2-1
* New upstream snapshot.
* Allow python-sqlite to not be installed if python-tdb is installed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mapping_implementations/test_repository.py
89
89
        repos = Repository.open(repos_url)
90
90
        mapping = repos.get_mapping()
91
91
        rm_provider = repos._revmeta_provider
92
 
        self.assertEqual({u"": (mapping.generate_file_id((repos.uuid, "", 0), u""), mapping.revision_id_foreign_to_bzr((repos.uuid, "", 0)), None)}, repos.get_fileid_map(rm_provider.get_revision("", 0), mapping))
 
92
        ret = repos.get_fileid_map(rm_provider.get_revision("", 0), mapping).as_dict()
 
93
        if mapping.is_branch(""):
 
94
            self.assertEqual({u"": (mapping.generate_file_id((repos.uuid, "", 0), u""), mapping.revision_id_foreign_to_bzr((repos.uuid, "", 0)), None)}, ret)
 
95
        else:
 
96
            self.assertEquals({}, ret)
93
97
 
94
98
    def test_add_revision(self):
95
99
        repos_url = self.make_repository("a")
131
135
        self.client_copy("dc/pykleur", "dc/pygments", 1)
132
136
        self.client_delete('dc/pykleur')
133
137
        self.client_update("dc")
 
138
        if ra.version()[1] >= 5:
 
139
            from subvertpy.wc import (
 
140
                CONFLICT_CHOOSE_MINE_FULL,
 
141
                )
 
142
            self.client_resolve("dc/pykleur", 1, CONFLICT_CHOOSE_MINE_FULL)
134
143
        self.client_commit("dc", "commit")
135
144
        repos = Repository.open(repos_url)
136
145
        repos.set_layout(TrunkLayout(1))
412
421
 
413
422
        self.assertEqual([("tags/branchab", 2, True), 
414
423
                          ("tags/brancha", 2, True)], 
415
 
                list(repos.find_branchpaths(TrunkLayout(0), to_revnum=2)))
 
424
                list(repos.find_branchpaths(TrunkLayout(0), from_revnum=2, to_revnum=0)))
416
425
 
417
426
    def test_find_branchpaths_start_revno(self):
418
427
        repos_url = self.make_repository("a")
445
454
        self.client_delete("dc/tmp/branches/somefile")
446
455
        self.client_commit("dc", "My Message 2")
447
456
 
448
 
        Repository.open(repos_url).find_branchpaths(TrunkLayout(2))
 
457
        Repository.open(repos_url).find_branchpaths(TrunkLayout(2), from_revnum=2, to_revnum=0)
449
458
 
450
459
    def test_find_branchpaths_deleted_from_nobranch(self):
451
460
        repos_url = self.make_client("a", "dc")
459
468
        self.client_delete("dc/tmp/branches/somefile")
460
469
        self.client_commit("dc", "My Message 2")
461
470
 
462
 
        Repository.open(repos_url).find_branchpaths(TrunkLayout(1))
 
471
        Repository.open(repos_url).find_branchpaths(TrunkLayout(1), from_revnum=2, to_revnum=0)
463
472
 
464
473
    def test_find_branchpaths_moved_nobranch(self):
465
474
        repos_url = self.make_client("a", "dc")
479
488
 
480
489
        self.assertEqual([("t2/branches/brancha", 2, True), 
481
490
                          ("t2/branches/branchab", 2, True)], 
482
 
                list(repos.find_branchpaths(TrunkLayout(1), to_revnum=2)))
 
491
                list(repos.find_branchpaths(TrunkLayout(1), to_revnum=2, from_revnum=2)))
483
492
 
484
493
    def test_find_branchpaths_root(self):
485
494
        repos_url = self.make_repository("a")
488
497
        repos.set_layout(RootLayout())
489
498
 
490
499
        self.assertEqual([("", 0, True)], 
491
 
                list(repos.find_branchpaths(RootLayout(), to_revnum=0)))
 
500
                list(repos.find_branchpaths(RootLayout(), to_revnum=0, from_revnum=0)))
492
501
 
493
502
    def test_find_branchpaths_no_later(self):
494
503
        repos_url = self.make_repository("a")
497
506
        repos.set_layout(RootLayout())
498
507
 
499
508
        self.assertEqual([("", 0, True)], 
500
 
                list(repos.find_branchpaths(RootLayout(), to_revnum=0)))
 
509
                list(repos.find_branchpaths(RootLayout(), to_revnum=0, from_revnum=0)))
501
510
 
502
511
    def test_find_branchpaths_trunk_empty(self):
503
512
        repos_url = self.make_repository("a")
506
515
        repos.set_layout(TrunkLayout(0))
507
516
 
508
517
        self.assertEqual([], 
509
 
                list(repos.find_branchpaths(TrunkLayout(0), to_revnum=0)))
 
518
                list(repos.find_branchpaths(TrunkLayout(0), to_revnum=0, from_revnum=0)))
510
519
 
511
520
    def test_find_branchpaths_trunk_one(self):
512
521
        repos_url = self.make_repository("a")
520
529
        dc.close()
521
530
 
522
531
        self.assertEqual([("trunk", 1, True)], 
523
 
                list(repos.find_branchpaths(TrunkLayout(0), to_revnum=1)))
 
532
                list(repos.find_branchpaths(TrunkLayout(0), from_revnum=1, to_revnum=0)))
524
533
 
525
534
    def test_find_branchpaths_removed(self):
526
535
        repos_url = self.make_repository("a")
538
547
        dc.close()
539
548
 
540
549
        self.assertEqual([("trunk", 1, True)], 
541
 
                list(repos.find_branchpaths(TrunkLayout(0), to_revnum=1)))
542
 
        self.assertEqual([("trunk", 1, False)], 
543
 
                list(repos.find_branchpaths(TrunkLayout(0), to_revnum=2)))
 
550
                list(repos.find_branchpaths(TrunkLayout(0), from_revnum=2, to_revnum=0)))
 
551
        self.assertEqual([("trunk", 1, True)], 
 
552
                list(repos.find_branchpaths(TrunkLayout(0), from_revnum=1, to_revnum=0)))
544
553
 
545
554
    def test_has_revision(self):
546
555
        bzrdir = self.make_client_and_bzrdir('d', 'dc')
1004
1013
        self.assertEquals([
1005
1014
            ('file', mapping.generate_file_id((b.repository.uuid, "", 1), u"foo"), set([revid])),
1006
1015
            ('inventory', None, [revid]),
1007
 
            ('signatures', None, set([revid])),
 
1016
            ('signatures', None, set([])),
1008
1017
            ('revisions', None, [revid])], ch)
1009
1018
 
1010
1019
    def test_fetch_file_from_non_branch(self):