← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-07-29 10:44:42 UTC
  • mfrom: (5361.1.1 2.3-lp-home)
  • Revision ID: pqm@pqm.ubuntu.com-20100729104442-5g1m4pumcss037ic
(spiv) Expand lp:~/ to lp:~username/ if a user has already logged in. (John
 A Meinel)

Show diffs side-by-side

added added

removed removed

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