176
message_callback=None):
207
message_callback=None,
210
possible_master_transports=None):
177
211
"""Commit working copy as a new revision.
179
branch -- the deprecated branch to commit to. New callers should pass in
182
message -- the commit message (it or message_callback is required)
184
timestamp -- if not None, seconds-since-epoch for a
185
postdated/predated commit.
187
specific_files -- If true, commit only those files.
189
rev_id -- If set, use this as the new revision id.
213
:param message: the commit message (it or message_callback is required)
215
:param timestamp: if not None, seconds-since-epoch for a
216
postdated/predated commit.
218
:param specific_files: If true, commit only those files.
220
:param rev_id: If set, use this as the new revision id.
190
221
Useful for test or import commands that need to tightly
191
222
control what revisions are assigned. If you duplicate
192
223
a revision id that exists elsewhere it is your own fault.
193
224
If null (default), a time/random revision id is generated.
195
allow_pointless -- If true (default), commit even if nothing
226
:param allow_pointless: If true (default), commit even if nothing
196
227
has changed and no merges are recorded.
198
strict -- If true, don't allow a commit if the working tree
229
:param strict: If true, don't allow a commit if the working tree
199
230
contains unknown files.
201
revprops -- Properties for new revision
232
:param revprops: Properties for new revision
202
233
:param local: Perform a local only commit.
234
:param reporter: the reporter to use or None for the default
235
:param verbose: if True and the reporter is not None, report everything
236
:param recursive: If set to 'down', commit in any subtrees that have
237
pending changes of any sort during this commit.
238
:param exclude: None or a list of relative paths to exclude from the
239
commit. Pending changes to excluded files will be ignored by the
204
242
mutter('preparing to commit')
206
if deprecated_passed(branch):
207
symbol_versioning.warn("Commit.commit (branch, ...): The branch parameter is "
208
"deprecated as of bzr 0.8. Please use working_tree= instead.",
209
DeprecationWarning, stacklevel=2)
211
self.work_tree = self.branch.bzrdir.open_workingtree()
212
elif working_tree is None:
213
raise BzrError("One of branch and working_tree must be passed into commit().")
244
if working_tree is None:
245
raise BzrError("working_tree must be passed into commit().")
215
247
self.work_tree = working_tree
216
248
self.branch = self.work_tree.branch
249
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
250
if not self.branch.repository.supports_rich_root():
251
raise errors.RootNotRich()
217
252
if message_callback is None:
218
253
if message is not None:
219
254
if isinstance(message, str):
220
message = message.decode(bzrlib.user_encoding)
255
message = message.decode(get_user_encoding())
221
256
message_callback = lambda x: message
223
258
raise BzrError("The message or message_callback keyword"
224
259
" parameter is required for commit().")
226
261
self.bound_branch = None
262
self.any_entries_changed = False
263
self.any_entries_deleted = False
264
if exclude is not None:
265
self.exclude = sorted(
266
minimum_path_selection(exclude))
227
269
self.local = local
228
270
self.master_branch = None
229
271
self.master_locked = False
272
self.recursive = recursive
230
273
self.rev_id = None
231
self.specific_files = specific_files
274
if specific_files is not None:
275
self.specific_files = sorted(
276
minimum_path_selection(specific_files))
278
self.specific_files = None
279
self.specific_file_ids = None
232
280
self.allow_pointless = allow_pointless
234
if reporter is None and self.reporter is None:
235
self.reporter = NullCommitReporter()
236
elif reporter is not None:
237
self.reporter = reporter
281
self.revprops = revprops
282
self.message_callback = message_callback
283
self.timestamp = timestamp
284
self.timezone = timezone
285
self.committer = committer
287
self.verbose = verbose
239
289
self.work_tree.lock_write()
240
290
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
291
self.basis_revid = self.work_tree.last_revision()
241
292
self.basis_tree = self.work_tree.basis_tree()
242
293
self.basis_tree.lock_read()
244
295
# Cannot commit with conflicts present.
245
if len(self.work_tree.conflicts())>0:
296
if len(self.work_tree.conflicts()) > 0:
246
297
raise ConflictsInTree
248
# setup the bound branch variables as needed.
249
self._check_bound_branch()
251
# check for out of date working trees
253
first_tree_parent = self.work_tree.get_parent_ids()[0]
255
# if there are no parents, treat our parent as 'None'
256
# this is so that we still consier the master branch
257
# - in a checkout scenario the tree may have no
258
# parents but the branch may do.
259
first_tree_parent = bzrlib.revision.NULL_REVISION
260
old_revno, master_last = self.master_branch.last_revision_info()
261
if master_last != first_tree_parent:
262
if master_last != bzrlib.revision.NULL_REVISION:
263
raise errors.OutOfDateTree(self.work_tree)
264
if self.branch.repository.has_revision(first_tree_parent):
265
new_revno = old_revno + 1
267
# ghost parents never appear in revision history.
270
# raise an exception as soon as we find a single unknown.
271
for unknown in self.work_tree.unknowns():
272
raise StrictCommitFailed()
299
# Setup the bound branch variables as needed.
300
self._check_bound_branch(possible_master_transports)
302
# Check that the working tree is up to date
303
old_revno, new_revno = self._check_out_of_date_tree()
305
# Complete configuration setup
306
if reporter is not None:
307
self.reporter = reporter
308
elif self.reporter is None:
309
self.reporter = self._select_reporter()
274
310
if self.config is None:
275
311
self.config = self.branch.get_config()
277
self.work_inv = self.work_tree.inventory
313
# If provided, ensure the specified files are versioned
314
if self.specific_files is not None:
315
# Note: This routine is being called because it raises
316
# PathNotVersionedError as a side effect of finding the IDs. We
317
# later use the ids we found as input to the working tree
318
# inventory iterator, so we only consider those ids rather than
319
# examining the whole tree again.
320
# XXX: Dont we have filter_unversioned to do this more
322
self.specific_file_ids = tree.find_ids_across_trees(
323
specific_files, [self.basis_tree, self.work_tree])
325
# Setup the progress bar. As the number of files that need to be
326
# committed in unknown, progress is reported as stages.
327
# We keep track of entries separately though and include that
328
# information in the progress bar during the relevant stages.
329
self.pb_stage_name = ""
330
self.pb_stage_count = 0
331
self.pb_stage_total = 5
332
if self.bound_branch:
333
self.pb_stage_total += 1
334
self.pb.show_pct = False
335
self.pb.show_spinner = False
336
self.pb.show_eta = False
337
self.pb.show_count = True
338
self.pb.show_bar = True
278
340
self.basis_inv = self.basis_tree.inventory
279
if specific_files is not None:
280
# Ensure specified files are versioned
281
# (We don't actually need the ids here)
282
tree.find_ids_across_trees(specific_files,
283
[self.basis_tree, self.work_tree])
284
# one to finish, one for rev and inventory, and one for each
285
# inventory entry, and the same for the new inventory.
286
# note that this estimate is too long when we do a partial tree
287
# commit which excludes some new files from being considered.
288
# The estimate is corrected when we populate the new inv.
289
self.pb_total = len(self.work_inv) + 5
292
341
self._gather_parents()
342
# After a merge, a selected file commit is not supported.
343
# See 'bzr help merge' for an explanation as to why.
293
344
if len(self.parents) > 1 and self.specific_files:
294
raise NotImplementedError('selected-file commit of merges is not supported yet: files %r',
297
self.builder = self.branch.get_commit_builder(self.parents,
345
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
346
# Excludes are a form of selected file commit.
347
if len(self.parents) > 1 and self.exclude:
348
raise errors.CannotCommitSelectedFileMerge(self.exclude)
350
# Collect the changes
351
self._set_progress_stage("Collecting changes",
352
entries_title="Directory")
353
self.builder = self.branch.get_commit_builder(self.parents,
298
354
self.config, timestamp, timezone, committer, revprops, rev_id)
300
self._remove_deleted()
301
self._populate_new_inv()
302
self._report_deletes()
304
self._check_pointless()
306
self._emit_progress_update()
307
# TODO: Now the new inventory is known, check for conflicts and
308
# prompt the user for a commit message.
309
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
310
# weave lines, because nothing should be recorded until it is known
311
# that commit will succeed.
312
self.builder.finish_inventory()
313
self._emit_progress_update()
314
message = message_callback(self)
315
assert isinstance(message, unicode), type(message)
316
self.message = message
317
self._escape_commit_message()
319
self.rev_id = self.builder.commit(self.message)
320
self._emit_progress_update()
321
# revision data is in the local branch now.
323
# upload revision data to the master.
357
self.builder.will_record_deletes()
358
# find the location being committed to
359
if self.bound_branch:
360
master_location = self.master_branch.base
362
master_location = self.branch.base
364
# report the start of the commit
365
self.reporter.started(new_revno, self.rev_id, master_location)
367
self._update_builder_with_changes()
368
self._report_and_accumulate_deletes()
369
self._check_pointless()
371
# TODO: Now the new inventory is known, check for conflicts.
372
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
373
# weave lines, because nothing should be recorded until it is known
374
# that commit will succeed.
375
self._set_progress_stage("Saving data locally")
376
self.builder.finish_inventory()
378
# Prompt the user for a commit message if none provided
379
message = message_callback(self)
380
self.message = message
381
self._escape_commit_message()
383
# Add revision data to the local branch
384
self.rev_id = self.builder.commit(self.message)
387
mutter("aborting commit write group because of exception:")
388
trace.log_exception_quietly()
389
note("aborting commit write group: %r" % (e,))
393
self._process_pre_hooks(old_revno, new_revno)
395
# Upload revision data to the master.
324
396
# this will propagate merged revisions too if needed.
325
397
if self.bound_branch:
326
self.master_branch.repository.fetch(self.branch.repository,
327
revision_id=self.rev_id)
398
if not self.master_branch.repository.has_same_location(
399
self.branch.repository):
400
self._set_progress_stage("Uploading data to master branch")
401
self.master_branch.repository.fetch(self.branch.repository,
402
revision_id=self.rev_id)
328
403
# now the master has the revision data
329
# 'commit' to the master first so a timeout here causes the local
330
# branch to be out of date
404
# 'commit' to the master first so a timeout here causes the
405
# local branch to be out of date
331
406
self.master_branch.set_last_revision_info(new_revno,
334
409
# and now do the commit locally.
335
410
self.branch.set_last_revision_info(new_revno, self.rev_id)
337
rev_tree = self.builder.revision_tree()
338
self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
339
# now the work tree is up to date with the branch
412
# Make the working tree up to date with the branch
413
self._set_progress_stage("Updating the working tree")
414
self.work_tree.update_basis_by_delta(self.rev_id,
415
self.builder.get_basis_delta())
341
416
self.reporter.completed(new_revno, self.rev_id)
342
# old style commit hooks - should be deprecated ? (obsoleted in
344
if self.config.post_commit() is not None:
345
hooks = self.config.post_commit().split(' ')
346
# this would be nicer with twisted.python.reflect.namedAny
348
result = eval(hook + '(branch, rev_id)',
349
{'branch':self.branch,
351
'rev_id':self.rev_id})
352
# new style commit hooks:
353
if not self.bound_branch:
354
hook_master = self.branch
357
hook_master = self.master_branch
358
hook_local = self.branch
359
# With bound branches, when the master is behind the local branch,
360
# the 'old_revno' and old_revid values here are incorrect.
361
# XXX: FIXME ^. RBC 20060206
363
old_revid = self.parents[0]
365
old_revid = bzrlib.revision.NULL_REVISION
366
for hook in Branch.hooks['post_commit']:
367
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
369
self._emit_progress_update()
417
self._process_post_hooks(old_revno, new_revno)
372
420
return self.rev_id
374
def _any_real_changes(self):
375
"""Are there real changes between new_inventory and basis?
377
For trees without rich roots, inv.root.revision changes every commit.
378
But if that is the only change, we want to treat it as though there
381
new_entries = self.builder.new_inventory.iter_entries()
382
basis_entries = self.basis_inv.iter_entries()
383
new_path, new_root_ie = new_entries.next()
384
basis_path, basis_root_ie = basis_entries.next()
386
# This is a copy of InventoryEntry.__eq__ only leaving out .revision
387
def ie_equal_no_revision(this, other):
388
return ((this.file_id == other.file_id)
389
and (this.name == other.name)
390
and (this.symlink_target == other.symlink_target)
391
and (this.text_sha1 == other.text_sha1)
392
and (this.text_size == other.text_size)
393
and (this.text_id == other.text_id)
394
and (this.parent_id == other.parent_id)
395
and (this.kind == other.kind)
396
and (this.executable == other.executable)
398
if not ie_equal_no_revision(new_root_ie, basis_root_ie):
401
for new_ie, basis_ie in zip(new_entries, basis_entries):
402
if new_ie != basis_ie:
405
# No actual changes present
422
def _select_reporter(self):
423
"""Select the CommitReporter to use."""
425
return NullCommitReporter()
426
return ReportCommitToLog()
408
428
def _check_pointless(self):
409
429
if self.allow_pointless:
467
490
self.master_branch.lock_write()
468
491
self.master_locked = True
493
def _check_out_of_date_tree(self):
494
"""Check that the working tree is up to date.
496
:return: old_revision_number,new_revision_number tuple
499
first_tree_parent = self.work_tree.get_parent_ids()[0]
501
# if there are no parents, treat our parent as 'None'
502
# this is so that we still consider the master branch
503
# - in a checkout scenario the tree may have no
504
# parents but the branch may do.
505
first_tree_parent = bzrlib.revision.NULL_REVISION
506
old_revno, master_last = self.master_branch.last_revision_info()
507
if master_last != first_tree_parent:
508
if master_last != bzrlib.revision.NULL_REVISION:
509
raise errors.OutOfDateTree(self.work_tree)
510
if self.branch.repository.has_revision(first_tree_parent):
511
new_revno = old_revno + 1
513
# ghost parents never appear in revision history.
515
return old_revno,new_revno
517
def _process_pre_hooks(self, old_revno, new_revno):
518
"""Process any registered pre commit hooks."""
519
self._set_progress_stage("Running pre_commit hooks")
520
self._process_hooks("pre_commit", old_revno, new_revno)
522
def _process_post_hooks(self, old_revno, new_revno):
523
"""Process any registered post commit hooks."""
524
# Process the post commit hooks, if any
525
self._set_progress_stage("Running post_commit hooks")
526
# old style commit hooks - should be deprecated ? (obsoleted in
528
if self.config.post_commit() is not None:
529
hooks = self.config.post_commit().split(' ')
530
# this would be nicer with twisted.python.reflect.namedAny
532
result = eval(hook + '(branch, rev_id)',
533
{'branch':self.branch,
535
'rev_id':self.rev_id})
536
# process new style post commit hooks
537
self._process_hooks("post_commit", old_revno, new_revno)
539
def _process_hooks(self, hook_name, old_revno, new_revno):
540
if not Branch.hooks[hook_name]:
543
# new style commit hooks:
544
if not self.bound_branch:
545
hook_master = self.branch
548
hook_master = self.master_branch
549
hook_local = self.branch
550
# With bound branches, when the master is behind the local branch,
551
# the 'old_revno' and old_revid values here are incorrect.
552
# XXX: FIXME ^. RBC 20060206
554
old_revid = self.parents[0]
556
old_revid = bzrlib.revision.NULL_REVISION
558
if hook_name == "pre_commit":
559
future_tree = self.builder.revision_tree()
560
tree_delta = future_tree.changes_from(self.basis_tree,
563
for hook in Branch.hooks[hook_name]:
564
# show the running hook in the progress bar. As hooks may
565
# end up doing nothing (e.g. because they are not configured by
566
# the user) this is still showing progress, not showing overall
567
# actions - its up to each plugin to show a UI if it want's to
568
# (such as 'Emailing diff to foo@example.com').
569
self.pb_stage_name = "Running %s hooks [%s]" % \
570
(hook_name, Branch.hooks.get_hook_name(hook))
571
self._emit_progress()
572
if 'hooks' in debug.debug_flags:
573
mutter("Invoking commit hook: %r", hook)
574
if hook_name == "post_commit":
575
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
577
elif hook_name == "pre_commit":
578
hook(hook_local, hook_master,
579
old_revno, old_revid, new_revno, self.rev_id,
580
tree_delta, future_tree)
470
582
def _cleanup(self):
471
583
"""Cleanup any open locks, progress bars etc."""
472
584
cleanups = [self._cleanup_bound_branch,
536
648
mutter('commit parent ghost revision {%s}', revision)
538
def _remove_deleted(self):
539
"""Remove deleted files from the working inventories.
541
This is done prior to taking the working inventory as the
542
basis for the new committed inventory.
544
This returns true if any files
545
*that existed in the basis inventory* were deleted.
546
Files that were added and deleted
547
in the working copy don't matter.
549
specific = self.specific_files
551
deleted_paths = set()
552
for path, ie in self.work_inv.iter_entries():
553
if is_inside_any(deleted_paths, path):
554
# The tree will delete the required ids recursively.
556
if specific and not is_inside_any(specific, path):
558
if not self.work_tree.has_filename(path):
559
deleted_paths.add(path)
560
self.reporter.missing(path)
561
deleted_ids.append(ie.file_id)
562
self.work_tree.unversion(deleted_ids)
564
def _populate_new_inv(self):
565
"""Build revision inventory.
567
This creates a new empty inventory. Depending on
568
which files are selected for commit, and what is present in the
569
current tree, the new inventory is populated. inventory entries
570
which are candidates for modification have their revision set to
571
None; inventory entries that are carried over untouched have their
572
revision set to their prior value.
650
def _update_builder_with_changes(self):
651
"""Update the commit builder with the data about what has changed.
653
# Build the revision inventory.
655
# This starts by creating a new empty inventory. Depending on
656
# which files are selected for commit, and what is present in the
657
# current tree, the new inventory is populated. inventory entries
658
# which are candidates for modification have their revision set to
659
# None; inventory entries that are carried over untouched have their
660
# revision set to their prior value.
574
662
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
575
663
# results to create a new inventory at the same time, which results
576
664
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
577
665
# ADHB 11-07-2006
578
mutter("Selecting files for commit with filter %s", self.specific_files)
579
assert self.work_inv.root is not None
580
entries = self.work_inv.iter_entries()
581
if not self.builder.record_root_entry:
582
symbol_versioning.warn('CommitBuilders should support recording'
583
' the root entry as of bzr 0.10.', DeprecationWarning,
585
self.builder.new_inventory.add(self.basis_inv.root.copy())
587
self._emit_progress_update()
588
for path, new_ie in entries:
589
self._emit_progress_update()
590
file_id = new_ie.file_id
592
kind = self.work_tree.kind(file_id)
593
if kind != new_ie.kind:
594
new_ie = inventory.make_entry(kind, new_ie.name,
595
new_ie.parent_id, file_id)
596
except errors.NoSuchFile:
598
# mutter('check %s {%s}', path, file_id)
599
if (not self.specific_files or
600
is_inside_or_parent_of_any(self.specific_files, path)):
601
# mutter('%s selected for commit', path)
667
exclude = self.exclude
668
specific_files = self.specific_files or []
669
mutter("Selecting files for commit with filter %s", specific_files)
671
# Build the new inventory
672
self._populate_from_inventory()
674
# If specific files are selected, then all un-selected files must be
675
# recorded in their previous state. For more details, see
676
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
677
if specific_files or exclude:
678
for path, old_ie in self.basis_inv.iter_entries():
679
if old_ie.file_id in self.builder.new_inventory:
680
# already added - skip.
682
if (is_inside_any(specific_files, path)
683
and not is_inside_any(exclude, path)):
684
# was inside the selected path, and not excluded - if not
685
# present it has been deleted so skip.
687
# From here down it was either not selected, or was excluded:
688
if old_ie.kind == 'directory':
689
self._next_progress_entry()
690
# We preserve the entry unaltered.
692
# Note: specific file commits after a merge are currently
693
# prohibited. This test is for sanity/safety in case it's
694
# required after that changes.
695
if len(self.parents) > 1:
603
696
ie.revision = None
605
# mutter('%s not selected for commit', path)
606
if self.basis_inv.has_id(file_id):
607
ie = self.basis_inv[file_id].copy()
609
# this entry is new and not being committed
611
self.builder.record_entry_contents(ie, self.parent_invs,
612
path, self.work_tree)
613
# describe the nature of the change that has occurred relative to
614
# the basis inventory.
615
if (self.basis_inv.has_id(ie.file_id)):
616
basis_ie = self.basis_inv[ie.file_id]
619
change = ie.describe_change(basis_ie, ie)
620
if change in (InventoryEntry.RENAMED,
621
InventoryEntry.MODIFIED_AND_RENAMED):
622
old_path = self.basis_inv.id2path(ie.file_id)
623
self.reporter.renamed(change, old_path, path)
625
self.reporter.snapshot_change(change, path)
627
if not self.specific_files:
630
# ignore removals that don't match filespec
631
for path, new_ie in self.basis_inv.iter_entries():
632
if new_ie.file_id in self.work_inv:
634
if is_inside_any(self.specific_files, path):
697
_, version_recorded, _ = self.builder.record_entry_contents(
698
ie, self.parent_invs, path, self.basis_tree, None)
700
self.any_entries_changed = True
702
def _report_and_accumulate_deletes(self):
703
# XXX: Could the list of deleted paths and ids be instead taken from
704
# _populate_from_inventory?
705
if (isinstance(self.basis_inv, Inventory)
706
and isinstance(self.builder.new_inventory, Inventory)):
707
# the older Inventory classes provide a _byid dict, and building a
708
# set from the keys of this dict is substantially faster than even
709
# getting a set of ids from the inventory
711
# <lifeless> set(dict) is roughly the same speed as
712
# set(iter(dict)) and both are significantly slower than
714
deleted_ids = set(self.basis_inv._byid.keys()) - \
715
set(self.builder.new_inventory._byid.keys())
717
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
719
self.any_entries_deleted = True
720
deleted = [(self.basis_tree.id2path(file_id), file_id)
721
for file_id in deleted_ids]
723
# XXX: this is not quite directory-order sorting
724
for path, file_id in deleted:
725
self.builder.record_delete(path, file_id)
726
self.reporter.deleted(path)
728
def _populate_from_inventory(self):
729
"""Populate the CommitBuilder by walking the working tree inventory."""
731
# raise an exception as soon as we find a single unknown.
732
for unknown in self.work_tree.unknowns():
733
raise StrictCommitFailed()
735
specific_files = self.specific_files
736
exclude = self.exclude
737
report_changes = self.reporter.is_verbose()
739
# A tree of paths that have been deleted. E.g. if foo/bar has been
740
# deleted, then we have {'foo':{'bar':{}}}
742
# XXX: Note that entries may have the wrong kind because the entry does
743
# not reflect the status on disk.
744
work_inv = self.work_tree.inventory
745
# NB: entries will include entries within the excluded ids/paths
746
# because iter_entries_by_dir has no 'exclude' facility today.
747
entries = work_inv.iter_entries_by_dir(
748
specific_file_ids=self.specific_file_ids, yield_parents=True)
749
for path, existing_ie in entries:
750
file_id = existing_ie.file_id
751
name = existing_ie.name
752
parent_id = existing_ie.parent_id
753
kind = existing_ie.kind
754
if kind == 'directory':
755
self._next_progress_entry()
756
# Skip files that have been deleted from the working tree.
757
# The deleted path ids are also recorded so they can be explicitly
760
path_segments = splitpath(path)
761
deleted_dict = deleted_paths
762
for segment in path_segments:
763
deleted_dict = deleted_dict.get(segment, None)
765
# We either took a path not present in the dict
766
# (deleted_dict was None), or we've reached an empty
767
# child dir in the dict, so are now a sub-path.
771
if deleted_dict is not None:
772
# the path has a deleted parent, do not add it.
774
if exclude and is_inside_any(exclude, path):
775
# Skip excluded paths. Excluded paths are processed by
776
# _update_builder_with_changes.
778
content_summary = self.work_tree.path_content_summary(path)
779
# Note that when a filter of specific files is given, we must only
780
# skip/record deleted files matching that filter.
781
if not specific_files or is_inside_any(specific_files, path):
782
if content_summary[0] == 'missing':
783
if not deleted_paths:
784
# path won't have been split yet.
785
path_segments = splitpath(path)
786
deleted_dict = deleted_paths
787
for segment in path_segments:
788
deleted_dict = deleted_dict.setdefault(segment, {})
789
self.reporter.missing(path)
790
deleted_ids.append(file_id)
792
# TODO: have the builder do the nested commit just-in-time IF and
794
if content_summary[0] == 'tree-reference':
795
# enforce repository nested tree policy.
796
if (not self.work_tree.supports_tree_reference() or
797
# repository does not support it either.
798
not self.branch.repository._format.supports_tree_reference):
799
content_summary = ('directory',) + content_summary[1:]
800
kind = content_summary[0]
801
# TODO: specific_files filtering before nested tree processing
802
if kind == 'tree-reference':
803
if self.recursive == 'down':
804
nested_revision_id = self._commit_nested_tree(
806
content_summary = content_summary[:3] + (
809
content_summary = content_summary[:3] + (
810
self.work_tree.get_reference_revision(file_id),)
812
# Record an entry for this item
813
# Note: I don't particularly want to have the existing_ie
814
# parameter but the test suite currently (28-Jun-07) breaks
815
# without it thanks to a unicode normalisation issue. :-(
816
definitely_changed = kind != existing_ie.kind
817
self._record_entry(path, file_id, specific_files, kind, name,
818
parent_id, definitely_changed, existing_ie, report_changes,
821
# Unversion IDs that were found to be deleted
822
self.work_tree.unversion(deleted_ids)
824
def _commit_nested_tree(self, file_id, path):
825
"Commit a nested tree."
826
sub_tree = self.work_tree.get_nested_tree(file_id, path)
827
# FIXME: be more comprehensive here:
828
# this works when both trees are in --trees repository,
829
# but when both are bound to a different repository,
830
# it fails; a better way of approaching this is to
831
# finally implement the explicit-caches approach design
832
# a while back - RBC 20070306.
833
if sub_tree.branch.repository.has_same_location(
834
self.work_tree.branch.repository):
835
sub_tree.branch.repository = \
836
self.work_tree.branch.repository
838
return sub_tree.commit(message=None, revprops=self.revprops,
839
recursive=self.recursive,
840
message_callback=self.message_callback,
841
timestamp=self.timestamp, timezone=self.timezone,
842
committer=self.committer,
843
allow_pointless=self.allow_pointless,
844
strict=self.strict, verbose=self.verbose,
845
local=self.local, reporter=self.reporter)
846
except errors.PointlessCommit:
847
return self.work_tree.get_reference_revision(file_id)
849
def _record_entry(self, path, file_id, specific_files, kind, name,
850
parent_id, definitely_changed, existing_ie, report_changes,
852
"Record the new inventory entry for a path if any."
853
# mutter('check %s {%s}', path, file_id)
854
# mutter('%s selected for commit', path)
855
if definitely_changed or existing_ie is None:
856
ie = make_entry(kind, name, parent_id, file_id)
858
ie = existing_ie.copy()
637
859
ie.revision = None
638
self.builder.record_entry_contents(ie, self.parent_invs, path,
641
def _emit_progress_update(self):
642
"""Emit an update to the progress bar."""
643
self.pb.update("Committing", self.pb_count, self.pb_total)
646
def _report_deletes(self):
647
for path, ie in self.basis_inv.iter_entries():
648
if ie.file_id not in self.builder.new_inventory:
649
self.reporter.deleted(path)
860
# For carried over entries we don't care about the fs hash - the repo
861
# isn't generating a sha, so we're not saving computation time.
862
_, version_recorded, fs_hash = self.builder.record_entry_contents(
863
ie, self.parent_invs, path, self.work_tree, content_summary)
865
self.any_entries_changed = True
867
self._report_change(ie, path)
869
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
872
def _report_change(self, ie, path):
873
"""Report a change to the user.
875
The change that has occurred is described relative to the basis
878
if (self.basis_inv.has_id(ie.file_id)):
879
basis_ie = self.basis_inv[ie.file_id]
882
change = ie.describe_change(basis_ie, ie)
883
if change in (InventoryEntry.RENAMED,
884
InventoryEntry.MODIFIED_AND_RENAMED):
885
old_path = self.basis_inv.id2path(ie.file_id)
886
self.reporter.renamed(change, old_path, path)
888
self.reporter.snapshot_change(change, path)
890
def _set_progress_stage(self, name, entries_title=None):
891
"""Set the progress stage and emit an update to the progress bar."""
892
self.pb_stage_name = name
893
self.pb_stage_count += 1
894
self.pb_entries_title = entries_title
895
if entries_title is not None:
896
self.pb_entries_count = 0
897
self.pb_entries_total = '?'
898
self._emit_progress()
900
def _next_progress_entry(self):
901
"""Emit an update to the progress bar and increment the entry count."""
902
self.pb_entries_count += 1
903
self._emit_progress()
905
def _emit_progress(self):
906
if self.pb_entries_title:
907
if self.pb_entries_total == '?':
908
text = "%s [%s %d] - Stage" % (self.pb_stage_name,
909
self.pb_entries_title, self.pb_entries_count)
911
text = "%s [%s %d/%s] - Stage" % (self.pb_stage_name,
912
self.pb_entries_title, self.pb_entries_count,
913
str(self.pb_entries_total))
915
text = "%s - Stage" % (self.pb_stage_name)
916
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
added
removed
bzrlib/commit.py
