~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Kent Gibson
  • Date: 2006-12-08 12:59:11 UTC
  • mto: (2178.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2179.
  • Revision ID: warthog618@gmail.com-20061208125911-wsnbxy7aydzjb47s
Implement JAM's review suggestions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
53
53
    bzrdir,
54
54
    conflicts as _mod_conflicts,
55
55
    errors,
56
 
    glob,
57
56
    generate_ids,
 
57
    globbing,
58
58
    ignores,
59
59
    merge,
60
60
    osutils,
1251
1251
        self._ignoreset = ignore_globs
1252
1252
        return ignore_globs
1253
1253
 
1254
 
    def flush_ignore_list_cache(self):
 
1254
    def _flush_ignore_list_cache(self):
1255
1255
        """Resets the cached ignore list to force a cache rebuild."""
1256
1256
        self._ignoreset = None
1257
1257
        self._ignoreglobster = None
1266
1266
        be ignored, otherwise None.  So this can simply be used as a
1267
1267
        boolean if desired."""
1268
1268
        if getattr(self, '_ignoreglobster', None) is None:
1269
 
            self._ignoreglobster = glob.Globster(self.get_ignore_list())
 
1269
            self._ignoreglobster = globbing.Globster(self.get_ignore_list())
1270
1270
        return self._ignoreglobster.match(filename)
1271
1271
 
1272
1272
    def kind(self, file_id):