/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 branch.py

Merge new dulwich.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
20
20
    branch,
21
21
    config,
22
22
    revision,
 
23
    tag,
23
24
    )
24
25
from bzrlib.decorators import needs_read_lock
25
26
 
26
 
from bzrlib.plugins.git import ids
 
27
from bzrlib.plugins.git.foreign import ForeignBranch
 
28
from bzrlib.plugins.git.mapping import default_mapping
 
29
 
 
30
class GitTagDict(tag.BasicTags):
 
31
 
 
32
    def __init__(self, branch):
 
33
        self.branch = branch
 
34
        self.repository = branch.repository
 
35
 
 
36
    def get_tag_dict(self):
 
37
        ret = {}
 
38
        for tag in self.repository._git.tags:
 
39
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
40
        return ret
 
41
 
 
42
    def set_tag(self, name, revid):
 
43
        raise NotImplementedError(self.set_tag)
27
44
 
28
45
 
29
46
class GitBranchConfig(config.BranchConfig):
41
58
 
42
59
class GitBranchFormat(branch.BranchFormat):
43
60
 
44
 
    def get_branch_description(self):
 
61
    def get_format_description(self):
45
62
        return 'Git Branch'
46
63
 
47
 
 
48
 
class GitBranch(branch.Branch):
 
64
    def supports_tags(self):
 
65
        return True
 
66
 
 
67
 
 
68
class GitBranch(ForeignBranch):
49
69
    """An adapter to git repositories for bzr Branch objects."""
50
70
 
51
 
    def __init__(self, gitdir, lockfiles):
52
 
        super(GitBranch, self).__init__()
53
 
        from bzrlib.plugins.git import git_repository
54
 
        self.bzrdir = gitdir
 
71
    def __init__(self, bzrdir, repository, head, base, lockfiles):
 
72
        self.repository = repository
 
73
        super(GitBranch, self).__init__(default_mapping)
55
74
        self.control_files = lockfiles
56
 
        self.repository = git_repository.GitRepository(gitdir, lockfiles)
57
 
        self.base = gitdir.root_transport.base
58
 
        if '.git' not in gitdir.root_transport.list_dir('.'):
59
 
            raise errors.NotBranchError(self.base)
 
75
        self.bzrdir = bzrdir
 
76
        self.head = head
 
77
        self.base = base
60
78
        self._format = GitBranchFormat()
61
79
 
62
80
    def lock_write(self):
65
83
    @needs_read_lock
66
84
    def last_revision(self):
67
85
        # perhaps should escape this ?
68
 
        head_git_id = self.repository._git.get_head()
69
 
        if head_git_id is None:
 
86
        if self.head is None:
70
87
            return revision.NULL_REVISION
71
 
        return ids.convert_revision_id_git_to_bzr(head_git_id)
72
 
 
73
 
    @needs_read_lock
74
 
    def revision_history(self):
75
 
        node = self.last_revision()
76
 
        if node == revision.NULL_REVISION:
 
88
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
89
 
 
90
    def _make_tags(self):
 
91
        return GitTagDict(self)
 
92
 
 
93
    def get_parent(self):
 
94
        """See Branch.get_parent()."""
 
95
        return None
 
96
 
 
97
    def get_stacked_on_url(self):
 
98
        return None
 
99
 
 
100
    def _gen_revision_history(self):
 
101
        if self.head is None:
77
102
            return []
78
 
        ancestors = self.repository.get_revision_graph(node)
79
 
        history = []
80
 
        while node is not None:
81
 
            history.append(node)
82
 
            if len(ancestors[node]) > 0:
83
 
                node = ancestors[node][0]
84
 
            else:
85
 
                node = None
86
 
        return list(reversed(history))
 
103
        skip = 0
 
104
        cms = None
 
105
        ret = []
 
106
        max_count = 1000
 
107
        nextid = self.head
 
108
        while cms != []:
 
109
            cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
 
110
            skip += max_count
 
111
            for cm in cms:
 
112
                if cm.id == nextid:
 
113
                    ret.append(self.mapping.revision_id_foreign_to_bzr(cm.id))
 
114
                    if cm.parents == []:
 
115
                        nextid = None
 
116
                    else:
 
117
                        nextid = cm.parents[0].id
 
118
        ret.reverse()
 
119
        return ret
87
120
 
88
121
    def get_config(self):
89
122
        return GitBranchConfig(self)
94
127
    def unlock(self):
95
128
        self.control_files.unlock()
96
129
 
 
130
    def get_physical_lock_status(self):
 
131
        return False
 
132
 
97
133
    def get_push_location(self):
98
134
        """See Branch.get_push_location."""
99
135
        push_loc = self.get_config().get_user_option('push_location')
105
141
                                          local=True)
106
142
 
107
143
    def supports_tags(self):
108
 
        return False
 
144
        return True
 
145
 
 
146
    def sprout(self, to_bzrdir, revision_id=None):
 
147
        """See Branch.sprout()."""
 
148
        result = to_bzrdir.create_branch()
 
149
        self.copy_content_into(result, revision_id=revision_id)
 
150
        result.set_parent(self.bzrdir.root_transport.base)
 
151
        return result
 
152