339
284
self.verbose = verbose
341
286
self.work_tree.lock_write()
342
operation.add_cleanup(self.work_tree.unlock)
343
287
self.parents = self.work_tree.get_parent_ids()
344
288
# We can use record_iter_changes IFF iter_changes is compatible with
345
289
# the command line parameters, and the repository has fast delta
346
290
# generation. See bug 347649.
347
291
self.use_record_iter_changes = (
292
not self.specific_files and
348
293
not self.exclude and
349
294
not self.branch.repository._format.supports_tree_reference and
350
295
(self.branch.repository._format.fast_deltas or
351
296
len(self.parents) < 2))
352
self.pb = ui.ui_factory.nested_progress_bar()
353
operation.add_cleanup(self.pb.finished)
297
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
354
298
self.basis_revid = self.work_tree.last_revision()
355
299
self.basis_tree = self.work_tree.basis_tree()
356
300
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)
302
# Cannot commit with conflicts present.
303
if len(self.work_tree.conflicts()) > 0:
304
raise ConflictsInTree
306
# Setup the bound branch variables as needed.
307
self._check_bound_branch(possible_master_transports)
309
# Check that the working tree is up to date
310
old_revno, new_revno = self._check_out_of_date_tree()
312
# Complete configuration setup
313
if reporter is not None:
314
self.reporter = reporter
315
elif self.reporter is None:
316
self.reporter = self._select_reporter()
317
if self.config is None:
318
self.config = self.branch.get_config()
320
self._set_specific_file_ids()
322
# Setup the progress bar. As the number of files that need to be
323
# committed in unknown, progress is reported as stages.
324
# We keep track of entries separately though and include that
325
# information in the progress bar during the relevant stages.
326
self.pb_stage_name = ""
327
self.pb_stage_count = 0
328
self.pb_stage_total = 5
329
if self.bound_branch:
330
self.pb_stage_total += 1
331
self.pb.show_pct = False
332
self.pb.show_spinner = False
333
self.pb.show_eta = False
334
self.pb.show_count = True
335
self.pb.show_bar = True
337
self._gather_parents()
338
# After a merge, a selected file commit is not supported.
339
# See 'bzr help merge' for an explanation as to why.
340
if len(self.parents) > 1 and self.specific_files:
341
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
342
# Excludes are a form of selected file commit.
343
if len(self.parents) > 1 and self.exclude:
344
raise errors.CannotCommitSelectedFileMerge(self.exclude)
346
# Collect the changes
347
self._set_progress_stage("Collecting changes", counter=True)
348
self.builder = self.branch.get_commit_builder(self.parents,
349
self.config, timestamp, timezone, committer, revprops, rev_id)
352
self.builder.will_record_deletes()
353
# find the location being committed to
354
if self.bound_branch:
355
master_location = self.master_branch.base
357
master_location = self.branch.base
359
# report the start of the commit
360
self.reporter.started(new_revno, self.rev_id, master_location)
362
self._update_builder_with_changes()
363
self._check_pointless()
365
# TODO: Now the new inventory is known, check for conflicts.
366
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
367
# weave lines, because nothing should be recorded until it is known
368
# that commit will succeed.
369
self._set_progress_stage("Saving data locally")
370
self.builder.finish_inventory()
372
# Prompt the user for a commit message if none provided
373
message = message_callback(self)
374
self.message = message
375
self._escape_commit_message()
377
# Add revision data to the local branch
378
self.rev_id = self.builder.commit(self.message)
381
mutter("aborting commit write group because of exception:")
382
trace.log_exception_quietly()
383
note("aborting commit write group: %r" % (e,))
387
self._process_pre_hooks(old_revno, new_revno)
389
# Upload revision data to the master.
390
# this will propagate merged revisions too if needed.
391
if self.bound_branch:
392
self._set_progress_stage("Uploading data to master branch")
393
# 'commit' to the master first so a timeout here causes the
394
# local branch to be out of date
395
self.master_branch.import_last_revision_info(
396
self.branch.repository, new_revno, self.rev_id)
398
# and now do the commit locally.
399
self.branch.set_last_revision_info(new_revno, self.rev_id)
401
# Make the working tree up to date with the branch
402
self._set_progress_stage("Updating the working tree")
403
self.work_tree.update_basis_by_delta(self.rev_id,
404
self.builder.get_basis_delta())
405
self.reporter.completed(new_revno, self.rev_id)
406
self._process_post_hooks(old_revno, new_revno)
482
409
return self.rev_id
484
411
def _select_reporter(self):
629
565
old_revno, old_revid, new_revno, self.rev_id,
630
566
tree_delta, future_tree)
569
"""Cleanup any open locks, progress bars etc."""
570
cleanups = [self._cleanup_bound_branch,
571
self.basis_tree.unlock,
572
self.work_tree.unlock,
574
found_exception = None
575
for cleanup in cleanups:
578
# we want every cleanup to run no matter what.
579
# so we have a catchall here, but we will raise the
580
# last encountered exception up the stack: and
581
# typically this will be useful enough.
584
if found_exception is not None:
585
# don't do a plan raise, because the last exception may have been
586
# trashed, e is our sure-to-work exception even though it loses the
587
# full traceback. XXX: RBC 20060421 perhaps we could check the
588
# exc_info and if its the same one do a plain raise otherwise
589
# 'raise e' as we do now.
592
def _cleanup_bound_branch(self):
593
"""Executed at the end of a try/finally to cleanup a bound branch.
595
If the branch wasn't bound, this is a no-op.
596
If it was, it resents self.branch to the local branch, instead
599
if not self.bound_branch:
601
if self.master_locked:
602
self.master_branch.unlock()
604
def _escape_commit_message(self):
605
"""Replace xml-incompatible control characters."""
606
# FIXME: RBC 20060419 this should be done by the revision
607
# serialiser not by commit. Then we can also add an unescaper
608
# in the deserializer and start roundtripping revision messages
609
# precisely. See repository_implementations/test_repository.py
611
# Python strings can include characters that can't be
612
# represented in well-formed XML; escape characters that
613
# aren't listed in the XML specification
614
# (http://www.w3.org/TR/REC-xml/#NT-Char).
615
self.message, escape_count = re.subn(
616
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
617
lambda match: match.group(0).encode('unicode_escape'),
620
self.reporter.escaped(escape_count, self.message)
632
622
def _gather_parents(self):
633
623
"""Record the parents of a merge for merge detection."""
634
624
# TODO: Make sure that this list doesn't contain duplicate
added
removed
bzrlib/commit.py
