← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105103758-wzftnmsip5iv9n2g
Revert addition of get_message_encoding function

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
32
32
    transform,
33
33
    workingtree,
34
34
    )
 
35
from bzrlib.i18n import gettext, ngettext
35
36
""")
36
37
from bzrlib import (
37
38
    commands,
79
80
 
80
81
 
81
82
resolve_action_registry.register(
82
 
    'done', 'done', 'Marks the conflict as resolved' )
 
83
    'done', 'done', 'Marks the conflict as resolved.')
83
84
resolve_action_registry.register(
84
85
    'take-this', 'take_this',
85
 
    'Resolve the conflict preserving the version in the working tree' )
 
86
    'Resolve the conflict preserving the version in the working tree.')
86
87
resolve_action_registry.register(
87
88
    'take-other', 'take_other',
88
 
    'Resolve the conflict taking the merged version into account' )
 
89
    'Resolve the conflict taking the merged version into account.')
89
90
resolve_action_registry.default_key = 'done'
90
91
 
91
92
class ResolveActionOption(option.RegistryOption):
120
121
    def run(self, file_list=None, all=False, action=None, directory=None):
121
122
        if all:
122
123
            if file_list:
123
 
                raise errors.BzrCommandError("If --all is specified,"
124
 
                                             " no FILE may be provided")
 
124
                raise errors.BzrCommandError(gettext("If --all is specified,"
 
125
                                             " no FILE may be provided"))
125
126
            if directory is None:
126
127
                directory = u'.'
127
128
            tree = workingtree.WorkingTree.open_containing(directory)[0]
145
146
            if file_list is None:
146
147
                un_resolved, resolved = tree.auto_resolve()
147
148
                if len(un_resolved) > 0:
148
 
                    trace.note('%d conflict(s) auto-resolved.', len(resolved))
149
 
                    trace.note('Remaining conflicts:')
 
149
                    trace.note(ngettext('%d conflict auto-resolved.',
 
150
                        '%d conflicts auto-resolved.', len(resolved)),
 
151
                        len(resolved))
 
152
                    trace.note(gettext('Remaining conflicts:'))
150
153
                    for conflict in un_resolved:
151
154
                        trace.note(unicode(conflict))
152
155
                    return 1
153
156
                else:
154
 
                    trace.note('All conflicts resolved.')
 
157
                    trace.note(gettext('All conflicts resolved.'))
155
158
                    return 0
156
159
            else:
157
160
                # FIXME: This can never occur but the block above needs some
160
163
                pass
161
164
        else:
162
165
            before, after = resolve(tree, file_list, action=action)
163
 
            trace.note('%d conflict(s) resolved, %d remaining'
164
 
                       % (before - after, after))
 
166
            trace.note(ngettext('{0} conflict resolved, {1} remaining',
 
167
                                '{0} conflicts resolved, {1} remaining',
 
168
                                before-after).format(before - after, after))
165
169
 
166
170
 
167
171
def resolve(tree, paths=None, ignore_misses=False, recursive=False,