1
# Copyright (C) 2008 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."""
24
revision as _mod_revision,
27
from bzrlib.trace import (
33
class PushResult(object):
34
"""Result of a push operation.
36
:ivar branch_push_result: Result of a push between branches
37
:ivar target_branch: The target branch
38
:ivar stacked_on: URL of the branch on which the result is stacked
39
:ivar workingtree_updated: Whether or not the target workingtree was updated.
43
self.branch_push_result = None
44
self.stacked_on = None
45
self.workingtree_updated = None
46
self.target_branch = None
48
def report(self, to_file):
49
"""Write a human-readable description of the result."""
50
if self.branch_push_result is None:
51
if self.stacked_on is not None:
52
note('Created new stacked branch referring to %s.' %
55
note('Created new branch.')
57
self.branch_push_result.report(to_file)
60
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
61
overwrite=False, remember=False, stacked_on=None, create_prefix=False,
62
use_existing_dir=False):
63
"""Push a branch to a location.
65
:param br_from: the source branch
66
:param revision_id: the revision-id to push up to
67
:param location: the url of the destination
68
:param to_file: the output stream
69
: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
72
:param remember: if True, store the location as the push location for
74
:param stacked_on: the url of the branch, if any, to stack on;
75
if set, only the revisions not in that branch are pushed
76
:param create_prefix: if True, create the necessary parent directories
77
at the destination if they don't already exist
78
:param use_existing_dir: if True, proceed even if the destination
79
directory exists without a current .bzr directory in it
81
to_transport = transport.get_transport(location)
82
br_to = repository_to = dir_to = None
84
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
85
except errors.NotBranchError:
86
pass # Didn't find anything
88
push_result = PushResult()
90
# The destination doesn't exist; create it.
91
# XXX: Refactor the create_prefix/no_create_prefix code into a
92
# common helper function
94
def make_directory(transport):
98
def redirected(transport, e, redirection_notice):
99
note(redirection_notice)
100
return transport._redirected_to(e.source, e.target)
103
to_transport = transport.do_catching_redirections(
104
make_directory, to_transport, redirected)
105
except errors.FileExists:
106
if not use_existing_dir:
107
raise errors.BzrCommandError("Target directory %s"
108
" already exists, but does not have a valid .bzr"
109
" directory. Supply --use-existing-dir to push"
110
" there anyway." % location)
111
except errors.NoSuchFile:
112
if not create_prefix:
113
raise errors.BzrCommandError("Parent directory of %s"
115
"\nYou may supply --create-prefix to create all"
116
" leading parent directories."
118
builtins._create_prefix(to_transport)
119
except errors.TooManyRedirections:
120
raise errors.BzrCommandError("Too many redirections trying "
121
"to make %s." % location)
123
# Now the target directory exists, but doesn't have a .bzr
124
# directory. So we need to create it, along with any work to create
125
# all of the dependent branches, etc.
126
br_to = br_from.create_clone_on_transport(to_transport,
127
revision_id=revision_id, stacked_on=stacked_on)
128
# TODO: Some more useful message about what was copied
130
push_result.stacked_on = br_to.get_stacked_on_url()
131
except (errors.UnstackableBranchFormat,
132
errors.UnstackableRepositoryFormat,
134
push_result.stacked_on = None
135
push_result.target_branch = br_to
136
push_result.old_revid = _mod_revision.NULL_REVISION
137
push_result.old_revno = 0
138
if br_from.get_push_location() is None or remember:
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,
147
except errors.DivergedBranches:
148
raise errors.BzrCommandError('These branches have diverged.'
149
' Try using "merge" and then "push".')
150
except errors.NoRepositoryPresent:
151
# we have a bzrdir but no branch or repository
152
# XXX: Figure out what to do other than complain.
153
raise errors.BzrCommandError("At %s you have a valid .bzr"
154
" control directory, but not a branch or repository. This"
155
" is an unsupported configuration. Please move the target"
156
" directory out of the way and try again." % location)
157
if push_result.workingtree_updated == False:
158
warning("This transport does not update the working "
159
"tree of: %s. See 'bzr help working-trees' for "
160
"more information." % push_result.target_branch.base)
161
push_result.report(to_file)
163
br_to = push_result.target_branch
166
from bzrlib.log import show_branch_change
167
show_branch_change(br_to, to_file, push_result.old_revno,
168
push_result.old_revid)
added
removed
bzrlib/push.py
