/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 bzrlib/tests/workingtree_implementations/test_commit.py

  • Committer: John Arbash Meinel
  • Date: 2007-11-16 01:39:55 UTC
  • mfrom: (2998 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3003.
  • Revision ID: john@arbash-meinel.com-20071116013955-3zy651u2crhk31xx
[merge] bzr.dev 2998

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_commit.py
31
31
    )
32
32
from bzrlib.errors import (NotBranchError, NotVersionedError, 
33
33
                           UnsupportedOperation)
34
 
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
35
 
from bzrlib.tests import TestSkipped, TestCase
 
34
from bzrlib.osutils import pathjoin, getcwd
 
35
from bzrlib.tests import TestCase
36
36
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
37
37
from bzrlib.trace import mutter
38
38
from bzrlib.workingtree import (TreeEntry, TreeDirectory, TreeFile, TreeLink,
105
105
 
106
106
        tree_a.lock_read()
107
107
        try:
108
 
            root_id = tree_a.inventory.root.file_id
 
108
            root_id = tree_a.get_root_id()
109
109
            paths = [(path, ie.file_id)
110
110
                     for path, ie in tree_a.iter_entries_by_dir()]
111
111
        finally:
126
126
 
127
127
        tree_a.lock_read()
128
128
        try:
129
 
            root_id = tree_a.inventory.root.file_id
 
129
            root_id = tree_a.get_root_id()
130
130
            paths = [(path, ie.file_id)
131
131
                     for path, ie in tree_a.iter_entries_by_dir()]
132
132
        finally:
145
145
 
146
146
        tree_a.lock_read()
147
147
        try:
148
 
            root_id = tree_a.inventory.root.file_id
 
148
            root_id = tree_a.get_root_id()
149
149
        finally:
150
150
            tree_a.unlock()
151
151