1
# Copyright (C) 2008, 2009, 2010 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."""
22
revision as _mod_revision,
25
from bzrlib.trace import (
31
class PushResult(object):
32
"""Result of a push operation.
34
:ivar branch_push_result: Result of a push between branches
35
:ivar target_branch: The target branch
36
:ivar stacked_on: URL of the branch on which the result is stacked
37
:ivar workingtree_updated: Whether or not the target workingtree was updated.
41
self.branch_push_result = None
42
self.stacked_on = None
43
self.workingtree_updated = None
44
self.target_branch = None
46
def report(self, to_file):
47
"""Write a human-readable description of the result."""
48
if self.branch_push_result is None:
49
if self.stacked_on is not None:
50
note('Created new stacked branch referring to %s.' %
53
note('Created new branch.')
55
self.branch_push_result.report(to_file)
58
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
59
overwrite=False, remember=False, stacked_on=None, create_prefix=False,
60
use_existing_dir=False):
61
"""Push a branch to a location.
63
:param br_from: the source branch
64
:param revision_id: the revision-id to push up to
65
:param location: the url of the destination
66
:param to_file: the output stream
67
: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
70
:param remember: if True, store the location as the push location for
72
:param stacked_on: the url of the branch, if any, to stack on;
73
if set, only the revisions not in that branch are pushed
74
:param create_prefix: if True, create the necessary parent directories
75
at the destination if they don't already exist
76
:param use_existing_dir: if True, proceed even if the destination
77
directory exists without a current .bzr directory in it
79
to_transport = transport.get_transport(location)
81
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
82
except errors.NotBranchError:
83
# Didn't find anything
88
br_to = br_from.create_clone_on_transport(to_transport,
89
revision_id=revision_id, stacked_on=stacked_on,
90
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
91
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
if not use_existing_dir:
97
raise errors.BzrCommandError("Target directory %s"
98
" already exists, but does not have a .bzr"
99
" directory. Supply --use-existing-dir to push"
100
" there anyway." % location)
101
# This shouldn't occur, but if it does the FileExists error will be
102
# more informative than an UnboundLocalError for br_to.
104
except errors.NoSuchFile:
105
if not create_prefix:
106
raise errors.BzrCommandError("Parent directory of %s"
108
"\nYou may supply --create-prefix to create all"
109
" leading parent directories."
111
# This shouldn't occur (because create_prefix is true, so
112
# create_clone_on_transport should be catching NoSuchFile and
113
# creating the missing directories) but if it does the original
114
# NoSuchFile error will be more informative than an
115
# UnboundLocalError for br_to.
117
except errors.TooManyRedirections:
118
raise errors.BzrCommandError("Too many redirections trying "
119
"to make %s." % location)
120
push_result = PushResult()
121
# TODO: Some more useful message about what was copied
123
push_result.stacked_on = br_to.get_stacked_on_url()
124
except (errors.UnstackableBranchFormat,
125
errors.UnstackableRepositoryFormat,
127
push_result.stacked_on = None
128
push_result.target_branch = br_to
129
push_result.old_revid = _mod_revision.NULL_REVISION
130
push_result.old_revno = 0
131
if br_from.get_push_location() is None or remember:
132
br_from.set_push_location(br_to.base)
134
if stacked_on is not None:
135
warning("Ignoring request for a stacked branch as repository "
136
"already exists at the destination location.")
138
push_result = dir_to.push_branch(br_from, revision_id, overwrite,
139
remember, create_prefix)
140
except errors.DivergedBranches:
141
raise errors.BzrCommandError('These branches have diverged.'
142
' See "bzr help diverged-branches"'
143
' for more information.')
144
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." %
147
e.target_branch.mapping.vcs.abbreviation)
148
except errors.NoRepositoryPresent:
149
# we have a bzrdir but no branch or repository
150
# XXX: Figure out what to do other than complain.
151
raise errors.BzrCommandError("At %s you have a valid .bzr"
152
" control directory, but not a branch or repository. This"
153
" is an unsupported configuration. Please move the target"
154
" directory out of the way and try again." % location)
155
if push_result.workingtree_updated == False:
156
warning("This transport does not update the working "
157
"tree of: %s. See 'bzr help working-trees' for "
158
"more information." % push_result.target_branch.base)
159
push_result.report(to_file)
161
br_to = push_result.target_branch
164
from bzrlib.log import show_branch_change
165
show_branch_change(br_to, to_file, push_result.old_revno,
166
push_result.old_revid)
added
removed
bzrlib/push.py
