114
122
note(format, *args)
116
124
def snapshot_change(self, change, path):
117
if path == '' and change in ('added', 'modified'):
125
if change == 'unchanged':
127
if change == 'added' and path == '':
119
129
self._note("%s %s", change, path)
121
131
def started(self, revno, rev_id, location=None):
122
132
if location is not None:
123
location = ' to: ' + unescape_for_display(location, 'utf-8')
133
location = ' to "' + unescape_for_display(location, 'utf-8') + '"'
125
# When started was added, location was only made optional by
126
# accident. Matt Nordhoff 20071129
127
symbol_versioning.warn("As of bzr 1.0 you must pass a location "
128
"to started.", DeprecationWarning,
131
self._note('Committing%s', location)
136
self._note('Committing revision %d%s.', revno, location)
133
138
def completed(self, revno, rev_id):
134
139
self._note('Committed revision %d.', revno)
135
# self._note goes to the console too; so while we want to log the
136
# rev_id, we can't trivially only log it. (See bug 526425). Long
137
# term we should rearrange the reporting structure, but for now
138
# we just mutter seperately. We mutter the revid and revno together
139
# so that concurrent bzr invocations won't lead to confusion.
140
mutter('Committed revid %s as revno %d.', rev_id, revno)
142
def deleted(self, path):
143
self._note('deleted %s', path)
141
def deleted(self, file_id):
142
self._note('deleted %s', file_id)
144
def escaped(self, escape_count, message):
145
self._note("replaced %d control characters in message", escape_count)
145
147
def missing(self, path):
146
148
self._note('missing %s', path)
336
257
self.verbose = verbose
338
259
self.work_tree.lock_write()
339
operation.add_cleanup(self.work_tree.unlock)
340
self.parents = self.work_tree.get_parent_ids()
341
# We can use record_iter_changes IFF iter_changes is compatible with
342
# the command line parameters, and the repository has fast delta
343
# generation. See bug 347649.
344
self.use_record_iter_changes = (
346
not self.branch.repository._format.supports_tree_reference and
347
(self.branch.repository._format.fast_deltas or
348
len(self.parents) < 2))
349
260
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
350
operation.add_cleanup(self.pb.finished)
351
self.basis_revid = self.work_tree.last_revision()
352
261
self.basis_tree = self.work_tree.basis_tree()
353
262
self.basis_tree.lock_read()
354
operation.add_cleanup(self.basis_tree.unlock)
355
# Cannot commit with conflicts present.
356
if len(self.work_tree.conflicts()) > 0:
357
raise ConflictsInTree
359
# Setup the bound branch variables as needed.
360
self._check_bound_branch(operation, possible_master_transports)
362
# Check that the working tree is up to date
363
old_revno, new_revno = self._check_out_of_date_tree()
365
# Complete configuration setup
366
if reporter is not None:
367
self.reporter = reporter
368
elif self.reporter is None:
369
self.reporter = self._select_reporter()
370
if self.config is None:
371
self.config = self.branch.get_config()
373
self._set_specific_file_ids()
375
# Setup the progress bar. As the number of files that need to be
376
# committed in unknown, progress is reported as stages.
377
# We keep track of entries separately though and include that
378
# information in the progress bar during the relevant stages.
379
self.pb_stage_name = ""
380
self.pb_stage_count = 0
381
self.pb_stage_total = 5
382
if self.bound_branch:
383
self.pb_stage_total += 1
384
self.pb.show_pct = False
385
self.pb.show_spinner = False
386
self.pb.show_eta = False
387
self.pb.show_count = True
388
self.pb.show_bar = True
390
self._gather_parents()
391
# After a merge, a selected file commit is not supported.
392
# See 'bzr help merge' for an explanation as to why.
393
if len(self.parents) > 1 and self.specific_files is not None:
394
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
395
# Excludes are a form of selected file commit.
396
if len(self.parents) > 1 and self.exclude:
397
raise errors.CannotCommitSelectedFileMerge(self.exclude)
399
# Collect the changes
400
self._set_progress_stage("Collecting changes", counter=True)
401
self.builder = self.branch.get_commit_builder(self.parents,
402
self.config, timestamp, timezone, committer, self.revprops, rev_id)
405
self.builder.will_record_deletes()
406
# find the location being committed to
407
if self.bound_branch:
408
master_location = self.master_branch.base
410
master_location = self.branch.base
412
# report the start of the commit
413
self.reporter.started(new_revno, self.rev_id, master_location)
415
self._update_builder_with_changes()
416
self._check_pointless()
418
# TODO: Now the new inventory is known, check for conflicts.
419
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
420
# weave lines, because nothing should be recorded until it is known
421
# that commit will succeed.
422
self._set_progress_stage("Saving data locally")
423
self.builder.finish_inventory()
425
# Prompt the user for a commit message if none provided
426
message = message_callback(self)
427
self.message = message
429
# Add revision data to the local branch
430
self.rev_id = self.builder.commit(self.message)
433
mutter("aborting commit write group because of exception:")
434
trace.log_exception_quietly()
435
note("aborting commit write group: %r" % (e,))
439
self._process_pre_hooks(old_revno, new_revno)
441
# Upload revision data to the master.
442
# this will propagate merged revisions too if needed.
443
if self.bound_branch:
444
self._set_progress_stage("Uploading data to master branch")
445
# 'commit' to the master first so a timeout here causes the
446
# local branch to be out of date
447
self.master_branch.import_last_revision_info(
448
self.branch.repository, new_revno, self.rev_id)
450
# and now do the commit locally.
451
self.branch.set_last_revision_info(new_revno, self.rev_id)
453
# Make the working tree be up to date with the branch. This
454
# includes automatic changes scheduled to be made to the tree, such
455
# as updating its basis and unversioning paths that were missing.
456
self.work_tree.unversion(self.deleted_ids)
457
self._set_progress_stage("Updating the working tree")
458
self.work_tree.update_basis_by_delta(self.rev_id,
459
self.builder.get_basis_delta())
460
self.reporter.completed(new_revno, self.rev_id)
461
self._process_post_hooks(old_revno, new_revno)
264
# Cannot commit with conflicts present.
265
if len(self.work_tree.conflicts()) > 0:
266
raise ConflictsInTree
268
# Setup the bound branch variables as needed.
269
self._check_bound_branch()
271
# Check that the working tree is up to date
272
old_revno, new_revno = self._check_out_of_date_tree()
274
# Complete configuration setup
275
if reporter is not None:
276
self.reporter = reporter
277
elif self.reporter is None:
278
self.reporter = self._select_reporter()
279
if self.config is None:
280
self.config = self.branch.get_config()
282
# If provided, ensure the specified files are versioned
283
if specific_files is not None:
284
# Note: We don't actually need the IDs here. This routine
285
# is being called because it raises PathNotVerisonedError
286
# as a side effect of finding the IDs.
287
# XXX: Dont we have filter_unversioned to do this more
289
tree.find_ids_across_trees(specific_files,
290
[self.basis_tree, self.work_tree])
292
# Setup the progress bar. As the number of files that need to be
293
# committed in unknown, progress is reported as stages.
294
# We keep track of entries separately though and include that
295
# information in the progress bar during the relevant stages.
296
self.pb_stage_name = ""
297
self.pb_stage_count = 0
298
self.pb_stage_total = 5
299
if self.bound_branch:
300
self.pb_stage_total += 1
301
self.pb.show_pct = False
302
self.pb.show_spinner = False
303
self.pb.show_eta = False
304
self.pb.show_count = True
305
self.pb.show_bar = True
307
# After a merge, a selected file commit is not supported.
308
# See 'bzr help merge' for an explanation as to why.
309
self.basis_inv = self.basis_tree.inventory
310
self._gather_parents()
311
if len(self.parents) > 1 and self.specific_files:
312
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
314
# Collect the changes
315
self._set_progress_stage("Collecting changes",
316
entries_title="Directory")
317
self.builder = self.branch.get_commit_builder(self.parents,
318
self.config, timestamp, timezone, committer, revprops, rev_id)
321
# find the location being committed to
322
if self.bound_branch:
323
master_location = self.master_branch.base
325
master_location = self.branch.base
327
# report the start of the commit
328
self.reporter.started(new_revno, self.rev_id, master_location)
330
self._update_builder_with_changes()
331
self._check_pointless()
333
# TODO: Now the new inventory is known, check for conflicts.
334
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
335
# weave lines, because nothing should be recorded until it is known
336
# that commit will succeed.
337
self._set_progress_stage("Saving data locally")
338
self.builder.finish_inventory()
340
# Prompt the user for a commit message if none provided
341
message = message_callback(self)
342
assert isinstance(message, unicode), type(message)
343
self.message = message
344
self._escape_commit_message()
346
# Add revision data to the local branch
347
self.rev_id = self.builder.commit(self.message)
353
self._process_pre_hooks(old_revno, new_revno)
355
# Upload revision data to the master.
356
# this will propagate merged revisions too if needed.
357
if self.bound_branch:
358
self._set_progress_stage("Uploading data to master branch")
359
self.master_branch.repository.fetch(self.branch.repository,
360
revision_id=self.rev_id)
361
# now the master has the revision data
362
# 'commit' to the master first so a timeout here causes the
363
# local branch to be out of date
364
self.master_branch.set_last_revision_info(new_revno,
367
# and now do the commit locally.
368
self.branch.set_last_revision_info(new_revno, self.rev_id)
370
# Make the working tree up to date with the branch
371
self._set_progress_stage("Updating the working tree")
372
rev_tree = self.builder.revision_tree()
373
self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
374
self.reporter.completed(new_revno, self.rev_id)
375
self._process_post_hooks(old_revno, new_revno)
462
378
return self.rev_id
464
380
def _select_reporter(self):
467
383
return NullCommitReporter()
468
384
return ReportCommitToLog()
386
def _any_real_changes(self):
387
"""Are there real changes between new_inventory and basis?
389
For trees without rich roots, inv.root.revision changes every commit.
390
But if that is the only change, we want to treat it as though there
393
new_entries = self.builder.new_inventory.iter_entries()
394
basis_entries = self.basis_inv.iter_entries()
395
new_path, new_root_ie = new_entries.next()
396
basis_path, basis_root_ie = basis_entries.next()
398
# This is a copy of InventoryEntry.__eq__ only leaving out .revision
399
def ie_equal_no_revision(this, other):
400
return ((this.file_id == other.file_id)
401
and (this.name == other.name)
402
and (this.symlink_target == other.symlink_target)
403
and (this.text_sha1 == other.text_sha1)
404
and (this.text_size == other.text_size)
405
and (this.text_id == other.text_id)
406
and (this.parent_id == other.parent_id)
407
and (this.kind == other.kind)
408
and (this.executable == other.executable)
409
and (this.reference_revision == other.reference_revision)
411
if not ie_equal_no_revision(new_root_ie, basis_root_ie):
414
for new_ie, basis_ie in zip(new_entries, basis_entries):
415
if new_ie != basis_ie:
418
# No actual changes present
470
421
def _check_pointless(self):
471
422
if self.allow_pointless:
473
424
# A merge with no effect on files
474
425
if len(self.parents) > 1:
476
# TODO: we could simplify this by using self.builder.basis_delta.
478
# The initial commit adds a root directory, but this in itself is not
479
# a worthwhile commit.
480
if (self.basis_revid == revision.NULL_REVISION and
481
((self.builder.new_inventory is not None and
482
len(self.builder.new_inventory) == 1) or
483
len(self.builder._basis_delta) == 1)):
427
# work around the fact that a newly-initted tree does differ from its
429
if len(self.basis_inv) == 0 and len(self.builder.new_inventory) == 1:
484
430
raise PointlessCommit()
485
if self.builder.any_changes():
431
# Shortcut, if the number of entries changes, then we obviously have
433
if len(self.builder.new_inventory) != len(self.basis_inv):
435
# If length == 1, then we only have the root entry. Which means
436
# that there is no real difference (only the root could be different)
437
if (len(self.builder.new_inventory) != 1 and self._any_real_changes()):
487
439
raise PointlessCommit()
489
def _check_bound_branch(self, operation, possible_master_transports=None):
441
def _check_bound_branch(self):
490
442
"""Check to see if the local branch is bound.
492
444
If it is bound, then most of the commit will actually be
618
569
old_revno, old_revid, new_revno, self.rev_id,
619
570
tree_delta, future_tree)
573
"""Cleanup any open locks, progress bars etc."""
574
cleanups = [self._cleanup_bound_branch,
575
self.basis_tree.unlock,
576
self.work_tree.unlock,
578
found_exception = None
579
for cleanup in cleanups:
582
# we want every cleanup to run no matter what.
583
# so we have a catchall here, but we will raise the
584
# last encountered exception up the stack: and
585
# typically this will be useful enough.
588
if found_exception is not None:
589
# don't do a plan raise, because the last exception may have been
590
# trashed, e is our sure-to-work exception even though it loses the
591
# full traceback. XXX: RBC 20060421 perhaps we could check the
592
# exc_info and if its the same one do a plain raise otherwise
593
# 'raise e' as we do now.
596
def _cleanup_bound_branch(self):
597
"""Executed at the end of a try/finally to cleanup a bound branch.
599
If the branch wasn't bound, this is a no-op.
600
If it was, it resents self.branch to the local branch, instead
603
if not self.bound_branch:
605
if self.master_locked:
606
self.master_branch.unlock()
608
def _escape_commit_message(self):
609
"""Replace xml-incompatible control characters."""
610
# FIXME: RBC 20060419 this should be done by the revision
611
# serialiser not by commit. Then we can also add an unescaper
612
# in the deserializer and start roundtripping revision messages
613
# precisely. See repository_implementations/test_repository.py
615
# Python strings can include characters that can't be
616
# represented in well-formed XML; escape characters that
617
# aren't listed in the XML specification
618
# (http://www.w3.org/TR/REC-xml/#NT-Char).
619
self.message, escape_count = re.subn(
620
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
621
lambda match: match.group(0).encode('unicode_escape'),
624
self.reporter.escaped(escape_count, self.message)
621
626
def _gather_parents(self):
622
627
"""Record the parents of a merge for merge detection."""
623
# TODO: Make sure that this list doesn't contain duplicate
628
# TODO: Make sure that this list doesn't contain duplicate
624
629
# entries and the order is preserved when doing this.
625
if self.use_record_iter_changes:
627
self.basis_inv = self.basis_tree.inventory
630
self.parents = self.work_tree.get_parent_ids()
628
631
self.parent_invs = [self.basis_inv]
629
632
for revision in self.parents[1:]:
630
633
if self.branch.repository.has_revision(revision):
637
640
def _update_builder_with_changes(self):
638
641
"""Update the commit builder with the data about what has changed.
640
exclude = self.exclude
641
specific_files = self.specific_files
642
mutter("Selecting files for commit with filter %s", specific_files)
645
if self.use_record_iter_changes:
646
iter_changes = self.work_tree.iter_changes(self.basis_tree,
647
specific_files=specific_files)
648
iter_changes = self._filter_iter_changes(iter_changes)
649
for file_id, path, fs_hash in self.builder.record_iter_changes(
650
self.work_tree, self.basis_revid, iter_changes):
651
self.work_tree._observed_sha1(file_id, path, fs_hash)
653
# Build the new inventory
654
self._populate_from_inventory()
655
self._record_unselected()
656
self._report_and_accumulate_deletes()
658
def _filter_iter_changes(self, iter_changes):
659
"""Process iter_changes.
661
This method reports on the changes in iter_changes to the user, and
662
converts 'missing' entries in the iter_changes iterator to 'deleted'
663
entries. 'missing' entries have their
665
:param iter_changes: An iter_changes to process.
666
:return: A generator of changes.
668
reporter = self.reporter
669
report_changes = reporter.is_verbose()
671
for change in iter_changes:
673
old_path = change[1][0]
674
new_path = change[1][1]
675
versioned = change[3][1]
677
versioned = change[3][1]
678
if kind is None and versioned:
681
reporter.missing(new_path)
682
deleted_ids.append(change[0])
683
# Reset the new path (None) and new versioned flag (False)
684
change = (change[0], (change[1][0], None), change[2],
685
(change[3][0], False)) + change[4:]
686
elif kind == 'tree-reference':
687
if self.recursive == 'down':
688
self._commit_nested_tree(change[0], change[1][1])
689
if change[3][0] or change[3][1]:
693
reporter.deleted(old_path)
694
elif old_path is None:
695
reporter.snapshot_change('added', new_path)
696
elif old_path != new_path:
697
reporter.renamed('renamed', old_path, new_path)
700
self.work_tree.branch.repository._format.rich_root_data):
701
# Don't report on changes to '' in non rich root
703
reporter.snapshot_change('modified', new_path)
704
self._next_progress_entry()
705
# Unversion IDs that were found to be deleted
706
self.deleted_ids = deleted_ids
708
def _record_unselected(self):
709
# If specific files are selected, then all un-selected files must be
710
# recorded in their previous state. For more details, see
711
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
712
if self.specific_files or self.exclude:
713
specific_files = self.specific_files or []
714
for path, old_ie in self.basis_inv.iter_entries():
715
if old_ie.file_id in self.builder.new_inventory:
716
# already added - skip.
718
if (is_inside_any(specific_files, path)
719
and not is_inside_any(self.exclude, path)):
720
# was inside the selected path, and not excluded - if not
721
# present it has been deleted so skip.
723
# From here down it was either not selected, or was excluded:
724
# We preserve the entry unaltered.
726
# Note: specific file commits after a merge are currently
727
# prohibited. This test is for sanity/safety in case it's
728
# required after that changes.
729
if len(self.parents) > 1:
731
self.builder.record_entry_contents(ie, self.parent_invs, path,
732
self.basis_tree, None)
734
def _report_and_accumulate_deletes(self):
735
if (isinstance(self.basis_inv, Inventory)
736
and isinstance(self.builder.new_inventory, Inventory)):
737
# the older Inventory classes provide a _byid dict, and building a
738
# set from the keys of this dict is substantially faster than even
739
# getting a set of ids from the inventory
741
# <lifeless> set(dict) is roughly the same speed as
742
# set(iter(dict)) and both are significantly slower than
744
deleted_ids = set(self.basis_inv._byid.keys()) - \
745
set(self.builder.new_inventory._byid.keys())
747
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
749
self.any_entries_deleted = True
750
deleted = [(self.basis_tree.id2path(file_id), file_id)
751
for file_id in deleted_ids]
753
# XXX: this is not quite directory-order sorting
754
for path, file_id in deleted:
755
self.builder.record_delete(path, file_id)
756
self.reporter.deleted(path)
758
def _check_strict(self):
759
# XXX: when we use iter_changes this would likely be faster if
760
# iter_changes would check for us (even in the presence of
763
# raise an exception as soon as we find a single unknown.
764
for unknown in self.work_tree.unknowns():
765
raise StrictCommitFailed()
767
def _populate_from_inventory(self):
768
"""Populate the CommitBuilder by walking the working tree inventory."""
769
643
# Build the revision inventory.
771
645
# This starts by creating a new empty inventory. Depending on
772
646
# which files are selected for commit, and what is present in the
773
# current tree, the new inventory is populated. inventory entries
647
# current tree, the new inventory is populated. inventory entries
774
648
# which are candidates for modification have their revision set to
775
649
# None; inventory entries that are carried over untouched have their
776
650
# revision set to their prior value.
781
655
# ADHB 11-07-2006
783
657
specific_files = self.specific_files
784
exclude = self.exclude
658
mutter("Selecting files for commit with filter %s", specific_files)
660
# Check and warn about old CommitBuilders
661
if not self.builder.record_root_entry:
662
symbol_versioning.warn('CommitBuilders should support recording'
663
' the root entry as of bzr 0.10.', DeprecationWarning,
665
self.builder.new_inventory.add(self.basis_inv.root.copy())
667
# Build the new inventory
668
self._populate_from_inventory(specific_files)
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.
674
for path, new_ie in self.basis_inv.iter_entries():
675
if new_ie.file_id in self.builder.new_inventory:
677
if is_inside_any(specific_files, path):
681
self.builder.record_entry_contents(ie, self.parent_invs, path,
684
# Report what was deleted.
685
if self.reporter.is_verbose():
686
for path, ie in self.basis_inv.iter_entries():
687
if ie.file_id not in self.builder.new_inventory:
688
self.reporter.deleted(path)
690
def _populate_from_inventory(self, specific_files):
691
"""Populate the CommitBuilder by walking the working tree inventory."""
693
# raise an exception as soon as we find a single unknown.
694
for unknown in self.work_tree.unknowns():
695
raise StrictCommitFailed()
785
697
report_changes = self.reporter.is_verbose()
787
# A tree of paths that have been deleted. E.g. if foo/bar has been
788
# deleted, then we have {'foo':{'bar':{}}}
790
# XXX: Note that entries may have the wrong kind because the entry does
791
# not reflect the status on disk.
699
deleted_paths = set()
792
700
work_inv = self.work_tree.inventory
793
# NB: entries will include entries within the excluded ids/paths
794
# because iter_entries_by_dir has no 'exclude' facility today.
795
entries = work_inv.iter_entries_by_dir(
796
specific_file_ids=self.specific_file_ids, yield_parents=True)
701
assert work_inv.root is not None
702
entries = work_inv.iter_entries_by_dir()
703
if not self.builder.record_root_entry:
797
705
for path, existing_ie in entries:
798
706
file_id = existing_ie.file_id
799
707
name = existing_ie.name
800
708
parent_id = existing_ie.parent_id
801
709
kind = existing_ie.kind
710
if kind == 'directory':
711
self._next_progress_entry()
802
713
# Skip files that have been deleted from the working tree.
803
# The deleted path ids are also recorded so they can be explicitly
806
path_segments = splitpath(path)
807
deleted_dict = deleted_paths
808
for segment in path_segments:
809
deleted_dict = deleted_dict.get(segment, None)
811
# We either took a path not present in the dict
812
# (deleted_dict was None), or we've reached an empty
813
# child dir in the dict, so are now a sub-path.
817
if deleted_dict is not None:
818
# the path has a deleted parent, do not add it.
820
if exclude and is_inside_any(exclude, path):
821
# Skip excluded paths. Excluded paths are processed by
822
# _update_builder_with_changes.
714
# The deleted files/directories are also recorded so they
715
# can be explicitly unversioned later. Note that when a
716
# filter of specific files is given, we must only skip/record
717
# deleted files matching that filter.
718
if is_inside_any(deleted_paths, path):
824
content_summary = self.work_tree.path_content_summary(path)
825
kind = content_summary[0]
826
# Note that when a filter of specific files is given, we must only
827
# skip/record deleted files matching that filter.
828
720
if not specific_files or is_inside_any(specific_files, path):
829
if kind == 'missing':
830
if not deleted_paths:
831
# path won't have been split yet.
832
path_segments = splitpath(path)
833
deleted_dict = deleted_paths
834
for segment in path_segments:
835
deleted_dict = deleted_dict.setdefault(segment, {})
721
if not self.work_tree.has_filename(path):
722
deleted_paths.add(path)
836
723
self.reporter.missing(path)
837
self._next_progress_entry()
838
724
deleted_ids.append(file_id)
840
# TODO: have the builder do the nested commit just-in-time IF and
842
if kind == 'tree-reference':
843
# enforce repository nested tree policy.
844
if (not self.work_tree.supports_tree_reference() or
845
# repository does not support it either.
846
not self.branch.repository._format.supports_tree_reference):
848
content_summary = (kind, None, None, None)
849
elif self.recursive == 'down':
850
nested_revision_id = self._commit_nested_tree(
852
content_summary = (kind, None, None, nested_revision_id)
854
nested_revision_id = self.work_tree.get_reference_revision(file_id)
855
content_summary = (kind, None, None, nested_revision_id)
727
kind = self.work_tree.kind(file_id)
728
# TODO: specific_files filtering before nested tree processing
729
if kind == 'tree-reference' and self.recursive == 'down':
730
self._commit_nested_tree(file_id, path)
731
except errors.NoSuchFile:
857
734
# Record an entry for this item
858
735
# Note: I don't particularly want to have the existing_ie
859
736
# parameter but the test suite currently (28-Jun-07) breaks
860
737
# without it thanks to a unicode normalisation issue. :-(
861
definitely_changed = kind != existing_ie.kind
738
definitely_changed = kind != existing_ie.kind
862
739
self._record_entry(path, file_id, specific_files, kind, name,
863
parent_id, definitely_changed, existing_ie, report_changes,
740
parent_id, definitely_changed, existing_ie, report_changes)
866
742
# Unversion IDs that were found to be deleted
867
self.deleted_ids = deleted_ids
743
self.work_tree.unversion(deleted_ids)
869
745
def _commit_nested_tree(self, file_id, path):
870
746
"Commit a nested tree."
889
765
strict=self.strict, verbose=self.verbose,
890
766
local=self.local, reporter=self.reporter)
891
767
except errors.PointlessCommit:
892
return self.work_tree.get_reference_revision(file_id)
894
770
def _record_entry(self, path, file_id, specific_files, kind, name,
895
parent_id, definitely_changed, existing_ie, report_changes,
771
parent_id, definitely_changed, existing_ie=None,
772
report_changes=True):
897
773
"Record the new inventory entry for a path if any."
898
774
# mutter('check %s {%s}', path, file_id)
899
# mutter('%s selected for commit', path)
900
if definitely_changed or existing_ie is None:
901
ie = make_entry(kind, name, parent_id, file_id)
775
if (not specific_files or
776
is_inside_or_parent_of_any(specific_files, path)):
777
# mutter('%s selected for commit', path)
778
if definitely_changed or existing_ie is None:
779
ie = inventory.make_entry(kind, name, parent_id, file_id)
781
ie = existing_ie.copy()
903
ie = existing_ie.copy()
905
# For carried over entries we don't care about the fs hash - the repo
906
# isn't generating a sha, so we're not saving computation time.
907
_, _, fs_hash = self.builder.record_entry_contents(
908
ie, self.parent_invs, path, self.work_tree, content_summary)
910
self._report_change(ie, path)
912
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
784
# mutter('%s not selected for commit', path)
785
if self.basis_inv.has_id(file_id):
786
ie = self.basis_inv[file_id].copy()
788
# this entry is new and not being committed
791
self.builder.record_entry_contents(ie, self.parent_invs,
792
path, self.work_tree)
794
self._report_change(ie, path)
915
797
def _report_change(self, ie, path):
950
828
self._emit_progress()
952
830
def _emit_progress(self):
953
if self.pb_entries_count is not None:
954
text = "%s [%d] - Stage" % (self.pb_stage_name,
955
self.pb_entries_count)
831
if self.pb_entries_title:
832
if self.pb_entries_total == '?':
833
text = "%s [%s %d] - Stage" % (self.pb_stage_name,
834
self.pb_entries_title, self.pb_entries_count)
836
text = "%s [%s %d/%s] - Stage" % (self.pb_stage_name,
837
self.pb_entries_title, self.pb_entries_count,
838
str(self.pb_entries_total))
957
text = "%s - Stage" % (self.pb_stage_name, )
840
text = "%s - Stage" % (self.pb_stage_name)
958
841
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
960
def _set_specific_file_ids(self):
961
"""populate self.specific_file_ids if we will use it."""
962
if not self.use_record_iter_changes:
963
# If provided, ensure the specified files are versioned
964
if self.specific_files is not None:
965
# Note: This routine is being called because it raises
966
# PathNotVersionedError as a side effect of finding the IDs. We
967
# later use the ids we found as input to the working tree
968
# inventory iterator, so we only consider those ids rather than
969
# examining the whole tree again.
970
# XXX: Dont we have filter_unversioned to do this more
972
self.specific_file_ids = tree.find_ids_across_trees(
973
self.specific_files, [self.basis_tree, self.work_tree])
975
self.specific_file_ids = None
added
removed
bzrlib/commit.py
