/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 breezy/tests/per_workingtree/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_workingtree.py
20
20
import errno
21
21
import os
22
22
 
23
 
from brzlib import (
 
23
from breezy import (
24
24
    branch,
25
25
    bzrdir,
26
26
    config,
33
33
    trace,
34
34
    urlutils,
35
35
    )
36
 
from brzlib.errors import (
 
36
from breezy.errors import (
37
37
    UnsupportedOperation,
38
38
    PathsNotVersionedError,
39
39
    )
40
 
from brzlib.inventory import Inventory
41
 
from brzlib.mutabletree import MutableTree
42
 
from brzlib.osutils import pathjoin, getcwd, has_symlinks
43
 
from brzlib.tests import (
 
40
from breezy.inventory import Inventory
 
41
from breezy.mutabletree import MutableTree
 
42
from breezy.osutils import pathjoin, getcwd, has_symlinks
 
43
from breezy.tests import (
44
44
    features,
45
45
    TestSkipped,
46
46
    TestNotApplicable,
47
47
    )
48
 
from brzlib.tests.per_workingtree import TestCaseWithWorkingTree
49
 
from brzlib.workingtree import (
 
48
from breezy.tests.per_workingtree import TestCaseWithWorkingTree
 
49
from breezy.workingtree import (
50
50
    TreeDirectory,
51
51
    TreeFile,
52
52
    TreeLink,
53
53
    InventoryWorkingTree,
54
54
    WorkingTree,
55
55
    )
56
 
from brzlib.conflicts import ConflictList, TextConflict, ContentsConflict
 
56
from breezy.conflicts import ConflictList, TextConflict, ContentsConflict
57
57
 
58
58
 
59
59
class TestWorkingTree(TestCaseWithWorkingTree):
295
295
        "bzr add" adds the parent as necessary, but simple working tree add
296
296
        doesn't do that.
297
297
        """
298
 
        from brzlib.errors import NotVersionedError
 
298
        from breezy.errors import NotVersionedError
299
299
        wt = self.make_branch_and_tree('.')
300
300
        self.build_tree(['foo/',
301
301
                         'foo/hello'])
569
569
        self.assertEqual(['A'], old_tree.get_parent_ids())
570
570
 
571
571
    def test_merge_revert(self):
572
 
        from brzlib.merge import merge_inner
 
572
        from breezy.merge import merge_inner
573
573
        this = self.make_branch_and_tree('b1')
574
574
        self.build_tree_contents([('b1/a', 'a test\n'), ('b1/b', 'b test\n')])
575
575
        this.add(['a', 'b'])
688
688
        self.assertEqual(mm, d)
689
689
 
690
690
    def test_conflicts(self):
691
 
        from brzlib.tests.test_conflicts import example_conflicts
 
691
        from breezy.tests.test_conflicts import example_conflicts
692
692
        tree = self.make_branch_and_tree('master')
693
693
        try:
694
694
            tree.set_conflicts(example_conflicts)
705
705
                          tree2.conflicts)
706
706
 
707
707
    def make_merge_conflicts(self):
708
 
        from brzlib.merge import merge_inner
 
708
        from breezy.merge import merge_inner
709
709
        tree = self.make_branch_and_tree('mine')
710
710
        with file('mine/bloo', 'wb') as f: f.write('one')
711
711
        with file('mine/blo', 'wb') as f: f.write('on')