← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
16
16
 
17
17
"""UI helper for the push command."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib import (
20
 
    bzrdir,
 
22
    controldir,
21
23
    errors,
22
24
    revision as _mod_revision,
23
25
    transport,
26
28
    note,
27
29
    warning,
28
30
    )
 
31
from bzrlib.i18n import gettext
29
32
 
30
33
 
31
34
class PushResult(object):
47
50
        """Write a human-readable description of the result."""
48
51
        if self.branch_push_result is None:
49
52
            if self.stacked_on is not None:
50
 
                note('Created new stacked branch referring to %s.' %
 
53
                note(gettext('Created new stacked branch referring to %s.') %
51
54
                    self.stacked_on)
52
55
            else:
53
 
                note('Created new branch.')
 
56
                note(gettext('Created new branch.'))
54
57
        else:
55
58
            self.branch_push_result.report(to_file)
56
59
 
78
81
    """
79
82
    to_transport = transport.get_transport(location)
80
83
    try:
81
 
        dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
 
84
        dir_to = controldir.ControlDir.open_from_transport(to_transport)
82
85
    except errors.NotBranchError:
83
86
        # Didn't find anything
84
87
        dir_to = None
91
94
                no_tree=no_tree)
92
95
        except errors.FileExists, err:
93
96
            if err.path.endswith('/.bzr'):
94
 
                raise errors.BzrCommandError(
 
97
                raise errors.BzrCommandError(gettext(
95
98
                    "Target directory %s already contains a .bzr directory, "
96
 
                    "but it is not valid." % (location,))
 
99
                    "but it is not valid.") % (location,))
97
100
            if not use_existing_dir:
98
 
                raise errors.BzrCommandError("Target directory %s"
 
101
                raise errors.BzrCommandError(gettext("Target directory %s"
99
102
                     " already exists, but does not have a .bzr"
100
103
                     " directory. Supply --use-existing-dir to push"
101
 
                     " there anyway." % location)
 
104
                     " there anyway.") % location)
102
105
            # This shouldn't occur, but if it does the FileExists error will be
103
106
            # more informative than an UnboundLocalError for br_to.
104
107
            raise
105
108
        except errors.NoSuchFile:
106
109
            if not create_prefix:
107
 
                raise errors.BzrCommandError("Parent directory of %s"
 
110
                raise errors.BzrCommandError(gettext("Parent directory of %s"
108
111
                    " does not exist."
109
112
                    "\nYou may supply --create-prefix to create all"
110
 
                    " leading parent directories."
 
113
                    " leading parent directories.")
111
114
                    % location)
112
115
            # This shouldn't occur (because create_prefix is true, so
113
116
            # create_clone_on_transport should be catching NoSuchFile and
116
119
            # UnboundLocalError for br_to.
117
120
            raise
118
121
        except errors.TooManyRedirections:
119
 
            raise errors.BzrCommandError("Too many redirections trying "
120
 
                                         "to make %s." % location)
 
122
            raise errors.BzrCommandError(gettext("Too many redirections trying "
 
123
                                         "to make %s.") % location)
121
124
        push_result = PushResult()
122
125
        # TODO: Some more useful message about what was copied
123
126
        try:
141
144
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
142
145
                remember, create_prefix)
143
146
        except errors.DivergedBranches:
144
 
            raise errors.BzrCommandError('These branches have diverged.'
 
147
            raise errors.BzrCommandError(gettext('These branches have diverged.'
145
148
                                    '  See "bzr help diverged-branches"'
146
 
                                    ' for more information.')
 
149
                                    ' for more information.'))
147
150
        except errors.NoRoundtrippingSupport, e:
148
 
            raise errors.BzrCommandError("It is not possible to losslessly "
149
 
                "push to %s. You may want to use dpush instead." % 
 
151
            raise errors.BzrCommandError(gettext("It is not possible to losslessly "
 
152
                "push to %s. You may want to use dpush instead.") % 
150
153
                    e.target_branch.mapping.vcs.abbreviation)
151
154
        except errors.NoRepositoryPresent:
152
 
            # we have a bzrdir but no branch or repository
 
155
            # we have a controldir but no branch or repository
153
156
            # XXX: Figure out what to do other than complain.
154
 
            raise errors.BzrCommandError("At %s you have a valid .bzr"
 
157
            raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
155
158
                " control directory, but not a branch or repository. This"
156
159
                " is an unsupported configuration. Please move the target"
157
 
                " directory out of the way and try again." % location)
 
160
                " directory out of the way and try again.") % location)
158
161
        if push_result.workingtree_updated == False:
159
162
            warning("This transport does not update the working " 
160
163
                    "tree of: %s. See 'bzr help working-trees' for "