← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2005-05-11 08:11:37 UTC
  • Revision ID: mbp@sourcefrog.net-20050511081137-b4a639321fbe37bb
- change 'file_list' to more explanatory 'specific_files'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
67
67
    print >>to_file
68
68
 
69
69
 
70
 
def show_diff(b, revision, file_list):
 
70
def show_diff(b, revision, specific_files):
71
71
    import sys
72
72
 
73
73
    if revision == None:
90
90
    # be usefully made into a much faster special case.
91
91
 
92
92
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
93
 
                          file_list=file_list)
 
93
                          specific_files=specific_files)
94
94
 
95
95
    for path, file_id, kind in delta.removed:
96
96
        print '*** removed %s %r' % (kind, path)
199
199
 
200
200
 
201
201
 
202
 
def compare_trees(old_tree, new_tree, want_unchanged, file_list=None):
 
202
def compare_trees(old_tree, new_tree, want_unchanged, specific_files=None):
203
203
    """Describe changes from one tree to another.
204
204
 
205
205
    Returns a TreeDelta with details of added, modified, renamed, and
212
212
    want_unchanged
213
213
        If true, also list files unchanged from one version to the next.
214
214
 
215
 
    file_list
216
 
        If true, only check for changes to specified files.        
 
215
    specific_files
 
216
        If true, only check for changes to specified files.
217
217
    """
218
218
    old_inv = old_tree.inventory
219
219
    new_inv = new_tree.inventory
220
220
    delta = TreeDelta()
221
221
    mutter('start compare_trees')
222
222
 
223
 
    if file_list:
224
 
        file_list = ImmutableSet(file_list)
 
223
    if specific_files:
 
224
        specific_files = ImmutableSet(specific_files)
225
225
 
226
226
    for file_id in old_tree:
227
227
        if file_id in new_tree:
237
237
            old_path = old_inv.id2path(file_id)
238
238
            new_path = new_inv.id2path(file_id)
239
239
 
240
 
            if file_list:
241
 
                if (old_path not in file_list
242
 
                    and new_path not in file_list):
 
240
            if specific_files:
 
241
                if (old_path not in specific_files
 
242
                    and new_path not in specific_files):
243
243
                    continue
244
244
 
245
245
            if kind == 'file':
270
270
        if file_id in old_inv:
271
271
            continue
272
272
        new_path = new_inv.id2path(file_id)
273
 
        if file_list:
274
 
            if new_path not in file_list:
 
273
        if specific_files:
 
274
            if new_path not in specific_files:
275
275
                continue
276
276
        kind = new_inv.get_file_kind(file_id)
277
277
        delta.added.append((new_path, file_id, kind))