/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
35
35
 
36
36
    def get_tag_dict(self):
37
37
        ret = {}
38
 
        for tag in self.repository._git.tags:
39
 
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
38
        for k,v in self.repository._git.tags.iteritems():
 
39
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
40
40
        return ret
41
41
 
42
42
    def set_tag(self, name, revid):
43
 
        raise NotImplementedError(self.set_tag)
 
43
        self.repository._git.tags[name] = revid
44
44
 
45
45
 
46
46
class GitBranchConfig(config.BranchConfig):
68
68
class GitBranch(ForeignBranch):
69
69
    """An adapter to git repositories for bzr Branch objects."""
70
70
 
71
 
    def __init__(self, bzrdir, repository, head, base, lockfiles):
 
71
    def __init__(self, bzrdir, repository, name, head, lockfiles):
72
72
        self.repository = repository
73
73
        super(GitBranch, self).__init__(default_mapping)
74
74
        self.control_files = lockfiles
75
75
        self.bzrdir = bzrdir
 
76
        self.name = name
76
77
        self.head = head
77
 
        self.base = base
 
78
        self.base = bzrdir.transport.base
78
79
        self._format = GitBranchFormat()
79
80
 
80
81
    def lock_write(self):
81
82
        self.control_files.lock_write()
82
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
 
83
107
    @needs_read_lock
84
108
    def last_revision(self):
85
109
        # perhaps should escape this ?
90
114
    def _make_tags(self):
91
115
        return GitTagDict(self)
92
116
 
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
117
    def _gen_revision_history(self):
101
118
        if self.head is None:
102
119
            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
 
120
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
118
121
        ret.reverse()
119
122
        return ret
120
123
 
121
124
    def get_config(self):
122
125
        return GitBranchConfig(self)
123
126
 
124
 
    def lock_read(self):
125
 
        self.control_files.lock_read()
126
 
 
127
 
    def unlock(self):
128
 
        self.control_files.unlock()
129
 
 
130
 
    def get_physical_lock_status(self):
131
 
        return False
132
 
 
133
127
    def get_push_location(self):
134
128
        """See Branch.get_push_location."""
135
129
        push_loc = self.get_config().get_user_option('push_location')