/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
1
# Copyright (C) 2008-2012 Canonical Ltd
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
16
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""UI helper for the push command."""
18
6379.6.3 by Jelmer Vernooij
Use absolute_import.
19
from __future__ import absolute_import
20
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
21
from . import (
6734.1.11 by Jelmer Vernooij
Move UnstackableBranchFormat.
22
    branch as _mod_branch,
6207.3.3 by jelmer at samba
Fix tests and the like.
23
    controldir,
3978.3.13 by Jelmer Vernooij
Store the pushed branches' URL rather than the URL of the branch itself.
24
    errors,
25
    revision as _mod_revision,
26
    transport,
27
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
28
from .trace import (
3978.3.13 by Jelmer Vernooij
Store the pushed branches' URL rather than the URL of the branch itself.
29
    note,
30
    warning,
31
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
32
from .i18n import gettext
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
33
34
4053.3.2 by Jelmer Vernooij
Use PushResult in push.py.
35
class PushResult(object):
36
    """Result of a push operation.
37
38
    :ivar branch_push_result: Result of a push between branches
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
39
    :ivar target_branch: The target branch
4053.3.2 by Jelmer Vernooij
Use PushResult in push.py.
40
    :ivar stacked_on: URL of the branch on which the result is stacked
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
41
    :ivar workingtree_updated: Whether or not the target workingtree was updated.
4053.3.2 by Jelmer Vernooij
Use PushResult in push.py.
42
    """
43
44
    def __init__(self):
45
        self.branch_push_result = None
46
        self.stacked_on = None
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
47
        self.workingtree_updated = None
48
        self.target_branch = None
4053.3.2 by Jelmer Vernooij
Use PushResult in push.py.
49
50
    def report(self, to_file):
51
        """Write a human-readable description of the result."""
52
        if self.branch_push_result is None:
53
            if self.stacked_on is not None:
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
54
                note(gettext('Created new stacked branch referring to %s.') %
4053.3.2 by Jelmer Vernooij
Use PushResult in push.py.
55
                    self.stacked_on)
56
            else:
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
57
                note(gettext('Created new branch.'))
4053.3.2 by Jelmer Vernooij
Use PushResult in push.py.
58
        else:
59
            self.branch_push_result.report(to_file)
60
61
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
62
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
63
    overwrite=False, remember=False, stacked_on=None, create_prefix=False,
6929.14.1 by Jelmer Vernooij
add --lossy option to 'bzr push'.
64
    use_existing_dir=False, no_tree=False, lossy=False):
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
65
    """Push a branch to a location.
66
67
    :param br_from: the source branch
68
    :param revision_id: the revision-id to push up to
69
    :param location: the url of the destination
70
    :param to_file: the output stream
71
    :param verbose: if True, display more output than normal
6159.2.4 by Jelmer Vernooij
Add --overwrite-tags flag.
72
    :param overwrite: list of things to overwrite ("history", "tags")
73
        or boolean indicating for everything
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
74
    :param remember: if True, store the location as the push location for
75
        the source branch
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
76
    :param stacked_on: the url of the branch, if any, to stack on;
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
77
        if set, only the revisions not in that branch are pushed
78
    :param create_prefix: if True, create the necessary parent directories
79
        at the destination if they don't already exist
80
    :param use_existing_dir: if True, proceed even if the destination
6681.2.4 by Jelmer Vernooij
More renames.
81
        directory exists without a current control directory in it
6929.14.1 by Jelmer Vernooij
add --lossy option to 'bzr push'.
82
    :param lossy: Allow lossy push
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
83
    """
84
    to_transport = transport.get_transport(location)
85
    try:
6207.3.3 by jelmer at samba
Fix tests and the like.
86
        dir_to = controldir.ControlDir.open_from_transport(to_transport)
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
87
    except errors.NotBranchError:
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
88
        # Didn't find anything
89
        dir_to = None
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
90
91
    if dir_to is None:
4294.2.6 by Robert Collins
Report errors back in the UI layer for push, to use the url the user gave us.
92
        try:
93
            br_to = br_from.create_clone_on_transport(to_transport,
94
                revision_id=revision_id, stacked_on=stacked_on,
5448.6.2 by Matthew Gordon
Tested push --no-tree ang gor it working right.
95
                create_prefix=create_prefix, use_existing_dir=use_existing_dir,
96
                no_tree=no_tree)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
97
        except errors.AlreadyControlDirError as err:
6437.10.5 by Jelmer Vernooij
FIx test - remove some no longer necessary special casing.
98
            raise errors.BzrCommandError(gettext(
99
                "Target directory %s already contains a .bzr directory, "
100
                "but it is not valid.") % (location,))
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
101
        except errors.FileExists as err:
4294.2.6 by Robert Collins
Report errors back in the UI layer for push, to use the url the user gave us.
102
            if not use_existing_dir:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
103
                raise errors.BzrCommandError(gettext("Target directory %s"
4634.105.1 by Andrew Bennetts
Fix traceback when doing 'bzr push --use-existing-dir' into a dir with an invalid .bzr directory.
104
                     " already exists, but does not have a .bzr"
4294.2.6 by Robert Collins
Report errors back in the UI layer for push, to use the url the user gave us.
105
                     " directory. Supply --use-existing-dir to push"
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
106
                     " there anyway.") % location)
4634.105.2 by Andrew Bennetts
Clearer code and error message.
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
4294.2.6 by Robert Collins
Report errors back in the UI layer for push, to use the url the user gave us.
110
        except errors.NoSuchFile:
111
            if not create_prefix:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
112
                raise errors.BzrCommandError(gettext("Parent directory of %s"
4294.2.6 by Robert Collins
Report errors back in the UI layer for push, to use the url the user gave us.
113
                    " does not exist."
114
                    "\nYou may supply --create-prefix to create all"
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
115
                    " leading parent directories.")
4294.2.6 by Robert Collins
Report errors back in the UI layer for push, to use the url the user gave us.
116
                    % location)
4634.129.2 by Andrew Bennetts
Add NEWS entry and elaborate comment, as suggested in Martin's review.
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.
4634.129.1 by Andrew Bennetts
Propagate the NoSuchFile error in show_push_branch when create_prefix is True, because a user reports that it can happen somehow.
122
            raise
4294.2.6 by Robert Collins
Report errors back in the UI layer for push, to use the url the user gave us.
123
        except errors.TooManyRedirections:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
124
            raise errors.BzrCommandError(gettext("Too many redirections trying "
125
                                         "to make %s.") % location)
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
126
        push_result = PushResult()
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
127
        # TODO: Some more useful message about what was copied
3650.5.2 by Aaron Bentley
Always show stacked message if stacking done.
128
        try:
3978.3.3 by Jelmer Vernooij
Use PushResult everywhere.
129
            push_result.stacked_on = br_to.get_stacked_on_url()
6734.1.11 by Jelmer Vernooij
Move UnstackableBranchFormat.
130
        except (_mod_branch.UnstackableBranchFormat,
3650.5.2 by Aaron Bentley
Always show stacked message if stacking done.
131
                errors.UnstackableRepositoryFormat,
132
                errors.NotStacked):
3978.3.3 by Jelmer Vernooij
Use PushResult everywhere.
133
            push_result.stacked_on = None
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
134
        push_result.target_branch = br_to
3978.3.13 by Jelmer Vernooij
Store the pushed branches' URL rather than the URL of the branch itself.
135
        push_result.old_revid = _mod_revision.NULL_REVISION
136
        push_result.old_revno = 0
5861.1.11 by Vincent Ladeuil
Add news entry and same comments.
137
        # Remembers if asked explicitly or no previous location is set
5861.1.9 by Vincent Ladeuil
Fix --no-remember for the first push.
138
        if (remember
139
            or (remember is None and br_from.get_push_location() is None)):
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
140
            # FIXME: Should be done only if we succeed ? -- vila 2012-01-18
141
            br_from.set_push_location(br_to.base)
3978.3.2 by Jelmer Vernooij
Move most of push to IterGenericBranchBzrDir.
142
    else:
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
143
        if stacked_on is not None:
3221.19.4 by Ian Clatworthy
shallow -> stacked
144
            warning("Ignoring request for a stacked branch as repository "
3221.19.2 by Ian Clatworthy
tweaks to ui during review by igc
145
                    "already exists at the destination location.")
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
146
        try:
6929.14.1 by Jelmer Vernooij
add --lossy option to 'bzr push'.
147
            push_result = dir_to.push_branch(br_from, revision_id, overwrite,
148
                remember, create_prefix, lossy=lossy)
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
149
        except errors.DivergedBranches:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
150
            raise errors.BzrCommandError(gettext('These branches have diverged.'
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
151
                                    '  See "brz help diverged-branches"'
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
152
                                    ' for more information.'))
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
153
        except errors.NoRoundtrippingSupport as e:
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
154
            raise errors.BzrCommandError(gettext("It is not possible to losslessly "
155
                "push to %s. You may want to use dpush instead.") % 
4925.1.1 by Jelmer Vernooij
Print a proper error when attempting to push to a foreign VCS for which
156
                    e.target_branch.mapping.vcs.abbreviation)
3978.3.13 by Jelmer Vernooij
Store the pushed branches' URL rather than the URL of the branch itself.
157
        except errors.NoRepositoryPresent:
6207.3.3 by jelmer at samba
Fix tests and the like.
158
            # we have a controldir but no branch or repository
3978.3.13 by Jelmer Vernooij
Store the pushed branches' URL rather than the URL of the branch itself.
159
            # XXX: Figure out what to do other than complain.
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
160
            raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
3978.3.13 by Jelmer Vernooij
Store the pushed branches' URL rather than the URL of the branch itself.
161
                " control directory, but not a branch or repository. This"
162
                " is an unsupported configuration. Please move the target"
6138.3.7 by Jonathan Riddell
add gettext() to BzrCommandError uses
163
                " directory out of the way and try again.") % location)
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
164
        if push_result.workingtree_updated == False:
3978.3.2 by Jelmer Vernooij
Move most of push to IterGenericBranchBzrDir.
165
            warning("This transport does not update the working " 
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
166
                    "tree of: %s. See 'brz help working-trees' for "
3978.3.2 by Jelmer Vernooij
Move most of push to IterGenericBranchBzrDir.
167
                    "more information." % push_result.target_branch.base)
3978.3.3 by Jelmer Vernooij
Use PushResult everywhere.
168
    push_result.report(to_file)
3848.1.19 by Aaron Bentley
Show log for non-initial push -v
169
    if verbose:
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
170
        br_to = push_result.target_branch
3848.1.18 by Aaron Bentley
Update push to use show_branch_change
171
        br_to.lock_read()
172
        try:
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
173
            from .log import show_branch_change
3978.3.13 by Jelmer Vernooij
Store the pushed branches' URL rather than the URL of the branch itself.
174
            show_branch_change(br_to, to_file, push_result.old_revno, 
175
                               push_result.old_revid)
3848.1.18 by Aaron Bentley
Update push to use show_branch_change
176
        finally:
177
            br_to.unlock()
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
178
179