13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
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)
19
from bzrlib import (builtins, bzrdir, errors, revision as _mod_revision,
21
from bzrlib.trace import note, warning
60
24
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
79
43
directory exists without a current .bzr directory in it
81
45
to_transport = transport.get_transport(location)
46
br_to = repository_to = dir_to = None
83
48
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
84
49
except errors.NotBranchError:
85
# Didn't find anything
50
pass # Didn't find anything
52
# If we can open a branch, use its direct repository, otherwise see
53
# if there is a repository without a branch.
55
br_to = dir_to.open_branch()
56
except errors.NotBranchError:
57
# Didn't find a branch, can we find a repository?
59
repository_to = dir_to.find_repository()
60
except errors.NoRepositoryPresent:
63
# Found a branch, so we must have found a repository
64
repository_to = br_to.repository
68
# The destination doesn't exist; create it.
69
# XXX: Refactor the create_prefix/no_create_prefix code into a
70
# common helper function
72
def make_directory(transport):
76
def redirected(transport, e, redirection_notice):
77
note(redirection_notice)
78
return transport._redirected_to(e.source, e.target)
90
br_to = br_from.create_clone_on_transport(to_transport,
91
revision_id=revision_id, stacked_on=stacked_on,
92
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
93
except errors.FileExists, err:
94
if err.path.endswith('/.bzr'):
95
raise errors.BzrCommandError(
96
"Target directory %s already contains a .bzr directory, "
97
"but it is not valid." % (location,))
81
to_transport = transport.do_catching_redirections(
82
make_directory, to_transport, redirected)
83
except errors.FileExists:
98
84
if not use_existing_dir:
99
85
raise errors.BzrCommandError("Target directory %s"
100
" already exists, but does not have a .bzr"
86
" already exists, but does not have a valid .bzr"
101
87
" directory. Supply --use-existing-dir to push"
102
88
" there anyway." % location)
103
# This shouldn't occur, but if it does the FileExists error will be
104
# more informative than an UnboundLocalError for br_to.
106
89
except errors.NoSuchFile:
107
90
if not create_prefix:
108
91
raise errors.BzrCommandError("Parent directory of %s"
110
93
"\nYou may supply --create-prefix to create all"
111
94
" leading parent directories."
96
builtins._create_prefix(to_transport)
113
97
except errors.TooManyRedirections:
114
98
raise errors.BzrCommandError("Too many redirections trying "
115
99
"to make %s." % location)
116
push_result = PushResult()
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
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
105
revision_id=revision_id, stacked_on=stacked_on)
106
# XXX: Fix this API to allow getting the branch back from the clone
107
# call. Or something. 20090224 RBC/spiv.
108
br_to = dir_to.open_branch()
117
109
# TODO: Some more useful message about what was copied
119
push_result.stacked_on = br_to.get_stacked_on_url()
111
finally_stacked_on = br_to.get_stacked_on_url()
120
112
except (errors.UnstackableBranchFormat,
121
113
errors.UnstackableRepositoryFormat,
122
114
errors.NotStacked):
123
push_result.stacked_on = None
124
push_result.target_branch = br_to
125
push_result.old_revid = _mod_revision.NULL_REVISION
126
push_result.old_revno = 0
115
finally_stacked_on = None
116
if finally_stacked_on is not None:
117
note('Created new stacked branch referring to %s.' %
120
note('Created new branch.')
121
# We successfully created the target, remember it
127
122
if br_from.get_push_location() is None or remember:
128
123
br_from.set_push_location(br_to.base)
124
elif repository_to is None:
125
# we have a bzrdir but no branch or repository
126
# XXX: Figure out what to do other than complain.
127
raise errors.BzrCommandError("At %s you have a valid .bzr control"
128
" directory, but not a branch or repository. This is an"
129
" unsupported configuration. Please move the target directory"
130
" out of the way and try again."
133
# We have a repository but no branch, copy the revisions, and then
130
135
if stacked_on is not None:
131
136
warning("Ignoring request for a stacked branch as repository "
132
137
"already exists at the destination location.")
138
repository_to.fetch(br_from.repository, revision_id=revision_id)
139
br_to = br_from.clone(dir_to, revision_id=revision_id)
140
note('Created new branch.')
141
if br_from.get_push_location() is None or remember:
142
br_from.set_push_location(br_to.base)
143
else: # We have a valid to branch
144
if stacked_on is not None:
145
warning("Ignoring request for a stacked branch as branch "
146
"already exists at the destination location.")
147
# We were able to connect to the remote location, so remember it.
148
# (We don't need to successfully push because of possible divergence.)
149
if br_from.get_push_location() is None or remember:
150
br_from.set_push_location(br_to.base)
134
push_result = dir_to.push_branch(br_from, revision_id, overwrite,
135
remember, create_prefix)
153
tree_to = dir_to.open_workingtree()
154
except errors.NotLocalUrl:
155
warning("This transport does not update the working "
156
"tree of: %s. See 'bzr help working-trees' for "
157
"more information." % br_to.base)
158
push_result = br_from.push(br_to, overwrite,
159
stop_revision=revision_id)
160
except errors.NoWorkingTree:
161
push_result = br_from.push(br_to, overwrite,
162
stop_revision=revision_id)
166
push_result = br_from.push(tree_to.branch, overwrite,
167
stop_revision=revision_id)
136
171
except errors.DivergedBranches:
137
172
raise errors.BzrCommandError('These branches have diverged.'
138
' See "bzr help diverged-branches"'
139
' for more information.')
140
except errors.NoRoundtrippingSupport, e:
141
raise errors.BzrCommandError("It is not possible to losslessly "
142
"push to %s. You may want to use dpush instead." %
143
e.target_branch.mapping.vcs.abbreviation)
144
except errors.NoRepositoryPresent:
145
# we have a bzrdir but no branch or repository
146
# XXX: Figure out what to do other than complain.
147
raise errors.BzrCommandError("At %s you have a valid .bzr"
148
" control directory, but not a branch or repository. This"
149
" is an unsupported configuration. Please move the target"
150
" directory out of the way and try again." % location)
151
if push_result.workingtree_updated == False:
152
warning("This transport does not update the working "
153
"tree of: %s. See 'bzr help working-trees' for "
154
"more information." % push_result.target_branch.base)
155
push_result.report(to_file)
173
' Try using "merge" and then "push".')
174
if push_result is not None:
175
push_result.report(to_file)
176
old_revid = push_result.old_revid
177
old_revno = push_result.old_revno
179
old_revid = _mod_revision.NULL_REVISION
157
br_to = push_result.target_branch
158
182
br_to.lock_read()
160
184
from bzrlib.log import show_branch_change
161
show_branch_change(br_to, to_file, push_result.old_revno,
162
push_result.old_revid)
185
show_branch_change(br_to, to_file, old_revno, old_revid)
added
removed
bzrlib/push.py
