/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to mapping.py

Fix formatting, remove catch-all for exceptions when opening local repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mapping.py
17
17
"""Converters, etc for going between Bazaar and Git ids."""
18
18
 
19
19
from bzrlib import errors, foreign
20
 
from bzrlib.inventory import ROOT_ID
21
20
from bzrlib.foreign import (
22
 
        ForeignVcs, 
23
 
        VcsMappingRegistry, 
24
21
        ForeignRevision,
25
22
        )
26
23
 
37
34
    """Class that maps between Git and Bazaar semantics."""
38
35
    experimental = False
39
36
 
40
 
    def __eq__(self, other):
41
 
        return type(self) == type(other) and self.revid_prefix == other.revid_prefix
42
 
 
43
 
    @classmethod
44
 
    def revision_id_foreign_to_bzr(cls, git_rev_id):
 
37
    def revision_id_foreign_to_bzr(self, git_rev_id):
45
38
        """Convert a git revision id handle to a Bazaar revision id."""
46
 
        return "%s:%s" % (cls.revid_prefix, git_rev_id)
 
39
        return "%s:%s" % (self.revid_prefix, git_rev_id)
47
40
 
48
 
    @classmethod
49
 
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
 
41
    def revision_id_bzr_to_foreign(self, bzr_rev_id):
50
42
        """Convert a Bazaar revision id to a git revision id handle."""
51
 
        if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
52
 
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
53
 
        return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
 
43
        if not bzr_rev_id.startswith("%s:" % self.revid_prefix):
 
44
            raise errors.InvalidRevisionId(bzr_rev_id, self)
 
45
        return bzr_rev_id[len(self.revid_prefix)+1:]
54
46
 
55
 
    @classmethod
56
 
    def show_foreign_revid(cls, foreign_revid):
 
47
    def show_foreign_revid(self, foreign_revid):
57
48
        return { "git commit": foreign_revid }
58
49
 
59
50
    def generate_file_id(self, path):
60
 
        if path == "":
61
 
            return ROOT_ID
62
51
        return escape_file_id(path.encode('utf-8'))
63
52
 
64
53
    def import_commit(self, commit):
79
68
        return rev
80
69
 
81
70
 
82
 
class BzrGitMappingv1(BzrGitMapping):
83
 
    revid_prefix = 'git-v1'
84
 
    experimental = False
85
 
 
86
 
 
87
 
class BzrGitMappingExperimental(BzrGitMappingv1):
 
71
class BzrGitMappingExperimental(BzrGitMapping):
88
72
    revid_prefix = 'git-experimental'
89
73
    experimental = True
90
74
 
91
75
 
92
 
class GitMappingRegistry(VcsMappingRegistry):
93
 
 
94
 
    def revision_id_bzr_to_foreign(self, bzr_revid):
95
 
        if not bzr_revid.startswith("git-"):
96
 
            raise errors.InvalidRevisionId(bzr_revid, None)
97
 
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
98
 
        mapping = self.get(mapping_version)
99
 
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
100
 
 
101
 
    parse_revision_id = revision_id_bzr_to_foreign
102
 
 
103
 
 
104
 
mapping_registry = GitMappingRegistry()
105
 
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
106
 
                                   "BzrGitMappingv1")
107
 
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
108
 
                                   "BzrGitMappingExperimental")
109
 
 
110
 
 
111
 
class ForeignGit(ForeignVcs):
112
 
    """Foreign Git."""
113
 
 
114
 
    def __init__(self):
115
 
        super(ForeignGit, self).__init__(mapping_registry)
116
 
 
117
 
 
118
 
default_mapping = BzrGitMappingv1()
119
 
foreign_git = ForeignGit()
 
76
default_mapping = BzrGitMappingExperimental()