299
265
self.verbose = verbose
301
267
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
268
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
269
self.basis_tree = self.work_tree.basis_tree()
316
270
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)
272
# Cannot commit with conflicts present.
273
if len(self.work_tree.conflicts()) > 0:
274
raise ConflictsInTree
276
# Setup the bound branch variables as needed.
277
self._check_bound_branch()
279
# Check that the working tree is up to date
280
old_revno, new_revno = self._check_out_of_date_tree()
282
# Complete configuration setup
283
if reporter is not None:
284
self.reporter = reporter
285
elif self.reporter is None:
286
self.reporter = self._select_reporter()
287
if self.config is None:
288
self.config = self.branch.get_config()
290
# If provided, ensure the specified files are versioned
291
if self.specific_files is not None:
292
# Note: This routine is being called because it raises
293
# PathNotVersionedError as a side effect of finding the IDs. We
294
# later use the ids we found as input to the working tree
295
# inventory iterator, so we only consider those ids rather than
296
# examining the whole tree again.
297
# XXX: Dont we have filter_unversioned to do this more
299
self.specific_file_ids = tree.find_ids_across_trees(
300
specific_files, [self.basis_tree, self.work_tree])
302
# Setup the progress bar. As the number of files that need to be
303
# committed in unknown, progress is reported as stages.
304
# We keep track of entries separately though and include that
305
# information in the progress bar during the relevant stages.
306
self.pb_stage_name = ""
307
self.pb_stage_count = 0
308
self.pb_stage_total = 5
309
if self.bound_branch:
310
self.pb_stage_total += 1
311
self.pb.show_pct = False
312
self.pb.show_spinner = False
313
self.pb.show_eta = False
314
self.pb.show_count = True
315
self.pb.show_bar = True
317
# After a merge, a selected file commit is not supported.
318
# See 'bzr help merge' for an explanation as to why.
319
self.basis_inv = self.basis_tree.inventory
320
self._gather_parents()
321
if len(self.parents) > 1 and self.specific_files:
322
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
324
# Collect the changes
325
self._set_progress_stage("Collecting changes",
326
entries_title="Directory")
327
self.builder = self.branch.get_commit_builder(self.parents,
328
self.config, timestamp, timezone, committer, revprops, rev_id)
331
# find the location being committed to
332
if self.bound_branch:
333
master_location = self.master_branch.base
335
master_location = self.branch.base
337
# report the start of the commit
338
self.reporter.started(new_revno, self.rev_id, master_location)
340
self._update_builder_with_changes()
341
self._check_pointless()
343
# TODO: Now the new inventory is known, check for conflicts.
344
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
345
# weave lines, because nothing should be recorded until it is known
346
# that commit will succeed.
347
self._set_progress_stage("Saving data locally")
348
self.builder.finish_inventory()
350
# Prompt the user for a commit message if none provided
351
message = message_callback(self)
352
assert isinstance(message, unicode), type(message)
353
self.message = message
354
self._escape_commit_message()
356
# Add revision data to the local branch
357
self.rev_id = self.builder.commit(self.message)
363
self._process_pre_hooks(old_revno, new_revno)
365
# Upload revision data to the master.
366
# this will propagate merged revisions too if needed.
367
if self.bound_branch:
368
self._set_progress_stage("Uploading data to master branch")
369
self.master_branch.repository.fetch(self.branch.repository,
370
revision_id=self.rev_id)
371
# now the master has the revision data
372
# 'commit' to the master first so a timeout here causes the
373
# local branch to be out of date
374
self.master_branch.set_last_revision_info(new_revno,
377
# and now do the commit locally.
378
self.branch.set_last_revision_info(new_revno, self.rev_id)
380
# Make the working tree up to date with the branch
381
self._set_progress_stage("Updating the working tree")
382
rev_tree = self.builder.revision_tree()
383
self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
384
self.reporter.completed(new_revno, self.rev_id)
385
self._process_post_hooks(old_revno, new_revno)
425
388
return self.rev_id
427
390
def _select_reporter(self):
581
545
old_revno, old_revid, new_revno, self.rev_id,
582
546
tree_delta, future_tree)
549
"""Cleanup any open locks, progress bars etc."""
550
cleanups = [self._cleanup_bound_branch,
551
self.basis_tree.unlock,
552
self.work_tree.unlock,
554
found_exception = None
555
for cleanup in cleanups:
558
# we want every cleanup to run no matter what.
559
# so we have a catchall here, but we will raise the
560
# last encountered exception up the stack: and
561
# typically this will be useful enough.
564
if found_exception is not None:
565
# don't do a plan raise, because the last exception may have been
566
# trashed, e is our sure-to-work exception even though it loses the
567
# full traceback. XXX: RBC 20060421 perhaps we could check the
568
# exc_info and if its the same one do a plain raise otherwise
569
# 'raise e' as we do now.
572
def _cleanup_bound_branch(self):
573
"""Executed at the end of a try/finally to cleanup a bound branch.
575
If the branch wasn't bound, this is a no-op.
576
If it was, it resents self.branch to the local branch, instead
579
if not self.bound_branch:
581
if self.master_locked:
582
self.master_branch.unlock()
584
def _escape_commit_message(self):
585
"""Replace xml-incompatible control characters."""
586
# FIXME: RBC 20060419 this should be done by the revision
587
# serialiser not by commit. Then we can also add an unescaper
588
# in the deserializer and start roundtripping revision messages
589
# precisely. See repository_implementations/test_repository.py
591
# Python strings can include characters that can't be
592
# represented in well-formed XML; escape characters that
593
# aren't listed in the XML specification
594
# (http://www.w3.org/TR/REC-xml/#NT-Char).
595
self.message, escape_count = re.subn(
596
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
597
lambda match: match.group(0).encode('unicode_escape'),
600
self.reporter.escaped(escape_count, self.message)
584
602
def _gather_parents(self):
585
603
"""Record the parents of a merge for merge detection."""
586
# TODO: Make sure that this list doesn't contain duplicate
604
# TODO: Make sure that this list doesn't contain duplicate
587
605
# entries and the order is preserved when doing this.
588
if self.use_record_iter_changes:
590
self.basis_inv = self.basis_tree.inventory
606
self.parents = self.work_tree.get_parent_ids()
591
607
self.parent_invs = [self.basis_inv]
592
608
for revision in self.parents[1:]:
593
609
if self.branch.repository.has_revision(revision):
600
616
def _update_builder_with_changes(self):
601
617
"""Update the commit builder with the data about what has changed.
603
exclude = self.exclude
619
# Build the revision inventory.
621
# This starts by creating a new empty inventory. Depending on
622
# which files are selected for commit, and what is present in the
623
# current tree, the new inventory is populated. inventory entries
624
# which are candidates for modification have their revision set to
625
# None; inventory entries that are carried over untouched have their
626
# revision set to their prior value.
628
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
629
# results to create a new inventory at the same time, which results
630
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
604
633
specific_files = self.specific_files
605
634
mutter("Selecting files for commit with filter %s", specific_files)
608
if self.use_record_iter_changes:
609
iter_changes = self.work_tree.iter_changes(self.basis_tree,
610
specific_files=specific_files)
611
iter_changes = self._filter_iter_changes(iter_changes)
612
for file_id, path, fs_hash in self.builder.record_iter_changes(
613
self.work_tree, self.basis_revid, iter_changes):
614
self.work_tree._observed_sha1(file_id, path, fs_hash)
616
# Build the new inventory
617
self._populate_from_inventory()
618
self._record_unselected()
619
self._report_and_accumulate_deletes()
621
def _filter_iter_changes(self, iter_changes):
622
"""Process iter_changes.
624
This method reports on the changes in iter_changes to the user, and
625
converts 'missing' entries in the iter_changes iterator to 'deleted'
626
entries. 'missing' entries have their
628
:param iter_changes: An iter_changes to process.
629
:return: A generator of changes.
631
reporter = self.reporter
632
report_changes = reporter.is_verbose()
634
for change in iter_changes:
636
old_path = change[1][0]
637
new_path = change[1][1]
638
versioned = change[3][1]
640
versioned = change[3][1]
641
if kind is None and versioned:
644
reporter.missing(new_path)
645
deleted_ids.append(change[0])
646
# 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:]
649
elif kind == 'tree-reference':
650
if self.recursive == 'down':
651
self._commit_nested_tree(change[0], change[1][1])
652
if change[3][0] or change[3][1]:
656
reporter.deleted(old_path)
657
elif old_path is None:
658
reporter.snapshot_change('added', new_path)
659
elif old_path != new_path:
660
reporter.renamed('renamed', old_path, new_path)
663
self.work_tree.branch.repository._format.rich_root_data):
664
# Don't report on changes to '' in non rich root
666
reporter.snapshot_change('modified', new_path)
667
self._next_progress_entry()
668
# Unversion IDs that were found to be deleted
669
self.deleted_ids = deleted_ids
671
def _record_unselected(self):
636
# Check and warn about old CommitBuilders
637
if not self.builder.record_root_entry:
638
symbol_versioning.warn('CommitBuilders should support recording'
639
' the root entry as of bzr 0.10.', DeprecationWarning,
641
self.builder.new_inventory.add(self.basis_inv.root.copy())
643
# Build the new inventory
644
self._populate_from_inventory(specific_files)
672
646
# If specific files are selected, then all un-selected files must be
673
647
# recorded in their previous state. For more details, see
674
648
# 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
650
for path, old_ie in self.basis_inv.iter_entries():
678
651
if old_ie.file_id in self.builder.new_inventory:
679
652
# 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.
654
if is_inside_any(specific_files, path):
655
# was inside the selected path, if not present it has been
686
# From here down it was either not selected, or was excluded:
687
# We preserve the entry unaltered.
658
if old_ie.kind == 'directory':
659
self._next_progress_entry()
660
# not in final inv yet, was not in the selected files, so is an
661
# entry to be preserved unaltered.
688
662
ie = old_ie.copy()
689
663
# Note: specific file commits after a merge are currently
690
664
# prohibited. This test is for sanity/safety in case it's
691
665
# required after that changes.
692
666
if len(self.parents) > 1:
693
667
ie.revision = None
694
self.builder.record_entry_contents(ie, self.parent_invs, path,
695
self.basis_tree, None)
668
delta, version_recorded = self.builder.record_entry_contents(
669
ie, self.parent_invs, path, self.basis_tree, None)
671
self.any_entries_changed = True
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)
673
# note that deletes have occurred
674
if set(self.basis_inv._byid.keys()) - set(self.builder.new_inventory._byid.keys()):
712
675
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)
676
# Report what was deleted.
677
if self.any_entries_deleted and self.reporter.is_verbose():
678
for path, ie in self.basis_inv.iter_entries():
679
if ie.file_id not in self.builder.new_inventory:
680
self.reporter.deleted(path)
721
def _check_strict(self):
722
# XXX: when we use iter_changes this would likely be faster if
723
# iter_changes would check for us (even in the presence of
682
def _populate_from_inventory(self, specific_files):
683
"""Populate the CommitBuilder by walking the working tree inventory."""
726
685
# raise an exception as soon as we find a single unknown.
727
686
for unknown in self.work_tree.unknowns():
728
687
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
689
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.
691
deleted_paths = set()
755
692
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.
693
assert work_inv.root is not None
694
# XXX: Note that entries may have the wrong kind.
758
695
entries = work_inv.iter_entries_by_dir(
759
696
specific_file_ids=self.specific_file_ids, yield_parents=True)
697
if not self.builder.record_root_entry:
760
699
for path, existing_ie in entries:
761
700
file_id = existing_ie.file_id
762
701
name = existing_ie.name
763
702
parent_id = existing_ie.parent_id
764
703
kind = existing_ie.kind
704
if kind == 'directory':
705
self._next_progress_entry()
765
706
# 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.
707
# The deleted files/directories are also recorded so they
708
# can be explicitly unversioned later. Note that when a
709
# filter of specific files is given, we must only skip/record
710
# deleted files matching that filter.
711
if is_inside_any(deleted_paths, path):
787
713
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
714
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, {})
715
if content_summary[0] == 'missing':
716
deleted_paths.add(path)
799
717
self.reporter.missing(path)
800
self._next_progress_entry()
801
718
deleted_ids.append(file_id)
803
720
# TODO: have the builder do the nested commit just-in-time IF and
804
721
# only if needed.
805
if kind == 'tree-reference':
722
if content_summary[0] == 'tree-reference':
806
723
# enforce repository nested tree policy.
807
724
if (not self.work_tree.supports_tree_reference() or
808
725
# repository does not support it either.
809
726
not self.branch.repository._format.supports_tree_reference):
811
content_summary = (kind, None, None, None)
812
elif self.recursive == 'down':
727
content_summary = ('directory',) + content_summary[1:]
728
kind = content_summary[0]
729
# TODO: specific_files filtering before nested tree processing
730
if kind == 'tree-reference':
731
if self.recursive == 'down':
813
732
nested_revision_id = self._commit_nested_tree(
815
content_summary = (kind, None, None, nested_revision_id)
734
content_summary = content_summary[:3] + (
817
nested_revision_id = self.work_tree.get_reference_revision(file_id)
818
content_summary = (kind, None, None, nested_revision_id)
737
content_summary = content_summary[:3] + (
738
self.work_tree.get_reference_revision(file_id),)
820
740
# Record an entry for this item
821
741
# Note: I don't particularly want to have the existing_ie
added
removed
bzrlib/commit.py
