283
266
:param lossy: When committing to a foreign VCS, ignore any
284
267
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())
345
# Cannot commit with conflicts present.
346
if len(self.work_tree.conflicts()) > 0:
347
raise ConflictsInTree
349
# 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()
354
# Check that the working tree is up to date
355
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
357
# Complete configuration setup
358
if reporter is not None:
359
self.reporter = reporter
360
elif self.reporter is None:
361
self.reporter = self._select_reporter()
363
# Setup the progress bar. As the number of files that need to be
364
# committed in unknown, progress is reported as stages.
365
# We keep track of entries separately though and include that
366
# information in the progress bar during the relevant stages.
367
self.pb_stage_name = ""
368
self.pb_stage_count = 0
369
self.pb_stage_total = 5
370
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
374
self.pb.show_pct = False
375
self.pb.show_spinner = False
376
self.pb.show_eta = False
377
self.pb.show_count = True
378
self.pb.show_bar = True
380
# After a merge, a selected file commit is not supported.
381
# See 'bzr help merge' for an explanation as to why.
382
if len(self.parents) > 1 and self.specific_files is not None:
383
raise CannotCommitSelectedFileMerge(self.specific_files)
384
# Excludes are a form of selected file commit.
385
if len(self.parents) > 1 and self.exclude:
386
raise CannotCommitSelectedFileMerge(self.exclude)
388
# Collect the changes
389
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")
402
# find the location being committed to
403
if self.bound_branch:
404
master_location = self.master_branch.base
406
master_location = self.branch.base
408
# report the start of the commit
409
self.reporter.started(new_revno, self.rev_id, master_location)
411
self._update_builder_with_changes()
412
self._check_pointless()
414
# TODO: Now the new inventory is known, check for conflicts.
415
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
416
# weave lines, because nothing should be recorded until it is known
417
# that commit will succeed.
418
self._set_progress_stage("Saving data locally")
419
self.builder.finish_inventory()
421
# Prompt the user for a commit message if none provided
422
message = message_callback(self)
423
self.message = message
425
# Add revision data to the local branch
426
self.rev_id = self.builder.commit(self.message)
429
mutter("aborting commit write group because of exception:")
430
trace.log_exception_quietly()
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
self._process_pre_hooks(old_revno, new_revno)
461
# Upload revision data to the master.
462
# this will propagate merged revisions too if needed.
463
if self.bound_branch:
464
self._set_progress_stage("Uploading data to master branch")
465
# 'commit' to the master first so a timeout here causes the
466
# 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)
472
# and now do the commit locally.
473
if new_revno is None:
474
# Keep existing behaviour around ghosts
476
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)
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()
449
self._process_pre_hooks(old_revno, new_revno)
451
# Upload revision data to the master.
452
# this will propagate merged revisions too if needed.
453
if self.bound_branch:
454
self._set_progress_stage("Uploading data to master branch")
455
# 'commit' to the master first so a timeout here causes the
456
# local branch to be out of date
457
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
458
self.branch, new_revno, self.rev_id, lossy=lossy)
460
self.branch.fetch(self.master_branch, self.rev_id)
462
# and now do the commit locally.
463
self.branch.set_last_revision_info(new_revno, self.rev_id)
486
465
# Merge local tags to remote
487
466
if self.bound_branch:
488
467
self._set_progress_stage("Merging tags to master branch")
489
tag_updates, tag_conflicts = self.branch.tags.merge_to(
490
self.master_branch.tags)
468
tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
491
469
if tag_conflicts:
492
470
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
493
note(gettext("Conflicting tags in bound branch:\n{0}".format(
494
"\n".join(warning_lines))))
471
note("Conflicting tags in bound branch:\n" +
472
"\n".join(warning_lines))
474
# Make the working tree be up to date with the branch. This
475
# includes automatic changes scheduled to be made to the tree, such
476
# as updating its basis and unversioning paths that were missing.
477
self.work_tree.unversion(self.deleted_ids)
478
self._set_progress_stage("Updating the working tree")
479
self.work_tree.update_basis_by_delta(self.rev_id,
480
self.builder.get_basis_delta())
481
self.reporter.completed(new_revno, self.rev_id)
482
self._process_post_hooks(old_revno, new_revno)
496
485
def _select_reporter(self):
497
486
"""Select the CommitReporter to use."""
681
680
reporter = self.reporter
682
681
report_changes = reporter.is_verbose()
684
683
for change in iter_changes:
685
684
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]
685
old_path = change[1][0]
686
new_path = change[1][1]
687
versioned = change[3][1]
689
versioned = change[3][1]
691
690
if kind is None and versioned:
693
692
if report_changes:
694
693
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])
694
deleted_ids.append(change[0])
700
695
# Reset the new path (None) and new versioned flag (False)
701
change = change.discard_new()
702
new_path = change.path[1]
696
change = (change[0], (change[1][0], None), change[2],
697
(change[3][0], False)) + change[4:]
704
698
elif kind == 'tree-reference':
705
699
if self.recursive == 'down':
706
self._commit_nested_tree(change.path[1])
707
if change.versioned[0] or change.versioned[1]:
700
self._commit_nested_tree(change[0], change[1][1])
701
if change[3][0] or change[3][1]:
709
703
if report_changes:
710
704
if new_path is None:
711
705
reporter.deleted(old_path)
712
706
elif old_path is None:
713
reporter.snapshot_change(gettext('added'), new_path)
707
reporter.snapshot_change('added', new_path)
714
708
elif old_path != new_path:
715
reporter.renamed(gettext('renamed'),
709
reporter.renamed('renamed', old_path, new_path)
719
or self.work_tree.branch.repository._format.rich_root_data):
712
self.work_tree.branch.repository._format.rich_root_data):
720
713
# Don't report on changes to '' in non rich root
722
reporter.snapshot_change(
723
gettext('modified'), new_path)
715
reporter.snapshot_change('modified', new_path)
724
716
self._next_progress_entry()
725
# Unversion files that were found to be deleted
726
self.deleted_paths = deleted_paths
717
# Unversion IDs that were found to be deleted
718
self.deleted_ids = deleted_ids
720
def _record_unselected(self):
721
# If specific files are selected, then all un-selected files must be
722
# recorded in their previous state. For more details, see
723
# https://lists.ubuntu.com/archives/bazaar/2007q3/028476.html.
724
if self.specific_files or self.exclude:
725
specific_files = self.specific_files or []
726
for path, old_ie in self.basis_inv.iter_entries():
727
if old_ie.file_id in self.builder.new_inventory:
728
# already added - skip.
730
if (is_inside_any(specific_files, path)
731
and not is_inside_any(self.exclude, path)):
732
# was inside the selected path, and not excluded - if not
733
# present it has been deleted so skip.
735
# From here down it was either not selected, or was excluded:
736
# We preserve the entry unaltered.
738
# Note: specific file commits after a merge are currently
739
# prohibited. This test is for sanity/safety in case it's
740
# required after that changes.
741
if len(self.parents) > 1:
743
self.builder.record_entry_contents(ie, self.parent_invs, path,
744
self.basis_tree, None)
746
def _report_and_accumulate_deletes(self):
747
if (isinstance(self.basis_inv, Inventory)
748
and isinstance(self.builder.new_inventory, Inventory)):
749
# the older Inventory classes provide a _byid dict, and building a
750
# set from the keys of this dict is substantially faster than even
751
# getting a set of ids from the inventory
753
# <lifeless> set(dict) is roughly the same speed as
754
# set(iter(dict)) and both are significantly slower than
756
deleted_ids = set(self.basis_inv._byid.keys()) - \
757
set(self.builder.new_inventory._byid.keys())
759
deleted_ids = set(self.basis_inv) - set(self.builder.new_inventory)
761
self.any_entries_deleted = True
762
deleted = [(self.basis_tree.id2path(file_id), file_id)
763
for file_id in deleted_ids]
765
# XXX: this is not quite directory-order sorting
766
for path, file_id in deleted:
767
self.builder.record_delete(path, file_id)
768
self.reporter.deleted(path)
728
770
def _check_strict(self):
729
771
# XXX: when we use iter_changes this would likely be faster if
734
776
for unknown in self.work_tree.unknowns():
735
777
raise StrictCommitFailed()
737
def _commit_nested_tree(self, path):
779
def _populate_from_inventory(self):
780
"""Populate the CommitBuilder by walking the working tree inventory."""
781
# Build the revision inventory.
783
# This starts by creating a new empty inventory. Depending on
784
# which files are selected for commit, and what is present in the
785
# current tree, the new inventory is populated. inventory entries
786
# which are candidates for modification have their revision set to
787
# None; inventory entries that are carried over untouched have their
788
# revision set to their prior value.
790
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
791
# results to create a new inventory at the same time, which results
792
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
795
specific_files = self.specific_files
796
exclude = self.exclude
797
report_changes = self.reporter.is_verbose()
799
# A tree of paths that have been deleted. E.g. if foo/bar has been
800
# deleted, then we have {'foo':{'bar':{}}}
802
# XXX: Note that entries may have the wrong kind because the entry does
803
# not reflect the status on disk.
804
work_inv = self.work_tree.inventory
805
# NB: entries will include entries within the excluded ids/paths
806
# because iter_entries_by_dir has no 'exclude' facility today.
807
entries = work_inv.iter_entries_by_dir(
808
specific_file_ids=self.specific_file_ids, yield_parents=True)
809
for path, existing_ie in entries:
810
file_id = existing_ie.file_id
811
name = existing_ie.name
812
parent_id = existing_ie.parent_id
813
kind = existing_ie.kind
814
# Skip files that have been deleted from the working tree.
815
# The deleted path ids are also recorded so they can be explicitly
818
path_segments = splitpath(path)
819
deleted_dict = deleted_paths
820
for segment in path_segments:
821
deleted_dict = deleted_dict.get(segment, None)
823
# We either took a path not present in the dict
824
# (deleted_dict was None), or we've reached an empty
825
# child dir in the dict, so are now a sub-path.
829
if deleted_dict is not None:
830
# the path has a deleted parent, do not add it.
832
if exclude and is_inside_any(exclude, path):
833
# Skip excluded paths. Excluded paths are processed by
834
# _update_builder_with_changes.
836
content_summary = self.work_tree.path_content_summary(path)
837
kind = content_summary[0]
838
# Note that when a filter of specific files is given, we must only
839
# skip/record deleted files matching that filter.
840
if not specific_files or is_inside_any(specific_files, path):
841
if kind == 'missing':
842
if not deleted_paths:
843
# path won't have been split yet.
844
path_segments = splitpath(path)
845
deleted_dict = deleted_paths
846
for segment in path_segments:
847
deleted_dict = deleted_dict.setdefault(segment, {})
848
self.reporter.missing(path)
849
self._next_progress_entry()
850
deleted_ids.append(file_id)
852
# TODO: have the builder do the nested commit just-in-time IF and
854
if kind == 'tree-reference':
855
# enforce repository nested tree policy.
856
if (not self.work_tree.supports_tree_reference() or
857
# repository does not support it either.
858
not self.branch.repository._format.supports_tree_reference):
860
content_summary = (kind, None, None, None)
861
elif self.recursive == 'down':
862
nested_revision_id = self._commit_nested_tree(
864
content_summary = (kind, None, None, nested_revision_id)
866
nested_revision_id = self.work_tree.get_reference_revision(file_id)
867
content_summary = (kind, None, None, nested_revision_id)
869
# Record an entry for this item
870
# Note: I don't particularly want to have the existing_ie
871
# parameter but the test suite currently (28-Jun-07) breaks
872
# without it thanks to a unicode normalisation issue. :-(
873
definitely_changed = kind != existing_ie.kind
874
self._record_entry(path, file_id, specific_files, kind, name,
875
parent_id, definitely_changed, existing_ie, report_changes,
878
# Unversion IDs that were found to be deleted
879
self.deleted_ids = deleted_ids
881
def _commit_nested_tree(self, file_id, path):
738
882
"Commit a nested tree."
739
sub_tree = self.work_tree.get_nested_tree(path)
883
sub_tree = self.work_tree.get_nested_tree(file_id, path)
740
884
# FIXME: be more comprehensive here:
741
885
# this works when both trees are in --trees repository,
742
886
# but when both are bound to a different repository,
744
888
# finally implement the explicit-caches approach design
745
889
# a while back - RBC 20070306.
746
890
if sub_tree.branch.repository.has_same_location(
747
self.work_tree.branch.repository):
891
self.work_tree.branch.repository):
748
892
sub_tree.branch.repository = \
749
893
self.work_tree.branch.repository
751
895
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)
896
recursive=self.recursive,
897
message_callback=self.message_callback,
898
timestamp=self.timestamp, timezone=self.timezone,
899
committer=self.committer,
900
allow_pointless=self.allow_pointless,
901
strict=self.strict, verbose=self.verbose,
902
local=self.local, reporter=self.reporter)
903
except errors.PointlessCommit:
904
return self.work_tree.get_reference_revision(file_id)
906
def _record_entry(self, path, file_id, specific_files, kind, name,
907
parent_id, definitely_changed, existing_ie, report_changes,
909
"Record the new inventory entry for a path if any."
910
# mutter('check %s {%s}', path, file_id)
911
# mutter('%s selected for commit', path)
912
if definitely_changed or existing_ie is None:
913
ie = make_entry(kind, name, parent_id, file_id)
915
ie = existing_ie.copy()
917
# For carried over entries we don't care about the fs hash - the repo
918
# isn't generating a sha, so we're not saving computation time.
919
_, _, fs_hash = self.builder.record_entry_contents(
920
ie, self.parent_invs, path, self.work_tree, content_summary)
922
self._report_change(ie, path)
924
self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
927
def _report_change(self, ie, path):
928
"""Report a change to the user.
930
The change that has occurred is described relative to the basis
933
if (self.basis_inv.has_id(ie.file_id)):
934
basis_ie = self.basis_inv[ie.file_id]
937
change = ie.describe_change(basis_ie, ie)
938
if change in (InventoryEntry.RENAMED,
939
InventoryEntry.MODIFIED_AND_RENAMED):
940
old_path = self.basis_inv.id2path(ie.file_id)
941
self.reporter.renamed(change, old_path, path)
942
self._next_progress_entry()
944
if change == 'unchanged':
946
self.reporter.snapshot_change(change, path)
947
self._next_progress_entry()
763
949
def _set_progress_stage(self, name, counter=False):
764
950
"""Set the progress stage and emit an update to the progress bar."""
added
removed
bzrlib/commit.py
