← 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 at utoronto
  • Date: 2005-08-27 04:42:41 UTC
  • mfrom: (1092.1.43)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050827044241-23d676133b9fc981
Merge of robertc@robertcollins.net-20050826013321-52eee1f1da679ee9

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