← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 10:41:45 UTC
  • mto: This revision was merged to the branch mainline in revision 6144.
  • Revision ID: jriddell@canonical.com-20110916104145-eu7v8gkip5hi0ur1
more error gettext()ing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
64
64
    # XXX: Should the tree be locked for get_parent_ids?
65
65
    existing_pending_merges = tree.get_parent_ids()[1:]
66
66
    if len(existing_pending_merges) > 0:
67
 
        raise errors.BzrCommandError('Pending merges must be '
68
 
            'committed or reverted before using switch.')
 
67
        raise errors.BzrCommandError(gettext('Pending merges must be '
 
68
            'committed or reverted before using switch.'))
69
69
 
70
70
 
71
71
def _set_branch_location(control, to_branch, force=False):
90
90
            possible_transports = []
91
91
            try:
92
92
                if not force and _any_local_commits(b, possible_transports):
93
 
                    raise errors.BzrCommandError(
 
93
                    raise errors.BzrCommandError(gettext(
94
94
                        'Cannot switch as local commits found in the checkout. '
95
95
                        'Commit these to the bound branch or use --force to '
96
 
                        'throw them away.')
 
96
                        'throw them away.'))
97
97
            except errors.BoundBranchConnectionFailure, e:
98
 
                raise errors.BzrCommandError(
 
98
                raise errors.BzrCommandError(gettext(
99
99
                        'Unable to connect to current master branch %(target)s: '
100
 
                        '%(error)s To switch anyway, use --force.' %
 
100
                        '%(error)s To switch anyway, use --force.') %
101
101
                        e.__dict__)
102
102
            b.set_bound_location(None)
103
103
            b.pull(to_branch, overwrite=True,
105
105
            b.set_bound_location(to_branch.base)
106
106
            b.set_parent(b.get_master_branch().get_parent())
107
107
        else:
108
 
            raise errors.BzrCommandError('Cannot switch a branch, '
109
 
                'only a checkout.')
 
108
            raise errors.BzrCommandError(gettext('Cannot switch a branch, '
 
109
                'only a checkout.'))
110
110
 
111
111
 
112
112
def _any_local_commits(this_branch, possible_transports):