← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Jelmer Vernooij
  • Date: 2011-09-26 15:21:01 UTC
  • mfrom: (6165.2.3 avoid-revision-history)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20110926152101-afcxw1hikybyivfd
merge avoid-revision-history.

Show diffs side-by-side

added added

removed removed

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