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