183
202
working_tree=None,
206
message_callback=None,
187
208
"""Commit working copy as a new revision.
189
branch -- the deprecated branch to commit to. New callers should pass in
192
message -- the commit message, a mandatory parameter
194
timestamp -- if not None, seconds-since-epoch for a
195
postdated/predated commit.
197
specific_files -- If true, commit only those files.
199
rev_id -- If set, use this as the new revision id.
210
:param message: the commit message (it or message_callback is required)
212
:param timestamp: if not None, seconds-since-epoch for a
213
postdated/predated commit.
215
:param specific_files: If true, commit only those files.
217
:param rev_id: If set, use this as the new revision id.
200
218
Useful for test or import commands that need to tightly
201
219
control what revisions are assigned. If you duplicate
202
220
a revision id that exists elsewhere it is your own fault.
203
221
If null (default), a time/random revision id is generated.
205
allow_pointless -- If true (default), commit even if nothing
223
:param allow_pointless: If true (default), commit even if nothing
206
224
has changed and no merges are recorded.
208
strict -- If true, don't allow a commit if the working tree
226
:param strict: If true, don't allow a commit if the working tree
209
227
contains unknown files.
211
revprops -- Properties for new revision
229
:param revprops: Properties for new revision
212
230
:param local: Perform a local only commit.
231
:param reporter: the reporter to use or None for the default
232
:param verbose: if True and the reporter is not None, report everything
233
:param recursive: If set to 'down', commit in any subtrees that have
234
pending changes of any sort during this commit.
214
236
mutter('preparing to commit')
216
if deprecated_passed(branch):
217
warn("Commit.commit (branch, ...): The branch parameter is "
218
"deprecated as of bzr 0.8. Please use working_tree= instead.",
219
DeprecationWarning, stacklevel=2)
221
self.work_tree = self.branch.bzrdir.open_workingtree()
222
elif working_tree is None:
223
raise BzrError("One of branch and working_tree must be passed into commit().")
238
if working_tree is None:
239
raise BzrError("working_tree must be passed into commit().")
225
241
self.work_tree = working_tree
226
242
self.branch = self.work_tree.branch
228
raise BzrError("The message keyword parameter is required for commit().")
243
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
244
if not self.branch.repository.supports_rich_root():
245
raise errors.RootNotRich()
246
if message_callback is None:
247
if message is not None:
248
if isinstance(message, str):
249
message = message.decode(bzrlib.user_encoding)
250
message_callback = lambda x: message
252
raise BzrError("The message or message_callback keyword"
253
" parameter is required for commit().")
230
self.weave_store = self.branch.repository.weave_store
231
255
self.bound_branch = None
256
self.any_entries_changed = False
257
self.any_entries_deleted = False
232
258
self.local = local
233
259
self.master_branch = None
234
260
self.master_locked = False
236
self.specific_files = specific_files
261
self.recursive = recursive
263
if specific_files is not None:
264
self.specific_files = sorted(
265
minimum_path_selection(specific_files))
267
self.specific_files = None
268
self.specific_file_ids = None
237
269
self.allow_pointless = allow_pointless
239
if revprops is not None:
240
self.revprops.update(revprops)
242
if reporter is None and self.reporter is None:
243
self.reporter = NullCommitReporter()
244
elif reporter is not None:
245
self.reporter = reporter
270
self.revprops = revprops
271
self.message_callback = message_callback
272
self.timestamp = timestamp
273
self.timezone = timezone
274
self.committer = committer
276
self.verbose = verbose
277
# accumulates an inventory delta to the basis entry, so we can make
278
# just the necessary updates to the workingtree's cached basis.
279
self._basis_delta = []
247
281
self.work_tree.lock_write()
282
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
283
self.basis_revid = self.work_tree.last_revision()
284
self.basis_tree = self.work_tree.basis_tree()
285
self.basis_tree.lock_read()
249
# setup the bound branch variables as needed.
287
# Cannot commit with conflicts present.
288
if len(self.work_tree.conflicts()) > 0:
289
raise ConflictsInTree
291
# Setup the bound branch variables as needed.
250
292
self._check_bound_branch()
252
# check for out of date working trees
253
# if we are bound, then self.branch is the master branch and this
254
# test is thus all we need.
255
if self.work_tree.last_revision() != self.master_branch.last_revision():
256
raise errors.OutOfDateTree(self.work_tree)
259
# raise an exception as soon as we find a single unknown.
260
for unknown in self.work_tree.unknowns():
261
raise StrictCommitFailed()
263
if timestamp is None:
264
self.timestamp = time.time()
266
self.timestamp = long(timestamp)
294
# Check that the working tree is up to date
295
old_revno, new_revno = self._check_out_of_date_tree()
297
# Complete configuration setup
298
if reporter is not None:
299
self.reporter = reporter
300
elif self.reporter is None:
301
self.reporter = self._select_reporter()
268
302
if self.config is None:
269
self.config = bzrlib.config.BranchConfig(self.branch)
272
self.rev_id = _gen_revision_id(self.config, self.timestamp)
276
if committer is None:
277
self.committer = self.config.username()
279
assert isinstance(committer, basestring), type(committer)
280
self.committer = committer
283
self.timezone = local_time_offset()
285
self.timezone = int(timezone)
287
if isinstance(message, str):
288
message = message.decode(bzrlib.user_encoding)
289
assert isinstance(message, unicode), type(message)
290
self.message = message
291
self._escape_commit_message()
293
self.work_inv = self.work_tree.inventory
294
self.basis_tree = self.work_tree.basis_tree()
303
self.config = self.branch.get_config()
305
# If provided, ensure the specified files are versioned
306
if self.specific_files is not None:
307
# Note: This routine is being called because it raises
308
# PathNotVersionedError as a side effect of finding the IDs. We
309
# later use the ids we found as input to the working tree
310
# inventory iterator, so we only consider those ids rather than
311
# examining the whole tree again.
312
# XXX: Dont we have filter_unversioned to do this more
314
self.specific_file_ids = tree.find_ids_across_trees(
315
specific_files, [self.basis_tree, self.work_tree])
317
# Setup the progress bar. As the number of files that need to be
318
# committed in unknown, progress is reported as stages.
319
# We keep track of entries separately though and include that
320
# information in the progress bar during the relevant stages.
321
self.pb_stage_name = ""
322
self.pb_stage_count = 0
323
self.pb_stage_total = 5
324
if self.bound_branch:
325
self.pb_stage_total += 1
326
self.pb.show_pct = False
327
self.pb.show_spinner = False
328
self.pb.show_eta = False
329
self.pb.show_count = True
330
self.pb.show_bar = True
332
# After a merge, a selected file commit is not supported.
333
# See 'bzr help merge' for an explanation as to why.
295
334
self.basis_inv = self.basis_tree.inventory
297
335
self._gather_parents()
298
336
if len(self.parents) > 1 and self.specific_files:
299
raise NotImplementedError('selected-file commit of merges is not supported yet')
300
self._check_parents_present()
302
self._remove_deleted()
303
self._populate_new_inv()
304
self._store_snapshot()
305
self._report_deletes()
307
if not (self.allow_pointless
308
or len(self.parents) > 1
309
or self.new_inv != self.basis_inv):
310
raise PointlessCommit()
312
if len(self.work_tree.conflicts())>0:
313
raise ConflictsInTree
315
self.inv_sha1 = self.branch.repository.add_inventory(
320
self._make_revision()
321
# revision data is in the local branch now.
323
# upload revision data to the master.
324
# this will propogate merged revisions too if needed.
337
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
339
# Collect the changes
340
self._set_progress_stage("Collecting changes",
341
entries_title="Directory")
342
self.builder = self.branch.get_commit_builder(self.parents,
343
self.config, timestamp, timezone, committer, revprops, rev_id)
346
# find the location being committed to
347
if self.bound_branch:
348
master_location = self.master_branch.base
350
master_location = self.branch.base
352
# report the start of the commit
353
self.reporter.started(new_revno, self.rev_id, master_location)
355
self._update_builder_with_changes()
356
self._report_and_accumulate_deletes()
357
self._check_pointless()
359
# TODO: Now the new inventory is known, check for conflicts.
360
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
361
# weave lines, because nothing should be recorded until it is known
362
# that commit will succeed.
363
self._set_progress_stage("Saving data locally")
364
self.builder.finish_inventory()
366
# Prompt the user for a commit message if none provided
367
message = message_callback(self)
368
self.message = message
369
self._escape_commit_message()
371
# Add revision data to the local branch
372
self.rev_id = self.builder.commit(self.message)
378
self._process_pre_hooks(old_revno, new_revno)
380
# Upload revision data to the master.
381
# this will propagate merged revisions too if needed.
325
382
if self.bound_branch:
326
self.master_branch.repository.fetch(self.branch.repository,
327
revision_id=self.rev_id)
383
if not self.master_branch.repository.has_same_location(
384
self.branch.repository):
385
self._set_progress_stage("Uploading data to master branch")
386
self.master_branch.repository.fetch(self.branch.repository,
387
revision_id=self.rev_id)
328
388
# now the master has the revision data
329
# 'commit' to the master first so a timeout here causes the local
330
# branch to be out of date
331
self.master_branch.append_revision(self.rev_id)
389
# 'commit' to the master first so a timeout here causes the
390
# local branch to be out of date
391
self.master_branch.set_last_revision_info(new_revno,
333
394
# and now do the commit locally.
334
self.branch.append_revision(self.rev_id)
395
self.branch.set_last_revision_info(new_revno, self.rev_id)
336
self.work_tree.set_pending_merges([])
337
self.work_tree.set_last_revision(self.rev_id)
338
# now the work tree is up to date with the branch
340
self.reporter.completed(self.branch.revno(), self.rev_id)
341
if self.config.post_commit() is not None:
342
hooks = self.config.post_commit().split(' ')
343
# this would be nicer with twisted.python.reflect.namedAny
345
result = eval(hook + '(branch, rev_id)',
346
{'branch':self.branch,
348
'rev_id':self.rev_id})
397
# Make the working tree up to date with the branch
398
self._set_progress_stage("Updating the working tree")
399
self.work_tree.update_basis_by_delta(self.rev_id,
401
self.reporter.completed(new_revno, self.rev_id)
402
self._process_post_hooks(old_revno, new_revno)
350
self._cleanup_bound_branch()
351
self.work_tree.unlock()
407
def _select_reporter(self):
408
"""Select the CommitReporter to use."""
410
return NullCommitReporter()
411
return ReportCommitToLog()
413
def _check_pointless(self):
414
if self.allow_pointless:
416
# A merge with no effect on files
417
if len(self.parents) > 1:
419
# TODO: we could simplify this by using self._basis_delta.
421
# The initial commit adds a root directory, but this in itself is not
422
# a worthwhile commit.
423
if (self.basis_revid == revision.NULL_REVISION and
424
len(self.builder.new_inventory) == 1):
425
raise PointlessCommit()
426
# If length == 1, then we only have the root entry. Which means
427
# that there is no real difference (only the root could be different)
428
# unless deletes occured, in which case the length is irrelevant.
429
if (self.any_entries_deleted or
430
(len(self.builder.new_inventory) != 1 and
431
self.any_entries_changed)):
433
raise PointlessCommit()
353
435
def _check_bound_branch(self):
354
436
"""Check to see if the local branch is bound.
391
473
self.bound_branch = self.branch
392
474
self.master_branch.lock_write()
393
475
self.master_locked = True
395
#### # Check to see if we have any pending merges. If we do
396
#### # those need to be pushed into the master branch
397
#### pending_merges = self.work_tree.pending_merges()
398
#### if pending_merges:
399
#### for revision_id in pending_merges:
400
#### self.master_branch.repository.fetch(self.bound_branch.repository,
401
#### revision_id=revision_id)
477
def _check_out_of_date_tree(self):
478
"""Check that the working tree is up to date.
480
:return: old_revision_number,new_revision_number tuple
483
first_tree_parent = self.work_tree.get_parent_ids()[0]
485
# if there are no parents, treat our parent as 'None'
486
# this is so that we still consider the master branch
487
# - in a checkout scenario the tree may have no
488
# parents but the branch may do.
489
first_tree_parent = bzrlib.revision.NULL_REVISION
490
old_revno, master_last = self.master_branch.last_revision_info()
491
if master_last != first_tree_parent:
492
if master_last != bzrlib.revision.NULL_REVISION:
493
raise errors.OutOfDateTree(self.work_tree)
494
if self.branch.repository.has_revision(first_tree_parent):
495
new_revno = old_revno + 1
497
# ghost parents never appear in revision history.
499
return old_revno,new_revno
501
def _process_pre_hooks(self, old_revno, new_revno):
502
"""Process any registered pre commit hooks."""
503
self._set_progress_stage("Running pre_commit hooks")
504
self._process_hooks("pre_commit", old_revno, new_revno)
506
def _process_post_hooks(self, old_revno, new_revno):
507
"""Process any registered post commit hooks."""
508
# Process the post commit hooks, if any
509
self._set_progress_stage("Running post_commit hooks")
510
# old style commit hooks - should be deprecated ? (obsoleted in
512
if self.config.post_commit() is not None:
513
hooks = self.config.post_commit().split(' ')
514
# this would be nicer with twisted.python.reflect.namedAny
516
result = eval(hook + '(branch, rev_id)',
517
{'branch':self.branch,
519
'rev_id':self.rev_id})
520
# process new style post commit hooks
521
self._process_hooks("post_commit", old_revno, new_revno)
523
def _process_hooks(self, hook_name, old_revno, new_revno):
524
if not Branch.hooks[hook_name]:
527
# new style commit hooks:
528
if not self.bound_branch:
529
hook_master = self.branch
532
hook_master = self.master_branch
533
hook_local = self.branch
534
# With bound branches, when the master is behind the local branch,
535
# the 'old_revno' and old_revid values here are incorrect.
536
# XXX: FIXME ^. RBC 20060206
538
old_revid = self.parents[0]
540
old_revid = bzrlib.revision.NULL_REVISION
542
if hook_name == "pre_commit":
543
future_tree = self.builder.revision_tree()
544
tree_delta = future_tree.changes_from(self.basis_tree,
547
for hook in Branch.hooks[hook_name]:
548
# show the running hook in the progress bar. As hooks may
549
# end up doing nothing (e.g. because they are not configured by
550
# the user) this is still showing progress, not showing overall
551
# actions - its up to each plugin to show a UI if it want's to
552
# (such as 'Emailing diff to foo@example.com').
553
self.pb_stage_name = "Running %s hooks [%s]" % \
554
(hook_name, Branch.hooks.get_hook_name(hook))
555
self._emit_progress()
556
if 'hooks' in debug.debug_flags:
557
mutter("Invoking commit hook: %r", hook)
558
if hook_name == "post_commit":
559
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
561
elif hook_name == "pre_commit":
562
hook(hook_local, hook_master,
563
old_revno, old_revid, new_revno, self.rev_id,
564
tree_delta, future_tree)
567
"""Cleanup any open locks, progress bars etc."""
568
cleanups = [self._cleanup_bound_branch,
569
self.basis_tree.unlock,
570
self.work_tree.unlock,
572
found_exception = None
573
for cleanup in cleanups:
576
# we want every cleanup to run no matter what.
577
# so we have a catchall here, but we will raise the
578
# last encountered exception up the stack: and
579
# typically this will be useful enough.
582
if found_exception is not None:
583
# don't do a plan raise, because the last exception may have been
584
# trashed, e is our sure-to-work exception even though it loses the
585
# full traceback. XXX: RBC 20060421 perhaps we could check the
586
# exc_info and if its the same one do a plain raise otherwise
587
# 'raise e' as we do now.
403
590
def _cleanup_bound_branch(self):
404
591
"""Executed at the end of a try/finally to cleanup a bound branch.
428
620
def _gather_parents(self):
429
621
"""Record the parents of a merge for merge detection."""
430
pending_merges = self.work_tree.pending_merges()
432
self.parent_invs = []
433
self.present_parents = []
434
precursor_id = self.branch.last_revision()
436
self.parents.append(precursor_id)
437
self.parents += pending_merges
438
for revision in self.parents:
622
# TODO: Make sure that this list doesn't contain duplicate
623
# entries and the order is preserved when doing this.
624
self.parents = self.work_tree.get_parent_ids()
625
self.parent_invs = [self.basis_inv]
626
for revision in self.parents[1:]:
439
627
if self.branch.repository.has_revision(revision):
628
mutter('commit parent revision {%s}', revision)
440
629
inventory = self.branch.repository.get_inventory(revision)
441
630
self.parent_invs.append(inventory)
442
self.present_parents.append(revision)
444
def _check_parents_present(self):
445
for parent_id in self.parents:
446
mutter('commit parent revision {%s}', parent_id)
447
if not self.branch.repository.has_revision(parent_id):
448
if parent_id == self.branch.last_revision():
449
warning("parent is missing %r", parent_id)
450
raise HistoryMissing(self.branch, 'revision', parent_id)
452
mutter("commit will ghost revision %r", parent_id)
454
def _make_revision(self):
455
"""Record a new revision object for this commit."""
456
rev = Revision(timestamp=self.timestamp,
457
timezone=self.timezone,
458
committer=self.committer,
459
message=self.message,
460
inventory_sha1=self.inv_sha1,
461
revision_id=self.rev_id,
462
properties=self.revprops)
463
rev.parent_ids = self.parents
464
self.branch.repository.add_revision(self.rev_id, rev, self.new_inv, self.config)
466
def _remove_deleted(self):
467
"""Remove deleted files from the working inventories.
469
This is done prior to taking the working inventory as the
470
basis for the new committed inventory.
472
This returns true if any files
473
*that existed in the basis inventory* were deleted.
474
Files that were added and deleted
475
in the working copy don't matter.
632
mutter('commit parent ghost revision {%s}', revision)
634
def _update_builder_with_changes(self):
635
"""Update the commit builder with the data about what has changed.
477
specific = self.specific_files
637
# Build the revision inventory.
639
# This starts by creating a new empty inventory. Depending on
640
# which files are selected for commit, and what is present in the
641
# current tree, the new inventory is populated. inventory entries
642
# which are candidates for modification have their revision set to
643
# None; inventory entries that are carried over untouched have their
644
# revision set to their prior value.
646
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
647
# results to create a new inventory at the same time, which results
648
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
651
specific_files = self.specific_files
652
mutter("Selecting files for commit with filter %s", specific_files)
654
# Build the new inventory
655
self._populate_from_inventory(specific_files)
657
# If specific files are selected, then all un-selected files must be
658
# recorded in their previous state. For more details, see
659
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
661
for path, old_ie in self.basis_inv.iter_entries():
662
if old_ie.file_id in self.builder.new_inventory:
663
# already added - skip.
665
if is_inside_any(specific_files, path):
666
# was inside the selected path, if not present it has been
669
if old_ie.kind == 'directory':
670
self._next_progress_entry()
671
# not in final inv yet, was not in the selected files, so is an
672
# entry to be preserved unaltered.
674
# Note: specific file commits after a merge are currently
675
# prohibited. This test is for sanity/safety in case it's
676
# required after that changes.
677
if len(self.parents) > 1:
679
delta, version_recorded = self.builder.record_entry_contents(
680
ie, self.parent_invs, path, self.basis_tree, None)
682
self.any_entries_changed = True
683
if delta: self._basis_delta.append(delta)
685
def _report_and_accumulate_deletes(self):
686
# XXX: Could the list of deleted paths and ids be instead taken from
687
# _populate_from_inventory?
688
deleted_ids = set(self.basis_inv._byid.keys()) - \
689
set(self.builder.new_inventory._byid.keys())
691
self.any_entries_deleted = True
692
deleted = [(self.basis_tree.id2path(file_id), file_id)
693
for file_id in deleted_ids]
695
# XXX: this is not quite directory-order sorting
696
for path, file_id in deleted:
697
self._basis_delta.append((path, None, file_id, None))
698
self.reporter.deleted(path)
700
def _populate_from_inventory(self, specific_files):
701
"""Populate the CommitBuilder by walking the working tree inventory."""
703
# raise an exception as soon as we find a single unknown.
704
for unknown in self.work_tree.unknowns():
705
raise StrictCommitFailed()
707
report_changes = self.reporter.is_verbose()
479
for path, ie in self.work_inv.iter_entries():
480
if specific and not is_inside_any(specific, path):
482
if not self.work_tree.has_filename(path):
483
self.reporter.missing(path)
484
deleted_ids.append((path, ie.file_id))
486
deleted_ids.sort(reverse=True)
487
for path, file_id in deleted_ids:
488
del self.work_inv[file_id]
489
self.work_tree._write_inventory(self.work_inv)
491
def _store_snapshot(self):
492
"""Pass over inventory and record a snapshot.
494
Entries get a new revision when they are modified in
495
any way, which includes a merge with a new set of
496
parents that have the same entry.
709
# A tree of paths that have been deleted. E.g. if foo/bar has been
710
# deleted, then we have {'foo':{'bar':{}}}
712
# XXX: Note that entries may have the wrong kind because the entry does
713
# not reflect the status on disk.
714
work_inv = self.work_tree.inventory
715
entries = work_inv.iter_entries_by_dir(
716
specific_file_ids=self.specific_file_ids, yield_parents=True)
717
for path, existing_ie in entries:
718
file_id = existing_ie.file_id
719
name = existing_ie.name
720
parent_id = existing_ie.parent_id
721
kind = existing_ie.kind
722
if kind == 'directory':
723
self._next_progress_entry()
724
# Skip files that have been deleted from the working tree.
725
# The deleted path ids are also recorded so they can be explicitly
728
path_segments = splitpath(path)
729
deleted_dict = deleted_paths
730
for segment in path_segments:
731
deleted_dict = deleted_dict.get(segment, None)
733
# We either took a path not present in the dict
734
# (deleted_dict was None), or we've reached an empty
735
# child dir in the dict, so are now a sub-path.
739
if deleted_dict is not None:
740
# the path has a deleted parent, do not add it.
742
content_summary = self.work_tree.path_content_summary(path)
743
# Note that when a filter of specific files is given, we must only
744
# skip/record deleted files matching that filter.
745
if not specific_files or is_inside_any(specific_files, path):
746
if content_summary[0] == 'missing':
747
if not deleted_paths:
748
# path won't have been split yet.
749
path_segments = splitpath(path)
750
deleted_dict = deleted_paths
751
for segment in path_segments:
752
deleted_dict = deleted_dict.setdefault(segment, {})
753
self.reporter.missing(path)
754
deleted_ids.append(file_id)
756
# TODO: have the builder do the nested commit just-in-time IF and
758
if content_summary[0] == 'tree-reference':
759
# enforce repository nested tree policy.
760
if (not self.work_tree.supports_tree_reference() or
761
# repository does not support it either.
762
not self.branch.repository._format.supports_tree_reference):
763
content_summary = ('directory',) + content_summary[1:]
764
kind = content_summary[0]
765
# TODO: specific_files filtering before nested tree processing
766
if kind == 'tree-reference':
767
if self.recursive == 'down':
768
nested_revision_id = self._commit_nested_tree(
770
content_summary = content_summary[:3] + (
773
content_summary = content_summary[:3] + (
774
self.work_tree.get_reference_revision(file_id),)
776
# Record an entry for this item
777
# Note: I don't particularly want to have the existing_ie
778
# parameter but the test suite currently (28-Jun-07) breaks
779
# without it thanks to a unicode normalisation issue. :-(
780
definitely_changed = kind != existing_ie.kind
781
self._record_entry(path, file_id, specific_files, kind, name,
782
parent_id, definitely_changed, existing_ie, report_changes,
785
# Unversion IDs that were found to be deleted
786
self.work_tree.unversion(deleted_ids)
788
def _commit_nested_tree(self, file_id, path):
789
"Commit a nested tree."
790
sub_tree = self.work_tree.get_nested_tree(file_id, path)
791
# FIXME: be more comprehensive here:
792
# this works when both trees are in --trees repository,
793
# but when both are bound to a different repository,
794
# it fails; a better way of approaching this is to
795
# finally implement the explicit-caches approach design
796
# a while back - RBC 20070306.
797
if sub_tree.branch.repository.has_same_location(
798
self.work_tree.branch.repository):
799
sub_tree.branch.repository = \
800
self.work_tree.branch.repository
802
return sub_tree.commit(message=None, revprops=self.revprops,
803
recursive=self.recursive,
804
message_callback=self.message_callback,
805
timestamp=self.timestamp, timezone=self.timezone,
806
committer=self.committer,
807
allow_pointless=self.allow_pointless,
808
strict=self.strict, verbose=self.verbose,
809
local=self.local, reporter=self.reporter)
810
except errors.PointlessCommit:
811
return self.work_tree.get_reference_revision(file_id)
813
def _record_entry(self, path, file_id, specific_files, kind, name,
814
parent_id, definitely_changed, existing_ie, report_changes,
816
"Record the new inventory entry for a path if any."
817
# mutter('check %s {%s}', path, file_id)
818
# mutter('%s selected for commit', path)
819
if definitely_changed or existing_ie is None:
820
ie = make_entry(kind, name, parent_id, file_id)
822
ie = existing_ie.copy()
824
delta, version_recorded = self.builder.record_entry_contents(ie,
825
self.parent_invs, path, self.work_tree, content_summary)
827
self._basis_delta.append(delta)
829
self.any_entries_changed = True
831
self._report_change(ie, path)
834
def _report_change(self, ie, path):
835
"""Report a change to the user.
837
The change that has occurred is described relative to the basis
498
# XXX: Need to think more here about when the user has
499
# made a specific decision on a particular value -- c.f.
501
for path, ie in self.new_inv.iter_entries():
502
previous_entries = ie.find_previous_heads(
505
self.branch.repository.get_transaction())
506
if ie.revision is None:
507
change = ie.snapshot(self.rev_id, path, previous_entries,
508
self.work_tree, self.weave_store,
509
self.branch.get_transaction())
840
if (self.basis_inv.has_id(ie.file_id)):
841
basis_ie = self.basis_inv[ie.file_id]
844
change = ie.describe_change(basis_ie, ie)
845
if change in (InventoryEntry.RENAMED,
846
InventoryEntry.MODIFIED_AND_RENAMED):
847
old_path = self.basis_inv.id2path(ie.file_id)
848
self.reporter.renamed(change, old_path, path)
512
850
self.reporter.snapshot_change(change, path)
514
def _populate_new_inv(self):
515
"""Build revision inventory.
517
This creates a new empty inventory. Depending on
518
which files are selected for commit, and what is present in the
519
current tree, the new inventory is populated. inventory entries
520
which are candidates for modification have their revision set to
521
None; inventory entries that are carried over untouched have their
522
revision set to their prior value.
524
mutter("Selecting files for commit with filter %s", self.specific_files)
525
self.new_inv = Inventory(revision_id=self.rev_id)
526
for path, new_ie in self.work_inv.iter_entries():
527
file_id = new_ie.file_id
528
mutter('check %s {%s}', path, new_ie.file_id)
529
if self.specific_files:
530
if not is_inside_any(self.specific_files, path):
531
mutter('%s not selected for commit', path)
532
self._carry_entry(file_id)
535
# this is selected, ensure its parents are too.
536
parent_id = new_ie.parent_id
537
while parent_id != ROOT_ID:
538
if not self.new_inv.has_id(parent_id):
539
ie = self._select_entry(self.work_inv[parent_id])
540
mutter('%s selected for commit because of %s',
541
self.new_inv.id2path(parent_id), path)
543
ie = self.new_inv[parent_id]
544
if ie.revision is not None:
546
mutter('%s selected for commit because of %s',
547
self.new_inv.id2path(parent_id), path)
548
parent_id = ie.parent_id
549
mutter('%s selected for commit', path)
550
self._select_entry(new_ie)
552
def _select_entry(self, new_ie):
553
"""Make new_ie be considered for committing."""
559
def _carry_entry(self, file_id):
560
"""Carry the file unchanged from the basis revision."""
561
if self.basis_inv.has_id(file_id):
562
self.new_inv.add(self.basis_inv[file_id].copy())
564
def _report_deletes(self):
565
for file_id in self.basis_inv:
566
if file_id not in self.new_inv:
567
self.reporter.deleted(self.basis_inv.id2path(file_id))
569
def _gen_revision_id(config, when):
570
"""Return new revision-id."""
571
s = '%s-%s-' % (config.user_email(), compact_date(when))
572
s += hexlify(rand_bytes(8))
852
def _set_progress_stage(self, name, entries_title=None):
853
"""Set the progress stage and emit an update to the progress bar."""
854
self.pb_stage_name = name
855
self.pb_stage_count += 1
856
self.pb_entries_title = entries_title
857
if entries_title is not None:
858
self.pb_entries_count = 0
859
self.pb_entries_total = '?'
860
self._emit_progress()
862
def _next_progress_entry(self):
863
"""Emit an update to the progress bar and increment the entry count."""
864
self.pb_entries_count += 1
865
self._emit_progress()
867
def _emit_progress(self):
868
if self.pb_entries_title:
869
if self.pb_entries_total == '?':
870
text = "%s [%s %d] - Stage" % (self.pb_stage_name,
871
self.pb_entries_title, self.pb_entries_count)
873
text = "%s [%s %d/%s] - Stage" % (self.pb_stage_name,
874
self.pb_entries_title, self.pb_entries_count,
875
str(self.pb_entries_total))
877
text = "%s - Stage" % (self.pb_stage_name)
878
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
added
removed
bzrlib/commit.py
