/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 new dulwich.

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.foreign import (
 
21
        ForeignRevision,
 
22
        )
 
23
 
 
24
 
 
25
def escape_file_id(file_id):
 
26
    return file_id.replace('_', '__').replace(' ', '_s')
 
27
 
 
28
 
 
29
def unescape_file_id(file_id):
 
30
    return file_id.replace("_s", " ").replace("__", "_")
20
31
 
21
32
 
22
33
class BzrGitMapping(foreign.VcsMapping):
36
47
    def show_foreign_revid(self, foreign_revid):
37
48
        return { "git commit": foreign_revid }
38
49
 
 
50
    def generate_file_id(self, path):
 
51
        return escape_file_id(path.encode('utf-8'))
 
52
 
 
53
    def import_commit(self, commit):
 
54
        """Convert a git commit to a bzr revision.
 
55
 
 
56
        :return: a `bzrlib.revision.Revision` object.
 
57
        """
 
58
        if commit is None:
 
59
            raise AssertionError("Commit object can't be None")
 
60
        rev = ForeignRevision(commit.id, self, self.revision_id_foreign_to_bzr(commit.id))
 
61
        rev.parent_ids = tuple([self.revision_id_foreign_to_bzr(p) for p in commit.parents])
 
62
        rev.message = commit.message.decode("utf-8", "replace")
 
63
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
64
        if commit.committer != commit.author:
 
65
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
66
        rev.timestamp = commit.commit_time
 
67
        rev.timezone = 0
 
68
        return rev
 
69
 
39
70
 
40
71
class BzrGitMappingExperimental(BzrGitMapping):
41
72
    revid_prefix = 'git-experimental'