/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 changes, open index.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007-2008 Canonical Ltd
 
1
# Copyright (C) 2007 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
19
19
from bzrlib import errors, foreign
20
20
from bzrlib.inventory import ROOT_ID
21
21
from bzrlib.foreign import (
22
 
        ForeignVcs, 
23
 
        VcsMappingRegistry, 
24
22
        ForeignRevision,
25
23
        )
26
24
 
 
25
 
27
26
def escape_file_id(file_id):
28
27
    return file_id.replace('_', '__').replace(' ', '_s')
29
28
 
36
35
    """Class that maps between Git and Bazaar semantics."""
37
36
    experimental = False
38
37
 
39
 
    def __init__(self):
40
 
        super(BzrGitMapping, self).__init__(foreign_git)
41
 
 
42
 
    def __eq__(self, other):
43
 
        return type(self) == type(other) and self.revid_prefix == other.revid_prefix
44
 
 
45
 
    @classmethod
46
 
    def revision_id_foreign_to_bzr(cls, git_rev_id):
 
38
    def revision_id_foreign_to_bzr(self, git_rev_id):
47
39
        """Convert a git revision id handle to a Bazaar revision id."""
48
 
        return "%s:%s" % (cls.revid_prefix, git_rev_id)
 
40
        return "%s:%s" % (self.revid_prefix, git_rev_id)
49
41
 
50
 
    @classmethod
51
 
    def revision_id_bzr_to_foreign(cls, bzr_rev_id):
 
42
    def revision_id_bzr_to_foreign(self, bzr_rev_id):
52
43
        """Convert a Bazaar revision id to a git revision id handle."""
53
 
        if not bzr_rev_id.startswith("%s:" % cls.revid_prefix):
54
 
            raise errors.InvalidRevisionId(bzr_rev_id, cls)
55
 
        return bzr_rev_id[len(cls.revid_prefix)+1:], cls()
 
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 }
56
50
 
57
51
    def generate_file_id(self, path):
58
52
        if path == "":
76
70
        rev.timezone = 0
77
71
        return rev
78
72
 
79
 
    def export_commit(self, rev, tree_sha):
80
 
        """Turn a Bazaar revision in to a Git commit
81
 
 
82
 
        :param tree_sha: HACK parameter (until we can retrieve this from the mapping)
83
 
        :return dulwich.objects.Commit represent the revision:
84
 
        """
85
 
        from dulwich.objects import Commit
86
 
        commit = Commit()
87
 
        commit._tree = tree_sha
88
 
        for p in rev.parent_ids:
89
 
            commit._parents.append(self.revision_id_bzr_to_foreign(p))
90
 
        commit._message = rev.message
91
 
        commit._committer = rev.committer
92
 
        if 'author' in rev.properties:
93
 
            commit._author = rev.properties['author']
94
 
        else:
95
 
            commit._author = rev.committer
96
 
        commit._commit_time = long(rev.timestamp)
97
 
        commit.serialize()
98
 
        return commit
99
 
 
100
 
 
101
 
class BzrGitMappingv1(BzrGitMapping):
102
 
    revid_prefix = 'git-v1'
103
 
    experimental = False
104
 
 
105
 
 
106
 
class BzrGitMappingExperimental(BzrGitMappingv1):
 
73
 
 
74
class BzrGitMappingExperimental(BzrGitMapping):
107
75
    revid_prefix = 'git-experimental'
108
76
    experimental = True
109
77
 
110
78
 
111
 
class GitMappingRegistry(VcsMappingRegistry):
112
 
 
113
 
    def revision_id_bzr_to_foreign(self, bzr_revid):
114
 
        if not bzr_revid.startswith("git-"):
115
 
            raise errors.InvalidRevisionId(bzr_revid, None)
116
 
        (mapping_version, git_sha) = bzr_revid.split(":", 1)
117
 
        mapping = self.get(mapping_version)
118
 
        return mapping.revision_id_bzr_to_foreign(bzr_revid)
119
 
 
120
 
    parse_revision_id = revision_id_bzr_to_foreign
121
 
 
122
 
 
123
 
mapping_registry = GitMappingRegistry()
124
 
mapping_registry.register_lazy('git-v1', "bzrlib.plugins.git.mapping",
125
 
                                   "BzrGitMappingv1")
126
 
mapping_registry.register_lazy('git-experimental', "bzrlib.plugins.git.mapping",
127
 
                                   "BzrGitMappingExperimental")
128
 
 
129
 
 
130
 
class ForeignGit(ForeignVcs):
131
 
    """Foreign Git."""
132
 
 
133
 
    def __init__(self):
134
 
        super(ForeignGit, self).__init__(mapping_registry)
135
 
 
136
 
    @classmethod
137
 
    def show_foreign_revid(cls, foreign_revid):
138
 
        return { "git commit": foreign_revid }
139
 
 
140
 
 
141
 
foreign_git = ForeignGit()
142
 
default_mapping = BzrGitMappingv1()
 
79
default_mapping = BzrGitMappingExperimental()