1
# Copyright (C) 2005-2010 Canonical Ltd.
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd.
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
293
@deprecated_function(deprecated_in((2, 2, 0)))
294
289
def get_trees_and_branches_to_diff(path_list, revision_specs, old_url, new_url,
295
290
apply_view=True):
296
291
"""Get the trees and specific files to diff given a list of paths.
316
311
a tuple of (old_tree, new_tree, old_branch, new_branch,
317
312
specific_files, extra_trees) where extra_trees is a sequence of
318
additional trees to search in for file-ids. The trees and branches
321
op = cleanup.OperationWithCleanups(get_trees_and_branches_to_diff_locked)
322
return op.run_simple(path_list, revision_specs, old_url, new_url,
323
op.add_cleanup, apply_view=apply_view)
326
def get_trees_and_branches_to_diff_locked(
327
path_list, revision_specs, old_url, new_url, add_cleanup, apply_view=True):
328
"""Get the trees and specific files to diff given a list of paths.
330
This method works out the trees to be diff'ed and the files of
331
interest within those trees.
334
the list of arguments passed to the diff command
335
:param revision_specs:
336
Zero, one or two RevisionSpecs from the diff command line,
337
saying what revisions to compare.
339
The url of the old branch or tree. If None, the tree to use is
340
taken from the first path, if any, or the current working tree.
342
The url of the new branch or tree. If None, the tree to use is
343
taken from the first path, if any, or the current working tree.
345
a callable like Command.add_cleanup. get_trees_and_branches_to_diff
346
will register cleanups that must be run to unlock the trees, etc.
348
if True and a view is set, apply the view or check that the paths
351
a tuple of (old_tree, new_tree, old_branch, new_branch,
352
specific_files, extra_trees) where extra_trees is a sequence of
353
additional trees to search in for file-ids. The trees and branches
354
will be read-locked until the cleanups registered via the add_cleanup
313
additional trees to search in for file-ids.
357
315
# Get the old and new revision specs
358
316
old_revision_spec = None
381
339
default_location = path_list[0]
382
340
other_paths = path_list[1:]
384
def lock_tree_or_branch(wt, br):
387
add_cleanup(wt.unlock)
390
add_cleanup(br.unlock)
392
342
# Get the old location
393
343
specific_files = []
394
344
if old_url is None:
395
345
old_url = default_location
396
346
working_tree, branch, relpath = \
397
347
bzrdir.BzrDir.open_containing_tree_or_branch(old_url)
398
lock_tree_or_branch(working_tree, branch)
399
348
if consider_relpath and relpath != '':
400
349
if working_tree is not None and apply_view:
401
350
views.check_path_in_view(working_tree, relpath)
409
358
if new_url != old_url:
410
359
working_tree, branch, relpath = \
411
360
bzrdir.BzrDir.open_containing_tree_or_branch(new_url)
412
lock_tree_or_branch(working_tree, branch)
413
361
if consider_relpath and relpath != '':
414
362
if working_tree is not None and apply_view:
415
363
views.check_path_in_view(working_tree, relpath)
463
411
old_label='a/', new_label='b/',
464
412
extra_trees=None,
465
413
path_encoding='utf8',
468
415
"""Show in text form the changes from one tree to another.
470
:param to_file: The output stream.
471
:param specific_files:Include only changes to these files - None for all
473
:param external_diff_options: If set, use an external GNU diff and pass
475
:param extra_trees: If set, more Trees to use for looking up file ids
476
:param path_encoding: If set, the path will be encoded as specified,
477
otherwise is supposed to be utf8
478
:param format_cls: Formatter class (DiffTree subclass)
421
Include only changes to these files - None for all changes.
423
external_diff_options
424
If set, use an external GNU diff and pass these options.
427
If set, more Trees to use for looking up file ids
430
If set, the path will be encoded as specified, otherwise is supposed
480
if format_cls is None:
481
format_cls = DiffTree
482
433
old_tree.lock_read()
484
435
if extra_trees is not None:
487
438
new_tree.lock_read()
489
differ = format_cls.from_trees_options(old_tree, new_tree, to_file,
491
external_diff_options,
492
old_label, new_label, using)
440
differ = DiffTree.from_trees_options(old_tree, new_tree, to_file,
442
external_diff_options,
443
old_label, new_label, using)
493
444
return differ.show_diff(specific_files, extra_trees)
495
446
new_tree.unlock()
503
454
def _patch_header_date(tree, file_id, path):
504
455
"""Returns a timestamp suitable for use in a patch header."""
506
mtime = tree.get_file_mtime(file_id, path)
507
except errors.FileTimestampUnavailable:
456
mtime = tree.get_file_mtime(file_id, path)
509
457
return timestamp.format_patch_date(mtime)
733
681
def from_string(klass, command_string, old_tree, new_tree, to_file,
734
682
path_encoding='utf-8'):
735
command_template = cmdline.split(command_string)
683
command_template = commands.shlex_split_unicode(command_string)
736
684
if '@' not in command_string:
737
685
command_template.extend(['@old_path', '@new_path'])
738
686
return klass(command_template, old_tree, new_tree, to_file,
801
mtime = tree.get_file_mtime(file_id)
802
except errors.FileTimestampUnavailable:
805
os.utime(full_path, (mtime, mtime))
806
748
if not allow_write:
807
749
osutils.make_readonly(full_path)
750
mtime = tree.get_file_mtime(file_id)
751
os.utime(full_path, (mtime, mtime))
810
754
def _prepare_files(self, file_id, old_path, new_path, force_temp=False,
932
876
def show_diff(self, specific_files, extra_trees=None):
933
877
"""Write tree diff to self.to_file
935
:param specific_files: the specific files to compare (recursive)
879
:param sepecific_files: the specific files to compare (recursive)
936
880
:param extra_trees: extra trees to use for mapping paths to file_ids
added
removed
bzrlib/diff.py
