← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Andrew Bennetts
  • Date: 2010-10-13 06:14:37 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101013061437-2e2m9gro1eusnbb8
Tweaks to the sphinx build.

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