183
203
working_tree=None,
207
message_callback=None,
210
possible_master_transports=None):
187
211
"""Commit working copy as a new revision.
189
branch -- the deprecated branch to commit to. New callers should pass in
192
message -- the commit message, a mandatory parameter
194
timestamp -- if not None, seconds-since-epoch for a
195
postdated/predated commit.
197
specific_files -- If true, commit only those files.
199
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.
200
221
Useful for test or import commands that need to tightly
201
222
control what revisions are assigned. If you duplicate
202
223
a revision id that exists elsewhere it is your own fault.
203
224
If null (default), a time/random revision id is generated.
205
allow_pointless -- If true (default), commit even if nothing
226
:param allow_pointless: If true (default), commit even if nothing
206
227
has changed and no merges are recorded.
208
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
209
230
contains unknown files.
211
revprops -- Properties for new revision
232
:param revprops: Properties for new revision
212
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
214
242
mutter('preparing to commit')
216
if deprecated_passed(branch):
217
warn("Commit.commit (branch, ...): The branch parameter is "
218
"deprecated as of bzr 0.8. Please use working_tree= instead.",
219
DeprecationWarning, stacklevel=2)
221
self.work_tree = self.branch.bzrdir.open_workingtree()
222
elif working_tree is None:
223
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().")
225
247
self.work_tree = working_tree
226
248
self.branch = self.work_tree.branch
228
raise BzrError("The message keyword parameter is required for commit().")
249
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
250
if not self.branch.repository.supports_rich_root():
251
raise errors.RootNotRich()
252
if message_callback is None:
253
if message is not None:
254
if isinstance(message, str):
255
message = message.decode(get_user_encoding())
256
message_callback = lambda x: message
258
raise BzrError("The message or message_callback keyword"
259
" parameter is required for commit().")
230
self.weave_store = self.branch.repository.weave_store
231
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))
232
269
self.local = local
233
270
self.master_branch = None
234
271
self.master_locked = False
236
self.specific_files = specific_files
272
self.recursive = recursive
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
237
280
self.allow_pointless = allow_pointless
239
if revprops is not None:
240
self.revprops.update(revprops)
242
if reporter is None and self.reporter is None:
243
self.reporter = NullCommitReporter()
244
elif reporter is not None:
245
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
247
289
self.work_tree.lock_write()
290
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
291
self.basis_revid = self.work_tree.last_revision()
292
self.basis_tree = self.work_tree.basis_tree()
293
self.basis_tree.lock_read()
249
# setup the bound branch variables as needed.
250
self._check_bound_branch()
252
# check for out of date working trees
253
# if we are bound, then self.branch is the master branch and this
254
# test is thus all we need.
255
if self.work_tree.last_revision() != self.master_branch.last_revision():
256
raise errors.OutOfDateTree(self.work_tree)
259
# raise an exception as soon as we find a single unknown.
260
for unknown in self.work_tree.unknowns():
261
raise StrictCommitFailed()
263
if timestamp is None:
264
self.timestamp = time.time()
266
self.timestamp = long(timestamp)
295
# Cannot commit with conflicts present.
296
if len(self.work_tree.conflicts()) > 0:
297
raise ConflictsInTree
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()
268
310
if self.config is None:
269
self.config = bzrlib.config.BranchConfig(self.branch)
272
self.rev_id = _gen_revision_id(self.config, self.timestamp)
276
if committer is None:
277
self.committer = self.config.username()
279
assert isinstance(committer, basestring), type(committer)
280
self.committer = committer
283
self.timezone = local_time_offset()
285
self.timezone = int(timezone)
287
if isinstance(message, str):
288
message = message.decode(bzrlib.user_encoding)
289
assert isinstance(message, unicode), type(message)
290
self.message = message
291
self._escape_commit_message()
293
self.work_inv = self.work_tree.inventory
294
self.basis_tree = self.work_tree.basis_tree()
311
self.config = self.branch.get_config()
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
295
340
self.basis_inv = self.basis_tree.inventory
297
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.
298
344
if len(self.parents) > 1 and self.specific_files:
299
raise NotImplementedError('selected-file commit of merges is not supported yet')
300
self._check_parents_present()
302
self._remove_deleted()
303
self._populate_new_inv()
304
self._store_snapshot()
305
self._report_deletes()
307
if not (self.allow_pointless
308
or len(self.parents) > 1
309
or self.new_inv != self.basis_inv):
310
raise PointlessCommit()
312
if len(self.work_tree.conflicts())>0:
313
raise ConflictsInTree
315
self.inv_sha1 = self.branch.repository.add_inventory(
320
self._make_revision()
321
# revision data is in the local branch now.
323
# upload revision data to the master.
324
# this will propogate merged revisions too if needed.
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,
354
self.config, timestamp, timezone, committer, revprops, rev_id)
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.
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
331
self.master_branch.append_revision(self.rev_id)
404
# 'commit' to the master first so a timeout here causes the
405
# local branch to be out of date
406
self.master_branch.set_last_revision_info(new_revno,
333
409
# and now do the commit locally.
334
self.branch.append_revision(self.rev_id)
410
self.branch.set_last_revision_info(new_revno, self.rev_id)
336
self.work_tree.set_pending_merges([])
337
self.work_tree.set_last_revision(self.rev_id)
338
# now the work tree is up to date with the branch
340
self.reporter.completed(self.branch.revno(), self.rev_id)
341
if self.config.post_commit() is not None:
342
hooks = self.config.post_commit().split(' ')
343
# this would be nicer with twisted.python.reflect.namedAny
345
result = eval(hook + '(branch, rev_id)',
346
{'branch':self.branch,
348
'rev_id':self.rev_id})
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())
416
self.reporter.completed(new_revno, self.rev_id)
417
self._process_post_hooks(old_revno, new_revno)
350
self._cleanup_bound_branch()
351
self.work_tree.unlock()
353
def _check_bound_branch(self):
422
def _select_reporter(self):
423
"""Select the CommitReporter to use."""
425
return NullCommitReporter()
426
return ReportCommitToLog()
428
def _check_pointless(self):
429
if self.allow_pointless:
431
# A merge with no effect on files
432
if len(self.parents) > 1:
434
# TODO: we could simplify this by using self.builder.basis_delta.
436
# The initial commit adds a root directory, but this in itself is not
437
# a worthwhile commit.
438
if (self.basis_revid == revision.NULL_REVISION and
439
len(self.builder.new_inventory) == 1):
440
raise PointlessCommit()
441
# If length == 1, then we only have the root entry. Which means
442
# that there is no real difference (only the root could be different)
443
# unless deletes occured, in which case the length is irrelevant.
444
if (self.any_entries_deleted or
445
(len(self.builder.new_inventory) != 1 and
446
self.any_entries_changed)):
448
raise PointlessCommit()
450
def _check_bound_branch(self, possible_master_transports=None):
354
451
"""Check to see if the local branch is bound.
356
453
If it is bound, then most of the commit will actually be
391
489
self.bound_branch = self.branch
392
490
self.master_branch.lock_write()
393
491
self.master_locked = True
395
#### # Check to see if we have any pending merges. If we do
396
#### # those need to be pushed into the master branch
397
#### pending_merges = self.work_tree.pending_merges()
398
#### if pending_merges:
399
#### for revision_id in pending_merges:
400
#### self.master_branch.repository.fetch(self.bound_branch.repository,
401
#### revision_id=revision_id)
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)
583
"""Cleanup any open locks, progress bars etc."""
584
cleanups = [self._cleanup_bound_branch,
585
self.basis_tree.unlock,
586
self.work_tree.unlock,
588
found_exception = None
589
for cleanup in cleanups:
592
# we want every cleanup to run no matter what.
593
# so we have a catchall here, but we will raise the
594
# last encountered exception up the stack: and
595
# typically this will be useful enough.
598
if found_exception is not None:
599
# don't do a plan raise, because the last exception may have been
600
# trashed, e is our sure-to-work exception even though it loses the
601
# full traceback. XXX: RBC 20060421 perhaps we could check the
602
# exc_info and if its the same one do a plain raise otherwise
603
# 'raise e' as we do now.
403
606
def _cleanup_bound_branch(self):
404
607
"""Executed at the end of a try/finally to cleanup a bound branch.
428
636
def _gather_parents(self):
429
637
"""Record the parents of a merge for merge detection."""
430
pending_merges = self.work_tree.pending_merges()
432
self.parent_invs = []
433
self.present_parents = []
434
precursor_id = self.branch.last_revision()
436
self.parents.append(precursor_id)
437
self.parents += pending_merges
438
for revision in self.parents:
638
# TODO: Make sure that this list doesn't contain duplicate
639
# entries and the order is preserved when doing this.
640
self.parents = self.work_tree.get_parent_ids()
641
self.parent_invs = [self.basis_inv]
642
for revision in self.parents[1:]:
439
643
if self.branch.repository.has_revision(revision):
644
mutter('commit parent revision {%s}', revision)
440
645
inventory = self.branch.repository.get_inventory(revision)
441
646
self.parent_invs.append(inventory)
442
self.present_parents.append(revision)
444
def _check_parents_present(self):
445
for parent_id in self.parents:
446
mutter('commit parent revision {%s}', parent_id)
447
if not self.branch.repository.has_revision(parent_id):
448
if parent_id == self.branch.last_revision():
449
warning("parent is missing %r", parent_id)
450
raise HistoryMissing(self.branch, 'revision', parent_id)
452
mutter("commit will ghost revision %r", parent_id)
454
def _make_revision(self):
455
"""Record a new revision object for this commit."""
456
rev = Revision(timestamp=self.timestamp,
457
timezone=self.timezone,
458
committer=self.committer,
459
message=self.message,
460
inventory_sha1=self.inv_sha1,
461
revision_id=self.rev_id,
462
properties=self.revprops)
463
rev.parent_ids = self.parents
464
self.branch.repository.add_revision(self.rev_id, rev, self.new_inv, self.config)
466
def _remove_deleted(self):
467
"""Remove deleted files from the working inventories.
469
This is done prior to taking the working inventory as the
470
basis for the new committed inventory.
472
This returns true if any files
473
*that existed in the basis inventory* were deleted.
474
Files that were added and deleted
475
in the working copy don't matter.
648
mutter('commit parent ghost revision {%s}', revision)
650
def _update_builder_with_changes(self):
651
"""Update the commit builder with the data about what has changed.
477
specific = self.specific_files
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.
662
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
663
# results to create a new inventory at the same time, which results
664
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
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:
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()
479
for path, ie in self.work_inv.iter_entries():
480
if specific and not is_inside_any(specific, path):
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.
482
if not self.work_tree.has_filename(path):
483
self.reporter.missing(path)
484
deleted_ids.append((path, ie.file_id))
486
deleted_ids.sort(reverse=True)
487
for path, file_id in deleted_ids:
488
del self.work_inv[file_id]
489
self.work_tree._write_inventory(self.work_inv)
491
def _store_snapshot(self):
492
"""Pass over inventory and record a snapshot.
494
Entries get a new revision when they are modified in
495
any way, which includes a merge with a new set of
496
parents that have the same entry.
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()
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
498
# XXX: Need to think more here about when the user has
499
# made a specific decision on a particular value -- c.f.
501
for path, ie in self.new_inv.iter_entries():
502
previous_entries = ie.find_previous_heads(
505
self.branch.repository.get_transaction())
506
if ie.revision is None:
507
change = ie.snapshot(self.rev_id, path, previous_entries,
508
self.work_tree, self.weave_store,
509
self.branch.get_transaction())
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)
512
888
self.reporter.snapshot_change(change, path)
514
def _populate_new_inv(self):
515
"""Build revision inventory.
517
This creates a new empty inventory. Depending on
518
which files are selected for commit, and what is present in the
519
current tree, the new inventory is populated. inventory entries
520
which are candidates for modification have their revision set to
521
None; inventory entries that are carried over untouched have their
522
revision set to their prior value.
524
mutter("Selecting files for commit with filter %s", self.specific_files)
525
self.new_inv = Inventory(revision_id=self.rev_id)
526
for path, new_ie in self.work_inv.iter_entries():
527
file_id = new_ie.file_id
528
mutter('check %s {%s}', path, new_ie.file_id)
529
if self.specific_files:
530
if not is_inside_any(self.specific_files, path):
531
mutter('%s not selected for commit', path)
532
self._carry_entry(file_id)
535
# this is selected, ensure its parents are too.
536
parent_id = new_ie.parent_id
537
while parent_id != ROOT_ID:
538
if not self.new_inv.has_id(parent_id):
539
ie = self._select_entry(self.work_inv[parent_id])
540
mutter('%s selected for commit because of %s',
541
self.new_inv.id2path(parent_id), path)
543
ie = self.new_inv[parent_id]
544
if ie.revision is not None:
546
mutter('%s selected for commit because of %s',
547
self.new_inv.id2path(parent_id), path)
548
parent_id = ie.parent_id
549
mutter('%s selected for commit', path)
550
self._select_entry(new_ie)
552
def _select_entry(self, new_ie):
553
"""Make new_ie be considered for committing."""
559
def _carry_entry(self, file_id):
560
"""Carry the file unchanged from the basis revision."""
561
if self.basis_inv.has_id(file_id):
562
self.new_inv.add(self.basis_inv[file_id].copy())
564
def _report_deletes(self):
565
for file_id in self.basis_inv:
566
if file_id not in self.new_inv:
567
self.reporter.deleted(self.basis_inv.id2path(file_id))
569
def _gen_revision_id(config, when):
570
"""Return new revision-id."""
571
s = '%s-%s-' % (config.user_email(), compact_date(when))
572
s += hexlify(rand_bytes(8))
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
