/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-11-17 00:47:52 UTC
  • mfrom: (7182 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20181117004752-6ywampe5pfywlby4
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/push.py
52
52
        if self.branch_push_result is None:
53
53
            if self.stacked_on is not None:
54
54
                note(gettext('Created new stacked branch referring to %s.') %
55
 
                    self.stacked_on)
 
55
                     self.stacked_on)
56
56
            else:
57
57
                note(gettext('Created new branch.'))
58
58
        else:
60
60
 
61
61
 
62
62
def _show_push_branch(br_from, revision_id, location, to_file, verbose=False,
63
 
    overwrite=False, remember=False, stacked_on=None, create_prefix=False,
64
 
    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):
65
65
    """Push a branch to a location.
66
66
 
67
67
    :param br_from: the source branch
91
91
    if dir_to is None:
92
92
        try:
93
93
            br_to = br_from.create_clone_on_transport(to_transport,
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:
 
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
98
            raise errors.BzrCommandError(gettext(
99
99
                "Target directory %s already contains a .bzr directory, "
100
100
                "but it is not valid.") % (location,))
101
 
        except errors.FileExists as err:
 
101
        except errors.FileExists:
102
102
            if not use_existing_dir:
103
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)
 
104
                                                     " already exists, but does not have a .bzr"
 
105
                                                     " directory. Supply --use-existing-dir to push"
 
106
                                                     " there anyway.") % location)
107
107
            # This shouldn't occur, but if it does the FileExists error will be
108
108
            # more informative than an UnboundLocalError for br_to.
109
109
            raise
110
110
        except errors.NoSuchFile:
111
111
            if not create_prefix:
112
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)
 
113
                                                     " does not exist."
 
114
                                                     "\nYou may supply --create-prefix to create all"
 
115
                                                     " leading parent directories.")
 
116
                                             % location)
117
117
            # This shouldn't occur (because create_prefix is true, so
118
118
            # create_clone_on_transport should be catching NoSuchFile and
119
119
            # creating the missing directories) but if it does the original
122
122
            raise
123
123
        except errors.TooManyRedirections:
124
124
            raise errors.BzrCommandError(gettext("Too many redirections trying "
125
 
                                         "to make %s.") % location)
 
125
                                                 "to make %s.") % location)
126
126
        push_result = PushResult()
127
127
        # TODO: Some more useful message about what was copied
128
128
        try:
136
136
        push_result.old_revno = 0
137
137
        # Remembers if asked explicitly or no previous location is set
138
138
        if (remember
139
 
            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)):
140
140
            # FIXME: Should be done only if we succeed ? -- vila 2012-01-18
141
141
            br_from.set_push_location(br_to.base)
142
142
    else:
145
145
                    "already exists at the destination location.")
146
146
        try:
147
147
            push_result = dir_to.push_branch(br_from, revision_id, overwrite,
148
 
                remember, create_prefix, lossy=lossy)
 
148
                                             remember, create_prefix, lossy=lossy)
149
149
        except errors.DivergedBranches:
150
150
            raise errors.BzrCommandError(gettext('These branches have diverged.'
151
 
                                    '  See "brz help diverged-branches"'
152
 
                                    ' for more information.'))
 
151
                                                 '  See "brz help diverged-branches"'
 
152
                                                 ' for more information.'))
153
153
        except errors.NoRoundtrippingSupport as e:
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)
 
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)
157
158
        except errors.NoRepositoryPresent:
158
159
            # we have a controldir but no branch or repository
159
160
            # XXX: Figure out what to do other than complain.
160
161
            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)
 
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)
164
165
        if push_result.workingtree_updated == False:
165
 
            warning("This transport does not update the working " 
 
166
            warning("This transport does not update the working "
166
167
                    "tree of: %s. See 'brz help working-trees' for "
167
168
                    "more information." % push_result.target_branch.base)
168
169
    push_result.report(to_file)
171
172
        br_to.lock_read()
172
173
        try:
173
174
            from .log import show_branch_change
174
 
            show_branch_change(br_to, to_file, push_result.old_revno, 
 
175
            show_branch_change(br_to, to_file, push_result.old_revno,
175
176
                               push_result.old_revid)
176
177
        finally:
177
178
            br_to.unlock()
178
 
 
179