113
125
note(format, *args)
115
127
def snapshot_change(self, change, path):
116
if path == '' and change in ('added', 'modified'):
128
if change == 'unchanged':
130
if change == 'added' and path == '':
118
132
self._note("%s %s", change, path)
120
134
def started(self, revno, rev_id, location=None):
121
135
if location is not None:
122
location = ' to: ' + unescape_for_display(location, 'utf-8')
136
location = ' to "' + unescape_for_display(location, 'utf-8') + '"'
124
# When started was added, location was only made optional by
125
# accident. Matt Nordhoff 20071129
126
symbol_versioning.warn("As of bzr 1.0 you must pass a location "
127
"to started.", DeprecationWarning,
130
self._note('Committing%s', location)
139
self._note('Committing revision %d%s.', revno, location)
132
141
def completed(self, revno, rev_id):
133
142
self._note('Committed revision %d.', revno)
134
# self._note goes to the console too; so while we want to log the
135
# rev_id, we can't trivially only log it. (See bug 526425). Long
136
# term we should rearrange the reporting structure, but for now
137
# we just mutter seperately. We mutter the revid and revno together
138
# so that concurrent bzr invocations won't lead to confusion.
139
mutter('Committed revid %s as revno %d.', rev_id, revno)
141
def deleted(self, path):
142
self._note('deleted %s', path)
144
def deleted(self, file_id):
145
self._note('deleted %s', file_id)
147
def escaped(self, escape_count, message):
148
self._note("replaced %d control characters in message", escape_count)
144
150
def missing(self, path):
145
151
self._note('missing %s', path)
305
237
if message_callback is None:
306
238
if message is not None:
307
239
if isinstance(message, str):
308
message = message.decode(get_user_encoding())
240
message = message.decode(bzrlib.user_encoding)
309
241
message_callback = lambda x: message
311
243
raise BzrError("The message or message_callback keyword"
312
244
" parameter is required for commit().")
314
246
self.bound_branch = None
247
self.any_entries_changed = False
315
248
self.any_entries_deleted = False
316
if exclude is not None:
317
self.exclude = sorted(
318
minimum_path_selection(exclude))
321
249
self.local = local
322
250
self.master_branch = None
251
self.master_locked = False
323
252
self.recursive = recursive
324
253
self.rev_id = None
325
# self.specific_files is None to indicate no filter, or any iterable to
326
# indicate a filter - [] means no files at all, as per iter_changes.
327
254
if specific_files is not None:
328
255
self.specific_files = sorted(
329
256
minimum_path_selection(specific_files))
331
258
self.specific_files = None
259
self.specific_file_ids = None
333
260
self.allow_pointless = allow_pointless
261
self.revprops = revprops
334
262
self.message_callback = message_callback
335
263
self.timestamp = timestamp
336
264
self.timezone = timezone
337
265
self.committer = committer
338
266
self.strict = strict
339
267
self.verbose = verbose
268
# accumulates an inventory delta to the basis entry, so we can make
269
# just the necessary updates to the workingtree's cached basis.
270
self._basis_delta = []
341
272
self.work_tree.lock_write()
342
operation.add_cleanup(self.work_tree.unlock)
343
self.parents = self.work_tree.get_parent_ids()
344
# We can use record_iter_changes IFF iter_changes is compatible with
345
# the command line parameters, and the repository has fast delta
346
# generation. See bug 347649.
347
self.use_record_iter_changes = (
349
not self.branch.repository._format.supports_tree_reference and
350
(self.branch.repository._format.fast_deltas or
351
len(self.parents) < 2))
352
self.pb = ui.ui_factory.nested_progress_bar()
353
operation.add_cleanup(self.pb.finished)
273
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
354
274
self.basis_revid = self.work_tree.last_revision()
355
275
self.basis_tree = self.work_tree.basis_tree()
356
276
self.basis_tree.lock_read()
357
operation.add_cleanup(self.basis_tree.unlock)
358
# Cannot commit with conflicts present.
359
if len(self.work_tree.conflicts()) > 0:
360
raise ConflictsInTree
362
# Setup the bound branch variables as needed.
363
self._check_bound_branch(operation, possible_master_transports)
365
# Check that the working tree is up to date
366
old_revno, new_revno = self._check_out_of_date_tree()
368
# Complete configuration setup
369
if reporter is not None:
370
self.reporter = reporter
371
elif self.reporter is None:
372
self.reporter = self._select_reporter()
373
if self.config is None:
374
self.config = self.branch.get_config()
376
self._set_specific_file_ids()
378
# Setup the progress bar. As the number of files that need to be
379
# committed in unknown, progress is reported as stages.
380
# We keep track of entries separately though and include that
381
# information in the progress bar during the relevant stages.
382
self.pb_stage_name = ""
383
self.pb_stage_count = 0
384
self.pb_stage_total = 5
385
if self.bound_branch:
386
# 2 extra stages: "Uploading data to master branch" and "Merging
387
# tags to master branch"
388
self.pb_stage_total += 2
389
self.pb.show_pct = False
390
self.pb.show_spinner = False
391
self.pb.show_eta = False
392
self.pb.show_count = True
393
self.pb.show_bar = True
395
self._gather_parents()
396
# After a merge, a selected file commit is not supported.
397
# See 'bzr help merge' for an explanation as to why.
398
if len(self.parents) > 1 and self.specific_files is not None:
399
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
400
# Excludes are a form of selected file commit.
401
if len(self.parents) > 1 and self.exclude:
402
raise errors.CannotCommitSelectedFileMerge(self.exclude)
404
# Collect the changes
405
self._set_progress_stage("Collecting changes", counter=True)
407
self.builder = self.branch.get_commit_builder(self.parents,
408
self.config, timestamp, timezone, committer, self.revprops,
410
if not self.builder.supports_record_entry_contents and self.exclude:
412
raise errors.ExcludesUnsupported(self.branch.repository)
415
self.builder.will_record_deletes()
416
# find the location being committed to
417
if self.bound_branch:
418
master_location = self.master_branch.base
420
master_location = self.branch.base
422
# report the start of the commit
423
self.reporter.started(new_revno, self.rev_id, master_location)
425
self._update_builder_with_changes()
426
self._check_pointless()
428
# TODO: Now the new inventory is known, check for conflicts.
429
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
430
# weave lines, because nothing should be recorded until it is known
431
# that commit will succeed.
432
self._set_progress_stage("Saving data locally")
433
self.builder.finish_inventory()
435
# Prompt the user for a commit message if none provided
436
message = message_callback(self)
437
self.message = message
439
# Add revision data to the local branch
440
self.rev_id = self.builder.commit(self.message)
443
mutter("aborting commit write group because of exception:")
444
trace.log_exception_quietly()
448
self._process_pre_hooks(old_revno, new_revno)
450
# Upload revision data to the master.
451
# this will propagate merged revisions too if needed.
452
if self.bound_branch:
453
self._set_progress_stage("Uploading data to master branch")
454
# 'commit' to the master first so a timeout here causes the
455
# local branch to be out of date
456
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
457
self.branch, new_revno, self.rev_id, lossy=lossy)
459
self.branch.fetch(self.master_branch, self.rev_id)
461
# and now do the commit locally.
462
self.branch.set_last_revision_info(new_revno, self.rev_id)
464
# Merge local tags to remote
465
if self.bound_branch:
466
self._set_progress_stage("Merging tags to master branch")
467
tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
469
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
470
note("Conflicting tags in bound branch:\n" +
471
"\n".join(warning_lines))
473
# Make the working tree be up to date with the branch. This
474
# includes automatic changes scheduled to be made to the tree, such
475
# as updating its basis and unversioning paths that were missing.
476
self.work_tree.unversion(self.deleted_ids)
477
self._set_progress_stage("Updating the working tree")
478
self.work_tree.update_basis_by_delta(self.rev_id,
479
self.builder.get_basis_delta())
480
self.reporter.completed(new_revno, self.rev_id)
481
self._process_post_hooks(old_revno, new_revno)
278
# Cannot commit with conflicts present.
279
if len(self.work_tree.conflicts()) > 0:
280
raise ConflictsInTree
282
# Setup the bound branch variables as needed.
283
self._check_bound_branch()
285
# Check that the working tree is up to date
286
old_revno, new_revno = self._check_out_of_date_tree()
288
# Complete configuration setup
289
if reporter is not None:
290
self.reporter = reporter
291
elif self.reporter is None:
292
self.reporter = self._select_reporter()
293
if self.config is None:
294
self.config = self.branch.get_config()
296
# If provided, ensure the specified files are versioned
297
if self.specific_files is not None:
298
# Note: This routine is being called because it raises
299
# PathNotVersionedError as a side effect of finding the IDs. We
300
# later use the ids we found as input to the working tree
301
# inventory iterator, so we only consider those ids rather than
302
# examining the whole tree again.
303
# XXX: Dont we have filter_unversioned to do this more
305
self.specific_file_ids = tree.find_ids_across_trees(
306
specific_files, [self.basis_tree, self.work_tree])
308
# Setup the progress bar. As the number of files that need to be
309
# committed in unknown, progress is reported as stages.
310
# We keep track of entries separately though and include that
311
# information in the progress bar during the relevant stages.
312
self.pb_stage_name = ""
313
self.pb_stage_count = 0
314
self.pb_stage_total = 5
315
if self.bound_branch:
316
self.pb_stage_total += 1
317
self.pb.show_pct = False
318
self.pb.show_spinner = False
319
self.pb.show_eta = False
320
self.pb.show_count = True
321
self.pb.show_bar = True
323
# After a merge, a selected file commit is not supported.
324
# See 'bzr help merge' for an explanation as to why.
325
self.basis_inv = self.basis_tree.inventory
326
self._gather_parents()
327
if len(self.parents) > 1 and self.specific_files:
328
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
330
# Collect the changes
331
self._set_progress_stage("Collecting changes",
332
entries_title="Directory")
333
self.builder = self.branch.get_commit_builder(self.parents,
334
self.config, timestamp, timezone, committer, revprops, rev_id)
337
# find the location being committed to
338
if self.bound_branch:
339
master_location = self.master_branch.base
341
master_location = self.branch.base
343
# report the start of the commit
344
self.reporter.started(new_revno, self.rev_id, master_location)
346
self._update_builder_with_changes()
347
self._report_and_accumulate_deletes()
348
self._check_pointless()
350
# TODO: Now the new inventory is known, check for conflicts.
351
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
352
# weave lines, because nothing should be recorded until it is known
353
# that commit will succeed.
354
self._set_progress_stage("Saving data locally")
355
self.builder.finish_inventory()
357
# Prompt the user for a commit message if none provided
358
message = message_callback(self)
359
assert isinstance(message, unicode), type(message)
360
self.message = message
361
self._escape_commit_message()
363
# Add revision data to the local branch
364
self.rev_id = self.builder.commit(self.message)
370
self._process_pre_hooks(old_revno, new_revno)
372
# Upload revision data to the master.
373
# this will propagate merged revisions too if needed.
374
if self.bound_branch:
375
self._set_progress_stage("Uploading data to master branch")
376
self.master_branch.repository.fetch(self.branch.repository,
377
revision_id=self.rev_id)
378
# now the master has the revision data
379
# 'commit' to the master first so a timeout here causes the
380
# local branch to be out of date
381
self.master_branch.set_last_revision_info(new_revno,
384
# and now do the commit locally.
385
self.branch.set_last_revision_info(new_revno, self.rev_id)
387
# Make the working tree up to date with the branch
388
self._set_progress_stage("Updating the working tree")
389
self.work_tree.update_basis_by_delta(self.rev_id,
391
self.reporter.completed(new_revno, self.rev_id)
392
self._process_post_hooks(old_revno, new_revno)
482
395
return self.rev_id
484
397
def _select_reporter(self):
629
553
old_revno, old_revid, new_revno, self.rev_id,
630
554
tree_delta, future_tree)
557
"""Cleanup any open locks, progress bars etc."""
558
cleanups = [self._cleanup_bound_branch,
559
self.basis_tree.unlock,
560
self.work_tree.unlock,
562
found_exception = None
563
for cleanup in cleanups:
566
# we want every cleanup to run no matter what.
567
# so we have a catchall here, but we will raise the
568
# last encountered exception up the stack: and
569
# typically this will be useful enough.
572
if found_exception is not None:
573
# don't do a plan raise, because the last exception may have been
574
# trashed, e is our sure-to-work exception even though it loses the
575
# full traceback. XXX: RBC 20060421 perhaps we could check the
576
# exc_info and if its the same one do a plain raise otherwise
577
# 'raise e' as we do now.
580
def _cleanup_bound_branch(self):
581
"""Executed at the end of a try/finally to cleanup a bound branch.
583
If the branch wasn't bound, this is a no-op.
584
If it was, it resents self.branch to the local branch, instead
587
if not self.bound_branch:
589
if self.master_locked:
590
self.master_branch.unlock()
592
def _escape_commit_message(self):
593
"""Replace xml-incompatible control characters."""
594
# FIXME: RBC 20060419 this should be done by the revision
595
# serialiser not by commit. Then we can also add an unescaper
596
# in the deserializer and start roundtripping revision messages
597
# precisely. See repository_implementations/test_repository.py
599
# Python strings can include characters that can't be
600
# represented in well-formed XML; escape characters that
601
# aren't listed in the XML specification
602
# (http://www.w3.org/TR/REC-xml/#NT-Char).
603
self.message, escape_count = re.subn(
604
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
605
lambda match: match.group(0).encode('unicode_escape'),
608
self.reporter.escaped(escape_count, self.message)
632
610
def _gather_parents(self):
633
611
"""Record the parents of a merge for merge detection."""
634
# TODO: Make sure that this list doesn't contain duplicate
612
# TODO: Make sure that this list doesn't contain duplicate
635
613
# entries and the order is preserved when doing this.
636
if self.use_record_iter_changes:
638
self.basis_inv = self.basis_tree.inventory
614
self.parents = self.work_tree.get_parent_ids()
639
615
self.parent_invs = [self.basis_inv]
640
616
for revision in self.parents[1:]:
641
617
if self.branch.repository.has_revision(revision):
648
624
def _update_builder_with_changes(self):
649
625
"""Update the commit builder with the data about what has changed.
651
exclude = self.exclude
627
# Build the revision inventory.
629
# This starts by creating a new empty inventory. Depending on
630
# which files are selected for commit, and what is present in the
631
# current tree, the new inventory is populated. inventory entries
632
# which are candidates for modification have their revision set to
633
# None; inventory entries that are carried over untouched have their
634
# revision set to their prior value.
636
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
637
# results to create a new inventory at the same time, which results
638
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
652
641
specific_files = self.specific_files
653
642
mutter("Selecting files for commit with filter %s", specific_files)
656
if self.use_record_iter_changes:
657
iter_changes = self.work_tree.iter_changes(self.basis_tree,
658
specific_files=specific_files)
659
iter_changes = self._filter_iter_changes(iter_changes)
660
for file_id, path, fs_hash in self.builder.record_iter_changes(
661
self.work_tree, self.basis_revid, iter_changes):
662
self.work_tree._observed_sha1(file_id, path, fs_hash)
664
# Build the new inventory
665
self._populate_from_inventory()
666
self._record_unselected()
667
self._report_and_accumulate_deletes()
669
def _filter_iter_changes(self, iter_changes):
670
"""Process iter_changes.
672
This method reports on the changes in iter_changes to the user, and
673
converts 'missing' entries in the iter_changes iterator to 'deleted'
674
entries. 'missing' entries have their
676
:param iter_changes: An iter_changes to process.
677
:return: A generator of changes.
679
reporter = self.reporter
680
report_changes = reporter.is_verbose()
682
for change in iter_changes:
684
old_path = change[1][0]
685
new_path = change[1][1]
686
versioned = change[3][1]
688
versioned = change[3][1]
689
if kind is None and versioned:
692
reporter.missing(new_path)
693
deleted_ids.append(change[0])
694
# Reset the new path (None) and new versioned flag (False)
695
change = (change[0], (change[1][0], None), change[2],
696
(change[3][0], False)) + change[4:]
697
elif kind == 'tree-reference':
698
if self.recursive == 'down':
699
self._commit_nested_tree(change[0], change[1][1])
700
if change[3][0] or change[3][1]:
704
reporter.deleted(old_path)
705
elif old_path is None:
706
reporter.snapshot_change('added', new_path)
707
elif old_path != new_path:
708
reporter.renamed('renamed', old_path, new_path)
711
self.work_tree.branch.repository._format.rich_root_data):
712
# Don't report on changes to '' in non rich root
714
reporter.snapshot_change('modified', new_path)
715
self._next_progress_entry()
716
# Unversion IDs that were found to be deleted
717
self.deleted_ids = deleted_ids
719
def _record_unselected(self):
644
# Build the new inventory
645
self._populate_from_inventory(specific_files)
720
647
# If specific files are selected, then all un-selected files must be
721
648
# recorded in their previous state. For more details, see
722
649
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
723
if self.specific_files or self.exclude:
724
specific_files = self.specific_files or []
725
651
for path, old_ie in self.basis_inv.iter_entries():
726
if self.builder.new_inventory.has_id(old_ie.file_id):
652
if old_ie.file_id in self.builder.new_inventory:
727
653
# already added - skip.
729
if (is_inside_any(specific_files, path)
730
and not is_inside_any(self.exclude, path)):
731
# was inside the selected path, and not excluded - if not
732
# present it has been deleted so skip.
655
if is_inside_any(specific_files, path):
656
# was inside the selected path, if not present it has been
734
# From here down it was either not selected, or was excluded:
735
# We preserve the entry unaltered.
659
if old_ie.kind == 'directory':
660
self._next_progress_entry()
661
# not in final inv yet, was not in the selected files, so is an
662
# entry to be preserved unaltered.
736
663
ie = old_ie.copy()
737
664
# Note: specific file commits after a merge are currently
738
665
# prohibited. This test is for sanity/safety in case it's
739
666
# required after that changes.
740
667
if len(self.parents) > 1:
741
668
ie.revision = None
742
self.builder.record_entry_contents(ie, self.parent_invs, path,
743
self.basis_tree, None)
669
delta, version_recorded = self.builder.record_entry_contents(
670
ie, self.parent_invs, path, self.basis_tree, None)
672
self.any_entries_changed = True
673
if delta: self._basis_delta.append(delta)
745
675
def _report_and_accumulate_deletes(self):
746
if (isinstance(self.basis_inv, Inventory)
747
and isinstance(self.builder.new_inventory, Inventory)):
748
# the older Inventory classes provide a _byid dict, and building a
749
# set from the keys of this dict is substantially faster than even
750
# getting a set of ids from the inventory
752
# <lifeless> set(dict) is roughly the same speed as
753
# set(iter(dict)) and both are significantly slower than
755
deleted_ids = set(self.basis_inv._byid.keys()) - \
756
set(self.builder.new_inventory._byid.keys())
758
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
676
# XXX: Could the list of deleted paths and ids be instead taken from
677
# _populate_from_inventory?
678
deleted_ids = set(self.basis_inv._byid.keys()) - \
679
set(self.builder.new_inventory._byid.keys())
760
681
self.any_entries_deleted = True
761
682
deleted = [(self.basis_tree.id2path(file_id), file_id)
added
removed
bzrlib/commit.py
