1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
1
# Copyright (C) 2008-2012 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""UI helper for the push command."""
19
from __future__ import absolute_import
22
branch as _mod_branch,
22
25
revision as _mod_revision,
25
from bzrlib.trace import (
32
from .i18n import gettext
31
35
class PushResult(object):
47
51
"""Write a human-readable description of the result."""
48
52
if self.branch_push_result is None:
49
53
if self.stacked_on is not None:
50
note('Created new stacked branch referring to %s.' %
54
note(gettext('Created new stacked branch referring to %s.') %
53
note('Created new branch.')
57
note(gettext('Created new branch.'))
55
59
self.branch_push_result.report(to_file)
58
62
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
59
63
overwrite=False, remember=False, stacked_on=None, create_prefix=False,
60
use_existing_dir=False):
64
use_existing_dir=False, no_tree=False):
61
65
"""Push a branch to a location.
63
67
:param br_from: the source branch
65
69
:param location: the url of the destination
66
70
:param to_file: the output stream
67
71
:param verbose: if True, display more output than normal
68
:param overwrite: if False, a current branch at the destination may not
69
have diverged from the source, otherwise the push fails
72
:param overwrite: list of things to overwrite ("history", "tags")
73
or boolean indicating for everything
70
74
:param remember: if True, store the location as the push location for
72
76
:param stacked_on: the url of the branch, if any, to stack on;
74
78
:param create_prefix: if True, create the necessary parent directories
75
79
at the destination if they don't already exist
76
80
:param use_existing_dir: if True, proceed even if the destination
77
directory exists without a current .bzr directory in it
81
directory exists without a current control directory in it
79
83
to_transport = transport.get_transport(location)
81
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
85
dir_to = controldir.ControlDir.open_from_transport(to_transport)
82
86
except errors.NotBranchError:
83
87
# Didn't find anything
88
92
br_to = br_from.create_clone_on_transport(to_transport,
89
93
revision_id=revision_id, stacked_on=stacked_on,
90
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
91
except errors.FileExists, err:
92
if err.path.endswith('/.bzr'):
93
raise errors.BzrCommandError(
94
"Target directory %s already contains a .bzr directory, "
95
"but it is not valid." % (location,))
94
create_prefix=create_prefix, use_existing_dir=use_existing_dir,
96
except errors.AlreadyControlDirError as err:
97
raise errors.BzrCommandError(gettext(
98
"Target directory %s already contains a .bzr directory, "
99
"but it is not valid.") % (location,))
100
except errors.FileExists as err:
96
101
if not use_existing_dir:
97
raise errors.BzrCommandError("Target directory %s"
102
raise errors.BzrCommandError(gettext("Target directory %s"
98
103
" already exists, but does not have a .bzr"
99
104
" directory. Supply --use-existing-dir to push"
100
" there anyway." % location)
105
" there anyway.") % location)
101
106
# This shouldn't occur, but if it does the FileExists error will be
102
107
# more informative than an UnboundLocalError for br_to.
104
109
except errors.NoSuchFile:
105
110
if not create_prefix:
106
raise errors.BzrCommandError("Parent directory of %s"
111
raise errors.BzrCommandError(gettext("Parent directory of %s"
107
112
" does not exist."
108
113
"\nYou may supply --create-prefix to create all"
109
" leading parent directories."
114
" leading parent directories.")
111
116
# This shouldn't occur (because create_prefix is true, so
112
117
# create_clone_on_transport should be catching NoSuchFile and
115
120
# UnboundLocalError for br_to.
117
122
except errors.TooManyRedirections:
118
raise errors.BzrCommandError("Too many redirections trying "
119
"to make %s." % location)
123
raise errors.BzrCommandError(gettext("Too many redirections trying "
124
"to make %s.") % location)
120
125
push_result = PushResult()
121
126
# TODO: Some more useful message about what was copied
123
128
push_result.stacked_on = br_to.get_stacked_on_url()
124
except (errors.UnstackableBranchFormat,
129
except (_mod_branch.UnstackableBranchFormat,
125
130
errors.UnstackableRepositoryFormat,
126
131
errors.NotStacked):
127
132
push_result.stacked_on = None
128
133
push_result.target_branch = br_to
129
134
push_result.old_revid = _mod_revision.NULL_REVISION
130
135
push_result.old_revno = 0
131
if br_from.get_push_location() is None or remember:
136
# Remembers if asked explicitly or no previous location is set
138
or (remember is None and br_from.get_push_location() is None)):
139
# FIXME: Should be done only if we succeed ? -- vila 2012-01-18
132
140
br_from.set_push_location(br_to.base)
134
142
if stacked_on is not None:
138
146
push_result = dir_to.push_branch(br_from, revision_id, overwrite,
139
147
remember, create_prefix)
140
148
except errors.DivergedBranches:
141
raise errors.BzrCommandError('These branches have diverged.'
142
' See "bzr help diverged-branches"'
143
' for more information.')
144
except errors.NoRoundtrippingSupport, e:
145
raise errors.BzrCommandError("It is not possible to losslessly "
146
"push to %s. You may want to use dpush instead." %
149
raise errors.BzrCommandError(gettext('These branches have diverged.'
150
' See "brz help diverged-branches"'
151
' for more information.'))
152
except errors.NoRoundtrippingSupport as e:
153
raise errors.BzrCommandError(gettext("It is not possible to losslessly "
154
"push to %s. You may want to use dpush instead.") %
147
155
e.target_branch.mapping.vcs.abbreviation)
148
156
except errors.NoRepositoryPresent:
149
# we have a bzrdir but no branch or repository
157
# we have a controldir but no branch or repository
150
158
# XXX: Figure out what to do other than complain.
151
raise errors.BzrCommandError("At %s you have a valid .bzr"
159
raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
152
160
" control directory, but not a branch or repository. This"
153
161
" is an unsupported configuration. Please move the target"
154
" directory out of the way and try again." % location)
162
" directory out of the way and try again.") % location)
155
163
if push_result.workingtree_updated == False:
156
164
warning("This transport does not update the working "
157
"tree of: %s. See 'bzr help working-trees' for "
165
"tree of: %s. See 'brz help working-trees' for "
158
166
"more information." % push_result.target_branch.base)
159
167
push_result.report(to_file)
161
169
br_to = push_result.target_branch
162
170
br_to.lock_read()
164
from bzrlib.log import show_branch_change
172
from .log import show_branch_change
165
173
show_branch_change(br_to, to_file, push_result.old_revno,
166
174
push_result.old_revid)