← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/directory_service.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/directory_service.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
to true URLs.  Examples include lp:urls and per-user location aliases.
21
21
"""
22
22
 
23
 
from bzrlib import errors, registry
 
23
from __future__ import absolute_import
 
24
 
 
25
from bzrlib import (
 
26
    errors,
 
27
    registry,
 
28
    )
24
29
from bzrlib.lazy_import import lazy_import
25
30
lazy_import(globals(), """
26
 
from bzrlib.branch import Branch
27
 
from bzrlib import urlutils
 
31
from bzrlib import (
 
32
    branch as _mod_branch,
 
33
    controldir as _mod_controldir,
 
34
    urlutils,
 
35
    )
28
36
""")
29
37
 
30
38
 
59
67
 
60
68
directories = DirectoryServiceRegistry()
61
69
 
62
 
 
63
70
class AliasDirectory(object):
64
71
    """Directory lookup for locations associated with a branch.
65
72
 
67
74
    supported.  On error, a subclass of DirectoryLookupFailure will be raised.
68
75
    """
69
76
 
 
77
    branch_aliases = registry.Registry()
 
78
    branch_aliases.register('parent', lambda b: b.get_parent(),
 
79
        help="The parent of this branch.")
 
80
    branch_aliases.register('submit', lambda b: b.get_submit_branch(),
 
81
        help="The submit branch for this branch.")
 
82
    branch_aliases.register('public', lambda b: b.get_public_branch(),
 
83
        help="The public location of this branch.")
 
84
    branch_aliases.register('bound', lambda b: b.get_bound_location(),
 
85
        help="The branch this branch is bound to, for bound branches.")
 
86
    branch_aliases.register('push', lambda b: b.get_push_location(),
 
87
        help="The saved location used for `bzr push` with no arguments.")
 
88
    branch_aliases.register('this', lambda b: b.base,
 
89
        help="This branch.")
 
90
 
70
91
    def look_up(self, name, url):
71
 
        branch = Branch.open_containing('.')[0]
72
 
        lookups = {
73
 
            'parent': branch.get_parent,
74
 
            'submit': branch.get_submit_branch,
75
 
            'public': branch.get_public_branch,
76
 
            'bound': branch.get_bound_location,
77
 
            'push': branch.get_push_location,
78
 
            'this': lambda: branch.base
79
 
        }
 
92
        branch = _mod_branch.Branch.open_containing('.')[0]
80
93
        parts = url.split('/', 1)
81
94
        if len(parts) == 2:
82
95
            name, extra = parts
84
97
            (name,) = parts
85
98
            extra = None
86
99
        try:
87
 
            method = lookups[name[1:]]
 
100
            method = self.branch_aliases.get(name[1:])
88
101
        except KeyError:
89
102
            raise errors.InvalidLocationAlias(url)
90
103
        else:
91
 
            result = method()
 
104
            result = method(branch)
92
105
        if result is None:
93
106
            raise errors.UnsetLocationAlias(url)
94
107
        if extra is not None:
95
108
            result = urlutils.join(result, extra)
96
109
        return result
97
110
 
 
111
    @classmethod
 
112
    def help_text(cls, topic):
 
113
        alias_lines = []
 
114
        for key in cls.branch_aliases.keys():
 
115
            help = cls.branch_aliases.get_help(key)
 
116
            alias_lines.append("  :%-10s%s\n" % (key, help))
 
117
        return """\
 
118
Location aliases
 
119
================
 
120
 
 
121
Bazaar defines several aliases for locations associated with a branch.  These
 
122
can be used with most commands that expect a location, such as `bzr push`.
 
123
 
 
124
The aliases are::
 
125
 
 
126
%s
 
127
For example, to push to the parent location::
 
128
 
 
129
    bzr push :parent
 
130
""" % "".join(alias_lines)
 
131
 
 
132
 
98
133
directories.register(':', AliasDirectory,
99
134
                     'Easy access to remembered branch locations')
 
135
 
 
136
 
 
137
class ColocatedDirectory(object):
 
138
    """Directory lookup for colocated branches.
 
139
 
 
140
    co:somename will resolve to the colocated branch with "somename" in
 
141
    the current directory.
 
142
    """
 
143
 
 
144
    def look_up(self, name, url):
 
145
        dir = _mod_controldir.ControlDir.open_containing('.')[0]
 
146
        return urlutils.join_segment_parameters(dir.user_url,
 
147
            {"branch": urlutils.escape(name)})
 
148
 
 
149
 
 
150
directories.register('co:', ColocatedDirectory,
 
151
                     'Easy access to colocated branches')
 
152