310
318
if self.config is None:
311
319
self.config = self.branch.get_config()
313
# If provided, ensure the specified files are versioned
314
if self.specific_files is not None:
315
# Note: This routine is being called because it raises
316
# PathNotVersionedError as a side effect of finding the IDs. We
317
# later use the ids we found as input to the working tree
318
# inventory iterator, so we only consider those ids rather than
319
# examining the whole tree again.
320
# XXX: Dont we have filter_unversioned to do this more
322
self.specific_file_ids = tree.find_ids_across_trees(
323
specific_files, [self.basis_tree, self.work_tree])
321
self._set_specific_file_ids()
325
323
# Setup the progress bar. As the number of files that need to be
326
324
# committed in unknown, progress is reported as stages.
395
390
# Upload revision data to the master.
396
391
# this will propagate merged revisions too if needed.
397
392
if self.bound_branch:
398
if not self.master_branch.repository.has_same_location(
399
self.branch.repository):
400
self._set_progress_stage("Uploading data to master branch")
401
self.master_branch.repository.fetch(self.branch.repository,
402
revision_id=self.rev_id)
403
# now the master has the revision data
393
self._set_progress_stage("Uploading data to master branch")
404
394
# 'commit' to the master first so a timeout here causes the
405
395
# local branch to be out of date
406
self.master_branch.set_last_revision_info(new_revno,
396
self.master_branch.import_last_revision_info(
397
self.branch.repository, new_revno, self.rev_id)
409
399
# and now do the commit locally.
410
400
self.branch.set_last_revision_info(new_revno, self.rev_id)
436
426
# The initial commit adds a root directory, but this in itself is not
437
427
# a worthwhile commit.
438
428
if (self.basis_revid == revision.NULL_REVISION and
439
len(self.builder.new_inventory) == 1):
429
((self.builder.new_inventory is not None and
430
len(self.builder.new_inventory) == 1) or
431
len(self.builder._basis_delta) == 1)):
440
432
raise PointlessCommit()
441
# If length == 1, then we only have the root entry. Which means
442
# that there is no real difference (only the root could be different)
443
# unless deletes occured, in which case the length is irrelevant.
444
if (self.any_entries_deleted or
445
(len(self.builder.new_inventory) != 1 and
446
self.any_entries_changed)):
433
if self.builder.any_changes():
448
435
raise PointlessCommit()
621
608
# serialiser not by commit. Then we can also add an unescaper
622
609
# in the deserializer and start roundtripping revision messages
623
610
# precisely. See repository_implementations/test_repository.py
625
# Python strings can include characters that can't be
626
# represented in well-formed XML; escape characters that
627
# aren't listed in the XML specification
628
# (http://www.w3.org/TR/REC-xml/#NT-Char).
629
self.message, escape_count = re.subn(
630
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
631
lambda match: match.group(0).encode('unicode_escape'),
611
self.message, escape_count = xml_serializer.escape_invalid_chars(
634
614
self.reporter.escaped(escape_count, self.message)
636
616
def _gather_parents(self):
637
617
"""Record the parents of a merge for merge detection."""
638
# TODO: Make sure that this list doesn't contain duplicate
618
# TODO: Make sure that this list doesn't contain duplicate
639
619
# entries and the order is preserved when doing this.
640
self.parents = self.work_tree.get_parent_ids()
620
if self.use_record_iter_changes:
622
self.basis_inv = self.basis_tree.inventory
641
623
self.parent_invs = [self.basis_inv]
642
624
for revision in self.parents[1:]:
643
625
if self.branch.repository.has_revision(revision):
650
632
def _update_builder_with_changes(self):
651
633
"""Update the commit builder with the data about what has changed.
653
# Build the revision inventory.
655
# This starts by creating a new empty inventory. Depending on
656
# which files are selected for commit, and what is present in the
657
# current tree, the new inventory is populated. inventory entries
658
# which are candidates for modification have their revision set to
659
# None; inventory entries that are carried over untouched have their
660
# revision set to their prior value.
662
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
663
# results to create a new inventory at the same time, which results
664
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
667
635
exclude = self.exclude
668
636
specific_files = self.specific_files or []
669
637
mutter("Selecting files for commit with filter %s", specific_files)
671
# Build the new inventory
672
self._populate_from_inventory()
640
if self.use_record_iter_changes:
641
iter_changes = self.work_tree.iter_changes(self.basis_tree)
642
iter_changes = self._filter_iter_changes(iter_changes)
643
for file_id, path, fs_hash in self.builder.record_iter_changes(
644
self.work_tree, self.basis_revid, iter_changes):
645
self.work_tree._observed_sha1(file_id, path, fs_hash)
647
# Build the new inventory
648
self._populate_from_inventory()
649
self._record_unselected()
650
self._report_and_accumulate_deletes()
652
def _filter_iter_changes(self, iter_changes):
653
"""Process iter_changes.
655
This method reports on the changes in iter_changes to the user, and
656
converts 'missing' entries in the iter_changes iterator to 'deleted'
657
entries. 'missing' entries have their
659
:param iter_changes: An iter_changes to process.
660
:return: A generator of changes.
662
reporter = self.reporter
663
report_changes = reporter.is_verbose()
665
for change in iter_changes:
667
old_path = change[1][0]
668
new_path = change[1][1]
669
versioned = change[3][1]
671
versioned = change[3][1]
672
if kind is None and versioned:
675
reporter.missing(new_path)
676
deleted_ids.append(change[0])
677
# Reset the new path (None) and new versioned flag (False)
678
change = (change[0], (change[1][0], None), change[2],
679
(change[3][0], False)) + change[4:]
680
elif kind == 'tree-reference':
681
if self.recursive == 'down':
682
self._commit_nested_tree(change[0], change[1][1])
683
if change[3][0] or change[3][1]:
687
reporter.deleted(old_path)
688
elif old_path is None:
689
reporter.snapshot_change('added', new_path)
690
elif old_path != new_path:
691
reporter.renamed('renamed', old_path, new_path)
694
self.work_tree.branch.repository._format.rich_root_data):
695
# Don't report on changes to '' in non rich root
697
reporter.snapshot_change('modified', new_path)
698
self._next_progress_entry()
699
# Unversion IDs that were found to be deleted
700
self.work_tree.unversion(deleted_ids)
702
def _record_unselected(self):
674
703
# If specific files are selected, then all un-selected files must be
675
704
# recorded in their previous state. For more details, see
676
705
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
677
if specific_files or exclude:
706
if self.specific_files or self.exclude:
707
specific_files = self.specific_files or []
678
708
for path, old_ie in self.basis_inv.iter_entries():
679
709
if old_ie.file_id in self.builder.new_inventory:
680
710
# already added - skip.
682
712
if (is_inside_any(specific_files, path)
683
and not is_inside_any(exclude, path)):
713
and not is_inside_any(self.exclude, path)):
684
714
# was inside the selected path, and not excluded - if not
685
715
# present it has been deleted so skip.
687
717
# From here down it was either not selected, or was excluded:
688
if old_ie.kind == 'directory':
689
self._next_progress_entry()
690
718
# We preserve the entry unaltered.
691
719
ie = old_ie.copy()
692
720
# Note: specific file commits after a merge are currently
694
722
# required after that changes.
695
723
if len(self.parents) > 1:
696
724
ie.revision = None
697
_, version_recorded, _ = self.builder.record_entry_contents(
698
ie, self.parent_invs, path, self.basis_tree, None)
700
self.any_entries_changed = True
725
self.builder.record_entry_contents(ie, self.parent_invs, path,
726
self.basis_tree, None)
702
728
def _report_and_accumulate_deletes(self):
703
# XXX: Could the list of deleted paths and ids be instead taken from
704
# _populate_from_inventory?
705
729
if (isinstance(self.basis_inv, Inventory)
706
730
and isinstance(self.builder.new_inventory, Inventory)):
707
731
# the older Inventory classes provide a _byid dict, and building a
725
749
self.builder.record_delete(path, file_id)
726
750
self.reporter.deleted(path)
728
def _populate_from_inventory(self):
729
"""Populate the CommitBuilder by walking the working tree inventory."""
752
def _check_strict(self):
753
# XXX: when we use iter_changes this would likely be faster if
754
# iter_changes would check for us (even in the presence of
731
757
# raise an exception as soon as we find a single unknown.
732
758
for unknown in self.work_tree.unknowns():
733
759
raise StrictCommitFailed()
761
def _populate_from_inventory(self):
762
"""Populate the CommitBuilder by walking the working tree inventory."""
763
# Build the revision inventory.
765
# This starts by creating a new empty inventory. Depending on
766
# which files are selected for commit, and what is present in the
767
# current tree, the new inventory is populated. inventory entries
768
# which are candidates for modification have their revision set to
769
# None; inventory entries that are carried over untouched have their
770
# revision set to their prior value.
772
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
773
# results to create a new inventory at the same time, which results
774
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
735
777
specific_files = self.specific_files
736
778
exclude = self.exclude
737
779
report_changes = self.reporter.is_verbose()
882
921
change = ie.describe_change(basis_ie, ie)
883
if change in (InventoryEntry.RENAMED,
922
if change in (InventoryEntry.RENAMED,
884
923
InventoryEntry.MODIFIED_AND_RENAMED):
885
924
old_path = self.basis_inv.id2path(ie.file_id)
886
925
self.reporter.renamed(change, old_path, path)
926
self._next_progress_entry()
928
if change == 'unchanged':
888
930
self.reporter.snapshot_change(change, path)
931
self._next_progress_entry()
890
def _set_progress_stage(self, name, entries_title=None):
933
def _set_progress_stage(self, name, counter=False):
891
934
"""Set the progress stage and emit an update to the progress bar."""
892
935
self.pb_stage_name = name
893
936
self.pb_stage_count += 1
894
self.pb_entries_title = entries_title
895
if entries_title is not None:
896
938
self.pb_entries_count = 0
897
self.pb_entries_total = '?'
940
self.pb_entries_count = None
898
941
self._emit_progress()
900
943
def _next_progress_entry(self):
903
946
self._emit_progress()
905
948
def _emit_progress(self):
906
if self.pb_entries_title:
907
if self.pb_entries_total == '?':
908
text = "%s [%s %d] - Stage" % (self.pb_stage_name,
909
self.pb_entries_title, self.pb_entries_count)
911
text = "%s [%s %d/%s] - Stage" % (self.pb_stage_name,
912
self.pb_entries_title, self.pb_entries_count,
913
str(self.pb_entries_total))
949
if self.pb_entries_count is not None:
950
text = "%s [%d] - Stage" % (self.pb_stage_name,
951
self.pb_entries_count)
915
text = "%s - Stage" % (self.pb_stage_name)
953
text = "%s - Stage" % (self.pb_stage_name, )
916
954
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
956
def _set_specific_file_ids(self):
957
"""populate self.specific_file_ids if we will use it."""
958
if not self.use_record_iter_changes:
959
# If provided, ensure the specified files are versioned
960
if self.specific_files is not None:
961
# Note: This routine is being called because it raises
962
# PathNotVersionedError as a side effect of finding the IDs. We
963
# later use the ids we found as input to the working tree
964
# inventory iterator, so we only consider those ids rather than
965
# examining the whole tree again.
966
# XXX: Dont we have filter_unversioned to do this more
968
self.specific_file_ids = tree.find_ids_across_trees(
969
self.specific_files, [self.basis_tree, self.work_tree])
971
self.specific_file_ids = None
added
removed
bzrlib/commit.py
