1
# Copyright (C) 2008-2012 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""UI helper for the push command."""
19
from __future__ import absolute_import
24
revision as _mod_revision,
27
from bzrlib.trace import (
31
from bzrlib.i18n import gettext
34
class PushResult(object):
35
"""Result of a push operation.
37
:ivar branch_push_result: Result of a push between branches
38
:ivar target_branch: The target branch
39
:ivar stacked_on: URL of the branch on which the result is stacked
40
:ivar workingtree_updated: Whether or not the target workingtree was updated.
44
self.branch_push_result = None
45
self.stacked_on = None
46
self.workingtree_updated = None
47
self.target_branch = None
49
def report(self, to_file):
50
"""Write a human-readable description of the result."""
51
if self.branch_push_result is None:
52
if self.stacked_on is not None:
53
note(gettext('Created new stacked branch referring to %s.') %
56
note(gettext('Created new branch.'))
58
self.branch_push_result.report(to_file)
61
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
62
overwrite=False, remember=False, stacked_on=None, create_prefix=False,
63
use_existing_dir=False, no_tree=False):
64
"""Push a branch to a location.
66
:param br_from: the source branch
67
:param revision_id: the revision-id to push up to
68
:param location: the url of the destination
69
:param to_file: the output stream
70
: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
73
:param remember: if True, store the location as the push location for
75
:param stacked_on: the url of the branch, if any, to stack on;
76
if set, only the revisions not in that branch are pushed
77
:param create_prefix: if True, create the necessary parent directories
78
at the destination if they don't already exist
79
:param use_existing_dir: if True, proceed even if the destination
80
directory exists without a current .bzr directory in it
82
to_transport = transport.get_transport(location)
84
dir_to = controldir.ControlDir.open_from_transport(to_transport)
85
except errors.NotBranchError:
86
# Didn't find anything
91
br_to = br_from.create_clone_on_transport(to_transport,
92
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,))
99
except errors.FileExists, err:
100
if not use_existing_dir:
101
raise errors.BzrCommandError(gettext("Target directory %s"
102
" already exists, but does not have a .bzr"
103
" directory. Supply --use-existing-dir to push"
104
" there anyway.") % location)
105
# This shouldn't occur, but if it does the FileExists error will be
106
# more informative than an UnboundLocalError for br_to.
108
except errors.NoSuchFile:
109
if not create_prefix:
110
raise errors.BzrCommandError(gettext("Parent directory of %s"
112
"\nYou may supply --create-prefix to create all"
113
" 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
except errors.TooManyRedirections:
122
raise errors.BzrCommandError(gettext("Too many redirections trying "
123
"to make %s.") % location)
124
push_result = PushResult()
125
# TODO: Some more useful message about what was copied
127
push_result.stacked_on = br_to.get_stacked_on_url()
128
except (errors.UnstackableBranchFormat,
129
errors.UnstackableRepositoryFormat,
131
push_result.stacked_on = None
132
push_result.target_branch = br_to
133
push_result.old_revid = _mod_revision.NULL_REVISION
134
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
139
br_from.set_push_location(br_to.base)
141
if stacked_on is not None:
142
warning("Ignoring request for a stacked branch as repository "
143
"already exists at the destination location.")
145
push_result = dir_to.push_branch(br_from, revision_id, overwrite,
146
remember, create_prefix)
147
except errors.DivergedBranches:
148
raise errors.BzrCommandError(gettext('These branches have diverged.'
149
' See "bzr help diverged-branches"'
150
' for more information.'))
151
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.") %
154
e.target_branch.mapping.vcs.abbreviation)
155
except errors.NoRepositoryPresent:
156
# we have a controldir but no branch or repository
157
# XXX: Figure out what to do other than complain.
158
raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
159
" control directory, but not a branch or repository. This"
160
" is an unsupported configuration. Please move the target"
161
" directory out of the way and try again.") % location)
162
if push_result.workingtree_updated == False:
163
warning("This transport does not update the working "
164
"tree of: %s. See 'bzr help working-trees' for "
165
"more information." % push_result.target_branch.base)
166
push_result.report(to_file)
168
br_to = push_result.target_branch
171
from bzrlib.log import show_branch_change
172
show_branch_change(br_to, to_file, push_result.old_revno,
173
push_result.old_revid)
added
removed
bzrlib/push.py
