/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 bzrlib/push.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 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
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,
90
88
            br_to = br_from.create_clone_on_transport(to_transport,
91
89
                revision_id=revision_id, stacked_on=stacked_on,
92
90
                create_prefix=create_prefix, use_existing_dir=use_existing_dir)
93
 
        except errors.FileExists:
 
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
96
            if not use_existing_dir:
95
97
                raise errors.BzrCommandError("Target directory %s"
96
 
                     " already exists, but does not have a valid .bzr"
 
98
                     " already exists, but does not have a .bzr"
97
99
                     " directory. Supply --use-existing-dir to push"
98
100
                     " there anyway." % location)
 
101
            # This shouldn't occur, but if it does the FileExists error will be
 
102
            # more informative than an UnboundLocalError for br_to.
 
103
            raise
99
104
        except errors.NoSuchFile:
100
105
            if not create_prefix:
101
106
                raise errors.BzrCommandError("Parent directory of %s"
103
108
                    "\nYou may supply --create-prefix to create all"
104
109
                    " leading parent directories."
105
110
                    % location)
 
111
            # This shouldn't occur (because create_prefix is true, so
 
112
            # create_clone_on_transport should be catching NoSuchFile and
 
113
            # creating the missing directories) but if it does the original
 
114
            # NoSuchFile error will be more informative than an
 
115
            # UnboundLocalError for br_to.
 
116
            raise
106
117
        except errors.TooManyRedirections:
107
118
            raise errors.BzrCommandError("Too many redirections trying "
108
119
                                         "to make %s." % location)
125
136
                    "already exists at the destination location.")
126
137
        try:
127
138
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
128
 
                remember)
 
139
                remember, create_prefix)
129
140
        except errors.DivergedBranches:
130
141
            raise errors.BzrCommandError('These branches have diverged.'
131
 
                                    '  Try using "merge" and then "push".')
 
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)
132
148
        except errors.NoRepositoryPresent:
133
149
            # we have a bzrdir but no branch or repository
134
150
            # XXX: Figure out what to do other than complain.