← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-09 13:52:06 UTC
  • mfrom: (6202.1.3 revno-revision)
  • Revision ID: pqm@pqm.ubuntu.com-20111009135206-t3utsln6mtzv9eut
(jelmer) Add a --revision argument to 'bzr revno'. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

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