← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-27 16:27:26 UTC
  • mto: This revision was merged to the branch mainline in revision 6449.
  • Revision ID: jelmer@samba.org-20120127162726-f3qlvm7xkfg460ck
Run subtree tests with development-subtree rather than deprecated dirstate-with-subtree.

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
 
57
60
 
58
61
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
59
62
    overwrite=False, remember=False, stacked_on=None, create_prefix=False,
60
 
    use_existing_dir=False):
 
63
    use_existing_dir=False, no_tree=False):
61
64
    """Push a branch to a location.
62
65
 
63
66
    :param br_from: the source branch
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
87
90
        try:
88
91
            br_to = br_from.create_clone_on_transport(to_transport,
89
92
                revision_id=revision_id, stacked_on=stacked_on,
90
 
                create_prefix=create_prefix, use_existing_dir=use_existing_dir)
 
93
                create_prefix=create_prefix, use_existing_dir=use_existing_dir,
 
94
                no_tree=no_tree)
91
95
        except errors.FileExists, err:
92
96
            if err.path.endswith('/.bzr'):
93
 
                raise errors.BzrCommandError(
 
97
                raise errors.BzrCommandError(gettext(
94
98
                    "Target directory %s already contains a .bzr directory, "
95
 
                    "but it is not valid." % (location,))
 
99
                    "but it is not valid.") % (location,))
96
100
            if not use_existing_dir:
97
 
                raise errors.BzrCommandError("Target directory %s"
 
101
                raise errors.BzrCommandError(gettext("Target directory %s"
98
102
                     " already exists, but does not have a .bzr"
99
103
                     " directory. Supply --use-existing-dir to push"
100
 
                     " there anyway." % location)
 
104
                     " there anyway.") % location)
101
105
            # This shouldn't occur, but if it does the FileExists error will be
102
106
            # more informative than an UnboundLocalError for br_to.
103
107
            raise
104
108
        except errors.NoSuchFile:
105
109
            if not create_prefix:
106
 
                raise errors.BzrCommandError("Parent directory of %s"
 
110
                raise errors.BzrCommandError(gettext("Parent directory of %s"
107
111
                    " does not exist."
108
112
                    "\nYou may supply --create-prefix to create all"
109
 
                    " leading parent directories."
 
113
                    " leading parent directories.")
110
114
                    % location)
111
115
            # This shouldn't occur (because create_prefix is true, so
112
116
            # create_clone_on_transport should be catching NoSuchFile and
115
119
            # UnboundLocalError for br_to.
116
120
            raise
117
121
        except errors.TooManyRedirections:
118
 
            raise errors.BzrCommandError("Too many redirections trying "
119
 
                                         "to make %s." % location)
 
122
            raise errors.BzrCommandError(gettext("Too many redirections trying "
 
123
                                         "to make %s.") % location)
120
124
        push_result = PushResult()
121
125
        # TODO: Some more useful message about what was copied
122
126
        try:
128
132
        push_result.target_branch = br_to
129
133
        push_result.old_revid = _mod_revision.NULL_REVISION
130
134
        push_result.old_revno = 0
131
 
        if br_from.get_push_location() is None or remember:
 
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
138
            br_from.set_push_location(br_to.base)
133
139
    else:
134
140
        if stacked_on is not None:
138
144
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
139
145
                remember, create_prefix)
140
146
        except errors.DivergedBranches:
141
 
            raise errors.BzrCommandError('These branches have diverged.'
 
147
            raise errors.BzrCommandError(gettext('These branches have diverged.'
142
148
                                    '  See "bzr help diverged-branches"'
143
 
                                    ' for more information.')
 
149
                                    ' for more information.'))
144
150
        except errors.NoRoundtrippingSupport, e:
145
 
            raise errors.BzrCommandError("It is not possible to losslessly "
146
 
                "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.") % 
147
153
                    e.target_branch.mapping.vcs.abbreviation)
148
154
        except errors.NoRepositoryPresent:
149
 
            # we have a bzrdir but no branch or repository
 
155
            # we have a controldir but no branch or repository
150
156
            # XXX: Figure out what to do other than complain.
151
 
            raise errors.BzrCommandError("At %s you have a valid .bzr"
 
157
            raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
152
158
                " control directory, but not a branch or repository. This"
153
159
                " is an unsupported configuration. Please move the target"
154
 
                " directory out of the way and try again." % location)
 
160
                " directory out of the way and try again.") % location)
155
161
        if push_result.workingtree_updated == False:
156
162
            warning("This transport does not update the working " 
157
163
                    "tree of: %s. See 'bzr help working-trees' for "