179
202
working_tree=None,
206
message_callback=None,
183
209
"""Commit working copy as a new revision.
185
branch -- the deprecated branch to commit to. New callers should pass in
188
message -- the commit message, a mandatory parameter
190
timestamp -- if not None, seconds-since-epoch for a
191
postdated/predated commit.
193
specific_files -- If true, commit only those files.
195
rev_id -- If set, use this as the new revision id.
211
:param message: the commit message (it or message_callback is required)
213
:param timestamp: if not None, seconds-since-epoch for a
214
postdated/predated commit.
216
:param specific_files: If true, commit only those files.
218
:param rev_id: If set, use this as the new revision id.
196
219
Useful for test or import commands that need to tightly
197
220
control what revisions are assigned. If you duplicate
198
221
a revision id that exists elsewhere it is your own fault.
199
222
If null (default), a time/random revision id is generated.
201
allow_pointless -- If true (default), commit even if nothing
224
:param allow_pointless: If true (default), commit even if nothing
202
225
has changed and no merges are recorded.
204
strict -- If true, don't allow a commit if the working tree
227
:param strict: If true, don't allow a commit if the working tree
205
228
contains unknown files.
207
revprops -- Properties for new revision
230
:param revprops: Properties for new revision
208
231
:param local: Perform a local only commit.
232
:param reporter: the reporter to use or None for the default
233
:param verbose: if True and the reporter is not None, report everything
234
:param recursive: If set to 'down', commit in any subtrees that have
235
pending changes of any sort during this commit.
236
:param exclude: None or a list of relative paths to exclude from the
237
commit. Pending changes to excluded files will be ignored by the
210
240
mutter('preparing to commit')
212
if deprecated_passed(branch):
213
symbol_versioning.warn("Commit.commit (branch, ...): The branch parameter is "
214
"deprecated as of bzr 0.8. Please use working_tree= instead.",
215
DeprecationWarning, stacklevel=2)
217
self.work_tree = self.branch.bzrdir.open_workingtree()
218
elif working_tree is None:
219
raise BzrError("One of branch and working_tree must be passed into commit().")
242
if working_tree is None:
243
raise BzrError("working_tree must be passed into commit().")
221
245
self.work_tree = working_tree
222
246
self.branch = self.work_tree.branch
224
raise BzrError("The message keyword parameter is required for commit().")
247
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
248
if not self.branch.repository.supports_rich_root():
249
raise errors.RootNotRich()
250
if message_callback is None:
251
if message is not None:
252
if isinstance(message, str):
253
message = message.decode(bzrlib.user_encoding)
254
message_callback = lambda x: message
256
raise BzrError("The message or message_callback keyword"
257
" parameter is required for commit().")
226
259
self.bound_branch = None
260
self.any_entries_changed = False
261
self.any_entries_deleted = False
262
if exclude is not None:
263
self.exclude = sorted(
264
minimum_path_selection(exclude))
227
267
self.local = local
228
268
self.master_branch = None
229
269
self.master_locked = False
270
self.recursive = recursive
230
271
self.rev_id = None
231
self.specific_files = specific_files
272
if specific_files is not None:
273
self.specific_files = sorted(
274
minimum_path_selection(specific_files))
276
self.specific_files = None
277
self.specific_file_ids = None
232
278
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
279
self.revprops = revprops
280
self.message_callback = message_callback
281
self.timestamp = timestamp
282
self.timezone = timezone
283
self.committer = committer
285
self.verbose = verbose
286
# accumulates an inventory delta to the basis entry, so we can make
287
# just the necessary updates to the workingtree's cached basis.
288
self._basis_delta = []
239
290
self.work_tree.lock_write()
240
291
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
292
self.basis_revid = self.work_tree.last_revision()
293
self.basis_tree = self.work_tree.basis_tree()
294
self.basis_tree.lock_read()
242
296
# Cannot commit with conflicts present.
243
if len(self.work_tree.conflicts())>0:
297
if len(self.work_tree.conflicts()) > 0:
244
298
raise ConflictsInTree
246
# setup the bound branch variables as needed.
300
# Setup the bound branch variables as needed.
247
301
self._check_bound_branch()
249
# check for out of date working trees
251
first_tree_parent = self.work_tree.get_parent_ids()[0]
253
# if there are no parents, treat our parent as 'None'
254
# this is so that we still consier the master branch
255
# - in a checkout scenario the tree may have no
256
# parents but the branch may do.
257
first_tree_parent = None
258
master_last = self.master_branch.last_revision()
259
if (master_last is not None and
260
master_last != first_tree_parent):
261
raise errors.OutOfDateTree(self.work_tree)
264
# raise an exception as soon as we find a single unknown.
265
for unknown in self.work_tree.unknowns():
266
raise StrictCommitFailed()
303
# Check that the working tree is up to date
304
old_revno, new_revno = self._check_out_of_date_tree()
306
# Complete configuration setup
307
if reporter is not None:
308
self.reporter = reporter
309
elif self.reporter is None:
310
self.reporter = self._select_reporter()
268
311
if self.config is None:
269
312
self.config = self.branch.get_config()
271
if isinstance(message, str):
272
message = message.decode(bzrlib.user_encoding)
273
assert isinstance(message, unicode), type(message)
274
self.message = message
275
self._escape_commit_message()
277
self.work_inv = self.work_tree.inventory
278
self.basis_tree = self.work_tree.basis_tree()
314
# If provided, ensure the specified files are versioned
315
if self.specific_files is not None:
316
# Note: This routine is being called because it raises
317
# PathNotVersionedError as a side effect of finding the IDs. We
318
# later use the ids we found as input to the working tree
319
# inventory iterator, so we only consider those ids rather than
320
# examining the whole tree again.
321
# XXX: Dont we have filter_unversioned to do this more
323
self.specific_file_ids = tree.find_ids_across_trees(
324
specific_files, [self.basis_tree, self.work_tree])
326
# Setup the progress bar. As the number of files that need to be
327
# committed in unknown, progress is reported as stages.
328
# We keep track of entries separately though and include that
329
# information in the progress bar during the relevant stages.
330
self.pb_stage_name = ""
331
self.pb_stage_count = 0
332
self.pb_stage_total = 5
333
if self.bound_branch:
334
self.pb_stage_total += 1
335
self.pb.show_pct = False
336
self.pb.show_spinner = False
337
self.pb.show_eta = False
338
self.pb.show_count = True
339
self.pb.show_bar = True
279
341
self.basis_inv = self.basis_tree.inventory
280
# one to finish, one for rev and inventory, and one for each
281
# inventory entry, and the same for the new inventory.
282
# note that this estimate is too long when we do a partial tree
283
# commit which excludes some new files from being considered.
284
# The estimate is corrected when we populate the new inv.
285
self.pb_total = len(self.work_inv) + 5
288
342
self._gather_parents()
343
# After a merge, a selected file commit is not supported.
344
# See 'bzr help merge' for an explanation as to why.
289
345
if len(self.parents) > 1 and self.specific_files:
290
raise NotImplementedError('selected-file commit of merges is not supported yet: files %r',
293
self.builder = self.branch.get_commit_builder(self.parents,
346
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
347
# Excludes are a form of selected file commit.
348
if len(self.parents) > 1 and self.exclude:
349
raise errors.CannotCommitSelectedFileMerge(self.exclude)
351
# Collect the changes
352
self._set_progress_stage("Collecting changes",
353
entries_title="Directory")
354
self.builder = self.branch.get_commit_builder(self.parents,
294
355
self.config, timestamp, timezone, committer, revprops, rev_id)
296
self._remove_deleted()
297
self._populate_new_inv()
298
self._report_deletes()
300
self._check_pointless()
302
self._emit_progress_update()
303
# TODO: Now the new inventory is known, check for conflicts and
304
# prompt the user for a commit message.
305
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
306
# weave lines, because nothing should be recorded until it is known
307
# that commit will succeed.
308
self.builder.finish_inventory()
309
self._emit_progress_update()
310
self.rev_id = self.builder.commit(self.message)
311
self._emit_progress_update()
312
# revision data is in the local branch now.
314
# upload revision data to the master.
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)
390
self._process_pre_hooks(old_revno, new_revno)
392
# Upload revision data to the master.
315
393
# this will propagate merged revisions too if needed.
316
394
if self.bound_branch:
317
self.master_branch.repository.fetch(self.branch.repository,
318
revision_id=self.rev_id)
395
if not self.master_branch.repository.has_same_location(
396
self.branch.repository):
397
self._set_progress_stage("Uploading data to master branch")
398
self.master_branch.repository.fetch(self.branch.repository,
399
revision_id=self.rev_id)
319
400
# now the master has the revision data
320
# 'commit' to the master first so a timeout here causes the local
321
# branch to be out of date
322
self.master_branch.append_revision(self.rev_id)
401
# 'commit' to the master first so a timeout here causes the
402
# local branch to be out of date
403
self.master_branch.set_last_revision_info(new_revno,
324
406
# and now do the commit locally.
325
self.branch.append_revision(self.rev_id)
407
self.branch.set_last_revision_info(new_revno, self.rev_id)
327
# if the builder gave us the revisiontree it created back, we
328
# could use it straight away here.
329
# TODO: implement this.
330
self.work_tree.set_parent_trees([(self.rev_id,
331
self.branch.repository.revision_tree(self.rev_id))])
332
# now the work tree is up to date with the branch
334
self.reporter.completed(self.branch.revno(), self.rev_id)
335
if self.config.post_commit() is not None:
336
hooks = self.config.post_commit().split(' ')
337
# this would be nicer with twisted.python.reflect.namedAny
339
result = eval(hook + '(branch, rev_id)',
340
{'branch':self.branch,
342
'rev_id':self.rev_id})
343
self._emit_progress_update()
409
# Make the working tree up to date with the branch
410
self._set_progress_stage("Updating the working tree")
411
self.work_tree.update_basis_by_delta(self.rev_id,
413
self.reporter.completed(new_revno, self.rev_id)
414
self._process_post_hooks(old_revno, new_revno)
346
417
return self.rev_id
419
def _select_reporter(self):
420
"""Select the CommitReporter to use."""
422
return NullCommitReporter()
423
return ReportCommitToLog()
348
425
def _check_pointless(self):
349
426
if self.allow_pointless:
351
428
# A merge with no effect on files
352
429
if len(self.parents) > 1:
354
# work around the fact that a newly-initted tree does differ from its
356
if len(self.builder.new_inventory) != len(self.basis_inv):
358
if (len(self.builder.new_inventory) != 1 and
359
self.builder.new_inventory != self.basis_inv):
431
# TODO: we could simplify this by using self._basis_delta.
433
# The initial commit adds a root directory, but this in itself is not
434
# a worthwhile commit.
435
if (self.basis_revid == revision.NULL_REVISION and
436
len(self.builder.new_inventory) == 1):
437
raise PointlessCommit()
438
# If length == 1, then we only have the root entry. Which means
439
# that there is no real difference (only the root could be different)
440
# unless deletes occured, in which case the length is irrelevant.
441
if (self.any_entries_deleted or
442
(len(self.builder.new_inventory) != 1 and
443
self.any_entries_changed)):
361
445
raise PointlessCommit()
402
486
self.master_branch.lock_write()
403
487
self.master_locked = True
489
def _check_out_of_date_tree(self):
490
"""Check that the working tree is up to date.
492
:return: old_revision_number,new_revision_number tuple
495
first_tree_parent = self.work_tree.get_parent_ids()[0]
497
# if there are no parents, treat our parent as 'None'
498
# this is so that we still consider the master branch
499
# - in a checkout scenario the tree may have no
500
# parents but the branch may do.
501
first_tree_parent = bzrlib.revision.NULL_REVISION
502
old_revno, master_last = self.master_branch.last_revision_info()
503
if master_last != first_tree_parent:
504
if master_last != bzrlib.revision.NULL_REVISION:
505
raise errors.OutOfDateTree(self.work_tree)
506
if self.branch.repository.has_revision(first_tree_parent):
507
new_revno = old_revno + 1
509
# ghost parents never appear in revision history.
511
return old_revno,new_revno
513
def _process_pre_hooks(self, old_revno, new_revno):
514
"""Process any registered pre commit hooks."""
515
self._set_progress_stage("Running pre_commit hooks")
516
self._process_hooks("pre_commit", old_revno, new_revno)
518
def _process_post_hooks(self, old_revno, new_revno):
519
"""Process any registered post commit hooks."""
520
# Process the post commit hooks, if any
521
self._set_progress_stage("Running post_commit hooks")
522
# old style commit hooks - should be deprecated ? (obsoleted in
524
if self.config.post_commit() is not None:
525
hooks = self.config.post_commit().split(' ')
526
# this would be nicer with twisted.python.reflect.namedAny
528
result = eval(hook + '(branch, rev_id)',
529
{'branch':self.branch,
531
'rev_id':self.rev_id})
532
# process new style post commit hooks
533
self._process_hooks("post_commit", old_revno, new_revno)
535
def _process_hooks(self, hook_name, old_revno, new_revno):
536
if not Branch.hooks[hook_name]:
539
# new style commit hooks:
540
if not self.bound_branch:
541
hook_master = self.branch
544
hook_master = self.master_branch
545
hook_local = self.branch
546
# With bound branches, when the master is behind the local branch,
547
# the 'old_revno' and old_revid values here are incorrect.
548
# XXX: FIXME ^. RBC 20060206
550
old_revid = self.parents[0]
552
old_revid = bzrlib.revision.NULL_REVISION
554
if hook_name == "pre_commit":
555
future_tree = self.builder.revision_tree()
556
tree_delta = future_tree.changes_from(self.basis_tree,
559
for hook in Branch.hooks[hook_name]:
560
# show the running hook in the progress bar. As hooks may
561
# end up doing nothing (e.g. because they are not configured by
562
# the user) this is still showing progress, not showing overall
563
# actions - its up to each plugin to show a UI if it want's to
564
# (such as 'Emailing diff to foo@example.com').
565
self.pb_stage_name = "Running %s hooks [%s]" % \
566
(hook_name, Branch.hooks.get_hook_name(hook))
567
self._emit_progress()
568
if 'hooks' in debug.debug_flags:
569
mutter("Invoking commit hook: %r", hook)
570
if hook_name == "post_commit":
571
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
573
elif hook_name == "pre_commit":
574
hook(hook_local, hook_master,
575
old_revno, old_revid, new_revno, self.rev_id,
576
tree_delta, future_tree)
405
578
def _cleanup(self):
406
579
"""Cleanup any open locks, progress bars etc."""
407
580
cleanups = [self._cleanup_bound_branch,
581
self.basis_tree.unlock,
408
582
self.work_tree.unlock,
409
583
self.pb.finished]
410
584
found_exception = None
470
644
mutter('commit parent ghost revision {%s}', revision)
472
def _remove_deleted(self):
473
"""Remove deleted files from the working inventories.
475
This is done prior to taking the working inventory as the
476
basis for the new committed inventory.
478
This returns true if any files
479
*that existed in the basis inventory* were deleted.
480
Files that were added and deleted
481
in the working copy don't matter.
483
specific = self.specific_files
485
deleted_paths = set()
486
for path, ie in self.work_inv.iter_entries():
487
if is_inside_any(deleted_paths, path):
488
# The tree will delete the required ids recursively.
490
if specific and not is_inside_any(specific, path):
492
if not self.work_tree.has_filename(path):
493
deleted_paths.add(path)
494
self.reporter.missing(path)
495
deleted_ids.append(ie.file_id)
496
self.work_tree.unversion(deleted_ids)
498
def _populate_new_inv(self):
499
"""Build revision inventory.
501
This creates a new empty inventory. Depending on
502
which files are selected for commit, and what is present in the
503
current tree, the new inventory is populated. inventory entries
504
which are candidates for modification have their revision set to
505
None; inventory entries that are carried over untouched have their
506
revision set to their prior value.
646
def _update_builder_with_changes(self):
647
"""Update the commit builder with the data about what has changed.
649
# Build the revision inventory.
651
# This starts by creating a new empty inventory. Depending on
652
# which files are selected for commit, and what is present in the
653
# current tree, the new inventory is populated. inventory entries
654
# which are candidates for modification have their revision set to
655
# None; inventory entries that are carried over untouched have their
656
# revision set to their prior value.
508
658
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
509
659
# results to create a new inventory at the same time, which results
510
660
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
511
661
# ADHB 11-07-2006
512
mutter("Selecting files for commit with filter %s", self.specific_files)
513
entries = self.work_inv.iter_entries()
514
if not self.builder.record_root_entry:
515
symbol_versioning.warn('CommitBuilders should support recording'
516
' the root entry as of bzr 0.10.', DeprecationWarning,
518
self.builder.new_inventory.add(self.basis_inv.root.copy())
520
self._emit_progress_update()
521
for path, new_ie in entries:
522
self._emit_progress_update()
523
file_id = new_ie.file_id
524
# mutter('check %s {%s}', path, file_id)
525
if (not self.specific_files or
526
is_inside_or_parent_of_any(self.specific_files, path)):
527
# mutter('%s selected for commit', path)
663
exclude = self.exclude
664
specific_files = self.specific_files or []
665
mutter("Selecting files for commit with filter %s", specific_files)
667
# Build the new inventory
668
self._populate_from_inventory()
670
# If specific files are selected, then all un-selected files must be
671
# recorded in their previous state. For more details, see
672
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
673
if specific_files or exclude:
674
for path, old_ie in self.basis_inv.iter_entries():
675
if old_ie.file_id in self.builder.new_inventory:
676
# already added - skip.
678
if (is_inside_any(specific_files, path)
679
and not is_inside_any(exclude, path)):
680
# was inside the selected path, and not excluded - if not
681
# present it has been deleted so skip.
683
# From here down it was either not selected, or was excluded:
684
if old_ie.kind == 'directory':
685
self._next_progress_entry()
686
# We preserve the entry unaltered.
688
# Note: specific file commits after a merge are currently
689
# prohibited. This test is for sanity/safety in case it's
690
# required after that changes.
691
if len(self.parents) > 1:
529
692
ie.revision = None
531
# mutter('%s not selected for commit', path)
532
if self.basis_inv.has_id(file_id):
533
ie = self.basis_inv[file_id].copy()
535
# this entry is new and not being committed
538
self.builder.record_entry_contents(ie, self.parent_invs,
539
path, self.work_tree)
540
# describe the nature of the change that has occurred relative to
541
# the basis inventory.
542
if (self.basis_inv.has_id(ie.file_id)):
543
basis_ie = self.basis_inv[ie.file_id]
546
change = ie.describe_change(basis_ie, ie)
547
if change in (InventoryEntry.RENAMED,
548
InventoryEntry.MODIFIED_AND_RENAMED):
549
old_path = self.basis_inv.id2path(ie.file_id)
550
self.reporter.renamed(change, old_path, path)
552
self.reporter.snapshot_change(change, path)
554
if not self.specific_files:
557
# ignore removals that don't match filespec
558
for path, new_ie in self.basis_inv.iter_entries():
559
if new_ie.file_id in self.work_inv:
561
if is_inside_any(self.specific_files, path):
693
delta, version_recorded = self.builder.record_entry_contents(
694
ie, self.parent_invs, path, self.basis_tree, None)
696
self.any_entries_changed = True
697
if delta: self._basis_delta.append(delta)
699
def _report_and_accumulate_deletes(self):
700
# XXX: Could the list of deleted paths and ids be instead taken from
701
# _populate_from_inventory?
702
deleted_ids = set(self.basis_inv._byid.keys()) - \
703
set(self.builder.new_inventory._byid.keys())
705
self.any_entries_deleted = True
706
deleted = [(self.basis_tree.id2path(file_id), file_id)
707
for file_id in deleted_ids]
709
# XXX: this is not quite directory-order sorting
710
for path, file_id in deleted:
711
self._basis_delta.append((path, None, file_id, None))
712
self.reporter.deleted(path)
714
def _populate_from_inventory(self):
715
"""Populate the CommitBuilder by walking the working tree inventory."""
717
# raise an exception as soon as we find a single unknown.
718
for unknown in self.work_tree.unknowns():
719
raise StrictCommitFailed()
721
specific_files = self.specific_files
722
exclude = self.exclude
723
report_changes = self.reporter.is_verbose()
725
# A tree of paths that have been deleted. E.g. if foo/bar has been
726
# deleted, then we have {'foo':{'bar':{}}}
728
# XXX: Note that entries may have the wrong kind because the entry does
729
# not reflect the status on disk.
730
work_inv = self.work_tree.inventory
731
# NB: entries will include entries within the excluded ids/paths
732
# because iter_entries_by_dir has no 'exclude' facility today.
733
entries = work_inv.iter_entries_by_dir(
734
specific_file_ids=self.specific_file_ids, yield_parents=True)
735
for path, existing_ie in entries:
736
file_id = existing_ie.file_id
737
name = existing_ie.name
738
parent_id = existing_ie.parent_id
739
kind = existing_ie.kind
740
if kind == 'directory':
741
self._next_progress_entry()
742
# Skip files that have been deleted from the working tree.
743
# The deleted path ids are also recorded so they can be explicitly
746
path_segments = splitpath(path)
747
deleted_dict = deleted_paths
748
for segment in path_segments:
749
deleted_dict = deleted_dict.get(segment, None)
751
# We either took a path not present in the dict
752
# (deleted_dict was None), or we've reached an empty
753
# child dir in the dict, so are now a sub-path.
757
if deleted_dict is not None:
758
# the path has a deleted parent, do not add it.
760
if exclude and is_inside_any(exclude, path):
761
# Skip excluded paths. Excluded paths are processed by
762
# _update_builder_with_changes.
764
content_summary = self.work_tree.path_content_summary(path)
765
# Note that when a filter of specific files is given, we must only
766
# skip/record deleted files matching that filter.
767
if not specific_files or is_inside_any(specific_files, path):
768
if content_summary[0] == 'missing':
769
if not deleted_paths:
770
# path won't have been split yet.
771
path_segments = splitpath(path)
772
deleted_dict = deleted_paths
773
for segment in path_segments:
774
deleted_dict = deleted_dict.setdefault(segment, {})
775
self.reporter.missing(path)
776
deleted_ids.append(file_id)
778
# TODO: have the builder do the nested commit just-in-time IF and
780
if content_summary[0] == 'tree-reference':
781
# enforce repository nested tree policy.
782
if (not self.work_tree.supports_tree_reference() or
783
# repository does not support it either.
784
not self.branch.repository._format.supports_tree_reference):
785
content_summary = ('directory',) + content_summary[1:]
786
kind = content_summary[0]
787
# TODO: specific_files filtering before nested tree processing
788
if kind == 'tree-reference':
789
if self.recursive == 'down':
790
nested_revision_id = self._commit_nested_tree(
792
content_summary = content_summary[:3] + (
795
content_summary = content_summary[:3] + (
796
self.work_tree.get_reference_revision(file_id),)
798
# Record an entry for this item
799
# Note: I don't particularly want to have the existing_ie
800
# parameter but the test suite currently (28-Jun-07) breaks
801
# without it thanks to a unicode normalisation issue. :-(
802
definitely_changed = kind != existing_ie.kind
803
self._record_entry(path, file_id, specific_files, kind, name,
804
parent_id, definitely_changed, existing_ie, report_changes,
807
# Unversion IDs that were found to be deleted
808
self.work_tree.unversion(deleted_ids)
810
def _commit_nested_tree(self, file_id, path):
811
"Commit a nested tree."
812
sub_tree = self.work_tree.get_nested_tree(file_id, path)
813
# FIXME: be more comprehensive here:
814
# this works when both trees are in --trees repository,
815
# but when both are bound to a different repository,
816
# it fails; a better way of approaching this is to
817
# finally implement the explicit-caches approach design
818
# a while back - RBC 20070306.
819
if sub_tree.branch.repository.has_same_location(
820
self.work_tree.branch.repository):
821
sub_tree.branch.repository = \
822
self.work_tree.branch.repository
824
return sub_tree.commit(message=None, revprops=self.revprops,
825
recursive=self.recursive,
826
message_callback=self.message_callback,
827
timestamp=self.timestamp, timezone=self.timezone,
828
committer=self.committer,
829
allow_pointless=self.allow_pointless,
830
strict=self.strict, verbose=self.verbose,
831
local=self.local, reporter=self.reporter)
832
except errors.PointlessCommit:
833
return self.work_tree.get_reference_revision(file_id)
835
def _record_entry(self, path, file_id, specific_files, kind, name,
836
parent_id, definitely_changed, existing_ie, report_changes,
838
"Record the new inventory entry for a path if any."
839
# mutter('check %s {%s}', path, file_id)
840
# mutter('%s selected for commit', path)
841
if definitely_changed or existing_ie is None:
842
ie = make_entry(kind, name, parent_id, file_id)
844
ie = existing_ie.copy()
564
845
ie.revision = None
565
self.builder.record_entry_contents(ie, self.parent_invs, path,
568
def _emit_progress_update(self):
569
"""Emit an update to the progress bar."""
570
self.pb.update("Committing", self.pb_count, self.pb_total)
573
def _report_deletes(self):
574
for path, ie in self.basis_inv.iter_entries():
575
if ie.file_id not in self.builder.new_inventory:
576
self.reporter.deleted(path)
846
delta, version_recorded = self.builder.record_entry_contents(ie,
847
self.parent_invs, path, self.work_tree, content_summary)
849
self._basis_delta.append(delta)
851
self.any_entries_changed = True
853
self._report_change(ie, path)
856
def _report_change(self, ie, path):
857
"""Report a change to the user.
859
The change that has occurred is described relative to the basis
862
if (self.basis_inv.has_id(ie.file_id)):
863
basis_ie = self.basis_inv[ie.file_id]
866
change = ie.describe_change(basis_ie, ie)
867
if change in (InventoryEntry.RENAMED,
868
InventoryEntry.MODIFIED_AND_RENAMED):
869
old_path = self.basis_inv.id2path(ie.file_id)
870
self.reporter.renamed(change, old_path, path)
872
self.reporter.snapshot_change(change, path)
874
def _set_progress_stage(self, name, entries_title=None):
875
"""Set the progress stage and emit an update to the progress bar."""
876
self.pb_stage_name = name
877
self.pb_stage_count += 1
878
self.pb_entries_title = entries_title
879
if entries_title is not None:
880
self.pb_entries_count = 0
881
self.pb_entries_total = '?'
882
self._emit_progress()
884
def _next_progress_entry(self):
885
"""Emit an update to the progress bar and increment the entry count."""
886
self.pb_entries_count += 1
887
self._emit_progress()
889
def _emit_progress(self):
890
if self.pb_entries_title:
891
if self.pb_entries_total == '?':
892
text = "%s [%s %d] - Stage" % (self.pb_stage_name,
893
self.pb_entries_title, self.pb_entries_count)
895
text = "%s [%s %d/%s] - Stage" % (self.pb_stage_name,
896
self.pb_entries_title, self.pb_entries_count,
897
str(self.pb_entries_total))
899
text = "%s - Stage" % (self.pb_stage_name)
900
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
added
removed
bzrlib/commit.py
