← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 14:13:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6146.
  • Revision ID: jriddell@canonical.com-20110916141337-3h92trnh14xosnlu
gettext() shelf_ui.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
121
121
    def run(self, file_list=None, all=False, action=None, directory=None):
122
122
        if all:
123
123
            if file_list:
124
 
                raise errors.BzrCommandError(gettext("If --all is specified,"
125
 
                                             " no FILE may be provided"))
 
124
                raise errors.BzrCommandError("If --all is specified,"
 
125
                                             " no FILE may be provided")
126
126
            if directory is None:
127
127
                directory = u'.'
128
128
            tree = workingtree.WorkingTree.open_containing(directory)[0]
146
146
            if file_list is None:
147
147
                un_resolved, resolved = tree.auto_resolve()
148
148
                if len(un_resolved) > 0:
149
 
                    trace.note(ngettext('%d conflict auto-resolved.',
150
 
                        '%d conflicts auto-resolved.', len(resolved)),
151
 
                        len(resolved))
 
149
                    trace.note(gettext('%d conflict(s) auto-resolved.'), len(resolved))
152
150
                    trace.note(gettext('Remaining conflicts:'))
153
151
                    for conflict in un_resolved:
154
152
                        trace.note(unicode(conflict))