← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

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,
39
41
    )
40
42
 
41
43
from bzrlib.workingtree import WorkingTree
 
44
from bzrlib.i18n import gettext
42
45
""")
43
46
 
44
47
from bzrlib.registry import (
355
358
    if old_url is None:
356
359
        old_url = default_location
357
360
    working_tree, branch, relpath = \
358
 
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
 
361
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
359
362
    lock_tree_or_branch(working_tree, branch)
360
363
    if consider_relpath and relpath != '':
361
364
        if working_tree is not None and apply_view:
369
372
        new_url = default_location
370
373
    if new_url != old_url:
371
374
        working_tree, branch, relpath = \
372
 
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
 
375
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
373
376
        lock_tree_or_branch(working_tree, branch)
374
377
        if consider_relpath and relpath != '':
375
378
            if working_tree is not None and apply_view:
393
396
            if view_files:
394
397
                specific_files = view_files
395
398
                view_str = views.view_display_str(view_files)
396
 
                note("*** Ignoring files outside view. View is %s" % view_str)
 
399
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
397
400
 
398
401
    # Get extra trees that ought to be searched for file-ids
399
402
    extra_trees = None