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.27
by David Allouche
Flat is better than nested, remove the gitlib hierarchy. |
27 |
from bzrlib.plugins.git import ids |
0.200.20
by John Arbash Meinel
All tests are passing again |
28 |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
29 |
class GitTagDict(tag.BasicTags): |
30 |
||
0.200.89
by Jelmer Vernooij
Support sprouting branches. |
31 |
def __init__(self, branch): |
32 |
self.branch = branch |
|
33 |
self.repository = branch.repository |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
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 |
||
0.200.86
by Jelmer Vernooij
Clearer error when setting tags. |
41 |
def set_tag(self, name, revid): |
42 |
raise NotImplementedError(self.set_tag) |
|
43 |
||
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
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 |
||
0.200.70
by Jelmer Vernooij
Implement GitBranchFormat.get_format_description. |
60 |
def get_format_description(self): |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
61 |
return 'Git Branch' |
62 |
||
0.200.82
by Jelmer Vernooij
Support listing tags. |
63 |
def supports_tags(self): |
64 |
return True |
|
65 |
||
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
66 |
|
67 |
class GitBranch(branch.Branch): |
|
68 |
"""An adapter to git repositories for bzr Branch objects.""" |
|
69 |
||
0.200.59
by Jelmer Vernooij
Add more tests, fix revision history. |
70 |
def __init__(self, bzrdir, repository, head, base, lockfiles): |
0.200.82
by Jelmer Vernooij
Support listing tags. |
71 |
self.repository = repository |
0.200.43
by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity. |
72 |
super(GitBranch, self).__init__() |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
73 |
self.control_files = lockfiles |
0.200.59
by Jelmer Vernooij
Add more tests, fix revision history. |
74 |
self.bzrdir = bzrdir |
0.200.57
by Jelmer Vernooij
Fix more tests. |
75 |
self.head = head |
76 |
self.base = base |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
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 ?
|
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
85 |
if self.head is None: |
0.200.19
by John Arbash Meinel
More refactoring. Add some direct tests for GitModel. |
86 |
return revision.NULL_REVISION |
0.200.58
by Jelmer Vernooij
Fix remaining tests. |
87 |
return ids.convert_revision_id_git_to_bzr(self.head) |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
88 |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
89 |
def _make_tags(self): |
0.200.89
by Jelmer Vernooij
Support sprouting branches. |
90 |
return GitTagDict(self) |
0.200.82
by Jelmer Vernooij
Support listing tags. |
91 |
|
0.200.66
by Jelmer Vernooij
Implement branch.get_parent(). |
92 |
def get_parent(self): |
93 |
"""See Branch.get_parent().""" |
|
94 |
return None |
|
95 |
||
0.200.67
by Jelmer Vernooij
Implement Branch.get_stacked_on_url. |
96 |
def get_stacked_on_url(self): |
97 |
return None |
|
98 |
||
0.200.57
by Jelmer Vernooij
Fix more tests. |
99 |
def _gen_revision_history(self): |
0.200.58
by Jelmer Vernooij
Fix remaining tests. |
100 |
if self.head is None: |
101 |
return [] |
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
102 |
skip = 0 |
0.200.58
by Jelmer Vernooij
Fix remaining tests. |
103 |
cms = None |
104 |
ret = [] |
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
105 |
max_count = 1000 |
0.200.64
by Jelmer Vernooij
Only include mainline when generating revision history. |
106 |
nextid = self.head |
0.200.57
by Jelmer Vernooij
Fix more tests. |
107 |
while cms != []: |
0.200.58
by Jelmer Vernooij
Fix remaining tests. |
108 |
cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip) |
109 |
skip += max_count |
|
0.200.64
by Jelmer Vernooij
Only include mainline when generating revision history. |
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 |
|
0.200.59
by Jelmer Vernooij
Add more tests, fix revision history. |
117 |
ret.reverse() |
0.200.57
by Jelmer Vernooij
Fix more tests. |
118 |
return ret |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
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 |
||
0.200.72
by Jelmer Vernooij
Implement Branch.get_physical_lock_status. |
129 |
def get_physical_lock_status(self): |
130 |
return False |
|
131 |
||
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
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.""" |
|
0.200.19
by John Arbash Meinel
More refactoring. Add some direct tests for GitModel. |
139 |
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. |
140 |
local=True) |
0.200.43
by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity. |
141 |
|
142 |
def supports_tags(self): |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
143 |
return True |