49
50
# TODO: Change the parameter 'rev_id' to 'revision_id' to be consistent with
50
51
# the rest of the code; add a deprecation of the old name.
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
59
from .branch import Branch
60
from .cleanup import ExitStack
62
from .errors import (BzrError,
66
from .osutils import (get_user_encoding,
69
minimum_path_selection,
71
from .trace import mutter, note, is_quiet
72
from .tree import TreeChange
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
new_excluded = (change.path[1] is not None and
101
is_inside_any(exclude, change.path[1]))
103
old_excluded = (change.path[0] is not None and
104
is_inside_any(exclude, change.path[0]))
106
if old_excluded and new_excluded:
109
if old_excluded or new_excluded:
110
# TODO(jelmer): Perhaps raise an error here instead?
78
116
class NullCommitReporter(object):
79
117
"""I report on progress of a commit."""
81
def started(self, revno, revid, location=None):
83
symbol_versioning.warn("As of bzr 1.0 you must pass a location "
84
"to started.", DeprecationWarning,
119
def started(self, revno, revid, location):
88
122
def snapshot_change(self, change, path):
225
279
:param exclude: None or a list of relative paths to exclude from the
226
280
commit. Pending changes to excluded files will be ignored by the
229
operation = OperationWithCleanups(self._commit)
230
self.revprops = revprops or {}
231
# XXX: Can be set on __init__ or passed in - this is a bit ugly.
232
self.config = config or self.config
233
return operation.run(
238
specific_files=specific_files,
240
allow_pointless=allow_pointless,
243
working_tree=working_tree,
246
message_callback=message_callback,
249
possible_master_transports=possible_master_transports)
251
def _commit(self, operation, message, timestamp, timezone, committer,
252
specific_files, rev_id, allow_pointless, strict, verbose,
253
working_tree, local, reporter, message_callback, recursive,
254
exclude, possible_master_transports):
255
mutter('preparing to commit')
257
if working_tree is None:
258
raise BzrError("working_tree must be passed into commit().")
260
self.work_tree = working_tree
261
self.branch = self.work_tree.branch
262
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
263
if not self.branch.repository.supports_rich_root():
264
raise errors.RootNotRich()
265
if message_callback is None:
266
if message is not None:
267
if isinstance(message, str):
268
message = message.decode(get_user_encoding())
269
message_callback = lambda x: message
271
raise BzrError("The message or message_callback keyword"
272
" parameter is required for commit().")
274
self.bound_branch = None
275
self.any_entries_deleted = False
276
if exclude is not None:
277
self.exclude = sorted(
278
minimum_path_selection(exclude))
282
self.master_branch = None
283
self.recursive = recursive
285
# self.specific_files is None to indicate no filter, or any iterable to
286
# indicate a filter - [] means no files at all, as per iter_changes.
287
if specific_files is not None:
288
self.specific_files = sorted(
289
minimum_path_selection(specific_files))
291
self.specific_files = None
293
self.allow_pointless = allow_pointless
294
self.message_callback = message_callback
295
self.timestamp = timestamp
296
self.timezone = timezone
297
self.committer = committer
299
self.verbose = verbose
301
self.work_tree.lock_write()
302
operation.add_cleanup(self.work_tree.unlock)
303
self.parents = self.work_tree.get_parent_ids()
304
# We can use record_iter_changes IFF iter_changes is compatible with
305
# the command line parameters, and the repository has fast delta
306
# generation. See bug 347649.
307
self.use_record_iter_changes = (
309
not self.branch.repository._format.supports_tree_reference and
310
(self.branch.repository._format.fast_deltas or
311
len(self.parents) < 2))
312
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
313
operation.add_cleanup(self.pb.finished)
314
self.basis_revid = self.work_tree.last_revision()
315
self.basis_tree = self.work_tree.basis_tree()
316
self.basis_tree.lock_read()
317
operation.add_cleanup(self.basis_tree.unlock)
318
# Cannot commit with conflicts present.
319
if len(self.work_tree.conflicts()) > 0:
320
raise ConflictsInTree
322
# Setup the bound branch variables as needed.
323
self._check_bound_branch(operation, possible_master_transports)
325
# Check that the working tree is up to date
326
old_revno, new_revno = self._check_out_of_date_tree()
328
# Complete configuration setup
329
if reporter is not None:
330
self.reporter = reporter
331
elif self.reporter is None:
332
self.reporter = self._select_reporter()
333
if self.config is None:
334
self.config = self.branch.get_config()
336
self._set_specific_file_ids()
338
# Setup the progress bar. As the number of files that need to be
339
# committed in unknown, progress is reported as stages.
340
# We keep track of entries separately though and include that
341
# information in the progress bar during the relevant stages.
342
self.pb_stage_name = ""
343
self.pb_stage_count = 0
344
self.pb_stage_total = 5
345
if self.bound_branch:
346
self.pb_stage_total += 1
347
self.pb.show_pct = False
348
self.pb.show_spinner = False
349
self.pb.show_eta = False
350
self.pb.show_count = True
351
self.pb.show_bar = True
353
self._gather_parents()
354
# After a merge, a selected file commit is not supported.
355
# See 'bzr help merge' for an explanation as to why.
356
if len(self.parents) > 1 and self.specific_files is not None:
357
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
358
# Excludes are a form of selected file commit.
359
if len(self.parents) > 1 and self.exclude:
360
raise errors.CannotCommitSelectedFileMerge(self.exclude)
362
# Collect the changes
363
self._set_progress_stage("Collecting changes", counter=True)
364
self.builder = self.branch.get_commit_builder(self.parents,
365
self.config, timestamp, timezone, committer, self.revprops, rev_id)
368
self.builder.will_record_deletes()
369
# find the location being committed to
370
if self.bound_branch:
371
master_location = self.master_branch.base
373
master_location = self.branch.base
375
# report the start of the commit
376
self.reporter.started(new_revno, self.rev_id, master_location)
378
self._update_builder_with_changes()
379
self._check_pointless()
381
# TODO: Now the new inventory is known, check for conflicts.
382
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
383
# weave lines, because nothing should be recorded until it is known
384
# that commit will succeed.
385
self._set_progress_stage("Saving data locally")
386
self.builder.finish_inventory()
388
# Prompt the user for a commit message if none provided
389
message = message_callback(self)
390
self.message = message
392
# Add revision data to the local branch
393
self.rev_id = self.builder.commit(self.message)
396
mutter("aborting commit write group because of exception:")
397
trace.log_exception_quietly()
398
note("aborting commit write group: %r" % (e,))
402
self._process_pre_hooks(old_revno, new_revno)
404
# Upload revision data to the master.
405
# this will propagate merged revisions too if needed.
406
if self.bound_branch:
407
self._set_progress_stage("Uploading data to master branch")
408
# 'commit' to the master first so a timeout here causes the
409
# local branch to be out of date
410
self.master_branch.import_last_revision_info(
411
self.branch.repository, new_revno, self.rev_id)
413
# and now do the commit locally.
414
self.branch.set_last_revision_info(new_revno, self.rev_id)
416
# Make the working tree be up to date with the branch. This
417
# includes automatic changes scheduled to be made to the tree, such
418
# as updating its basis and unversioning paths that were missing.
419
self.work_tree.unversion(self.deleted_ids)
420
self._set_progress_stage("Updating the working tree")
421
self.work_tree.update_basis_by_delta(self.rev_id,
422
self.builder.get_basis_delta())
423
self.reporter.completed(new_revno, self.rev_id)
424
self._process_post_hooks(old_revno, new_revno)
282
:param lossy: When committing to a foreign VCS, ignore any
283
data that can not be natively represented.
285
with ExitStack() as stack:
286
self.revprops = revprops or {}
287
# XXX: Can be set on __init__ or passed in - this is a bit ugly.
288
self.config_stack = config or self.config_stack
289
mutter('preparing to commit')
291
if working_tree is None:
292
raise BzrError("working_tree must be passed into commit().")
294
self.work_tree = working_tree
295
self.branch = self.work_tree.branch
296
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
297
if not self.branch.repository.supports_rich_root():
298
raise errors.RootNotRich()
299
if message_callback is None:
300
if message is not None:
301
if isinstance(message, bytes):
302
message = message.decode(get_user_encoding())
304
def message_callback(x):
307
raise BzrError("The message or message_callback keyword"
308
" parameter is required for commit().")
310
self.bound_branch = None
311
self.any_entries_deleted = False
312
if exclude is not None:
313
self.exclude = sorted(
314
minimum_path_selection(exclude))
318
self.master_branch = None
319
self.recursive = recursive
321
# self.specific_files is None to indicate no filter, or any iterable to
322
# indicate a filter - [] means no files at all, as per iter_changes.
323
if specific_files is not None:
324
self.specific_files = sorted(
325
minimum_path_selection(specific_files))
327
self.specific_files = None
329
self.allow_pointless = allow_pointless
330
self.message_callback = message_callback
331
self.timestamp = timestamp
332
self.timezone = timezone
333
self.committer = committer
335
self.verbose = verbose
337
stack.enter_context(self.work_tree.lock_write())
338
self.parents = self.work_tree.get_parent_ids()
339
self.pb = ui.ui_factory.nested_progress_bar()
340
stack.callback(self.pb.finished)
341
self.basis_revid = self.work_tree.last_revision()
342
self.basis_tree = self.work_tree.basis_tree()
343
stack.enter_context(self.basis_tree.lock_read())
344
# Cannot commit with conflicts present.
345
if len(self.work_tree.conflicts()) > 0:
346
raise ConflictsInTree
348
# Setup the bound branch variables as needed.
349
self._check_bound_branch(stack, possible_master_transports)
351
# Check that the working tree is up to date
352
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
354
# Complete configuration setup
355
if reporter is not None:
356
self.reporter = reporter
357
elif self.reporter is None:
358
self.reporter = self._select_reporter()
359
if self.config_stack is None:
360
self.config_stack = self.work_tree.get_config_stack()
362
# Setup the progress bar. As the number of files that need to be
363
# committed in unknown, progress is reported as stages.
364
# We keep track of entries separately though and include that
365
# information in the progress bar during the relevant stages.
366
self.pb_stage_name = ""
367
self.pb_stage_count = 0
368
self.pb_stage_total = 5
369
if self.bound_branch:
370
# 2 extra stages: "Uploading data to master branch" and "Merging
371
# tags to master branch"
372
self.pb_stage_total += 2
373
self.pb.show_pct = False
374
self.pb.show_spinner = False
375
self.pb.show_eta = False
376
self.pb.show_count = True
377
self.pb.show_bar = True
379
# After a merge, a selected file commit is not supported.
380
# See 'bzr help merge' for an explanation as to why.
381
if len(self.parents) > 1 and self.specific_files is not None:
382
raise CannotCommitSelectedFileMerge(self.specific_files)
383
# Excludes are a form of selected file commit.
384
if len(self.parents) > 1 and self.exclude:
385
raise CannotCommitSelectedFileMerge(self.exclude)
387
# Collect the changes
388
self._set_progress_stage("Collecting changes", counter=True)
390
self.builder = self.branch.get_commit_builder(
391
self.parents, self.config_stack, timestamp, timezone, committer,
392
self.revprops, rev_id, lossy=lossy)
394
if self.builder.updates_branch and self.bound_branch:
396
raise AssertionError(
397
"bound branches not supported for commit builders "
398
"that update the branch")
401
# find the location being committed to
402
if self.bound_branch:
403
master_location = self.master_branch.base
405
master_location = self.branch.base
407
# report the start of the commit
408
self.reporter.started(new_revno, self.rev_id, master_location)
410
self._update_builder_with_changes()
411
self._check_pointless()
413
# TODO: Now the new inventory is known, check for conflicts.
414
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
415
# weave lines, because nothing should be recorded until it is known
416
# that commit will succeed.
417
self._set_progress_stage("Saving data locally")
418
self.builder.finish_inventory()
420
# Prompt the user for a commit message if none provided
421
message = message_callback(self)
422
self.message = message
424
# Add revision data to the local branch
425
self.rev_id = self.builder.commit(self.message)
428
mutter("aborting commit write group because of exception:")
429
trace.log_exception_quietly()
433
self._update_branches(old_revno, old_revid, new_revno)
435
# Make the working tree be up to date with the branch. This
436
# includes automatic changes scheduled to be made to the tree, such
437
# as updating its basis and unversioning paths that were missing.
438
self.work_tree.unversion(self.deleted_paths)
439
self._set_progress_stage("Updating the working tree")
440
self.work_tree.update_basis_by_delta(self.rev_id,
441
self.builder.get_basis_delta())
442
self.reporter.completed(new_revno, self.rev_id)
443
self._process_post_hooks(old_revno, new_revno)
446
def _update_branches(self, old_revno, old_revid, new_revno):
447
"""Update the master and local branch to the new revision.
449
This will try to make sure that the master branch is updated
450
before the local branch.
452
:param old_revno: Revision number of master branch before the
454
:param old_revid: Tip of master branch before the commit
455
:param new_revno: Revision number of the new commit
457
if not self.builder.updates_branch:
458
self._process_pre_hooks(old_revno, new_revno)
460
# Upload revision data to the master.
461
# this will propagate merged revisions too if needed.
462
if self.bound_branch:
463
self._set_progress_stage("Uploading data to master branch")
464
# 'commit' to the master first so a timeout here causes the
465
# local branch to be out of date
466
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
467
self.branch, new_revno, self.rev_id, lossy=self._lossy)
469
self.branch.fetch(self.master_branch, self.rev_id)
471
# and now do the commit locally.
472
self.branch.set_last_revision_info(new_revno, self.rev_id)
475
self._process_pre_hooks(old_revno, new_revno)
476
except BaseException:
477
# The commit builder will already have updated the branch,
479
self.branch.set_last_revision_info(old_revno, old_revid)
482
# Merge local tags to remote
483
if self.bound_branch:
484
self._set_progress_stage("Merging tags to master branch")
485
tag_updates, tag_conflicts = self.branch.tags.merge_to(
486
self.master_branch.tags)
488
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
489
note(gettext("Conflicting tags in bound branch:\n{0}".format(
490
"\n".join(warning_lines))))
427
492
def _select_reporter(self):
428
493
"""Select the CommitReporter to use."""
631
671
reporter = self.reporter
632
672
report_changes = reporter.is_verbose()
634
674
for change in iter_changes:
635
675
if report_changes:
636
old_path = change[1][0]
637
new_path = change[1][1]
638
versioned = change[3][1]
640
versioned = change[3][1]
676
old_path = change.path[0]
677
new_path = change.path[1]
678
versioned = change.versioned[1]
679
kind = change.kind[1]
680
versioned = change.versioned[1]
641
681
if kind is None and versioned:
643
683
if report_changes:
644
684
reporter.missing(new_path)
645
deleted_ids.append(change[0])
685
if change.kind[0] == 'symlink' and not self.work_tree.supports_symlinks():
686
trace.warning('Ignoring "%s" as symlinks are not '
687
'supported on this filesystem.' % (change.path[0],))
689
deleted_paths.append(change[1][1])
646
690
# Reset the new path (None) and new versioned flag (False)
647
change = (change[0], (change[1][0], None), change[2],
648
(change[3][0], False)) + change[4:]
691
change = change.discard_new()
692
new_path = change.path[1]
649
694
elif kind == 'tree-reference':
650
695
if self.recursive == 'down':
651
self._commit_nested_tree(change[0], change[1][1])
652
if change[3][0] or change[3][1]:
696
self._commit_nested_tree(change[1][1])
697
if change.versioned[0] or change.versioned[1]:
654
699
if report_changes:
655
700
if new_path is None:
656
701
reporter.deleted(old_path)
657
702
elif old_path is None:
658
reporter.snapshot_change('added', new_path)
703
reporter.snapshot_change(gettext('added'), new_path)
659
704
elif old_path != new_path:
660
reporter.renamed('renamed', old_path, new_path)
705
reporter.renamed(gettext('renamed'),
663
self.work_tree.branch.repository._format.rich_root_data):
709
or self.work_tree.branch.repository._format.rich_root_data):
664
710
# Don't report on changes to '' in non rich root
666
reporter.snapshot_change('modified', new_path)
712
reporter.snapshot_change(
713
gettext('modified'), new_path)
667
714
self._next_progress_entry()
668
# Unversion IDs that were found to be deleted
669
self.deleted_ids = deleted_ids
671
def _record_unselected(self):
672
# If specific files are selected, then all un-selected files must be
673
# recorded in their previous state. For more details, see
674
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
675
if self.specific_files or self.exclude:
676
specific_files = self.specific_files or []
677
for path, old_ie in self.basis_inv.iter_entries():
678
if old_ie.file_id in self.builder.new_inventory:
679
# already added - skip.
681
if (is_inside_any(specific_files, path)
682
and not is_inside_any(self.exclude, path)):
683
# was inside the selected path, and not excluded - if not
684
# present it has been deleted so skip.
686
# From here down it was either not selected, or was excluded:
687
# We preserve the entry unaltered.
689
# Note: specific file commits after a merge are currently
690
# prohibited. This test is for sanity/safety in case it's
691
# required after that changes.
692
if len(self.parents) > 1:
694
self.builder.record_entry_contents(ie, self.parent_invs, path,
695
self.basis_tree, None)
697
def _report_and_accumulate_deletes(self):
698
if (isinstance(self.basis_inv, Inventory)
699
and isinstance(self.builder.new_inventory, Inventory)):
700
# the older Inventory classes provide a _byid dict, and building a
701
# set from the keys of this dict is substantially faster than even
702
# getting a set of ids from the inventory
704
# <lifeless> set(dict) is roughly the same speed as
705
# set(iter(dict)) and both are significantly slower than
707
deleted_ids = set(self.basis_inv._byid.keys()) - \
708
set(self.builder.new_inventory._byid.keys())
710
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
712
self.any_entries_deleted = True
713
deleted = [(self.basis_tree.id2path(file_id), file_id)
714
for file_id in deleted_ids]
716
# XXX: this is not quite directory-order sorting
717
for path, file_id in deleted:
718
self.builder.record_delete(path, file_id)
719
self.reporter.deleted(path)
715
# Unversion files that were found to be deleted
716
self.deleted_paths = deleted_paths
721
718
def _check_strict(self):
722
719
# XXX: when we use iter_changes this would likely be faster if
727
724
for unknown in self.work_tree.unknowns():
728
725
raise StrictCommitFailed()
730
def _populate_from_inventory(self):
731
"""Populate the CommitBuilder by walking the working tree inventory."""
732
# Build the revision inventory.
734
# This starts by creating a new empty inventory. Depending on
735
# which files are selected for commit, and what is present in the
736
# current tree, the new inventory is populated. inventory entries
737
# which are candidates for modification have their revision set to
738
# None; inventory entries that are carried over untouched have their
739
# revision set to their prior value.
741
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
742
# results to create a new inventory at the same time, which results
743
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
746
specific_files = self.specific_files
747
exclude = self.exclude
748
report_changes = self.reporter.is_verbose()
750
# A tree of paths that have been deleted. E.g. if foo/bar has been
751
# deleted, then we have {'foo':{'bar':{}}}
753
# XXX: Note that entries may have the wrong kind because the entry does
754
# not reflect the status on disk.
755
work_inv = self.work_tree.inventory
756
# NB: entries will include entries within the excluded ids/paths
757
# because iter_entries_by_dir has no 'exclude' facility today.
758
entries = work_inv.iter_entries_by_dir(
759
specific_file_ids=self.specific_file_ids, yield_parents=True)
760
for path, existing_ie in entries:
761
file_id = existing_ie.file_id
762
name = existing_ie.name
763
parent_id = existing_ie.parent_id
764
kind = existing_ie.kind
765
# Skip files that have been deleted from the working tree.
766
# The deleted path ids are also recorded so they can be explicitly
769
path_segments = splitpath(path)
770
deleted_dict = deleted_paths
771
for segment in path_segments:
772
deleted_dict = deleted_dict.get(segment, None)
774
# We either took a path not present in the dict
775
# (deleted_dict was None), or we've reached an empty
776
# child dir in the dict, so are now a sub-path.
780
if deleted_dict is not None:
781
# the path has a deleted parent, do not add it.
783
if exclude and is_inside_any(exclude, path):
784
# Skip excluded paths. Excluded paths are processed by
785
# _update_builder_with_changes.
787
content_summary = self.work_tree.path_content_summary(path)
788
kind = content_summary[0]
789
# Note that when a filter of specific files is given, we must only
790
# skip/record deleted files matching that filter.
791
if not specific_files or is_inside_any(specific_files, path):
792
if kind == 'missing':
793
if not deleted_paths:
794
# path won't have been split yet.
795
path_segments = splitpath(path)
796
deleted_dict = deleted_paths
797
for segment in path_segments:
798
deleted_dict = deleted_dict.setdefault(segment, {})
799
self.reporter.missing(path)
800
self._next_progress_entry()
801
deleted_ids.append(file_id)
803
# TODO: have the builder do the nested commit just-in-time IF and
805
if kind == 'tree-reference':
806
# enforce repository nested tree policy.
807
if (not self.work_tree.supports_tree_reference() or
808
# repository does not support it either.
809
not self.branch.repository._format.supports_tree_reference):
811
content_summary = (kind, None, None, None)
812
elif self.recursive == 'down':
813
nested_revision_id = self._commit_nested_tree(
815
content_summary = (kind, None, None, nested_revision_id)
817
nested_revision_id = self.work_tree.get_reference_revision(file_id)
818
content_summary = (kind, None, None, nested_revision_id)
820
# Record an entry for this item
821
# Note: I don't particularly want to have the existing_ie
822
# parameter but the test suite currently (28-Jun-07) breaks
823
# without it thanks to a unicode normalisation issue. :-(
824
definitely_changed = kind != existing_ie.kind
825
self._record_entry(path, file_id, specific_files, kind, name,
826
parent_id, definitely_changed, existing_ie, report_changes,
829
# Unversion IDs that were found to be deleted
830
self.deleted_ids = deleted_ids
832
def _commit_nested_tree(self, file_id, path):
727
def _commit_nested_tree(self, path):
833
728
"Commit a nested tree."
834
sub_tree = self.work_tree.get_nested_tree(file_id, path)
729
sub_tree = self.work_tree.get_nested_tree(path)
835
730
# FIXME: be more comprehensive here:
836
731
# this works when both trees are in --trees repository,
837
732
# but when both are bound to a different repository,
839
734
# finally implement the explicit-caches approach design
840
735
# a while back - RBC 20070306.
841
736
if sub_tree.branch.repository.has_same_location(
842
self.work_tree.branch.repository):
737
self.work_tree.branch.repository):
843
738
sub_tree.branch.repository = \
844
739
self.work_tree.branch.repository
846
741
return sub_tree.commit(message=None, revprops=self.revprops,
847
recursive=self.recursive,
848
message_callback=self.message_callback,
849
timestamp=self.timestamp, timezone=self.timezone,
850
committer=self.committer,
851
allow_pointless=self.allow_pointless,
852
strict=self.strict, verbose=self.verbose,
853
local=self.local, reporter=self.reporter)
854
except errors.PointlessCommit:
855
return self.work_tree.get_reference_revision(file_id)
857
def _record_entry(self, path, file_id, specific_files, kind, name,
858
parent_id, definitely_changed, existing_ie, report_changes,
860
"Record the new inventory entry for a path if any."
861
# mutter('check %s {%s}', path, file_id)
862
# mutter('%s selected for commit', path)
863
if definitely_changed or existing_ie is None:
864
ie = make_entry(kind, name, parent_id, file_id)
866
ie = existing_ie.copy()
868
# For carried over entries we don't care about the fs hash - the repo
869
# isn't generating a sha, so we're not saving computation time.
870
_, _, fs_hash = self.builder.record_entry_contents(
871
ie, self.parent_invs, path, self.work_tree, content_summary)
873
self._report_change(ie, path)
875
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
878
def _report_change(self, ie, path):
879
"""Report a change to the user.
881
The change that has occurred is described relative to the basis
884
if (self.basis_inv.has_id(ie.file_id)):
885
basis_ie = self.basis_inv[ie.file_id]
888
change = ie.describe_change(basis_ie, ie)
889
if change in (InventoryEntry.RENAMED,
890
InventoryEntry.MODIFIED_AND_RENAMED):
891
old_path = self.basis_inv.id2path(ie.file_id)
892
self.reporter.renamed(change, old_path, path)
893
self._next_progress_entry()
895
if change == 'unchanged':
897
self.reporter.snapshot_change(change, path)
898
self._next_progress_entry()
742
recursive=self.recursive,
743
message_callback=self.message_callback,
744
timestamp=self.timestamp,
745
timezone=self.timezone,
746
committer=self.committer,
747
allow_pointless=self.allow_pointless,
748
strict=self.strict, verbose=self.verbose,
749
local=self.local, reporter=self.reporter)
750
except PointlessCommit:
751
return self.work_tree.get_reference_revision(path)
900
753
def _set_progress_stage(self, name, counter=False):
901
754
"""Set the progress stage and emit an update to the progress bar."""
added
removed
breezy/commit.py
