50
49
"""Write a human-readable description of the result."""
51
50
if self.branch_push_result is None:
52
51
if self.stacked_on is not None:
53
note(gettext('Created new stacked branch referring to %s.') %
52
note('Created new stacked branch referring to %s.' %
56
note(gettext('Created new branch.'))
55
note('Created new branch.')
58
57
self.branch_push_result.report(to_file)
61
60
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
62
61
overwrite=False, remember=False, stacked_on=None, create_prefix=False,
63
use_existing_dir=False, no_tree=False):
62
use_existing_dir=False):
64
63
"""Push a branch to a location.
66
65
:param br_from: the source branch
68
67
:param location: the url of the destination
69
68
:param to_file: the output stream
70
69
:param verbose: if True, display more output than normal
71
:param overwrite: list of things to overwrite ("history", "tags")
72
or boolean indicating for everything
70
:param overwrite: if False, a current branch at the destination may not
71
have diverged from the source, otherwise the push fails
73
72
:param remember: if True, store the location as the push location for
75
74
:param stacked_on: the url of the branch, if any, to stack on;
91
90
br_to = br_from.create_clone_on_transport(to_transport,
92
91
revision_id=revision_id, stacked_on=stacked_on,
93
create_prefix=create_prefix, use_existing_dir=use_existing_dir,
95
except errors.AlreadyControlDirError, err:
96
raise errors.BzrCommandError(gettext(
97
"Target directory %s already contains a .bzr directory, "
98
"but it is not valid.") % (location,))
92
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
99
93
except errors.FileExists, err:
94
if err.path.endswith('/.bzr'):
95
raise errors.BzrCommandError(
96
"Target directory %s already contains a .bzr directory, "
97
"but it is not valid." % (location,))
100
98
if not use_existing_dir:
101
raise errors.BzrCommandError(gettext("Target directory %s"
99
raise errors.BzrCommandError("Target directory %s"
102
100
" already exists, but does not have a .bzr"
103
101
" directory. Supply --use-existing-dir to push"
104
" there anyway.") % location)
102
" there anyway." % location)
105
103
# This shouldn't occur, but if it does the FileExists error will be
106
104
# more informative than an UnboundLocalError for br_to.
108
106
except errors.NoSuchFile:
109
107
if not create_prefix:
110
raise errors.BzrCommandError(gettext("Parent directory of %s"
108
raise errors.BzrCommandError("Parent directory of %s"
111
109
" does not exist."
112
110
"\nYou may supply --create-prefix to create all"
113
" leading parent directories.")
111
" leading parent directories."
115
# This shouldn't occur (because create_prefix is true, so
116
# create_clone_on_transport should be catching NoSuchFile and
117
# creating the missing directories) but if it does the original
118
# NoSuchFile error will be more informative than an
119
# UnboundLocalError for br_to.
121
113
except errors.TooManyRedirections:
122
raise errors.BzrCommandError(gettext("Too many redirections trying "
123
"to make %s.") % location)
114
raise errors.BzrCommandError("Too many redirections trying "
115
"to make %s." % location)
124
116
push_result = PushResult()
125
117
# TODO: Some more useful message about what was copied
132
124
push_result.target_branch = br_to
133
125
push_result.old_revid = _mod_revision.NULL_REVISION
134
126
push_result.old_revno = 0
135
# Remembers if asked explicitly or no previous location is set
137
or (remember is None and br_from.get_push_location() is None)):
138
# FIXME: Should be done only if we succeed ? -- vila 2012-01-18
127
if br_from.get_push_location() is None or remember:
139
128
br_from.set_push_location(br_to.base)
141
130
if stacked_on is not None:
145
134
push_result = dir_to.push_branch(br_from, revision_id, overwrite,
146
135
remember, create_prefix)
147
136
except errors.DivergedBranches:
148
raise errors.BzrCommandError(gettext('These branches have diverged.'
137
raise errors.BzrCommandError('These branches have diverged.'
149
138
' See "bzr help diverged-branches"'
150
' for more information.'))
139
' for more information.')
151
140
except errors.NoRoundtrippingSupport, e:
152
raise errors.BzrCommandError(gettext("It is not possible to losslessly "
153
"push to %s. You may want to use dpush instead.") %
141
raise errors.BzrCommandError("It is not possible to losslessly "
142
"push to %s. You may want to use dpush instead." %
154
143
e.target_branch.mapping.vcs.abbreviation)
155
144
except errors.NoRepositoryPresent:
156
# we have a controldir but no branch or repository
145
# we have a bzrdir but no branch or repository
157
146
# XXX: Figure out what to do other than complain.
158
raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
147
raise errors.BzrCommandError("At %s you have a valid .bzr"
159
148
" control directory, but not a branch or repository. This"
160
149
" is an unsupported configuration. Please move the target"
161
" directory out of the way and try again.") % location)
150
" directory out of the way and try again." % location)
162
151
if push_result.workingtree_updated == False:
163
152
warning("This transport does not update the working "
164
153
"tree of: %s. See 'bzr help working-trees' for "
added
removed
bzrlib/push.py
