← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Sidnei da Silva
  • Date: 2009-05-29 14:19:29 UTC
  • mto: (4531.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4532.
  • Revision ID: sidnei.da.silva@canonical.com-20090529141929-3heywbvj36po72a5
- Add initial config

Show diffs side-by-side

added added

removed removed

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