← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

 * bzr add now lists how many files were ignored per glob.  add --verbose
   lists the specific files.  (Aaron Bentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
160
160
        files within them.
161
161
    """
162
162
 
163
 
    old_tree.lock_read()
164
 
    try:
165
 
        new_tree.lock_read()
166
 
        try:
167
 
            return _compare_trees(old_tree, new_tree, want_unchanged,
168
 
                                  specific_files)
169
 
        finally:
170
 
            new_tree.unlock()
171
 
    finally:
172
 
        old_tree.unlock()
173
 
 
174
 
 
175
 
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files):
176
 
 
177
163
    from osutils import is_inside_any
178
164
    
179
165
    old_inv = old_tree.inventory