← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2005-09-12 13:48:32 UTC
  • mfrom: (1185.3.4)
  • mto: (1185.1.16)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: abentley@panoramicfeedback.com-20050912134832-c23db11dc63170b6
Merged from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
21
21
# it's not predictable when it will be written out.
22
22
 
23
23
import os
24
 
    
 
24
import fnmatch
 
25
        
25
26
import bzrlib.tree
26
 
from errors import BzrCheckError
27
 
from trace import mutter
 
27
from bzrlib.osutils import appendpath, file_kind, isdir, splitpath
 
28
from bzrlib.errors import BzrCheckError
 
29
from bzrlib.trace import mutter
28
30
 
29
31
class WorkingTree(bzrlib.tree.Tree):
30
32
    """Working copy tree.
135
137
 
136
138
        Skips the control directory.
137
139
        """
138
 
        from osutils import appendpath, file_kind
139
 
        import os
140
 
 
141
140
        inv = self._inventory
142
141
 
143
142
        def descend(from_dir_relpath, from_dir_id, dp):
205
204
        Currently returned depth-first, sorted by name within directories.
206
205
        """
207
206
        ## TODO: Work from given directory downwards
208
 
        from osutils import isdir, appendpath
209
 
        
210
207
        for path, dir_entry in self.inventory.directories():
211
208
            mutter("search for unknowns in %r" % path)
212
209
            dirabs = self.abspath(path)
269
266
        # Eventually it should be replaced with something more
270
267
        # accurate.
271
268
        
272
 
        import fnmatch
273
 
        from osutils import splitpath
274
 
        
275
269
        for pat in self.get_ignore_list():
276
270
            if '/' in pat or '\\' in pat:
277
271
                
290
284
                    return pat
291
285
        else:
292
286
            return None
293
 
        
 
 
b'\\ No newline at end of file'
 
287