~bzr-pqm/bzr/bzr.dev

3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
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,
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
24
    overwrite=False, remember=False, stacked_on=None, create_prefix=False,
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
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
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
37
    :param stacked_on: the url of the branch, if any, to stack on;
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
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
3878.4.4 by Vincent Ladeuil
Cleanup.
77
        def redirected(transport, e, redirection_notice):
78
            note(redirection_notice)
3878.4.5 by Vincent Ladeuil
Don't use the exception as a parameter for _redirected_to.
79
            return transport._redirected_to(e.source, e.target)
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
80
81
        try:
82
            to_transport = transport.do_catching_redirections(
83
                make_directory, to_transport, redirected)
84
        except errors.FileExists:
85
            if not use_existing_dir:
86
                raise errors.BzrCommandError("Target directory %s"
87
                     " already exists, but does not have a valid .bzr"
88
                     " directory. Supply --use-existing-dir to push"
89
                     " there anyway." % location)
90
        except errors.NoSuchFile:
91
            if not create_prefix:
92
                raise errors.BzrCommandError("Parent directory of %s"
93
                    " does not exist."
94
                    "\nYou may supply --create-prefix to create all"
95
                    " leading parent directories."
96
                    % location)
97
            builtins._create_prefix(to_transport)
98
        except errors.TooManyRedirections:
99
            raise errors.BzrCommandError("Too many redirections trying "
100
                                         "to make %s." % location)
101
102
        # Now the target directory exists, but doesn't have a .bzr
103
        # directory. So we need to create it, along with any work to create
104
        # all of the dependent branches, etc.
3650.5.1 by Aaron Bentley
Fix push to use clone all the time.
105
        dir_to = br_from.bzrdir.clone_on_transport(to_transport,
106
            revision_id=revision_id, stacked_on=stacked_on)
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
107
        br_to = dir_to.open_branch()
108
        # TODO: Some more useful message about what was copied
3650.5.2 by Aaron Bentley
Always show stacked message if stacking done.
109
        try:
110
            finally_stacked_on = br_to.get_stacked_on_url()
111
        except (errors.UnstackableBranchFormat,
112
                errors.UnstackableRepositoryFormat,
113
                errors.NotStacked):
114
            finally_stacked_on = None
115
        if finally_stacked_on is not None:
116
            note('Created new stacked branch referring to %s.' %
117
                 finally_stacked_on)
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
118
        else:
119
            note('Created new branch.')
120
        # We successfully created the target, remember it
121
        if br_from.get_push_location() is None or remember:
122
            br_from.set_push_location(br_to.base)
123
    elif repository_to is None:
124
        # we have a bzrdir but no branch or repository
125
        # XXX: Figure out what to do other than complain.
126
        raise errors.BzrCommandError("At %s you have a valid .bzr control"
127
            " directory, but not a branch or repository. This is an"
128
            " unsupported configuration. Please move the target directory"
129
            " out of the way and try again."
130
            % location)
131
    elif br_to is None:
132
        # We have a repository but no branch, copy the revisions, and then
133
        # create a branch.
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
134
        if stacked_on is not None:
3221.19.4 by Ian Clatworthy
shallow -> stacked
135
            warning("Ignoring request for a stacked branch as repository "
3221.19.2 by Ian Clatworthy
tweaks to ui during review by igc
136
                    "already exists at the destination location.")
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
137
        repository_to.fetch(br_from.repository, revision_id=revision_id)
138
        br_to = br_from.clone(dir_to, revision_id=revision_id)
139
        note('Created new branch.')
140
        if br_from.get_push_location() is None or remember:
141
            br_from.set_push_location(br_to.base)
142
    else: # We have a valid to branch
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
143
        if stacked_on is not None:
3221.19.4 by Ian Clatworthy
shallow -> stacked
144
            warning("Ignoring request for a stacked branch as branch "
3221.19.2 by Ian Clatworthy
tweaks to ui during review by igc
145
                    "already exists at the destination location.")
146
        # We were able to connect to the remote location, so remember it.
147
        # (We don't need to successfully push because of possible divergence.)
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
148
        if br_from.get_push_location() is None or remember:
149
            br_from.set_push_location(br_to.base)
150
        if verbose:
151
            old_rh = br_to.revision_history()
152
        try:
153
            try:
154
                tree_to = dir_to.open_workingtree()
155
            except errors.NotLocalUrl:
156
                warning("This transport does not update the working " 
157
                        "tree of: %s. See 'bzr help working-trees' for "
158
                        "more information." % br_to.base)
159
                push_result = br_from.push(br_to, overwrite,
160
                                           stop_revision=revision_id)
161
            except errors.NoWorkingTree:
162
                push_result = br_from.push(br_to, overwrite,
163
                                           stop_revision=revision_id)
164
            else:
165
                tree_to.lock_write()
166
                try:
167
                    push_result = br_from.push(tree_to.branch, overwrite,
168
                                               stop_revision=revision_id)
169
                    tree_to.update()
170
                finally:
171
                    tree_to.unlock()
172
        except errors.DivergedBranches:
173
            raise errors.BzrCommandError('These branches have diverged.'
174
                                    '  Try using "merge" and then "push".')
175
    if push_result is not None:
176
        push_result.report(to_file)
177
    elif verbose:
178
        new_rh = br_to.revision_history()
179
        if old_rh != new_rh:
180
            # Something changed
181
            from bzrlib.log import show_changed_revisions
182
            show_changed_revisions(br_to, old_rh, new_rh,
183
                                   to_file=to_file)
184
    else:
185
        # we probably did a clone rather than a push, so a message was
186
        # emitted above
187
        pass