← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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
    )
 
31
 
 
32
 
 
33
class PushResult(object):
 
34
    """Result of a push operation.
 
35
 
 
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.
 
40
    """
 
41
 
 
42
    def __init__(self):
 
43
        self.branch_push_result = None
 
44
        self.stacked_on = None
 
45
        self.workingtree_updated = None
 
46
        self.target_branch = None
 
47
 
 
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.' %
 
53
                    self.stacked_on)
 
54
            else:
 
55
                note('Created new branch.')
 
56
        else:
 
57
            self.branch_push_result.report(to_file)
22
58
 
23
59
 
24
60
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
48
84
        dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
49
85
    except errors.NotBranchError:
50
86
        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
65
87
 
66
 
    push_result = None
 
88
    push_result = PushResult()
67
89
    if dir_to is None:
68
90
        # The destination doesn't exist; create it.
69
91
        # XXX: Refactor the create_prefix/no_create_prefix code into a
101
123
        # Now the target directory exists, but doesn't have a .bzr
102
124
        # directory. So we need to create it, along with any work to create
103
125
        # all of the dependent branches, etc.
104
 
        dir_to = br_from.bzrdir.clone_on_transport(to_transport,
 
126
        br_to = br_from.create_clone_on_transport(to_transport,
105
127
            revision_id=revision_id, stacked_on=stacked_on)
106
 
        br_to = dir_to.open_branch()
107
128
        # TODO: Some more useful message about what was copied
108
129
        try:
109
 
            finally_stacked_on = br_to.get_stacked_on_url()
 
130
            push_result.stacked_on = br_to.get_stacked_on_url()
110
131
        except (errors.UnstackableBranchFormat,
111
132
                errors.UnstackableRepositoryFormat,
112
133
                errors.NotStacked):
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
 
134
            push_result.stacked_on = None
 
135
        push_result.target_branch = br_to
 
136
        push_result.old_revid = _mod_revision.NULL_REVISION
 
137
        push_result.old_revno = 0
120
138
        if br_from.get_push_location() is None or remember:
121
139
            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."
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.
 
140
    else:
133
141
        if stacked_on is not None:
134
142
            warning("Ignoring request for a stacked branch as repository "
135
143
                    "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)
149
144
        try:
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()
 
145
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
 
146
                remember)
169
147
        except errors.DivergedBranches:
170
148
            raise errors.BzrCommandError('These branches have diverged.'
171
149
                                    '  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
 
150
        except errors.NoRepositoryPresent:
 
151
            # we have a bzrdir but no branch or repository
 
152
            # XXX: Figure out what to do other than complain.
 
153
            raise errors.BzrCommandError("At %s you have a valid .bzr"
 
154
                " control directory, but not a branch or repository. This"
 
155
                " is an unsupported configuration. Please move the target"
 
156
                " directory out of the way and try again." % location)
 
157
        if push_result.workingtree_updated == False:
 
158
            warning("This transport does not update the working " 
 
159
                    "tree of: %s. See 'bzr help working-trees' for "
 
160
                    "more information." % push_result.target_branch.base)
 
161
    push_result.report(to_file)
179
162
    if verbose:
 
163
        br_to = push_result.target_branch
180
164
        br_to.lock_read()
181
165
        try:
182
166
            from bzrlib.log import show_branch_change
183
 
            show_branch_change(br_to, to_file, old_revno, old_revid)
 
167
            show_branch_change(br_to, to_file, push_result.old_revno, 
 
168
                               push_result.old_revid)
184
169
        finally:
185
170
            br_to.unlock()
 
171
 
 
172