← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/directory_service.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/directory_service.py
20
20
to true URLs.  Examples include lp:urls and per-user location aliases.
21
21
"""
22
22
 
 
23
from __future__ import absolute_import
 
24
 
23
25
from bzrlib import (
24
26
    errors,
25
27
    registry,
64
66
 
65
67
directories = DirectoryServiceRegistry()
66
68
 
67
 
 
68
69
class AliasDirectory(object):
69
70
    """Directory lookup for locations associated with a branch.
70
71
 
72
73
    supported.  On error, a subclass of DirectoryLookupFailure will be raised.
73
74
    """
74
75
 
 
76
    branch_aliases = registry.Registry()
 
77
    branch_aliases.register('parent', lambda b: b.get_parent(),
 
78
        help="The parent of this branch.")
 
79
    branch_aliases.register('submit', lambda b: b.get_submit_branch(),
 
80
        help="The submit branch for this branch.")
 
81
    branch_aliases.register('public', lambda b: b.get_public_branch(),
 
82
        help="The public location of this branch.")
 
83
    branch_aliases.register('bound', lambda b: b.get_bound_location(),
 
84
        help="The branch this branch is bound to, for bound branches.")
 
85
    branch_aliases.register('push', lambda b: b.get_push_location(),
 
86
        help="The saved location used for `bzr push` with no arguments.")
 
87
    branch_aliases.register('this', lambda b: b.base,
 
88
        help="This branch.")
 
89
 
75
90
    def look_up(self, name, url):
76
91
        branch = _mod_branch.Branch.open_containing('.')[0]
77
 
        lookups = {
78
 
            'parent': branch.get_parent,
79
 
            'submit': branch.get_submit_branch,
80
 
            'public': branch.get_public_branch,
81
 
            'bound': branch.get_bound_location,
82
 
            'push': branch.get_push_location,
83
 
            'this': lambda: branch.base
84
 
        }
85
92
        parts = url.split('/', 1)
86
93
        if len(parts) == 2:
87
94
            name, extra = parts
89
96
            (name,) = parts
90
97
            extra = None
91
98
        try:
92
 
            method = lookups[name[1:]]
 
99
            method = self.branch_aliases.get(name[1:])
93
100
        except KeyError:
94
101
            raise errors.InvalidLocationAlias(url)
95
102
        else:
96
 
            result = method()
 
103
            result = method(branch)
97
104
        if result is None:
98
105
            raise errors.UnsetLocationAlias(url)
99
106
        if extra is not None:
100
107
            result = urlutils.join(result, extra)
101
108
        return result
102
109
 
 
110
    @classmethod
 
111
    def help_text(cls, topic):
 
112
        alias_lines = []
 
113
        for key in cls.branch_aliases.keys():
 
114
            help = cls.branch_aliases.get_help(key)
 
115
            alias_lines.append("  :%-10s%s\n" % (key, help))
 
116
        return """\
 
117
Location aliases
 
118
================
 
119
 
 
120
Bazaar defines several aliases for locations associated with a branch.  These
 
121
can be used with most commands that expect a location, such as `bzr push`.
 
122
 
 
123
The aliases are::
 
124
 
 
125
%s
 
126
For example, to push to the parent location::
 
127
 
 
128
    bzr push :parent
 
129
""" % "".join(alias_lines)
 
130
 
 
131
 
103
132
directories.register(':', AliasDirectory,
104
133
                     'Easy access to remembered branch locations')