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