50
49
# TODO: Change the parameter 'rev_id' to 'revision_id' to be consistent with
51
50
# the rest of the code; add a deprecation of the old name.
57
from cStringIO import StringIO
60
from .branch import Branch
61
from .cleanup import OperationWithCleanups
63
from .errors import (BzrError,
67
from .osutils import (get_user_encoding,
69
minimum_path_selection,
72
from .trace import mutter, note, is_quiet
73
from .urlutils import unescape_for_display
74
from .i18n import gettext
77
class PointlessCommit(BzrError):
79
_fmt = "No changes to commit"
82
class CannotCommitSelectedFileMerge(BzrError):
84
_fmt = 'Selected-file commit of merges is not supported yet:'\
85
' files %(files_str)s'
87
def __init__(self, files):
88
files_str = ', '.join(files)
89
BzrError.__init__(self, files=files, files_str=files_str)
92
def filter_excluded(iter_changes, exclude):
93
"""Filter exclude filenames.
95
:param iter_changes: iter_changes function
96
:param exclude: List of paths to exclude
97
:return: iter_changes function
99
for change in iter_changes:
100
old_path = change[1][0]
101
new_path = change[1][1]
103
new_excluded = (new_path is not None and
104
is_inside_any(exclude, new_path))
106
old_excluded = (old_path is not None and
107
is_inside_any(exclude, old_path))
109
if old_excluded and new_excluded:
112
if old_excluded or new_excluded:
113
# TODO(jelmer): Perhaps raise an error here instead?
67
from bzrlib.branch import Branch
69
from bzrlib.errors import (BzrError, PointlessCommit,
73
from bzrlib.osutils import (get_user_encoding,
74
kind_marker, isdir,isfile, is_inside_any,
75
is_inside_or_parent_of_any,
76
minimum_path_selection,
77
quotefn, sha_file, split_lines,
80
from bzrlib.testament import Testament
81
from bzrlib.trace import mutter, note, warning, is_quiet
82
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
83
from bzrlib import symbol_versioning
84
from bzrlib.symbol_versioning import (deprecated_passed,
87
from bzrlib.workingtree import WorkingTree
88
from bzrlib.urlutils import unescape_for_display
119
92
class NullCommitReporter(object):
120
93
"""I report on progress of a commit."""
122
def started(self, revno, revid, location):
95
def started(self, revno, revid, location=None):
97
symbol_versioning.warn("As of bzr 1.0 you must pass a location "
98
"to started.", DeprecationWarning,
125
102
def snapshot_change(self, change, path):
151
128
note(format, *args)
153
130
def snapshot_change(self, change, path):
154
if path == '' and change in (gettext('added'), gettext('modified')):
131
if path == '' and change in ('added', 'modified'):
156
133
self._note("%s %s", change, path)
158
def started(self, revno, rev_id, location):
160
gettext('Committing to: %s'),
161
unescape_for_display(location, 'utf-8'))
135
def started(self, revno, rev_id, location=None):
136
if location is not None:
137
location = ' to: ' + unescape_for_display(location, 'utf-8')
139
# When started was added, location was only made optional by
140
# accident. Matt Nordhoff 20071129
141
symbol_versioning.warn("As of bzr 1.0 you must pass a location "
142
"to started.", DeprecationWarning,
145
self._note('Committing%s', location)
163
147
def completed(self, revno, rev_id):
164
self._note(gettext('Committed revision %d.'), revno)
165
# self._note goes to the console too; so while we want to log the
166
# rev_id, we can't trivially only log it. (See bug 526425). Long
167
# term we should rearrange the reporting structure, but for now
168
# we just mutter seperately. We mutter the revid and revno together
169
# so that concurrent bzr invocations won't lead to confusion.
170
mutter('Committed revid %s as revno %d.', rev_id, revno)
148
self._note('Committed revision %d.', revno)
172
150
def deleted(self, path):
173
self._note(gettext('deleted %s'), path)
151
self._note('deleted %s', path)
175
153
def missing(self, path):
176
self._note(gettext('missing %s'), path)
154
self._note('missing %s', path)
178
156
def renamed(self, change, old_path, new_path):
179
157
self._note('%s %s => %s', change, old_path, new_path)
280
231
:param exclude: None or a list of relative paths to exclude from the
281
232
commit. Pending changes to excluded files will be ignored by the
283
:param lossy: When committing to a foreign VCS, ignore any
284
data that can not be natively represented.
286
operation = OperationWithCleanups(self._commit)
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
return operation.run(
295
specific_files=specific_files,
297
allow_pointless=allow_pointless,
300
working_tree=working_tree,
303
message_callback=message_callback,
306
possible_master_transports=possible_master_transports,
309
def _commit(self, operation, message, timestamp, timezone, committer,
310
specific_files, rev_id, allow_pointless, strict, verbose,
311
working_tree, local, reporter, message_callback, recursive,
312
exclude, possible_master_transports, lossy):
313
235
mutter('preparing to commit')
315
237
if working_tree is None:
357
279
self.verbose = verbose
359
281
self.work_tree.lock_write()
360
operation.add_cleanup(self.work_tree.unlock)
361
282
self.parents = self.work_tree.get_parent_ids()
362
self.pb = ui.ui_factory.nested_progress_bar()
363
operation.add_cleanup(self.pb.finished)
283
# We can use record_iter_changes IFF iter_changes is compatible with
284
# the command line parameters, and the repository has fast delta
285
# generation. See bug 347649.
286
self.use_record_iter_changes = (
287
not self.specific_files and
289
not self.branch.repository._format.supports_tree_reference and
290
(self.branch.repository._format.fast_deltas or
291
len(self.parents) < 2))
292
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
364
293
self.basis_revid = self.work_tree.last_revision()
365
294
self.basis_tree = self.work_tree.basis_tree()
366
295
self.basis_tree.lock_read()
367
operation.add_cleanup(self.basis_tree.unlock)
368
# Cannot commit with conflicts present.
369
if len(self.work_tree.conflicts()) > 0:
370
raise ConflictsInTree
372
# Setup the bound branch variables as needed.
373
self._check_bound_branch(operation, possible_master_transports)
375
# Check that the working tree is up to date
376
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
378
# Complete configuration setup
379
if reporter is not None:
380
self.reporter = reporter
381
elif self.reporter is None:
382
self.reporter = self._select_reporter()
383
if self.config_stack is None:
384
self.config_stack = self.work_tree.get_config_stack()
386
# Setup the progress bar. As the number of files that need to be
387
# committed in unknown, progress is reported as stages.
388
# We keep track of entries separately though and include that
389
# information in the progress bar during the relevant stages.
390
self.pb_stage_name = ""
391
self.pb_stage_count = 0
392
self.pb_stage_total = 5
393
if self.bound_branch:
394
# 2 extra stages: "Uploading data to master branch" and "Merging
395
# tags to master branch"
396
self.pb_stage_total += 2
397
self.pb.show_pct = False
398
self.pb.show_spinner = False
399
self.pb.show_eta = False
400
self.pb.show_count = True
401
self.pb.show_bar = True
403
# After a merge, a selected file commit is not supported.
404
# See 'bzr help merge' for an explanation as to why.
405
if len(self.parents) > 1 and self.specific_files is not None:
406
raise CannotCommitSelectedFileMerge(self.specific_files)
407
# Excludes are a form of selected file commit.
408
if len(self.parents) > 1 and self.exclude:
409
raise CannotCommitSelectedFileMerge(self.exclude)
411
# Collect the changes
412
self._set_progress_stage("Collecting changes", counter=True)
414
self.builder = self.branch.get_commit_builder(self.parents,
415
self.config_stack, timestamp, timezone, committer, self.revprops,
418
if self.builder.updates_branch and self.bound_branch:
420
raise AssertionError(
421
"bound branches not supported for commit builders "
422
"that update the branch")
425
# find the location being committed to
297
# Cannot commit with conflicts present.
298
if len(self.work_tree.conflicts()) > 0:
299
raise ConflictsInTree
301
# Setup the bound branch variables as needed.
302
self._check_bound_branch(possible_master_transports)
304
# Check that the working tree is up to date
305
old_revno, new_revno = self._check_out_of_date_tree()
307
# Complete configuration setup
308
if reporter is not None:
309
self.reporter = reporter
310
elif self.reporter is None:
311
self.reporter = self._select_reporter()
312
if self.config is None:
313
self.config = self.branch.get_config()
315
self._set_specific_file_ids()
317
# Setup the progress bar. As the number of files that need to be
318
# committed in unknown, progress is reported as stages.
319
# We keep track of entries separately though and include that
320
# information in the progress bar during the relevant stages.
321
self.pb_stage_name = ""
322
self.pb_stage_count = 0
323
self.pb_stage_total = 5
426
324
if self.bound_branch:
427
master_location = self.master_branch.base
429
master_location = self.branch.base
431
# report the start of the commit
432
self.reporter.started(new_revno, self.rev_id, master_location)
434
self._update_builder_with_changes()
435
self._check_pointless()
437
# TODO: Now the new inventory is known, check for conflicts.
438
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
439
# weave lines, because nothing should be recorded until it is known
440
# that commit will succeed.
441
self._set_progress_stage("Saving data locally")
442
self.builder.finish_inventory()
444
# Prompt the user for a commit message if none provided
445
message = message_callback(self)
446
self.message = message
448
# Add revision data to the local branch
449
self.rev_id = self.builder.commit(self.message)
451
except Exception as e:
452
mutter("aborting commit write group because of exception:")
453
trace.log_exception_quietly()
457
self._update_branches(old_revno, old_revid, new_revno)
459
# Make the working tree be up to date with the branch. This
460
# includes automatic changes scheduled to be made to the tree, such
461
# as updating its basis and unversioning paths that were missing.
462
self.work_tree.unversion(self.deleted_paths)
463
self._set_progress_stage("Updating the working tree")
464
self.work_tree.update_basis_by_delta(self.rev_id,
465
self.builder.get_basis_delta())
466
self.reporter.completed(new_revno, self.rev_id)
467
self._process_post_hooks(old_revno, new_revno)
470
def _update_branches(self, old_revno, old_revid, new_revno):
471
"""Update the master and local branch to the new revision.
473
This will try to make sure that the master branch is updated
474
before the local branch.
476
:param old_revno: Revision number of master branch before the
478
:param old_revid: Tip of master branch before the commit
479
:param new_revno: Revision number of the new commit
481
if not self.builder.updates_branch:
325
self.pb_stage_total += 1
326
self.pb.show_pct = False
327
self.pb.show_spinner = False
328
self.pb.show_eta = False
329
self.pb.show_count = True
330
self.pb.show_bar = True
332
self._gather_parents()
333
# After a merge, a selected file commit is not supported.
334
# See 'bzr help merge' for an explanation as to why.
335
if len(self.parents) > 1 and self.specific_files:
336
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
337
# Excludes are a form of selected file commit.
338
if len(self.parents) > 1 and self.exclude:
339
raise errors.CannotCommitSelectedFileMerge(self.exclude)
341
# Collect the changes
342
self._set_progress_stage("Collecting changes", counter=True)
343
self.builder = self.branch.get_commit_builder(self.parents,
344
self.config, timestamp, timezone, committer, revprops, rev_id)
347
self.builder.will_record_deletes()
348
# find the location being committed to
349
if self.bound_branch:
350
master_location = self.master_branch.base
352
master_location = self.branch.base
354
# report the start of the commit
355
self.reporter.started(new_revno, self.rev_id, master_location)
357
self._update_builder_with_changes()
358
self._check_pointless()
360
# TODO: Now the new inventory is known, check for conflicts.
361
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
362
# weave lines, because nothing should be recorded until it is known
363
# that commit will succeed.
364
self._set_progress_stage("Saving data locally")
365
self.builder.finish_inventory()
367
# Prompt the user for a commit message if none provided
368
message = message_callback(self)
369
self.message = message
371
# Add revision data to the local branch
372
self.rev_id = self.builder.commit(self.message)
375
mutter("aborting commit write group because of exception:")
376
trace.log_exception_quietly()
377
note("aborting commit write group: %r" % (e,))
482
381
self._process_pre_hooks(old_revno, new_revno)
484
383
# Upload revision data to the master.
487
386
self._set_progress_stage("Uploading data to master branch")
488
387
# 'commit' to the master first so a timeout here causes the
489
388
# local branch to be out of date
490
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
491
self.branch, new_revno, self.rev_id, lossy=self._lossy)
493
self.branch.fetch(self.master_branch, self.rev_id)
389
self.master_branch.import_last_revision_info(
390
self.branch.repository, new_revno, self.rev_id)
495
392
# and now do the commit locally.
496
393
self.branch.set_last_revision_info(new_revno, self.rev_id)
499
self._process_pre_hooks(old_revno, new_revno)
501
# The commit builder will already have updated the branch,
503
self.branch.set_last_revision_info(old_revno, old_revid)
506
# Merge local tags to remote
507
if self.bound_branch:
508
self._set_progress_stage("Merging tags to master branch")
509
tag_updates, tag_conflicts = self.branch.tags.merge_to(
510
self.master_branch.tags)
512
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
513
note( gettext("Conflicting tags in bound branch:\n{0}".format(
514
"\n".join(warning_lines))) )
395
# Make the working tree up to date with the branch
396
self._set_progress_stage("Updating the working tree")
397
self.work_tree.update_basis_by_delta(self.rev_id,
398
self.builder.get_basis_delta())
399
self.reporter.completed(new_revno, self.rev_id)
400
self._process_post_hooks(old_revno, new_revno)
516
405
def _select_reporter(self):
517
406
"""Select the CommitReporter to use."""
663
559
old_revno, old_revid, new_revno, self.rev_id,
664
560
tree_delta, future_tree)
563
"""Cleanup any open locks, progress bars etc."""
564
cleanups = [self._cleanup_bound_branch,
565
self.basis_tree.unlock,
566
self.work_tree.unlock,
568
found_exception = None
569
for cleanup in cleanups:
572
# we want every cleanup to run no matter what.
573
# so we have a catchall here, but we will raise the
574
# last encountered exception up the stack: and
575
# typically this will be useful enough.
578
if found_exception is not None:
579
# don't do a plan raise, because the last exception may have been
580
# trashed, e is our sure-to-work exception even though it loses the
581
# full traceback. XXX: RBC 20060421 perhaps we could check the
582
# exc_info and if its the same one do a plain raise otherwise
583
# 'raise e' as we do now.
586
def _cleanup_bound_branch(self):
587
"""Executed at the end of a try/finally to cleanup a bound branch.
589
If the branch wasn't bound, this is a no-op.
590
If it was, it resents self.branch to the local branch, instead
593
if not self.bound_branch:
595
if self.master_locked:
596
self.master_branch.unlock()
598
def _gather_parents(self):
599
"""Record the parents of a merge for merge detection."""
600
# TODO: Make sure that this list doesn't contain duplicate
601
# entries and the order is preserved when doing this.
602
if self.use_record_iter_changes:
604
self.basis_inv = self.basis_tree.inventory
605
self.parent_invs = [self.basis_inv]
606
for revision in self.parents[1:]:
607
if self.branch.repository.has_revision(revision):
608
mutter('commit parent revision {%s}', revision)
609
inventory = self.branch.repository.get_inventory(revision)
610
self.parent_invs.append(inventory)
612
mutter('commit parent ghost revision {%s}', revision)
666
614
def _update_builder_with_changes(self):
667
615
"""Update the commit builder with the data about what has changed.
669
specific_files = self.specific_files
670
mutter("Selecting files for commit with filter %r", specific_files)
617
exclude = self.exclude
618
specific_files = self.specific_files or []
619
mutter("Selecting files for commit with filter %s", specific_files)
672
621
self._check_strict()
673
iter_changes = self.work_tree.iter_changes(self.basis_tree,
674
specific_files=specific_files)
676
iter_changes = filter_excluded(iter_changes, self.exclude)
677
iter_changes = self._filter_iter_changes(iter_changes)
678
for file_id, path, fs_hash in self.builder.record_iter_changes(
679
self.work_tree, self.basis_revid, iter_changes):
680
self.work_tree._observed_sha1(file_id, path, fs_hash)
622
if self.use_record_iter_changes:
623
iter_changes = self.work_tree.iter_changes(self.basis_tree)
624
iter_changes = self._filter_iter_changes(iter_changes)
625
for file_id, path, fs_hash in self.builder.record_iter_changes(
626
self.work_tree, self.basis_revid, iter_changes):
627
self.work_tree._observed_sha1(file_id, path, fs_hash)
629
# Build the new inventory
630
self._populate_from_inventory()
631
self._record_unselected()
632
self._report_and_accumulate_deletes()
682
634
def _filter_iter_changes(self, iter_changes):
683
635
"""Process iter_changes.
718
668
if new_path is None:
719
669
reporter.deleted(old_path)
720
670
elif old_path is None:
721
reporter.snapshot_change(gettext('added'), new_path)
671
reporter.snapshot_change('added', new_path)
722
672
elif old_path != new_path:
723
reporter.renamed(gettext('renamed'), old_path, new_path)
673
reporter.renamed('renamed', old_path, new_path)
726
676
self.work_tree.branch.repository._format.rich_root_data):
727
677
# Don't report on changes to '' in non rich root
729
reporter.snapshot_change(gettext('modified'), new_path)
679
reporter.snapshot_change('modified', new_path)
730
680
self._next_progress_entry()
731
# Unversion files that were found to be deleted
732
self.deleted_paths = deleted_paths
681
# Unversion IDs that were found to be deleted
682
self.work_tree.unversion(deleted_ids)
684
def _record_unselected(self):
685
# If specific files are selected, then all un-selected files must be
686
# recorded in their previous state. For more details, see
687
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
688
if self.specific_files or self.exclude:
689
specific_files = self.specific_files or []
690
for path, old_ie in self.basis_inv.iter_entries():
691
if old_ie.file_id in self.builder.new_inventory:
692
# already added - skip.
694
if (is_inside_any(specific_files, path)
695
and not is_inside_any(self.exclude, path)):
696
# was inside the selected path, and not excluded - if not
697
# present it has been deleted so skip.
699
# From here down it was either not selected, or was excluded:
700
# We preserve the entry unaltered.
702
# Note: specific file commits after a merge are currently
703
# prohibited. This test is for sanity/safety in case it's
704
# required after that changes.
705
if len(self.parents) > 1:
707
self.builder.record_entry_contents(ie, self.parent_invs, path,
708
self.basis_tree, None)
710
def _report_and_accumulate_deletes(self):
711
if (isinstance(self.basis_inv, Inventory)
712
and isinstance(self.builder.new_inventory, Inventory)):
713
# the older Inventory classes provide a _byid dict, and building a
714
# set from the keys of this dict is substantially faster than even
715
# getting a set of ids from the inventory
717
# <lifeless> set(dict) is roughly the same speed as
718
# set(iter(dict)) and both are significantly slower than
720
deleted_ids = set(self.basis_inv._byid.keys()) - \
721
set(self.builder.new_inventory._byid.keys())
723
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
725
self.any_entries_deleted = True
726
deleted = [(self.basis_tree.id2path(file_id), file_id)
727
for file_id in deleted_ids]
729
# XXX: this is not quite directory-order sorting
730
for path, file_id in deleted:
731
self.builder.record_delete(path, file_id)
732
self.reporter.deleted(path)
734
734
def _check_strict(self):
735
735
# XXX: when we use iter_changes this would likely be faster if
740
740
for unknown in self.work_tree.unknowns():
741
741
raise StrictCommitFailed()
743
def _populate_from_inventory(self):
744
"""Populate the CommitBuilder by walking the working tree inventory."""
745
# Build the revision inventory.
747
# This starts by creating a new empty inventory. Depending on
748
# which files are selected for commit, and what is present in the
749
# current tree, the new inventory is populated. inventory entries
750
# which are candidates for modification have their revision set to
751
# None; inventory entries that are carried over untouched have their
752
# revision set to their prior value.
754
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
755
# results to create a new inventory at the same time, which results
756
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
759
specific_files = self.specific_files
760
exclude = self.exclude
761
report_changes = self.reporter.is_verbose()
763
# A tree of paths that have been deleted. E.g. if foo/bar has been
764
# deleted, then we have {'foo':{'bar':{}}}
766
# XXX: Note that entries may have the wrong kind because the entry does
767
# not reflect the status on disk.
768
work_inv = self.work_tree.inventory
769
# NB: entries will include entries within the excluded ids/paths
770
# because iter_entries_by_dir has no 'exclude' facility today.
771
entries = work_inv.iter_entries_by_dir(
772
specific_file_ids=self.specific_file_ids, yield_parents=True)
773
for path, existing_ie in entries:
774
file_id = existing_ie.file_id
775
name = existing_ie.name
776
parent_id = existing_ie.parent_id
777
kind = existing_ie.kind
778
# Skip files that have been deleted from the working tree.
779
# The deleted path ids are also recorded so they can be explicitly
782
path_segments = splitpath(path)
783
deleted_dict = deleted_paths
784
for segment in path_segments:
785
deleted_dict = deleted_dict.get(segment, None)
787
# We either took a path not present in the dict
788
# (deleted_dict was None), or we've reached an empty
789
# child dir in the dict, so are now a sub-path.
793
if deleted_dict is not None:
794
# the path has a deleted parent, do not add it.
796
if exclude and is_inside_any(exclude, path):
797
# Skip excluded paths. Excluded paths are processed by
798
# _update_builder_with_changes.
800
content_summary = self.work_tree.path_content_summary(path)
801
# Note that when a filter of specific files is given, we must only
802
# skip/record deleted files matching that filter.
803
if not specific_files or is_inside_any(specific_files, path):
804
if content_summary[0] == 'missing':
805
if not deleted_paths:
806
# path won't have been split yet.
807
path_segments = splitpath(path)
808
deleted_dict = deleted_paths
809
for segment in path_segments:
810
deleted_dict = deleted_dict.setdefault(segment, {})
811
self.reporter.missing(path)
812
self._next_progress_entry()
813
deleted_ids.append(file_id)
815
# TODO: have the builder do the nested commit just-in-time IF and
817
if content_summary[0] == 'tree-reference':
818
# enforce repository nested tree policy.
819
if (not self.work_tree.supports_tree_reference() or
820
# repository does not support it either.
821
not self.branch.repository._format.supports_tree_reference):
822
content_summary = ('directory',) + content_summary[1:]
823
kind = content_summary[0]
824
# TODO: specific_files filtering before nested tree processing
825
if kind == 'tree-reference':
826
if self.recursive == 'down':
827
nested_revision_id = self._commit_nested_tree(
829
content_summary = content_summary[:3] + (
832
content_summary = content_summary[:3] + (
833
self.work_tree.get_reference_revision(file_id),)
835
# Record an entry for this item
836
# Note: I don't particularly want to have the existing_ie
837
# parameter but the test suite currently (28-Jun-07) breaks
838
# without it thanks to a unicode normalisation issue. :-(
839
definitely_changed = kind != existing_ie.kind
840
self._record_entry(path, file_id, specific_files, kind, name,
841
parent_id, definitely_changed, existing_ie, report_changes,
844
# Unversion IDs that were found to be deleted
845
self.work_tree.unversion(deleted_ids)
743
847
def _commit_nested_tree(self, file_id, path):
744
848
"Commit a nested tree."
745
sub_tree = self.work_tree.get_nested_tree(path, file_id)
849
sub_tree = self.work_tree.get_nested_tree(file_id, path)
746
850
# FIXME: be more comprehensive here:
747
851
# this works when both trees are in --trees repository,
748
852
# but when both are bound to a different repository,
762
866
allow_pointless=self.allow_pointless,
763
867
strict=self.strict, verbose=self.verbose,
764
868
local=self.local, reporter=self.reporter)
765
except PointlessCommit:
766
return self.work_tree.get_reference_revision(path, file_id)
869
except errors.PointlessCommit:
870
return self.work_tree.get_reference_revision(file_id)
872
def _record_entry(self, path, file_id, specific_files, kind, name,
873
parent_id, definitely_changed, existing_ie, report_changes,
875
"Record the new inventory entry for a path if any."
876
# mutter('check %s {%s}', path, file_id)
877
# mutter('%s selected for commit', path)
878
if definitely_changed or existing_ie is None:
879
ie = make_entry(kind, name, parent_id, file_id)
881
ie = existing_ie.copy()
883
# For carried over entries we don't care about the fs hash - the repo
884
# isn't generating a sha, so we're not saving computation time.
885
_, _, fs_hash = self.builder.record_entry_contents(
886
ie, self.parent_invs, path, self.work_tree, content_summary)
888
self._report_change(ie, path)
890
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
893
def _report_change(self, ie, path):
894
"""Report a change to the user.
896
The change that has occurred is described relative to the basis
899
if (self.basis_inv.has_id(ie.file_id)):
900
basis_ie = self.basis_inv[ie.file_id]
903
change = ie.describe_change(basis_ie, ie)
904
if change in (InventoryEntry.RENAMED,
905
InventoryEntry.MODIFIED_AND_RENAMED):
906
old_path = self.basis_inv.id2path(ie.file_id)
907
self.reporter.renamed(change, old_path, path)
908
self._next_progress_entry()
910
if change == 'unchanged':
912
self.reporter.snapshot_change(change, path)
913
self._next_progress_entry()
768
915
def _set_progress_stage(self, name, counter=False):
769
916
"""Set the progress stage and emit an update to the progress bar."""
added
removed
bzrlib/commit.py
