← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Aaron Bentley
  • Date: 2007-05-18 18:32:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2528.
  • Revision ID: aaron.bentley@utoronto.ca-20070518183214-b7qfkw9z0ou5egmi
Change separator from '/' to 'or'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
380
380
    """Determine the format of an existing control directory
381
381
 
382
382
    Several candidates may be found.  If so, the names are returned as a
383
 
    single string, separated by slashes.
 
383
    single string, separated by ' or '.
384
384
 
385
385
    If no matching candidate is found, "unnamed" is returned.
386
386
    """
414
414
        bzrdir.format_registry.get_info(c).hidden]
415
415
    if len(new_candidates) > 0:
416
416
        candidates = new_candidates
417
 
    return ' / '.join(candidates)
 
417
    return ' or '.join(candidates)
418
418
 
419
419
@deprecated_function(zero_eight)
420
420
def show_info(b):