48
49
# TODO: Change the parameter 'rev_id' to 'revision_id' to be consistent with
49
50
# the rest of the code; add a deprecation of the old name.
57
from .branch import Branch
58
from contextlib import ExitStack
60
from .errors import (BzrError,
64
from .osutils import (get_user_encoding,
67
minimum_path_selection,
69
from .trace import mutter, note, is_quiet
70
from .tree import TreeChange
71
from .urlutils import unescape_for_display
72
from .i18n import gettext
75
class PointlessCommit(BzrError):
77
_fmt = "No changes to commit"
80
class CannotCommitSelectedFileMerge(BzrError):
82
_fmt = 'Selected-file commit of merges is not supported yet:'\
83
' files %(files_str)s'
85
def __init__(self, files):
86
files_str = ', '.join(files)
87
BzrError.__init__(self, files=files, files_str=files_str)
90
def filter_excluded(iter_changes, exclude):
91
"""Filter exclude filenames.
93
:param iter_changes: iter_changes function
94
:param exclude: List of paths to exclude
95
:return: iter_changes function
97
for change in iter_changes:
98
new_excluded = (change.path[1] is not None and
99
is_inside_any(exclude, change.path[1]))
101
old_excluded = (change.path[0] is not None and
102
is_inside_any(exclude, change.path[0]))
104
if old_excluded and new_excluded:
107
if old_excluded or new_excluded:
108
# TODO(jelmer): Perhaps raise an error here instead?
59
from bzrlib.branch import Branch
60
from bzrlib.cleanup import OperationWithCleanups
62
from bzrlib.errors import (BzrError, PointlessCommit,
66
from bzrlib.osutils import (get_user_encoding,
68
minimum_path_selection,
71
from bzrlib.trace import mutter, note, is_quiet
72
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
73
from bzrlib import symbol_versioning
74
from bzrlib.urlutils import unescape_for_display
75
from bzrlib.i18n import gettext
114
77
class NullCommitReporter(object):
115
78
"""I report on progress of a commit."""
117
def started(self, revno, revid, location):
80
def started(self, revno, revid, location=None):
82
symbol_versioning.warn("As of bzr 1.0 you must pass a location "
83
"to started.", DeprecationWarning,
120
87
def snapshot_change(self, change, path):
283
265
:param lossy: When committing to a foreign VCS, ignore any
284
266
data that can not be natively represented.
286
with ExitStack() as stack:
287
self.revprops = revprops or {}
288
# XXX: Can be set on __init__ or passed in - this is a bit ugly.
289
self.config_stack = config or self.config_stack
290
mutter('preparing to commit')
292
if working_tree is None:
293
raise BzrError("working_tree must be passed into commit().")
295
self.work_tree = working_tree
296
self.branch = self.work_tree.branch
297
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
298
if not self.branch.repository.supports_rich_root():
299
raise errors.RootNotRich()
300
if message_callback is None:
301
if message is not None:
302
if isinstance(message, bytes):
303
message = message.decode(get_user_encoding())
305
def message_callback(x):
308
raise BzrError("The message or message_callback keyword"
309
" parameter is required for commit().")
311
self.bound_branch = None
312
self.any_entries_deleted = False
313
if exclude is not None:
314
self.exclude = sorted(
315
minimum_path_selection(exclude))
319
self.master_branch = None
320
self.recursive = recursive
322
# self.specific_files is None to indicate no filter, or any iterable to
323
# indicate a filter - [] means no files at all, as per iter_changes.
324
if specific_files is not None:
325
self.specific_files = sorted(
326
minimum_path_selection(specific_files))
328
self.specific_files = None
330
self.allow_pointless = allow_pointless
331
self.message_callback = message_callback
332
self.timestamp = timestamp
333
self.timezone = timezone
334
self.committer = committer
336
self.verbose = verbose
338
stack.enter_context(self.work_tree.lock_write())
339
self.parents = self.work_tree.get_parent_ids()
340
self.pb = ui.ui_factory.nested_progress_bar()
341
stack.callback(self.pb.finished)
342
self.basis_revid = self.work_tree.last_revision()
343
self.basis_tree = self.work_tree.basis_tree()
344
stack.enter_context(self.basis_tree.lock_read())
345
# Cannot commit with conflicts present.
346
if len(self.work_tree.conflicts()) > 0:
347
raise ConflictsInTree
349
# Setup the bound branch variables as needed.
350
self._check_bound_branch(stack, possible_master_transports)
351
if self.config_stack is None:
352
self.config_stack = self.work_tree.get_config_stack()
354
# Check that the working tree is up to date
355
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
357
# Complete configuration setup
358
if reporter is not None:
359
self.reporter = reporter
360
elif self.reporter is None:
361
self.reporter = self._select_reporter()
363
# Setup the progress bar. As the number of files that need to be
364
# committed in unknown, progress is reported as stages.
365
# We keep track of entries separately though and include that
366
# information in the progress bar during the relevant stages.
367
self.pb_stage_name = ""
368
self.pb_stage_count = 0
369
self.pb_stage_total = 5
268
operation = OperationWithCleanups(self._commit)
269
self.revprops = revprops or {}
270
# XXX: Can be set on __init__ or passed in - this is a bit ugly.
271
self.config = config or self.config
272
return operation.run(
277
specific_files=specific_files,
279
allow_pointless=allow_pointless,
282
working_tree=working_tree,
285
message_callback=message_callback,
288
possible_master_transports=possible_master_transports,
291
def _commit(self, operation, message, timestamp, timezone, committer,
292
specific_files, rev_id, allow_pointless, strict, verbose,
293
working_tree, local, reporter, message_callback, recursive,
294
exclude, possible_master_transports, lossy):
295
mutter('preparing to commit')
297
if working_tree is None:
298
raise BzrError("working_tree must be passed into commit().")
300
self.work_tree = working_tree
301
self.branch = self.work_tree.branch
302
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
303
if not self.branch.repository.supports_rich_root():
304
raise errors.RootNotRich()
305
if message_callback is None:
306
if message is not None:
307
if isinstance(message, str):
308
message = message.decode(get_user_encoding())
309
message_callback = lambda x: message
311
raise BzrError("The message or message_callback keyword"
312
" parameter is required for commit().")
314
self.bound_branch = None
315
self.any_entries_deleted = False
316
if exclude is not None:
317
self.exclude = sorted(
318
minimum_path_selection(exclude))
322
self.master_branch = None
323
self.recursive = recursive
325
# self.specific_files is None to indicate no filter, or any iterable to
326
# indicate a filter - [] means no files at all, as per iter_changes.
327
if specific_files is not None:
328
self.specific_files = sorted(
329
minimum_path_selection(specific_files))
331
self.specific_files = None
333
self.allow_pointless = allow_pointless
334
self.message_callback = message_callback
335
self.timestamp = timestamp
336
self.timezone = timezone
337
self.committer = committer
339
self.verbose = verbose
341
self.work_tree.lock_write()
342
operation.add_cleanup(self.work_tree.unlock)
343
self.parents = self.work_tree.get_parent_ids()
344
# We can use record_iter_changes IFF iter_changes is compatible with
345
# the command line parameters, and the repository has fast delta
346
# generation. See bug 347649.
347
self.use_record_iter_changes = (
349
not self.branch.repository._format.supports_tree_reference and
350
(self.branch.repository._format.fast_deltas or
351
len(self.parents) < 2))
352
self.pb = ui.ui_factory.nested_progress_bar()
353
operation.add_cleanup(self.pb.finished)
354
self.basis_revid = self.work_tree.last_revision()
355
self.basis_tree = self.work_tree.basis_tree()
356
self.basis_tree.lock_read()
357
operation.add_cleanup(self.basis_tree.unlock)
358
# Cannot commit with conflicts present.
359
if len(self.work_tree.conflicts()) > 0:
360
raise ConflictsInTree
362
# Setup the bound branch variables as needed.
363
self._check_bound_branch(operation, possible_master_transports)
365
# Check that the working tree is up to date
366
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
368
# Complete configuration setup
369
if reporter is not None:
370
self.reporter = reporter
371
elif self.reporter is None:
372
self.reporter = self._select_reporter()
373
if self.config is None:
374
self.config = self.branch.get_config()
376
self._set_specific_file_ids()
378
# Setup the progress bar. As the number of files that need to be
379
# committed in unknown, progress is reported as stages.
380
# We keep track of entries separately though and include that
381
# information in the progress bar during the relevant stages.
382
self.pb_stage_name = ""
383
self.pb_stage_count = 0
384
self.pb_stage_total = 5
385
if self.bound_branch:
386
# 2 extra stages: "Uploading data to master branch" and "Merging
387
# tags to master branch"
388
self.pb_stage_total += 2
389
self.pb.show_pct = False
390
self.pb.show_spinner = False
391
self.pb.show_eta = False
392
self.pb.show_count = True
393
self.pb.show_bar = True
395
self._gather_parents()
396
# After a merge, a selected file commit is not supported.
397
# See 'bzr help merge' for an explanation as to why.
398
if len(self.parents) > 1 and self.specific_files is not None:
399
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
400
# Excludes are a form of selected file commit.
401
if len(self.parents) > 1 and self.exclude:
402
raise errors.CannotCommitSelectedFileMerge(self.exclude)
404
# Collect the changes
405
self._set_progress_stage("Collecting changes", counter=True)
407
self.builder = self.branch.get_commit_builder(self.parents,
408
self.config, timestamp, timezone, committer, self.revprops,
410
if not self.builder.supports_record_entry_contents and self.exclude:
412
raise errors.ExcludesUnsupported(self.branch.repository)
414
if self.builder.updates_branch and self.bound_branch:
416
raise AssertionError(
417
"bound branches not supported for commit builders "
418
"that update the branch")
421
self.builder.will_record_deletes()
422
# find the location being committed to
370
423
if self.bound_branch:
371
# 2 extra stages: "Uploading data to master branch" and "Merging
372
# tags to master branch"
373
self.pb_stage_total += 2
374
self.pb.show_pct = False
375
self.pb.show_spinner = False
376
self.pb.show_eta = False
377
self.pb.show_count = True
378
self.pb.show_bar = True
380
# After a merge, a selected file commit is not supported.
381
# See 'bzr help merge' for an explanation as to why.
382
if len(self.parents) > 1 and self.specific_files is not None:
383
raise CannotCommitSelectedFileMerge(self.specific_files)
384
# Excludes are a form of selected file commit.
385
if len(self.parents) > 1 and self.exclude:
386
raise CannotCommitSelectedFileMerge(self.exclude)
388
# Collect the changes
389
self._set_progress_stage("Collecting changes", counter=True)
391
self.builder = self.branch.get_commit_builder(
392
self.parents, self.config_stack, timestamp, timezone, committer,
393
self.revprops, rev_id, lossy=lossy)
395
if self.builder.updates_branch and self.bound_branch:
397
raise AssertionError(
398
"bound branches not supported for commit builders "
399
"that update the branch")
402
# find the location being committed to
403
if self.bound_branch:
404
master_location = self.master_branch.base
406
master_location = self.branch.base
408
# report the start of the commit
409
self.reporter.started(new_revno, self.rev_id, master_location)
411
self._update_builder_with_changes()
412
self._check_pointless()
414
# TODO: Now the new inventory is known, check for conflicts.
415
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
416
# weave lines, because nothing should be recorded until it is known
417
# that commit will succeed.
418
self._set_progress_stage("Saving data locally")
419
self.builder.finish_inventory()
421
# Prompt the user for a commit message if none provided
422
message = message_callback(self)
423
self.message = message
425
# Add revision data to the local branch
426
self.rev_id = self.builder.commit(self.message)
429
mutter("aborting commit write group because of exception:")
430
trace.log_exception_quietly()
434
self._update_branches(old_revno, old_revid, new_revno)
436
# Make the working tree be up to date with the branch. This
437
# includes automatic changes scheduled to be made to the tree, such
438
# as updating its basis and unversioning paths that were missing.
439
self.work_tree.unversion(self.deleted_paths)
440
self._set_progress_stage("Updating the working tree")
441
self.work_tree.update_basis_by_delta(
442
self.rev_id, self.builder.get_basis_delta())
443
self.reporter.completed(new_revno, self.rev_id)
444
self._process_post_hooks(old_revno, new_revno)
424
master_location = self.master_branch.base
426
master_location = self.branch.base
428
# report the start of the commit
429
self.reporter.started(new_revno, self.rev_id, master_location)
431
self._update_builder_with_changes()
432
self._check_pointless()
434
# TODO: Now the new inventory is known, check for conflicts.
435
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
436
# weave lines, because nothing should be recorded until it is known
437
# that commit will succeed.
438
self._set_progress_stage("Saving data locally")
439
self.builder.finish_inventory()
441
# Prompt the user for a commit message if none provided
442
message = message_callback(self)
443
self.message = message
445
# Add revision data to the local branch
446
self.rev_id = self.builder.commit(self.message)
449
mutter("aborting commit write group because of exception:")
450
trace.log_exception_quietly()
454
self._update_branches(old_revno, old_revid, new_revno)
456
# Make the working tree be up to date with the branch. This
457
# includes automatic changes scheduled to be made to the tree, such
458
# as updating its basis and unversioning paths that were missing.
459
self.work_tree.unversion(self.deleted_ids)
460
self._set_progress_stage("Updating the working tree")
461
self.work_tree.update_basis_by_delta(self.rev_id,
462
self.builder.get_basis_delta())
463
self.reporter.completed(new_revno, self.rev_id)
464
self._process_post_hooks(old_revno, new_revno)
447
467
def _update_branches(self, old_revno, old_revid, new_revno):
448
468
"""Update the master and local branch to the new revision.
652
659
old_revno, old_revid, new_revno, self.rev_id,
653
660
tree_delta, future_tree)
662
def _gather_parents(self):
663
"""Record the parents of a merge for merge detection."""
664
# TODO: Make sure that this list doesn't contain duplicate
665
# entries and the order is preserved when doing this.
666
if self.use_record_iter_changes:
668
self.basis_inv = self.basis_tree.inventory
669
self.parent_invs = [self.basis_inv]
670
for revision in self.parents[1:]:
671
if self.branch.repository.has_revision(revision):
672
mutter('commit parent revision {%s}', revision)
673
inventory = self.branch.repository.get_inventory(revision)
674
self.parent_invs.append(inventory)
676
mutter('commit parent ghost revision {%s}', revision)
655
678
def _update_builder_with_changes(self):
656
679
"""Update the commit builder with the data about what has changed.
681
exclude = self.exclude
658
682
specific_files = self.specific_files
659
mutter("Selecting files for commit with filter %r", specific_files)
683
mutter("Selecting files for commit with filter %s", specific_files)
661
685
self._check_strict()
662
iter_changes = self.work_tree.iter_changes(
663
self.basis_tree, specific_files=specific_files)
665
iter_changes = filter_excluded(iter_changes, self.exclude)
666
iter_changes = self._filter_iter_changes(iter_changes)
667
for path, fs_hash in self.builder.record_iter_changes(
686
if self.use_record_iter_changes:
687
iter_changes = self.work_tree.iter_changes(self.basis_tree,
688
specific_files=specific_files)
689
iter_changes = self._filter_iter_changes(iter_changes)
690
for file_id, path, fs_hash in self.builder.record_iter_changes(
668
691
self.work_tree, self.basis_revid, iter_changes):
669
self.work_tree._observed_sha1(path, fs_hash)
692
self.work_tree._observed_sha1(file_id, path, fs_hash)
694
# Build the new inventory
695
self._populate_from_inventory()
696
self._record_unselected()
697
self._report_and_accumulate_deletes()
671
699
def _filter_iter_changes(self, iter_changes):
672
700
"""Process iter_changes.
674
This method reports on the changes in iter_changes to the user, and
702
This method reports on the changes in iter_changes to the user, and
675
703
converts 'missing' entries in the iter_changes iterator to 'deleted'
676
704
entries. 'missing' entries have their
712
737
elif old_path is None:
713
738
reporter.snapshot_change(gettext('added'), new_path)
714
739
elif old_path != new_path:
715
reporter.renamed(gettext('renamed'),
740
reporter.renamed(gettext('renamed'), old_path, new_path)
719
or self.work_tree.branch.repository._format.rich_root_data):
743
self.work_tree.branch.repository._format.rich_root_data):
720
744
# Don't report on changes to '' in non rich root
722
reporter.snapshot_change(
723
gettext('modified'), new_path)
746
reporter.snapshot_change(gettext('modified'), new_path)
724
747
self._next_progress_entry()
725
# Unversion files that were found to be deleted
726
self.deleted_paths = deleted_paths
748
# Unversion IDs that were found to be deleted
749
self.deleted_ids = deleted_ids
751
def _record_unselected(self):
752
# If specific files are selected, then all un-selected files must be
753
# recorded in their previous state. For more details, see
754
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
755
if self.specific_files or self.exclude:
756
specific_files = self.specific_files or []
757
for path, old_ie in self.basis_inv.iter_entries():
758
if self.builder.new_inventory.has_id(old_ie.file_id):
759
# already added - skip.
761
if (is_inside_any(specific_files, path)
762
and not is_inside_any(self.exclude, path)):
763
# was inside the selected path, and not excluded - if not
764
# present it has been deleted so skip.
766
# From here down it was either not selected, or was excluded:
767
# We preserve the entry unaltered.
769
# Note: specific file commits after a merge are currently
770
# prohibited. This test is for sanity/safety in case it's
771
# required after that changes.
772
if len(self.parents) > 1:
774
self.builder.record_entry_contents(ie, self.parent_invs, path,
775
self.basis_tree, None)
777
def _report_and_accumulate_deletes(self):
778
if (isinstance(self.basis_inv, Inventory)
779
and isinstance(self.builder.new_inventory, Inventory)):
780
# the older Inventory classes provide a _byid dict, and building a
781
# set from the keys of this dict is substantially faster than even
782
# getting a set of ids from the inventory
784
# <lifeless> set(dict) is roughly the same speed as
785
# set(iter(dict)) and both are significantly slower than
787
deleted_ids = set(self.basis_inv._byid.keys()) - \
788
set(self.builder.new_inventory._byid.keys())
790
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
792
self.any_entries_deleted = True
793
deleted = [(self.basis_tree.id2path(file_id), file_id)
794
for file_id in deleted_ids]
796
# XXX: this is not quite directory-order sorting
797
for path, file_id in deleted:
798
self.builder.record_delete(path, file_id)
799
self.reporter.deleted(path)
728
801
def _check_strict(self):
729
802
# XXX: when we use iter_changes this would likely be faster if
734
807
for unknown in self.work_tree.unknowns():
735
808
raise StrictCommitFailed()
737
def _commit_nested_tree(self, path):
810
def _populate_from_inventory(self):
811
"""Populate the CommitBuilder by walking the working tree inventory."""
812
# Build the revision inventory.
814
# This starts by creating a new empty inventory. Depending on
815
# which files are selected for commit, and what is present in the
816
# current tree, the new inventory is populated. inventory entries
817
# which are candidates for modification have their revision set to
818
# None; inventory entries that are carried over untouched have their
819
# revision set to their prior value.
821
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
822
# results to create a new inventory at the same time, which results
823
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
826
specific_files = self.specific_files
827
exclude = self.exclude
828
report_changes = self.reporter.is_verbose()
830
# A tree of paths that have been deleted. E.g. if foo/bar has been
831
# deleted, then we have {'foo':{'bar':{}}}
833
# XXX: Note that entries may have the wrong kind because the entry does
834
# not reflect the status on disk.
835
work_inv = self.work_tree.inventory
836
# NB: entries will include entries within the excluded ids/paths
837
# because iter_entries_by_dir has no 'exclude' facility today.
838
entries = work_inv.iter_entries_by_dir(
839
specific_file_ids=self.specific_file_ids, yield_parents=True)
840
for path, existing_ie in entries:
841
file_id = existing_ie.file_id
842
name = existing_ie.name
843
parent_id = existing_ie.parent_id
844
kind = existing_ie.kind
845
# Skip files that have been deleted from the working tree.
846
# The deleted path ids are also recorded so they can be explicitly
849
path_segments = splitpath(path)
850
deleted_dict = deleted_paths
851
for segment in path_segments:
852
deleted_dict = deleted_dict.get(segment, None)
854
# We either took a path not present in the dict
855
# (deleted_dict was None), or we've reached an empty
856
# child dir in the dict, so are now a sub-path.
860
if deleted_dict is not None:
861
# the path has a deleted parent, do not add it.
863
if exclude and is_inside_any(exclude, path):
864
# Skip excluded paths. Excluded paths are processed by
865
# _update_builder_with_changes.
867
content_summary = self.work_tree.path_content_summary(path)
868
kind = content_summary[0]
869
# Note that when a filter of specific files is given, we must only
870
# skip/record deleted files matching that filter.
871
if not specific_files or is_inside_any(specific_files, path):
872
if kind == 'missing':
873
if not deleted_paths:
874
# path won't have been split yet.
875
path_segments = splitpath(path)
876
deleted_dict = deleted_paths
877
for segment in path_segments:
878
deleted_dict = deleted_dict.setdefault(segment, {})
879
self.reporter.missing(path)
880
self._next_progress_entry()
881
deleted_ids.append(file_id)
883
# TODO: have the builder do the nested commit just-in-time IF and
885
if kind == 'tree-reference':
886
# enforce repository nested tree policy.
887
if (not self.work_tree.supports_tree_reference() or
888
# repository does not support it either.
889
not self.branch.repository._format.supports_tree_reference):
891
content_summary = (kind, None, None, None)
892
elif self.recursive == 'down':
893
nested_revision_id = self._commit_nested_tree(
895
content_summary = (kind, None, None, nested_revision_id)
897
nested_revision_id = self.work_tree.get_reference_revision(file_id)
898
content_summary = (kind, None, None, nested_revision_id)
900
# Record an entry for this item
901
# Note: I don't particularly want to have the existing_ie
902
# parameter but the test suite currently (28-Jun-07) breaks
903
# without it thanks to a unicode normalisation issue. :-(
904
definitely_changed = kind != existing_ie.kind
905
self._record_entry(path, file_id, specific_files, kind, name,
906
parent_id, definitely_changed, existing_ie, report_changes,
909
# Unversion IDs that were found to be deleted
910
self.deleted_ids = deleted_ids
912
def _commit_nested_tree(self, file_id, path):
738
913
"Commit a nested tree."
739
sub_tree = self.work_tree.get_nested_tree(path)
914
sub_tree = self.work_tree.get_nested_tree(file_id, path)
740
915
# FIXME: be more comprehensive here:
741
916
# this works when both trees are in --trees repository,
742
917
# but when both are bound to a different repository,
744
919
# finally implement the explicit-caches approach design
745
920
# a while back - RBC 20070306.
746
921
if sub_tree.branch.repository.has_same_location(
747
self.work_tree.branch.repository):
922
self.work_tree.branch.repository):
748
923
sub_tree.branch.repository = \
749
924
self.work_tree.branch.repository
751
926
return sub_tree.commit(message=None, revprops=self.revprops,
752
recursive=self.recursive,
753
message_callback=self.message_callback,
754
timestamp=self.timestamp,
755
timezone=self.timezone,
756
committer=self.committer,
757
allow_pointless=self.allow_pointless,
758
strict=self.strict, verbose=self.verbose,
759
local=self.local, reporter=self.reporter)
760
except PointlessCommit:
761
return self.work_tree.get_reference_revision(path)
927
recursive=self.recursive,
928
message_callback=self.message_callback,
929
timestamp=self.timestamp, timezone=self.timezone,
930
committer=self.committer,
931
allow_pointless=self.allow_pointless,
932
strict=self.strict, verbose=self.verbose,
933
local=self.local, reporter=self.reporter)
934
except errors.PointlessCommit:
935
return self.work_tree.get_reference_revision(file_id)
937
def _record_entry(self, path, file_id, specific_files, kind, name,
938
parent_id, definitely_changed, existing_ie, report_changes,
940
"Record the new inventory entry for a path if any."
941
# mutter('check %s {%s}', path, file_id)
942
# mutter('%s selected for commit', path)
943
if definitely_changed or existing_ie is None:
944
ie = make_entry(kind, name, parent_id, file_id)
946
ie = existing_ie.copy()
948
# For carried over entries we don't care about the fs hash - the repo
949
# isn't generating a sha, so we're not saving computation time.
950
_, _, fs_hash = self.builder.record_entry_contents(
951
ie, self.parent_invs, path, self.work_tree, content_summary)
953
self._report_change(ie, path)
955
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
958
def _report_change(self, ie, path):
959
"""Report a change to the user.
961
The change that has occurred is described relative to the basis
964
if (self.basis_inv.has_id(ie.file_id)):
965
basis_ie = self.basis_inv[ie.file_id]
968
change = ie.describe_change(basis_ie, ie)
969
if change in (InventoryEntry.RENAMED,
970
InventoryEntry.MODIFIED_AND_RENAMED):
971
old_path = self.basis_inv.id2path(ie.file_id)
972
self.reporter.renamed(change, old_path, path)
973
self._next_progress_entry()
975
if change == gettext('unchanged'):
977
self.reporter.snapshot_change(change, path)
978
self._next_progress_entry()
763
980
def _set_progress_stage(self, name, counter=False):
764
981
"""Set the progress stage and emit an update to the progress bar."""