← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/test_workingtree.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:
tests/test_workingtree.py
92
92
        self.client_update("dc")
93
93
        self.build_tree({"dc/trunk/dir": None})
94
94
        self.client_add("dc/trunk/dir")
95
 
        config_set_scheme(Repository.open(repos_url), TrunkBranchingScheme(0), 
 
95
        config_set_scheme(Repository.open(repos_url), TrunkBranchingScheme(0),
96
96
                          None, True)
97
97
        Repository.open(repos_url).store_layout(TrunkLayout(0))
98
98
        self.assertRaises(NotBranchError, WorkingTree.open, "dc")
324
324
        self.client_commit("dc", "Bla")
325
325
        tree = WorkingTree.open("dc")
326
326
        tree.rename_one("bl", "bloe")
327
 
        
 
327
 
328
328
        basis_inv = tree.basis_tree().inventory
329
329
        inv = tree.read_working_inventory()
330
330
        self.assertFalse(inv.has_filename("bl"))
331
331
        self.assertTrue(inv.has_filename("bloe"))
332
 
        self.assertEqual(basis_inv.path2id("bl"), 
 
332
        self.assertEqual(basis_inv.path2id("bl"),
333
333
                         inv.path2id("bloe"))
334
334
        self.assertIs(None, inv.path2id("bl"))
335
335
        self.assertIs(None, basis_inv.path2id("bloe"))
337
337
    def test_empty_basis_tree(self):
338
338
        self.make_client('a', 'dc')
339
339
        wt = WorkingTree.open("dc")
340
 
        self.assertEqual(wt.branch.generate_revision_id(0), 
 
340
        self.assertEqual(wt.branch.generate_revision_id(0),
341
341
                         wt.basis_tree().inventory.revision_id)
342
342
        inv = Inventory()
343
343
        root_id = wt.branch.repository.get_mapping().generate_file_id((wt.branch.repository.uuid, "", 0), u"")
344
344
        inv.revision_id = wt.branch.generate_revision_id(0)
345
345
        inv.add_path('', 'directory', root_id).revision = inv.revision_id
346
 
                              
 
346
 
347
347
        self.assertEqual(inv, wt.basis_tree().inventory)
348
348
 
349
349
    def test_basis_tree(self):
366
366
        self.client_commit("dc", "Bla")
367
367
        tree = WorkingTree.open("dc")
368
368
        tree.move(["bl", "a"], "dir")
369
 
        
 
369
 
370
370
        basis_inv = tree.basis_tree().inventory
371
371
        inv = tree.read_working_inventory()
372
372
        self.assertFalse(inv.has_filename("bl"))
383
383
        self.build_tree({"dc/bl": "data"})
384
384
        tree = WorkingTree.open("dc")
385
385
        self.assertEqual([Branch.open(repos_url).last_revision()], tree.get_parent_ids())
386
 
 
 
386
 
387
387
    def test_delta(self):
388
388
        self.make_client('a', 'dc')
389
389
        self.build_tree({"dc/bl": "data"})
422
422
        self.assertEquals(None, result.master_branch)
423
423
        self.assertEquals(tree.branch, result.target_branch)
424
424
        self.assertEquals(br, result.source_branch)
425
 
 
 
425
 
426
426
    def test_working_inventory(self):
427
427
        self.make_client('a', 'dc')
428
428
        self.build_tree({"dc/bl": "data", "dc/foo/bar": "bla", "dc/foo/bla": "aa"})
563
563
 
564
564
        self.build_tree({"dc/trunk/bl": None})
565
565
        self.client_add("dc/trunk")
566
 
        
 
566
 
567
567
        tree = WorkingTree.open("dc")
568
568
        tree.set_pending_merges([
569
569
            tree.branch.repository.generate_revision_id(1, "branches/foo", tree.branch.mapping), "c"])
570
 
        self.assertEqual("%s:/branches/foo:1\n" % tree.branch.repository.uuid,  
 
570
        self.assertEqual("%s:/branches/foo:1\n" % tree.branch.repository.uuid,
571
571
                         self.client_get_prop("dc", "svk:merge"))
572
572
 
573
573
    def test_commit_callback(self):
794
794
        self.assertEquals([], generate_ignore_list({}))
795
795
 
796
796
    def test_simple(self):
797
 
        self.assertEquals(["./twin/peaks"], 
 
797
        self.assertEquals(["./twin/peaks"],
798
798
                generate_ignore_list({"twin": "peaks"}))
799
799
 
800
800
    def test_toplevel(self):
801
 
        self.assertEquals(["./twin*"], 
 
801
        self.assertEquals(["./twin*"],
802
802
                generate_ignore_list({"": "twin*"}))
803
803
 
804
804
    def test_multiple(self):
805
 
        self.assertEquals(["./twin*", "./twin/peaks"], 
 
805
        self.assertEquals(["./twin*", "./twin/peaks"],
806
806
                generate_ignore_list({"twin": "peaks", "": "twin*"}))
807
807
 
808
808