/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

Merge foreign branch utility code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mapping.py
16
16
 
17
17
"""Converters, etc for going between Bazaar and Git ids."""
18
18
 
19
 
from bzrlib import errors, foreign
20
 
 
21
 
 
22
 
class BzrGitMapping(foreign.VcsMapping):
 
19
class BzrGitMapping(object):
23
20
    """Class that maps between Git and Bazaar semantics."""
24
21
    experimental = False
 
22
    namespace = None
25
23
 
26
 
    def revision_id_foreign_to_bzr(self, git_rev_id):
 
24
    def convert_revision_id_git_to_bzr(self, git_rev_id):
27
25
        """Convert a git revision id handle to a Bazaar revision id."""
28
 
        return "%s:%s" % (self.revid_prefix, git_rev_id)
 
26
        return "%s:%s" % (self.namespace, git_rev_id)
29
27
 
30
 
    def revision_id_bzr_to_foreign(self, bzr_rev_id):
 
28
    def convert_revision_id_bzr_to_git(self, bzr_rev_id):
31
29
        """Convert a Bazaar revision id to a git revision id handle."""
32
 
        if not bzr_rev_id.startswith("%s:" % self.revid_prefix):
33
 
            raise errors.InvalidRevisionId(bzr_rev_id, self)
34
 
        return bzr_rev_id[len(self.revid_prefix)+1:]
35
 
 
36
 
    def show_foreign_revid(self, foreign_revid):
37
 
        return { "git commit": foreign_revid }
 
30
        assert bzr_rev_id.startswith("%s:" % self.namespace)
 
31
        return bzr_rev_id[len(self.namespace)+1:]
38
32
 
39
33
 
40
34
class BzrGitMappingExperimental(BzrGitMapping):
41
 
    revid_prefix = 'git-experimental'
42
 
    experimental = True
 
35
    namespace = 'git-experimental'
43
36
 
44
37
 
45
38
default_mapping = BzrGitMappingExperimental()