← 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-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

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,
39
39
    )
40
40
 
41
41
from bzrlib.workingtree import WorkingTree
42
 
from bzrlib.i18n import gettext
43
42
""")
44
43
 
45
44
from bzrlib.registry import (
46
45
    Registry,
47
46
    )
 
47
from bzrlib.symbol_versioning import (
 
48
    deprecated_function,
 
49
    deprecated_in,
 
50
    )
48
51
from bzrlib.trace import mutter, note, warning
49
52
 
50
53
 
285
288
                        new_abspath, e)
286
289
 
287
290
 
 
291
@deprecated_function(deprecated_in((2, 2, 0)))
 
292
def get_trees_and_branches_to_diff(path_list, revision_specs, old_url, new_url,
 
293
                                   apply_view=True):
 
294
    """Get the trees and specific files to diff given a list of paths.
 
295
 
 
296
    This method works out the trees to be diff'ed and the files of
 
297
    interest within those trees.
 
298
 
 
299
    :param path_list:
 
300
        the list of arguments passed to the diff command
 
301
    :param revision_specs:
 
302
        Zero, one or two RevisionSpecs from the diff command line,
 
303
        saying what revisions to compare.
 
304
    :param old_url:
 
305
        The url of the old branch or tree. If None, the tree to use is
 
306
        taken from the first path, if any, or the current working tree.
 
307
    :param new_url:
 
308
        The url of the new branch or tree. If None, the tree to use is
 
309
        taken from the first path, if any, or the current working tree.
 
310
    :param apply_view:
 
311
        if True and a view is set, apply the view or check that the paths
 
312
        are within it
 
313
    :returns:
 
314
        a tuple of (old_tree, new_tree, old_branch, new_branch,
 
315
        specific_files, extra_trees) where extra_trees is a sequence of
 
316
        additional trees to search in for file-ids.  The trees and branches
 
317
        are not locked.
 
318
    """
 
319
    op = cleanup.OperationWithCleanups(get_trees_and_branches_to_diff_locked)
 
320
    return op.run_simple(path_list, revision_specs, old_url, new_url,
 
321
            op.add_cleanup, apply_view=apply_view)
 
322
    
 
323
 
288
324
def get_trees_and_branches_to_diff_locked(
289
325
    path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
290
326
    """Get the trees and specific files to diff given a list of paths.
356
392
    if old_url is None:
357
393
        old_url = default_location
358
394
    working_tree, branch, relpath = \
359
 
        controldir.ControlDir.open_containing_tree_or_branch(old_url)
 
395
        bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
360
396
    lock_tree_or_branch(working_tree, branch)
361
397
    if consider_relpath and relpath != '':
362
398
        if working_tree is not None and apply_view:
370
406
        new_url = default_location
371
407
    if new_url != old_url:
372
408
        working_tree, branch, relpath = \
373
 
            controldir.ControlDir.open_containing_tree_or_branch(new_url)
 
409
            bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
374
410
        lock_tree_or_branch(working_tree, branch)
375
411
        if consider_relpath and relpath != '':
376
412
            if working_tree is not None and apply_view:
394
430
            if view_files:
395
431
                specific_files = view_files
396
432
                view_str = views.view_display_str(view_files)
397
 
                note(gettext("*** Ignoring files outside view. View is %s") % view_str)
 
433
                note("*** Ignoring files outside view. View is %s" % view_str)
398
434
 
399
435
    # Get extra trees that ought to be searched for file-ids
400
436
    extra_trees = None
401
437
    if working_tree is not None and working_tree not in (old_tree, new_tree):
402
438
        extra_trees = (working_tree,)
403
 
    return (old_tree, new_tree, old_branch, new_branch,
404
 
            specific_files, extra_trees)
 
439
    return old_tree, new_tree, old_branch, new_branch, specific_files, extra_trees
405
440
 
406
441
 
407
442
def _get_tree_to_diff(spec, tree=None, branch=None, basis_is_default=True):