/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: Jelmer Vernooij
  • Date: 2012-01-30 14:12:36 UTC
  • mfrom: (6437.3.28 2.5)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120130141236-66k8qj1he6q2nq3r
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
import difflib
18
20
import os
19
21
import re
27
29
import tempfile
28
30
 
29
31
from bzrlib import (
30
 
    bzrdir,
 
32
    cleanup,
31
33
    cmdline,
32
 
    cleanup,
 
34
    controldir,
33
35
    errors,
34
36
    osutils,
35
37
    patiencediff,
356
358
    if old_url is None:
357
359
        old_url = default_location
358
360
    working_tree, branch, relpath = \
359
 
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
 
361
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
360
362
    lock_tree_or_branch(working_tree, branch)
361
363
    if consider_relpath and relpath != '':
362
364
        if working_tree is not None and apply_view:
370
372
        new_url = default_location
371
373
    if new_url != old_url:
372
374
        working_tree, branch, relpath = \
373
 
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
 
375
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
374
376
        lock_tree_or_branch(working_tree, branch)
375
377
        if consider_relpath and relpath != '':
376
378
            if working_tree is not None and apply_view: