183
191
working_tree=None,
195
message_callback=None,
187
197
"""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.
199
:param message: the commit message (it or message_callback is required)
201
:param timestamp: if not None, seconds-since-epoch for a
202
postdated/predated commit.
204
:param specific_files: If true, commit only those files.
206
:param rev_id: If set, use this as the new revision id.
200
207
Useful for test or import commands that need to tightly
201
208
control what revisions are assigned. If you duplicate
202
209
a revision id that exists elsewhere it is your own fault.
203
210
If null (default), a time/random revision id is generated.
205
allow_pointless -- If true (default), commit even if nothing
212
:param allow_pointless: If true (default), commit even if nothing
206
213
has changed and no merges are recorded.
208
strict -- If true, don't allow a commit if the working tree
215
:param strict: If true, don't allow a commit if the working tree
209
216
contains unknown files.
211
revprops -- Properties for new revision
218
:param revprops: Properties for new revision
212
219
:param local: Perform a local only commit.
220
:param reporter: the reporter to use or None for the default
221
:param verbose: if True and the reporter is not None, report everything
222
:param recursive: If set to 'down', commit in any subtrees that have
223
pending changes of any sort during this commit.
214
225
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().")
227
if working_tree is None:
228
raise BzrError("working_tree must be passed into commit().")
225
230
self.work_tree = working_tree
226
231
self.branch = self.work_tree.branch
228
raise BzrError("The message keyword parameter is required for commit().")
232
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
233
if not self.branch.repository.supports_rich_root():
234
raise errors.RootNotRich()
235
if message_callback is None:
236
if message is not None:
237
if isinstance(message, str):
238
message = message.decode(bzrlib.user_encoding)
239
message_callback = lambda x: message
241
raise BzrError("The message or message_callback keyword"
242
" parameter is required for commit().")
230
self.weave_store = self.branch.repository.weave_store
231
244
self.bound_branch = None
245
self.any_entries_changed = False
246
self.any_entries_deleted = False
232
247
self.local = local
233
248
self.master_branch = None
234
249
self.master_locked = False
236
self.specific_files = specific_files
251
if specific_files is not None:
252
self.specific_files = sorted(
253
minimum_path_selection(specific_files))
255
self.specific_files = None
256
self.specific_file_ids = None
237
257
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
258
self.recursive = recursive
259
self.revprops = revprops
260
self.message_callback = message_callback
261
self.timestamp = timestamp
262
self.timezone = timezone
263
self.committer = committer
265
self.verbose = verbose
247
267
self.work_tree.lock_write()
268
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
269
self.basis_tree = self.work_tree.basis_tree()
270
self.basis_tree.lock_read()
249
# setup the bound branch variables as needed.
272
# Cannot commit with conflicts present.
273
if len(self.work_tree.conflicts()) > 0:
274
raise ConflictsInTree
276
# Setup the bound branch variables as needed.
250
277
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)
279
# Check that the working tree is up to date
280
old_revno, new_revno = self._check_out_of_date_tree()
282
# Complete configuration setup
283
if reporter is not None:
284
self.reporter = reporter
285
elif self.reporter is None:
286
self.reporter = self._select_reporter()
268
287
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()
288
self.config = self.branch.get_config()
290
# If provided, ensure the specified files are versioned
291
if self.specific_files is not None:
293
# is being called because it raises PathNotVerisonedError
294
# as a side effect of finding the IDs. We later use the ids we
295
# found as input to the working tree inventory iterator, so we
296
# only consider those ids rather than examining the whole tree
298
# XXX: Dont we have filter_unversioned to do this more
300
self.specific_file_ids = tree.find_ids_across_trees(
301
specific_files, [self.basis_tree, self.work_tree])
303
# Setup the progress bar. As the number of files that need to be
304
# committed in unknown, progress is reported as stages.
305
# We keep track of entries separately though and include that
306
# information in the progress bar during the relevant stages.
307
self.pb_stage_name = ""
308
self.pb_stage_count = 0
309
self.pb_stage_total = 5
310
if self.bound_branch:
311
self.pb_stage_total += 1
312
self.pb.show_pct = False
313
self.pb.show_spinner = False
314
self.pb.show_eta = False
315
self.pb.show_count = True
316
self.pb.show_bar = True
318
# After a merge, a selected file commit is not supported.
319
# See 'bzr help merge' for an explanation as to why.
295
320
self.basis_inv = self.basis_tree.inventory
297
321
self._gather_parents()
298
322
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.
323
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
325
# Collect the changes
326
self._set_progress_stage("Collecting changes",
327
entries_title="Directory")
328
self.builder = self.branch.get_commit_builder(self.parents,
329
self.config, timestamp, timezone, committer, revprops, rev_id)
332
# find the location being committed to
333
if self.bound_branch:
334
master_location = self.master_branch.base
336
master_location = self.branch.base
338
# report the start of the commit
339
self.reporter.started(new_revno, self.rev_id, master_location)
341
self._update_builder_with_changes()
342
self._check_pointless()
344
# TODO: Now the new inventory is known, check for conflicts.
345
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
346
# weave lines, because nothing should be recorded until it is known
347
# that commit will succeed.
348
self._set_progress_stage("Saving data locally")
349
self.builder.finish_inventory()
351
# Prompt the user for a commit message if none provided
352
message = message_callback(self)
353
assert isinstance(message, unicode), type(message)
354
self.message = message
355
self._escape_commit_message()
357
# Add revision data to the local branch
358
self.rev_id = self.builder.commit(self.message)
364
self._process_pre_hooks(old_revno, new_revno)
366
# Upload revision data to the master.
367
# this will propagate merged revisions too if needed.
325
368
if self.bound_branch:
369
self._set_progress_stage("Uploading data to master branch")
326
370
self.master_branch.repository.fetch(self.branch.repository,
327
371
revision_id=self.rev_id)
328
372
# 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)
373
# 'commit' to the master first so a timeout here causes the
374
# local branch to be out of date
375
self.master_branch.set_last_revision_info(new_revno,
333
378
# and now do the commit locally.
334
self.branch.append_revision(self.rev_id)
379
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})
381
# Make the working tree up to date with the branch
382
self._set_progress_stage("Updating the working tree")
383
rev_tree = self.builder.revision_tree()
384
self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
385
self.reporter.completed(new_revno, self.rev_id)
386
self._process_post_hooks(old_revno, new_revno)
350
self._cleanup_bound_branch()
351
self.work_tree.unlock()
391
def _select_reporter(self):
392
"""Select the CommitReporter to use."""
394
return NullCommitReporter()
395
return ReportCommitToLog()
397
def _check_pointless(self):
398
if self.allow_pointless:
400
# A merge with no effect on files
401
if len(self.parents) > 1:
403
# work around the fact that a newly-initted tree does differ from its
405
if len(self.basis_inv) == 0 and len(self.builder.new_inventory) == 1:
406
raise PointlessCommit()
407
# Shortcut, if the number of entries changes, then we obviously have
409
if len(self.builder.new_inventory) != len(self.basis_inv):
411
# If length == 1, then we only have the root entry. Which means
412
# that there is no real difference (only the root could be different)
413
if len(self.builder.new_inventory) != 1 and (self.any_entries_changed
414
or self.any_entries_deleted):
416
raise PointlessCommit()
353
418
def _check_bound_branch(self):
354
419
"""Check to see if the local branch is bound.
391
456
self.bound_branch = self.branch
392
457
self.master_branch.lock_write()
393
458
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)
460
def _check_out_of_date_tree(self):
461
"""Check that the working tree is up to date.
463
:return: old_revision_number,new_revision_number tuple
466
first_tree_parent = self.work_tree.get_parent_ids()[0]
468
# if there are no parents, treat our parent as 'None'
469
# this is so that we still consider the master branch
470
# - in a checkout scenario the tree may have no
471
# parents but the branch may do.
472
first_tree_parent = bzrlib.revision.NULL_REVISION
473
old_revno, master_last = self.master_branch.last_revision_info()
474
if master_last != first_tree_parent:
475
if master_last != bzrlib.revision.NULL_REVISION:
476
raise errors.OutOfDateTree(self.work_tree)
477
if self.branch.repository.has_revision(first_tree_parent):
478
new_revno = old_revno + 1
480
# ghost parents never appear in revision history.
482
return old_revno,new_revno
484
def _process_pre_hooks(self, old_revno, new_revno):
485
"""Process any registered pre commit hooks."""
486
self._set_progress_stage("Running pre_commit hooks")
487
self._process_hooks("pre_commit", old_revno, new_revno)
489
def _process_post_hooks(self, old_revno, new_revno):
490
"""Process any registered post commit hooks."""
491
# Process the post commit hooks, if any
492
self._set_progress_stage("Running post_commit hooks")
493
# old style commit hooks - should be deprecated ? (obsoleted in
495
if self.config.post_commit() is not None:
496
hooks = self.config.post_commit().split(' ')
497
# this would be nicer with twisted.python.reflect.namedAny
499
result = eval(hook + '(branch, rev_id)',
500
{'branch':self.branch,
502
'rev_id':self.rev_id})
503
# process new style post commit hooks
504
self._process_hooks("post_commit", old_revno, new_revno)
506
def _process_hooks(self, hook_name, old_revno, new_revno):
507
if not Branch.hooks[hook_name]:
510
# new style commit hooks:
511
if not self.bound_branch:
512
hook_master = self.branch
515
hook_master = self.master_branch
516
hook_local = self.branch
517
# With bound branches, when the master is behind the local branch,
518
# the 'old_revno' and old_revid values here are incorrect.
519
# XXX: FIXME ^. RBC 20060206
521
old_revid = self.parents[0]
523
old_revid = bzrlib.revision.NULL_REVISION
525
if hook_name == "pre_commit":
526
future_tree = self.builder.revision_tree()
527
tree_delta = future_tree.changes_from(self.basis_tree,
530
for hook in Branch.hooks[hook_name]:
531
# show the running hook in the progress bar. As hooks may
532
# end up doing nothing (e.g. because they are not configured by
533
# the user) this is still showing progress, not showing overall
534
# actions - its up to each plugin to show a UI if it want's to
535
# (such as 'Emailing diff to foo@example.com').
536
self.pb_stage_name = "Running %s hooks [%s]" % \
537
(hook_name, Branch.hooks.get_hook_name(hook))
538
self._emit_progress()
539
if 'hooks' in debug.debug_flags:
540
mutter("Invoking commit hook: %r", hook)
541
if hook_name == "post_commit":
542
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
544
elif hook_name == "pre_commit":
545
hook(hook_local, hook_master,
546
old_revno, old_revid, new_revno, self.rev_id,
547
tree_delta, future_tree)
550
"""Cleanup any open locks, progress bars etc."""
551
cleanups = [self._cleanup_bound_branch,
552
self.basis_tree.unlock,
553
self.work_tree.unlock,
555
found_exception = None
556
for cleanup in cleanups:
559
# we want every cleanup to run no matter what.
560
# so we have a catchall here, but we will raise the
561
# last encountered exception up the stack: and
562
# typically this will be useful enough.
565
if found_exception is not None:
566
# don't do a plan raise, because the last exception may have been
567
# trashed, e is our sure-to-work exception even though it loses the
568
# full traceback. XXX: RBC 20060421 perhaps we could check the
569
# exc_info and if its the same one do a plain raise otherwise
570
# 'raise e' as we do now.
403
573
def _cleanup_bound_branch(self):
404
574
"""Executed at the end of a try/finally to cleanup a bound branch.
428
603
def _gather_parents(self):
429
604
"""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:
605
# TODO: Make sure that this list doesn't contain duplicate
606
# entries and the order is preserved when doing this.
607
self.parents = self.work_tree.get_parent_ids()
608
self.parent_invs = [self.basis_inv]
609
for revision in self.parents[1:]:
439
610
if self.branch.repository.has_revision(revision):
611
mutter('commit parent revision {%s}', revision)
440
612
inventory = self.branch.repository.get_inventory(revision)
441
613
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.
615
mutter('commit parent ghost revision {%s}', revision)
617
def _update_builder_with_changes(self):
618
"""Update the commit builder with the data about what has changed.
477
specific = self.specific_files
620
# Build the revision inventory.
622
# This starts by creating a new empty inventory. Depending on
623
# which files are selected for commit, and what is present in the
624
# current tree, the new inventory is populated. inventory entries
625
# which are candidates for modification have their revision set to
626
# None; inventory entries that are carried over untouched have their
627
# revision set to their prior value.
629
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
630
# results to create a new inventory at the same time, which results
631
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
634
specific_files = self.specific_files
635
mutter("Selecting files for commit with filter %s", specific_files)
637
# Check and warn about old CommitBuilders
638
if not self.builder.record_root_entry:
639
symbol_versioning.warn('CommitBuilders should support recording'
640
' the root entry as of bzr 0.10.', DeprecationWarning,
642
self.builder.new_inventory.add(self.basis_inv.root.copy())
644
# Build the new inventory
645
self._populate_from_inventory(specific_files)
647
# If specific files are selected, then all un-selected files must be
648
# recorded in their previous state. For more details, see
649
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
651
for path, old_ie in self.basis_inv.iter_entries():
652
if old_ie.file_id in self.builder.new_inventory:
654
if is_inside_any(specific_files, path):
656
if old_ie.kind == 'directory':
657
self._next_progress_entry()
659
# Note: specific file commits after a merge are currently
660
# prohibited. This test is for sanity/safety in case it's
661
# required after that changes.
662
if len(self.parents) > 1:
664
if self.builder.record_entry_contents(ie, self.parent_invs, path,
666
self.any_entries_changed = True
668
# note that deletes have occurred
669
if set(self.basis_inv._byid.keys()) - set(self.builder.new_inventory._byid.keys()):
670
self.any_entries_deleted = True
671
# Report what was deleted.
672
if self.any_entries_deleted and self.reporter.is_verbose():
673
for path, ie in self.basis_inv.iter_entries():
674
if ie.file_id not in self.builder.new_inventory:
675
self.reporter.deleted(path)
677
def _populate_from_inventory(self, specific_files):
678
"""Populate the CommitBuilder by walking the working tree inventory."""
680
# raise an exception as soon as we find a single unknown.
681
for unknown in self.work_tree.unknowns():
682
raise StrictCommitFailed()
684
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):
686
deleted_paths = set()
687
work_inv = self.work_tree.inventory
688
assert work_inv.root is not None
689
entries = work_inv.iter_entries_by_dir(
690
specific_file_ids=self.specific_file_ids, yield_parents=True)
691
if not self.builder.record_root_entry:
693
for path, existing_ie in entries:
694
file_id = existing_ie.file_id
695
name = existing_ie.name
696
parent_id = existing_ie.parent_id
697
kind = existing_ie.kind
698
if kind == 'directory':
699
self._next_progress_entry()
700
# Skip files that have been deleted from the working tree.
701
# The deleted files/directories are also recorded so they
702
# can be explicitly unversioned later. Note that when a
703
# filter of specific files is given, we must only skip/record
704
# deleted files matching that filter.
705
if is_inside_any(deleted_paths, path):
482
707
if not self.work_tree.has_filename(path):
708
deleted_paths.add(path)
483
709
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.
710
deleted_ids.append(file_id)
713
kind = self.work_tree.kind(file_id)
714
# TODO: specific_files filtering before nested tree processing
715
if kind == 'tree-reference' and self.recursive == 'down':
716
self._commit_nested_tree(file_id, path)
717
except errors.NoSuchFile:
720
# Record an entry for this item
721
# Note: I don't particularly want to have the existing_ie
722
# parameter but the test suite currently (28-Jun-07) breaks
723
# without it thanks to a unicode normalisation issue. :-(
724
definitely_changed = kind != existing_ie.kind
725
self._record_entry(path, file_id, specific_files, kind, name,
726
parent_id, definitely_changed, existing_ie, report_changes)
728
# Unversion IDs that were found to be deleted
729
self.work_tree.unversion(deleted_ids)
731
def _commit_nested_tree(self, file_id, path):
732
"Commit a nested tree."
733
sub_tree = self.work_tree.get_nested_tree(file_id, path)
734
# FIXME: be more comprehensive here:
735
# this works when both trees are in --trees repository,
736
# but when both are bound to a different repository,
737
# it fails; a better way of approaching this is to
738
# finally implement the explicit-caches approach design
739
# a while back - RBC 20070306.
740
if sub_tree.branch.repository.has_same_location(
741
self.work_tree.branch.repository):
742
sub_tree.branch.repository = \
743
self.work_tree.branch.repository
745
sub_tree.commit(message=None, revprops=self.revprops,
746
recursive=self.recursive,
747
message_callback=self.message_callback,
748
timestamp=self.timestamp, timezone=self.timezone,
749
committer=self.committer,
750
allow_pointless=self.allow_pointless,
751
strict=self.strict, verbose=self.verbose,
752
local=self.local, reporter=self.reporter)
753
except errors.PointlessCommit:
756
def _record_entry(self, path, file_id, specific_files, kind, name,
757
parent_id, definitely_changed, existing_ie=None,
758
report_changes=True):
759
"Record the new inventory entry for a path if any."
760
# mutter('check %s {%s}', path, file_id)
761
# mutter('%s selected for commit', path)
762
if definitely_changed or existing_ie is None:
763
ie = inventory.make_entry(kind, name, parent_id, file_id)
765
ie = existing_ie.copy()
767
if self.builder.record_entry_contents(ie, self.parent_invs,
768
path, self.work_tree):
769
self.any_entries_changed = True
771
self._report_change(ie, path)
774
def _report_change(self, ie, path):
775
"""Report a change to the user.
777
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())
780
if (self.basis_inv.has_id(ie.file_id)):
781
basis_ie = self.basis_inv[ie.file_id]
784
change = ie.describe_change(basis_ie, ie)
785
if change in (InventoryEntry.RENAMED,
786
InventoryEntry.MODIFIED_AND_RENAMED):
787
old_path = self.basis_inv.id2path(ie.file_id)
788
self.reporter.renamed(change, old_path, path)
512
790
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))
792
def _set_progress_stage(self, name, entries_title=None):
793
"""Set the progress stage and emit an update to the progress bar."""
794
self.pb_stage_name = name
795
self.pb_stage_count += 1
796
self.pb_entries_title = entries_title
797
if entries_title is not None:
798
self.pb_entries_count = 0
799
self.pb_entries_total = '?'
800
self._emit_progress()
802
def _next_progress_entry(self):
803
"""Emit an update to the progress bar and increment the entry count."""
804
self.pb_entries_count += 1
805
self._emit_progress()
807
def _emit_progress(self):
808
if self.pb_entries_title:
809
if self.pb_entries_total == '?':
810
text = "%s [%s %d] - Stage" % (self.pb_stage_name,
811
self.pb_entries_title, self.pb_entries_count)
813
text = "%s [%s %d/%s] - Stage" % (self.pb_stage_name,
814
self.pb_entries_title, self.pb_entries_count,
815
str(self.pb_entries_total))
817
text = "%s - Stage" % (self.pb_stage_name)
818
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
added
removed
bzrlib/commit.py
