48
49
# TODO: Change the parameter 'rev_id' to 'revision_id' to be consistent with
49
50
# the rest of the code; add a deprecation of the old name.
57
from cStringIO import StringIO
57
from .branch import Branch
58
from contextlib import ExitStack
60
from .errors import (BzrError,
64
from .osutils import (get_user_encoding,
67
minimum_path_selection,
69
from .trace import mutter, note, is_quiet
70
from .tree import TreeChange
71
from .urlutils import unescape_for_display
72
from .i18n import gettext
75
class PointlessCommit(BzrError):
77
_fmt = "No changes to commit"
80
class CannotCommitSelectedFileMerge(BzrError):
82
_fmt = 'Selected-file commit of merges is not supported yet:'\
83
' files %(files_str)s'
85
def __init__(self, files):
86
files_str = ', '.join(files)
87
BzrError.__init__(self, files=files, files_str=files_str)
90
def filter_excluded(iter_changes, exclude):
91
"""Filter exclude filenames.
93
:param iter_changes: iter_changes function
94
:param exclude: List of paths to exclude
95
:return: iter_changes function
97
for change in iter_changes:
98
new_excluded = (change.path[1] is not None and
99
is_inside_any(exclude, change.path[1]))
101
old_excluded = (change.path[0] is not None and
102
is_inside_any(exclude, change.path[0]))
104
if old_excluded and new_excluded:
107
if old_excluded or new_excluded:
108
# TODO(jelmer): Perhaps raise an error here instead?
67
from bzrlib.branch import Branch
69
from bzrlib.errors import (BzrError, PointlessCommit,
73
from bzrlib.osutils import (get_user_encoding,
74
kind_marker, isdir,isfile, is_inside_any,
75
is_inside_or_parent_of_any,
76
minimum_path_selection,
77
quotefn, sha_file, split_lines,
80
from bzrlib.testament import Testament
81
from bzrlib.trace import mutter, note, warning, is_quiet
82
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
83
from bzrlib import symbol_versioning
84
from bzrlib.symbol_versioning import (deprecated_passed,
87
from bzrlib.workingtree import WorkingTree
88
from bzrlib.urlutils import unescape_for_display
114
92
class NullCommitReporter(object):
115
93
"""I report on progress of a commit."""
117
def started(self, revno, revid, location):
95
def started(self, revno, revid, location=None):
97
symbol_versioning.warn("As of bzr 1.0 you must pass a location "
98
"to started.", DeprecationWarning,
120
102
def snapshot_change(self, change, path):
146
128
note(format, *args)
148
130
def snapshot_change(self, change, path):
149
if path == '' and change in (gettext('added'), gettext('modified')):
131
if path == '' and change in ('added', 'modified'):
151
133
self._note("%s %s", change, path)
153
def started(self, revno, rev_id, location):
155
gettext('Committing to: %s'),
156
unescape_for_display(location, 'utf-8'))
135
def started(self, revno, rev_id, location=None):
136
if location is not None:
137
location = ' to: ' + unescape_for_display(location, 'utf-8')
139
# When started was added, location was only made optional by
140
# accident. Matt Nordhoff 20071129
141
symbol_versioning.warn("As of bzr 1.0 you must pass a location "
142
"to started.", DeprecationWarning,
145
self._note('Committing%s', location)
158
147
def completed(self, revno, rev_id):
159
if revno is not None:
160
self._note(gettext('Committed revision %d.'), revno)
161
# self._note goes to the console too; so while we want to log the
162
# rev_id, we can't trivially only log it. (See bug 526425). Long
163
# term we should rearrange the reporting structure, but for now
164
# we just mutter seperately. We mutter the revid and revno together
165
# so that concurrent bzr invocations won't lead to confusion.
166
mutter('Committed revid %s as revno %d.', rev_id, revno)
168
self._note(gettext('Committed revid %s.'), rev_id)
148
self._note('Committed revision %d.', revno)
170
150
def deleted(self, path):
171
self._note(gettext('deleted %s'), path)
151
self._note('deleted %s', path)
173
153
def missing(self, path):
174
self._note(gettext('missing %s'), path)
154
self._note('missing %s', path)
176
156
def renamed(self, change, old_path, new_path):
177
157
self._note('%s %s => %s', change, old_path, new_path)
192
172
the working directory; these should be removed from the
193
173
working inventory.
196
175
def __init__(self,
199
178
"""Create a Commit object.
201
180
:param reporter: the default reporter to use or None to decide later
203
182
self.reporter = reporter
204
self.config_stack = config_stack
207
def update_revprops(revprops, branch, authors=None,
208
local=False, possible_master_transports=None):
211
if possible_master_transports is None:
212
possible_master_transports = []
213
if (u'branch-nick' not in revprops and
214
branch.repository._format.supports_storing_branch_nick):
215
revprops[u'branch-nick'] = branch._get_nick(
217
possible_master_transports)
218
if authors is not None:
219
if u'author' in revprops or u'authors' in revprops:
220
# XXX: maybe we should just accept one of them?
221
raise AssertionError('author property given twice')
223
for individual in authors:
224
if '\n' in individual:
225
raise AssertionError('\\n is not a valid character '
226
'in an author identity')
227
revprops[u'authors'] = '\n'.join(authors)
280
233
:param exclude: None or a list of relative paths to exclude from the
281
234
commit. Pending changes to excluded files will be ignored by the
283
:param lossy: When committing to a foreign VCS, ignore any
284
data that can not be natively represented.
286
with ExitStack() as stack:
287
self.revprops = revprops or {}
288
# XXX: Can be set on __init__ or passed in - this is a bit ugly.
289
self.config_stack = config or self.config_stack
290
mutter('preparing to commit')
292
if working_tree is None:
293
raise BzrError("working_tree must be passed into commit().")
295
self.work_tree = working_tree
296
self.branch = self.work_tree.branch
297
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
298
if not self.branch.repository.supports_rich_root():
299
raise errors.RootNotRich()
300
if message_callback is None:
301
if message is not None:
302
if isinstance(message, bytes):
303
message = message.decode(get_user_encoding())
305
def message_callback(x):
308
raise BzrError("The message or message_callback keyword"
309
" parameter is required for commit().")
311
self.bound_branch = None
312
self.any_entries_deleted = False
313
if exclude is not None:
314
self.exclude = sorted(
315
minimum_path_selection(exclude))
319
self.master_branch = None
320
self.recursive = recursive
322
# self.specific_files is None to indicate no filter, or any iterable to
323
# indicate a filter - [] means no files at all, as per iter_changes.
324
if specific_files is not None:
325
self.specific_files = sorted(
326
minimum_path_selection(specific_files))
328
self.specific_files = None
330
self.allow_pointless = allow_pointless
331
self.message_callback = message_callback
332
self.timestamp = timestamp
333
self.timezone = timezone
334
self.committer = committer
336
self.verbose = verbose
338
stack.enter_context(self.work_tree.lock_write())
339
self.parents = self.work_tree.get_parent_ids()
340
self.pb = ui.ui_factory.nested_progress_bar()
341
stack.callback(self.pb.finished)
342
self.basis_revid = self.work_tree.last_revision()
343
self.basis_tree = self.work_tree.basis_tree()
344
stack.enter_context(self.basis_tree.lock_read())
237
mutter('preparing to commit')
239
if working_tree is None:
240
raise BzrError("working_tree must be passed into commit().")
242
self.work_tree = working_tree
243
self.branch = self.work_tree.branch
244
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
245
if not self.branch.repository.supports_rich_root():
246
raise errors.RootNotRich()
247
if message_callback is None:
248
if message is not None:
249
if isinstance(message, str):
250
message = message.decode(get_user_encoding())
251
message_callback = lambda x: message
253
raise BzrError("The message or message_callback keyword"
254
" parameter is required for commit().")
256
self.bound_branch = None
257
self.any_entries_deleted = False
258
if exclude is not None:
259
self.exclude = sorted(
260
minimum_path_selection(exclude))
264
self.master_branch = None
265
self.master_locked = False
266
self.recursive = recursive
268
# self.specific_files is None to indicate no filter, or any iterable to
269
# indicate a filter - [] means no files at all, as per iter_changes.
270
if specific_files is not None:
271
self.specific_files = sorted(
272
minimum_path_selection(specific_files))
274
self.specific_files = None
276
self.allow_pointless = allow_pointless
277
self.revprops = revprops
278
self.message_callback = message_callback
279
self.timestamp = timestamp
280
self.timezone = timezone
281
self.committer = committer
283
self.verbose = verbose
285
self.work_tree.lock_write()
286
self.parents = self.work_tree.get_parent_ids()
287
# We can use record_iter_changes IFF iter_changes is compatible with
288
# the command line parameters, and the repository has fast delta
289
# generation. See bug 347649.
290
self.use_record_iter_changes = (
292
not self.branch.repository._format.supports_tree_reference and
293
(self.branch.repository._format.fast_deltas or
294
len(self.parents) < 2))
295
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
296
self.basis_revid = self.work_tree.last_revision()
297
self.basis_tree = self.work_tree.basis_tree()
298
self.basis_tree.lock_read()
345
300
# Cannot commit with conflicts present.
346
301
if len(self.work_tree.conflicts()) > 0:
347
302
raise ConflictsInTree
349
304
# Setup the bound branch variables as needed.
350
self._check_bound_branch(stack, possible_master_transports)
351
if self.config_stack is None:
352
self.config_stack = self.work_tree.get_config_stack()
305
self._check_bound_branch(possible_master_transports)
354
307
# Check that the working tree is up to date
355
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
308
old_revno, new_revno = self._check_out_of_date_tree()
357
310
# Complete configuration setup
358
311
if reporter is not None:
359
312
self.reporter = reporter
360
313
elif self.reporter is None:
361
314
self.reporter = self._select_reporter()
315
if self.config is None:
316
self.config = self.branch.get_config()
318
self._set_specific_file_ids()
363
320
# Setup the progress bar. As the number of files that need to be
364
321
# committed in unknown, progress is reported as stages.
368
325
self.pb_stage_count = 0
369
326
self.pb_stage_total = 5
370
327
if self.bound_branch:
371
# 2 extra stages: "Uploading data to master branch" and "Merging
372
# tags to master branch"
373
self.pb_stage_total += 2
328
self.pb_stage_total += 1
374
329
self.pb.show_pct = False
375
330
self.pb.show_spinner = False
376
331
self.pb.show_eta = False
377
332
self.pb.show_count = True
378
333
self.pb.show_bar = True
335
self._gather_parents()
380
336
# After a merge, a selected file commit is not supported.
381
337
# See 'bzr help merge' for an explanation as to why.
382
338
if len(self.parents) > 1 and self.specific_files is not None:
383
raise CannotCommitSelectedFileMerge(self.specific_files)
339
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
384
340
# Excludes are a form of selected file commit.
385
341
if len(self.parents) > 1 and self.exclude:
386
raise CannotCommitSelectedFileMerge(self.exclude)
342
raise errors.CannotCommitSelectedFileMerge(self.exclude)
388
344
# Collect the changes
389
345
self._set_progress_stage("Collecting changes", counter=True)
391
self.builder = self.branch.get_commit_builder(
392
self.parents, self.config_stack, timestamp, timezone, committer,
393
self.revprops, rev_id, lossy=lossy)
395
if self.builder.updates_branch and self.bound_branch:
397
raise AssertionError(
398
"bound branches not supported for commit builders "
399
"that update the branch")
346
self.builder = self.branch.get_commit_builder(self.parents,
347
self.config, timestamp, timezone, committer, revprops, rev_id)
350
self.builder.will_record_deletes()
402
351
# find the location being committed to
403
352
if self.bound_branch:
404
353
master_location = self.master_branch.base
425
374
# Add revision data to the local branch
426
375
self.rev_id = self.builder.commit(self.message)
429
378
mutter("aborting commit write group because of exception:")
430
379
trace.log_exception_quietly()
380
note("aborting commit write group: %r" % (e,))
431
381
self.builder.abort()
434
self._update_branches(old_revno, old_revid, new_revno)
436
# Make the working tree be up to date with the branch. This
437
# includes automatic changes scheduled to be made to the tree, such
438
# as updating its basis and unversioning paths that were missing.
439
self.work_tree.unversion(self.deleted_paths)
440
self._set_progress_stage("Updating the working tree")
441
self.work_tree.update_basis_by_delta(
442
self.rev_id, self.builder.get_basis_delta())
443
self.reporter.completed(new_revno, self.rev_id)
444
self._process_post_hooks(old_revno, new_revno)
447
def _update_branches(self, old_revno, old_revid, new_revno):
448
"""Update the master and local branch to the new revision.
450
This will try to make sure that the master branch is updated
451
before the local branch.
453
:param old_revno: Revision number of master branch before the
455
:param old_revid: Tip of master branch before the commit
456
:param new_revno: Revision number of the new commit
458
if not self.builder.updates_branch:
459
384
self._process_pre_hooks(old_revno, new_revno)
461
386
# Upload revision data to the master.
464
389
self._set_progress_stage("Uploading data to master branch")
465
390
# 'commit' to the master first so a timeout here causes the
466
391
# local branch to be out of date
467
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
468
self.branch, new_revno, self.rev_id, lossy=self._lossy)
470
self.branch.fetch(self.master_branch, self.rev_id)
392
self.master_branch.import_last_revision_info(
393
self.branch.repository, new_revno, self.rev_id)
472
395
# and now do the commit locally.
473
if new_revno is None:
474
# Keep existing behaviour around ghosts
476
396
self.branch.set_last_revision_info(new_revno, self.rev_id)
479
self._process_pre_hooks(old_revno, new_revno)
480
except BaseException:
481
# The commit builder will already have updated the branch,
483
self.branch.set_last_revision_info(old_revno, old_revid)
486
# Merge local tags to remote
487
if self.bound_branch:
488
self._set_progress_stage("Merging tags to master branch")
489
tag_updates, tag_conflicts = self.branch.tags.merge_to(
490
self.master_branch.tags)
492
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
493
note(gettext("Conflicting tags in bound branch:\n{0}".format(
494
"\n".join(warning_lines))))
398
# Make the working tree be up to date with the branch. This
399
# includes automatic changes scheduled to be made to the tree, such
400
# as updating its basis and unversioning paths that were missing.
401
self.work_tree.unversion(self.deleted_ids)
402
self._set_progress_stage("Updating the working tree")
403
self.work_tree.update_basis_by_delta(self.rev_id,
404
self.builder.get_basis_delta())
405
self.reporter.completed(new_revno, self.rev_id)
406
self._process_post_hooks(old_revno, new_revno)
496
411
def _select_reporter(self):
497
412
"""Select the CommitReporter to use."""
542
466
# Make sure the local branch is identical to the master
543
master_revid = self.master_branch.last_revision()
544
local_revid = self.branch.last_revision()
545
if local_revid != master_revid:
467
master_info = self.master_branch.last_revision_info()
468
local_info = self.branch.last_revision_info()
469
if local_info != master_info:
546
470
raise errors.BoundBranchOutOfDate(self.branch,
549
473
# Now things are ready to change the master branch
550
474
# so grab the lock
551
475
self.bound_branch = self.branch
552
stack.enter_context(self.master_branch.lock_write())
476
self.master_branch.lock_write()
477
self.master_locked = True
554
479
def _check_out_of_date_tree(self):
555
480
"""Check that the working tree is up to date.
557
:return: old_revision_number, old_revision_id, new_revision_number
482
:return: old_revision_number,new_revision_number tuple
561
485
first_tree_parent = self.work_tree.get_parent_ids()[0]
564
488
# this is so that we still consider the master branch
565
489
# - in a checkout scenario the tree may have no
566
490
# parents but the branch may do.
567
first_tree_parent = breezy.revision.NULL_REVISION
568
if (self.master_branch._format.stores_revno() or
569
self.config_stack.get('calculate_revnos')):
571
old_revno, master_last = self.master_branch.last_revision_info()
572
except errors.UnsupportedOperation:
573
master_last = self.master_branch.last_revision()
574
old_revno = self.branch.revision_id_to_revno(master_last)
576
master_last = self.master_branch.last_revision()
491
first_tree_parent = bzrlib.revision.NULL_REVISION
492
old_revno, master_last = self.master_branch.last_revision_info()
578
493
if master_last != first_tree_parent:
579
if master_last != breezy.revision.NULL_REVISION:
494
if master_last != bzrlib.revision.NULL_REVISION:
580
495
raise errors.OutOfDateTree(self.work_tree)
581
if (old_revno is not None and
582
self.branch.repository.has_revision(first_tree_parent)):
496
if self.branch.repository.has_revision(first_tree_parent):
583
497
new_revno = old_revno + 1
585
499
# ghost parents never appear in revision history.
587
return old_revno, master_last, new_revno
501
return old_revno,new_revno
589
503
def _process_pre_hooks(self, old_revno, new_revno):
590
504
"""Process any registered pre commit hooks."""
652
565
old_revno, old_revid, new_revno, self.rev_id,
653
566
tree_delta, future_tree)
569
"""Cleanup any open locks, progress bars etc."""
570
cleanups = [self._cleanup_bound_branch,
571
self.basis_tree.unlock,
572
self.work_tree.unlock,
574
found_exception = None
575
for cleanup in cleanups:
578
# we want every cleanup to run no matter what.
579
# so we have a catchall here, but we will raise the
580
# last encountered exception up the stack: and
581
# typically this will be useful enough.
584
if found_exception is not None:
585
# don't do a plan raise, because the last exception may have been
586
# trashed, e is our sure-to-work exception even though it loses the
587
# full traceback. XXX: RBC 20060421 perhaps we could check the
588
# exc_info and if its the same one do a plain raise otherwise
589
# 'raise e' as we do now.
592
def _cleanup_bound_branch(self):
593
"""Executed at the end of a try/finally to cleanup a bound branch.
595
If the branch wasn't bound, this is a no-op.
596
If it was, it resents self.branch to the local branch, instead
599
if not self.bound_branch:
601
if self.master_locked:
602
self.master_branch.unlock()
604
def _gather_parents(self):
605
"""Record the parents of a merge for merge detection."""
606
# TODO: Make sure that this list doesn't contain duplicate
607
# entries and the order is preserved when doing this.
608
if self.use_record_iter_changes:
610
self.basis_inv = self.basis_tree.inventory
611
self.parent_invs = [self.basis_inv]
612
for revision in self.parents[1:]:
613
if self.branch.repository.has_revision(revision):
614
mutter('commit parent revision {%s}', revision)
615
inventory = self.branch.repository.get_inventory(revision)
616
self.parent_invs.append(inventory)
618
mutter('commit parent ghost revision {%s}', revision)
655
620
def _update_builder_with_changes(self):
656
621
"""Update the commit builder with the data about what has changed.
623
exclude = self.exclude
658
624
specific_files = self.specific_files
659
mutter("Selecting files for commit with filter %r", specific_files)
625
mutter("Selecting files for commit with filter %s", specific_files)
661
627
self._check_strict()
662
iter_changes = self.work_tree.iter_changes(
663
self.basis_tree, specific_files=specific_files)
665
iter_changes = filter_excluded(iter_changes, self.exclude)
666
iter_changes = self._filter_iter_changes(iter_changes)
667
for path, fs_hash in self.builder.record_iter_changes(
628
if self.use_record_iter_changes:
629
iter_changes = self.work_tree.iter_changes(self.basis_tree,
630
specific_files=specific_files)
631
iter_changes = self._filter_iter_changes(iter_changes)
632
for file_id, path, fs_hash in self.builder.record_iter_changes(
668
633
self.work_tree, self.basis_revid, iter_changes):
669
self.work_tree._observed_sha1(path, fs_hash)
634
self.work_tree._observed_sha1(file_id, path, fs_hash)
636
# Build the new inventory
637
self._populate_from_inventory()
638
self._record_unselected()
639
self._report_and_accumulate_deletes()
671
641
def _filter_iter_changes(self, iter_changes):
672
642
"""Process iter_changes.
674
This method reports on the changes in iter_changes to the user, and
644
This method reports on the changes in iter_changes to the user, and
675
645
converts 'missing' entries in the iter_changes iterator to 'deleted'
676
646
entries. 'missing' entries have their
681
651
reporter = self.reporter
682
652
report_changes = reporter.is_verbose()
684
654
for change in iter_changes:
685
655
if report_changes:
686
old_path = change.path[0]
687
new_path = change.path[1]
688
versioned = change.versioned[1]
689
kind = change.kind[1]
690
versioned = change.versioned[1]
656
old_path = change[1][0]
657
new_path = change[1][1]
658
versioned = change[3][1]
660
versioned = change[3][1]
691
661
if kind is None and versioned:
693
663
if report_changes:
694
664
reporter.missing(new_path)
695
if change.kind[0] == 'symlink' and not self.work_tree.supports_symlinks():
696
trace.warning('Ignoring "%s" as symlinks are not '
697
'supported on this filesystem.' % (change.path[0],))
699
deleted_paths.append(change.path[1])
665
deleted_ids.append(change[0])
700
666
# Reset the new path (None) and new versioned flag (False)
701
change = change.discard_new()
702
new_path = change.path[1]
667
change = (change[0], (change[1][0], None), change[2],
668
(change[3][0], False)) + change[4:]
704
669
elif kind == 'tree-reference':
705
670
if self.recursive == 'down':
706
self._commit_nested_tree(change.path[1])
707
if change.versioned[0] or change.versioned[1]:
671
self._commit_nested_tree(change[0], change[1][1])
672
if change[3][0] or change[3][1]:
709
674
if report_changes:
710
675
if new_path is None:
711
676
reporter.deleted(old_path)
712
677
elif old_path is None:
713
reporter.snapshot_change(gettext('added'), new_path)
678
reporter.snapshot_change('added', new_path)
714
679
elif old_path != new_path:
715
reporter.renamed(gettext('renamed'),
680
reporter.renamed('renamed', old_path, new_path)
719
or self.work_tree.branch.repository._format.rich_root_data):
683
self.work_tree.branch.repository._format.rich_root_data):
720
684
# Don't report on changes to '' in non rich root
722
reporter.snapshot_change(
723
gettext('modified'), new_path)
686
reporter.snapshot_change('modified', new_path)
724
687
self._next_progress_entry()
725
# Unversion files that were found to be deleted
726
self.deleted_paths = deleted_paths
688
# Unversion IDs that were found to be deleted
689
self.deleted_ids = deleted_ids
691
def _record_unselected(self):
692
# If specific files are selected, then all un-selected files must be
693
# recorded in their previous state. For more details, see
694
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
695
if self.specific_files or self.exclude:
696
specific_files = self.specific_files or []
697
for path, old_ie in self.basis_inv.iter_entries():
698
if old_ie.file_id in self.builder.new_inventory:
699
# already added - skip.
701
if (is_inside_any(specific_files, path)
702
and not is_inside_any(self.exclude, path)):
703
# was inside the selected path, and not excluded - if not
704
# present it has been deleted so skip.
706
# From here down it was either not selected, or was excluded:
707
# We preserve the entry unaltered.
709
# Note: specific file commits after a merge are currently
710
# prohibited. This test is for sanity/safety in case it's
711
# required after that changes.
712
if len(self.parents) > 1:
714
self.builder.record_entry_contents(ie, self.parent_invs, path,
715
self.basis_tree, None)
717
def _report_and_accumulate_deletes(self):
718
if (isinstance(self.basis_inv, Inventory)
719
and isinstance(self.builder.new_inventory, Inventory)):
720
# the older Inventory classes provide a _byid dict, and building a
721
# set from the keys of this dict is substantially faster than even
722
# getting a set of ids from the inventory
724
# <lifeless> set(dict) is roughly the same speed as
725
# set(iter(dict)) and both are significantly slower than
727
deleted_ids = set(self.basis_inv._byid.keys()) - \
728
set(self.builder.new_inventory._byid.keys())
730
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
732
self.any_entries_deleted = True
733
deleted = [(self.basis_tree.id2path(file_id), file_id)
734
for file_id in deleted_ids]
736
# XXX: this is not quite directory-order sorting
737
for path, file_id in deleted:
738
self.builder.record_delete(path, file_id)
739
self.reporter.deleted(path)
728
741
def _check_strict(self):
729
742
# XXX: when we use iter_changes this would likely be faster if
734
747
for unknown in self.work_tree.unknowns():
735
748
raise StrictCommitFailed()
737
def _commit_nested_tree(self, path):
750
def _populate_from_inventory(self):
751
"""Populate the CommitBuilder by walking the working tree inventory."""
752
# Build the revision inventory.
754
# This starts by creating a new empty inventory. Depending on
755
# which files are selected for commit, and what is present in the
756
# current tree, the new inventory is populated. inventory entries
757
# which are candidates for modification have their revision set to
758
# None; inventory entries that are carried over untouched have their
759
# revision set to their prior value.
761
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
762
# results to create a new inventory at the same time, which results
763
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
766
specific_files = self.specific_files
767
exclude = self.exclude
768
report_changes = self.reporter.is_verbose()
770
# A tree of paths that have been deleted. E.g. if foo/bar has been
771
# deleted, then we have {'foo':{'bar':{}}}
773
# XXX: Note that entries may have the wrong kind because the entry does
774
# not reflect the status on disk.
775
work_inv = self.work_tree.inventory
776
# NB: entries will include entries within the excluded ids/paths
777
# because iter_entries_by_dir has no 'exclude' facility today.
778
entries = work_inv.iter_entries_by_dir(
779
specific_file_ids=self.specific_file_ids, yield_parents=True)
780
for path, existing_ie in entries:
781
file_id = existing_ie.file_id
782
name = existing_ie.name
783
parent_id = existing_ie.parent_id
784
kind = existing_ie.kind
785
# Skip files that have been deleted from the working tree.
786
# The deleted path ids are also recorded so they can be explicitly
789
path_segments = splitpath(path)
790
deleted_dict = deleted_paths
791
for segment in path_segments:
792
deleted_dict = deleted_dict.get(segment, None)
794
# We either took a path not present in the dict
795
# (deleted_dict was None), or we've reached an empty
796
# child dir in the dict, so are now a sub-path.
800
if deleted_dict is not None:
801
# the path has a deleted parent, do not add it.
803
if exclude and is_inside_any(exclude, path):
804
# Skip excluded paths. Excluded paths are processed by
805
# _update_builder_with_changes.
807
content_summary = self.work_tree.path_content_summary(path)
808
kind = content_summary[0]
809
# Note that when a filter of specific files is given, we must only
810
# skip/record deleted files matching that filter.
811
if not specific_files or is_inside_any(specific_files, path):
812
if kind == 'missing':
813
if not deleted_paths:
814
# path won't have been split yet.
815
path_segments = splitpath(path)
816
deleted_dict = deleted_paths
817
for segment in path_segments:
818
deleted_dict = deleted_dict.setdefault(segment, {})
819
self.reporter.missing(path)
820
self._next_progress_entry()
821
deleted_ids.append(file_id)
823
# TODO: have the builder do the nested commit just-in-time IF and
825
if kind == 'tree-reference':
826
# enforce repository nested tree policy.
827
if (not self.work_tree.supports_tree_reference() or
828
# repository does not support it either.
829
not self.branch.repository._format.supports_tree_reference):
831
content_summary = (kind, None, None, None)
832
elif self.recursive == 'down':
833
nested_revision_id = self._commit_nested_tree(
835
content_summary = (kind, None, None, nested_revision_id)
837
nested_revision_id = self.work_tree.get_reference_revision(file_id)
838
content_summary = (kind, None, None, nested_revision_id)
840
# Record an entry for this item
841
# Note: I don't particularly want to have the existing_ie
842
# parameter but the test suite currently (28-Jun-07) breaks
843
# without it thanks to a unicode normalisation issue. :-(
844
definitely_changed = kind != existing_ie.kind
845
self._record_entry(path, file_id, specific_files, kind, name,
846
parent_id, definitely_changed, existing_ie, report_changes,
849
# Unversion IDs that were found to be deleted
850
self.deleted_ids = deleted_ids
852
def _commit_nested_tree(self, file_id, path):
738
853
"Commit a nested tree."
739
sub_tree = self.work_tree.get_nested_tree(path)
854
sub_tree = self.work_tree.get_nested_tree(file_id, path)
740
855
# FIXME: be more comprehensive here:
741
856
# this works when both trees are in --trees repository,
742
857
# but when both are bound to a different repository,
744
859
# finally implement the explicit-caches approach design
745
860
# a while back - RBC 20070306.
746
861
if sub_tree.branch.repository.has_same_location(
747
self.work_tree.branch.repository):
862
self.work_tree.branch.repository):
748
863
sub_tree.branch.repository = \
749
864
self.work_tree.branch.repository
751
866
return sub_tree.commit(message=None, revprops=self.revprops,
752
recursive=self.recursive,
753
message_callback=self.message_callback,
754
timestamp=self.timestamp,
755
timezone=self.timezone,
756
committer=self.committer,
757
allow_pointless=self.allow_pointless,
758
strict=self.strict, verbose=self.verbose,
759
local=self.local, reporter=self.reporter)
760
except PointlessCommit:
761
return self.work_tree.get_reference_revision(path)
867
recursive=self.recursive,
868
message_callback=self.message_callback,
869
timestamp=self.timestamp, timezone=self.timezone,
870
committer=self.committer,
871
allow_pointless=self.allow_pointless,
872
strict=self.strict, verbose=self.verbose,
873
local=self.local, reporter=self.reporter)
874
except errors.PointlessCommit:
875
return self.work_tree.get_reference_revision(file_id)
877
def _record_entry(self, path, file_id, specific_files, kind, name,
878
parent_id, definitely_changed, existing_ie, report_changes,
880
"Record the new inventory entry for a path if any."
881
# mutter('check %s {%s}', path, file_id)
882
# mutter('%s selected for commit', path)
883
if definitely_changed or existing_ie is None:
884
ie = make_entry(kind, name, parent_id, file_id)
886
ie = existing_ie.copy()
888
# For carried over entries we don't care about the fs hash - the repo
889
# isn't generating a sha, so we're not saving computation time.
890
_, _, fs_hash = self.builder.record_entry_contents(
891
ie, self.parent_invs, path, self.work_tree, content_summary)
893
self._report_change(ie, path)
895
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
898
def _report_change(self, ie, path):
899
"""Report a change to the user.
901
The change that has occurred is described relative to the basis
904
if (self.basis_inv.has_id(ie.file_id)):
905
basis_ie = self.basis_inv[ie.file_id]
908
change = ie.describe_change(basis_ie, ie)
909
if change in (InventoryEntry.RENAMED,
910
InventoryEntry.MODIFIED_AND_RENAMED):
911
old_path = self.basis_inv.id2path(ie.file_id)
912
self.reporter.renamed(change, old_path, path)
913
self._next_progress_entry()
915
if change == 'unchanged':
917
self.reporter.snapshot_change(change, path)
918
self._next_progress_entry()
763
920
def _set_progress_stage(self, name, counter=False):
764
921
"""Set the progress stage and emit an update to the progress bar."""
778
935
def _emit_progress(self):
779
936
if self.pb_entries_count is not None:
780
text = gettext("{0} [{1}] - Stage").format(self.pb_stage_name,
781
self.pb_entries_count)
937
text = "%s [%d] - Stage" % (self.pb_stage_name,
938
self.pb_entries_count)
783
text = gettext("%s - Stage") % (self.pb_stage_name, )
940
text = "%s - Stage" % (self.pb_stage_name, )
784
941
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
943
def _set_specific_file_ids(self):
944
"""populate self.specific_file_ids if we will use it."""
945
if not self.use_record_iter_changes:
946
# If provided, ensure the specified files are versioned
947
if self.specific_files is not None:
948
# Note: This routine is being called because it raises
949
# PathNotVersionedError as a side effect of finding the IDs. We
950
# later use the ids we found as input to the working tree
951
# inventory iterator, so we only consider those ids rather than
952
# examining the whole tree again.
953
# XXX: Dont we have filter_unversioned to do this more
955
self.specific_file_ids = tree.find_ids_across_trees(
956
self.specific_files, [self.basis_tree, self.work_tree])
958
self.specific_file_ids = None
added
removed
bzrlib/commit.py
