/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Martin Pool
  • Date: 2009-07-27 06:28:35 UTC
  • mto: This revision was merged to the branch mainline in revision 4587.
  • Revision ID: mbp@sourcefrog.net-20090727062835-o66p8it658tq1sma
Add CountedLock.get_physical_lock_status

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