~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

Changes from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
160
160
        the next.
161
161
 
162
162
    specific_files
163
 
        If true, only check for changes to specified names or
164
 
        files within them.  By default, unversioned files are ignored.
 
163
        If supplied, only check for changes to specified names or
 
164
        files within them.  When mapping filenames to ids, all matches in all
 
165
        trees (including optional extra_trees) are used, and all children of
 
166
        matched directories are included.
165
167
 
166
168
    extra_trees
167
169
        If non-None, a list of more trees to use for looking up file_ids from
180
182
            trees = (new_tree, old_tree)
181
183
            if extra_trees is not None:
182
184
                trees = trees + tuple(extra_trees)
183
 
            specific_file_ids = tree.specified_file_ids(specific_files, 
 
185
            specific_file_ids = tree.find_ids_across_trees(specific_files, 
184
186
                trees, require_versioned=require_versioned)
185
187
            return _compare_trees(old_tree, new_tree, want_unchanged,
186
188
                                  specific_file_ids)