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
59
from .branch import Branch
60
from .cleanup import OperationWithCleanups
62
from .errors import (BzrError,
66
from .osutils import (get_user_encoding,
68
minimum_path_selection,
70
from .trace import mutter, note, is_quiet
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
old_path = change[1][0]
99
new_path = change[1][1]
101
new_excluded = (new_path is not None and
102
is_inside_any(exclude, new_path))
104
old_excluded = (old_path is not None and
105
is_inside_any(exclude, old_path))
107
if old_excluded and new_excluded:
110
if old_excluded or new_excluded:
111
# TODO(jelmer): Perhaps raise an error here instead?
65
from bzrlib.branch import Branch
67
from bzrlib.errors import (BzrError, PointlessCommit,
71
from bzrlib.osutils import (kind_marker, isdir,isfile, is_inside_any,
72
is_inside_or_parent_of_any,
73
minimum_path_selection,
74
quotefn, sha_file, split_lines,
77
from bzrlib.testament import Testament
78
from bzrlib.trace import mutter, note, warning, is_quiet
79
from bzrlib.xml5 import serializer_v5
80
from bzrlib.inventory import InventoryEntry, make_entry
81
from bzrlib import symbol_versioning
82
from bzrlib.symbol_versioning import (deprecated_passed,
85
from bzrlib.workingtree import WorkingTree
86
from bzrlib.urlutils import unescape_for_display
117
90
class NullCommitReporter(object):
118
91
"""I report on progress of a commit."""
120
def started(self, revno, revid, location):
93
def started(self, revno, revid, location=None):
95
symbol_versioning.warn("As of bzr 1.0 you must pass a location "
96
"to started.", DeprecationWarning,
123
100
def snapshot_change(self, change, path):
340
266
self.exclude = []
341
267
self.local = local
342
268
self.master_branch = None
269
self.master_locked = False
343
270
self.recursive = recursive
344
271
self.rev_id = None
345
# self.specific_files is None to indicate no filter, or any iterable to
346
# indicate a filter - [] means no files at all, as per iter_changes.
347
272
if specific_files is not None:
348
273
self.specific_files = sorted(
349
274
minimum_path_selection(specific_files))
351
276
self.specific_files = None
277
self.specific_file_ids = None
353
278
self.allow_pointless = allow_pointless
279
self.revprops = revprops
354
280
self.message_callback = message_callback
355
281
self.timestamp = timestamp
356
282
self.timezone = timezone
357
283
self.committer = committer
358
284
self.strict = strict
359
285
self.verbose = verbose
286
# accumulates an inventory delta to the basis entry, so we can make
287
# just the necessary updates to the workingtree's cached basis.
288
self._basis_delta = []
361
290
self.work_tree.lock_write()
362
operation.add_cleanup(self.work_tree.unlock)
363
self.parents = self.work_tree.get_parent_ids()
364
self.pb = ui.ui_factory.nested_progress_bar()
365
operation.add_cleanup(self.pb.finished)
291
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
366
292
self.basis_revid = self.work_tree.last_revision()
367
293
self.basis_tree = self.work_tree.basis_tree()
368
294
self.basis_tree.lock_read()
369
operation.add_cleanup(self.basis_tree.unlock)
370
# Cannot commit with conflicts present.
371
if len(self.work_tree.conflicts()) > 0:
372
raise ConflictsInTree
374
# Setup the bound branch variables as needed.
375
self._check_bound_branch(operation, possible_master_transports)
377
# Check that the working tree is up to date
378
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
380
# Complete configuration setup
381
if reporter is not None:
382
self.reporter = reporter
383
elif self.reporter is None:
384
self.reporter = self._select_reporter()
385
if self.config_stack is None:
386
self.config_stack = self.work_tree.get_config_stack()
388
# Setup the progress bar. As the number of files that need to be
389
# committed in unknown, progress is reported as stages.
390
# We keep track of entries separately though and include that
391
# information in the progress bar during the relevant stages.
392
self.pb_stage_name = ""
393
self.pb_stage_count = 0
394
self.pb_stage_total = 5
395
if self.bound_branch:
396
# 2 extra stages: "Uploading data to master branch" and "Merging
397
# tags to master branch"
398
self.pb_stage_total += 2
399
self.pb.show_pct = False
400
self.pb.show_spinner = False
401
self.pb.show_eta = False
402
self.pb.show_count = True
403
self.pb.show_bar = True
405
# After a merge, a selected file commit is not supported.
406
# See 'bzr help merge' for an explanation as to why.
407
if len(self.parents) > 1 and self.specific_files is not None:
408
raise CannotCommitSelectedFileMerge(self.specific_files)
409
# Excludes are a form of selected file commit.
410
if len(self.parents) > 1 and self.exclude:
411
raise CannotCommitSelectedFileMerge(self.exclude)
413
# Collect the changes
414
self._set_progress_stage("Collecting changes", counter=True)
416
self.builder = self.branch.get_commit_builder(
417
self.parents, self.config_stack, timestamp, timezone, committer,
418
self.revprops, rev_id, lossy=lossy)
420
if self.builder.updates_branch and self.bound_branch:
422
raise AssertionError(
423
"bound branches not supported for commit builders "
424
"that update the branch")
427
# find the location being committed to
296
# Cannot commit with conflicts present.
297
if len(self.work_tree.conflicts()) > 0:
298
raise ConflictsInTree
300
# Setup the bound branch variables as needed.
301
self._check_bound_branch()
303
# Check that the working tree is up to date
304
old_revno, new_revno = self._check_out_of_date_tree()
306
# Complete configuration setup
307
if reporter is not None:
308
self.reporter = reporter
309
elif self.reporter is None:
310
self.reporter = self._select_reporter()
311
if self.config is None:
312
self.config = self.branch.get_config()
314
# If provided, ensure the specified files are versioned
315
if self.specific_files is not None:
316
# Note: This routine is being called because it raises
317
# PathNotVersionedError as a side effect of finding the IDs. We
318
# later use the ids we found as input to the working tree
319
# inventory iterator, so we only consider those ids rather than
320
# examining the whole tree again.
321
# XXX: Dont we have filter_unversioned to do this more
323
self.specific_file_ids = tree.find_ids_across_trees(
324
specific_files, [self.basis_tree, self.work_tree])
326
# Setup the progress bar. As the number of files that need to be
327
# committed in unknown, progress is reported as stages.
328
# We keep track of entries separately though and include that
329
# information in the progress bar during the relevant stages.
330
self.pb_stage_name = ""
331
self.pb_stage_count = 0
332
self.pb_stage_total = 5
428
333
if self.bound_branch:
429
master_location = self.master_branch.base
431
master_location = self.branch.base
433
# report the start of the commit
434
self.reporter.started(new_revno, self.rev_id, master_location)
436
self._update_builder_with_changes()
437
self._check_pointless()
439
# TODO: Now the new inventory is known, check for conflicts.
440
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
441
# weave lines, because nothing should be recorded until it is known
442
# that commit will succeed.
443
self._set_progress_stage("Saving data locally")
444
self.builder.finish_inventory()
446
# Prompt the user for a commit message if none provided
447
message = message_callback(self)
448
self.message = message
450
# Add revision data to the local branch
451
self.rev_id = self.builder.commit(self.message)
454
mutter("aborting commit write group because of exception:")
455
trace.log_exception_quietly()
459
self._update_branches(old_revno, old_revid, new_revno)
461
# Make the working tree be up to date with the branch. This
462
# includes automatic changes scheduled to be made to the tree, such
463
# as updating its basis and unversioning paths that were missing.
464
self.work_tree.unversion(self.deleted_paths)
465
self._set_progress_stage("Updating the working tree")
466
self.work_tree.update_basis_by_delta(self.rev_id,
467
self.builder.get_basis_delta())
468
self.reporter.completed(new_revno, self.rev_id)
469
self._process_post_hooks(old_revno, new_revno)
472
def _update_branches(self, old_revno, old_revid, new_revno):
473
"""Update the master and local branch to the new revision.
475
This will try to make sure that the master branch is updated
476
before the local branch.
478
:param old_revno: Revision number of master branch before the
480
:param old_revid: Tip of master branch before the commit
481
:param new_revno: Revision number of the new commit
483
if not self.builder.updates_branch:
334
self.pb_stage_total += 1
335
self.pb.show_pct = False
336
self.pb.show_spinner = False
337
self.pb.show_eta = False
338
self.pb.show_count = True
339
self.pb.show_bar = True
341
self.basis_inv = self.basis_tree.inventory
342
self._gather_parents()
343
# After a merge, a selected file commit is not supported.
344
# See 'bzr help merge' for an explanation as to why.
345
if len(self.parents) > 1 and self.specific_files:
346
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
347
# Excludes are a form of selected file commit.
348
if len(self.parents) > 1 and self.exclude:
349
raise errors.CannotCommitSelectedFileMerge(self.exclude)
351
# Collect the changes
352
self._set_progress_stage("Collecting changes",
353
entries_title="Directory")
354
self.builder = self.branch.get_commit_builder(self.parents,
355
self.config, timestamp, timezone, committer, revprops, rev_id)
358
# find the location being committed to
359
if self.bound_branch:
360
master_location = self.master_branch.base
362
master_location = self.branch.base
364
# report the start of the commit
365
self.reporter.started(new_revno, self.rev_id, master_location)
367
self._update_builder_with_changes()
368
self._report_and_accumulate_deletes()
369
self._check_pointless()
371
# TODO: Now the new inventory is known, check for conflicts.
372
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
373
# weave lines, because nothing should be recorded until it is known
374
# that commit will succeed.
375
self._set_progress_stage("Saving data locally")
376
self.builder.finish_inventory()
378
# Prompt the user for a commit message if none provided
379
message = message_callback(self)
380
self.message = message
381
self._escape_commit_message()
383
# Add revision data to the local branch
384
self.rev_id = self.builder.commit(self.message)
484
390
self._process_pre_hooks(old_revno, new_revno)
486
392
# Upload revision data to the master.
487
393
# this will propagate merged revisions too if needed.
488
394
if self.bound_branch:
489
self._set_progress_stage("Uploading data to master branch")
395
if not self.master_branch.repository.has_same_location(
396
self.branch.repository):
397
self._set_progress_stage("Uploading data to master branch")
398
self.master_branch.repository.fetch(self.branch.repository,
399
revision_id=self.rev_id)
400
# now the master has the revision data
490
401
# 'commit' to the master first so a timeout here causes the
491
402
# local branch to be out of date
492
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
493
self.branch, new_revno, self.rev_id, lossy=self._lossy)
495
self.branch.fetch(self.master_branch, self.rev_id)
403
self.master_branch.set_last_revision_info(new_revno,
497
406
# and now do the commit locally.
498
407
self.branch.set_last_revision_info(new_revno, self.rev_id)
501
self._process_pre_hooks(old_revno, new_revno)
502
except BaseException:
503
# The commit builder will already have updated the branch,
505
self.branch.set_last_revision_info(old_revno, old_revid)
508
# Merge local tags to remote
509
if self.bound_branch:
510
self._set_progress_stage("Merging tags to master branch")
511
tag_updates, tag_conflicts = self.branch.tags.merge_to(
512
self.master_branch.tags)
514
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
515
note(gettext("Conflicting tags in bound branch:\n{0}".format(
516
"\n".join(warning_lines))))
409
# Make the working tree up to date with the branch
410
self._set_progress_stage("Updating the working tree")
411
self.work_tree.update_basis_by_delta(self.rev_id,
413
self.reporter.completed(new_revno, self.rev_id)
414
self._process_post_hooks(old_revno, new_revno)
518
419
def _select_reporter(self):
519
420
"""Select the CommitReporter to use."""
669
575
old_revno, old_revid, new_revno, self.rev_id,
670
576
tree_delta, future_tree)
579
"""Cleanup any open locks, progress bars etc."""
580
cleanups = [self._cleanup_bound_branch,
581
self.basis_tree.unlock,
582
self.work_tree.unlock,
584
found_exception = None
585
for cleanup in cleanups:
588
# we want every cleanup to run no matter what.
589
# so we have a catchall here, but we will raise the
590
# last encountered exception up the stack: and
591
# typically this will be useful enough.
594
if found_exception is not None:
595
# don't do a plan raise, because the last exception may have been
596
# trashed, e is our sure-to-work exception even though it loses the
597
# full traceback. XXX: RBC 20060421 perhaps we could check the
598
# exc_info and if its the same one do a plain raise otherwise
599
# 'raise e' as we do now.
602
def _cleanup_bound_branch(self):
603
"""Executed at the end of a try/finally to cleanup a bound branch.
605
If the branch wasn't bound, this is a no-op.
606
If it was, it resents self.branch to the local branch, instead
609
if not self.bound_branch:
611
if self.master_locked:
612
self.master_branch.unlock()
614
def _escape_commit_message(self):
615
"""Replace xml-incompatible control characters."""
616
# FIXME: RBC 20060419 this should be done by the revision
617
# serialiser not by commit. Then we can also add an unescaper
618
# in the deserializer and start roundtripping revision messages
619
# precisely. See repository_implementations/test_repository.py
621
# Python strings can include characters that can't be
622
# represented in well-formed XML; escape characters that
623
# aren't listed in the XML specification
624
# (http://www.w3.org/TR/REC-xml/#NT-Char).
625
self.message, escape_count = re.subn(
626
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
627
lambda match: match.group(0).encode('unicode_escape'),
630
self.reporter.escaped(escape_count, self.message)
632
def _gather_parents(self):
633
"""Record the parents of a merge for merge detection."""
634
# TODO: Make sure that this list doesn't contain duplicate
635
# entries and the order is preserved when doing this.
636
self.parents = self.work_tree.get_parent_ids()
637
self.parent_invs = [self.basis_inv]
638
for revision in self.parents[1:]:
639
if self.branch.repository.has_revision(revision):
640
mutter('commit parent revision {%s}', revision)
641
inventory = self.branch.repository.get_inventory(revision)
642
self.parent_invs.append(inventory)
644
mutter('commit parent ghost revision {%s}', revision)
672
646
def _update_builder_with_changes(self):
673
647
"""Update the commit builder with the data about what has changed.
675
specific_files = self.specific_files
676
mutter("Selecting files for commit with filter %r", specific_files)
679
iter_changes = self.work_tree.iter_changes(
680
self.basis_tree, specific_files=specific_files)
682
iter_changes = filter_excluded(iter_changes, self.exclude)
683
iter_changes = self._filter_iter_changes(iter_changes)
684
for path, fs_hash in self.builder.record_iter_changes(
685
self.work_tree, self.basis_revid, iter_changes):
686
self.work_tree._observed_sha1(path, fs_hash)
688
def _filter_iter_changes(self, iter_changes):
689
"""Process iter_changes.
691
This method reports on the changes in iter_changes to the user, and
692
converts 'missing' entries in the iter_changes iterator to 'deleted'
693
entries. 'missing' entries have their
695
:param iter_changes: An iter_changes to process.
696
:return: A generator of changes.
698
reporter = self.reporter
699
report_changes = reporter.is_verbose()
701
for change in iter_changes:
703
old_path = change[1][0]
704
new_path = change[1][1]
705
versioned = change[3][1]
707
versioned = change[3][1]
708
if kind is None and versioned:
711
reporter.missing(new_path)
712
deleted_paths.append(change[1][1])
713
# Reset the new path (None) and new versioned flag (False)
714
change = (change[0], (change[1][0], None), change[2],
715
(change[3][0], False)) + change[4:]
716
new_path = change[1][1]
718
elif kind == 'tree-reference':
719
if self.recursive == 'down':
720
self._commit_nested_tree(change[1][1])
721
if change[3][0] or change[3][1]:
725
reporter.deleted(old_path)
726
elif old_path is None:
727
reporter.snapshot_change(gettext('added'), new_path)
728
elif old_path != new_path:
729
reporter.renamed(gettext('renamed'),
733
or self.work_tree.branch.repository._format.rich_root_data):
734
# Don't report on changes to '' in non rich root
736
reporter.snapshot_change(
737
gettext('modified'), new_path)
738
self._next_progress_entry()
739
# Unversion files that were found to be deleted
740
self.deleted_paths = deleted_paths
742
def _check_strict(self):
743
# XXX: when we use iter_changes this would likely be faster if
744
# iter_changes would check for us (even in the presence of
649
# Build the revision inventory.
651
# This starts by creating a new empty inventory. Depending on
652
# which files are selected for commit, and what is present in the
653
# current tree, the new inventory is populated. inventory entries
654
# which are candidates for modification have their revision set to
655
# None; inventory entries that are carried over untouched have their
656
# revision set to their prior value.
658
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
659
# results to create a new inventory at the same time, which results
660
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
663
exclude = self.exclude
664
specific_files = self.specific_files or []
665
mutter("Selecting files for commit with filter %s", specific_files)
667
# Build the new inventory
668
self._populate_from_inventory()
670
# If specific files are selected, then all un-selected files must be
671
# recorded in their previous state. For more details, see
672
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
673
if specific_files or exclude:
674
for path, old_ie in self.basis_inv.iter_entries():
675
if old_ie.file_id in self.builder.new_inventory:
676
# already added - skip.
678
if (is_inside_any(specific_files, path)
679
and not is_inside_any(exclude, path)):
680
# was inside the selected path, and not excluded - if not
681
# present it has been deleted so skip.
683
# From here down it was either not selected, or was excluded:
684
if old_ie.kind == 'directory':
685
self._next_progress_entry()
686
# We preserve the entry unaltered.
688
# Note: specific file commits after a merge are currently
689
# prohibited. This test is for sanity/safety in case it's
690
# required after that changes.
691
if len(self.parents) > 1:
693
delta, version_recorded = self.builder.record_entry_contents(
694
ie, self.parent_invs, path, self.basis_tree, None)
696
self.any_entries_changed = True
697
if delta: self._basis_delta.append(delta)
699
def _report_and_accumulate_deletes(self):
700
# XXX: Could the list of deleted paths and ids be instead taken from
701
# _populate_from_inventory?
702
deleted_ids = set(self.basis_inv._byid.keys()) - \
703
set(self.builder.new_inventory._byid.keys())
705
self.any_entries_deleted = True
706
deleted = [(self.basis_tree.id2path(file_id), file_id)
707
for file_id in deleted_ids]
709
# XXX: this is not quite directory-order sorting
710
for path, file_id in deleted:
711
self._basis_delta.append((path, None, file_id, None))
712
self.reporter.deleted(path)
714
def _populate_from_inventory(self):
715
"""Populate the CommitBuilder by walking the working tree inventory."""
747
717
# raise an exception as soon as we find a single unknown.
748
718
for unknown in self.work_tree.unknowns():
749
719
raise StrictCommitFailed()
751
def _commit_nested_tree(self, path):
721
specific_files = self.specific_files
722
exclude = self.exclude
723
report_changes = self.reporter.is_verbose()
725
# A tree of paths that have been deleted. E.g. if foo/bar has been
726
# deleted, then we have {'foo':{'bar':{}}}
728
# XXX: Note that entries may have the wrong kind because the entry does
729
# not reflect the status on disk.
730
work_inv = self.work_tree.inventory
731
# NB: entries will include entries within the excluded ids/paths
732
# because iter_entries_by_dir has no 'exclude' facility today.
733
entries = work_inv.iter_entries_by_dir(
734
specific_file_ids=self.specific_file_ids, yield_parents=True)
735
for path, existing_ie in entries:
736
file_id = existing_ie.file_id
737
name = existing_ie.name
738
parent_id = existing_ie.parent_id
739
kind = existing_ie.kind
740
if kind == 'directory':
741
self._next_progress_entry()
742
# Skip files that have been deleted from the working tree.
743
# The deleted path ids are also recorded so they can be explicitly
746
path_segments = splitpath(path)
747
deleted_dict = deleted_paths
748
for segment in path_segments:
749
deleted_dict = deleted_dict.get(segment, None)
751
# We either took a path not present in the dict
752
# (deleted_dict was None), or we've reached an empty
753
# child dir in the dict, so are now a sub-path.
757
if deleted_dict is not None:
758
# the path has a deleted parent, do not add it.
760
if exclude and is_inside_any(exclude, path):
761
# Skip excluded paths. Excluded paths are processed by
762
# _update_builder_with_changes.
764
content_summary = self.work_tree.path_content_summary(path)
765
# Note that when a filter of specific files is given, we must only
766
# skip/record deleted files matching that filter.
767
if not specific_files or is_inside_any(specific_files, path):
768
if content_summary[0] == 'missing':
769
if not deleted_paths:
770
# path won't have been split yet.
771
path_segments = splitpath(path)
772
deleted_dict = deleted_paths
773
for segment in path_segments:
774
deleted_dict = deleted_dict.setdefault(segment, {})
775
self.reporter.missing(path)
776
deleted_ids.append(file_id)
778
# TODO: have the builder do the nested commit just-in-time IF and
780
if content_summary[0] == 'tree-reference':
781
# enforce repository nested tree policy.
782
if (not self.work_tree.supports_tree_reference() or
783
# repository does not support it either.
784
not self.branch.repository._format.supports_tree_reference):
785
content_summary = ('directory',) + content_summary[1:]
786
kind = content_summary[0]
787
# TODO: specific_files filtering before nested tree processing
788
if kind == 'tree-reference':
789
if self.recursive == 'down':
790
nested_revision_id = self._commit_nested_tree(
792
content_summary = content_summary[:3] + (
795
content_summary = content_summary[:3] + (
796
self.work_tree.get_reference_revision(file_id),)
798
# Record an entry for this item
799
# Note: I don't particularly want to have the existing_ie
800
# parameter but the test suite currently (28-Jun-07) breaks
801
# without it thanks to a unicode normalisation issue. :-(
802
definitely_changed = kind != existing_ie.kind
803
self._record_entry(path, file_id, specific_files, kind, name,
804
parent_id, definitely_changed, existing_ie, report_changes,
807
# Unversion IDs that were found to be deleted
808
self.work_tree.unversion(deleted_ids)
810
def _commit_nested_tree(self, file_id, path):
752
811
"Commit a nested tree."
753
sub_tree = self.work_tree.get_nested_tree(path)
812
sub_tree = self.work_tree.get_nested_tree(file_id, path)
754
813
# FIXME: be more comprehensive here:
755
814
# this works when both trees are in --trees repository,
756
815
# but when both are bound to a different repository,
757
# it fails; a better way of approaching this is to
816
# it fails; a better way of approaching this is to
758
817
# finally implement the explicit-caches approach design
759
818
# a while back - RBC 20070306.
760
819
if sub_tree.branch.repository.has_same_location(
761
self.work_tree.branch.repository):
820
self.work_tree.branch.repository):
762
821
sub_tree.branch.repository = \
763
822
self.work_tree.branch.repository
765
824
return sub_tree.commit(message=None, revprops=self.revprops,
766
recursive=self.recursive,
767
message_callback=self.message_callback,
768
timestamp=self.timestamp,
769
timezone=self.timezone,
770
committer=self.committer,
771
allow_pointless=self.allow_pointless,
772
strict=self.strict, verbose=self.verbose,
773
local=self.local, reporter=self.reporter)
774
except PointlessCommit:
775
return self.work_tree.get_reference_revision(path)
777
def _set_progress_stage(self, name, counter=False):
825
recursive=self.recursive,
826
message_callback=self.message_callback,
827
timestamp=self.timestamp, timezone=self.timezone,
828
committer=self.committer,
829
allow_pointless=self.allow_pointless,
830
strict=self.strict, verbose=self.verbose,
831
local=self.local, reporter=self.reporter)
832
except errors.PointlessCommit:
833
return self.work_tree.get_reference_revision(file_id)
835
def _record_entry(self, path, file_id, specific_files, kind, name,
836
parent_id, definitely_changed, existing_ie, report_changes,
838
"Record the new inventory entry for a path if any."
839
# mutter('check %s {%s}', path, file_id)
840
# mutter('%s selected for commit', path)
841
if definitely_changed or existing_ie is None:
842
ie = make_entry(kind, name, parent_id, file_id)
844
ie = existing_ie.copy()
846
delta, version_recorded = self.builder.record_entry_contents(ie,
847
self.parent_invs, path, self.work_tree, content_summary)
849
self._basis_delta.append(delta)
851
self.any_entries_changed = True
853
self._report_change(ie, path)
856
def _report_change(self, ie, path):
857
"""Report a change to the user.
859
The change that has occurred is described relative to the basis
862
if (self.basis_inv.has_id(ie.file_id)):
863
basis_ie = self.basis_inv[ie.file_id]
866
change = ie.describe_change(basis_ie, ie)
867
if change in (InventoryEntry.RENAMED,
868
InventoryEntry.MODIFIED_AND_RENAMED):
869
old_path = self.basis_inv.id2path(ie.file_id)
870
self.reporter.renamed(change, old_path, path)
872
self.reporter.snapshot_change(change, path)
874
def _set_progress_stage(self, name, entries_title=None):
778
875
"""Set the progress stage and emit an update to the progress bar."""
779
876
self.pb_stage_name = name
780
877
self.pb_stage_count += 1
878
self.pb_entries_title = entries_title
879
if entries_title is not None:
782
880
self.pb_entries_count = 0
784
self.pb_entries_count = None
881
self.pb_entries_total = '?'
785
882
self._emit_progress()
787
884
def _next_progress_entry(self):
added
removed
bzrlib/commit.py
