← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Wouter van Heyst
  • Date: 2012-01-25 21:13:15 UTC
  • mto: (6437.3.27 2.5)
  • mto: This revision was merged to the branch mainline in revision 6451.
  • Revision ID: larstiq@larstiq.dyndns.org-20120125211315-ch74doua37bqet0i
mechanically replace file().write() pattern with a with-keyword version

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
16
16
 
17
17
"""UI helper for the push command."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib import (
20
 
    builtins,
21
 
    branch,
22
 
    bzrdir,
 
22
    controldir,
23
23
    errors,
24
24
    revision as _mod_revision,
25
25
    transport,
28
28
    note,
29
29
    warning,
30
30
    )
 
31
from bzrlib.i18n import gettext
31
32
 
32
33
 
33
34
class PushResult(object):
49
50
        """Write a human-readable description of the result."""
50
51
        if self.branch_push_result is None:
51
52
            if self.stacked_on is not None:
52
 
                note('Created new stacked branch referring to %s.' %
 
53
                note(gettext('Created new stacked branch referring to %s.') %
53
54
                    self.stacked_on)
54
55
            else:
55
 
                note('Created new branch.')
 
56
                note(gettext('Created new branch.'))
56
57
        else:
57
58
            self.branch_push_result.report(to_file)
58
59
 
59
60
 
60
61
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
61
62
    overwrite=False, remember=False, stacked_on=None, create_prefix=False,
62
 
    use_existing_dir=False):
 
63
    use_existing_dir=False, no_tree=False):
63
64
    """Push a branch to a location.
64
65
 
65
66
    :param br_from: the source branch
80
81
    """
81
82
    to_transport = transport.get_transport(location)
82
83
    try:
83
 
        dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
 
84
        dir_to = controldir.ControlDir.open_from_transport(to_transport)
84
85
    except errors.NotBranchError:
85
86
        # Didn't find anything
86
87
        dir_to = None
89
90
        try:
90
91
            br_to = br_from.create_clone_on_transport(to_transport,
91
92
                revision_id=revision_id, stacked_on=stacked_on,
92
 
                create_prefix=create_prefix, use_existing_dir=use_existing_dir)
 
93
                create_prefix=create_prefix, use_existing_dir=use_existing_dir,
 
94
                no_tree=no_tree)
 
95
        except errors.AlreadyControlDirError, err:
 
96
            raise errors.BzrCommandError(gettext(
 
97
                "Target directory %s already contains a .bzr directory, "
 
98
                "but it is not valid.") % (location,))
93
99
        except errors.FileExists, err:
94
 
            if err.path.endswith('/.bzr'):
95
 
                raise errors.BzrCommandError(
96
 
                    "Target directory %s already contains a .bzr directory, "
97
 
                    "but it is not valid." % (location,))
98
100
            if not use_existing_dir:
99
 
                raise errors.BzrCommandError("Target directory %s"
 
101
                raise errors.BzrCommandError(gettext("Target directory %s"
100
102
                     " already exists, but does not have a .bzr"
101
103
                     " directory. Supply --use-existing-dir to push"
102
 
                     " there anyway." % location)
 
104
                     " there anyway.") % location)
103
105
            # This shouldn't occur, but if it does the FileExists error will be
104
106
            # more informative than an UnboundLocalError for br_to.
105
107
            raise
106
108
        except errors.NoSuchFile:
107
109
            if not create_prefix:
108
 
                raise errors.BzrCommandError("Parent directory of %s"
 
110
                raise errors.BzrCommandError(gettext("Parent directory of %s"
109
111
                    " does not exist."
110
112
                    "\nYou may supply --create-prefix to create all"
111
 
                    " leading parent directories."
 
113
                    " leading parent directories.")
112
114
                    % location)
113
115
            # This shouldn't occur (because create_prefix is true, so
114
116
            # create_clone_on_transport should be catching NoSuchFile and
117
119
            # UnboundLocalError for br_to.
118
120
            raise
119
121
        except errors.TooManyRedirections:
120
 
            raise errors.BzrCommandError("Too many redirections trying "
121
 
                                         "to make %s." % location)
 
122
            raise errors.BzrCommandError(gettext("Too many redirections trying "
 
123
                                         "to make %s.") % location)
122
124
        push_result = PushResult()
123
125
        # TODO: Some more useful message about what was copied
124
126
        try:
130
132
        push_result.target_branch = br_to
131
133
        push_result.old_revid = _mod_revision.NULL_REVISION
132
134
        push_result.old_revno = 0
133
 
        if br_from.get_push_location() is None or remember:
 
135
        # Remembers if asked explicitly or no previous location is set
 
136
        if (remember
 
137
            or (remember is None and br_from.get_push_location() is None)):
134
138
            br_from.set_push_location(br_to.base)
135
139
    else:
136
140
        if stacked_on is not None:
140
144
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
141
145
                remember, create_prefix)
142
146
        except errors.DivergedBranches:
143
 
            raise errors.BzrCommandError('These branches have diverged.'
 
147
            raise errors.BzrCommandError(gettext('These branches have diverged.'
144
148
                                    '  See "bzr help diverged-branches"'
145
 
                                    ' for more information.')
 
149
                                    ' for more information.'))
146
150
        except errors.NoRoundtrippingSupport, e:
147
 
            raise errors.BzrCommandError("It is not possible to losslessly "
148
 
                "push to %s. You may want to use dpush instead." % 
 
151
            raise errors.BzrCommandError(gettext("It is not possible to losslessly "
 
152
                "push to %s. You may want to use dpush instead.") % 
149
153
                    e.target_branch.mapping.vcs.abbreviation)
150
154
        except errors.NoRepositoryPresent:
151
 
            # we have a bzrdir but no branch or repository
 
155
            # we have a controldir but no branch or repository
152
156
            # XXX: Figure out what to do other than complain.
153
 
            raise errors.BzrCommandError("At %s you have a valid .bzr"
 
157
            raise errors.BzrCommandError(gettext("At %s you have a valid .bzr"
154
158
                " control directory, but not a branch or repository. This"
155
159
                " is an unsupported configuration. Please move the target"
156
 
                " directory out of the way and try again." % location)
 
160
                " directory out of the way and try again.") % location)
157
161
        if push_result.workingtree_updated == False:
158
162
            warning("This transport does not update the working " 
159
163
                    "tree of: %s. See 'bzr help working-trees' for "