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