/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: 2020-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

Show diffs side-by-side

added added

removed removed

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