/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 breezy/push.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-14 17:59:16 UTC
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180614175916-a2e2xh5k533guq1x
Move breezy.plugins.git to breezy.git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/push.py
16
16
 
17
17
"""UI helper for the push command."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from . import (
20
22
    branch as _mod_branch,
21
23
    controldir,
50
52
        if self.branch_push_result is None:
51
53
            if self.stacked_on is not None:
52
54
                note(gettext('Created new stacked branch referring to %s.') %
53
 
                     self.stacked_on)
 
55
                    self.stacked_on)
54
56
            else:
55
57
                note(gettext('Created new branch.'))
56
58
        else:
58
60
 
59
61
 
60
62
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
61
 
                      overwrite=False, remember=False, stacked_on=None, create_prefix=False,
62
 
                      use_existing_dir=False, no_tree=False, lossy=False):
 
63
    overwrite=False, remember=False, stacked_on=None, create_prefix=False,
 
64
    use_existing_dir=False, no_tree=False, lossy=False):
63
65
    """Push a branch to a location.
64
66
 
65
67
    :param br_from: the source branch
79
81
        directory exists without a current control directory in it
80
82
    :param lossy: Allow lossy push
81
83
    """
82
 
    to_transport = transport.get_transport(location, purpose='write')
 
84
    to_transport = transport.get_transport(location)
83
85
    try:
84
86
        dir_to = controldir.ControlDir.open_from_transport(to_transport)
85
87
    except errors.NotBranchError:
89
91
    if dir_to is None:
90
92
        try:
91
93
            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:
96
 
            raise errors.CommandError(gettext(
 
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 as err:
 
98
            raise errors.BzrCommandError(gettext(
97
99
                "Target directory %s already contains a .bzr directory, "
98
100
                "but it is not valid.") % (location,))
99
 
        except errors.FileExists:
 
101
        except errors.FileExists as err:
100
102
            if not use_existing_dir:
101
 
                raise errors.CommandError(gettext("Target directory %s"
102
 
                                                     " already exists, but does not have a .bzr"
103
 
                                                     " directory. Supply --use-existing-dir to push"
104
 
                                                     " there anyway.") % location)
 
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)
105
107
            # This shouldn't occur, but if it does the FileExists error will be
106
108
            # more informative than an UnboundLocalError for br_to.
107
109
            raise
108
110
        except errors.NoSuchFile:
109
111
            if not create_prefix:
110
 
                raise errors.CommandError(gettext("Parent directory of %s"
111
 
                                                     " does not exist."
112
 
                                                     "\nYou may supply --create-prefix to create all"
113
 
                                                     " leading parent directories.")
114
 
                                             % location)
 
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)
115
117
            # This shouldn't occur (because create_prefix is true, so
116
118
            # create_clone_on_transport should be catching NoSuchFile and
117
119
            # creating the missing directories) but if it does the original
119
121
            # UnboundLocalError for br_to.
120
122
            raise
121
123
        except errors.TooManyRedirections:
122
 
            raise errors.CommandError(gettext("Too many redirections trying "
123
 
                                                 "to make %s.") % location)
 
124
            raise errors.BzrCommandError(gettext("Too many redirections trying "
 
125
                                         "to make %s.") % location)
124
126
        push_result = PushResult()
125
127
        # TODO: Some more useful message about what was copied
126
128
        try:
134
136
        push_result.old_revno = 0
135
137
        # Remembers if asked explicitly or no previous location is set
136
138
        if (remember
137
 
                or (remember is None and br_from.get_push_location() is None)):
 
139
            or (remember is None and br_from.get_push_location() is None)):
138
140
            # FIXME: Should be done only if we succeed ? -- vila 2012-01-18
139
141
            br_from.set_push_location(br_to.base)
140
142
    else:
143
145
                    "already exists at the destination location.")
144
146
        try:
145
147
            push_result = dir_to.push_branch(br_from, revision_id, overwrite,
146
 
                                             remember, create_prefix, lossy=lossy)
 
148
                remember, create_prefix, lossy=lossy)
147
149
        except errors.DivergedBranches:
148
 
            raise errors.CommandError(gettext('These branches have diverged.'
149
 
                                                 '  See "brz help diverged-branches"'
150
 
                                                 ' for more information.'))
 
150
            raise errors.BzrCommandError(gettext('These branches have diverged.'
 
151
                                    '  See "brz help diverged-branches"'
 
152
                                    ' for more information.'))
151
153
        except errors.NoRoundtrippingSupport as e:
152
 
            raise errors.CommandError(
153
 
                gettext("It is not possible to losslessly "
154
 
                        "push to %s. You may want to use --lossy.") %
155
 
                e.target_branch.mapping.vcs.abbreviation)
 
154
            raise errors.BzrCommandError(gettext("It is not possible to losslessly "
 
155
                "push to %s. You may want to use dpush instead.") % 
 
156
                    e.target_branch.mapping.vcs.abbreviation)
156
157
        except errors.NoRepositoryPresent:
157
158
            # we have a controldir but no branch or repository
158
159
            # XXX: Figure out what to do other than complain.
159
 
            raise errors.CommandError(gettext("At %s you have a valid .bzr"
160
 
                                                 " control directory, but not a branch or repository. This"
161
 
                                                 " is an unsupported configuration. Please move the target"
162
 
                                                 " directory out of the way and try again.") % location)
163
 
        if push_result.workingtree_updated is False:
164
 
            warning("This transport does not update the working "
 
160
            raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
 
161
                " control directory, but not a branch or repository. This"
 
162
                " is an unsupported configuration. Please move the target"
 
163
                " directory out of the way and try again.") % location)
 
164
        if push_result.workingtree_updated == False:
 
165
            warning("This transport does not update the working " 
165
166
                    "tree of: %s. See 'brz help working-trees' for "
166
167
                    "more information." % push_result.target_branch.base)
167
168
    push_result.report(to_file)
168
169
    if verbose:
169
170
        br_to = push_result.target_branch
170
 
        with br_to.lock_read():
 
171
        br_to.lock_read()
 
172
        try:
171
173
            from .log import show_branch_change
172
 
            show_branch_change(br_to, to_file, push_result.old_revno,
 
174
            show_branch_change(br_to, to_file, push_result.old_revno, 
173
175
                               push_result.old_revid)
 
176
        finally:
 
177
            br_to.unlock()
 
178
 
 
179