177
196
working_tree=None,
200
message_callback=None,
203
possible_master_transports=None):
181
204
"""Commit working copy as a new revision.
183
branch -- the deprecated branch to commit to. New callers should pass in
186
message -- the commit message, a mandatory parameter
188
timestamp -- if not None, seconds-since-epoch for a
189
postdated/predated commit.
191
specific_files -- If true, commit only those files.
193
rev_id -- If set, use this as the new revision id.
206
:param message: the commit message (it or message_callback is required)
207
:param message_callback: A callback: message = message_callback(cmt_obj)
209
:param timestamp: if not None, seconds-since-epoch for a
210
postdated/predated commit.
212
:param specific_files: If true, commit only those files.
214
:param rev_id: If set, use this as the new revision id.
194
215
Useful for test or import commands that need to tightly
195
216
control what revisions are assigned. If you duplicate
196
217
a revision id that exists elsewhere it is your own fault.
197
218
If null (default), a time/random revision id is generated.
199
allow_pointless -- If true (default), commit even if nothing
220
:param allow_pointless: If true (default), commit even if nothing
200
221
has changed and no merges are recorded.
202
strict -- If true, don't allow a commit if the working tree
223
:param strict: If true, don't allow a commit if the working tree
203
224
contains unknown files.
205
revprops -- Properties for new revision
226
:param revprops: Properties for new revision
206
227
:param local: Perform a local only commit.
228
:param reporter: the reporter to use or None for the default
229
:param verbose: if True and the reporter is not None, report everything
230
:param recursive: If set to 'down', commit in any subtrees that have
231
pending changes of any sort during this commit.
232
:param exclude: None or a list of relative paths to exclude from the
233
commit. Pending changes to excluded files will be ignored by the
208
236
mutter('preparing to commit')
210
if deprecated_passed(branch):
211
symbol_versioning.warn("Commit.commit (branch, ...): The branch parameter is "
212
"deprecated as of bzr 0.8. Please use working_tree= instead.",
213
DeprecationWarning, stacklevel=2)
215
self.work_tree = self.branch.bzrdir.open_workingtree()
216
elif working_tree is None:
217
raise BzrError("One of branch and working_tree must be passed into commit().")
238
if working_tree is None:
239
raise BzrError("working_tree must be passed into commit().")
219
241
self.work_tree = working_tree
220
242
self.branch = self.work_tree.branch
222
raise BzrError("The message keyword parameter is required for commit().")
243
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
244
if not self.branch.repository.supports_rich_root():
245
raise errors.RootNotRich()
246
if message_callback is None:
247
if message is not None:
248
if isinstance(message, str):
249
message = message.decode(get_user_encoding())
250
message_callback = lambda x: message
252
raise BzrError("The message or message_callback keyword"
253
" parameter is required for commit().")
224
255
self.bound_branch = None
256
self.any_entries_deleted = False
257
if exclude is not None:
258
self.exclude = sorted(
259
minimum_path_selection(exclude))
225
262
self.local = local
226
263
self.master_branch = None
227
264
self.master_locked = False
265
self.recursive = recursive
228
266
self.rev_id = None
229
self.specific_files = specific_files
267
if specific_files is not None:
268
self.specific_files = sorted(
269
minimum_path_selection(specific_files))
271
self.specific_files = None
230
273
self.allow_pointless = allow_pointless
232
if reporter is None and self.reporter is None:
233
self.reporter = NullCommitReporter()
234
elif reporter is not None:
235
self.reporter = reporter
274
self.revprops = revprops
275
self.message_callback = message_callback
276
self.timestamp = timestamp
277
self.timezone = timezone
278
self.committer = committer
280
self.verbose = verbose
237
282
self.work_tree.lock_write()
283
self.parents = self.work_tree.get_parent_ids()
284
# We can use record_iter_changes IFF iter_changes is compatible with
285
# the command line parameters, and the repository has fast delta
286
# generation. See bug 347649.
287
self.use_record_iter_changes = (
288
not self.specific_files and
290
not self.branch.repository._format.supports_tree_reference and
291
(self.branch.repository._format.fast_deltas or
292
len(self.parents) < 2))
238
293
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
294
self.basis_revid = self.work_tree.last_revision()
295
self.basis_tree = self.work_tree.basis_tree()
296
self.basis_tree.lock_read()
240
298
# Cannot commit with conflicts present.
241
if len(self.work_tree.conflicts())>0:
299
if len(self.work_tree.conflicts()) > 0:
242
300
raise ConflictsInTree
244
# setup the bound branch variables as needed.
245
self._check_bound_branch()
247
# check for out of date working trees
249
first_tree_parent = self.work_tree.get_parent_ids()[0]
251
# if there are no parents, treat our parent as 'None'
252
# this is so that we still consier the master branch
253
# - in a checkout scenario the tree may have no
254
# parents but the branch may do.
255
first_tree_parent = None
256
master_last = self.master_branch.last_revision()
257
if (master_last is not None and
258
master_last != first_tree_parent):
259
raise errors.OutOfDateTree(self.work_tree)
262
# raise an exception as soon as we find a single unknown.
263
for unknown in self.work_tree.unknowns():
264
raise StrictCommitFailed()
302
# Setup the bound branch variables as needed.
303
self._check_bound_branch(possible_master_transports)
305
# Check that the working tree is up to date
306
old_revno, new_revno = self._check_out_of_date_tree()
308
# Complete configuration setup
309
if reporter is not None:
310
self.reporter = reporter
311
elif self.reporter is None:
312
self.reporter = self._select_reporter()
266
313
if self.config is None:
267
314
self.config = self.branch.get_config()
269
if isinstance(message, str):
270
message = message.decode(bzrlib.user_encoding)
271
assert isinstance(message, unicode), type(message)
272
self.message = message
273
self._escape_commit_message()
275
self.work_inv = self.work_tree.inventory
276
self.basis_tree = self.work_tree.basis_tree()
277
self.basis_inv = self.basis_tree.inventory
278
# one to finish, one for rev and inventory, and one for each
279
# inventory entry, and the same for the new inventory.
280
# note that this estimate is too long when we do a partial tree
281
# commit which excludes some new files from being considered.
282
# The estimate is corrected when we populate the new inv.
283
self.pb_total = len(self.work_inv) + 5
316
self._set_specific_file_ids()
318
# Setup the progress bar. As the number of files that need to be
319
# committed in unknown, progress is reported as stages.
320
# We keep track of entries separately though and include that
321
# information in the progress bar during the relevant stages.
322
self.pb_stage_name = ""
323
self.pb_stage_count = 0
324
self.pb_stage_total = 5
325
if self.bound_branch:
326
self.pb_stage_total += 1
327
self.pb.show_pct = False
328
self.pb.show_spinner = False
329
self.pb.show_eta = False
330
self.pb.show_count = True
331
self.pb.show_bar = True
286
333
self._gather_parents()
334
# After a merge, a selected file commit is not supported.
335
# See 'bzr help merge' for an explanation as to why.
287
336
if len(self.parents) > 1 and self.specific_files:
288
raise NotImplementedError('selected-file commit of merges is not supported yet: files %r',
291
self.builder = self.branch.get_commit_builder(self.parents,
337
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
338
# Excludes are a form of selected file commit.
339
if len(self.parents) > 1 and self.exclude:
340
raise errors.CannotCommitSelectedFileMerge(self.exclude)
342
# Collect the changes
343
self._set_progress_stage("Collecting changes", counter=True)
344
self.builder = self.branch.get_commit_builder(self.parents,
292
345
self.config, timestamp, timezone, committer, revprops, rev_id)
294
self._remove_deleted()
295
self._populate_new_inv()
296
self._report_deletes()
298
self._check_pointless()
300
self._emit_progress_update()
301
# TODO: Now the new inventory is known, check for conflicts and
302
# prompt the user for a commit message.
303
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
304
# weave lines, because nothing should be recorded until it is known
305
# that commit will succeed.
306
self.builder.finish_inventory()
307
self._emit_progress_update()
308
self.rev_id = self.builder.commit(self.message)
309
self._emit_progress_update()
310
# revision data is in the local branch now.
312
# upload revision data to the master.
348
self.builder.will_record_deletes()
349
# find the location being committed to
350
if self.bound_branch:
351
master_location = self.master_branch.base
353
master_location = self.branch.base
355
# report the start of the commit
356
self.reporter.started(new_revno, self.rev_id, master_location)
358
self._update_builder_with_changes()
359
self._check_pointless()
361
# TODO: Now the new inventory is known, check for conflicts.
362
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
363
# weave lines, because nothing should be recorded until it is known
364
# that commit will succeed.
365
self._set_progress_stage("Saving data locally")
366
self.builder.finish_inventory()
368
# Prompt the user for a commit message if none provided
369
message = message_callback(self)
370
self.message = message
372
# Add revision data to the local branch
373
self.rev_id = self.builder.commit(self.message)
376
mutter("aborting commit write group because of exception:")
377
trace.log_exception_quietly()
378
note("aborting commit write group: %r" % (e,))
382
self._process_pre_hooks(old_revno, new_revno)
384
# Upload revision data to the master.
313
385
# this will propagate merged revisions too if needed.
314
386
if self.bound_branch:
315
self.master_branch.repository.fetch(self.branch.repository,
316
revision_id=self.rev_id)
317
# now the master has the revision data
318
# 'commit' to the master first so a timeout here causes the local
319
# branch to be out of date
320
self.master_branch.append_revision(self.rev_id)
387
self._set_progress_stage("Uploading data to master branch")
388
# 'commit' to the master first so a timeout here causes the
389
# local branch to be out of date
390
self.master_branch.import_last_revision_info(
391
self.branch.repository, new_revno, self.rev_id)
322
393
# and now do the commit locally.
323
self.branch.append_revision(self.rev_id)
394
self.branch.set_last_revision_info(new_revno, self.rev_id)
325
# if the builder gave us the revisiontree it created back, we
326
# could use it straight away here.
327
# TODO: implement this.
328
self.work_tree.set_parent_trees([(self.rev_id,
329
self.branch.repository.revision_tree(self.rev_id))])
330
# now the work tree is up to date with the branch
332
self.reporter.completed(self.branch.revno(), self.rev_id)
333
if self.config.post_commit() is not None:
334
hooks = self.config.post_commit().split(' ')
335
# this would be nicer with twisted.python.reflect.namedAny
337
result = eval(hook + '(branch, rev_id)',
338
{'branch':self.branch,
340
'rev_id':self.rev_id})
341
self._emit_progress_update()
396
# Make the working tree be up to date with the branch. This
397
# includes automatic changes scheduled to be made to the tree, such
398
# as updating its basis and unversioning paths that were missing.
399
self.work_tree.unversion(self.deleted_ids)
400
self._set_progress_stage("Updating the working tree")
401
self.work_tree.update_basis_by_delta(self.rev_id,
402
self.builder.get_basis_delta())
403
self.reporter.completed(new_revno, self.rev_id)
404
self._process_post_hooks(old_revno, new_revno)
344
407
return self.rev_id
409
def _select_reporter(self):
410
"""Select the CommitReporter to use."""
412
return NullCommitReporter()
413
return ReportCommitToLog()
346
415
def _check_pointless(self):
347
416
if self.allow_pointless:
349
418
# A merge with no effect on files
350
419
if len(self.parents) > 1:
352
# work around the fact that a newly-initted tree does differ from its
354
if len(self.builder.new_inventory) != len(self.basis_inv):
356
if (len(self.builder.new_inventory) != 1 and
357
self.builder.new_inventory != self.basis_inv):
421
# TODO: we could simplify this by using self.builder.basis_delta.
423
# The initial commit adds a root directory, but this in itself is not
424
# a worthwhile commit.
425
if (self.basis_revid == revision.NULL_REVISION and
426
((self.builder.new_inventory is not None and
427
len(self.builder.new_inventory) == 1) or
428
len(self.builder._basis_delta) == 1)):
429
raise PointlessCommit()
430
if self.builder.any_changes():
359
432
raise PointlessCommit()
361
def _check_bound_branch(self):
434
def _check_bound_branch(self, possible_master_transports=None):
362
435
"""Check to see if the local branch is bound.
364
437
If it is bound, then most of the commit will actually be
400
474
self.master_branch.lock_write()
401
475
self.master_locked = True
477
def _check_out_of_date_tree(self):
478
"""Check that the working tree is up to date.
480
:return: old_revision_number,new_revision_number tuple
483
first_tree_parent = self.work_tree.get_parent_ids()[0]
485
# if there are no parents, treat our parent as 'None'
486
# this is so that we still consider the master branch
487
# - in a checkout scenario the tree may have no
488
# parents but the branch may do.
489
first_tree_parent = bzrlib.revision.NULL_REVISION
490
old_revno, master_last = self.master_branch.last_revision_info()
491
if master_last != first_tree_parent:
492
if master_last != bzrlib.revision.NULL_REVISION:
493
raise errors.OutOfDateTree(self.work_tree)
494
if self.branch.repository.has_revision(first_tree_parent):
495
new_revno = old_revno + 1
497
# ghost parents never appear in revision history.
499
return old_revno,new_revno
501
def _process_pre_hooks(self, old_revno, new_revno):
502
"""Process any registered pre commit hooks."""
503
self._set_progress_stage("Running pre_commit hooks")
504
self._process_hooks("pre_commit", old_revno, new_revno)
506
def _process_post_hooks(self, old_revno, new_revno):
507
"""Process any registered post commit hooks."""
508
# Process the post commit hooks, if any
509
self._set_progress_stage("Running post_commit hooks")
510
# old style commit hooks - should be deprecated ? (obsoleted in
512
if self.config.post_commit() is not None:
513
hooks = self.config.post_commit().split(' ')
514
# this would be nicer with twisted.python.reflect.namedAny
516
result = eval(hook + '(branch, rev_id)',
517
{'branch':self.branch,
519
'rev_id':self.rev_id})
520
# process new style post commit hooks
521
self._process_hooks("post_commit", old_revno, new_revno)
523
def _process_hooks(self, hook_name, old_revno, new_revno):
524
if not Branch.hooks[hook_name]:
527
# new style commit hooks:
528
if not self.bound_branch:
529
hook_master = self.branch
532
hook_master = self.master_branch
533
hook_local = self.branch
534
# With bound branches, when the master is behind the local branch,
535
# the 'old_revno' and old_revid values here are incorrect.
536
# XXX: FIXME ^. RBC 20060206
538
old_revid = self.parents[0]
540
old_revid = bzrlib.revision.NULL_REVISION
542
if hook_name == "pre_commit":
543
future_tree = self.builder.revision_tree()
544
tree_delta = future_tree.changes_from(self.basis_tree,
547
for hook in Branch.hooks[hook_name]:
548
# show the running hook in the progress bar. As hooks may
549
# end up doing nothing (e.g. because they are not configured by
550
# the user) this is still showing progress, not showing overall
551
# actions - its up to each plugin to show a UI if it want's to
552
# (such as 'Emailing diff to foo@example.com').
553
self.pb_stage_name = "Running %s hooks [%s]" % \
554
(hook_name, Branch.hooks.get_hook_name(hook))
555
self._emit_progress()
556
if 'hooks' in debug.debug_flags:
557
mutter("Invoking commit hook: %r", hook)
558
if hook_name == "post_commit":
559
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
561
elif hook_name == "pre_commit":
562
hook(hook_local, hook_master,
563
old_revno, old_revid, new_revno, self.rev_id,
564
tree_delta, future_tree)
403
566
def _cleanup(self):
404
567
"""Cleanup any open locks, progress bars etc."""
405
568
cleanups = [self._cleanup_bound_branch,
569
self.basis_tree.unlock,
406
570
self.work_tree.unlock,
407
571
self.pb.finished]
408
572
found_exception = None
468
616
mutter('commit parent ghost revision {%s}', revision)
470
def _remove_deleted(self):
471
"""Remove deleted files from the working inventories.
473
This is done prior to taking the working inventory as the
474
basis for the new committed inventory.
476
This returns true if any files
477
*that existed in the basis inventory* were deleted.
478
Files that were added and deleted
479
in the working copy don't matter.
481
specific = self.specific_files
618
def _update_builder_with_changes(self):
619
"""Update the commit builder with the data about what has changed.
621
exclude = self.exclude
622
specific_files = self.specific_files or []
623
mutter("Selecting files for commit with filter %s", specific_files)
626
if self.use_record_iter_changes:
627
iter_changes = self.work_tree.iter_changes(self.basis_tree)
628
iter_changes = self._filter_iter_changes(iter_changes)
629
for file_id, path, fs_hash in self.builder.record_iter_changes(
630
self.work_tree, self.basis_revid, iter_changes):
631
self.work_tree._observed_sha1(file_id, path, fs_hash)
633
# Build the new inventory
634
self._populate_from_inventory()
635
self._record_unselected()
636
self._report_and_accumulate_deletes()
638
def _filter_iter_changes(self, iter_changes):
639
"""Process iter_changes.
641
This method reports on the changes in iter_changes to the user, and
642
converts 'missing' entries in the iter_changes iterator to 'deleted'
643
entries. 'missing' entries have their
645
:param iter_changes: An iter_changes to process.
646
:return: A generator of changes.
648
reporter = self.reporter
649
report_changes = reporter.is_verbose()
483
deleted_paths = set()
484
for path, ie in self.work_inv.iter_entries():
485
if is_inside_any(deleted_paths, path):
486
# The tree will delete the required ids recursively.
488
if specific and not is_inside_any(specific, path):
490
if not self.work_tree.has_filename(path):
491
deleted_paths.add(path)
492
self.reporter.missing(path)
493
deleted_ids.append(ie.file_id)
494
self.work_tree.unversion(deleted_ids)
496
def _populate_new_inv(self):
497
"""Build revision inventory.
499
This creates a new empty inventory. Depending on
500
which files are selected for commit, and what is present in the
501
current tree, the new inventory is populated. inventory entries
502
which are candidates for modification have their revision set to
503
None; inventory entries that are carried over untouched have their
504
revision set to their prior value.
651
for change in iter_changes:
653
old_path = change[1][0]
654
new_path = change[1][1]
655
versioned = change[3][1]
657
versioned = change[3][1]
658
if kind is None and versioned:
661
reporter.missing(new_path)
662
deleted_ids.append(change[0])
663
# Reset the new path (None) and new versioned flag (False)
664
change = (change[0], (change[1][0], None), change[2],
665
(change[3][0], False)) + change[4:]
666
elif kind == 'tree-reference':
667
if self.recursive == 'down':
668
self._commit_nested_tree(change[0], change[1][1])
669
if change[3][0] or change[3][1]:
673
reporter.deleted(old_path)
674
elif old_path is None:
675
reporter.snapshot_change('added', new_path)
676
elif old_path != new_path:
677
reporter.renamed('renamed', old_path, new_path)
680
self.work_tree.branch.repository._format.rich_root_data):
681
# Don't report on changes to '' in non rich root
683
reporter.snapshot_change('modified', new_path)
684
self._next_progress_entry()
685
# Unversion IDs that were found to be deleted
686
self.deleted_ids = deleted_ids
688
def _record_unselected(self):
689
# If specific files are selected, then all un-selected files must be
690
# recorded in their previous state. For more details, see
691
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
692
if self.specific_files or self.exclude:
693
specific_files = self.specific_files or []
694
for path, old_ie in self.basis_inv.iter_entries():
695
if old_ie.file_id in self.builder.new_inventory:
696
# already added - skip.
698
if (is_inside_any(specific_files, path)
699
and not is_inside_any(self.exclude, path)):
700
# was inside the selected path, and not excluded - if not
701
# present it has been deleted so skip.
703
# From here down it was either not selected, or was excluded:
704
# We preserve the entry unaltered.
706
# Note: specific file commits after a merge are currently
707
# prohibited. This test is for sanity/safety in case it's
708
# required after that changes.
709
if len(self.parents) > 1:
711
self.builder.record_entry_contents(ie, self.parent_invs, path,
712
self.basis_tree, None)
714
def _report_and_accumulate_deletes(self):
715
if (isinstance(self.basis_inv, Inventory)
716
and isinstance(self.builder.new_inventory, Inventory)):
717
# the older Inventory classes provide a _byid dict, and building a
718
# set from the keys of this dict is substantially faster than even
719
# getting a set of ids from the inventory
721
# <lifeless> set(dict) is roughly the same speed as
722
# set(iter(dict)) and both are significantly slower than
724
deleted_ids = set(self.basis_inv._byid.keys()) - \
725
set(self.builder.new_inventory._byid.keys())
727
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
729
self.any_entries_deleted = True
730
deleted = [(self.basis_tree.id2path(file_id), file_id)
731
for file_id in deleted_ids]
733
# XXX: this is not quite directory-order sorting
734
for path, file_id in deleted:
735
self.builder.record_delete(path, file_id)
736
self.reporter.deleted(path)
738
def _check_strict(self):
739
# XXX: when we use iter_changes this would likely be faster if
740
# iter_changes would check for us (even in the presence of
743
# raise an exception as soon as we find a single unknown.
744
for unknown in self.work_tree.unknowns():
745
raise StrictCommitFailed()
747
def _populate_from_inventory(self):
748
"""Populate the CommitBuilder by walking the working tree inventory."""
749
# Build the revision inventory.
751
# This starts by creating a new empty inventory. Depending on
752
# which files are selected for commit, and what is present in the
753
# current tree, the new inventory is populated. inventory entries
754
# which are candidates for modification have their revision set to
755
# None; inventory entries that are carried over untouched have their
756
# revision set to their prior value.
506
758
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
507
759
# results to create a new inventory at the same time, which results
508
760
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
509
761
# ADHB 11-07-2006
510
mutter("Selecting files for commit with filter %s", self.specific_files)
511
entries = self.work_inv.iter_entries()
512
if not self.builder.record_root_entry:
513
symbol_versioning.warn('CommitBuilders should support recording'
514
' the root entry as of bzr 0.10.', DeprecationWarning,
516
self.builder.new_inventory.add(self.basis_inv.root.copy())
518
self._emit_progress_update()
519
for path, new_ie in entries:
520
self._emit_progress_update()
521
file_id = new_ie.file_id
522
# mutter('check %s {%s}', path, file_id)
523
if (not self.specific_files or
524
is_inside_or_parent_of_any(self.specific_files, path)):
525
# mutter('%s selected for commit', path)
529
# mutter('%s not selected for commit', path)
530
if self.basis_inv.has_id(file_id):
531
ie = self.basis_inv[file_id].copy()
533
# this entry is new and not being committed
536
self.builder.record_entry_contents(ie, self.parent_invs,
537
path, self.work_tree)
538
# describe the nature of the change that has occurred relative to
539
# the basis inventory.
540
if (self.basis_inv.has_id(ie.file_id)):
541
basis_ie = self.basis_inv[ie.file_id]
544
change = ie.describe_change(basis_ie, ie)
545
if change in (InventoryEntry.RENAMED,
546
InventoryEntry.MODIFIED_AND_RENAMED):
547
old_path = self.basis_inv.id2path(ie.file_id)
548
self.reporter.renamed(change, old_path, path)
550
self.reporter.snapshot_change(change, path)
552
if not self.specific_files:
555
# ignore removals that don't match filespec
556
for path, new_ie in self.basis_inv.iter_entries():
557
if new_ie.file_id in self.work_inv:
559
if is_inside_any(self.specific_files, path):
763
specific_files = self.specific_files
764
exclude = self.exclude
765
report_changes = self.reporter.is_verbose()
767
# A tree of paths that have been deleted. E.g. if foo/bar has been
768
# deleted, then we have {'foo':{'bar':{}}}
770
# XXX: Note that entries may have the wrong kind because the entry does
771
# not reflect the status on disk.
772
work_inv = self.work_tree.inventory
773
# NB: entries will include entries within the excluded ids/paths
774
# because iter_entries_by_dir has no 'exclude' facility today.
775
entries = work_inv.iter_entries_by_dir(
776
specific_file_ids=self.specific_file_ids, yield_parents=True)
777
for path, existing_ie in entries:
778
file_id = existing_ie.file_id
779
name = existing_ie.name
780
parent_id = existing_ie.parent_id
781
kind = existing_ie.kind
782
# Skip files that have been deleted from the working tree.
783
# The deleted path ids are also recorded so they can be explicitly
786
path_segments = splitpath(path)
787
deleted_dict = deleted_paths
788
for segment in path_segments:
789
deleted_dict = deleted_dict.get(segment, None)
791
# We either took a path not present in the dict
792
# (deleted_dict was None), or we've reached an empty
793
# child dir in the dict, so are now a sub-path.
797
if deleted_dict is not None:
798
# the path has a deleted parent, do not add it.
800
if exclude and is_inside_any(exclude, path):
801
# Skip excluded paths. Excluded paths are processed by
802
# _update_builder_with_changes.
804
content_summary = self.work_tree.path_content_summary(path)
805
# Note that when a filter of specific files is given, we must only
806
# skip/record deleted files matching that filter.
807
if not specific_files or is_inside_any(specific_files, path):
808
if content_summary[0] == 'missing':
809
if not deleted_paths:
810
# path won't have been split yet.
811
path_segments = splitpath(path)
812
deleted_dict = deleted_paths
813
for segment in path_segments:
814
deleted_dict = deleted_dict.setdefault(segment, {})
815
self.reporter.missing(path)
816
self._next_progress_entry()
817
deleted_ids.append(file_id)
819
# TODO: have the builder do the nested commit just-in-time IF and
821
if content_summary[0] == 'tree-reference':
822
# enforce repository nested tree policy.
823
if (not self.work_tree.supports_tree_reference() or
824
# repository does not support it either.
825
not self.branch.repository._format.supports_tree_reference):
826
content_summary = ('directory',) + content_summary[1:]
827
kind = content_summary[0]
828
# TODO: specific_files filtering before nested tree processing
829
if kind == 'tree-reference':
830
if self.recursive == 'down':
831
nested_revision_id = self._commit_nested_tree(
833
content_summary = content_summary[:3] + (
836
content_summary = content_summary[:3] + (
837
self.work_tree.get_reference_revision(file_id),)
839
# Record an entry for this item
840
# Note: I don't particularly want to have the existing_ie
841
# parameter but the test suite currently (28-Jun-07) breaks
842
# without it thanks to a unicode normalisation issue. :-(
843
definitely_changed = kind != existing_ie.kind
844
self._record_entry(path, file_id, specific_files, kind, name,
845
parent_id, definitely_changed, existing_ie, report_changes,
848
# Unversion IDs that were found to be deleted
849
self.deleted_ids = deleted_ids
851
def _commit_nested_tree(self, file_id, path):
852
"Commit a nested tree."
853
sub_tree = self.work_tree.get_nested_tree(file_id, path)
854
# FIXME: be more comprehensive here:
855
# this works when both trees are in --trees repository,
856
# but when both are bound to a different repository,
857
# it fails; a better way of approaching this is to
858
# finally implement the explicit-caches approach design
859
# a while back - RBC 20070306.
860
if sub_tree.branch.repository.has_same_location(
861
self.work_tree.branch.repository):
862
sub_tree.branch.repository = \
863
self.work_tree.branch.repository
865
return sub_tree.commit(message=None, revprops=self.revprops,
866
recursive=self.recursive,
867
message_callback=self.message_callback,
868
timestamp=self.timestamp, timezone=self.timezone,
869
committer=self.committer,
870
allow_pointless=self.allow_pointless,
871
strict=self.strict, verbose=self.verbose,
872
local=self.local, reporter=self.reporter)
873
except errors.PointlessCommit:
874
return self.work_tree.get_reference_revision(file_id)
876
def _record_entry(self, path, file_id, specific_files, kind, name,
877
parent_id, definitely_changed, existing_ie, report_changes,
879
"Record the new inventory entry for a path if any."
880
# mutter('check %s {%s}', path, file_id)
881
# mutter('%s selected for commit', path)
882
if definitely_changed or existing_ie is None:
883
ie = make_entry(kind, name, parent_id, file_id)
885
ie = existing_ie.copy()
562
886
ie.revision = None
563
self.builder.record_entry_contents(ie, self.parent_invs, path,
566
def _emit_progress_update(self):
567
"""Emit an update to the progress bar."""
568
self.pb.update("Committing", self.pb_count, self.pb_total)
571
def _report_deletes(self):
572
for path, ie in self.basis_inv.iter_entries():
573
if ie.file_id not in self.builder.new_inventory:
574
self.reporter.deleted(path)
887
# For carried over entries we don't care about the fs hash - the repo
888
# isn't generating a sha, so we're not saving computation time.
889
_, _, fs_hash = self.builder.record_entry_contents(
890
ie, self.parent_invs, path, self.work_tree, content_summary)
892
self._report_change(ie, path)
894
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
897
def _report_change(self, ie, path):
898
"""Report a change to the user.
900
The change that has occurred is described relative to the basis
903
if (self.basis_inv.has_id(ie.file_id)):
904
basis_ie = self.basis_inv[ie.file_id]
907
change = ie.describe_change(basis_ie, ie)
908
if change in (InventoryEntry.RENAMED,
909
InventoryEntry.MODIFIED_AND_RENAMED):
910
old_path = self.basis_inv.id2path(ie.file_id)
911
self.reporter.renamed(change, old_path, path)
912
self._next_progress_entry()
914
if change == 'unchanged':
916
self.reporter.snapshot_change(change, path)
917
self._next_progress_entry()
919
def _set_progress_stage(self, name, counter=False):
920
"""Set the progress stage and emit an update to the progress bar."""
921
self.pb_stage_name = name
922
self.pb_stage_count += 1
924
self.pb_entries_count = 0
926
self.pb_entries_count = None
927
self._emit_progress()
929
def _next_progress_entry(self):
930
"""Emit an update to the progress bar and increment the entry count."""
931
self.pb_entries_count += 1
932
self._emit_progress()
934
def _emit_progress(self):
935
if self.pb_entries_count is not None:
936
text = "%s [%d] - Stage" % (self.pb_stage_name,
937
self.pb_entries_count)
939
text = "%s - Stage" % (self.pb_stage_name, )
940
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
942
def _set_specific_file_ids(self):
943
"""populate self.specific_file_ids if we will use it."""
944
if not self.use_record_iter_changes:
945
# If provided, ensure the specified files are versioned
946
if self.specific_files is not None:
947
# Note: This routine is being called because it raises
948
# PathNotVersionedError as a side effect of finding the IDs. We
949
# later use the ids we found as input to the working tree
950
# inventory iterator, so we only consider those ids rather than
951
# examining the whole tree again.
952
# XXX: Dont we have filter_unversioned to do this more
954
self.specific_file_ids = tree.find_ids_across_trees(
955
self.specific_files, [self.basis_tree, self.work_tree])
957
self.specific_file_ids = None
added
removed
bzrlib/commit.py
