/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

  • Committer: Ian Clatworthy
  • Date: 2008-01-04 00:26:05 UTC
  • mto: (3164.2.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3166.
  • Revision ID: ian.clatworthy@internode.on.net-20080104002605-wusiuhvzkpt8ovcd
diff without arguments means the current tree, not the current directory

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
388
388
 
389
389
    other_paths = []
390
390
    make_paths_wt_relative = True
 
391
    consider_relpath = True
391
392
    if path_list is None or len(path_list) == 0:
392
 
        # If no path is given, assume the current directory
 
393
        # If no path is given, the current working tree is used
393
394
        default_location = u'.'
 
395
        consider_relpath = False
394
396
    elif old_url is not None and new_url is not None:
395
397
        other_paths = path_list
396
398
        make_paths_wt_relative = False
404
406
        old_url = default_location
405
407
    working_tree, branch, relpath = \
406
408
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
407
 
    if relpath != '':
 
409
    if consider_relpath and relpath != '':
408
410
        specific_files.append(relpath)
409
411
    old_tree = _get_tree_to_diff(old_revision_spec, working_tree, branch)
410
412
 
414
416
    if new_url != old_url:
415
417
        working_tree, branch, relpath = \
416
418
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
417
 
        if relpath != '':
 
419
        if consider_relpath and relpath != '':
418
420
            specific_files.append(relpath)
419
421
    new_tree = _get_tree_to_diff(new_revision_spec, working_tree, branch,
420
422
        basis_is_default=working_tree is None)