/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
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,
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
22
    revision,
0.200.82 by Jelmer Vernooij
Support listing tags.
23
    tag,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
24
    )
25
from bzrlib.decorators import needs_read_lock
26
0.200.111 by Jelmer Vernooij
Merge bzr-foreign.
27
from bzrlib.plugins.git.foreign import ForeignBranch
0.200.97 by Jelmer Vernooij
use mapping object.
28
from bzrlib.plugins.git.mapping import default_mapping
0.200.20 by John Arbash Meinel
All tests are passing again
29
0.200.82 by Jelmer Vernooij
Support listing tags.
30
class GitTagDict(tag.BasicTags):
31
0.200.89 by Jelmer Vernooij
Support sprouting branches.
32
    def __init__(self, branch):
33
        self.branch = branch
34
        self.repository = branch.repository
0.200.82 by Jelmer Vernooij
Support listing tags.
35
36
    def get_tag_dict(self):
37
        ret = {}
0.200.180 by Jelmer Vernooij
Simplify tag handling.
38
        for k,v in self.repository._git.tags.iteritems():
39
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
0.200.82 by Jelmer Vernooij
Support listing tags.
40
        return ret
41
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
42
    def set_tag(self, name, revid):
0.200.181 by Jelmer Vernooij
Support setting tags.
43
        self.repository._git.tags[name] = revid
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
44
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
45
46
class GitBranchConfig(config.BranchConfig):
47
    """BranchConfig that uses locations.conf in place of branch.conf"""
48
49
    def __init__(self, branch):
50
        config.BranchConfig.__init__(self, branch)
51
        # do not provide a BranchDataConfig
52
        self.option_sources = self.option_sources[0], self.option_sources[2]
53
54
    def set_user_option(self, name, value, local=False):
55
        """Force local to True"""
56
        config.BranchConfig.set_user_option(self, name, value, local=True)
57
58
59
class GitBranchFormat(branch.BranchFormat):
60
0.200.70 by Jelmer Vernooij
Implement GitBranchFormat.get_format_description.
61
    def get_format_description(self):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
62
        return 'Git Branch'
63
0.200.82 by Jelmer Vernooij
Support listing tags.
64
    def supports_tags(self):
65
        return True
66
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
67
0.200.111 by Jelmer Vernooij
Merge bzr-foreign.
68
class GitBranch(ForeignBranch):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
69
    """An adapter to git repositories for bzr Branch objects."""
70
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
71
    def __init__(self, bzrdir, repository, name, head, lockfiles):
0.200.82 by Jelmer Vernooij
Support listing tags.
72
        self.repository = repository
0.200.112 by Jelmer Vernooij
Fix the build.
73
        super(GitBranch, self).__init__(default_mapping)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
74
        self.control_files = lockfiles
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
75
        self.bzrdir = bzrdir
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
76
        self.name = name
0.200.57 by Jelmer Vernooij
Fix more tests.
77
        self.head = head
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
78
        self.base = bzrdir.transport.base
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
79
        self._format = GitBranchFormat()
80
81
    def lock_write(self):
82
        self.control_files.lock_write()
83
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
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
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
92
    def set_parent(self, url):
93
        pass
94
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
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
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
107
    @needs_read_lock
108
    def last_revision(self):
109
        # perhaps should escape this ?
0.200.57 by Jelmer Vernooij
Fix more tests.
110
        if self.head is None:
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
111
            return revision.NULL_REVISION
0.200.112 by Jelmer Vernooij
Fix the build.
112
        return self.mapping.revision_id_foreign_to_bzr(self.head)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
113
0.200.82 by Jelmer Vernooij
Support listing tags.
114
    def _make_tags(self):
0.200.89 by Jelmer Vernooij
Support sprouting branches.
115
        return GitTagDict(self)
0.200.82 by Jelmer Vernooij
Support listing tags.
116
0.200.57 by Jelmer Vernooij
Fix more tests.
117
    def _gen_revision_history(self):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
118
        if self.head is None:
119
            return []
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
120
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
121
        ret.reverse()
0.200.57 by Jelmer Vernooij
Fix more tests.
122
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
123
124
    def get_config(self):
125
        return GitBranchConfig(self)
126
127
    def get_push_location(self):
128
        """See Branch.get_push_location."""
129
        push_loc = self.get_config().get_user_option('push_location')
130
        return push_loc
131
132
    def set_push_location(self, location):
133
        """See Branch.set_push_location."""
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
134
        self.get_config().set_user_option('push_location', location,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
135
                                          local=True)
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
136
137
    def supports_tags(self):
0.200.82 by Jelmer Vernooij
Support listing tags.
138
        return True
0.200.96 by Jelmer Vernooij
Fix branch.
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