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
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.') %
53
note('Created new branch.')
56
note(gettext('Created new branch.'))
55
58
self.branch_push_result.report(to_file)
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.
63
66
:param br_from: the source branch
65
68
:param location: the url of the destination
66
69
:param to_file: the output stream
67
70
:param verbose: if True, display more output than normal
68
:param overwrite: if False, a current branch at the destination may not
69
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
70
73
:param remember: if True, store the location as the push location for
72
75
:param stacked_on: the url of the branch, if any, to stack on;
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,
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,))
91
99
except errors.FileExists, err:
92
if err.path.endswith('/.bzr'):
93
raise errors.BzrCommandError(
94
"Target directory %s already contains a .bzr directory, "
95
"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.
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.")
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.
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
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
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
132
139
br_from.set_push_location(br_to.base)
134
141
if stacked_on is not None:
138
145
push_result = dir_to.push_branch(br_from, revision_id, overwrite,
139
146
remember, create_prefix)
140
147
except errors.DivergedBranches:
141
raise errors.BzrCommandError('These branches have diverged.'
148
raise errors.BzrCommandError(gettext('These branches have diverged.'
142
149
' See "bzr help diverged-branches"'
143
' for more information.')
150
' for more information.'))
144
151
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." %
152
raise errors.BzrCommandError(gettext("It is not possible to losslessly "
153
"push to %s. You may want to use dpush instead.") %
147
154
e.target_branch.mapping.vcs.abbreviation)
148
155
except errors.NoRepositoryPresent:
149
# we have a bzrdir but no branch or repository
156
# we have a controldir but no branch or repository
150
157
# XXX: Figure out what to do other than complain.
151
raise errors.BzrCommandError("At %s you have a valid .bzr"
158
raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
152
159
" control directory, but not a branch or repository. This"
153
160
" is an unsupported configuration. Please move the target"
154
" directory out of the way and try again." % location)
161
" directory out of the way and try again.") % location)
155
162
if push_result.workingtree_updated == False:
156
163
warning("This transport does not update the working "
157
164
"tree of: %s. See 'bzr help working-trees' for "
added
removed
bzrlib/push.py
