← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

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: