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

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
git_branch.py
1
 
# Copyright (C) 2007 Canonical Ltd
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
"""An adapter between a Git Branch and a Bazaar Branch"""
18
 
 
19
 
from bzrlib import (
20
 
    branch,
21
 
    config,
22
 
    revision,
23
 
    tag,
24
 
    )
25
 
from bzrlib.decorators import needs_read_lock
26
 
 
27
 
from bzrlib.plugins.git import ids
28
 
 
29
 
class GitTagDict(tag.BasicTags):
30
 
 
31
 
    def __init__(self, branch):
32
 
        self.branch = branch
33
 
        self.repository = branch.repository
34
 
 
35
 
    def get_tag_dict(self):
36
 
        ret = {}
37
 
        for tag in self.repository._git.tags:
38
 
            ret[tag.name] = ids.convert_revision_id_git_to_bzr(tag.commit.id)
39
 
        return ret
40
 
 
41
 
    def set_tag(self, name, revid):
42
 
        raise NotImplementedError(self.set_tag)
43
 
 
44
 
 
45
 
class GitBranchConfig(config.BranchConfig):
46
 
    """BranchConfig that uses locations.conf in place of branch.conf"""
47
 
 
48
 
    def __init__(self, branch):
49
 
        config.BranchConfig.__init__(self, branch)
50
 
        # do not provide a BranchDataConfig
51
 
        self.option_sources = self.option_sources[0], self.option_sources[2]
52
 
 
53
 
    def set_user_option(self, name, value, local=False):
54
 
        """Force local to True"""
55
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
56
 
 
57
 
 
58
 
class GitBranchFormat(branch.BranchFormat):
59
 
 
60
 
    def get_format_description(self):
61
 
        return 'Git Branch'
62
 
 
63
 
    def supports_tags(self):
64
 
        return True
65
 
 
66
 
 
67
 
class GitBranch(branch.Branch):
68
 
    """An adapter to git repositories for bzr Branch objects."""
69
 
 
70
 
    def __init__(self, bzrdir, repository, head, base, lockfiles):
71
 
        self.repository = repository
72
 
        super(GitBranch, self).__init__()
73
 
        self.control_files = lockfiles
74
 
        self.bzrdir = bzrdir
75
 
        self.head = head
76
 
        self.base = base
77
 
        self._format = GitBranchFormat()
78
 
 
79
 
    def lock_write(self):
80
 
        self.control_files.lock_write()
81
 
 
82
 
    @needs_read_lock
83
 
    def last_revision(self):
84
 
        # perhaps should escape this ?
85
 
        if self.head is None:
86
 
            return revision.NULL_REVISION
87
 
        return ids.convert_revision_id_git_to_bzr(self.head)
88
 
 
89
 
    def _make_tags(self):
90
 
        return GitTagDict(self)
91
 
 
92
 
    def get_parent(self):
93
 
        """See Branch.get_parent()."""
94
 
        return None
95
 
 
96
 
    def get_stacked_on_url(self):
97
 
        return None
98
 
 
99
 
    def _gen_revision_history(self):
100
 
        if self.head is None:
101
 
            return []
102
 
        skip = 0
103
 
        cms = None
104
 
        ret = []
105
 
        max_count = 1000
106
 
        nextid = self.head
107
 
        while cms != []:
108
 
            cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
109
 
            skip += max_count
110
 
            for cm in cms:
111
 
                if cm.id == nextid:
112
 
                    ret.append(ids.convert_revision_id_git_to_bzr(cm.id))
113
 
                    if cm.parents == []:
114
 
                        nextid = None
115
 
                    else:
116
 
                        nextid = cm.parents[0].id
117
 
        ret.reverse()
118
 
        return ret
119
 
 
120
 
    def get_config(self):
121
 
        return GitBranchConfig(self)
122
 
 
123
 
    def lock_read(self):
124
 
        self.control_files.lock_read()
125
 
 
126
 
    def unlock(self):
127
 
        self.control_files.unlock()
128
 
 
129
 
    def get_physical_lock_status(self):
130
 
        return False
131
 
 
132
 
    def get_push_location(self):
133
 
        """See Branch.get_push_location."""
134
 
        push_loc = self.get_config().get_user_option('push_location')
135
 
        return push_loc
136
 
 
137
 
    def set_push_location(self, location):
138
 
        """See Branch.set_push_location."""
139
 
        self.get_config().set_user_option('push_location', location,
140
 
                                          local=True)
141
 
 
142
 
    def supports_tags(self):
143
 
        return True