← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
52
52
from bzrlib import (
53
53
    debug,
54
54
    errors,
 
55
    revision,
55
56
    trace,
56
57
    tree,
57
58
    ui,
72
73
from bzrlib.inventory import Inventory, InventoryEntry, make_entry
73
74
from bzrlib import symbol_versioning
74
75
from bzrlib.urlutils import unescape_for_display
75
 
from bzrlib.i18n import gettext
 
76
 
76
77
 
77
78
class NullCommitReporter(object):
78
79
    """I report on progress of a commit."""
113
114
        note(format, *args)
114
115
 
115
116
    def snapshot_change(self, change, path):
116
 
        if path == '' and change in (gettext('added'), gettext('modified')):
 
117
        if path == '' and change in ('added', 'modified'):
117
118
            return
118
119
        self._note("%s %s", change, path)
119
120
 
127
128
                                   "to started.", DeprecationWarning,
128
129
                                   stacklevel=2)
129
130
            location = ''
130
 
        self._note(gettext('Committing%s'), location)
 
131
        self._note('Committing%s', location)
131
132
 
132
133
    def completed(self, revno, rev_id):
133
 
        self._note(gettext('Committed revision %d.'), revno)
 
134
        self._note('Committed revision %d.', revno)
134
135
        # self._note goes to the console too; so while we want to log the
135
136
        # rev_id, we can't trivially only log it. (See bug 526425). Long
136
137
        # term we should rearrange the reporting structure, but for now
139
140
        mutter('Committed revid %s as revno %d.', rev_id, revno)
140
141
 
141
142
    def deleted(self, path):
142
 
        self._note(gettext('deleted %s'), path)
 
143
        self._note('deleted %s', path)
143
144
 
144
145
    def missing(self, path):
145
 
        self._note(gettext('missing %s'), path)
 
146
        self._note('missing %s', path)
146
147
 
147
148
    def renamed(self, change, old_path, new_path):
148
149
        self._note('%s %s => %s', change, old_path, new_path)
464
465
        # Merge local tags to remote
465
466
        if self.bound_branch:
466
467
            self._set_progress_stage("Merging tags to master branch")
467
 
            tag_updates, tag_conflicts = self.branch.tags.merge_to(
468
 
                self.master_branch.tags)
 
468
            tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
469
469
            if tag_conflicts:
470
470
                warning_lines = ['    ' + name for name, _, _ in tag_conflicts]
471
 
                note( gettext("Conflicting tags in bound branch:\n{0}".format(
472
 
                    "\n".join(warning_lines))) )
 
471
                note("Conflicting tags in bound branch:\n" +
 
472
                    "\n".join(warning_lines))
473
473
 
474
474
        # Make the working tree be up to date with the branch. This
475
475
        # includes automatic changes scheduled to be made to the tree, such
695
695
                # Reset the new path (None) and new versioned flag (False)
696
696
                change = (change[0], (change[1][0], None), change[2],
697
697
                    (change[3][0], False)) + change[4:]
698
 
                new_path = change[1][1]
699
 
                versioned = False
700
698
            elif kind == 'tree-reference':
701
699
                if self.recursive == 'down':
702
700
                    self._commit_nested_tree(change[0], change[1][1])
706
704
                    if new_path is None:
707
705
                        reporter.deleted(old_path)
708
706
                    elif old_path is None:
709
 
                        reporter.snapshot_change(gettext('added'), new_path)
 
707
                        reporter.snapshot_change('added', new_path)
710
708
                    elif old_path != new_path:
711
 
                        reporter.renamed(gettext('renamed'), old_path, new_path)
 
709
                        reporter.renamed('renamed', old_path, new_path)
712
710
                    else:
713
711
                        if (new_path or 
714
712
                            self.work_tree.branch.repository._format.rich_root_data):
715
713
                            # Don't report on changes to '' in non rich root
716
714
                            # repositories.
717
 
                            reporter.snapshot_change(gettext('modified'), new_path)
 
715
                            reporter.snapshot_change('modified', new_path)
718
716
            self._next_progress_entry()
719
717
        # Unversion IDs that were found to be deleted
720
718
        self.deleted_ids = deleted_ids
726
724
        if self.specific_files or self.exclude:
727
725
            specific_files = self.specific_files or []
728
726
            for path, old_ie in self.basis_inv.iter_entries():
729
 
                if self.builder.new_inventory.has_id(old_ie.file_id):
 
727
                if old_ie.file_id in self.builder.new_inventory:
730
728
                    # already added - skip.
731
729
                    continue
732
730
                if (is_inside_any(specific_files, path)
943
941
            self.reporter.renamed(change, old_path, path)
944
942
            self._next_progress_entry()
945
943
        else:
946
 
            if change == gettext('unchanged'):
 
944
            if change == 'unchanged':
947
945
                return
948
946
            self.reporter.snapshot_change(change, path)
949
947
            self._next_progress_entry()
965
963
 
966
964
    def _emit_progress(self):
967
965
        if self.pb_entries_count is not None:
968
 
            text = gettext("{0} [{1}] - Stage").format(self.pb_stage_name,
 
966
            text = "%s [%d] - Stage" % (self.pb_stage_name,
969
967
                self.pb_entries_count)
970
968
        else:
971
 
            text = gettext("%s - Stage") % (self.pb_stage_name, )
 
969
            text = "%s - Stage" % (self.pb_stage_name, )
972
970
        self.pb.update(text, self.pb_stage_count, self.pb_stage_total)
973
971
 
974
972
    def _set_specific_file_ids(self):