265
214
if message_callback is None:
266
215
if message is not None:
267
216
if isinstance(message, str):
268
message = message.decode(get_user_encoding())
217
message = message.decode(bzrlib.user_encoding)
269
218
message_callback = lambda x: message
271
220
raise BzrError("The message or message_callback keyword"
272
221
" parameter is required for commit().")
274
223
self.bound_branch = None
275
self.any_entries_deleted = False
276
if exclude is not None:
277
self.exclude = sorted(
278
minimum_path_selection(exclude))
281
224
self.local = local
282
225
self.master_branch = None
283
self.recursive = recursive
226
self.master_locked = False
284
227
self.rev_id = None
285
# self.specific_files is None to indicate no filter, or any iterable to
286
# indicate a filter - [] means no files at all, as per iter_changes.
287
if specific_files is not None:
288
self.specific_files = sorted(
289
minimum_path_selection(specific_files))
291
self.specific_files = None
228
self.specific_files = specific_files
293
229
self.allow_pointless = allow_pointless
230
self.recursive = recursive
231
self.revprops = revprops
294
232
self.message_callback = message_callback
295
233
self.timestamp = timestamp
296
234
self.timezone = timezone
297
235
self.committer = committer
298
236
self.strict = strict
299
237
self.verbose = verbose
240
if reporter is None and self.reporter is None:
241
self.reporter = NullCommitReporter()
242
elif reporter is not None:
243
self.reporter = reporter
301
245
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
246
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
247
self.basis_tree = self.work_tree.basis_tree()
316
248
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
250
# Cannot commit with conflicts present.
251
if len(self.work_tree.conflicts())>0:
252
raise ConflictsInTree
254
# setup the bound branch variables as needed.
255
self._check_bound_branch()
257
# check for out of date working trees
259
first_tree_parent = self.work_tree.get_parent_ids()[0]
261
# if there are no parents, treat our parent as 'None'
262
# this is so that we still consier the master branch
263
# - in a checkout scenario the tree may have no
264
# parents but the branch may do.
265
first_tree_parent = bzrlib.revision.NULL_REVISION
266
old_revno, master_last = self.master_branch.last_revision_info()
267
if master_last != first_tree_parent:
268
if master_last != bzrlib.revision.NULL_REVISION:
269
raise errors.OutOfDateTree(self.work_tree)
270
if self.branch.repository.has_revision(first_tree_parent):
271
new_revno = old_revno + 1
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()
273
# ghost parents never appear in revision history.
276
# raise an exception as soon as we find a single unknown.
277
for unknown in self.work_tree.unknowns():
278
raise StrictCommitFailed()
280
if self.config is None:
281
self.config = self.branch.get_config()
283
self.work_inv = self.work_tree.inventory
284
self.basis_inv = self.basis_tree.inventory
285
if specific_files is not None:
286
# Ensure specified files are versioned
287
# (We don't actually need the ids here)
288
# XXX: Dont we have filter_unversioned to do this more
290
tree.find_ids_across_trees(specific_files,
291
[self.basis_tree, self.work_tree])
292
# one to finish, one for rev and inventory, and one for each
293
# inventory entry, and the same for the new inventory.
294
# note that this estimate is too long when we do a partial tree
295
# commit which excludes some new files from being considered.
296
# The estimate is corrected when we populate the new inv.
297
self.pb_total = len(self.work_inv) + 5
300
self._gather_parents()
301
if len(self.parents) > 1 and self.specific_files:
302
raise NotImplementedError('selected-file commit of merges is not supported yet: files %r',
305
self.builder = self.branch.get_commit_builder(self.parents,
306
self.config, timestamp, timezone, committer, revprops, rev_id)
308
self._remove_deleted()
309
self._populate_new_inv()
310
self._report_deletes()
379
312
self._check_pointless()
381
# TODO: Now the new inventory is known, check for conflicts.
314
self._emit_progress_update()
315
# TODO: Now the new inventory is known, check for conflicts and
316
# prompt the user for a commit message.
382
317
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
383
318
# weave lines, because nothing should be recorded until it is known
384
319
# that commit will succeed.
385
self._set_progress_stage("Saving data locally")
386
320
self.builder.finish_inventory()
388
# Prompt the user for a commit message if none provided
321
self._emit_progress_update()
389
322
message = message_callback(self)
323
assert isinstance(message, unicode), type(message)
390
324
self.message = message
325
self._escape_commit_message()
392
# Add revision data to the local branch
393
327
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)
328
self._emit_progress_update()
329
# revision data is in the local branch now.
331
# upload revision data to the master.
332
# this will propagate merged revisions too if needed.
333
if self.bound_branch:
334
self.master_branch.repository.fetch(self.branch.repository,
335
revision_id=self.rev_id)
336
# now the master has the revision data
337
# 'commit' to the master first so a timeout here causes the local
338
# branch to be out of date
339
self.master_branch.set_last_revision_info(new_revno,
342
# and now do the commit locally.
343
self.branch.set_last_revision_info(new_revno, self.rev_id)
345
rev_tree = self.builder.revision_tree()
346
self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
347
# now the work tree is up to date with the branch
349
self.reporter.completed(new_revno, self.rev_id)
350
# old style commit hooks - should be deprecated ? (obsoleted in
352
if self.config.post_commit() is not None:
353
hooks = self.config.post_commit().split(' ')
354
# this would be nicer with twisted.python.reflect.namedAny
356
result = eval(hook + '(branch, rev_id)',
357
{'branch':self.branch,
359
'rev_id':self.rev_id})
360
# new style commit hooks:
361
if not self.bound_branch:
362
hook_master = self.branch
365
hook_master = self.master_branch
366
hook_local = self.branch
367
# With bound branches, when the master is behind the local branch,
368
# the 'old_revno' and old_revid values here are incorrect.
369
# XXX: FIXME ^. RBC 20060206
371
old_revid = self.parents[0]
373
old_revid = bzrlib.revision.NULL_REVISION
374
for hook in Branch.hooks['post_commit']:
375
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
377
self._emit_progress_update()
425
380
return self.rev_id
427
def _select_reporter(self):
428
"""Select the CommitReporter to use."""
430
return NullCommitReporter()
431
return ReportCommitToLog()
382
def _any_real_changes(self):
383
"""Are there real changes between new_inventory and basis?
385
For trees without rich roots, inv.root.revision changes every commit.
386
But if that is the only change, we want to treat it as though there
389
new_entries = self.builder.new_inventory.iter_entries()
390
basis_entries = self.basis_inv.iter_entries()
391
new_path, new_root_ie = new_entries.next()
392
basis_path, basis_root_ie = basis_entries.next()
394
# This is a copy of InventoryEntry.__eq__ only leaving out .revision
395
def ie_equal_no_revision(this, other):
396
return ((this.file_id == other.file_id)
397
and (this.name == other.name)
398
and (this.symlink_target == other.symlink_target)
399
and (this.text_sha1 == other.text_sha1)
400
and (this.text_size == other.text_size)
401
and (this.text_id == other.text_id)
402
and (this.parent_id == other.parent_id)
403
and (this.kind == other.kind)
404
and (this.executable == other.executable)
405
and (this.reference_revision == other.reference_revision)
407
if not ie_equal_no_revision(new_root_ie, basis_root_ie):
410
for new_ie, basis_ie in zip(new_entries, basis_entries):
411
if new_ie != basis_ie:
414
# No actual changes present
433
417
def _check_pointless(self):
434
418
if self.allow_pointless:
490
474
# so grab the lock
491
475
self.bound_branch = self.branch
492
476
self.master_branch.lock_write()
493
operation.add_cleanup(self.master_branch.unlock)
495
def _check_out_of_date_tree(self):
496
"""Check that the working tree is up to date.
498
:return: old_revision_number,new_revision_number tuple
477
self.master_locked = True
480
"""Cleanup any open locks, progress bars etc."""
481
cleanups = [self._cleanup_bound_branch,
482
self.basis_tree.unlock,
483
self.work_tree.unlock,
485
found_exception = None
486
for cleanup in cleanups:
489
# we want every cleanup to run no matter what.
490
# so we have a catchall here, but we will raise the
491
# last encountered exception up the stack: and
492
# typically this will be useful enough.
495
if found_exception is not None:
496
# don't do a plan raise, because the last exception may have been
497
# trashed, e is our sure-to-work exception even though it loses the
498
# full traceback. XXX: RBC 20060421 perhaps we could check the
499
# exc_info and if its the same one do a plain raise otherwise
500
# 'raise e' as we do now.
503
def _cleanup_bound_branch(self):
504
"""Executed at the end of a try/finally to cleanup a bound branch.
506
If the branch wasn't bound, this is a no-op.
507
If it was, it resents self.branch to the local branch, instead
501
first_tree_parent = self.work_tree.get_parent_ids()[0]
503
# if there are no parents, treat our parent as 'None'
504
# this is so that we still consider the master branch
505
# - in a checkout scenario the tree may have no
506
# parents but the branch may do.
507
first_tree_parent = bzrlib.revision.NULL_REVISION
508
old_revno, master_last = self.master_branch.last_revision_info()
509
if master_last != first_tree_parent:
510
if master_last != bzrlib.revision.NULL_REVISION:
511
raise errors.OutOfDateTree(self.work_tree)
512
if self.branch.repository.has_revision(first_tree_parent):
513
new_revno = old_revno + 1
515
# ghost parents never appear in revision history.
517
return old_revno,new_revno
519
def _process_pre_hooks(self, old_revno, new_revno):
520
"""Process any registered pre commit hooks."""
521
self._set_progress_stage("Running pre_commit hooks")
522
self._process_hooks("pre_commit", old_revno, new_revno)
524
def _process_post_hooks(self, old_revno, new_revno):
525
"""Process any registered post commit hooks."""
526
# Process the post commit hooks, if any
527
self._set_progress_stage("Running post_commit hooks")
528
# old style commit hooks - should be deprecated ? (obsoleted in
530
if self.config.post_commit() is not None:
531
hooks = self.config.post_commit().split(' ')
532
# this would be nicer with twisted.python.reflect.namedAny
534
result = eval(hook + '(branch, rev_id)',
535
{'branch':self.branch,
537
'rev_id':self.rev_id})
538
# process new style post commit hooks
539
self._process_hooks("post_commit", old_revno, new_revno)
541
def _process_hooks(self, hook_name, old_revno, new_revno):
542
if not Branch.hooks[hook_name]:
545
# new style commit hooks:
546
510
if not self.bound_branch:
547
hook_master = self.branch
550
hook_master = self.master_branch
551
hook_local = self.branch
552
# With bound branches, when the master is behind the local branch,
553
# the 'old_revno' and old_revid values here are incorrect.
554
# XXX: FIXME ^. RBC 20060206
556
old_revid = self.parents[0]
558
old_revid = bzrlib.revision.NULL_REVISION
560
if hook_name == "pre_commit":
561
future_tree = self.builder.revision_tree()
562
tree_delta = future_tree.changes_from(self.basis_tree,
565
for hook in Branch.hooks[hook_name]:
566
# show the running hook in the progress bar. As hooks may
567
# end up doing nothing (e.g. because they are not configured by
568
# the user) this is still showing progress, not showing overall
569
# actions - its up to each plugin to show a UI if it want's to
570
# (such as 'Emailing diff to foo@example.com').
571
self.pb_stage_name = "Running %s hooks [%s]" % \
572
(hook_name, Branch.hooks.get_hook_name(hook))
573
self._emit_progress()
574
if 'hooks' in debug.debug_flags:
575
mutter("Invoking commit hook: %r", hook)
576
if hook_name == "post_commit":
577
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
579
elif hook_name == "pre_commit":
580
hook(hook_local, hook_master,
581
old_revno, old_revid, new_revno, self.rev_id,
582
tree_delta, future_tree)
512
if self.master_locked:
513
self.master_branch.unlock()
515
def _escape_commit_message(self):
516
"""Replace xml-incompatible control characters."""
517
# FIXME: RBC 20060419 this should be done by the revision
518
# serialiser not by commit. Then we can also add an unescaper
519
# in the deserializer and start roundtripping revision messages
520
# precisely. See repository_implementations/test_repository.py
522
# Python strings can include characters that can't be
523
# represented in well-formed XML; escape characters that
524
# aren't listed in the XML specification
525
# (http://www.w3.org/TR/REC-xml/#NT-Char).
526
self.message, escape_count = re.subn(
527
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
528
lambda match: match.group(0).encode('unicode_escape'),
531
self.reporter.escaped(escape_count, self.message)
584
533
def _gather_parents(self):
585
534
"""Record the parents of a merge for merge detection."""
586
# TODO: Make sure that this list doesn't contain duplicate
535
# TODO: Make sure that this list doesn't contain duplicate
587
536
# entries and the order is preserved when doing this.
588
if self.use_record_iter_changes:
590
self.basis_inv = self.basis_tree.inventory
537
self.parents = self.work_tree.get_parent_ids()
591
538
self.parent_invs = [self.basis_inv]
592
539
for revision in self.parents[1:]:
593
540
if self.branch.repository.has_revision(revision):
598
545
mutter('commit parent ghost revision {%s}', revision)
600
def _update_builder_with_changes(self):
601
"""Update the commit builder with the data about what has changed.
603
exclude = self.exclude
604
specific_files = self.specific_files
605
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()
547
def _remove_deleted(self):
548
"""Remove deleted files from the working inventories.
550
This is done prior to taking the working inventory as the
551
basis for the new committed inventory.
553
This returns true if any files
554
*that existed in the basis inventory* were deleted.
555
Files that were added and deleted
556
in the working copy don't matter.
558
specific = self.specific_files
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):
672
# If specific files are selected, then all un-selected files must be
673
# recorded in their previous state. For more details, see
674
# 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
for path, old_ie in self.basis_inv.iter_entries():
678
if old_ie.file_id in self.builder.new_inventory:
679
# 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.
686
# From here down it was either not selected, or was excluded:
687
# We preserve the entry unaltered.
689
# Note: specific file commits after a merge are currently
690
# prohibited. This test is for sanity/safety in case it's
691
# required after that changes.
692
if len(self.parents) > 1:
694
self.builder.record_entry_contents(ie, self.parent_invs, path,
695
self.basis_tree, None)
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)
712
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)
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
726
# raise an exception as soon as we find a single unknown.
727
for unknown in self.work_tree.unknowns():
728
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.
560
deleted_paths = set()
561
for path, ie in self.work_inv.iter_entries():
562
if is_inside_any(deleted_paths, path):
563
# The tree will delete the required ids recursively.
565
if specific and not is_inside_any(specific, path):
567
if not self.work_tree.has_filename(path):
568
deleted_paths.add(path)
569
self.reporter.missing(path)
570
deleted_ids.append(ie.file_id)
571
self.work_tree.unversion(deleted_ids)
573
def _populate_new_inv(self):
574
"""Build revision inventory.
576
This creates a new empty inventory. Depending on
577
which files are selected for commit, and what is present in the
578
current tree, the new inventory is populated. inventory entries
579
which are candidates for modification have their revision set to
580
None; inventory entries that are carried over untouched have their
581
revision set to their prior value.
741
583
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
742
584
# results to create a new inventory at the same time, which results
743
585
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
744
586
# ADHB 11-07-2006
746
specific_files = self.specific_files
747
exclude = self.exclude
748
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.
755
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.
758
entries = work_inv.iter_entries_by_dir(
759
specific_file_ids=self.specific_file_ids, yield_parents=True)
760
for path, existing_ie in entries:
761
file_id = existing_ie.file_id
762
name = existing_ie.name
763
parent_id = existing_ie.parent_id
764
kind = existing_ie.kind
765
# 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.
787
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
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, {})
799
self.reporter.missing(path)
800
self._next_progress_entry()
801
deleted_ids.append(file_id)
803
# TODO: have the builder do the nested commit just-in-time IF and
805
if kind == 'tree-reference':
806
# enforce repository nested tree policy.
807
if (not self.work_tree.supports_tree_reference() or
808
# repository does not support it either.
809
not self.branch.repository._format.supports_tree_reference):
811
content_summary = (kind, None, None, None)
812
elif self.recursive == 'down':
813
nested_revision_id = self._commit_nested_tree(
815
content_summary = (kind, None, None, nested_revision_id)
817
nested_revision_id = self.work_tree.get_reference_revision(file_id)
818
content_summary = (kind, None, None, nested_revision_id)
820
# Record an entry for this item
821
# Note: I don't particularly want to have the existing_ie
822
# parameter but the test suite currently (28-Jun-07) breaks
823
# without it thanks to a unicode normalisation issue. :-(
824
definitely_changed = kind != existing_ie.kind
825
self._record_entry(path, file_id, specific_files, kind, name,
826
parent_id, definitely_changed, existing_ie, report_changes,
829
# Unversion IDs that were found to be deleted
830
self.deleted_ids = deleted_ids
832
def _commit_nested_tree(self, file_id, path):
833
"Commit a nested tree."
834
sub_tree = self.work_tree.get_nested_tree(file_id, path)
835
# FIXME: be more comprehensive here:
836
# this works when both trees are in --trees repository,
837
# but when both are bound to a different repository,
838
# it fails; a better way of approaching this is to
839
# finally implement the explicit-caches approach design
840
# a while back - RBC 20070306.
841
if sub_tree.branch.repository.has_same_location(
842
self.work_tree.branch.repository):
843
sub_tree.branch.repository = \
844
self.work_tree.branch.repository
846
return sub_tree.commit(message=None, revprops=self.revprops,
847
recursive=self.recursive,
848
message_callback=self.message_callback,
849
timestamp=self.timestamp, timezone=self.timezone,
850
committer=self.committer,
851
allow_pointless=self.allow_pointless,
852
strict=self.strict, verbose=self.verbose,
853
local=self.local, reporter=self.reporter)
854
except errors.PointlessCommit:
855
return self.work_tree.get_reference_revision(file_id)
857
def _record_entry(self, path, file_id, specific_files, kind, name,
858
parent_id, definitely_changed, existing_ie, report_changes,
860
"Record the new inventory entry for a path if any."
861
# mutter('check %s {%s}', path, file_id)
862
# mutter('%s selected for commit', path)
863
if definitely_changed or existing_ie is None:
864
ie = make_entry(kind, name, parent_id, file_id)
866
ie = existing_ie.copy()
587
mutter("Selecting files for commit with filter %s", self.specific_files)
588
assert self.work_inv.root is not None
589
entries = self.work_inv.iter_entries()
590
if not self.builder.record_root_entry:
591
symbol_versioning.warn('CommitBuilders should support recording'
592
' the root entry as of bzr 0.10.', DeprecationWarning,
594
self.builder.new_inventory.add(self.basis_inv.root.copy())
596
self._emit_progress_update()
597
for path, new_ie in entries:
598
self._emit_progress_update()
599
file_id = new_ie.file_id
601
kind = self.work_tree.kind(file_id)
602
if kind == 'tree-reference' and self.recursive == 'down':
603
# nested tree: commit in it
604
sub_tree = WorkingTree.open(self.work_tree.abspath(path))
605
# FIXME: be more comprehensive here:
606
# this works when both trees are in --trees repository,
607
# but when both are bound to a different repository,
608
# it fails; a better way of approaching this is to
609
# finally implement the explicit-caches approach design
610
# a while back - RBC 20070306.
611
if (sub_tree.branch.repository.bzrdir.root_transport.base
613
self.work_tree.branch.repository.bzrdir.root_transport.base):
614
sub_tree.branch.repository = \
615
self.work_tree.branch.repository
617
sub_tree.commit(message=None, revprops=self.revprops,
618
recursive=self.recursive,
619
message_callback=self.message_callback,
620
timestamp=self.timestamp, timezone=self.timezone,
621
committer=self.committer,
622
allow_pointless=self.allow_pointless,
623
strict=self.strict, verbose=self.verbose,
624
local=self.local, reporter=self.reporter)
625
except errors.PointlessCommit:
627
if kind != new_ie.kind:
628
new_ie = inventory.make_entry(kind, new_ie.name,
629
new_ie.parent_id, file_id)
630
except errors.NoSuchFile:
632
# mutter('check %s {%s}', path, file_id)
633
if (not self.specific_files or
634
is_inside_or_parent_of_any(self.specific_files, path)):
635
# mutter('%s selected for commit', path)
639
# mutter('%s not selected for commit', path)
640
if self.basis_inv.has_id(file_id):
641
ie = self.basis_inv[file_id].copy()
643
# this entry is new and not being committed
645
self.builder.record_entry_contents(ie, self.parent_invs,
646
path, self.work_tree)
647
# describe the nature of the change that has occurred relative to
648
# the basis inventory.
649
if (self.basis_inv.has_id(ie.file_id)):
650
basis_ie = self.basis_inv[ie.file_id]
653
change = ie.describe_change(basis_ie, ie)
654
if change in (InventoryEntry.RENAMED,
655
InventoryEntry.MODIFIED_AND_RENAMED):
656
old_path = self.basis_inv.id2path(ie.file_id)
657
self.reporter.renamed(change, old_path, path)
659
self.reporter.snapshot_change(change, path)
661
if not self.specific_files:
664
# ignore removals that don't match filespec
665
for path, new_ie in self.basis_inv.iter_entries():
666
if new_ie.file_id in self.work_inv:
668
if is_inside_any(self.specific_files, path):
867
671
ie.revision = None
868
# For carried over entries we don't care about the fs hash - the repo
869
# isn't generating a sha, so we're not saving computation time.
870
_, _, fs_hash = self.builder.record_entry_contents(
871
ie, self.parent_invs, path, self.work_tree, content_summary)
873
self._report_change(ie, path)
875
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
878
def _report_change(self, ie, path):
879
"""Report a change to the user.
881
The change that has occurred is described relative to the basis
884
if (self.basis_inv.has_id(ie.file_id)):
885
basis_ie = self.basis_inv[ie.file_id]
888
change = ie.describe_change(basis_ie, ie)
889
if change in (InventoryEntry.RENAMED,
890
InventoryEntry.MODIFIED_AND_RENAMED):
891
old_path = self.basis_inv.id2path(ie.file_id)
892
self.reporter.renamed(change, old_path, path)
893
self._next_progress_entry()
895
if change == 'unchanged':
897
self.reporter.snapshot_change(change, path)
898
self._next_progress_entry()
900
def _set_progress_stage(self, name, counter=False):
901
"""Set the progress stage and emit an update to the progress bar."""
902
self.pb_stage_name = name
903
self.pb_stage_count += 1
905
self.pb_entries_count = 0
907
self.pb_entries_count = None
908
self._emit_progress()
910
def _next_progress_entry(self):
911
"""Emit an update to the progress bar and increment the entry count."""
912
self.pb_entries_count += 1
913
self._emit_progress()
915
def _emit_progress(self):
916
if self.pb_entries_count is not None:
917
text = "%s [%d] - Stage" % (self.pb_stage_name,
918
self.pb_entries_count)
920
text = "%s - Stage" % (self.pb_stage_name, )
921
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
923
def _set_specific_file_ids(self):
924
"""populate self.specific_file_ids if we will use it."""
925
if not self.use_record_iter_changes:
926
# If provided, ensure the specified files are versioned
927
if self.specific_files is not None:
928
# Note: This routine is being called because it raises
929
# PathNotVersionedError as a side effect of finding the IDs. We
930
# later use the ids we found as input to the working tree
931
# inventory iterator, so we only consider those ids rather than
932
# examining the whole tree again.
933
# XXX: Dont we have filter_unversioned to do this more
935
self.specific_file_ids = tree.find_ids_across_trees(
936
self.specific_files, [self.basis_tree, self.work_tree])
938
self.specific_file_ids = None
672
self.builder.record_entry_contents(ie, self.parent_invs, path,
675
def _emit_progress_update(self):
676
"""Emit an update to the progress bar."""
677
self.pb.update("Committing", self.pb_count, self.pb_total)
680
def _report_deletes(self):
681
for path, ie in self.basis_inv.iter_entries():
682
if ie.file_id not in self.builder.new_inventory:
683
self.reporter.deleted(path)
added
removed
bzrlib/commit.py
