131
173
working inventory.
133
175
def __init__(self,
135
if reporter is not None:
136
self.reporter = reporter
138
self.reporter = NullCommitReporter()
178
"""Create a Commit object.
180
:param reporter: the default reporter to use or None to decide later
182
self.reporter = reporter
146
190
specific_files=None,
148
192
allow_pointless=True,
200
message_callback=None,
203
possible_master_transports=None):
150
204
"""Commit working copy as a new revision.
152
timestamp -- if not None, seconds-since-epoch for a
153
postdated/predated commit.
155
specific_files -- If true, commit only those files.
157
rev_id -- If set, use this as the new revision id.
206
:param message: the commit message (it or message_callback is required)
207
:param message_callback: A callback: message = message_callback(cmt_obj)
209
:param timestamp: if not None, seconds-since-epoch for a
210
postdated/predated commit.
212
:param specific_files: If true, commit only those files.
214
:param rev_id: If set, use this as the new revision id.
158
215
Useful for test or import commands that need to tightly
159
216
control what revisions are assigned. If you duplicate
160
217
a revision id that exists elsewhere it is your own fault.
161
218
If null (default), a time/random revision id is generated.
163
allow_pointless -- If true (default), commit even if nothing
220
:param allow_pointless: If true (default), commit even if nothing
164
221
has changed and no merges are recorded.
223
:param strict: If true, don't allow a commit if the working tree
224
contains unknown files.
226
:param revprops: Properties for new revision
227
:param local: Perform a local only commit.
228
:param reporter: the reporter to use or None for the default
229
:param verbose: if True and the reporter is not None, report everything
230
:param recursive: If set to 'down', commit in any subtrees that have
231
pending changes of any sort during this commit.
232
:param exclude: None or a list of relative paths to exclude from the
233
commit. Pending changes to excluded files will be ignored by the
166
236
mutter('preparing to commit')
169
self.weave_store = branch.weave_store
171
self.specific_files = specific_files
238
if working_tree is None:
239
raise BzrError("working_tree must be passed into commit().")
241
self.work_tree = working_tree
242
self.branch = self.work_tree.branch
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(get_user_encoding())
250
message_callback = lambda x: message
252
raise BzrError("The message or message_callback keyword"
253
" parameter is required for commit().")
255
self.bound_branch = None
256
self.any_entries_deleted = False
257
if exclude is not None:
258
self.exclude = sorted(
259
minimum_path_selection(exclude))
263
self.master_branch = None
264
self.master_locked = False
265
self.recursive = recursive
267
if specific_files is not None:
268
self.specific_files = sorted(
269
minimum_path_selection(specific_files))
271
self.specific_files = None
172
273
self.allow_pointless = allow_pointless
174
if timestamp is None:
175
self.timestamp = time.time()
177
self.timestamp = long(timestamp)
180
self.rev_id = _gen_revision_id(self.branch, self.timestamp)
184
if committer is None:
185
self.committer = username(self.branch)
187
assert isinstance(committer, basestring), type(committer)
188
self.committer = committer
191
self.timezone = local_time_offset()
193
self.timezone = int(timezone)
195
assert isinstance(message, basestring), type(message)
196
self.message = message
197
self._escape_commit_message()
199
self.branch.lock_write()
274
self.revprops = revprops
275
self.message_callback = message_callback
276
self.timestamp = timestamp
277
self.timezone = timezone
278
self.committer = committer
280
self.verbose = verbose
282
self.work_tree.lock_write()
283
self.parents = self.work_tree.get_parent_ids()
284
# We can use record_iter_changes IFF iter_changes is compatible with
285
# the command line parameters, and the repository has fast delta
286
# generation. See bug 347649.
287
self.use_record_iter_changes = (
288
not self.specific_files and
290
not self.branch.repository._format.supports_tree_reference and
291
(self.branch.repository._format.fast_deltas or
292
len(self.parents) < 2))
293
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
294
self.basis_revid = self.work_tree.last_revision()
295
self.basis_tree = self.work_tree.basis_tree()
296
self.basis_tree.lock_read()
201
self.work_tree = self.branch.working_tree()
202
self.work_inv = self.work_tree.inventory
203
self.basis_tree = self.branch.basis_tree()
204
self.basis_inv = self.basis_tree.inventory
298
# Cannot commit with conflicts present.
299
if len(self.work_tree.conflicts()) > 0:
300
raise ConflictsInTree
302
# Setup the bound branch variables as needed.
303
self._check_bound_branch(possible_master_transports)
305
# Check that the working tree is up to date
306
old_revno, new_revno = self._check_out_of_date_tree()
308
# Complete configuration setup
309
if reporter is not None:
310
self.reporter = reporter
311
elif self.reporter is None:
312
self.reporter = self._select_reporter()
313
if self.config is None:
314
self.config = self.branch.get_config()
316
self._set_specific_file_ids()
318
# Setup the progress bar. As the number of files that need to be
319
# committed in unknown, progress is reported as stages.
320
# We keep track of entries separately though and include that
321
# information in the progress bar during the relevant stages.
322
self.pb_stage_name = ""
323
self.pb_stage_count = 0
324
self.pb_stage_total = 5
325
if self.bound_branch:
326
self.pb_stage_total += 1
327
self.pb.show_pct = False
328
self.pb.show_spinner = False
329
self.pb.show_eta = False
330
self.pb.show_count = True
331
self.pb.show_bar = True
206
333
self._gather_parents()
334
# After a merge, a selected file commit is not supported.
335
# See 'bzr help merge' for an explanation as to why.
207
336
if len(self.parents) > 1 and self.specific_files:
208
raise NotImplementedError('selected-file commit of merges is not supported yet')
209
self._check_parents_present()
211
self._remove_deleted()
212
self._populate_new_inv()
213
self._store_snapshot()
214
self._report_deletes()
216
if not (self.allow_pointless
217
or len(self.parents) > 1
218
or self.new_inv != self.basis_inv):
219
raise PointlessCommit()
221
self._record_inventory()
222
self._record_ancestry()
223
self._make_revision()
224
note('committed r%d {%s}', (self.branch.revno() + 1),
226
self.branch.append_revision(self.rev_id)
227
self.branch.set_pending_merges([])
337
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
338
# Excludes are a form of selected file commit.
339
if len(self.parents) > 1 and self.exclude:
340
raise errors.CannotCommitSelectedFileMerge(self.exclude)
342
# Collect the changes
343
self._set_progress_stage("Collecting changes", counter=True)
344
self.builder = self.branch.get_commit_builder(self.parents,
345
self.config, timestamp, timezone, committer, revprops, rev_id)
348
self.builder.will_record_deletes()
349
# find the location being committed to
350
if self.bound_branch:
351
master_location = self.master_branch.base
353
master_location = self.branch.base
355
# report the start of the commit
356
self.reporter.started(new_revno, self.rev_id, master_location)
358
self._update_builder_with_changes()
359
self._check_pointless()
361
# TODO: Now the new inventory is known, check for conflicts.
362
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
363
# weave lines, because nothing should be recorded until it is known
364
# that commit will succeed.
365
self._set_progress_stage("Saving data locally")
366
self.builder.finish_inventory()
368
# Prompt the user for a commit message if none provided
369
message = message_callback(self)
370
self.message = message
372
# Add revision data to the local branch
373
self.rev_id = self.builder.commit(self.message)
376
mutter("aborting commit write group because of exception:")
377
trace.log_exception_quietly()
378
note("aborting commit write group: %r" % (e,))
382
self._process_pre_hooks(old_revno, new_revno)
384
# Upload revision data to the master.
385
# this will propagate merged revisions too if needed.
386
if self.bound_branch:
387
self._set_progress_stage("Uploading data to master branch")
388
# 'commit' to the master first so a timeout here causes the
389
# local branch to be out of date
390
self.master_branch.import_last_revision_info(
391
self.branch.repository, new_revno, self.rev_id)
393
# and now do the commit locally.
394
self.branch.set_last_revision_info(new_revno, self.rev_id)
396
# Make the working tree be up to date with the branch. This
397
# includes automatic changes scheduled to be made to the tree, such
398
# as updating its basis and unversioning paths that were missing.
399
self.work_tree.unversion(self.deleted_ids)
400
self._set_progress_stage("Updating the working tree")
401
self.work_tree.update_basis_by_delta(self.rev_id,
402
self.builder.get_basis_delta())
403
self.reporter.completed(new_revno, self.rev_id)
404
self._process_post_hooks(old_revno, new_revno)
231
def _record_inventory(self):
232
"""Store the inventory for the new revision."""
233
inv_text = serializer_v5.write_inventory_to_string(self.new_inv)
234
self.inv_sha1 = sha_string(inv_text)
235
s = self.branch.control_weaves
236
s.add_text('inventory', self.rev_id,
237
split_lines(inv_text), self.present_parents)
239
def _escape_commit_message(self):
240
"""Replace xml-incompatible control characters."""
241
# Python strings can include characters that can't be
242
# represented in well-formed XML; escape characters that
243
# aren't listed in the XML specification
244
# (http://www.w3.org/TR/REC-xml/#NT-Char).
245
if isinstance(self.message, unicode):
246
char_pattern = u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]'
248
# Use a regular 'str' as pattern to avoid having re.subn
249
# return 'unicode' results.
250
char_pattern = '[^x09\x0A\x0D\x20-\xFF]'
251
self.message, escape_count = re.subn(
253
lambda match: match.group(0).encode('unicode_escape'),
256
note("replaced %d control characters in message", escape_count)
258
def _record_ancestry(self):
259
"""Append merged revision ancestry to the ancestry file.
261
This should be the merged ancestry of all parents, plus the
263
s = self.branch.control_weaves
264
w = s.get_weave_or_empty('ancestry')
265
lines = self._make_ancestry(w)
266
w.add(self.rev_id, self.present_parents, lines)
267
s.put_weave('ancestry', w)
269
def _make_ancestry(self, ancestry_weave):
270
"""Return merged ancestry lines.
272
The lines are revision-ids followed by newlines."""
273
parent_ancestries = [ancestry_weave.get(p) for p in self.present_parents]
274
new_lines = merge_ancestry_lines(self.rev_id, parent_ancestries)
275
mutter('merged ancestry of {%s}:\n%s', self.rev_id, ''.join(new_lines))
409
def _select_reporter(self):
410
"""Select the CommitReporter to use."""
412
return NullCommitReporter()
413
return ReportCommitToLog()
415
def _check_pointless(self):
416
if self.allow_pointless:
418
# A merge with no effect on files
419
if len(self.parents) > 1:
421
# TODO: we could simplify this by using self.builder.basis_delta.
423
# The initial commit adds a root directory, but this in itself is not
424
# a worthwhile commit.
425
if (self.basis_revid == revision.NULL_REVISION and
426
((self.builder.new_inventory is not None and
427
len(self.builder.new_inventory) == 1) or
428
len(self.builder._basis_delta) == 1)):
429
raise PointlessCommit()
430
if self.builder.any_changes():
432
raise PointlessCommit()
434
def _check_bound_branch(self, possible_master_transports=None):
435
"""Check to see if the local branch is bound.
437
If it is bound, then most of the commit will actually be
438
done using the remote branch as the target branch.
439
Only at the end will the local branch be updated.
441
if self.local and not self.branch.get_bound_location():
442
raise errors.LocalRequiresBoundBranch()
445
self.master_branch = self.branch.get_master_branch(
446
possible_master_transports)
448
if not self.master_branch:
449
# make this branch the reference branch for out of date checks.
450
self.master_branch = self.branch
453
# If the master branch is bound, we must fail
454
master_bound_location = self.master_branch.get_bound_location()
455
if master_bound_location:
456
raise errors.CommitToDoubleBoundBranch(self.branch,
457
self.master_branch, master_bound_location)
459
# TODO: jam 20051230 We could automatically push local
460
# commits to the remote branch if they would fit.
461
# But for now, just require remote to be identical
464
# Make sure the local branch is identical to the master
465
master_info = self.master_branch.last_revision_info()
466
local_info = self.branch.last_revision_info()
467
if local_info != master_info:
468
raise errors.BoundBranchOutOfDate(self.branch,
471
# Now things are ready to change the master branch
473
self.bound_branch = self.branch
474
self.master_branch.lock_write()
475
self.master_locked = True
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.
590
def _cleanup_bound_branch(self):
591
"""Executed at the end of a try/finally to cleanup a bound branch.
593
If the branch wasn't bound, this is a no-op.
594
If it was, it resents self.branch to the local branch, instead
597
if not self.bound_branch:
599
if self.master_locked:
600
self.master_branch.unlock()
278
602
def _gather_parents(self):
279
603
"""Record the parents of a merge for merge detection."""
280
pending_merges = self.branch.pending_merges()
282
self.parent_invs = []
283
self.present_parents = []
284
precursor_id = self.branch.last_revision()
286
self.parents.append(precursor_id)
287
self.parents += pending_merges
288
for revision in self.parents:
289
if self.branch.has_revision(revision):
290
self.parent_invs.append(self.branch.get_inventory(revision))
291
self.present_parents.append(revision)
293
def _check_parents_present(self):
294
for parent_id in self.parents:
295
mutter('commit parent revision {%s}', parent_id)
296
if not self.branch.has_revision(parent_id):
297
if parent_id == self.branch.last_revision():
298
warning("parent is pissing %r", parent_id)
299
raise HistoryMissing(self.branch, 'revision', parent_id)
604
# TODO: Make sure that this list doesn't contain duplicate
605
# entries and the order is preserved when doing this.
606
if self.use_record_iter_changes:
608
self.basis_inv = self.basis_tree.inventory
609
self.parent_invs = [self.basis_inv]
610
for revision in self.parents[1:]:
611
if self.branch.repository.has_revision(revision):
612
mutter('commit parent revision {%s}', revision)
613
inventory = self.branch.repository.get_inventory(revision)
614
self.parent_invs.append(inventory)
616
mutter('commit parent ghost revision {%s}', revision)
618
def _update_builder_with_changes(self):
619
"""Update the commit builder with the data about what has changed.
621
exclude = self.exclude
622
specific_files = self.specific_files or []
623
mutter("Selecting files for commit with filter %s", specific_files)
626
if self.use_record_iter_changes:
627
iter_changes = self.work_tree.iter_changes(self.basis_tree)
628
iter_changes = self._filter_iter_changes(iter_changes)
629
for file_id, path, fs_hash in self.builder.record_iter_changes(
630
self.work_tree, self.basis_revid, iter_changes):
631
self.work_tree._observed_sha1(file_id, path, fs_hash)
633
# Build the new inventory
634
self._populate_from_inventory()
635
self._record_unselected()
636
self._report_and_accumulate_deletes()
638
def _filter_iter_changes(self, iter_changes):
639
"""Process iter_changes.
641
This method reports on the changes in iter_changes to the user, and
642
converts 'missing' entries in the iter_changes iterator to 'deleted'
643
entries. 'missing' entries have their
645
:param iter_changes: An iter_changes to process.
646
:return: A generator of changes.
648
reporter = self.reporter
649
report_changes = reporter.is_verbose()
651
for change in iter_changes:
653
old_path = change[1][0]
654
new_path = change[1][1]
655
versioned = change[3][1]
657
versioned = change[3][1]
658
if kind is None and versioned:
661
reporter.missing(new_path)
662
deleted_ids.append(change[0])
663
# Reset the new path (None) and new versioned flag (False)
664
change = (change[0], (change[1][0], None), change[2],
665
(change[3][0], False)) + change[4:]
666
elif kind == 'tree-reference':
667
if self.recursive == 'down':
668
self._commit_nested_tree(change[0], change[1][1])
669
if change[3][0] or change[3][1]:
673
reporter.deleted(old_path)
674
elif old_path is None:
675
reporter.snapshot_change('added', new_path)
676
elif old_path != new_path:
677
reporter.renamed('renamed', old_path, new_path)
680
self.work_tree.branch.repository._format.rich_root_data):
681
# Don't report on changes to '' in non rich root
683
reporter.snapshot_change('modified', new_path)
684
self._next_progress_entry()
685
# Unversion IDs that were found to be deleted
686
self.deleted_ids = deleted_ids
688
def _record_unselected(self):
689
# If specific files are selected, then all un-selected files must be
690
# recorded in their previous state. For more details, see
691
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
692
if self.specific_files or self.exclude:
693
specific_files = self.specific_files or []
694
for path, old_ie in self.basis_inv.iter_entries():
695
if old_ie.file_id in self.builder.new_inventory:
696
# already added - skip.
698
if (is_inside_any(specific_files, path)
699
and not is_inside_any(self.exclude, path)):
700
# was inside the selected path, and not excluded - if not
701
# present it has been deleted so skip.
703
# From here down it was either not selected, or was excluded:
704
# We preserve the entry unaltered.
706
# Note: specific file commits after a merge are currently
707
# prohibited. This test is for sanity/safety in case it's
708
# required after that changes.
709
if len(self.parents) > 1:
711
self.builder.record_entry_contents(ie, self.parent_invs, path,
712
self.basis_tree, None)
714
def _report_and_accumulate_deletes(self):
715
if (isinstance(self.basis_inv, Inventory)
716
and isinstance(self.builder.new_inventory, Inventory)):
717
# the older Inventory classes provide a _byid dict, and building a
718
# set from the keys of this dict is substantially faster than even
719
# getting a set of ids from the inventory
721
# <lifeless> set(dict) is roughly the same speed as
722
# set(iter(dict)) and both are significantly slower than
724
deleted_ids = set(self.basis_inv._byid.keys()) - \
725
set(self.builder.new_inventory._byid.keys())
727
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
729
self.any_entries_deleted = True
730
deleted = [(self.basis_tree.id2path(file_id), file_id)
731
for file_id in deleted_ids]
733
# XXX: this is not quite directory-order sorting
734
for path, file_id in deleted:
735
self.builder.record_delete(path, file_id)
736
self.reporter.deleted(path)
738
def _check_strict(self):
739
# XXX: when we use iter_changes this would likely be faster if
740
# iter_changes would check for us (even in the presence of
743
# raise an exception as soon as we find a single unknown.
744
for unknown in self.work_tree.unknowns():
745
raise StrictCommitFailed()
747
def _populate_from_inventory(self):
748
"""Populate the CommitBuilder by walking the working tree inventory."""
749
# Build the revision inventory.
751
# This starts by creating a new empty inventory. Depending on
752
# which files are selected for commit, and what is present in the
753
# current tree, the new inventory is populated. inventory entries
754
# which are candidates for modification have their revision set to
755
# None; inventory entries that are carried over untouched have their
756
# revision set to their prior value.
758
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
759
# results to create a new inventory at the same time, which results
760
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
763
specific_files = self.specific_files
764
exclude = self.exclude
765
report_changes = self.reporter.is_verbose()
767
# A tree of paths that have been deleted. E.g. if foo/bar has been
768
# deleted, then we have {'foo':{'bar':{}}}
770
# XXX: Note that entries may have the wrong kind because the entry does
771
# not reflect the status on disk.
772
work_inv = self.work_tree.inventory
773
# NB: entries will include entries within the excluded ids/paths
774
# because iter_entries_by_dir has no 'exclude' facility today.
775
entries = work_inv.iter_entries_by_dir(
776
specific_file_ids=self.specific_file_ids, yield_parents=True)
777
for path, existing_ie in entries:
778
file_id = existing_ie.file_id
779
name = existing_ie.name
780
parent_id = existing_ie.parent_id
781
kind = existing_ie.kind
782
# Skip files that have been deleted from the working tree.
783
# The deleted path ids are also recorded so they can be explicitly
786
path_segments = splitpath(path)
787
deleted_dict = deleted_paths
788
for segment in path_segments:
789
deleted_dict = deleted_dict.get(segment, None)
791
# We either took a path not present in the dict
792
# (deleted_dict was None), or we've reached an empty
793
# child dir in the dict, so are now a sub-path.
301
mutter("commit will ghost revision %r", parent_id)
303
def _make_revision(self):
304
"""Record a new revision object for this commit."""
305
self.rev = Revision(timestamp=self.timestamp,
306
timezone=self.timezone,
307
committer=self.committer,
308
message=self.message,
309
inventory_sha1=self.inv_sha1,
310
revision_id=self.rev_id)
311
self.rev.parent_ids = self.parents
313
serializer_v5.write_revision(self.rev, rev_tmp)
315
self.branch.revision_store.add(rev_tmp, self.rev_id)
316
mutter('new revision_id is {%s}', self.rev_id)
319
def _remove_deleted(self):
320
"""Remove deleted files from the working inventories.
322
This is done prior to taking the working inventory as the
323
basis for the new committed inventory.
325
This returns true if any files
326
*that existed in the basis inventory* were deleted.
327
Files that were added and deleted
328
in the working copy don't matter.
330
specific = self.specific_files
332
for path, ie in self.work_inv.iter_entries():
333
if specific and not is_inside_any(specific, path):
797
if deleted_dict is not None:
798
# the path has a deleted parent, do not add it.
800
if exclude and is_inside_any(exclude, path):
801
# Skip excluded paths. Excluded paths are processed by
802
# _update_builder_with_changes.
335
if not self.work_tree.has_filename(path):
336
note('missing %s', path)
337
deleted_ids.append(ie.file_id)
339
for file_id in deleted_ids:
340
if file_id in self.work_inv:
341
del self.work_inv[file_id]
342
self.branch._write_inventory(self.work_inv)
344
def _store_snapshot(self):
345
"""Pass over inventory and record a snapshot.
347
Entries get a new revision when they are modified in
348
any way, which includes a merge with a new set of
349
parents that have the same entry.
351
# XXX: Need to think more here about when the user has
352
# made a specific decision on a particular value -- c.f.
354
for path, ie in self.new_inv.iter_entries():
355
previous_entries = ie.find_previous_heads(
357
self.weave_store.get_weave_or_empty(ie.file_id))
358
if ie.revision is None:
359
change = ie.snapshot(self.rev_id, path, previous_entries,
360
self.work_tree, self.weave_store)
363
note("%s %s", change, path)
365
def _populate_new_inv(self):
366
"""Build revision inventory.
368
This creates a new empty inventory. Depending on
369
which files are selected for commit, and what is present in the
370
current tree, the new inventory is populated. inventory entries
371
which are candidates for modification have their revision set to
372
None; inventory entries that are carried over untouched have their
373
revision set to their prior value.
375
mutter("Selecting files for commit with filter %s", self.specific_files)
376
self.new_inv = Inventory()
377
for path, new_ie in self.work_inv.iter_entries():
378
file_id = new_ie.file_id
379
mutter('check %s {%s}', path, new_ie.file_id)
380
if self.specific_files:
381
if not is_inside_any(self.specific_files, path):
382
mutter('%s not selected for commit', path)
383
self._carry_file(file_id)
804
content_summary = self.work_tree.path_content_summary(path)
805
# Note that when a filter of specific files is given, we must only
806
# skip/record deleted files matching that filter.
807
if not specific_files or is_inside_any(specific_files, path):
808
if content_summary[0] == 'missing':
809
if not deleted_paths:
810
# path won't have been split yet.
811
path_segments = splitpath(path)
812
deleted_dict = deleted_paths
813
for segment in path_segments:
814
deleted_dict = deleted_dict.setdefault(segment, {})
815
self.reporter.missing(path)
816
self._next_progress_entry()
817
deleted_ids.append(file_id)
385
mutter('%s selected for commit', path)
819
# TODO: have the builder do the nested commit just-in-time IF and
821
if content_summary[0] == 'tree-reference':
822
# enforce repository nested tree policy.
823
if (not self.work_tree.supports_tree_reference() or
824
# repository does not support it either.
825
not self.branch.repository._format.supports_tree_reference):
826
content_summary = ('directory',) + content_summary[1:]
827
kind = content_summary[0]
828
# TODO: specific_files filtering before nested tree processing
829
if kind == 'tree-reference':
830
if self.recursive == 'down':
831
nested_revision_id = self._commit_nested_tree(
833
content_summary = content_summary[:3] + (
836
content_summary = content_summary[:3] + (
837
self.work_tree.get_reference_revision(file_id),)
839
# Record an entry for this item
840
# Note: I don't particularly want to have the existing_ie
841
# parameter but the test suite currently (28-Jun-07) breaks
842
# without it thanks to a unicode normalisation issue. :-(
843
definitely_changed = kind != existing_ie.kind
844
self._record_entry(path, file_id, specific_files, kind, name,
845
parent_id, definitely_changed, existing_ie, report_changes,
848
# Unversion IDs that were found to be deleted
849
self.deleted_ids = deleted_ids
851
def _commit_nested_tree(self, file_id, path):
852
"Commit a nested tree."
853
sub_tree = self.work_tree.get_nested_tree(file_id, path)
854
# FIXME: be more comprehensive here:
855
# this works when both trees are in --trees repository,
856
# but when both are bound to a different repository,
857
# it fails; a better way of approaching this is to
858
# finally implement the explicit-caches approach design
859
# a while back - RBC 20070306.
860
if sub_tree.branch.repository.has_same_location(
861
self.work_tree.branch.repository):
862
sub_tree.branch.repository = \
863
self.work_tree.branch.repository
865
return sub_tree.commit(message=None, revprops=self.revprops,
866
recursive=self.recursive,
867
message_callback=self.message_callback,
868
timestamp=self.timestamp, timezone=self.timezone,
869
committer=self.committer,
870
allow_pointless=self.allow_pointless,
871
strict=self.strict, verbose=self.verbose,
872
local=self.local, reporter=self.reporter)
873
except errors.PointlessCommit:
874
return self.work_tree.get_reference_revision(file_id)
876
def _record_entry(self, path, file_id, specific_files, kind, name,
877
parent_id, definitely_changed, existing_ie, report_changes,
879
"Record the new inventory entry for a path if any."
880
# mutter('check %s {%s}', path, file_id)
881
# mutter('%s selected for commit', path)
882
if definitely_changed or existing_ie is None:
883
ie = make_entry(kind, name, parent_id, file_id)
885
ie = existing_ie.copy()
387
886
ie.revision = None
390
def _carry_file(self, file_id):
391
"""Carry the file unchanged from the basis revision."""
392
if self.basis_inv.has_id(file_id):
393
self.new_inv.add(self.basis_inv[file_id].copy())
395
def _report_deletes(self):
396
for file_id in self.basis_inv:
397
if file_id not in self.new_inv:
398
note('deleted %s', self.basis_inv.id2path(file_id))
402
def _gen_revision_id(branch, when):
403
"""Return new revision-id."""
404
s = '%s-%s-' % (user_email(branch), compact_date(when))
405
s += hexlify(rand_bytes(8))
411
def merge_ancestry_lines(rev_id, ancestries):
412
"""Return merged ancestry lines.
414
rev_id -- id of the new revision
416
ancestries -- a sequence of ancestries for parent revisions,
417
as newline-terminated line lists.
419
if len(ancestries) == 0:
420
return [rev_id + '\n']
421
seen = set(ancestries[0])
422
ancs = ancestries[0][:]
423
for parent_ancestry in ancestries[1:]:
424
for line in parent_ancestry:
425
assert line[-1] == '\n'
887
# For carried over entries we don't care about the fs hash - the repo
888
# isn't generating a sha, so we're not saving computation time.
889
_, _, fs_hash = self.builder.record_entry_contents(
890
ie, self.parent_invs, path, self.work_tree, content_summary)
892
self._report_change(ie, path)
894
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
897
def _report_change(self, ie, path):
898
"""Report a change to the user.
900
The change that has occurred is described relative to the basis
903
if (self.basis_inv.has_id(ie.file_id)):
904
basis_ie = self.basis_inv[ie.file_id]
907
change = ie.describe_change(basis_ie, ie)
908
if change in (InventoryEntry.RENAMED,
909
InventoryEntry.MODIFIED_AND_RENAMED):
910
old_path = self.basis_inv.id2path(ie.file_id)
911
self.reporter.renamed(change, old_path, path)
912
self._next_progress_entry()
914
if change == 'unchanged':
916
self.reporter.snapshot_change(change, path)
917
self._next_progress_entry()
919
def _set_progress_stage(self, name, counter=False):
920
"""Set the progress stage and emit an update to the progress bar."""
921
self.pb_stage_name = name
922
self.pb_stage_count += 1
924
self.pb_entries_count = 0
926
self.pb_entries_count = None
927
self._emit_progress()
929
def _next_progress_entry(self):
930
"""Emit an update to the progress bar and increment the entry count."""
931
self.pb_entries_count += 1
932
self._emit_progress()
934
def _emit_progress(self):
935
if self.pb_entries_count is not None:
936
text = "%s [%d] - Stage" % (self.pb_stage_name,
937
self.pb_entries_count)
939
text = "%s - Stage" % (self.pb_stage_name, )
940
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
942
def _set_specific_file_ids(self):
943
"""populate self.specific_file_ids if we will use it."""
944
if not self.use_record_iter_changes:
945
# If provided, ensure the specified files are versioned
946
if self.specific_files is not None:
947
# Note: This routine is being called because it raises
948
# PathNotVersionedError as a side effect of finding the IDs. We
949
# later use the ids we found as input to the working tree
950
# inventory iterator, so we only consider those ids rather than
951
# examining the whole tree again.
952
# XXX: Dont we have filter_unversioned to do this more
954
self.specific_file_ids = tree.find_ids_across_trees(
955
self.specific_files, [self.basis_tree, self.work_tree])
957
self.specific_file_ids = None
added
removed
bzrlib/commit.py
