/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
 
from bzrlib.inventory import ROOT_ID
21
 
from bzrlib.foreign import (
22
 
        ForeignRevision,
23
 
        )
24
 
 
25
 
 
26
 
def escape_file_id(file_id):
27
 
    return file_id.replace('_', '__').replace(' ', '_s')
28
 
 
29
 
 
30
 
def unescape_file_id(file_id):
31
 
    return file_id.replace("_s", " ").replace("__", "_")
32
 
 
33
 
 
34
 
class BzrGitMapping(foreign.VcsMapping):
 
19
class BzrGitMapping(object):
35
20
    """Class that maps between Git and Bazaar semantics."""
36
21
    experimental = False
 
22
    namespace = None
37
23
 
38
 
    def revision_id_foreign_to_bzr(self, git_rev_id):
 
24
    def convert_revision_id_git_to_bzr(self, git_rev_id):
39
25
        """Convert a git revision id handle to a Bazaar revision id."""
40
 
        return "%s:%s" % (self.revid_prefix, git_rev_id)
 
26
        return "%s:%s" % (self.namespace, git_rev_id)
41
27
 
42
 
    def revision_id_bzr_to_foreign(self, bzr_rev_id):
 
28
    def convert_revision_id_bzr_to_git(self, bzr_rev_id):
43
29
        """Convert a Bazaar revision id to a git revision id handle."""
44
 
        if not bzr_rev_id.startswith("%s:" % self.revid_prefix):
45
 
            raise errors.InvalidRevisionId(bzr_rev_id, self)
46
 
        return bzr_rev_id[len(self.revid_prefix)+1:]
47
 
 
48
 
    def show_foreign_revid(self, foreign_revid):
49
 
        return { "git commit": foreign_revid }
50
 
 
51
 
    def generate_file_id(self, path):
52
 
        if path == "":
53
 
            return ROOT_ID
54
 
        return escape_file_id(path.encode('utf-8'))
55
 
 
56
 
    def import_commit(self, commit):
57
 
        """Convert a git commit to a bzr revision.
58
 
 
59
 
        :return: a `bzrlib.revision.Revision` object.
60
 
        """
61
 
        if commit is None:
62
 
            raise AssertionError("Commit object can't be None")
63
 
        rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
64
 
        rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
65
 
        rev.message = commit.message.decode("utf-8", "replace")
66
 
        rev.committer = str(commit.committer).decode("utf-8", "replace")
67
 
        if commit.committer != commit.author:
68
 
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
69
 
        rev.timestamp = commit.commit_time
70
 
        rev.timezone = 0
71
 
        return rev
 
30
        assert bzr_rev_id.startswith("%s:" % self.namespace)
 
31
        return bzr_rev_id[len(self.namespace)+1:]
72
32
 
73
33
 
74
34
class BzrGitMappingExperimental(BzrGitMapping):
75
 
    revid_prefix = 'git-experimental'
76
 
    experimental = True
 
35
    namespace = 'git-experimental'
77
36
 
78
37
 
79
38
default_mapping = BzrGitMappingExperimental()