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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
"""UI helper for the push command."""
19
from bzrlib import (builtins, bzrdir, errors, revision as _mod_revision,
21
from bzrlib.trace import note, warning
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)
24
60
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
43
79
directory exists without a current .bzr directory in it
45
81
to_transport = transport.get_transport(location)
46
br_to = repository_to = dir_to = None
48
83
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
49
84
except errors.NotBranchError:
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
85
# Didn't find anything
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)
81
to_transport = transport.do_catching_redirections(
82
make_directory, to_transport, redirected)
83
except errors.FileExists:
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,))
84
98
if not use_existing_dir:
85
99
raise errors.BzrCommandError("Target directory %s"
86
" already exists, but does not have a valid .bzr"
100
" already exists, but does not have a .bzr"
87
101
" directory. Supply --use-existing-dir to push"
88
102
" 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.
89
106
except errors.NoSuchFile:
90
107
if not create_prefix:
91
108
raise errors.BzrCommandError("Parent directory of %s"
93
110
"\nYou may supply --create-prefix to create all"
94
111
" leading parent directories."
96
builtins._create_prefix(to_transport)
97
113
except errors.TooManyRedirections:
98
114
raise errors.BzrCommandError("Too many redirections trying "
99
115
"to make %s." % location)
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()
116
push_result = PushResult()
107
117
# TODO: Some more useful message about what was copied
109
finally_stacked_on = br_to.get_stacked_on_url()
119
push_result.stacked_on = br_to.get_stacked_on_url()
110
120
except (errors.UnstackableBranchFormat,
111
121
errors.UnstackableRepositoryFormat,
112
122
errors.NotStacked):
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
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
120
127
if br_from.get_push_location() is None or remember:
121
128
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
133
130
if stacked_on is not None:
134
131
warning("Ignoring request for a stacked branch as repository "
135
132
"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)
151
tree_to = dir_to.open_workingtree()
152
except errors.NotLocalUrl:
153
warning("This transport does not update the working "
154
"tree of: %s. See 'bzr help working-trees' for "
155
"more information." % br_to.base)
156
push_result = br_from.push(br_to, overwrite,
157
stop_revision=revision_id)
158
except errors.NoWorkingTree:
159
push_result = br_from.push(br_to, overwrite,
160
stop_revision=revision_id)
164
push_result = br_from.push(tree_to.branch, overwrite,
165
stop_revision=revision_id)
134
push_result = dir_to.push_branch(br_from, revision_id, overwrite,
135
remember, create_prefix)
169
136
except errors.DivergedBranches:
170
137
raise errors.BzrCommandError('These branches have diverged.'
171
' Try using "merge" and then "push".')
172
if push_result is not None:
173
push_result.report(to_file)
174
old_revid = push_result.old_revid
175
old_revno = push_result.old_revno
177
old_revid = _mod_revision.NULL_REVISION
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)
157
br_to = push_result.target_branch
180
158
br_to.lock_read()
182
160
from bzrlib.log import show_branch_change
183
show_branch_change(br_to, to_file, old_revno, old_revid)
161
show_branch_change(br_to, to_file, push_result.old_revno,
162
push_result.old_revid)
added
removed
bzrlib/push.py
