← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-27 11:48:50 UTC
  • mto: This revision was merged to the branch mainline in revision 6173.
  • Revision ID: v.ladeuil+lp@free.fr-20110927114850-338r2mns0138klv0
https://launchpad.net/bugs/860424
Global options respect their hidden attribute

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
27
27
import tempfile
28
28
 
29
29
from bzrlib import (
 
30
    bzrdir,
 
31
    cmdline,
30
32
    cleanup,
31
 
    cmdline,
32
 
    controldir,
33
33
    errors,
34
34
    osutils,
35
35
    patiencediff,
356
356
    if old_url is None:
357
357
        old_url = default_location
358
358
    working_tree, branch, relpath = \
359
 
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
 
359
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
360
360
    lock_tree_or_branch(working_tree, branch)
361
361
    if consider_relpath and relpath != '':
362
362
        if working_tree is not None and apply_view:
370
370
        new_url = default_location
371
371
    if new_url != old_url:
372
372
        working_tree, branch, relpath = \
373
 
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
 
373
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
374
374
        lock_tree_or_branch(working_tree, branch)
375
375
        if consider_relpath and relpath != '':
376
376
            if working_tree is not None and apply_view: