336
285
self.verbose = verbose
338
287
self.work_tree.lock_write()
339
operation.add_cleanup(self.work_tree.unlock)
340
288
self.parents = self.work_tree.get_parent_ids()
341
289
# We can use record_iter_changes IFF iter_changes is compatible with
342
290
# the command line parameters, and the repository has fast delta
343
291
# generation. See bug 347649.
344
292
self.use_record_iter_changes = (
293
not self.specific_files and
345
294
not self.exclude and
346
295
not self.branch.repository._format.supports_tree_reference and
347
296
(self.branch.repository._format.fast_deltas or
348
297
len(self.parents) < 2))
349
self.pb = ui.ui_factory.nested_progress_bar()
350
operation.add_cleanup(self.pb.finished)
298
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
351
299
self.basis_revid = self.work_tree.last_revision()
352
300
self.basis_tree = self.work_tree.basis_tree()
353
301
self.basis_tree.lock_read()
354
operation.add_cleanup(self.basis_tree.unlock)
355
# Cannot commit with conflicts present.
356
if len(self.work_tree.conflicts()) > 0:
357
raise ConflictsInTree
359
# Setup the bound branch variables as needed.
360
self._check_bound_branch(operation, possible_master_transports)
362
# Check that the working tree is up to date
363
old_revno, new_revno = self._check_out_of_date_tree()
365
# Complete configuration setup
366
if reporter is not None:
367
self.reporter = reporter
368
elif self.reporter is None:
369
self.reporter = self._select_reporter()
370
if self.config is None:
371
self.config = self.branch.get_config()
373
self._set_specific_file_ids()
375
# Setup the progress bar. As the number of files that need to be
376
# committed in unknown, progress is reported as stages.
377
# We keep track of entries separately though and include that
378
# information in the progress bar during the relevant stages.
379
self.pb_stage_name = ""
380
self.pb_stage_count = 0
381
self.pb_stage_total = 5
382
if self.bound_branch:
383
# 2 extra stages: "Uploading data to master branch" and "Merging
384
# tags to master branch"
385
self.pb_stage_total += 2
386
self.pb.show_pct = False
387
self.pb.show_spinner = False
388
self.pb.show_eta = False
389
self.pb.show_count = True
390
self.pb.show_bar = True
392
self._gather_parents()
393
# After a merge, a selected file commit is not supported.
394
# See 'bzr help merge' for an explanation as to why.
395
if len(self.parents) > 1 and self.specific_files is not None:
396
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
397
# Excludes are a form of selected file commit.
398
if len(self.parents) > 1 and self.exclude:
399
raise errors.CannotCommitSelectedFileMerge(self.exclude)
401
# Collect the changes
402
self._set_progress_stage("Collecting changes", counter=True)
403
self.builder = self.branch.get_commit_builder(self.parents,
404
self.config, timestamp, timezone, committer, self.revprops, rev_id)
407
self.builder.will_record_deletes()
408
# find the location being committed to
409
if self.bound_branch:
410
master_location = self.master_branch.base
412
master_location = self.branch.base
414
# report the start of the commit
415
self.reporter.started(new_revno, self.rev_id, master_location)
417
self._update_builder_with_changes()
418
self._check_pointless()
420
# TODO: Now the new inventory is known, check for conflicts.
421
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
422
# weave lines, because nothing should be recorded until it is known
423
# that commit will succeed.
424
self._set_progress_stage("Saving data locally")
425
self.builder.finish_inventory()
427
# Prompt the user for a commit message if none provided
428
message = message_callback(self)
429
self.message = message
431
# Add revision data to the local branch
432
self.rev_id = self.builder.commit(self.message)
435
mutter("aborting commit write group because of exception:")
436
trace.log_exception_quietly()
437
note("aborting commit write group: %r" % (e,))
441
self._process_pre_hooks(old_revno, new_revno)
443
# Upload revision data to the master.
444
# this will propagate merged revisions too if needed.
445
if self.bound_branch:
446
self._set_progress_stage("Uploading data to master branch")
447
# 'commit' to the master first so a timeout here causes the
448
# local branch to be out of date
449
self.master_branch.import_last_revision_info_and_tags(
450
self.branch, new_revno, self.rev_id)
452
# and now do the commit locally.
453
self.branch.set_last_revision_info(new_revno, self.rev_id)
455
# Merge local tags to remote
456
if self.bound_branch:
457
self._set_progress_stage("Merging tags to master branch")
458
tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
460
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
461
note("Conflicting tags in bound branch:\n" +
462
"\n".join(warning_lines))
464
# Make the working tree be up to date with the branch. This
465
# includes automatic changes scheduled to be made to the tree, such
466
# as updating its basis and unversioning paths that were missing.
467
self.work_tree.unversion(self.deleted_ids)
468
self._set_progress_stage("Updating the working tree")
469
self.work_tree.update_basis_by_delta(self.rev_id,
470
self.builder.get_basis_delta())
471
self.reporter.completed(new_revno, self.rev_id)
472
self._process_post_hooks(old_revno, new_revno)
303
# Cannot commit with conflicts present.
304
if len(self.work_tree.conflicts()) > 0:
305
raise ConflictsInTree
307
# Setup the bound branch variables as needed.
308
self._check_bound_branch(possible_master_transports)
310
# Check that the working tree is up to date
311
old_revno, new_revno = self._check_out_of_date_tree()
313
# Complete configuration setup
314
if reporter is not None:
315
self.reporter = reporter
316
elif self.reporter is None:
317
self.reporter = self._select_reporter()
318
if self.config is None:
319
self.config = self.branch.get_config()
321
self._set_specific_file_ids()
323
# Setup the progress bar. As the number of files that need to be
324
# committed in unknown, progress is reported as stages.
325
# We keep track of entries separately though and include that
326
# information in the progress bar during the relevant stages.
327
self.pb_stage_name = ""
328
self.pb_stage_count = 0
329
self.pb_stage_total = 5
330
if self.bound_branch:
331
self.pb_stage_total += 1
332
self.pb.show_pct = False
333
self.pb.show_spinner = False
334
self.pb.show_eta = False
335
self.pb.show_count = True
336
self.pb.show_bar = True
338
self._gather_parents()
339
# After a merge, a selected file commit is not supported.
340
# See 'bzr help merge' for an explanation as to why.
341
if len(self.parents) > 1 and self.specific_files:
342
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
343
# Excludes are a form of selected file commit.
344
if len(self.parents) > 1 and self.exclude:
345
raise errors.CannotCommitSelectedFileMerge(self.exclude)
347
# Collect the changes
348
self._set_progress_stage("Collecting changes", counter=True)
349
self.builder = self.branch.get_commit_builder(self.parents,
350
self.config, timestamp, timezone, committer, revprops, rev_id)
353
self.builder.will_record_deletes()
354
# find the location being committed to
355
if self.bound_branch:
356
master_location = self.master_branch.base
358
master_location = self.branch.base
360
# report the start of the commit
361
self.reporter.started(new_revno, self.rev_id, master_location)
363
self._update_builder_with_changes()
364
self._check_pointless()
366
# TODO: Now the new inventory is known, check for conflicts.
367
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
368
# weave lines, because nothing should be recorded until it is known
369
# that commit will succeed.
370
self._set_progress_stage("Saving data locally")
371
self.builder.finish_inventory()
373
# Prompt the user for a commit message if none provided
374
message = message_callback(self)
375
self.message = message
376
self._escape_commit_message()
378
# Add revision data to the local branch
379
self.rev_id = self.builder.commit(self.message)
382
mutter("aborting commit write group because of exception:")
383
trace.log_exception_quietly()
384
note("aborting commit write group: %r" % (e,))
388
self._process_pre_hooks(old_revno, new_revno)
390
# Upload revision data to the master.
391
# this will propagate merged revisions too if needed.
392
if self.bound_branch:
393
self._set_progress_stage("Uploading data to master branch")
394
# 'commit' to the master first so a timeout here causes the
395
# local branch to be out of date
396
self.master_branch.import_last_revision_info(
397
self.branch.repository, new_revno, self.rev_id)
399
# and now do the commit locally.
400
self.branch.set_last_revision_info(new_revno, self.rev_id)
402
# Make the working tree up to date with the branch
403
self._set_progress_stage("Updating the working tree")
404
self.work_tree.update_basis_by_delta(self.rev_id,
405
self.builder.get_basis_delta())
406
self.reporter.completed(new_revno, self.rev_id)
407
self._process_post_hooks(old_revno, new_revno)
473
410
return self.rev_id
475
412
def _select_reporter(self):
629
566
old_revno, old_revid, new_revno, self.rev_id,
630
567
tree_delta, future_tree)
570
"""Cleanup any open locks, progress bars etc."""
571
cleanups = [self._cleanup_bound_branch,
572
self.basis_tree.unlock,
573
self.work_tree.unlock,
575
found_exception = None
576
for cleanup in cleanups:
579
# we want every cleanup to run no matter what.
580
# so we have a catchall here, but we will raise the
581
# last encountered exception up the stack: and
582
# typically this will be useful enough.
585
if found_exception is not None:
586
# don't do a plan raise, because the last exception may have been
587
# trashed, e is our sure-to-work exception even though it loses the
588
# full traceback. XXX: RBC 20060421 perhaps we could check the
589
# exc_info and if its the same one do a plain raise otherwise
590
# 'raise e' as we do now.
593
def _cleanup_bound_branch(self):
594
"""Executed at the end of a try/finally to cleanup a bound branch.
596
If the branch wasn't bound, this is a no-op.
597
If it was, it resents self.branch to the local branch, instead
600
if not self.bound_branch:
602
if self.master_locked:
603
self.master_branch.unlock()
605
def _escape_commit_message(self):
606
"""Replace xml-incompatible control characters."""
607
# FIXME: RBC 20060419 this should be done by the revision
608
# serialiser not by commit. Then we can also add an unescaper
609
# in the deserializer and start roundtripping revision messages
610
# precisely. See repository_implementations/test_repository.py
611
self.message, escape_count = xml_serializer.escape_invalid_chars(
614
self.reporter.escaped(escape_count, self.message)
632
616
def _gather_parents(self):
633
617
"""Record the parents of a merge for merge detection."""
634
618
# TODO: Make sure that this list doesn't contain duplicate
added
removed
bzrlib/commit.py
