/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
25
25
from bzrlib.decorators import needs_read_lock
26
26
 
27
27
from bzrlib.plugins.git.foreign import ForeignBranch
 
28
from bzrlib.plugins.git.mapping import default_mapping
28
29
 
29
30
class GitTagDict(tag.BasicTags):
30
31
 
34
35
 
35
36
    def get_tag_dict(self):
36
37
        ret = {}
37
 
        for k,v in self.repository._git.tags.iteritems():
38
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
38
        for tag in self.repository._git.tags:
 
39
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
39
40
        return ret
40
41
 
41
42
    def set_tag(self, name, revid):
42
 
        self.repository._git.tags[name] = revid
 
43
        raise NotImplementedError(self.set_tag)
43
44
 
44
45
 
45
46
class GitBranchConfig(config.BranchConfig):
67
68
class GitBranch(ForeignBranch):
68
69
    """An adapter to git repositories for bzr Branch objects."""
69
70
 
70
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
71
    def __init__(self, bzrdir, repository, head, base, lockfiles):
71
72
        self.repository = repository
72
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
73
        super(GitBranch, self).__init__(default_mapping)
73
74
        self.control_files = lockfiles
74
75
        self.bzrdir = bzrdir
75
 
        self.name = name
76
76
        self.head = head
77
 
        self.base = bzrdir.transport.base
 
77
        self.base = base
78
78
        self._format = GitBranchFormat()
79
79
 
80
80
    def lock_write(self):
81
81
        self.control_files.lock_write()
82
82
 
83
 
    def get_stacked_on_url(self):
84
 
        # Git doesn't do stacking (yet...)
85
 
        return None
86
 
 
87
 
    def get_parent(self):
88
 
        """See Branch.get_parent()."""
89
 
        return None
90
 
 
91
 
    def set_parent(self, url):
92
 
        pass
93
 
 
94
 
    def lock_read(self):
95
 
        self.control_files.lock_read()
96
 
 
97
 
    def unlock(self):
98
 
        self.control_files.unlock()
99
 
 
100
 
    def get_physical_lock_status(self):
101
 
        return False
102
 
 
103
 
 
104
 
class LocalGitBranch(GitBranch):
105
 
 
106
83
    @needs_read_lock
107
84
    def last_revision(self):
108
85
        # perhaps should escape this ?
113
90
    def _make_tags(self):
114
91
        return GitTagDict(self)
115
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
 
116
100
    def _gen_revision_history(self):
117
101
        if self.head is None:
118
102
            return []
123
107
    def get_config(self):
124
108
        return GitBranchConfig(self)
125
109
 
 
110
    def lock_read(self):
 
111
        self.control_files.lock_read()
 
112
 
 
113
    def unlock(self):
 
114
        self.control_files.unlock()
 
115
 
 
116
    def get_physical_lock_status(self):
 
117
        return False
 
118
 
126
119
    def get_push_location(self):
127
120
        """See Branch.get_push_location."""
128
121
        push_loc = self.get_config().get_user_option('push_location')