← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-20 21:51:21 UTC
  • mto: This revision was merged to the branch mainline in revision 1877.
  • Revision ID: john@arbash-meinel.com-20060720215121-2e15a8db5ad5fac4
Add a function for adding runtime ignores.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1109
1109
        if ignorelist is not None:
1110
1110
            return ignorelist
1111
1111
 
1112
 
        ignore_globs = bzrlib.DEFAULT_IGNORE[:]
 
1112
        ignore_globs = (bzrlib.DEFAULT_IGNORE[:] +
 
1113
                        list(ignores.get_runtime_ignores()))
1113
1114
 
1114
1115
        ignore_globs.extend(ignores.get_user_ignores())
1115
1116