50
49
# TODO: Change the parameter 'rev_id' to 'revision_id' to be consistent with
51
50
# the rest of the code; add a deprecation of the old name.
57
from cStringIO import StringIO
59
from .branch import Branch
60
from .cleanup import OperationWithCleanups
62
from .errors import (BzrError,
66
from .osutils import (get_user_encoding,
68
minimum_path_selection,
70
from .trace import mutter, note, is_quiet
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
old_path = change[1][0]
99
new_path = change[1][1]
101
new_excluded = (new_path is not None and
102
is_inside_any(exclude, new_path))
104
old_excluded = (old_path is not None and
105
is_inside_any(exclude, old_path))
107
if old_excluded and new_excluded:
110
if old_excluded or new_excluded:
111
# TODO(jelmer): Perhaps raise an error here instead?
65
from bzrlib.branch import Branch
67
from bzrlib.errors import (BzrError, PointlessCommit,
71
from bzrlib.osutils import (kind_marker, isdir,isfile, is_inside_any,
72
is_inside_or_parent_of_any,
73
quotefn, sha_file, split_lines)
74
from bzrlib.testament import Testament
75
from bzrlib.trace import mutter, note, warning
76
from bzrlib.xml5 import serializer_v5
77
from bzrlib.inventory import Inventory, InventoryEntry
78
from bzrlib import symbol_versioning
79
from bzrlib.symbol_versioning import (deprecated_passed,
82
from bzrlib.workingtree import WorkingTree
117
86
class NullCommitReporter(object):
118
87
"""I report on progress of a commit."""
120
def started(self, revno, revid, location):
123
89
def snapshot_change(self, change, path):
126
92
def completed(self, revno, rev_id):
129
def deleted(self, path):
95
def deleted(self, file_id):
98
def escaped(self, escape_count, message):
132
101
def missing(self, path):
358
236
self.strict = strict
359
237
self.verbose = verbose
239
if reporter is None and self.reporter is None:
240
self.reporter = NullCommitReporter()
241
elif reporter is not None:
242
self.reporter = reporter
361
244
self.work_tree.lock_write()
362
operation.add_cleanup(self.work_tree.unlock)
363
self.parents = self.work_tree.get_parent_ids()
364
self.pb = ui.ui_factory.nested_progress_bar()
365
operation.add_cleanup(self.pb.finished)
366
self.basis_revid = self.work_tree.last_revision()
245
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
367
246
self.basis_tree = self.work_tree.basis_tree()
368
247
self.basis_tree.lock_read()
369
operation.add_cleanup(self.basis_tree.unlock)
370
# Cannot commit with conflicts present.
371
if len(self.work_tree.conflicts()) > 0:
372
raise ConflictsInTree
374
# Setup the bound branch variables as needed.
375
self._check_bound_branch(operation, possible_master_transports)
377
# Check that the working tree is up to date
378
old_revno, old_revid, new_revno = self._check_out_of_date_tree()
380
# Complete configuration setup
381
if reporter is not None:
382
self.reporter = reporter
383
elif self.reporter is None:
384
self.reporter = self._select_reporter()
385
if self.config_stack is None:
386
self.config_stack = self.work_tree.get_config_stack()
388
# Setup the progress bar. As the number of files that need to be
389
# committed in unknown, progress is reported as stages.
390
# We keep track of entries separately though and include that
391
# information in the progress bar during the relevant stages.
392
self.pb_stage_name = ""
393
self.pb_stage_count = 0
394
self.pb_stage_total = 5
395
if self.bound_branch:
396
# 2 extra stages: "Uploading data to master branch" and "Merging
397
# tags to master branch"
398
self.pb_stage_total += 2
399
self.pb.show_pct = False
400
self.pb.show_spinner = False
401
self.pb.show_eta = False
402
self.pb.show_count = True
403
self.pb.show_bar = True
405
# After a merge, a selected file commit is not supported.
406
# See 'bzr help merge' for an explanation as to why.
407
if len(self.parents) > 1 and self.specific_files is not None:
408
raise CannotCommitSelectedFileMerge(self.specific_files)
409
# Excludes are a form of selected file commit.
410
if len(self.parents) > 1 and self.exclude:
411
raise CannotCommitSelectedFileMerge(self.exclude)
413
# Collect the changes
414
self._set_progress_stage("Collecting changes", counter=True)
416
self.builder = self.branch.get_commit_builder(
417
self.parents, self.config_stack, timestamp, timezone, committer,
418
self.revprops, rev_id, lossy=lossy)
420
if self.builder.updates_branch and self.bound_branch:
422
raise AssertionError(
423
"bound branches not supported for commit builders "
424
"that update the branch")
427
# find the location being committed to
249
# Cannot commit with conflicts present.
250
if len(self.work_tree.conflicts()) > 0:
251
raise ConflictsInTree
253
# Setup the bound branch variables as needed.
254
self._check_bound_branch()
256
# Check that the working tree is up to date
257
old_revno,new_revno = self._check_out_of_date_tree()
260
# raise an exception as soon as we find a single unknown.
261
for unknown in self.work_tree.unknowns():
262
raise StrictCommitFailed()
264
if self.config is None:
265
self.config = self.branch.get_config()
267
# If provided, ensure the specified files are versioned
268
if specific_files is not None:
269
# Note: We don't actually need the IDs here. This routine
270
# is being called because it raises PathNotVerisonedError
271
# as a side effect of finding the IDs.
272
# XXX: Dont we have filter_unversioned to do this more
274
tree.find_ids_across_trees(specific_files,
275
[self.basis_tree, self.work_tree])
277
# Setup the progress bar. As the number of files that need to be
278
# committed in unknown, progress is reported as stages.
279
# We keep track of entries separately though and include that
280
# information in the progress bar during the relevant stages.
281
self.pb_stage_name = ""
282
self.pb_stage_count = 0
283
self.pb_stage_total = 4
428
284
if self.bound_branch:
429
master_location = self.master_branch.base
431
master_location = self.branch.base
433
# report the start of the commit
434
self.reporter.started(new_revno, self.rev_id, master_location)
285
self.pb_stage_total += 1
286
self.pb.show_pct = False
287
self.pb.show_spinner = False
288
self.pb.show_eta = False
289
self.pb.show_count = True
290
self.pb.show_bar = True
292
# After a merge, a selected file commit is not supported.
293
# See 'bzr help merge' for an explanation as to why.
294
self.basis_inv = self.basis_tree.inventory
295
self._gather_parents()
296
if len(self.parents) > 1 and self.specific_files:
297
raise errors.CannotCommitSelectedFileMerge(self.specific_files)
299
# Collect the changes
300
self._emit_progress_set_stage("Collecting changes", show_entries=True)
301
self.builder = self.branch.get_commit_builder(self.parents,
302
self.config, timestamp, timezone, committer, revprops, rev_id)
436
303
self._update_builder_with_changes()
437
304
self._check_pointless()
440
307
# ADHB 2006-08-08: If this is done, populate_new_inv should not add
441
308
# weave lines, because nothing should be recorded until it is known
442
309
# that commit will succeed.
443
self._set_progress_stage("Saving data locally")
310
self._emit_progress_set_stage("Saving data locally")
444
311
self.builder.finish_inventory()
446
313
# Prompt the user for a commit message if none provided
447
314
message = message_callback(self)
315
assert isinstance(message, unicode), type(message)
448
316
self.message = message
317
self._escape_commit_message()
450
319
# Add revision data to the local branch
451
320
self.rev_id = self.builder.commit(self.message)
454
mutter("aborting commit write group because of exception:")
455
trace.log_exception_quietly()
459
self._update_branches(old_revno, old_revid, new_revno)
461
# Make the working tree be up to date with the branch. This
462
# includes automatic changes scheduled to be made to the tree, such
463
# as updating its basis and unversioning paths that were missing.
464
self.work_tree.unversion(self.deleted_paths)
465
self._set_progress_stage("Updating the working tree")
466
self.work_tree.update_basis_by_delta(self.rev_id,
467
self.builder.get_basis_delta())
468
self.reporter.completed(new_revno, self.rev_id)
469
self._process_post_hooks(old_revno, new_revno)
472
def _update_branches(self, old_revno, old_revid, new_revno):
473
"""Update the master and local branch to the new revision.
475
This will try to make sure that the master branch is updated
476
before the local branch.
478
:param old_revno: Revision number of master branch before the
480
:param old_revid: Tip of master branch before the commit
481
:param new_revno: Revision number of the new commit
483
if not self.builder.updates_branch:
484
self._process_pre_hooks(old_revno, new_revno)
486
322
# Upload revision data to the master.
487
323
# this will propagate merged revisions too if needed.
488
324
if self.bound_branch:
489
self._set_progress_stage("Uploading data to master branch")
325
self._emit_progress_set_stage("Uploading data to master branch")
326
self.master_branch.repository.fetch(self.branch.repository,
327
revision_id=self.rev_id)
328
# now the master has the revision data
490
329
# 'commit' to the master first so a timeout here causes the
491
330
# local branch to be out of date
492
(new_revno, self.rev_id) = self.master_branch.import_last_revision_info_and_tags(
493
self.branch, new_revno, self.rev_id, lossy=self._lossy)
495
self.branch.fetch(self.master_branch, self.rev_id)
331
self.master_branch.set_last_revision_info(new_revno,
497
334
# and now do the commit locally.
498
335
self.branch.set_last_revision_info(new_revno, self.rev_id)
501
self._process_pre_hooks(old_revno, new_revno)
502
except BaseException:
503
# The commit builder will already have updated the branch,
505
self.branch.set_last_revision_info(old_revno, old_revid)
508
# Merge local tags to remote
509
if self.bound_branch:
510
self._set_progress_stage("Merging tags to master branch")
511
tag_updates, tag_conflicts = self.branch.tags.merge_to(
512
self.master_branch.tags)
514
warning_lines = [' ' + name for name, _, _ in tag_conflicts]
515
note(gettext("Conflicting tags in bound branch:\n{0}".format(
516
"\n".join(warning_lines))))
518
def _select_reporter(self):
519
"""Select the CommitReporter to use."""
521
return NullCommitReporter()
522
return ReportCommitToLog()
337
# Make the working tree up to date with the branch
338
self._emit_progress_set_stage("Updating the working tree")
339
rev_tree = self.builder.revision_tree()
340
self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
341
self.reporter.completed(new_revno, self.rev_id)
342
self._process_hooks(old_revno, new_revno)
347
def _any_real_changes(self):
348
"""Are there real changes between new_inventory and basis?
350
For trees without rich roots, inv.root.revision changes every commit.
351
But if that is the only change, we want to treat it as though there
354
new_entries = self.builder.new_inventory.iter_entries()
355
basis_entries = self.basis_inv.iter_entries()
356
new_path, new_root_ie = new_entries.next()
357
basis_path, basis_root_ie = basis_entries.next()
359
# This is a copy of InventoryEntry.__eq__ only leaving out .revision
360
def ie_equal_no_revision(this, other):
361
return ((this.file_id == other.file_id)
362
and (this.name == other.name)
363
and (this.symlink_target == other.symlink_target)
364
and (this.text_sha1 == other.text_sha1)
365
and (this.text_size == other.text_size)
366
and (this.text_id == other.text_id)
367
and (this.parent_id == other.parent_id)
368
and (this.kind == other.kind)
369
and (this.executable == other.executable)
370
and (this.reference_revision == other.reference_revision)
372
if not ie_equal_no_revision(new_root_ie, basis_root_ie):
375
for new_ie, basis_ie in zip(new_entries, basis_entries):
376
if new_ie != basis_ie:
379
# No actual changes present
524
382
def _check_pointless(self):
525
383
if self.allow_pointless:
644
493
old_revid = self.parents[0]
646
old_revid = breezy.revision.NULL_REVISION
648
if hook_name == "pre_commit":
649
future_tree = self.builder.revision_tree()
650
tree_delta = future_tree.changes_from(self.basis_tree,
653
for hook in Branch.hooks[hook_name]:
495
old_revid = bzrlib.revision.NULL_REVISION
496
for hook in Branch.hooks['post_commit']:
654
497
# show the running hook in the progress bar. As hooks may
655
498
# end up doing nothing (e.g. because they are not configured by
656
499
# the user) this is still showing progress, not showing overall
657
500
# actions - its up to each plugin to show a UI if it want's to
658
501
# (such as 'Emailing diff to foo@example.com').
659
self.pb_stage_name = "Running %s hooks [%s]" % \
660
(hook_name, Branch.hooks.get_hook_name(hook))
502
self.pb_stage_name = "Running post commit hooks [%s]" % \
503
Branch.hooks.get_hook_name(hook)
661
504
self._emit_progress()
662
505
if 'hooks' in debug.debug_flags:
663
506
mutter("Invoking commit hook: %r", hook)
664
if hook_name == "post_commit":
665
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
667
elif hook_name == "pre_commit":
668
hook(hook_local, hook_master,
669
old_revno, old_revid, new_revno, self.rev_id,
670
tree_delta, future_tree)
507
hook(hook_local, hook_master, old_revno, old_revid, new_revno,
511
"""Cleanup any open locks, progress bars etc."""
512
cleanups = [self._cleanup_bound_branch,
513
self.basis_tree.unlock,
514
self.work_tree.unlock,
516
found_exception = None
517
for cleanup in cleanups:
520
# we want every cleanup to run no matter what.
521
# so we have a catchall here, but we will raise the
522
# last encountered exception up the stack: and
523
# typically this will be useful enough.
526
if found_exception is not None:
527
# don't do a plan raise, because the last exception may have been
528
# trashed, e is our sure-to-work exception even though it loses the
529
# full traceback. XXX: RBC 20060421 perhaps we could check the
530
# exc_info and if its the same one do a plain raise otherwise
531
# 'raise e' as we do now.
534
def _cleanup_bound_branch(self):
535
"""Executed at the end of a try/finally to cleanup a bound branch.
537
If the branch wasn't bound, this is a no-op.
538
If it was, it resents self.branch to the local branch, instead
541
if not self.bound_branch:
543
if self.master_locked:
544
self.master_branch.unlock()
546
def _escape_commit_message(self):
547
"""Replace xml-incompatible control characters."""
548
# FIXME: RBC 20060419 this should be done by the revision
549
# serialiser not by commit. Then we can also add an unescaper
550
# in the deserializer and start roundtripping revision messages
551
# precisely. See repository_implementations/test_repository.py
553
# Python strings can include characters that can't be
554
# represented in well-formed XML; escape characters that
555
# aren't listed in the XML specification
556
# (http://www.w3.org/TR/REC-xml/#NT-Char).
557
self.message, escape_count = re.subn(
558
u'[^\x09\x0A\x0D\u0020-\uD7FF\uE000-\uFFFD]+',
559
lambda match: match.group(0).encode('unicode_escape'),
562
self.reporter.escaped(escape_count, self.message)
564
def _gather_parents(self):
565
"""Record the parents of a merge for merge detection."""
566
# TODO: Make sure that this list doesn't contain duplicate
567
# entries and the order is preserved when doing this.
568
self.parents = self.work_tree.get_parent_ids()
569
self.parent_invs = [self.basis_inv]
570
for revision in self.parents[1:]:
571
if self.branch.repository.has_revision(revision):
572
mutter('commit parent revision {%s}', revision)
573
inventory = self.branch.repository.get_inventory(revision)
574
self.parent_invs.append(inventory)
576
mutter('commit parent ghost revision {%s}', revision)
672
578
def _update_builder_with_changes(self):
673
579
"""Update the commit builder with the data about what has changed.
581
# Build the revision inventory.
583
# This starts by creating a new empty inventory. Depending on
584
# which files are selected for commit, and what is present in the
585
# current tree, the new inventory is populated. inventory entries
586
# which are candidates for modification have their revision set to
587
# None; inventory entries that are carried over untouched have their
588
# revision set to their prior value.
590
# ESEPARATIONOFCONCERNS: this function is diffing and using the diff
591
# results to create a new inventory at the same time, which results
592
# in bugs like #46635. Any reason not to use/enhance Tree.changes_from?
675
595
specific_files = self.specific_files
676
mutter("Selecting files for commit with filter %r", specific_files)
679
iter_changes = self.work_tree.iter_changes(
680
self.basis_tree, specific_files=specific_files)
682
iter_changes = filter_excluded(iter_changes, self.exclude)
683
iter_changes = self._filter_iter_changes(iter_changes)
684
for file_id, path, fs_hash in self.builder.record_iter_changes(
685
self.work_tree, self.basis_revid, iter_changes):
686
self.work_tree._observed_sha1(path, fs_hash)
688
def _filter_iter_changes(self, iter_changes):
689
"""Process iter_changes.
691
This method reports on the changes in iter_changes to the user, and
692
converts 'missing' entries in the iter_changes iterator to 'deleted'
693
entries. 'missing' entries have their
695
:param iter_changes: An iter_changes to process.
696
:return: A generator of changes.
698
reporter = self.reporter
699
report_changes = reporter.is_verbose()
701
for change in iter_changes:
703
old_path = change[1][0]
704
new_path = change[1][1]
705
versioned = change[3][1]
707
versioned = change[3][1]
708
if kind is None and versioned:
711
reporter.missing(new_path)
712
deleted_paths.append(change[1][1])
713
# Reset the new path (None) and new versioned flag (False)
714
change = (change[0], (change[1][0], None), change[2],
715
(change[3][0], False)) + change[4:]
716
new_path = change[1][1]
718
elif kind == 'tree-reference':
719
if self.recursive == 'down':
720
self._commit_nested_tree(change[1][1])
721
if change[3][0] or change[3][1]:
725
reporter.deleted(old_path)
726
elif old_path is None:
727
reporter.snapshot_change(gettext('added'), new_path)
728
elif old_path != new_path:
729
reporter.renamed(gettext('renamed'),
733
or self.work_tree.branch.repository._format.rich_root_data):
734
# Don't report on changes to '' in non rich root
736
reporter.snapshot_change(
737
gettext('modified'), new_path)
738
self._next_progress_entry()
739
# Unversion files that were found to be deleted
740
self.deleted_paths = deleted_paths
742
def _check_strict(self):
743
# XXX: when we use iter_changes this would likely be faster if
744
# iter_changes would check for us (even in the presence of
747
# raise an exception as soon as we find a single unknown.
748
for unknown in self.work_tree.unknowns():
749
raise StrictCommitFailed()
751
def _commit_nested_tree(self, path):
752
"Commit a nested tree."
753
sub_tree = self.work_tree.get_nested_tree(path)
754
# FIXME: be more comprehensive here:
755
# this works when both trees are in --trees repository,
756
# but when both are bound to a different repository,
757
# it fails; a better way of approaching this is to
758
# finally implement the explicit-caches approach design
759
# a while back - RBC 20070306.
760
if sub_tree.branch.repository.has_same_location(
761
self.work_tree.branch.repository):
762
sub_tree.branch.repository = \
763
self.work_tree.branch.repository
765
return sub_tree.commit(message=None, revprops=self.revprops,
766
recursive=self.recursive,
767
message_callback=self.message_callback,
768
timestamp=self.timestamp,
769
timezone=self.timezone,
770
committer=self.committer,
771
allow_pointless=self.allow_pointless,
772
strict=self.strict, verbose=self.verbose,
773
local=self.local, reporter=self.reporter)
774
except PointlessCommit:
775
return self.work_tree.get_reference_revision(path)
777
def _set_progress_stage(self, name, counter=False):
596
mutter("Selecting files for commit with filter %s", specific_files)
597
work_inv = self.work_tree.inventory
598
assert work_inv.root is not None
599
self.pb_entries_total = len(work_inv)
601
# Check and warn about old CommitBuilders
602
entries = work_inv.iter_entries()
603
if not self.builder.record_root_entry:
604
symbol_versioning.warn('CommitBuilders should support recording'
605
' the root entry as of bzr 0.10.', DeprecationWarning,
607
self.builder.new_inventory.add(self.basis_inv.root.copy())
611
deleted_paths = set()
612
for path, new_ie in entries:
613
self._emit_progress_next_entry()
614
file_id = new_ie.file_id
616
# Skip files that have been deleted from the working tree.
617
# The deleted files/directories are also recorded so they
618
# can be explicitly unversioned later. Note that when a
619
# filter of specific files is given, we must only skip/record
620
# deleted files matching that filter.
621
if is_inside_any(deleted_paths, path):
623
if not specific_files or is_inside_any(specific_files, path):
624
if not self.work_tree.has_filename(path):
625
deleted_paths.add(path)
626
self.reporter.missing(path)
627
deleted_ids.append(file_id)
630
kind = self.work_tree.kind(file_id)
631
if kind == 'tree-reference' and self.recursive == 'down':
632
# nested tree: commit in it
633
sub_tree = WorkingTree.open(self.work_tree.abspath(path))
634
# FIXME: be more comprehensive here:
635
# this works when both trees are in --trees repository,
636
# but when both are bound to a different repository,
637
# it fails; a better way of approaching this is to
638
# finally implement the explicit-caches approach design
639
# a while back - RBC 20070306.
640
if (sub_tree.branch.repository.bzrdir.root_transport.base
642
self.work_tree.branch.repository.bzrdir.root_transport.base):
643
sub_tree.branch.repository = \
644
self.work_tree.branch.repository
646
sub_tree.commit(message=None, revprops=self.revprops,
647
recursive=self.recursive,
648
message_callback=self.message_callback,
649
timestamp=self.timestamp, timezone=self.timezone,
650
committer=self.committer,
651
allow_pointless=self.allow_pointless,
652
strict=self.strict, verbose=self.verbose,
653
local=self.local, reporter=self.reporter)
654
except errors.PointlessCommit:
656
if kind != new_ie.kind:
657
new_ie = inventory.make_entry(kind, new_ie.name,
658
new_ie.parent_id, file_id)
659
except errors.NoSuchFile:
661
# mutter('check %s {%s}', path, file_id)
662
if (not specific_files or
663
is_inside_or_parent_of_any(specific_files, path)):
664
# mutter('%s selected for commit', path)
668
# mutter('%s not selected for commit', path)
669
if self.basis_inv.has_id(file_id):
670
ie = self.basis_inv[file_id].copy()
672
# this entry is new and not being committed
674
self.builder.record_entry_contents(ie, self.parent_invs,
675
path, self.work_tree)
676
# describe the nature of the change that has occurred relative to
677
# the basis inventory.
678
if (self.basis_inv.has_id(ie.file_id)):
679
basis_ie = self.basis_inv[ie.file_id]
682
change = ie.describe_change(basis_ie, ie)
683
if change in (InventoryEntry.RENAMED,
684
InventoryEntry.MODIFIED_AND_RENAMED):
685
old_path = self.basis_inv.id2path(ie.file_id)
686
self.reporter.renamed(change, old_path, path)
688
self.reporter.snapshot_change(change, path)
690
# Unversion IDs that were found to be deleted
691
self.work_tree.unversion(deleted_ids)
693
# If specific files/directories were nominated, it is possible
694
# that some data from outside those needs to be preserved from
695
# the basis tree. For example, if a file x is moved from out of
696
# directory foo into directory bar and the user requests
697
# ``commit foo``, then information about bar/x must also be
700
for path, new_ie in self.basis_inv.iter_entries():
701
if new_ie.file_id in work_inv:
703
if is_inside_any(specific_files, path):
707
self.builder.record_entry_contents(ie, self.parent_invs, path,
710
# Report what was deleted. We could skip this when no deletes are
711
# detected to gain a performance win, but it arguably serves as a
712
# 'safety check' by informing the user whenever anything disappears.
713
for path, ie in self.basis_inv.iter_entries():
714
if ie.file_id not in self.builder.new_inventory:
715
self.reporter.deleted(path)
717
def _emit_progress_set_stage(self, name, show_entries=False):
778
718
"""Set the progress stage and emit an update to the progress bar."""
779
719
self.pb_stage_name = name
780
720
self.pb_stage_count += 1
721
self.pb_entries_show = show_entries
782
723
self.pb_entries_count = 0
784
self.pb_entries_count = None
724
self.pb_entries_total = '?'
785
725
self._emit_progress()
787
def _next_progress_entry(self):
788
"""Emit an update to the progress bar and increment the entry count."""
727
def _emit_progress_next_entry(self):
728
"""Emit an update to the progress bar and increment the file count."""
789
729
self.pb_entries_count += 1
790
730
self._emit_progress()
792
732
def _emit_progress(self):
793
if self.pb_entries_count is not None:
794
text = gettext("{0} [{1}] - Stage").format(self.pb_stage_name,
795
self.pb_entries_count)
733
if self.pb_entries_show:
734
text = "%s [Entry %d/%s] - Stage" % (self.pb_stage_name,
735
self.pb_entries_count,str(self.pb_entries_total))
797
text = gettext("%s - Stage") % (self.pb_stage_name, )
737
text = "%s - Stage" % (self.pb_stage_name)
798
738
self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
added
removed
bzrlib/commit.py
