← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Martin Pool
  • Date: 2009-01-13 03:06:36 UTC
  • mfrom: (3932.2.3 1.11)
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: mbp@sourcefrog.net-20090113030636-dqx4t8yaaqgdvam5
Merge 1.11rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
1
 
# Copyright (C) 2008-2012 Canonical Ltd
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
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
12
12
#
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
16
16
 
17
17
"""UI helper for the push command."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
 
from bzrlib import (
22
 
    controldir,
23
 
    errors,
24
 
    revision as _mod_revision,
25
 
    transport,
26
 
    )
27
 
from bzrlib.trace import (
28
 
    note,
29
 
    warning,
30
 
    )
31
 
from bzrlib.i18n import gettext
32
 
 
33
 
 
34
 
class PushResult(object):
35
 
    """Result of a push operation.
36
 
 
37
 
    :ivar branch_push_result: Result of a push between branches
38
 
    :ivar target_branch: The target branch
39
 
    :ivar stacked_on: URL of the branch on which the result is stacked
40
 
    :ivar workingtree_updated: Whether or not the target workingtree was updated.
41
 
    """
42
 
 
43
 
    def __init__(self):
44
 
        self.branch_push_result = None
45
 
        self.stacked_on = None
46
 
        self.workingtree_updated = None
47
 
        self.target_branch = None
48
 
 
49
 
    def report(self, to_file):
50
 
        """Write a human-readable description of the result."""
51
 
        if self.branch_push_result is None:
52
 
            if self.stacked_on is not None:
53
 
                note(gettext('Created new stacked branch referring to %s.') %
54
 
                    self.stacked_on)
55
 
            else:
56
 
                note(gettext('Created new branch.'))
57
 
        else:
58
 
            self.branch_push_result.report(to_file)
 
19
from bzrlib import (builtins, bzrdir, errors, revision as _mod_revision,
 
20
                    transport)
 
21
from bzrlib.trace import note, warning
59
22
 
60
23
 
61
24
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
62
25
    overwrite=False, remember=False, stacked_on=None, create_prefix=False,
63
 
    use_existing_dir=False, no_tree=False):
 
26
    use_existing_dir=False):
64
27
    """Push a branch to a location.
65
28
 
66
29
    :param br_from: the source branch
68
31
    :param location: the url of the destination
69
32
    :param to_file: the output stream
70
33
    :param verbose: if True, display more output than normal
71
 
    :param overwrite: list of things to overwrite ("history", "tags")
72
 
        or boolean indicating for everything
 
34
    :param overwrite: if False, a current branch at the destination may not
 
35
        have diverged from the source, otherwise the push fails
73
36
    :param remember: if True, store the location as the push location for
74
37
        the source branch
75
38
    :param stacked_on: the url of the branch, if any, to stack on;
80
43
        directory exists without a current .bzr directory in it
81
44
    """
82
45
    to_transport = transport.get_transport(location)
 
46
    br_to = repository_to = dir_to = None
83
47
    try:
84
 
        dir_to = controldir.ControlDir.open_from_transport(to_transport)
 
48
        dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
85
49
    except errors.NotBranchError:
86
 
        # Didn't find anything
87
 
        dir_to = None
 
50
        pass # Didn't find anything
 
51
    else:
 
52
        # If we can open a branch, use its direct repository, otherwise see
 
53
        # if there is a repository without a branch.
 
54
        try:
 
55
            br_to = dir_to.open_branch()
 
56
        except errors.NotBranchError:
 
57
            # Didn't find a branch, can we find a repository?
 
58
            try:
 
59
                repository_to = dir_to.find_repository()
 
60
            except errors.NoRepositoryPresent:
 
61
                pass
 
62
        else:
 
63
            # Found a branch, so we must have found a repository
 
64
            repository_to = br_to.repository
88
65
 
 
66
    push_result = None
89
67
    if dir_to is None:
 
68
        # The destination doesn't exist; create it.
 
69
        # XXX: Refactor the create_prefix/no_create_prefix code into a
 
70
        #      common helper function
 
71
 
 
72
        def make_directory(transport):
 
73
            transport.mkdir('.')
 
74
            return transport
 
75
 
 
76
        def redirected(transport, e, redirection_notice):
 
77
            note(redirection_notice)
 
78
            return transport._redirected_to(e.source, e.target)
 
79
 
90
80
        try:
91
 
            br_to = br_from.create_clone_on_transport(to_transport,
92
 
                revision_id=revision_id, stacked_on=stacked_on,
93
 
                create_prefix=create_prefix, use_existing_dir=use_existing_dir,
94
 
                no_tree=no_tree)
95
 
        except errors.AlreadyControlDirError, err:
96
 
            raise errors.BzrCommandError(gettext(
97
 
                "Target directory %s already contains a .bzr directory, "
98
 
                "but it is not valid.") % (location,))
99
 
        except errors.FileExists, err:
 
81
            to_transport = transport.do_catching_redirections(
 
82
                make_directory, to_transport, redirected)
 
83
        except errors.FileExists:
100
84
            if not use_existing_dir:
101
 
                raise errors.BzrCommandError(gettext("Target directory %s"
102
 
                     " already exists, but does not have a .bzr"
 
85
                raise errors.BzrCommandError("Target directory %s"
 
86
                     " already exists, but does not have a valid .bzr"
103
87
                     " directory. Supply --use-existing-dir to push"
104
 
                     " there anyway.") % location)
105
 
            # This shouldn't occur, but if it does the FileExists error will be
106
 
            # more informative than an UnboundLocalError for br_to.
107
 
            raise
 
88
                     " there anyway." % location)
108
89
        except errors.NoSuchFile:
109
90
            if not create_prefix:
110
 
                raise errors.BzrCommandError(gettext("Parent directory of %s"
 
91
                raise errors.BzrCommandError("Parent directory of %s"
111
92
                    " does not exist."
112
93
                    "\nYou may supply --create-prefix to create all"
113
 
                    " leading parent directories.")
 
94
                    " leading parent directories."
114
95
                    % location)
115
 
            # This shouldn't occur (because create_prefix is true, so
116
 
            # create_clone_on_transport should be catching NoSuchFile and
117
 
            # creating the missing directories) but if it does the original
118
 
            # NoSuchFile error will be more informative than an
119
 
            # UnboundLocalError for br_to.
120
 
            raise
 
96
            builtins._create_prefix(to_transport)
121
97
        except errors.TooManyRedirections:
122
 
            raise errors.BzrCommandError(gettext("Too many redirections trying "
123
 
                                         "to make %s.") % location)
124
 
        push_result = PushResult()
 
98
            raise errors.BzrCommandError("Too many redirections trying "
 
99
                                         "to make %s." % location)
 
100
 
 
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()
125
107
        # TODO: Some more useful message about what was copied
126
108
        try:
127
 
            push_result.stacked_on = br_to.get_stacked_on_url()
 
109
            finally_stacked_on = br_to.get_stacked_on_url()
128
110
        except (errors.UnstackableBranchFormat,
129
111
                errors.UnstackableRepositoryFormat,
130
112
                errors.NotStacked):
131
 
            push_result.stacked_on = None
132
 
        push_result.target_branch = br_to
133
 
        push_result.old_revid = _mod_revision.NULL_REVISION
134
 
        push_result.old_revno = 0
135
 
        # Remembers if asked explicitly or no previous location is set
136
 
        if (remember
137
 
            or (remember is None and br_from.get_push_location() is None)):
138
 
            # FIXME: Should be done only if we succeed ? -- vila 2012-01-18
 
113
            finally_stacked_on = None
 
114
        if finally_stacked_on is not None:
 
115
            note('Created new stacked branch referring to %s.' %
 
116
                 finally_stacked_on)
 
117
        else:
 
118
            note('Created new branch.')
 
119
        # We successfully created the target, remember it
 
120
        if br_from.get_push_location() is None or remember:
139
121
            br_from.set_push_location(br_to.base)
140
 
    else:
 
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."
 
129
            % location)
 
130
    elif br_to is None:
 
131
        # We have a repository but no branch, copy the revisions, and then
 
132
        # create a branch.
141
133
        if stacked_on is not None:
142
134
            warning("Ignoring request for a stacked branch as repository "
143
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)
144
149
        try:
145
 
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
146
 
                remember, create_prefix)
 
150
            try:
 
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)
 
161
            else:
 
162
                tree_to.lock_write()
 
163
                try:
 
164
                    push_result = br_from.push(tree_to.branch, overwrite,
 
165
                                               stop_revision=revision_id)
 
166
                    tree_to.update()
 
167
                finally:
 
168
                    tree_to.unlock()
147
169
        except errors.DivergedBranches:
148
 
            raise errors.BzrCommandError(gettext('These branches have diverged.'
149
 
                                    '  See "bzr help diverged-branches"'
150
 
                                    ' for more information.'))
151
 
        except errors.NoRoundtrippingSupport, e:
152
 
            raise errors.BzrCommandError(gettext("It is not possible to losslessly "
153
 
                "push to %s. You may want to use dpush instead.") % 
154
 
                    e.target_branch.mapping.vcs.abbreviation)
155
 
        except errors.NoRepositoryPresent:
156
 
            # we have a controldir but no branch or repository
157
 
            # XXX: Figure out what to do other than complain.
158
 
            raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
159
 
                " control directory, but not a branch or repository. This"
160
 
                " is an unsupported configuration. Please move the target"
161
 
                " directory out of the way and try again.") % location)
162
 
        if push_result.workingtree_updated == False:
163
 
            warning("This transport does not update the working " 
164
 
                    "tree of: %s. See 'bzr help working-trees' for "
165
 
                    "more information." % push_result.target_branch.base)
166
 
    push_result.report(to_file)
 
170
            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
 
176
    else:
 
177
        old_revid = _mod_revision.NULL_REVISION
 
178
        old_revno = 0
167
179
    if verbose:
168
 
        br_to = push_result.target_branch
169
180
        br_to.lock_read()
170
181
        try:
171
182
            from bzrlib.log import show_branch_change
172
 
            show_branch_change(br_to, to_file, push_result.old_revno, 
173
 
                               push_result.old_revid)
 
183
            show_branch_change(br_to, to_file, old_revno, old_revid)
174
184
        finally:
175
185
            br_to.unlock()
176
 
 
177