338
236
self.strict = strict
339
237
self.verbose = verbose
239
if reporter is None and self.reporter is None:
240
self.reporter = NullCommitReporter()
241
elif reporter is not None:
242
self.reporter = reporter
341
244
self.work_tree.lock_write()
342
operation.add_cleanup(self.work_tree.unlock)
343
self.parents = self.work_tree.get_parent_ids()
344
# We can use record_iter_changes IFF iter_changes is compatible with
345
# the command line parameters, and the repository has fast delta
346
# generation. See bug 347649.
347
self.use_record_iter_changes = (
349
not self.branch.repository._format.supports_tree_reference and
350
(self.branch.repository._format.fast_deltas or
351
len(self.parents) < 2))
352
self.pb = ui.ui_factory.nested_progress_bar()
353
operation.add_cleanup(self.pb.finished)
354
self.basis_revid = self.work_tree.last_revision()
245
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
355
246
self.basis_tree = self.work_tree.basis_tree()
356
247
self.basis_tree.lock_read()
357
operation.add_cleanup(self.basis_tree.unlock)
358
# Cannot commit with conflicts present.
359
if len(self.work_tree.conflicts()) > 0:
360
raise ConflictsInTree
362
# Setup the bound branch variables as needed.
363
self._check_bound_branch(operation, possible_master_transports)
365
# Check that the working tree is up to date
366
old_revno, new_revno = self._check_out_of_date_tree()
368
# Complete configuration setup
369
if reporter is not None:
370
self.reporter = reporter
371
elif self.reporter is None:
372
self.reporter = self._select_reporter()
373
if self.config is None:
374
self.config = self.branch.get_config()
376
self._set_specific_file_ids()
378
# Setup the progress bar. As the number of files that need to be
379
# committed in unknown, progress is reported as stages.
380
# We keep track of entries separately though and include that
381
# information in the progress bar during the relevant stages.
382
self.pb_stage_name = ""
383
self.pb_stage_count = 0
384
self.pb_stage_total = 5
385
if self.bound_branch:
386
# 2 extra stages: "Uploading data to master branch" and "Merging
387
# tags to master branch"
388
self.pb_stage_total += 2
389
self.pb.show_pct = False
390
self.pb.show_spinner = False
391
self.pb.show_eta = False
392
self.pb.show_count = True
393
self.pb.show_bar = True
395
self._gather_parents()
396
# After a merge, a selected file commit is not supported.
397
# See 'bzr help merge' for an explanation as to why.
398
if len(self.parents) > 1 and self.specific_files is not None:
399
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
400
# Excludes are a form of selected file commit.
401
if len(self.parents) > 1 and self.exclude:
402
raise errors.CannotCommitSelectedFileMerge(self.exclude)
404
# Collect the changes
405
self._set_progress_stage("Collecting changes", counter=True)
407
self.builder = self.branch.get_commit_builder(self.parents,
408
self.config, timestamp, timezone, committer, self.revprops,
410
if not self.builder.supports_record_entry_contents and self.exclude:
412
raise errors.ExcludesUnsupported(self.branch.repository)
415
self.builder.will_record_deletes()
416
# find the location being committed to
417
if self.bound_branch:
418
master_location = self.master_branch.base
420
master_location = self.branch.base
422
# report the start of the commit
423
self.reporter.started(new_revno, self.rev_id, master_location)
425
self._update_builder_with_changes()
426
self._check_pointless()
428
# TODO: Now the new inventory is known, check for conflicts.
429
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
430
# weave lines, because nothing should be recorded until it is known
431
# that commit will succeed.
432
self._set_progress_stage("Saving data locally")
433
self.builder.finish_inventory()
435
# Prompt the user for a commit message if none provided
436
message = message_callback(self)
437
self.message = message
439
# Add revision data to the local branch
440
self.rev_id = self.builder.commit(self.message)
443
mutter("aborting commit write group because of exception:")
444
trace.log_exception_quietly()
448
self._process_pre_hooks(old_revno, new_revno)
450
# Upload revision data to the master.
451
# this will propagate merged revisions too if needed.
452
if self.bound_branch:
453
self._set_progress_stage("Uploading data to master branch")
454
# 'commit' to the master first so a timeout here causes the
455
# local branch to be out of date
456
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
457
self.branch, new_revno, self.rev_id, lossy=lossy)
459
self.branch.fetch(self.master_branch, self.rev_id)
461
# and now do the commit locally.
462
self.branch.set_last_revision_info(new_revno, self.rev_id)
464
# Merge local tags to remote
465
if self.bound_branch:
466
self._set_progress_stage("Merging tags to master branch")
467
tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
469
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
470
note("Conflicting tags in bound branch:\n" +
471
"\n".join(warning_lines))
473
# Make the working tree be up to date with the branch. This
474
# includes automatic changes scheduled to be made to the tree, such
475
# as updating its basis and unversioning paths that were missing.
476
self.work_tree.unversion(self.deleted_ids)
477
self._set_progress_stage("Updating the working tree")
478
self.work_tree.update_basis_by_delta(self.rev_id,
479
self.builder.get_basis_delta())
480
self.reporter.completed(new_revno, self.rev_id)
481
self._process_post_hooks(old_revno, new_revno)
249
# Cannot commit with conflicts present.
250
if len(self.work_tree.conflicts()) > 0:
251
raise ConflictsInTree
253
# Setup the bound branch variables as needed.
254
self._check_bound_branch()
256
# Check that the working tree is up to date
257
old_revno,new_revno = self._check_out_of_date_tree()
259
if self.config is None:
260
self.config = self.branch.get_config()
262
# If provided, ensure the specified files are versioned
263
if specific_files is not None:
264
# Note: We don't actually need the IDs here. This routine
265
# is being called because it raises PathNotVerisonedError
266
# as a side effect of finding the IDs.
267
# XXX: Dont we have filter_unversioned to do this more
269
tree.find_ids_across_trees(specific_files,
270
[self.basis_tree, self.work_tree])
272
# Setup the progress bar. As the number of files that need to be
273
# committed in unknown, progress is reported as stages.
274
# We keep track of entries separately though and include that
275
# information in the progress bar during the relevant stages.
276
self.pb_stage_name = ""
277
self.pb_stage_count = 0
278
self.pb_stage_total = 4
279
if self.bound_branch:
280
self.pb_stage_total += 1
281
self.pb.show_pct = False
282
self.pb.show_spinner = False
283
self.pb.show_eta = False
284
self.pb.show_count = True
285
self.pb.show_bar = True
287
# After a merge, a selected file commit is not supported.
288
# See 'bzr help merge' for an explanation as to why.
289
self.basis_inv = self.basis_tree.inventory
290
self._gather_parents()
291
if len(self.parents) > 1 and self.specific_files:
292
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
294
# Collect the changes
295
self._set_progress_stage("Collecting changes",
296
entries_title="Directory")
297
self.builder = self.branch.get_commit_builder(self.parents,
298
self.config, timestamp, timezone, committer, revprops, rev_id)
300
self._update_builder_with_changes()
301
self._check_pointless()
303
# TODO: Now the new inventory is known, check for conflicts.
304
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
305
# weave lines, because nothing should be recorded until it is known
306
# that commit will succeed.
307
self._set_progress_stage("Saving data locally")
308
self.builder.finish_inventory()
310
# Prompt the user for a commit message if none provided
311
message = message_callback(self)
312
assert isinstance(message, unicode), type(message)
313
self.message = message
314
self._escape_commit_message()
316
# Add revision data to the local branch
317
self.rev_id = self.builder.commit(self.message)
319
# perhaps this should be done by the CommitBuilder ?
320
self.work_tree.branch.repository.abort_write_group()
323
# Upload revision data to the master.
324
# this will propagate merged revisions too if needed.
325
if self.bound_branch:
326
self._set_progress_stage("Uploading data to master branch")
327
self.master_branch.repository.fetch(self.branch.repository,
328
revision_id=self.rev_id)
329
# now the master has the revision data
330
# 'commit' to the master first so a timeout here causes the
331
# local branch to be out of date
332
self.master_branch.set_last_revision_info(new_revno,
335
# and now do the commit locally.
336
self.branch.set_last_revision_info(new_revno, self.rev_id)
338
# Make the working tree up to date with the branch
339
self._set_progress_stage("Updating the working tree")
340
rev_tree = self.builder.revision_tree()
341
self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
342
self.reporter.completed(new_revno, self.rev_id)
343
self._process_hooks(old_revno, new_revno)
482
346
return self.rev_id
484
def _select_reporter(self):
485
"""Select the CommitReporter to use."""
487
return NullCommitReporter()
488
return ReportCommitToLog()
348
def _any_real_changes(self):
349
"""Are there real changes between new_inventory and basis?
351
For trees without rich roots, inv.root.revision changes every commit.
352
But if that is the only change, we want to treat it as though there
355
new_entries = self.builder.new_inventory.iter_entries()
356
basis_entries = self.basis_inv.iter_entries()
357
new_path, new_root_ie = new_entries.next()
358
basis_path, basis_root_ie = basis_entries.next()
360
# This is a copy of InventoryEntry.__eq__ only leaving out .revision
361
def ie_equal_no_revision(this, other):
362
return ((this.file_id == other.file_id)
363
and (this.name == other.name)
364
and (this.symlink_target == other.symlink_target)
365
and (this.text_sha1 == other.text_sha1)
366
and (this.text_size == other.text_size)
367
and (this.text_id == other.text_id)
368
and (this.parent_id == other.parent_id)
369
and (this.kind == other.kind)
370
and (this.executable == other.executable)
371
and (this.reference_revision == other.reference_revision)
373
if not ie_equal_no_revision(new_root_ie, basis_root_ie):
376
for new_ie, basis_ie in zip(new_entries, basis_entries):
377
if new_ie != basis_ie:
380
# No actual changes present
490
383
def _check_pointless(self):
491
384
if self.allow_pointless:
604
494
old_revid = self.parents[0]
606
496
old_revid = bzrlib.revision.NULL_REVISION
608
if hook_name == "pre_commit":
609
future_tree = self.builder.revision_tree()
610
tree_delta = future_tree.changes_from(self.basis_tree,
613
for hook in Branch.hooks[hook_name]:
497
for hook in Branch.hooks['post_commit']:
614
498
# show the running hook in the progress bar. As hooks may
615
499
# end up doing nothing (e.g. because they are not configured by
616
500
# the user) this is still showing progress, not showing overall
617
501
# actions - its up to each plugin to show a UI if it want's to
618
502
# (such as 'Emailing diff to foo@example.com').
619
self.pb_stage_name = "Running %s hooks [%s]" % \
620
(hook_name, Branch.hooks.get_hook_name(hook))
503
self.pb_stage_name = "Running post commit hooks [%s]" % \
504
Branch.hooks.get_hook_name(hook)
621
505
self._emit_progress()
622
506
if 'hooks' in debug.debug_flags:
623
507
mutter("Invoking commit hook: %r", hook)
624
if hook_name == "post_commit":
625
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
627
elif hook_name == "pre_commit":
628
hook(hook_local, hook_master,
629
old_revno, old_revid, new_revno, self.rev_id,
630
tree_delta, future_tree)
508
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
512
"""Cleanup any open locks, progress bars etc."""
513
cleanups = [self._cleanup_bound_branch,
514
self.basis_tree.unlock,
515
self.work_tree.unlock,
517
found_exception = None
518
for cleanup in cleanups:
521
# we want every cleanup to run no matter what.
522
# so we have a catchall here, but we will raise the
523
# last encountered exception up the stack: and
524
# typically this will be useful enough.
527
if found_exception is not None:
528
# don't do a plan raise, because the last exception may have been
529
# trashed, e is our sure-to-work exception even though it loses the
530
# full traceback. XXX: RBC 20060421 perhaps we could check the
531
# exc_info and if its the same one do a plain raise otherwise
532
# 'raise e' as we do now.
535
def _cleanup_bound_branch(self):
536
"""Executed at the end of a try/finally to cleanup a bound branch.
538
If the branch wasn't bound, this is a no-op.
539
If it was, it resents self.branch to the local branch, instead
542
if not self.bound_branch:
544
if self.master_locked:
545
self.master_branch.unlock()
547
def _escape_commit_message(self):
548
"""Replace xml-incompatible control characters."""
549
# FIXME: RBC 20060419 this should be done by the revision
550
# serialiser not by commit. Then we can also add an unescaper
551
# in the deserializer and start roundtripping revision messages
552
# precisely. See repository_implementations/test_repository.py
554
# Python strings can include characters that can't be
555
# represented in well-formed XML; escape characters that
556
# aren't listed in the XML specification
557
# (http://www.w3.org/TR/REC-xml/#NT-Char).
558
self.message, escape_count = re.subn(
559
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
560
lambda match: match.group(0).encode('unicode_escape'),
563
self.reporter.escaped(escape_count, self.message)
632
565
def _gather_parents(self):
633
566
"""Record the parents of a merge for merge detection."""
634
# TODO: Make sure that this list doesn't contain duplicate
567
# TODO: Make sure that this list doesn't contain duplicate
635
568
# entries and the order is preserved when doing this.
636
if self.use_record_iter_changes:
638
self.basis_inv = self.basis_tree.inventory
569
self.parents = self.work_tree.get_parent_ids()
639
570
self.parent_invs = [self.basis_inv]
640
571
for revision in self.parents[1:]:
641
572
if self.branch.repository.has_revision(revision):
648
579
def _update_builder_with_changes(self):
649
580
"""Update the commit builder with the data about what has changed.
651
exclude = self.exclude
582
# Build the revision inventory.
584
# This starts by creating a new empty inventory. Depending on
585
# which files are selected for commit, and what is present in the
586
# current tree, the new inventory is populated. inventory entries
587
# which are candidates for modification have their revision set to
588
# None; inventory entries that are carried over untouched have their
589
# revision set to their prior value.
591
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
592
# results to create a new inventory at the same time, which results
593
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
652
596
specific_files = self.specific_files
653
597
mutter("Selecting files for commit with filter %s", specific_files)
656
if self.use_record_iter_changes:
657
iter_changes = self.work_tree.iter_changes(self.basis_tree,
658
specific_files=specific_files)
659
iter_changes = self._filter_iter_changes(iter_changes)
660
for file_id, path, fs_hash in self.builder.record_iter_changes(
661
self.work_tree, self.basis_revid, iter_changes):
662
self.work_tree._observed_sha1(file_id, path, fs_hash)
664
# Build the new inventory
665
self._populate_from_inventory()
666
self._record_unselected()
667
self._report_and_accumulate_deletes()
669
def _filter_iter_changes(self, iter_changes):
670
"""Process iter_changes.
672
This method reports on the changes in iter_changes to the user, and
673
converts 'missing' entries in the iter_changes iterator to 'deleted'
674
entries. 'missing' entries have their
676
:param iter_changes: An iter_changes to process.
677
:return: A generator of changes.
679
reporter = self.reporter
680
report_changes = reporter.is_verbose()
682
for change in iter_changes:
684
old_path = change[1][0]
685
new_path = change[1][1]
686
versioned = change[3][1]
688
versioned = change[3][1]
689
if kind is None and versioned:
692
reporter.missing(new_path)
693
deleted_ids.append(change[0])
694
# Reset the new path (None) and new versioned flag (False)
695
change = (change[0], (change[1][0], None), change[2],
696
(change[3][0], False)) + change[4:]
697
elif kind == 'tree-reference':
698
if self.recursive == 'down':
699
self._commit_nested_tree(change[0], change[1][1])
700
if change[3][0] or change[3][1]:
704
reporter.deleted(old_path)
705
elif old_path is None:
706
reporter.snapshot_change('added', new_path)
707
elif old_path != new_path:
708
reporter.renamed('renamed', old_path, new_path)
711
self.work_tree.branch.repository._format.rich_root_data):
712
# Don't report on changes to '' in non rich root
714
reporter.snapshot_change('modified', new_path)
715
self._next_progress_entry()
716
# Unversion IDs that were found to be deleted
717
self.deleted_ids = deleted_ids
719
def _record_unselected(self):
599
# Check and warn about old CommitBuilders
600
if not self.builder.record_root_entry:
601
symbol_versioning.warn('CommitBuilders should support recording'
602
' the root entry as of bzr 0.10.', DeprecationWarning,
604
self.builder.new_inventory.add(self.basis_inv.root.copy())
606
# Build the new inventory
607
self._populate_from_inventory(specific_files)
720
609
# If specific files are selected, then all un-selected files must be
721
610
# recorded in their previous state. For more details, see
722
611
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
723
if self.specific_files or self.exclude:
724
specific_files = self.specific_files or []
725
for path, old_ie in self.basis_inv.iter_entries():
726
if self.builder.new_inventory.has_id(old_ie.file_id):
727
# already added - skip.
729
if (is_inside_any(specific_files, path)
730
and not is_inside_any(self.exclude, path)):
731
# was inside the selected path, and not excluded - if not
732
# present it has been deleted so skip.
734
# From here down it was either not selected, or was excluded:
735
# We preserve the entry unaltered.
737
# Note: specific file commits after a merge are currently
738
# prohibited. This test is for sanity/safety in case it's
739
# required after that changes.
740
if len(self.parents) > 1:
613
for path, new_ie in self.basis_inv.iter_entries():
614
if new_ie.file_id in self.builder.new_inventory:
616
if is_inside_any(specific_files, path):
742
620
self.builder.record_entry_contents(ie, self.parent_invs, path,
743
self.basis_tree, None)
745
def _report_and_accumulate_deletes(self):
746
if (isinstance(self.basis_inv, Inventory)
747
and isinstance(self.builder.new_inventory, Inventory)):
748
# the older Inventory classes provide a _byid dict, and building a
749
# set from the keys of this dict is substantially faster than even
750
# getting a set of ids from the inventory
752
# <lifeless> set(dict) is roughly the same speed as
753
# set(iter(dict)) and both are significantly slower than
755
deleted_ids = set(self.basis_inv._byid.keys()) - \
756
set(self.builder.new_inventory._byid.keys())
758
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
760
self.any_entries_deleted = True
761
deleted = [(self.basis_tree.id2path(file_id), file_id)
762
for file_id in deleted_ids]
764
# XXX: this is not quite directory-order sorting
765
for path, file_id in deleted:
766
self.builder.record_delete(path, file_id)
623
# Report what was deleted. We could skip this when no deletes are
624
# detected to gain a performance win, but it arguably serves as a
625
# 'safety check' by informing the user whenever anything disappears.
626
for path, ie in self.basis_inv.iter_entries():
627
if ie.file_id not in self.builder.new_inventory:
767
628
self.reporter.deleted(path)
769
def _check_strict(self):
770
# XXX: when we use iter_changes this would likely be faster if
771
# iter_changes would check for us (even in the presence of
630
def _populate_from_inventory(self, specific_files):
631
"""Populate the CommitBuilder by walking the working tree inventory."""
774
633
# raise an exception as soon as we find a single unknown.
775
634
for unknown in self.work_tree.unknowns():
776
635
raise StrictCommitFailed()
778
def _populate_from_inventory(self):
779
"""Populate the CommitBuilder by walking the working tree inventory."""
780
# Build the revision inventory.
782
# This starts by creating a new empty inventory. Depending on
783
# which files are selected for commit, and what is present in the
784
# current tree, the new inventory is populated. inventory entries
785
# which are candidates for modification have their revision set to
786
# None; inventory entries that are carried over untouched have their
787
# revision set to their prior value.
789
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
790
# results to create a new inventory at the same time, which results
791
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
794
specific_files = self.specific_files
795
exclude = self.exclude
796
report_changes = self.reporter.is_verbose()
798
# A tree of paths that have been deleted. E.g. if foo/bar has been
799
# deleted, then we have {'foo':{'bar':{}}}
801
# XXX: Note that entries may have the wrong kind because the entry does
802
# not reflect the status on disk.
638
deleted_paths = set()
803
639
work_inv = self.work_tree.inventory
804
# NB: entries will include entries within the excluded ids/paths
805
# because iter_entries_by_dir has no 'exclude' facility today.
806
entries = work_inv.iter_entries_by_dir(
807
specific_file_ids=self.specific_file_ids, yield_parents=True)
640
assert work_inv.root is not None
641
entries = work_inv.iter_entries()
642
if not self.builder.record_root_entry:
808
644
for path, existing_ie in entries:
809
645
file_id = existing_ie.file_id
810
646
name = existing_ie.name
811
647
parent_id = existing_ie.parent_id
812
648
kind = existing_ie.kind
649
if kind == 'directory':
650
self._next_progress_entry()
813
652
# Skip files that have been deleted from the working tree.
814
# The deleted path ids are also recorded so they can be explicitly
817
path_segments = splitpath(path)
818
deleted_dict = deleted_paths
819
for segment in path_segments:
820
deleted_dict = deleted_dict.get(segment, None)
822
# We either took a path not present in the dict
823
# (deleted_dict was None), or we've reached an empty
824
# child dir in the dict, so are now a sub-path.
828
if deleted_dict is not None:
829
# the path has a deleted parent, do not add it.
831
if exclude and is_inside_any(exclude, path):
832
# Skip excluded paths. Excluded paths are processed by
833
# _update_builder_with_changes.
653
# The deleted files/directories are also recorded so they
654
# can be explicitly unversioned later. Note that when a
655
# filter of specific files is given, we must only skip/record
656
# deleted files matching that filter.
657
if is_inside_any(deleted_paths, path):
835
content_summary = self.work_tree.path_content_summary(path)
836
kind = content_summary[0]
837
# Note that when a filter of specific files is given, we must only
838
# skip/record deleted files matching that filter.
839
659
if not specific_files or is_inside_any(specific_files, path):
840
if kind == 'missing':
841
if not deleted_paths:
842
# path won't have been split yet.
843
path_segments = splitpath(path)
844
deleted_dict = deleted_paths
845
for segment in path_segments:
846
deleted_dict = deleted_dict.setdefault(segment, {})
660
if not self.work_tree.has_filename(path):
661
deleted_paths.add(path)
847
662
self.reporter.missing(path)
848
self._next_progress_entry()
849
663
deleted_ids.append(file_id)
851
# TODO: have the builder do the nested commit just-in-time IF and
853
if kind == 'tree-reference':
854
# enforce repository nested tree policy.
855
if (not self.work_tree.supports_tree_reference() or
856
# repository does not support it either.
857
not self.branch.repository._format.supports_tree_reference):
859
content_summary = (kind, None, None, None)
860
elif self.recursive == 'down':
861
nested_revision_id = self._commit_nested_tree(
863
content_summary = (kind, None, None, nested_revision_id)
865
nested_revision_id = self.work_tree.get_reference_revision(file_id)
866
content_summary = (kind, None, None, nested_revision_id)
666
kind = self.work_tree.kind(file_id)
667
# TODO: specific_files filtering before nested tree processing
668
if kind == 'tree-reference' and self.recursive == 'down':
669
self._commit_nested_tree(file_id, path)
670
except errors.NoSuchFile:
868
673
# Record an entry for this item
869
674
# Note: I don't particularly want to have the existing_ie
870
675
# parameter but the test suite currently (28-Jun-07) breaks
871
676
# without it thanks to a unicode normalisation issue. :-(
872
definitely_changed = kind != existing_ie.kind
677
definitely_changed = kind != existing_ie.kind
873
678
self._record_entry(path, file_id, specific_files, kind, name,
874
parent_id, definitely_changed, existing_ie, report_changes,
679
parent_id, definitely_changed, existing_ie)
877
681
# Unversion IDs that were found to be deleted
878
self.deleted_ids = deleted_ids
682
self.work_tree.unversion(deleted_ids)
880
684
def _commit_nested_tree(self, file_id, path):
881
685
"Commit a nested tree."
900
705
strict=self.strict, verbose=self.verbose,
901
706
local=self.local, reporter=self.reporter)
902
707
except errors.PointlessCommit:
903
return self.work_tree.get_reference_revision(file_id)
905
710
def _record_entry(self, path, file_id, specific_files, kind, name,
906
parent_id, definitely_changed, existing_ie, report_changes,
711
parent_id, definitely_changed, existing_ie=None):
908
712
"Record the new inventory entry for a path if any."
909
713
# mutter('check %s {%s}', path, file_id)
910
# mutter('%s selected for commit', path)
911
if definitely_changed or existing_ie is None:
912
ie = make_entry(kind, name, parent_id, file_id)
714
if (not specific_files or
715
is_inside_or_parent_of_any(specific_files, path)):
716
# mutter('%s selected for commit', path)
717
if definitely_changed or existing_ie is None:
718
ie = inventory.make_entry(kind, name, parent_id, file_id)
720
ie = existing_ie.copy()
914
ie = existing_ie.copy()
916
# For carried over entries we don't care about the fs hash - the repo
917
# isn't generating a sha, so we're not saving computation time.
918
_, _, fs_hash = self.builder.record_entry_contents(
919
ie, self.parent_invs, path, self.work_tree, content_summary)
723
# mutter('%s not selected for commit', path)
724
if self.basis_inv.has_id(file_id):
725
ie = self.basis_inv[file_id].copy()
727
# this entry is new and not being committed
730
self.builder.record_entry_contents(ie, self.parent_invs,
731
path, self.work_tree)
921
732
self._report_change(ie, path)
923
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
926
735
def _report_change(self, ie, path):
added
removed
bzrlib/commit.py
