← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-06 20:45:48 UTC
  • mfrom: (4728.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091006204548-bjnc3z4k256ppimz
MutableTree.has_changes() does not require a tree parameter anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
16
16
 
17
17
"""UI helper for the push command."""
18
18
 
19
 
from bzrlib import (builtins, bzrdir, errors, revision as _mod_revision,
20
 
                    transport)
21
 
from bzrlib.trace import note, warning
 
19
from bzrlib import (
 
20
    builtins,
 
21
    branch,
 
22
    bzrdir,
 
23
    errors,
 
24
    revision as _mod_revision,
 
25
    transport,
 
26
    )
 
27
from bzrlib.trace import (
 
28
    note,
 
29
    warning,
 
30
    )
22
31
 
23
32
 
24
33
class PushResult(object):
25
34
    """Result of a push operation.
26
35
 
27
36
    :ivar branch_push_result: Result of a push between branches
 
37
    :ivar target_branch: The target branch
28
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.
29
40
    """
30
41
 
31
42
    def __init__(self):
32
43
        self.branch_push_result = None
33
44
        self.stacked_on = None
 
45
        self.workingtree_updated = None
 
46
        self.target_branch = None
34
47
 
35
48
    def report(self, to_file):
36
49
        """Write a human-readable description of the result."""
66
79
        directory exists without a current .bzr directory in it
67
80
    """
68
81
    to_transport = transport.get_transport(location)
69
 
    br_to = repository_to = dir_to = None
70
82
    try:
71
83
        dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
72
84
    except errors.NotBranchError:
73
 
        pass # Didn't find anything
74
 
    else:
75
 
        # If we can open a branch, use its direct repository, otherwise see
76
 
        # if there is a repository without a branch.
77
 
        try:
78
 
            br_to = dir_to.open_branch()
79
 
        except errors.NotBranchError:
80
 
            # Didn't find a branch, can we find a repository?
81
 
            try:
82
 
                repository_to = dir_to.find_repository()
83
 
            except errors.NoRepositoryPresent:
84
 
                pass
85
 
        else:
86
 
            # Found a branch, so we must have found a repository
87
 
            repository_to = br_to.repository
 
85
        # Didn't find anything
 
86
        dir_to = None
88
87
 
89
 
    push_result = PushResult()
90
88
    if dir_to is None:
91
 
        # The destination doesn't exist; create it.
92
 
        # XXX: Refactor the create_prefix/no_create_prefix code into a
93
 
        #      common helper function
94
 
 
95
 
        def make_directory(transport):
96
 
            transport.mkdir('.')
97
 
            return transport
98
 
 
99
 
        def redirected(transport, e, redirection_notice):
100
 
            note(redirection_notice)
101
 
            return transport._redirected_to(e.source, e.target)
102
 
 
103
89
        try:
104
 
            to_transport = transport.do_catching_redirections(
105
 
                make_directory, to_transport, redirected)
 
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)
106
93
        except errors.FileExists:
107
94
            if not use_existing_dir:
108
95
                raise errors.BzrCommandError("Target directory %s"
116
103
                    "\nYou may supply --create-prefix to create all"
117
104
                    " leading parent directories."
118
105
                    % location)
119
 
            builtins._create_prefix(to_transport)
120
106
        except errors.TooManyRedirections:
121
107
            raise errors.BzrCommandError("Too many redirections trying "
122
108
                                         "to make %s." % location)
123
 
 
124
 
        # Now the target directory exists, but doesn't have a .bzr
125
 
        # directory. So we need to create it, along with any work to create
126
 
        # all of the dependent branches, etc.
127
 
        br_to = br_from.create_clone_on_transport(to_transport,
128
 
            revision_id=revision_id, stacked_on=stacked_on)
 
109
        push_result = PushResult()
129
110
        # TODO: Some more useful message about what was copied
130
111
        try:
131
112
            push_result.stacked_on = br_to.get_stacked_on_url()
133
114
                errors.UnstackableRepositoryFormat,
134
115
                errors.NotStacked):
135
116
            push_result.stacked_on = None
136
 
        # We successfully created the target, remember it
 
117
        push_result.target_branch = br_to
 
118
        push_result.old_revid = _mod_revision.NULL_REVISION
 
119
        push_result.old_revno = 0
137
120
        if br_from.get_push_location() is None or remember:
138
121
            br_from.set_push_location(br_to.base)
139
 
    elif repository_to is None:
140
 
        # we have a bzrdir but no branch or repository
141
 
        # XXX: Figure out what to do other than complain.
142
 
        raise errors.BzrCommandError("At %s you have a valid .bzr control"
143
 
            " directory, but not a branch or repository. This is an"
144
 
            " unsupported configuration. Please move the target directory"
145
 
            " out of the way and try again."
146
 
            % location)
147
 
    elif br_to is None:
148
 
        # We have a repository but no branch, copy the revisions, and then
149
 
        # create a branch.
 
122
    else:
150
123
        if stacked_on is not None:
151
124
            warning("Ignoring request for a stacked branch as repository "
152
125
                    "already exists at the destination location.")
153
 
        repository_to.fetch(br_from.repository, revision_id=revision_id)
154
 
        br_to = br_from.clone(dir_to, revision_id=revision_id)
155
 
        if br_from.get_push_location() is None or remember:
156
 
            br_from.set_push_location(br_to.base)
157
 
    else: # We have a valid to branch
158
 
        if stacked_on is not None:
159
 
            warning("Ignoring request for a stacked branch as branch "
160
 
                    "already exists at the destination location.")
161
 
        # We were able to connect to the remote location, so remember it.
162
 
        # (We don't need to successfully push because of possible divergence.)
163
 
        if br_from.get_push_location() is None or remember:
164
 
            br_from.set_push_location(br_to.base)
165
126
        try:
166
 
            try:
167
 
                tree_to = dir_to.open_workingtree()
168
 
            except errors.NotLocalUrl:
169
 
                note("This transport does not update the working "
170
 
                        "tree of: %s. See 'bzr help working-trees' for "
171
 
                        "more information." % br_to.base)
172
 
                push_result.branch_push_result = br_from.push(br_to, overwrite,
173
 
                                                   stop_revision=revision_id)
174
 
            except errors.NoWorkingTree:
175
 
                push_result.branch_push_result = br_from.push(br_to, overwrite,
176
 
                                                   stop_revision=revision_id)
177
 
            else:
178
 
                tree_to.lock_write()
179
 
                try:
180
 
                    push_result.branch_push_result = br_from.push(tree_to.branch,
181
 
                        overwrite, stop_revision=revision_id)
182
 
                    tree_to.update()
183
 
                finally:
184
 
                    tree_to.unlock()
 
127
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
 
128
                remember, create_prefix)
185
129
        except errors.DivergedBranches:
186
130
            raise errors.BzrCommandError('These branches have diverged.'
187
 
                                    '  Try using "merge" and then "push".')
 
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)
188
144
    push_result.report(to_file)
189
 
    if push_result.branch_push_result is not None:
190
 
        old_revid = push_result.branch_push_result.old_revid
191
 
        old_revno = push_result.branch_push_result.old_revno
192
 
    else:
193
 
        old_revid = _mod_revision.NULL_REVISION
194
 
        old_revno = 0
195
145
    if verbose:
 
146
        br_to = push_result.target_branch
196
147
        br_to.lock_read()
197
148
        try:
198
149
            from bzrlib.log import show_branch_change
199
 
            show_branch_change(br_to, to_file, old_revno, old_revid)
 
150
            show_branch_change(br_to, to_file, push_result.old_revno, 
 
151
                               push_result.old_revid)
200
152
        finally:
201
153
            br_to.unlock()
 
154
 
 
155