« back to all changes in this revision
Viewing changes to bzrlib/push.py
- browse files at revision 3537
- compare with another revision
- compare with revision 3537
- download diff
- download tarball
- view history from revision 3537
- Committer: Canonical.com Patch Queue Manager
- Date: 2008-07-14 08:21:19 UTC
- mfrom: (3517.4.20 stacking)
- Revision ID: pqm@pqm.ubuntu.com-20080714082119-ju6qe5weo8pp7f1c
merge integrated branch stacking
- files added:
- bzrlib/push.py
- files modified:
- NEWS
added
removed
bzrlib/push.py
1
# Copyright (C) 2008 Canonical Ltd
2
#
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.
7
#
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.
12
#
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
17
"""UI helper for the push command."""
18
19
from bzrlib import builtins, bzrdir, errors, transport
20
from bzrlib.trace import note, warning
21
22
23
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
24
overwrite=False, remember=False, reference=None, create_prefix=False,
25
use_existing_dir=False):
26
"""Push a branch to a location.
27
28
:param br_from: the source branch
29
:param revision_id: the revision-id to push up to
30
:param location: the url of the destination
31
:param to_file: the output stream
32
:param verbose: if True, display more output than normal
33
:param overwrite: if False, a current branch at the destination may not
34
have diverged from the source, otherwise the push fails
35
:param remember: if True, store the location as the push location for
36
the source branch
37
:param reference: the url of the branch, if any, to stack on;
38
if set, only the revisions not in that branch are pushed
39
:param create_prefix: if True, create the necessary parent directories
40
at the destination if they don't already exist
41
:param use_existing_dir: if True, proceed even if the destination
42
directory exists without a current .bzr directory in it
43
"""
44
to_transport = transport.get_transport(location)
45
br_to = repository_to = dir_to = None
46
try:
47
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
48
except errors.NotBranchError:
49
pass # Didn't find anything
50
else:
51
# If we can open a branch, use its direct repository, otherwise see
52
# if there is a repository without a branch.
53
try:
54
br_to = dir_to.open_branch()
55
except errors.NotBranchError:
56
# Didn't find a branch, can we find a repository?
57
try:
58
repository_to = dir_to.find_repository()
59
except errors.NoRepositoryPresent:
60
pass
61
else:
62
# Found a branch, so we must have found a repository
63
repository_to = br_to.repository
64
65
push_result = None
66
if verbose:
67
old_rh = []
68
if dir_to is None:
69
# The destination doesn't exist; create it.
70
# XXX: Refactor the create_prefix/no_create_prefix code into a
71
# common helper function
72
73
def make_directory(transport):
74
transport.mkdir('.')
75
return transport
76
77
def redirected(redirected_transport, e, redirection_notice):
78
return transport.get_transport(e.get_target_url())
79
80
try:
81
to_transport = transport.do_catching_redirections(
82
make_directory, to_transport, redirected)
83
except errors.FileExists:
84
if not use_existing_dir:
85
raise errors.BzrCommandError("Target directory %s"
86
" already exists, but does not have a valid .bzr"
87
" directory. Supply --use-existing-dir to push"
88
" there anyway." % location)
89
except errors.NoSuchFile:
90
if not create_prefix:
91
raise errors.BzrCommandError("Parent directory of %s"
92
" does not exist."
93
"\nYou may supply --create-prefix to create all"
94
" leading parent directories."
95
% location)
96
builtins._create_prefix(to_transport)
97
except errors.TooManyRedirections:
98
raise errors.BzrCommandError("Too many redirections trying "
99
"to make %s." % location)
100
101
# Now the target directory exists, but doesn't have a .bzr
102
# directory. So we need to create it, along with any work to create
103
# all of the dependent branches, etc.
104
if reference is not None:
105
# This should be buried in the clone method itself. TODO.
106
try:
107
# if the from format is stackable, this will either work or
108
# trigger NotStacked. If it's not, an error will be given to
109
# the user.
110
br_from.get_stacked_on()
111
except errors.NotStacked:
112
pass
113
# now we need to sprout the repository,
114
dir_to = br_from.bzrdir._format.initialize_on_transport(to_transport)
115
br_from.repository._format.initialize(dir_to)
116
br_to = br_from._format.initialize(dir_to)
117
br_to.set_stacked_on(reference)
118
# and copy the data up.
119
br_from.push(br_to)
120
else:
121
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
122
revision_id=revision_id)
123
br_to = dir_to.open_branch()
124
# TODO: Some more useful message about what was copied
125
if reference is not None:
126
note('Created new stacked branch referring to %s.' % reference)
127
else:
128
note('Created new branch.')
129
# We successfully created the target, remember it
130
if br_from.get_push_location() is None or remember:
131
br_from.set_push_location(br_to.base)
132
elif repository_to is None:
133
# we have a bzrdir but no branch or repository
134
# XXX: Figure out what to do other than complain.
135
raise errors.BzrCommandError("At %s you have a valid .bzr control"
136
" directory, but not a branch or repository. This is an"
137
" unsupported configuration. Please move the target directory"
138
" out of the way and try again."
139
% location)
140
elif br_to is None:
141
# We have a repository but no branch, copy the revisions, and then
142
# create a branch.
143
if reference is not None:
144
warning("Ignoring request for a stacked branch as repository "
145
"already exists at the destination location.")
146
repository_to.fetch(br_from.repository, revision_id=revision_id)
147
br_to = br_from.clone(dir_to, revision_id=revision_id)
148
note('Created new branch.')
149
if br_from.get_push_location() is None or remember:
150
br_from.set_push_location(br_to.base)
151
else: # We have a valid to branch
152
if reference is not None:
153
warning("Ignoring request for a stacked branch as branch "
154
"already exists at the destination location.")
155
# We were able to connect to the remote location, so remember it.
156
# (We don't need to successfully push because of possible divergence.)
157
if br_from.get_push_location() is None or remember:
158
br_from.set_push_location(br_to.base)
159
if verbose:
160
old_rh = br_to.revision_history()
161
try:
162
try:
163
tree_to = dir_to.open_workingtree()
164
except errors.NotLocalUrl:
165
warning("This transport does not update the working "
166
"tree of: %s. See 'bzr help working-trees' for "
167
"more information." % br_to.base)
168
push_result = br_from.push(br_to, overwrite,
169
stop_revision=revision_id)
170
except errors.NoWorkingTree:
171
push_result = br_from.push(br_to, overwrite,
172
stop_revision=revision_id)
173
else:
174
tree_to.lock_write()
175
try:
176
push_result = br_from.push(tree_to.branch, overwrite,
177
stop_revision=revision_id)
178
tree_to.update()
179
finally:
180
tree_to.unlock()
181
except errors.DivergedBranches:
182
raise errors.BzrCommandError('These branches have diverged.'
183
' Try using "merge" and then "push".')
184
if push_result is not None:
185
push_result.report(to_file)
186
elif verbose:
187
new_rh = br_to.revision_history()
188
if old_rh != new_rh:
189
# Something changed
190
from bzrlib.log import show_changed_revisions
191
show_changed_revisions(br_to, old_rh, new_rh,
192
to_file=to_file)
193
else:
194
# we probably did a clone rather than a push, so a message was
195
# emitted above
196
pass
Loggerhead is a web-based interface for Breezy
Version: 2.0.1