285
266
:param lossy: When committing to a foreign VCS, ignore any
286
267
data that can not be natively represented.
288
with ExitStack() as stack:
289
self.revprops = revprops or {}
290
# XXX: Can be set on __init__ or passed in - this is a bit ugly.
291
self.config_stack = config or self.config_stack
292
mutter('preparing to commit')
294
if working_tree is None:
295
raise BzrError("working_tree must be passed into commit().")
297
self.work_tree = working_tree
298
self.branch = self.work_tree.branch
299
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
300
if not self.branch.repository.supports_rich_root():
301
raise errors.RootNotRich()
302
if message_callback is None:
303
if message is not None:
304
if isinstance(message, bytes):
305
message = message.decode(get_user_encoding())
307
def message_callback(x):
310
raise BzrError("The message or message_callback keyword"
311
" parameter is required for commit().")
313
self.bound_branch = None
314
self.any_entries_deleted = False
315
if exclude is not None:
316
self.exclude = sorted(
317
minimum_path_selection(exclude))
321
self.master_branch = None
322
self.recursive = recursive
324
# self.specific_files is None to indicate no filter, or any iterable to
325
# indicate a filter - [] means no files at all, as per iter_changes.
326
if specific_files is not None:
327
self.specific_files = sorted(
328
minimum_path_selection(specific_files))
330
self.specific_files = None
332
self.allow_pointless = allow_pointless
333
self.message_callback = message_callback
334
self.timestamp = timestamp
335
self.timezone = timezone
336
self.committer = committer
338
self.verbose = verbose
340
stack.enter_context(self.work_tree.lock_write())
341
self.parents = self.work_tree.get_parent_ids()
342
self.pb = ui.ui_factory.nested_progress_bar()
343
stack.callback(self.pb.finished)
344
self.basis_revid = self.work_tree.last_revision()
345
self.basis_tree = self.work_tree.basis_tree()
346
stack.enter_context(self.basis_tree.lock_read())
347
# Cannot commit with conflicts present.
348
if len(self.work_tree.conflicts()) > 0:
349
raise ConflictsInTree
351
# Setup the bound branch variables as needed.
352
self._check_bound_branch(stack, possible_master_transports)
353
if self.config_stack is None:
354
self.config_stack = self.work_tree.get_config_stack()
356
# Check that the working tree is up to date
357
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
359
# Complete configuration setup
360
if reporter is not None:
361
self.reporter = reporter
362
elif self.reporter is None:
363
self.reporter = self._select_reporter()
365
# Setup the progress bar. As the number of files that need to be
366
# committed in unknown, progress is reported as stages.
367
# We keep track of entries separately though and include that
368
# information in the progress bar during the relevant stages.
369
self.pb_stage_name = ""
370
self.pb_stage_count = 0
371
self.pb_stage_total = 5
372
if self.bound_branch:
373
# 2 extra stages: "Uploading data to master branch" and "Merging
374
# tags to master branch"
375
self.pb_stage_total += 2
376
self.pb.show_pct = False
377
self.pb.show_spinner = False
378
self.pb.show_eta = False
379
self.pb.show_count = True
380
self.pb.show_bar = True
382
# After a merge, a selected file commit is not supported.
383
# See 'bzr help merge' for an explanation as to why.
384
if len(self.parents) > 1 and self.specific_files is not None:
385
raise CannotCommitSelectedFileMerge(self.specific_files)
386
# Excludes are a form of selected file commit.
387
if len(self.parents) > 1 and self.exclude:
388
raise CannotCommitSelectedFileMerge(self.exclude)
390
# Collect the changes
391
self._set_progress_stage("Collecting changes", counter=True)
393
self.builder = self.branch.get_commit_builder(
394
self.parents, self.config_stack, timestamp, timezone, committer,
395
self.revprops, rev_id, lossy=lossy)
397
if self.builder.updates_branch and self.bound_branch:
399
raise AssertionError(
400
"bound branches not supported for commit builders "
401
"that update the branch")
404
# find the location being committed to
405
if self.bound_branch:
406
master_location = self.master_branch.base
408
master_location = self.branch.base
410
# report the start of the commit
411
self.reporter.started(new_revno, self.rev_id, master_location)
413
self._update_builder_with_changes()
414
self._check_pointless()
416
# TODO: Now the new inventory is known, check for conflicts.
417
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
418
# weave lines, because nothing should be recorded until it is known
419
# that commit will succeed.
420
self._set_progress_stage("Saving data locally")
421
self.builder.finish_inventory()
423
# Prompt the user for a commit message if none provided
424
message = message_callback(self)
425
self.message = message
427
# Add revision data to the local branch
428
self.rev_id = self.builder.commit(self.message)
431
mutter("aborting commit write group because of exception:")
432
trace.log_exception_quietly()
436
self._update_branches(old_revno, old_revid, new_revno)
438
# Make the working tree be up to date with the branch. This
439
# includes automatic changes scheduled to be made to the tree, such
440
# as updating its basis and unversioning paths that were missing.
441
self.work_tree.unversion(self.deleted_paths)
442
self._set_progress_stage("Updating the working tree")
443
self.work_tree.update_basis_by_delta(self.rev_id,
444
self.builder.get_basis_delta())
445
self.reporter.completed(new_revno, self.rev_id)
446
self._process_post_hooks(old_revno, new_revno)
449
def _update_branches(self, old_revno, old_revid, new_revno):
450
"""Update the master and local branch to the new revision.
452
This will try to make sure that the master branch is updated
453
before the local branch.
455
:param old_revno: Revision number of master branch before the
457
:param old_revid: Tip of master branch before the commit
458
:param new_revno: Revision number of the new commit
460
if not self.builder.updates_branch:
461
self._process_pre_hooks(old_revno, new_revno)
463
# Upload revision data to the master.
464
# this will propagate merged revisions too if needed.
465
if self.bound_branch:
466
self._set_progress_stage("Uploading data to master branch")
467
# 'commit' to the master first so a timeout here causes the
468
# local branch to be out of date
469
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
470
self.branch, new_revno, self.rev_id, lossy=self._lossy)
472
self.branch.fetch(self.master_branch, self.rev_id)
474
# and now do the commit locally.
475
if new_revno is None:
476
# Keep existing behaviour around ghosts
478
self.branch.set_last_revision_info(new_revno, self.rev_id)
481
self._process_pre_hooks(old_revno, new_revno)
482
except BaseException:
483
# The commit builder will already have updated the branch,
485
self.branch.set_last_revision_info(old_revno, old_revid)
269
operation = OperationWithCleanups(self._commit)
270
self.revprops = revprops or {}
271
# XXX: Can be set on __init__ or passed in - this is a bit ugly.
272
self.config = config or self.config
273
return operation.run(
278
specific_files=specific_files,
280
allow_pointless=allow_pointless,
283
working_tree=working_tree,
286
message_callback=message_callback,
289
possible_master_transports=possible_master_transports,
292
def _commit(self, operation, message, timestamp, timezone, committer,
293
specific_files, rev_id, allow_pointless, strict, verbose,
294
working_tree, local, reporter, message_callback, recursive,
295
exclude, possible_master_transports, lossy):
296
mutter('preparing to commit')
298
if working_tree is None:
299
raise BzrError("working_tree must be passed into commit().")
301
self.work_tree = working_tree
302
self.branch = self.work_tree.branch
303
if getattr(self.work_tree, 'requires_rich_root', lambda: False)():
304
if not self.branch.repository.supports_rich_root():
305
raise errors.RootNotRich()
306
if message_callback is None:
307
if message is not None:
308
if isinstance(message, str):
309
message = message.decode(get_user_encoding())
310
message_callback = lambda x: message
312
raise BzrError("The message or message_callback keyword"
313
" parameter is required for commit().")
315
self.bound_branch = None
316
self.any_entries_deleted = False
317
if exclude is not None:
318
self.exclude = sorted(
319
minimum_path_selection(exclude))
323
self.master_branch = None
324
self.recursive = recursive
326
# self.specific_files is None to indicate no filter, or any iterable to
327
# indicate a filter - [] means no files at all, as per iter_changes.
328
if specific_files is not None:
329
self.specific_files = sorted(
330
minimum_path_selection(specific_files))
332
self.specific_files = None
334
self.allow_pointless = allow_pointless
335
self.message_callback = message_callback
336
self.timestamp = timestamp
337
self.timezone = timezone
338
self.committer = committer
340
self.verbose = verbose
342
self.work_tree.lock_write()
343
operation.add_cleanup(self.work_tree.unlock)
344
self.parents = self.work_tree.get_parent_ids()
345
# We can use record_iter_changes IFF iter_changes is compatible with
346
# the command line parameters, and the repository has fast delta
347
# generation. See bug 347649.
348
self.use_record_iter_changes = (
350
not self.branch.repository._format.supports_tree_reference and
351
(self.branch.repository._format.fast_deltas or
352
len(self.parents) < 2))
353
self.pb = ui.ui_factory.nested_progress_bar()
354
operation.add_cleanup(self.pb.finished)
355
self.basis_revid = self.work_tree.last_revision()
356
self.basis_tree = self.work_tree.basis_tree()
357
self.basis_tree.lock_read()
358
operation.add_cleanup(self.basis_tree.unlock)
359
# Cannot commit with conflicts present.
360
if len(self.work_tree.conflicts()) > 0:
361
raise ConflictsInTree
363
# Setup the bound branch variables as needed.
364
self._check_bound_branch(operation, possible_master_transports)
366
# Check that the working tree is up to date
367
old_revno, new_revno = self._check_out_of_date_tree()
369
# Complete configuration setup
370
if reporter is not None:
371
self.reporter = reporter
372
elif self.reporter is None:
373
self.reporter = self._select_reporter()
374
if self.config is None:
375
self.config = self.branch.get_config()
377
self._set_specific_file_ids()
379
# Setup the progress bar. As the number of files that need to be
380
# committed in unknown, progress is reported as stages.
381
# We keep track of entries separately though and include that
382
# information in the progress bar during the relevant stages.
383
self.pb_stage_name = ""
384
self.pb_stage_count = 0
385
self.pb_stage_total = 5
386
if self.bound_branch:
387
# 2 extra stages: "Uploading data to master branch" and "Merging
388
# tags to master branch"
389
self.pb_stage_total += 2
390
self.pb.show_pct = False
391
self.pb.show_spinner = False
392
self.pb.show_eta = False
393
self.pb.show_count = True
394
self.pb.show_bar = True
396
self._gather_parents()
397
# After a merge, a selected file commit is not supported.
398
# See 'bzr help merge' for an explanation as to why.
399
if len(self.parents) > 1 and self.specific_files is not None:
400
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
401
# Excludes are a form of selected file commit.
402
if len(self.parents) > 1 and self.exclude:
403
raise errors.CannotCommitSelectedFileMerge(self.exclude)
405
# Collect the changes
406
self._set_progress_stage("Collecting changes", counter=True)
408
self.builder = self.branch.get_commit_builder(self.parents,
409
self.config, timestamp, timezone, committer, self.revprops,
411
if not self.builder.supports_record_entry_contents and self.exclude:
413
raise errors.ExcludesUnsupported(self.branch.repository)
416
self.builder.will_record_deletes()
417
# find the location being committed to
418
if self.bound_branch:
419
master_location = self.master_branch.base
421
master_location = self.branch.base
423
# report the start of the commit
424
self.reporter.started(new_revno, self.rev_id, master_location)
426
self._update_builder_with_changes()
427
self._check_pointless()
429
# TODO: Now the new inventory is known, check for conflicts.
430
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
431
# weave lines, because nothing should be recorded until it is known
432
# that commit will succeed.
433
self._set_progress_stage("Saving data locally")
434
self.builder.finish_inventory()
436
# Prompt the user for a commit message if none provided
437
message = message_callback(self)
438
self.message = message
440
# Add revision data to the local branch
441
self.rev_id = self.builder.commit(self.message)
444
mutter("aborting commit write group because of exception:")
445
trace.log_exception_quietly()
446
note("aborting commit write group: %r" % (e,))
450
self._process_pre_hooks(old_revno, new_revno)
452
# Upload revision data to the master.
453
# this will propagate merged revisions too if needed.
454
if self.bound_branch:
455
self._set_progress_stage("Uploading data to master branch")
456
# 'commit' to the master first so a timeout here causes the
457
# local branch to be out of date
458
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
459
self.branch, new_revno, self.rev_id, lossy=lossy)
461
self.branch.fetch(self.master_branch, self.rev_id)
463
# and now do the commit locally.
464
self.branch.set_last_revision_info(new_revno, self.rev_id)
488
466
# Merge local tags to remote
489
467
if self.bound_branch:
490
468
self._set_progress_stage("Merging tags to master branch")
491
tag_updates, tag_conflicts = self.branch.tags.merge_to(
492
self.master_branch.tags)
469
tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
493
470
if tag_conflicts:
494
471
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
495
note(gettext("Conflicting tags in bound branch:\n{0}".format(
496
"\n".join(warning_lines))))
472
note("Conflicting tags in bound branch:\n" +
473
"\n".join(warning_lines))
475
# Make the working tree be up to date with the branch. This
476
# includes automatic changes scheduled to be made to the tree, such
477
# as updating its basis and unversioning paths that were missing.
478
self.work_tree.unversion(self.deleted_ids)
479
self._set_progress_stage("Updating the working tree")
480
self.work_tree.update_basis_by_delta(self.rev_id,
481
self.builder.get_basis_delta())
482
self.reporter.completed(new_revno, self.rev_id)
483
self._process_post_hooks(old_revno, new_revno)
498
486
def _select_reporter(self):
499
487
"""Select the CommitReporter to use."""
683
690
reporter = self.reporter
684
691
report_changes = reporter.is_verbose()
686
693
for change in iter_changes:
687
694
if report_changes:
688
old_path = change.path[0]
689
new_path = change.path[1]
690
versioned = change.versioned[1]
691
kind = change.kind[1]
692
versioned = change.versioned[1]
695
old_path = change[1][0]
696
new_path = change[1][1]
697
versioned = change[3][1]
699
versioned = change[3][1]
693
700
if kind is None and versioned:
695
702
if report_changes:
696
703
reporter.missing(new_path)
697
if change.kind[0] == 'symlink' and not self.work_tree.supports_symlinks():
698
trace.warning('Ignoring "%s" as symlinks are not '
699
'supported on this filesystem.' % (change.path[0],))
701
deleted_paths.append(change.path[1])
704
deleted_ids.append(change[0])
702
705
# Reset the new path (None) and new versioned flag (False)
703
change = change.discard_new()
704
new_path = change.path[1]
706
change = (change[0], (change[1][0], None), change[2],
707
(change[3][0], False)) + change[4:]
706
708
elif kind == 'tree-reference':
707
709
if self.recursive == 'down':
708
self._commit_nested_tree(change.path[1])
709
if change.versioned[0] or change.versioned[1]:
710
self._commit_nested_tree(change[0], change[1][1])
711
if change[3][0] or change[3][1]:
711
713
if report_changes:
712
714
if new_path is None:
713
715
reporter.deleted(old_path)
714
716
elif old_path is None:
715
reporter.snapshot_change(gettext('added'), new_path)
717
reporter.snapshot_change('added', new_path)
716
718
elif old_path != new_path:
717
reporter.renamed(gettext('renamed'),
719
reporter.renamed('renamed', old_path, new_path)
721
or self.work_tree.branch.repository._format.rich_root_data):
722
self.work_tree.branch.repository._format.rich_root_data):
722
723
# Don't report on changes to '' in non rich root
724
reporter.snapshot_change(
725
gettext('modified'), new_path)
725
reporter.snapshot_change('modified', new_path)
726
726
self._next_progress_entry()
727
# Unversion files that were found to be deleted
728
self.deleted_paths = deleted_paths
727
# Unversion IDs that were found to be deleted
728
self.deleted_ids = deleted_ids
730
def _record_unselected(self):
731
# If specific files are selected, then all un-selected files must be
732
# recorded in their previous state. For more details, see
733
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
734
if self.specific_files or self.exclude:
735
specific_files = self.specific_files or []
736
for path, old_ie in self.basis_inv.iter_entries():
737
if old_ie.file_id in self.builder.new_inventory:
738
# already added - skip.
740
if (is_inside_any(specific_files, path)
741
and not is_inside_any(self.exclude, path)):
742
# was inside the selected path, and not excluded - if not
743
# present it has been deleted so skip.
745
# From here down it was either not selected, or was excluded:
746
# We preserve the entry unaltered.
748
# Note: specific file commits after a merge are currently
749
# prohibited. This test is for sanity/safety in case it's
750
# required after that changes.
751
if len(self.parents) > 1:
753
self.builder.record_entry_contents(ie, self.parent_invs, path,
754
self.basis_tree, None)
756
def _report_and_accumulate_deletes(self):
757
if (isinstance(self.basis_inv, Inventory)
758
and isinstance(self.builder.new_inventory, Inventory)):
759
# the older Inventory classes provide a _byid dict, and building a
760
# set from the keys of this dict is substantially faster than even
761
# getting a set of ids from the inventory
763
# <lifeless> set(dict) is roughly the same speed as
764
# set(iter(dict)) and both are significantly slower than
766
deleted_ids = set(self.basis_inv._byid.keys()) - \
767
set(self.builder.new_inventory._byid.keys())
769
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
771
self.any_entries_deleted = True
772
deleted = [(self.basis_tree.id2path(file_id), file_id)
773
for file_id in deleted_ids]
775
# XXX: this is not quite directory-order sorting
776
for path, file_id in deleted:
777
self.builder.record_delete(path, file_id)
778
self.reporter.deleted(path)
730
780
def _check_strict(self):
731
781
# XXX: when we use iter_changes this would likely be faster if
736
786
for unknown in self.work_tree.unknowns():
737
787
raise StrictCommitFailed()
739
def _commit_nested_tree(self, path):
789
def _populate_from_inventory(self):
790
"""Populate the CommitBuilder by walking the working tree inventory."""
791
# Build the revision inventory.
793
# This starts by creating a new empty inventory. Depending on
794
# which files are selected for commit, and what is present in the
795
# current tree, the new inventory is populated. inventory entries
796
# which are candidates for modification have their revision set to
797
# None; inventory entries that are carried over untouched have their
798
# revision set to their prior value.
800
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
801
# results to create a new inventory at the same time, which results
802
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
805
specific_files = self.specific_files
806
exclude = self.exclude
807
report_changes = self.reporter.is_verbose()
809
# A tree of paths that have been deleted. E.g. if foo/bar has been
810
# deleted, then we have {'foo':{'bar':{}}}
812
# XXX: Note that entries may have the wrong kind because the entry does
813
# not reflect the status on disk.
814
work_inv = self.work_tree.inventory
815
# NB: entries will include entries within the excluded ids/paths
816
# because iter_entries_by_dir has no 'exclude' facility today.
817
entries = work_inv.iter_entries_by_dir(
818
specific_file_ids=self.specific_file_ids, yield_parents=True)
819
for path, existing_ie in entries:
820
file_id = existing_ie.file_id
821
name = existing_ie.name
822
parent_id = existing_ie.parent_id
823
kind = existing_ie.kind
824
# Skip files that have been deleted from the working tree.
825
# The deleted path ids are also recorded so they can be explicitly
828
path_segments = splitpath(path)
829
deleted_dict = deleted_paths
830
for segment in path_segments:
831
deleted_dict = deleted_dict.get(segment, None)
833
# We either took a path not present in the dict
834
# (deleted_dict was None), or we've reached an empty
835
# child dir in the dict, so are now a sub-path.
839
if deleted_dict is not None:
840
# the path has a deleted parent, do not add it.
842
if exclude and is_inside_any(exclude, path):
843
# Skip excluded paths. Excluded paths are processed by
844
# _update_builder_with_changes.
846
content_summary = self.work_tree.path_content_summary(path)
847
kind = content_summary[0]
848
# Note that when a filter of specific files is given, we must only
849
# skip/record deleted files matching that filter.
850
if not specific_files or is_inside_any(specific_files, path):
851
if kind == 'missing':
852
if not deleted_paths:
853
# path won't have been split yet.
854
path_segments = splitpath(path)
855
deleted_dict = deleted_paths
856
for segment in path_segments:
857
deleted_dict = deleted_dict.setdefault(segment, {})
858
self.reporter.missing(path)
859
self._next_progress_entry()
860
deleted_ids.append(file_id)
862
# TODO: have the builder do the nested commit just-in-time IF and
864
if kind == 'tree-reference':
865
# enforce repository nested tree policy.
866
if (not self.work_tree.supports_tree_reference() or
867
# repository does not support it either.
868
not self.branch.repository._format.supports_tree_reference):
870
content_summary = (kind, None, None, None)
871
elif self.recursive == 'down':
872
nested_revision_id = self._commit_nested_tree(
874
content_summary = (kind, None, None, nested_revision_id)
876
nested_revision_id = self.work_tree.get_reference_revision(file_id)
877
content_summary = (kind, None, None, nested_revision_id)
879
# Record an entry for this item
880
# Note: I don't particularly want to have the existing_ie
881
# parameter but the test suite currently (28-Jun-07) breaks
882
# without it thanks to a unicode normalisation issue. :-(
883
definitely_changed = kind != existing_ie.kind
884
self._record_entry(path, file_id, specific_files, kind, name,
885
parent_id, definitely_changed, existing_ie, report_changes,
888
# Unversion IDs that were found to be deleted
889
self.deleted_ids = deleted_ids
891
def _commit_nested_tree(self, file_id, path):
740
892
"Commit a nested tree."
741
sub_tree = self.work_tree.get_nested_tree(path)
893
sub_tree = self.work_tree.get_nested_tree(file_id, path)
742
894
# FIXME: be more comprehensive here:
743
895
# this works when both trees are in --trees repository,
744
896
# but when both are bound to a different repository,
746
898
# finally implement the explicit-caches approach design
747
899
# a while back - RBC 20070306.
748
900
if sub_tree.branch.repository.has_same_location(
749
self.work_tree.branch.repository):
901
self.work_tree.branch.repository):
750
902
sub_tree.branch.repository = \
751
903
self.work_tree.branch.repository
753
905
return sub_tree.commit(message=None, revprops=self.revprops,
754
recursive=self.recursive,
755
message_callback=self.message_callback,
756
timestamp=self.timestamp,
757
timezone=self.timezone,
758
committer=self.committer,
759
allow_pointless=self.allow_pointless,
760
strict=self.strict, verbose=self.verbose,
761
local=self.local, reporter=self.reporter)
762
except PointlessCommit:
763
return self.work_tree.get_reference_revision(path)
906
recursive=self.recursive,
907
message_callback=self.message_callback,
908
timestamp=self.timestamp, timezone=self.timezone,
909
committer=self.committer,
910
allow_pointless=self.allow_pointless,
911
strict=self.strict, verbose=self.verbose,
912
local=self.local, reporter=self.reporter)
913
except errors.PointlessCommit:
914
return self.work_tree.get_reference_revision(file_id)
916
def _record_entry(self, path, file_id, specific_files, kind, name,
917
parent_id, definitely_changed, existing_ie, report_changes,
919
"Record the new inventory entry for a path if any."
920
# mutter('check %s {%s}', path, file_id)
921
# mutter('%s selected for commit', path)
922
if definitely_changed or existing_ie is None:
923
ie = make_entry(kind, name, parent_id, file_id)
925
ie = existing_ie.copy()
927
# For carried over entries we don't care about the fs hash - the repo
928
# isn't generating a sha, so we're not saving computation time.
929
_, _, fs_hash = self.builder.record_entry_contents(
930
ie, self.parent_invs, path, self.work_tree, content_summary)
932
self._report_change(ie, path)
934
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
937
def _report_change(self, ie, path):
938
"""Report a change to the user.
940
The change that has occurred is described relative to the basis
943
if (self.basis_inv.has_id(ie.file_id)):
944
basis_ie = self.basis_inv[ie.file_id]
947
change = ie.describe_change(basis_ie, ie)
948
if change in (InventoryEntry.RENAMED,
949
InventoryEntry.MODIFIED_AND_RENAMED):
950
old_path = self.basis_inv.id2path(ie.file_id)
951
self.reporter.renamed(change, old_path, path)
952
self._next_progress_entry()
954
if change == 'unchanged':
956
self.reporter.snapshot_change(change, path)
957
self._next_progress_entry()
765
959
def _set_progress_stage(self, name, counter=False):
766
960
"""Set the progress stage and emit an update to the progress bar."""
added
removed
bzrlib/commit.py
