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):
123
96
def snapshot_change(self, change, path):
322
236
raise errors.RootNotRich()
323
237
if message_callback is None:
324
238
if message is not None:
325
if isinstance(message, bytes):
326
message = message.decode(get_user_encoding())
328
def message_callback(x):
239
if isinstance(message, str):
240
message = message.decode(bzrlib.user_encoding)
241
message_callback = lambda x: message
331
243
raise BzrError("The message or message_callback keyword"
332
244
" parameter is required for commit().")
334
246
self.bound_branch = None
247
self.any_entries_changed = False
335
248
self.any_entries_deleted = False
336
if exclude is not None:
337
self.exclude = sorted(
338
minimum_path_selection(exclude))
341
249
self.local = local
342
250
self.master_branch = None
251
self.master_locked = False
343
252
self.recursive = recursive
344
253
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
254
if specific_files is not None:
348
255
self.specific_files = sorted(
349
256
minimum_path_selection(specific_files))
351
258
self.specific_files = None
259
self.specific_file_ids = None
353
260
self.allow_pointless = allow_pointless
261
self.revprops = revprops
354
262
self.message_callback = message_callback
355
263
self.timestamp = timestamp
356
264
self.timezone = timezone
357
265
self.committer = committer
358
266
self.strict = strict
359
267
self.verbose = verbose
268
# accumulates an inventory delta to the basis entry, so we can make
269
# just the necessary updates to the workingtree's cached basis.
270
self._basis_delta = []
361
272
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)
273
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
366
274
self.basis_revid = self.work_tree.last_revision()
367
275
self.basis_tree = self.work_tree.basis_tree()
368
276
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
278
# Cannot commit with conflicts present.
279
if len(self.work_tree.conflicts()) > 0:
280
raise ConflictsInTree
282
# Setup the bound branch variables as needed.
283
self._check_bound_branch()
285
# Check that the working tree is up to date
286
old_revno, new_revno = self._check_out_of_date_tree()
288
# Complete configuration setup
289
if reporter is not None:
290
self.reporter = reporter
291
elif self.reporter is None:
292
self.reporter = self._select_reporter()
293
if self.config is None:
294
self.config = self.branch.get_config()
296
# If provided, ensure the specified files are versioned
297
if self.specific_files is not None:
298
# Note: This routine is being called because it raises
299
# PathNotVersionedError as a side effect of finding the IDs. We
300
# later use the ids we found as input to the working tree
301
# inventory iterator, so we only consider those ids rather than
302
# examining the whole tree again.
303
# XXX: Dont we have filter_unversioned to do this more
305
self.specific_file_ids = tree.find_ids_across_trees(
306
specific_files, [self.basis_tree, self.work_tree])
308
# Setup the progress bar. As the number of files that need to be
309
# committed in unknown, progress is reported as stages.
310
# We keep track of entries separately though and include that
311
# information in the progress bar during the relevant stages.
312
self.pb_stage_name = ""
313
self.pb_stage_count = 0
314
self.pb_stage_total = 5
428
315
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:
316
self.pb_stage_total += 1
317
self.pb.show_pct = False
318
self.pb.show_spinner = False
319
self.pb.show_eta = False
320
self.pb.show_count = True
321
self.pb.show_bar = True
323
# After a merge, a selected file commit is not supported.
324
# See 'bzr help merge' for an explanation as to why.
325
self.basis_inv = self.basis_tree.inventory
326
self._gather_parents()
327
if len(self.parents) > 1 and self.specific_files:
328
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
330
# Collect the changes
331
self._set_progress_stage("Collecting changes",
332
entries_title="Directory")
333
self.builder = self.branch.get_commit_builder(self.parents,
334
self.config, timestamp, timezone, committer, revprops, rev_id)
337
# find the location being committed to
338
if self.bound_branch:
339
master_location = self.master_branch.base
341
master_location = self.branch.base
343
# report the start of the commit
344
self.reporter.started(new_revno, self.rev_id, master_location)
346
self._update_builder_with_changes()
347
self._report_and_accumulate_deletes()
348
self._check_pointless()
350
# TODO: Now the new inventory is known, check for conflicts.
351
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
352
# weave lines, because nothing should be recorded until it is known
353
# that commit will succeed.
354
self._set_progress_stage("Saving data locally")
355
self.builder.finish_inventory()
357
# Prompt the user for a commit message if none provided
358
message = message_callback(self)
359
assert isinstance(message, unicode), type(message)
360
self.message = message
361
self._escape_commit_message()
363
# Add revision data to the local branch
364
self.rev_id = self.builder.commit(self.message)
484
370
self._process_pre_hooks(old_revno, new_revno)
486
372
# Upload revision data to the master.
487
373
# this will propagate merged revisions too if needed.
488
374
if self.bound_branch:
489
375
self._set_progress_stage("Uploading data to master branch")
376
self.master_branch.repository.fetch(self.branch.repository,
377
revision_id=self.rev_id)
378
# now the master has the revision data
490
379
# 'commit' to the master first so a timeout here causes the
491
380
# 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)
381
self.master_branch.set_last_revision_info(new_revno,
497
384
# and now do the commit locally.
498
385
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))))
387
# Make the working tree up to date with the branch
388
self._set_progress_stage("Updating the working tree")
389
self.work_tree.update_basis_by_delta(self.rev_id,
391
self.reporter.completed(new_revno, self.rev_id)
392
self._process_post_hooks(old_revno, new_revno)
518
397
def _select_reporter(self):
519
398
"""Select the CommitReporter to use."""
669
553
old_revno, old_revid, new_revno, self.rev_id,
670
554
tree_delta, future_tree)
557
"""Cleanup any open locks, progress bars etc."""
558
cleanups = [self._cleanup_bound_branch,
559
self.basis_tree.unlock,
560
self.work_tree.unlock,
562
found_exception = None
563
for cleanup in cleanups:
566
# we want every cleanup to run no matter what.
567
# so we have a catchall here, but we will raise the
568
# last encountered exception up the stack: and
569
# typically this will be useful enough.
572
if found_exception is not None:
573
# don't do a plan raise, because the last exception may have been
574
# trashed, e is our sure-to-work exception even though it loses the
575
# full traceback. XXX: RBC 20060421 perhaps we could check the
576
# exc_info and if its the same one do a plain raise otherwise
577
# 'raise e' as we do now.
580
def _cleanup_bound_branch(self):
581
"""Executed at the end of a try/finally to cleanup a bound branch.
583
If the branch wasn't bound, this is a no-op.
584
If it was, it resents self.branch to the local branch, instead
587
if not self.bound_branch:
589
if self.master_locked:
590
self.master_branch.unlock()
592
def _escape_commit_message(self):
593
"""Replace xml-incompatible control characters."""
594
# FIXME: RBC 20060419 this should be done by the revision
595
# serialiser not by commit. Then we can also add an unescaper
596
# in the deserializer and start roundtripping revision messages
597
# precisely. See repository_implementations/test_repository.py
599
# Python strings can include characters that can't be
600
# represented in well-formed XML; escape characters that
601
# aren't listed in the XML specification
602
# (http://www.w3.org/TR/REC-xml/#NT-Char).
603
self.message, escape_count = re.subn(
604
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
605
lambda match: match.group(0).encode('unicode_escape'),
608
self.reporter.escaped(escape_count, self.message)
610
def _gather_parents(self):
611
"""Record the parents of a merge for merge detection."""
612
# TODO: Make sure that this list doesn't contain duplicate
613
# entries and the order is preserved when doing this.
614
self.parents = self.work_tree.get_parent_ids()
615
self.parent_invs = [self.basis_inv]
616
for revision in self.parents[1:]:
617
if self.branch.repository.has_revision(revision):
618
mutter('commit parent revision {%s}', revision)
619
inventory = self.branch.repository.get_inventory(revision)
620
self.parent_invs.append(inventory)
622
mutter('commit parent ghost revision {%s}', revision)
672
624
def _update_builder_with_changes(self):
673
625
"""Update the commit builder with the data about what has changed.
627
# Build the revision inventory.
629
# This starts by creating a new empty inventory. Depending on
630
# which files are selected for commit, and what is present in the
631
# current tree, the new inventory is populated. inventory entries
632
# which are candidates for modification have their revision set to
633
# None; inventory entries that are carried over untouched have their
634
# revision set to their prior value.
636
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
637
# results to create a new inventory at the same time, which results
638
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
675
641
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 file_id, 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
642
mutter("Selecting files for commit with filter %s", specific_files)
644
# Build the new inventory
645
self._populate_from_inventory(specific_files)
647
# If specific files are selected, then all un-selected files must be
648
# recorded in their previous state. For more details, see
649
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
651
for path, old_ie in self.basis_inv.iter_entries():
652
if old_ie.file_id in self.builder.new_inventory:
653
# already added - skip.
655
if is_inside_any(specific_files, path):
656
# was inside the selected path, if not present it has been
659
if old_ie.kind == 'directory':
660
self._next_progress_entry()
661
# not in final inv yet, was not in the selected files, so is an
662
# entry to be preserved unaltered.
664
# Note: specific file commits after a merge are currently
665
# prohibited. This test is for sanity/safety in case it's
666
# required after that changes.
667
if len(self.parents) > 1:
669
delta, version_recorded = self.builder.record_entry_contents(
670
ie, self.parent_invs, path, self.basis_tree, None)
672
self.any_entries_changed = True
673
if delta: self._basis_delta.append(delta)
675
def _report_and_accumulate_deletes(self):
676
# XXX: Could the list of deleted paths and ids be instead taken from
677
# _populate_from_inventory?
678
deleted_ids = set(self.basis_inv._byid.keys()) - \
679
set(self.builder.new_inventory._byid.keys())
681
self.any_entries_deleted = True
682
deleted = [(self.basis_tree.id2path(file_id), file_id)
683
for file_id in deleted_ids]
685
# XXX: this is not quite directory-order sorting
686
for path, file_id in deleted:
687
self._basis_delta.append((path, None, file_id, None))
688
self.reporter.deleted(path)
690
def _populate_from_inventory(self, specific_files):
691
"""Populate the CommitBuilder by walking the working tree inventory."""
747
693
# raise an exception as soon as we find a single unknown.
748
694
for unknown in self.work_tree.unknowns():
749
695
raise StrictCommitFailed()
751
def _commit_nested_tree(self, path):
697
report_changes = self.reporter.is_verbose()
699
# A tree of paths that have been deleted. E.g. if foo/bar has been
700
# deleted, then we have {'foo':{'bar':{}}}
702
# XXX: Note that entries may have the wrong kind because the entry does
703
# not reflect the status on disk.
704
work_inv = self.work_tree.inventory
705
entries = work_inv.iter_entries_by_dir(
706
specific_file_ids=self.specific_file_ids, yield_parents=True)
707
for path, existing_ie in entries:
708
file_id = existing_ie.file_id
709
name = existing_ie.name
710
parent_id = existing_ie.parent_id
711
kind = existing_ie.kind
712
if kind == 'directory':
713
self._next_progress_entry()
714
# Skip files that have been deleted from the working tree.
715
# The deleted path ids are also recorded so they can be explicitly
718
path_segments = splitpath(path)
719
deleted_dict = deleted_paths
720
for segment in path_segments:
721
deleted_dict = deleted_dict.get(segment, None)
723
# We either took a path not present in the dict
724
# (deleted_dict was None), or we've reached an empty
725
# child dir in the dict, so are now a sub-path.
729
if deleted_dict is not None:
730
# the path has a deleted parent, do not add it.
732
content_summary = self.work_tree.path_content_summary(path)
733
# Note that when a filter of specific files is given, we must only
734
# skip/record deleted files matching that filter.
735
if not specific_files or is_inside_any(specific_files, path):
736
if content_summary[0] == 'missing':
737
if not deleted_paths:
738
# path won't have been split yet.
739
path_segments = splitpath(path)
740
deleted_dict = deleted_paths
741
for segment in path_segments:
742
deleted_dict = deleted_dict.setdefault(segment, {})
743
self.reporter.missing(path)
744
deleted_ids.append(file_id)
746
# TODO: have the builder do the nested commit just-in-time IF and
748
if content_summary[0] == 'tree-reference':
749
# enforce repository nested tree policy.
750
if (not self.work_tree.supports_tree_reference() or
751
# repository does not support it either.
752
not self.branch.repository._format.supports_tree_reference):
753
content_summary = ('directory',) + content_summary[1:]
754
kind = content_summary[0]
755
# TODO: specific_files filtering before nested tree processing
756
if kind == 'tree-reference':
757
if self.recursive == 'down':
758
nested_revision_id = self._commit_nested_tree(
760
content_summary = content_summary[:3] + (
763
content_summary = content_summary[:3] + (
764
self.work_tree.get_reference_revision(file_id),)
766
# Record an entry for this item
767
# Note: I don't particularly want to have the existing_ie
768
# parameter but the test suite currently (28-Jun-07) breaks
769
# without it thanks to a unicode normalisation issue. :-(
770
definitely_changed = kind != existing_ie.kind
771
self._record_entry(path, file_id, specific_files, kind, name,
772
parent_id, definitely_changed, existing_ie, report_changes,
775
# Unversion IDs that were found to be deleted
776
self.work_tree.unversion(deleted_ids)
778
def _commit_nested_tree(self, file_id, path):
752
779
"Commit a nested tree."
753
sub_tree = self.work_tree.get_nested_tree(path)
780
sub_tree = self.work_tree.get_nested_tree(file_id, path)
754
781
# FIXME: be more comprehensive here:
755
782
# this works when both trees are in --trees repository,
756
783
# but when both are bound to a different repository,
757
# it fails; a better way of approaching this is to
784
# it fails; a better way of approaching this is to
758
785
# finally implement the explicit-caches approach design
759
786
# a while back - RBC 20070306.
760
787
if sub_tree.branch.repository.has_same_location(
761
self.work_tree.branch.repository):
788
self.work_tree.branch.repository):
762
789
sub_tree.branch.repository = \
763
790
self.work_tree.branch.repository
765
792
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):
793
recursive=self.recursive,
794
message_callback=self.message_callback,
795
timestamp=self.timestamp, timezone=self.timezone,
796
committer=self.committer,
797
allow_pointless=self.allow_pointless,
798
strict=self.strict, verbose=self.verbose,
799
local=self.local, reporter=self.reporter)
800
except errors.PointlessCommit:
801
return self.work_tree.get_reference_revision(file_id)
803
def _record_entry(self, path, file_id, specific_files, kind, name,
804
parent_id, definitely_changed, existing_ie, report_changes,
806
"Record the new inventory entry for a path if any."
807
# mutter('check %s {%s}', path, file_id)
808
# mutter('%s selected for commit', path)
809
if definitely_changed or existing_ie is None:
810
ie = make_entry(kind, name, parent_id, file_id)
812
ie = existing_ie.copy()
814
delta, version_recorded = self.builder.record_entry_contents(ie,
815
self.parent_invs, path, self.work_tree, content_summary)
817
self._basis_delta.append(delta)
819
self.any_entries_changed = True
821
self._report_change(ie, path)
824
def _report_change(self, ie, path):
825
"""Report a change to the user.
827
The change that has occurred is described relative to the basis
830
if (self.basis_inv.has_id(ie.file_id)):
831
basis_ie = self.basis_inv[ie.file_id]
834
change = ie.describe_change(basis_ie, ie)
835
if change in (InventoryEntry.RENAMED,
836
InventoryEntry.MODIFIED_AND_RENAMED):
837
old_path = self.basis_inv.id2path(ie.file_id)
838
self.reporter.renamed(change, old_path, path)
840
self.reporter.snapshot_change(change, path)
842
def _set_progress_stage(self, name, entries_title=None):
778
843
"""Set the progress stage and emit an update to the progress bar."""
779
844
self.pb_stage_name = name
780
845
self.pb_stage_count += 1
846
self.pb_entries_title = entries_title
847
if entries_title is not None:
782
848
self.pb_entries_count = 0
784
self.pb_entries_count = None
849
self.pb_entries_total = '?'
785
850
self._emit_progress()
787
852
def _next_progress_entry(self):
added
removed
bzrlib/commit.py
