/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
19
19
from bzrlib import (
20
20
    branch,
21
21
    config,
 
22
    revision,
 
23
    tag,
22
24
    )
23
25
from bzrlib.decorators import needs_read_lock
24
26
 
 
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)
 
44
 
25
45
 
26
46
class GitBranchConfig(config.BranchConfig):
27
47
    """BranchConfig that uses locations.conf in place of branch.conf"""
38
58
 
39
59
class GitBranchFormat(branch.BranchFormat):
40
60
 
41
 
    def get_branch_description(self):
 
61
    def get_format_description(self):
42
62
        return 'Git Branch'
43
63
 
44
 
 
45
 
class GitBranch(branch.Branch):
 
64
    def supports_tags(self):
 
65
        return True
 
66
 
 
67
 
 
68
class GitBranch(ForeignBranch):
46
69
    """An adapter to git repositories for bzr Branch objects."""
47
70
 
48
 
    def __init__(self, gitdir, lockfiles):
49
 
        from bzrlib.plugins.git.gitlib import git_repository
50
 
        self.bzrdir = gitdir
 
71
    def __init__(self, bzrdir, repository, head, base, lockfiles):
 
72
        self.repository = repository
 
73
        super(GitBranch, self).__init__(default_mapping)
51
74
        self.control_files = lockfiles
52
 
        self.repository = git_repository.GitRepository(gitdir, lockfiles)
53
 
        self.base = gitdir.root_transport.base
54
 
        if '.git' not in gitdir.root_transport.list_dir('.'):
55
 
            raise errors.NotBranchError(self.base)
 
75
        self.bzrdir = bzrdir
 
76
        self.head = head
 
77
        self.base = base
56
78
        self._format = GitBranchFormat()
57
79
 
58
80
    def lock_write(self):
61
83
    @needs_read_lock
62
84
    def last_revision(self):
63
85
        # perhaps should escape this ?
64
 
        return bzrrevid_from_git(self.repository.git.get_head())
65
 
 
66
 
    @needs_read_lock
67
 
    def revision_history(self):
68
 
        node = self.last_revision()
69
 
        ancestors = self.repository.get_revision_graph(node)
70
 
        history = []
71
 
        while node is not None:
72
 
            history.append(node)
73
 
            if len(ancestors[node]) > 0:
74
 
                node = ancestors[node][0]
75
 
            else:
76
 
                node = None
77
 
        return list(reversed(history))
 
86
        if self.head is None:
 
87
            return 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:
 
102
            return []
 
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
78
120
 
79
121
    def get_config(self):
80
122
        return GitBranchConfig(self)
85
127
    def unlock(self):
86
128
        self.control_files.unlock()
87
129
 
 
130
    def get_physical_lock_status(self):
 
131
        return False
 
132
 
88
133
    def get_push_location(self):
89
134
        """See Branch.get_push_location."""
90
135
        push_loc = self.get_config().get_user_option('push_location')
92
137
 
93
138
    def set_push_location(self, location):
94
139
        """See Branch.set_push_location."""
95
 
        self.get_config().set_user_option('push_location', location, 
 
140
        self.get_config().set_user_option('push_location', location,
96
141
                                          local=True)
97
142
 
 
143
    def supports_tags(self):
 
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
98
152