/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 bzr-foreign.

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 k,v in self.repository._git.tags.iteritems():
 
39
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
40
        return ret
 
41
 
 
42
    def set_tag(self, name, revid):
 
43
        self.repository._git.tags[name] = revid
27
44
 
28
45
 
29
46
class GitBranchConfig(config.BranchConfig):
44
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, bzrdir, repository, head, base, lockfiles):
52
 
        super(GitBranch, self).__init__()
 
71
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
72
        self.repository = repository
 
73
        super(GitBranch, self).__init__(default_mapping)
53
74
        self.control_files = lockfiles
54
75
        self.bzrdir = bzrdir
55
 
        self.repository = repository
 
76
        self.name = name
56
77
        self.head = head
57
 
        self.base = base
 
78
        self.base = bzrdir.transport.base
58
79
        self._format = GitBranchFormat()
59
80
 
60
81
    def lock_write(self):
61
82
        self.control_files.lock_write()
62
83
 
 
84
    def get_stacked_on_url(self):
 
85
        # Git doesn't do stacking (yet...)
 
86
        return None
 
87
 
 
88
    def get_parent(self):
 
89
        """See Branch.get_parent()."""
 
90
        return None
 
91
 
 
92
    def set_parent(self, url):
 
93
        pass
 
94
 
 
95
    def lock_read(self):
 
96
        self.control_files.lock_read()
 
97
 
 
98
    def unlock(self):
 
99
        self.control_files.unlock()
 
100
 
 
101
    def get_physical_lock_status(self):
 
102
        return False
 
103
 
 
104
 
 
105
class LocalGitBranch(GitBranch):
 
106
 
63
107
    @needs_read_lock
64
108
    def last_revision(self):
65
109
        # perhaps should escape this ?
66
110
        if self.head is None:
67
111
            return revision.NULL_REVISION
68
 
        return ids.convert_revision_id_git_to_bzr(self.head)
69
 
 
70
 
    def get_parent(self):
71
 
        """See Branch.get_parent()."""
72
 
        return None
73
 
 
74
 
    def get_stacked_on_url(self):
75
 
        return None
 
112
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
113
 
 
114
    def _make_tags(self):
 
115
        return GitTagDict(self)
76
116
 
77
117
    def _gen_revision_history(self):
78
118
        if self.head is None:
79
119
            return []
80
 
        skip = 0
81
 
        cms = None
82
 
        ret = []
83
 
        max_count = 1000
84
 
        nextid = self.head
85
 
        while cms != []:
86
 
            cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
87
 
            skip += max_count
88
 
            for cm in cms:
89
 
                if cm.id == nextid:
90
 
                    ret.append(ids.convert_revision_id_git_to_bzr(cm.id))
91
 
                    if cm.parents == []:
92
 
                        nextid = None
93
 
                    else:
94
 
                        nextid = cm.parents[0].id
 
120
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
95
121
        ret.reverse()
96
122
        return ret
97
123
 
98
124
    def get_config(self):
99
125
        return GitBranchConfig(self)
100
126
 
101
 
    def lock_read(self):
102
 
        self.control_files.lock_read()
103
 
 
104
 
    def unlock(self):
105
 
        self.control_files.unlock()
106
 
 
107
 
    def get_physical_lock_status(self):
108
 
        return False
109
 
 
110
127
    def get_push_location(self):
111
128
        """See Branch.get_push_location."""
112
129
        push_loc = self.get_config().get_user_option('push_location')
118
135
                                          local=True)
119
136
 
120
137
    def supports_tags(self):
121
 
        return False
 
138
        return True
 
139
 
 
140
    def sprout(self, to_bzrdir, revision_id=None):
 
141
        """See Branch.sprout()."""
 
142
        result = to_bzrdir.create_branch()
 
143
        self.copy_content_into(result, revision_id=revision_id)
 
144
        result.set_parent(self.bzrdir.root_transport.base)
 
145
        return result
 
146