/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
269
269
        new_tree = tree
270
270
    else:
271
271
        new_tree = spec_tree(new_revision_spec)
 
272
    if new_tree is not tree:
 
273
        extra_trees = (tree,)
 
274
    else:
 
275
        extra_trees = None
272
276
 
273
277
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
274
278
                           external_diff_options,
275
 
                           old_label=old_label, new_label=new_label)
 
279
                           old_label=old_label, new_label=new_label,
 
280
                           extra_trees=extra_trees)
276
281
 
277
282
 
278
283
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
279
284
                    external_diff_options=None,
280
 
                    old_label='a/', new_label='b/'):
 
285
                    old_label='a/', new_label='b/',
 
286
                    extra_trees=None):
281
287
    """Show in text form the changes from one tree to another.
282
288
 
283
289
    to_files
285
291
 
286
292
    external_diff_options
287
293
        If set, use an external GNU diff and pass these options.
 
294
 
 
295
    extra_trees
 
296
        If set, more Trees to use for looking up file ids
288
297
    """
289
298
    old_tree.lock_read()
290
299
    try:
292
301
        try:
293
302
            return _show_diff_trees(old_tree, new_tree, to_file,
294
303
                                    specific_files, external_diff_options,
295
 
                                    old_label=old_label, new_label=new_label)
 
304
                                    old_label=old_label, new_label=new_label,
 
305
                                    extra_trees=extra_trees)
296
306
        finally:
297
307
            new_tree.unlock()
298
308
    finally:
301
311
 
302
312
def _show_diff_trees(old_tree, new_tree, to_file,
303
313
                     specific_files, external_diff_options, 
304
 
                     old_label='a/', new_label='b/' ):
 
314
                     old_label='a/', new_label='b/', extra_trees=None):
305
315
 
306
316
    # GNU Patch uses the epoch date to detect files that are being added
307
317
    # or removed in a diff.
310
320
    # TODO: Generation of pseudo-diffs for added/deleted files could
311
321
    # be usefully made into a much faster special case.
312
322
 
313
 
    _raise_if_doubly_unversioned(specific_files, old_tree, new_tree)
314
 
 
315
323
    if external_diff_options:
316
324
        assert isinstance(external_diff_options, basestring)
317
325
        opts = external_diff_options.split()
321
329
        diff_file = internal_diff
322
330
    
323
331
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
324
 
                          specific_files=specific_files)
 
332
                          specific_files=specific_files, 
 
333
                          extra_trees=extra_trees, require_versioned=True)
325
334
 
326
335
    has_changes = 0
327
336
    for path, file_id, kind in delta.removed:
379
388
    return time.strftime('%Y-%m-%d %H:%M:%S +0000', tm)
380
389
 
381
390
 
382
 
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
383
 
    """Complain if paths are not versioned in either tree."""
384
 
    if not specific_files:
385
 
        return
386
 
    old_unversioned = old_tree.filter_unversioned_files(specific_files)
387
 
    new_unversioned = new_tree.filter_unversioned_files(specific_files)
388
 
    unversioned = old_unversioned.intersection(new_unversioned)
389
 
    if unversioned:
390
 
        raise errors.PathsNotVersionedError(sorted(unversioned))
391
 
    
392
 
 
393
391
def _raise_if_nonexistent(paths, old_tree, new_tree):
394
392
    """Complain if paths are not in either inventory or tree.
395
393