221
177
allow_pointless=True,
229
message_callback=None,
232
possible_master_transports=None,
234
181
"""Commit working copy as a new revision.
236
:param message: the commit message (it or message_callback is required)
237
:param message_callback: A callback: message = message_callback(cmt_obj)
239
:param timestamp: if not None, seconds-since-epoch for a
240
postdated/predated commit.
242
:param specific_files: If not None, commit only those files. An empty
243
list means 'commit no files'.
245
:param rev_id: If set, use this as the new revision id.
183
timestamp -- if not None, seconds-since-epoch for a
184
postdated/predated commit.
186
specific_files -- If true, commit only those files.
188
rev_id -- If set, use this as the new revision id.
246
189
Useful for test or import commands that need to tightly
247
190
control what revisions are assigned. If you duplicate
248
191
a revision id that exists elsewhere it is your own fault.
249
192
If null (default), a time/random revision id is generated.
251
:param allow_pointless: If true (default), commit even if nothing
194
allow_pointless -- If true (default), commit even if nothing
252
195
has changed and no merges are recorded.
254
:param strict: If true, don't allow a commit if the working tree
197
strict -- If true, don't allow a commit if the working tree
255
198
contains unknown files.
257
:param revprops: Properties for new revision
258
:param local: Perform a local only commit.
259
:param reporter: the reporter to use or None for the default
260
:param verbose: if True and the reporter is not None, report everything
261
:param recursive: If set to 'down', commit in any subtrees that have
262
pending changes of any sort during this commit.
263
:param exclude: None or a list of relative paths to exclude from the
264
commit. Pending changes to excluded files will be ignored by the
266
:param lossy: When committing to a foreign VCS, ignore any
267
data that can not be natively represented.
200
revprops -- Properties for new revision
269
operation = OperationWithCleanups(self._commit)
270
self.revprops = revprops or {}
271
# XXX: Can be set on __init__ or passed in - this is a bit ugly.
272
self.config_stack = config or self.config_stack
273
return operation.run(
278
specific_files=specific_files,
280
allow_pointless=allow_pointless,
283
working_tree=working_tree,
286
message_callback=message_callback,
289
possible_master_transports=possible_master_transports,
292
def _commit(self, operation, message, timestamp, timezone, committer,
293
specific_files, rev_id, allow_pointless, strict, verbose,
294
working_tree, local, reporter, message_callback, recursive,
295
exclude, possible_master_transports, lossy):
296
202
mutter('preparing to commit')
298
if working_tree is None:
299
raise BzrError("working_tree must be passed into commit().")
301
self.work_tree = working_tree
302
self.branch = self.work_tree.branch
303
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
304
if not self.branch.repository.supports_rich_root():
305
raise errors.RootNotRich()
306
if message_callback is None:
307
if message is not None:
308
if isinstance(message, str):
309
message = message.decode(get_user_encoding())
310
message_callback = lambda x: message
312
raise BzrError("The message or message_callback keyword"
313
" parameter is required for commit().")
315
self.bound_branch = None
316
self.any_entries_deleted = False
317
if exclude is not None:
318
self.exclude = sorted(
319
minimum_path_selection(exclude))
323
self.master_branch = None
324
self.recursive = recursive
326
# self.specific_files is None to indicate no filter, or any iterable to
327
# indicate a filter - [] means no files at all, as per iter_changes.
328
if specific_files is not None:
329
self.specific_files = sorted(
330
minimum_path_selection(specific_files))
332
self.specific_files = None
205
self.weave_store = branch.weave_store
207
self.specific_files = specific_files
334
208
self.allow_pointless = allow_pointless
335
self.message_callback = message_callback
336
self.timestamp = timestamp
337
self.timezone = timezone
338
self.committer = committer
340
self.verbose = verbose
342
self.work_tree.lock_write()
343
operation.add_cleanup(self.work_tree.unlock)
344
self.parents = self.work_tree.get_parent_ids()
345
# We can use record_iter_changes IFF iter_changes is compatible with
346
# the command line parameters, and the repository has fast delta
347
# generation. See bug 347649.
348
self.use_record_iter_changes = (
350
not self.branch.repository._format.supports_tree_reference and
351
(self.branch.repository._format.fast_deltas or
352
len(self.parents) < 2))
353
self.pb = ui.ui_factory.nested_progress_bar()
354
operation.add_cleanup(self.pb.finished)
355
self.basis_revid = self.work_tree.last_revision()
356
self.basis_tree = self.work_tree.basis_tree()
357
self.basis_tree.lock_read()
358
operation.add_cleanup(self.basis_tree.unlock)
359
# Cannot commit with conflicts present.
360
if len(self.work_tree.conflicts()) > 0:
361
raise ConflictsInTree
363
# Setup the bound branch variables as needed.
364
self._check_bound_branch(operation, possible_master_transports)
366
# Check that the working tree is up to date
367
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
369
# Complete configuration setup
370
if reporter is not None:
371
self.reporter = reporter
372
elif self.reporter is None:
373
self.reporter = self._select_reporter()
374
if self.config_stack is None:
375
self.config_stack = self.branch.get_config_stack()
377
self._set_specific_file_ids()
379
# Setup the progress bar. As the number of files that need to be
380
# committed in unknown, progress is reported as stages.
381
# We keep track of entries separately though and include that
382
# information in the progress bar during the relevant stages.
383
self.pb_stage_name = ""
384
self.pb_stage_count = 0
385
self.pb_stage_total = 5
386
if self.bound_branch:
387
# 2 extra stages: "Uploading data to master branch" and "Merging
388
# tags to master branch"
389
self.pb_stage_total += 2
390
self.pb.show_pct = False
391
self.pb.show_spinner = False
392
self.pb.show_eta = False
393
self.pb.show_count = True
394
self.pb.show_bar = True
396
self._gather_parents()
397
# After a merge, a selected file commit is not supported.
398
# See 'bzr help merge' for an explanation as to why.
399
if len(self.parents) > 1 and self.specific_files is not None:
400
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
401
# Excludes are a form of selected file commit.
402
if len(self.parents) > 1 and self.exclude:
403
raise errors.CannotCommitSelectedFileMerge(self.exclude)
405
# Collect the changes
406
self._set_progress_stage("Collecting changes", counter=True)
408
self.builder = self.branch.get_commit_builder(self.parents,
409
self.config_stack, timestamp, timezone, committer, self.revprops,
411
if not self.builder.supports_record_entry_contents and self.exclude:
413
raise errors.ExcludesUnsupported(self.branch.repository)
415
if self.builder.updates_branch and self.bound_branch:
417
raise AssertionError(
418
"bound branches not supported for commit builders "
419
"that update the branch")
422
self.builder.will_record_deletes()
423
# find the location being committed to
424
if self.bound_branch:
425
master_location = self.master_branch.base
427
master_location = self.branch.base
429
# report the start of the commit
430
self.reporter.started(new_revno, self.rev_id, master_location)
432
self._update_builder_with_changes()
433
self._check_pointless()
435
# TODO: Now the new inventory is known, check for conflicts.
436
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
437
# weave lines, because nothing should be recorded until it is known
438
# that commit will succeed.
439
self._set_progress_stage("Saving data locally")
440
self.builder.finish_inventory()
442
# Prompt the user for a commit message if none provided
443
message = message_callback(self)
444
self.message = message
446
# Add revision data to the local branch
447
self.rev_id = self.builder.commit(self.message)
450
mutter("aborting commit write group because of exception:")
451
trace.log_exception_quietly()
455
self._update_branches(old_revno, old_revid, new_revno)
457
# Make the working tree be up to date with the branch. This
458
# includes automatic changes scheduled to be made to the tree, such
459
# as updating its basis and unversioning paths that were missing.
460
self.work_tree.unversion(self.deleted_ids)
461
self._set_progress_stage("Updating the working tree")
462
self.work_tree.update_basis_by_delta(self.rev_id,
463
self.builder.get_basis_delta())
464
self.reporter.completed(new_revno, self.rev_id)
465
self._process_post_hooks(old_revno, new_revno)
468
def _update_branches(self, old_revno, old_revid, new_revno):
469
"""Update the master and local branch to the new revision.
471
This will try to make sure that the master branch is updated
472
before the local branch.
474
:param old_revno: Revision number of master branch before the
476
:param old_revid: Tip of master branch before the commit
477
:param new_revno: Revision number of the new commit
479
if not self.builder.updates_branch:
480
self._process_pre_hooks(old_revno, new_revno)
482
# Upload revision data to the master.
483
# this will propagate merged revisions too if needed.
484
if self.bound_branch:
485
self._set_progress_stage("Uploading data to master branch")
486
# 'commit' to the master first so a timeout here causes the
487
# local branch to be out of date
488
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
489
self.branch, new_revno, self.rev_id, lossy=self._lossy)
491
self.branch.fetch(self.master_branch, self.rev_id)
493
# and now do the commit locally.
494
self.branch.set_last_revision_info(new_revno, self.rev_id)
497
self._process_pre_hooks(old_revno, new_revno)
499
# The commit builder will already have updated the branch,
501
self.branch.set_last_revision_info(old_revno, old_revid)
504
# Merge local tags to remote
505
if self.bound_branch:
506
self._set_progress_stage("Merging tags to master branch")
507
tag_updates, tag_conflicts = self.branch.tags.merge_to(
508
self.master_branch.tags)
510
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
511
note( gettext("Conflicting tags in bound branch:\n{0}".format(
512
"\n".join(warning_lines))) )
514
def _select_reporter(self):
515
"""Select the CommitReporter to use."""
517
return NullCommitReporter()
518
return ReportCommitToLog()
520
def _check_pointless(self):
521
if self.allow_pointless:
523
# A merge with no effect on files
524
if len(self.parents) > 1:
526
if self.builder.any_changes():
528
raise PointlessCommit()
530
def _check_bound_branch(self, operation, possible_master_transports=None):
531
"""Check to see if the local branch is bound.
533
If it is bound, then most of the commit will actually be
534
done using the remote branch as the target branch.
535
Only at the end will the local branch be updated.
537
if self.local and not self.branch.get_bound_location():
538
raise errors.LocalRequiresBoundBranch()
541
self.master_branch = self.branch.get_master_branch(
542
possible_master_transports)
544
if not self.master_branch:
545
# make this branch the reference branch for out of date checks.
546
self.master_branch = self.branch
549
# If the master branch is bound, we must fail
550
master_bound_location = self.master_branch.get_bound_location()
551
if master_bound_location:
552
raise errors.CommitToDoubleBoundBranch(self.branch,
553
self.master_branch, master_bound_location)
555
# TODO: jam 20051230 We could automatically push local
556
# commits to the remote branch if they would fit.
557
# But for now, just require remote to be identical
560
# Make sure the local branch is identical to the master
561
master_info = self.master_branch.last_revision_info()
562
local_info = self.branch.last_revision_info()
563
if local_info != master_info:
564
raise errors.BoundBranchOutOfDate(self.branch,
567
# Now things are ready to change the master branch
569
self.bound_branch = self.branch
570
self.master_branch.lock_write()
571
operation.add_cleanup(self.master_branch.unlock)
573
def _check_out_of_date_tree(self):
574
"""Check that the working tree is up to date.
576
:return: old_revision_number, old_revision_id, new_revision_number
580
first_tree_parent = self.work_tree.get_parent_ids()[0]
582
# if there are no parents, treat our parent as 'None'
583
# this is so that we still consider the master branch
584
# - in a checkout scenario the tree may have no
585
# parents but the branch may do.
586
first_tree_parent = bzrlib.revision.NULL_REVISION
587
old_revno, master_last = self.master_branch.last_revision_info()
588
if master_last != first_tree_parent:
589
if master_last != bzrlib.revision.NULL_REVISION:
590
raise errors.OutOfDateTree(self.work_tree)
591
if self.branch.repository.has_revision(first_tree_parent):
592
new_revno = old_revno + 1
594
# ghost parents never appear in revision history.
596
return old_revno, master_last, new_revno
598
def _process_pre_hooks(self, old_revno, new_revno):
599
"""Process any registered pre commit hooks."""
600
self._set_progress_stage("Running pre_commit hooks")
601
self._process_hooks("pre_commit", old_revno, new_revno)
603
def _process_post_hooks(self, old_revno, new_revno):
604
"""Process any registered post commit hooks."""
605
# Process the post commit hooks, if any
606
self._set_progress_stage("Running post_commit hooks")
607
# old style commit hooks - should be deprecated ? (obsoleted in
608
# 0.15^H^H^H^H 2.5.0)
609
post_commit = self.config_stack.get('post_commit')
610
if post_commit is not None:
611
hooks = post_commit.split(' ')
612
# this would be nicer with twisted.python.reflect.namedAny
614
result = eval(hook + '(branch, rev_id)',
615
{'branch':self.branch,
617
'rev_id':self.rev_id})
618
# process new style post commit hooks
619
self._process_hooks("post_commit", old_revno, new_revno)
621
def _process_hooks(self, hook_name, old_revno, new_revno):
622
if not Branch.hooks[hook_name]:
625
# new style commit hooks:
626
if not self.bound_branch:
627
hook_master = self.branch
630
hook_master = self.master_branch
631
hook_local = self.branch
632
# With bound branches, when the master is behind the local branch,
633
# the 'old_revno' and old_revid values here are incorrect.
634
# XXX: FIXME ^. RBC 20060206
636
old_revid = self.parents[0]
638
old_revid = bzrlib.revision.NULL_REVISION
640
if hook_name == "pre_commit":
641
future_tree = self.builder.revision_tree()
642
tree_delta = future_tree.changes_from(self.basis_tree,
645
for hook in Branch.hooks[hook_name]:
646
# show the running hook in the progress bar. As hooks may
647
# end up doing nothing (e.g. because they are not configured by
648
# the user) this is still showing progress, not showing overall
649
# actions - its up to each plugin to show a UI if it want's to
650
# (such as 'Emailing diff to foo@example.com').
651
self.pb_stage_name = "Running %s hooks [%s]" % \
652
(hook_name, Branch.hooks.get_hook_name(hook))
653
self._emit_progress()
654
if 'hooks' in debug.debug_flags:
655
mutter("Invoking commit hook: %r", hook)
656
if hook_name == "post_commit":
657
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
659
elif hook_name == "pre_commit":
660
hook(hook_local, hook_master,
661
old_revno, old_revid, new_revno, self.rev_id,
662
tree_delta, future_tree)
664
def _gather_parents(self):
665
"""Record the parents of a merge for merge detection."""
666
# TODO: Make sure that this list doesn't contain duplicate
667
# entries and the order is preserved when doing this.
668
if self.use_record_iter_changes:
670
self.basis_inv = self.basis_tree.inventory
671
self.parent_invs = [self.basis_inv]
672
for revision in self.parents[1:]:
673
if self.branch.repository.has_revision(revision):
674
mutter('commit parent revision {%s}', revision)
675
inventory = self.branch.repository.get_inventory(revision)
676
self.parent_invs.append(inventory)
678
mutter('commit parent ghost revision {%s}', revision)
680
def _update_builder_with_changes(self):
681
"""Update the commit builder with the data about what has changed.
683
exclude = self.exclude
684
specific_files = self.specific_files
685
mutter("Selecting files for commit with filter %s", specific_files)
688
if self.use_record_iter_changes:
689
iter_changes = self.work_tree.iter_changes(self.basis_tree,
690
specific_files=specific_files)
691
iter_changes = self._filter_iter_changes(iter_changes)
692
for file_id, path, fs_hash in self.builder.record_iter_changes(
693
self.work_tree, self.basis_revid, iter_changes):
694
self.work_tree._observed_sha1(file_id, path, fs_hash)
696
# Build the new inventory
697
self._populate_from_inventory()
698
self._record_unselected()
699
self._report_and_accumulate_deletes()
701
def _filter_iter_changes(self, iter_changes):
702
"""Process iter_changes.
704
This method reports on the changes in iter_changes to the user, and
705
converts 'missing' entries in the iter_changes iterator to 'deleted'
706
entries. 'missing' entries have their
708
:param iter_changes: An iter_changes to process.
709
:return: A generator of changes.
711
reporter = self.reporter
712
report_changes = reporter.is_verbose()
714
for change in iter_changes:
716
old_path = change[1][0]
717
new_path = change[1][1]
718
versioned = change[3][1]
720
versioned = change[3][1]
721
if kind is None and versioned:
724
reporter.missing(new_path)
725
deleted_ids.append(change[0])
726
# Reset the new path (None) and new versioned flag (False)
727
change = (change[0], (change[1][0], None), change[2],
728
(change[3][0], False)) + change[4:]
729
new_path = change[1][1]
731
elif kind == 'tree-reference':
732
if self.recursive == 'down':
733
self._commit_nested_tree(change[0], change[1][1])
734
if change[3][0] or change[3][1]:
738
reporter.deleted(old_path)
739
elif old_path is None:
740
reporter.snapshot_change(gettext('added'), new_path)
741
elif old_path != new_path:
742
reporter.renamed(gettext('renamed'), old_path, new_path)
745
self.work_tree.branch.repository._format.rich_root_data):
746
# Don't report on changes to '' in non rich root
748
reporter.snapshot_change(gettext('modified'), new_path)
749
self._next_progress_entry()
750
# Unversion IDs that were found to be deleted
751
self.deleted_ids = deleted_ids
753
def _record_unselected(self):
754
# If specific files are selected, then all un-selected files must be
755
# recorded in their previous state. For more details, see
756
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
757
if self.specific_files or self.exclude:
758
specific_files = self.specific_files or []
759
for path, old_ie in self.basis_inv.iter_entries():
760
if self.builder.new_inventory.has_id(old_ie.file_id):
761
# already added - skip.
763
if (is_inside_any(specific_files, path)
764
and not is_inside_any(self.exclude, path)):
765
# was inside the selected path, and not excluded - if not
766
# present it has been deleted so skip.
768
# From here down it was either not selected, or was excluded:
769
# We preserve the entry unaltered.
771
# Note: specific file commits after a merge are currently
772
# prohibited. This test is for sanity/safety in case it's
773
# required after that changes.
774
if len(self.parents) > 1:
776
self.builder.record_entry_contents(ie, self.parent_invs, path,
777
self.basis_tree, None)
779
def _report_and_accumulate_deletes(self):
780
if (isinstance(self.basis_inv, Inventory)
781
and isinstance(self.builder.new_inventory, Inventory)):
782
# the older Inventory classes provide a _byid dict, and building a
783
# set from the keys of this dict is substantially faster than even
784
# getting a set of ids from the inventory
786
# <lifeless> set(dict) is roughly the same speed as
787
# set(iter(dict)) and both are significantly slower than
789
deleted_ids = set(self.basis_inv._byid.keys()) - \
790
set(self.builder.new_inventory._byid.keys())
792
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
794
self.any_entries_deleted = True
795
deleted = [(self.basis_tree.id2path(file_id), file_id)
796
for file_id in deleted_ids]
798
# XXX: this is not quite directory-order sorting
799
for path, file_id in deleted:
800
self.builder.record_delete(path, file_id)
801
self.reporter.deleted(path)
803
def _check_strict(self):
804
# XXX: when we use iter_changes this would likely be faster if
805
# iter_changes would check for us (even in the presence of
209
self.revprops = {'branch-nick': branch.nick}
211
self.revprops.update(revprops)
212
self.work_tree = WorkingTree(branch.base, branch)
808
215
# raise an exception as soon as we find a single unknown.
809
216
for unknown in self.work_tree.unknowns():
810
217
raise StrictCommitFailed()
812
def _populate_from_inventory(self):
813
"""Populate the CommitBuilder by walking the working tree inventory."""
814
# Build the revision inventory.
816
# This starts by creating a new empty inventory. Depending on
817
# which files are selected for commit, and what is present in the
818
# current tree, the new inventory is populated. inventory entries
819
# which are candidates for modification have their revision set to
820
# None; inventory entries that are carried over untouched have their
821
# revision set to their prior value.
823
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
824
# results to create a new inventory at the same time, which results
825
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
828
specific_files = self.specific_files
829
exclude = self.exclude
830
report_changes = self.reporter.is_verbose()
219
if timestamp is None:
220
self.timestamp = time.time()
222
self.timestamp = long(timestamp)
224
if self.config is None:
225
self.config = bzrlib.config.BranchConfig(self.branch)
228
self.rev_id = _gen_revision_id(self.config, self.timestamp)
232
if committer is None:
233
self.committer = self.config.username()
235
assert isinstance(committer, basestring), type(committer)
236
self.committer = committer
239
self.timezone = local_time_offset()
241
self.timezone = int(timezone)
243
if isinstance(message, str):
244
message = message.decode(bzrlib.user_encoding)
245
assert isinstance(message, unicode), type(message)
246
self.message = message
247
self._escape_commit_message()
249
self.branch.lock_write()
251
self.work_inv = self.work_tree.inventory
252
self.basis_tree = self.branch.basis_tree()
253
self.basis_inv = self.basis_tree.inventory
255
self._gather_parents()
256
if len(self.parents) > 1 and self.specific_files:
257
raise NotImplementedError('selected-file commit of merges is not supported yet')
258
self._check_parents_present()
260
self._remove_deleted()
261
self._populate_new_inv()
262
self._store_snapshot()
263
self._report_deletes()
265
if not (self.allow_pointless
266
or len(self.parents) > 1
267
or self.new_inv != self.basis_inv):
268
raise PointlessCommit()
270
if len(list(self.work_tree.iter_conflicts()))>0:
271
raise ConflictsInTree
273
self._record_inventory()
274
self._make_revision()
275
self.work_tree.set_pending_merges([])
276
self.branch.append_revision(self.rev_id)
277
self.reporter.completed(self.branch.revno()+1, self.rev_id)
278
if self.config.post_commit() is not None:
279
hooks = self.config.post_commit().split(' ')
280
# this would be nicer with twisted.python.reflect.namedAny
282
result = eval(hook + '(branch, rev_id)',
283
{'branch':self.branch,
285
'rev_id':self.rev_id})
289
def _record_inventory(self):
290
"""Store the inventory for the new revision."""
291
inv_text = serializer_v5.write_inventory_to_string(self.new_inv)
292
self.inv_sha1 = sha_string(inv_text)
293
s = self.branch.control_weaves
294
s.add_text('inventory', self.rev_id,
295
split_lines(inv_text), self.present_parents,
296
self.branch.get_transaction())
298
def _escape_commit_message(self):
299
"""Replace xml-incompatible control characters."""
300
# Python strings can include characters that can't be
301
# represented in well-formed XML; escape characters that
302
# aren't listed in the XML specification
303
# (http://www.w3.org/TR/REC-xml/#NT-Char).
304
self.message, escape_count = re.subn(
305
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
306
lambda match: match.group(0).encode('unicode_escape'),
309
self.reporter.escaped(escape_count, self.message)
311
def _gather_parents(self):
312
"""Record the parents of a merge for merge detection."""
313
pending_merges = self.work_tree.pending_merges()
315
self.parent_invs = []
316
self.present_parents = []
317
precursor_id = self.branch.last_revision()
319
self.parents.append(precursor_id)
320
self.parents += pending_merges
321
for revision in self.parents:
322
if self.branch.has_revision(revision):
323
self.parent_invs.append(self.branch.get_inventory(revision))
324
self.present_parents.append(revision)
326
def _check_parents_present(self):
327
for parent_id in self.parents:
328
mutter('commit parent revision {%s}', parent_id)
329
if not self.branch.has_revision(parent_id):
330
if parent_id == self.branch.last_revision():
331
warning("parent is missing %r", parent_id)
332
raise HistoryMissing(self.branch, 'revision', parent_id)
334
mutter("commit will ghost revision %r", parent_id)
336
def _make_revision(self):
337
"""Record a new revision object for this commit."""
338
self.rev = Revision(timestamp=self.timestamp,
339
timezone=self.timezone,
340
committer=self.committer,
341
message=self.message,
342
inventory_sha1=self.inv_sha1,
343
revision_id=self.rev_id,
344
properties=self.revprops)
345
self.rev.parent_ids = self.parents
347
serializer_v5.write_revision(self.rev, rev_tmp)
349
if self.config.signature_needed():
350
plaintext = Testament(self.rev, self.new_inv).as_short_text()
351
self.branch.store_revision_signature(gpg.GPGStrategy(self.config),
352
plaintext, self.rev_id)
353
self.branch.revision_store.add(rev_tmp, self.rev_id)
354
mutter('new revision_id is {%s}', self.rev_id)
356
def _remove_deleted(self):
357
"""Remove deleted files from the working inventories.
359
This is done prior to taking the working inventory as the
360
basis for the new committed inventory.
362
This returns true if any files
363
*that existed in the basis inventory* were deleted.
364
Files that were added and deleted
365
in the working copy don't matter.
367
specific = self.specific_files
832
# A tree of paths that have been deleted. E.g. if foo/bar has been
833
# deleted, then we have {'foo':{'bar':{}}}
835
# XXX: Note that entries may have the wrong kind because the entry does
836
# not reflect the status on disk.
837
work_inv = self.work_tree.inventory
838
# NB: entries will include entries within the excluded ids/paths
839
# because iter_entries_by_dir has no 'exclude' facility today.
840
entries = work_inv.iter_entries_by_dir(
841
specific_file_ids=self.specific_file_ids, yield_parents=True)
842
for path, existing_ie in entries:
843
file_id = existing_ie.file_id
844
name = existing_ie.name
845
parent_id = existing_ie.parent_id
846
kind = existing_ie.kind
847
# Skip files that have been deleted from the working tree.
848
# The deleted path ids are also recorded so they can be explicitly
851
path_segments = splitpath(path)
852
deleted_dict = deleted_paths
853
for segment in path_segments:
854
deleted_dict = deleted_dict.get(segment, None)
856
# We either took a path not present in the dict
857
# (deleted_dict was None), or we've reached an empty
858
# child dir in the dict, so are now a sub-path.
862
if deleted_dict is not None:
863
# the path has a deleted parent, do not add it.
865
if exclude and is_inside_any(exclude, path):
866
# Skip excluded paths. Excluded paths are processed by
867
# _update_builder_with_changes.
369
for path, ie in self.work_inv.iter_entries():
370
if specific and not is_inside_any(specific, path):
869
content_summary = self.work_tree.path_content_summary(path)
870
kind = content_summary[0]
871
# Note that when a filter of specific files is given, we must only
872
# skip/record deleted files matching that filter.
873
if not specific_files or is_inside_any(specific_files, path):
874
if kind == 'missing':
875
if not deleted_paths:
876
# path won't have been split yet.
877
path_segments = splitpath(path)
878
deleted_dict = deleted_paths
879
for segment in path_segments:
880
deleted_dict = deleted_dict.setdefault(segment, {})
881
self.reporter.missing(path)
882
self._next_progress_entry()
883
deleted_ids.append(file_id)
372
if not self.work_tree.has_filename(path):
373
self.reporter.missing(path)
374
deleted_ids.append((path, ie.file_id))
376
deleted_ids.sort(reverse=True)
377
for path, file_id in deleted_ids:
378
del self.work_inv[file_id]
379
self.work_tree._write_inventory(self.work_inv)
381
def _store_snapshot(self):
382
"""Pass over inventory and record a snapshot.
384
Entries get a new revision when they are modified in
385
any way, which includes a merge with a new set of
386
parents that have the same entry.
388
# XXX: Need to think more here about when the user has
389
# made a specific decision on a particular value -- c.f.
391
for path, ie in self.new_inv.iter_entries():
392
previous_entries = ie.find_previous_heads(
394
self.weave_store.get_weave_prelude_or_empty(ie.file_id,
395
self.branch.get_transaction()))
396
if ie.revision is None:
397
change = ie.snapshot(self.rev_id, path, previous_entries,
398
self.work_tree, self.weave_store,
399
self.branch.get_transaction())
402
self.reporter.snapshot_change(change, path)
404
def _populate_new_inv(self):
405
"""Build revision inventory.
407
This creates a new empty inventory. Depending on
408
which files are selected for commit, and what is present in the
409
current tree, the new inventory is populated. inventory entries
410
which are candidates for modification have their revision set to
411
None; inventory entries that are carried over untouched have their
412
revision set to their prior value.
414
mutter("Selecting files for commit with filter %s", self.specific_files)
415
self.new_inv = Inventory()
416
for path, new_ie in self.work_inv.iter_entries():
417
file_id = new_ie.file_id
418
mutter('check %s {%s}', path, new_ie.file_id)
419
if self.specific_files:
420
if not is_inside_any(self.specific_files, path):
421
mutter('%s not selected for commit', path)
422
self._carry_entry(file_id)
885
# TODO: have the builder do the nested commit just-in-time IF and
887
if kind == 'tree-reference':
888
# enforce repository nested tree policy.
889
if (not self.work_tree.supports_tree_reference() or
890
# repository does not support it either.
891
not self.branch.repository._format.supports_tree_reference):
893
content_summary = (kind, None, None, None)
894
elif self.recursive == 'down':
895
nested_revision_id = self._commit_nested_tree(
897
content_summary = (kind, None, None, nested_revision_id)
899
nested_revision_id = self.work_tree.get_reference_revision(file_id)
900
content_summary = (kind, None, None, nested_revision_id)
902
# Record an entry for this item
903
# Note: I don't particularly want to have the existing_ie
904
# parameter but the test suite currently (28-Jun-07) breaks
905
# without it thanks to a unicode normalisation issue. :-(
906
definitely_changed = kind != existing_ie.kind
907
self._record_entry(path, file_id, specific_files, kind, name,
908
parent_id, definitely_changed, existing_ie, report_changes,
911
# Unversion IDs that were found to be deleted
912
self.deleted_ids = deleted_ids
914
def _commit_nested_tree(self, file_id, path):
915
"Commit a nested tree."
916
sub_tree = self.work_tree.get_nested_tree(file_id, path)
917
# FIXME: be more comprehensive here:
918
# this works when both trees are in --trees repository,
919
# but when both are bound to a different repository,
920
# it fails; a better way of approaching this is to
921
# finally implement the explicit-caches approach design
922
# a while back - RBC 20070306.
923
if sub_tree.branch.repository.has_same_location(
924
self.work_tree.branch.repository):
925
sub_tree.branch.repository = \
926
self.work_tree.branch.repository
928
return sub_tree.commit(message=None, revprops=self.revprops,
929
recursive=self.recursive,
930
message_callback=self.message_callback,
931
timestamp=self.timestamp, timezone=self.timezone,
932
committer=self.committer,
933
allow_pointless=self.allow_pointless,
934
strict=self.strict, verbose=self.verbose,
935
local=self.local, reporter=self.reporter)
936
except errors.PointlessCommit:
937
return self.work_tree.get_reference_revision(file_id)
939
def _record_entry(self, path, file_id, specific_files, kind, name,
940
parent_id, definitely_changed, existing_ie, report_changes,
942
"Record the new inventory entry for a path if any."
943
# mutter('check %s {%s}', path, file_id)
944
# mutter('%s selected for commit', path)
945
if definitely_changed or existing_ie is None:
946
ie = make_entry(kind, name, parent_id, file_id)
948
ie = existing_ie.copy()
950
# For carried over entries we don't care about the fs hash - the repo
951
# isn't generating a sha, so we're not saving computation time.
952
_, _, fs_hash = self.builder.record_entry_contents(
953
ie, self.parent_invs, path, self.work_tree, content_summary)
955
self._report_change(ie, path)
957
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
425
# this is selected, ensure its parents are too.
426
parent_id = new_ie.parent_id
427
while parent_id != ROOT_ID:
428
if not self.new_inv.has_id(parent_id):
429
ie = self._select_entry(self.work_inv[parent_id])
430
mutter('%s selected for commit because of %s',
431
self.new_inv.id2path(parent_id), path)
433
ie = self.new_inv[parent_id]
434
if ie.revision is not None:
436
mutter('%s selected for commit because of %s',
437
self.new_inv.id2path(parent_id), path)
438
parent_id = ie.parent_id
439
mutter('%s selected for commit', path)
440
self._select_entry(new_ie)
442
def _select_entry(self, new_ie):
443
"""Make new_ie be considered for committing."""
960
def _report_change(self, ie, path):
961
"""Report a change to the user.
963
The change that has occurred is described relative to the basis
966
if (self.basis_inv.has_id(ie.file_id)):
967
basis_ie = self.basis_inv[ie.file_id]
970
change = ie.describe_change(basis_ie, ie)
971
if change in (InventoryEntry.RENAMED,
972
InventoryEntry.MODIFIED_AND_RENAMED):
973
old_path = self.basis_inv.id2path(ie.file_id)
974
self.reporter.renamed(change, old_path, path)
975
self._next_progress_entry()
977
if change == gettext('unchanged'):
979
self.reporter.snapshot_change(change, path)
980
self._next_progress_entry()
982
def _set_progress_stage(self, name, counter=False):
983
"""Set the progress stage and emit an update to the progress bar."""
984
self.pb_stage_name = name
985
self.pb_stage_count += 1
987
self.pb_entries_count = 0
989
self.pb_entries_count = None
990
self._emit_progress()
992
def _next_progress_entry(self):
993
"""Emit an update to the progress bar and increment the entry count."""
994
self.pb_entries_count += 1
995
self._emit_progress()
997
def _emit_progress(self):
998
if self.pb_entries_count is not None:
999
text = gettext("{0} [{1}] - Stage").format(self.pb_stage_name,
1000
self.pb_entries_count)
1002
text = gettext("%s - Stage") % (self.pb_stage_name, )
1003
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
1005
def _set_specific_file_ids(self):
1006
"""populate self.specific_file_ids if we will use it."""
1007
if not self.use_record_iter_changes:
1008
# If provided, ensure the specified files are versioned
1009
if self.specific_files is not None:
1010
# Note: This routine is being called because it raises
1011
# PathNotVersionedError as a side effect of finding the IDs. We
1012
# later use the ids we found as input to the working tree
1013
# inventory iterator, so we only consider those ids rather than
1014
# examining the whole tree again.
1015
# XXX: Dont we have filter_unversioned to do this more
1017
self.specific_file_ids = tree.find_ids_across_trees(
1018
self.specific_files, [self.basis_tree, self.work_tree])
1020
self.specific_file_ids = None
449
def _carry_entry(self, file_id):
450
"""Carry the file unchanged from the basis revision."""
451
if self.basis_inv.has_id(file_id):
452
self.new_inv.add(self.basis_inv[file_id].copy())
454
def _report_deletes(self):
455
for file_id in self.basis_inv:
456
if file_id not in self.new_inv:
457
self.reporter.deleted(self.basis_inv.id2path(file_id))
459
def _gen_revision_id(config, when):
460
"""Return new revision-id."""
461
s = '%s-%s-' % (config.user_email(), compact_date(when))
462
s += hexlify(rand_bytes(8))
added
removed
bzrlib/commit.py
