← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-14 16:54:26 UTC
  • mfrom: (6216.1.1 remove-this-file)
  • Revision ID: pqm@pqm.ubuntu.com-20111014165426-tjix4e6idryf1r2z
(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)

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
 
 
21
19
from bzrlib import (
22
20
    controldir,
23
21
    errors,
92
90
                revision_id=revision_id, stacked_on=stacked_on,
93
91
                create_prefix=create_prefix, use_existing_dir=use_existing_dir,
94
92
                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,))
99
93
        except errors.FileExists, err:
 
94
            if err.path.endswith('/.bzr'):
 
95
                raise errors.BzrCommandError(gettext(
 
96
                    "Target directory %s already contains a .bzr directory, "
 
97
                    "but it is not valid.") % (location,))
100
98
            if not use_existing_dir:
101
99
                raise errors.BzrCommandError(gettext("Target directory %s"
102
100
                     " already exists, but does not have a .bzr"