← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-16 13:39:39 UTC
  • mto: (5923.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5925.
  • Revision ID: jelmer@samba.org-20110516133939-8u1pc9utas3uw1lt
https://launchpad.net/bugs/592083
Require a unicode prompt to be passed into all methods that prompt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
220
220
def _get_object_and_label(control_dir):
221
221
    """Return the primary object and type label for a control directory.
222
222
 
223
 
    :return: object, label where:
224
 
      * object is a Branch, Repository or WorkingTree and
225
 
      * label is one of:
226
 
        * branch            - a branch
227
 
        * repository        - a repository
228
 
        * tree              - a lightweight checkout
 
223
    :return: object, label where
 
224
      object is a Branch, Repository or WorkingTree and
 
225
      label is one of:
 
226
        branch            - a branch
 
227
        repository        - a repository
 
228
        tree              - a lightweight checkout
229
229
    """
230
230
    try:
231
231
        try: