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, transport
20
from bzrlib.trace import note, warning
60
23
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
79
42
directory exists without a current .bzr directory in it
81
44
to_transport = transport.get_transport(location)
45
br_to = repository_to = dir_to = None
83
47
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
84
48
except errors.NotBranchError:
85
# Didn't find anything
49
pass # Didn't find anything
51
# If we can open a branch, use its direct repository, otherwise see
52
# if there is a repository without a branch.
54
br_to = dir_to.open_branch()
55
except errors.NotBranchError:
56
# Didn't find a branch, can we find a repository?
58
repository_to = dir_to.find_repository()
59
except errors.NoRepositoryPresent:
62
# Found a branch, so we must have found a repository
63
repository_to = br_to.repository
69
# The destination doesn't exist; create it.
70
# XXX: Refactor the create_prefix/no_create_prefix code into a
71
# common helper function
73
def make_directory(transport):
77
def redirected(redirected_transport, e, redirection_notice):
78
return transport.get_transport(e.get_target_url())
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)
81
to_transport = transport.do_catching_redirections(
82
make_directory, to_transport, redirected)
93
83
except errors.FileExists:
94
84
if not use_existing_dir:
95
85
raise errors.BzrCommandError("Target directory %s"
103
93
"\nYou may supply --create-prefix to create all"
104
94
" leading parent directories."
96
builtins._create_prefix(to_transport)
106
97
except errors.TooManyRedirections:
107
98
raise errors.BzrCommandError("Too many redirections trying "
108
99
"to make %s." % location)
109
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
br_to = dir_to.open_branch()
110
107
# TODO: Some more useful message about what was copied
112
push_result.stacked_on = br_to.get_stacked_on_url()
109
finally_stacked_on = br_to.get_stacked_on_url()
113
110
except (errors.UnstackableBranchFormat,
114
111
errors.UnstackableRepositoryFormat,
115
112
errors.NotStacked):
116
push_result.stacked_on = None
117
push_result.target_branch = br_to
118
push_result.old_revid = _mod_revision.NULL_REVISION
119
push_result.old_revno = 0
113
finally_stacked_on = None
114
if finally_stacked_on is not None:
115
note('Created new stacked branch referring to %s.' %
118
note('Created new branch.')
119
# We successfully created the target, remember it
120
120
if br_from.get_push_location() is None or remember:
121
121
br_from.set_push_location(br_to.base)
122
elif repository_to is None:
123
# we have a bzrdir but no branch or repository
124
# XXX: Figure out what to do other than complain.
125
raise errors.BzrCommandError("At %s you have a valid .bzr control"
126
" directory, but not a branch or repository. This is an"
127
" unsupported configuration. Please move the target directory"
128
" out of the way and try again."
131
# We have a repository but no branch, copy the revisions, and then
123
133
if stacked_on is not None:
124
134
warning("Ignoring request for a stacked branch as repository "
125
135
"already exists at the destination location.")
136
repository_to.fetch(br_from.repository, revision_id=revision_id)
137
br_to = br_from.clone(dir_to, revision_id=revision_id)
138
note('Created new branch.')
139
if br_from.get_push_location() is None or remember:
140
br_from.set_push_location(br_to.base)
141
else: # We have a valid to branch
142
if stacked_on is not None:
143
warning("Ignoring request for a stacked branch as branch "
144
"already exists at the destination location.")
145
# We were able to connect to the remote location, so remember it.
146
# (We don't need to successfully push because of possible divergence.)
147
if br_from.get_push_location() is None or remember:
148
br_from.set_push_location(br_to.base)
150
old_rh = br_to.revision_history()
127
push_result = dir_to.push_branch(br_from, revision_id, overwrite,
128
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)
129
171
except errors.DivergedBranches:
130
172
raise errors.BzrCommandError('These branches have diverged.'
131
' See "bzr help diverged-branches"'
132
' for more information.')
133
except errors.NoRepositoryPresent:
134
# we have a bzrdir but no branch or repository
135
# XXX: Figure out what to do other than complain.
136
raise errors.BzrCommandError("At %s you have a valid .bzr"
137
" control directory, but not a branch or repository. This"
138
" is an unsupported configuration. Please move the target"
139
" directory out of the way and try again." % location)
140
if push_result.workingtree_updated == False:
141
warning("This transport does not update the working "
142
"tree of: %s. See 'bzr help working-trees' for "
143
"more information." % push_result.target_branch.base)
144
push_result.report(to_file)
146
br_to = push_result.target_branch
149
from bzrlib.log import show_branch_change
150
show_branch_change(br_to, to_file, push_result.old_revno,
151
push_result.old_revid)
173
' Try using "merge" and then "push".')
174
if push_result is not None:
175
push_result.report(to_file)
177
new_rh = br_to.revision_history()
180
from bzrlib.log import show_changed_revisions
181
show_changed_revisions(br_to, old_rh, new_rh,
184
# we probably did a clone rather than a push, so a message was
added
removed
bzrlib/push.py
