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 |
|
|
0.200.194
by Jelmer Vernooij
Look for commit object in heavyweight tags. |
26 |
from bzrlib.trace import mutter |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
27 |
|
|
0.200.111
by Jelmer Vernooij
Merge bzr-foreign. |
28 |
from bzrlib.plugins.git.foreign import ForeignBranch |
|
0.200.20
by John Arbash Meinel
All tests are passing again |
29 |
|
|
0.200.194
by Jelmer Vernooij
Look for commit object in heavyweight tags. |
30 |
from dulwich.objects import ( |
31 |
Commit, |
|
32 |
Tag, |
|
33 |
)
|
|
34 |
||
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
35 |
class GitTagDict(tag.BasicTags): |
36 |
||
|
0.200.89
by Jelmer Vernooij
Support sprouting branches. |
37 |
def __init__(self, branch): |
38 |
self.branch = branch |
|
39 |
self.repository = branch.repository |
|
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
40 |
|
41 |
def get_tag_dict(self): |
|
42 |
ret = {} |
|
|
0.200.180
by Jelmer Vernooij
Simplify tag handling. |
43 |
for k,v in self.repository._git.tags.iteritems(): |
|
0.200.194
by Jelmer Vernooij
Look for commit object in heavyweight tags. |
44 |
obj = self.repository._git.get_object(v) |
45 |
while isinstance(obj, Tag): |
|
46 |
v = obj.object[1] |
|
47 |
obj = self.repository._git.get_object(v) |
|
48 |
if not isinstance(obj, Commit): |
|
49 |
mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj) |
|
50 |
continue
|
|
|
0.200.180
by Jelmer Vernooij
Simplify tag handling. |
51 |
ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v) |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
52 |
return ret |
53 |
||
|
0.200.86
by Jelmer Vernooij
Clearer error when setting tags. |
54 |
def set_tag(self, name, revid): |
|
0.200.181
by Jelmer Vernooij
Support setting tags. |
55 |
self.repository._git.tags[name] = revid |
|
0.200.86
by Jelmer Vernooij
Clearer error when setting tags. |
56 |
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
57 |
|
58 |
class GitBranchConfig(config.BranchConfig): |
|
59 |
"""BranchConfig that uses locations.conf in place of branch.conf""" |
|
60 |
||
61 |
def __init__(self, branch): |
|
62 |
config.BranchConfig.__init__(self, branch) |
|
63 |
# do not provide a BranchDataConfig
|
|
64 |
self.option_sources = self.option_sources[0], self.option_sources[2] |
|
65 |
||
66 |
def set_user_option(self, name, value, local=False): |
|
67 |
"""Force local to True""" |
|
68 |
config.BranchConfig.set_user_option(self, name, value, local=True) |
|
69 |
||
70 |
||
71 |
class GitBranchFormat(branch.BranchFormat): |
|
72 |
||
|
0.200.70
by Jelmer Vernooij
Implement GitBranchFormat.get_format_description. |
73 |
def get_format_description(self): |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
74 |
return 'Git Branch' |
75 |
||
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
76 |
def supports_tags(self): |
77 |
return True |
|
78 |
||
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
79 |
|
|
0.200.111
by Jelmer Vernooij
Merge bzr-foreign. |
80 |
class GitBranch(ForeignBranch): |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
81 |
"""An adapter to git repositories for bzr Branch objects.""" |
82 |
||
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
83 |
def __init__(self, bzrdir, repository, name, head, lockfiles): |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
84 |
self.repository = repository |
|
0.222.1
by Jelmer Vernooij
Retrieve mapping from repository rather than just using the default mapping. |
85 |
super(GitBranch, self).__init__(repository.get_mapping()) |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
86 |
self.control_files = lockfiles |
|
0.200.59
by Jelmer Vernooij
Add more tests, fix revision history. |
87 |
self.bzrdir = bzrdir |
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
88 |
self.name = name |
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
89 |
self.head = head |
|
0.200.143
by Jelmer Vernooij
Reoncile InterGitRepository objects. |
90 |
self.base = bzrdir.transport.base |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
91 |
self._format = GitBranchFormat() |
92 |
||
93 |
def lock_write(self): |
|
94 |
self.control_files.lock_write() |
|
95 |
||
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
96 |
def get_stacked_on_url(self): |
97 |
# Git doesn't do stacking (yet...)
|
|
98 |
return None |
|
99 |
||
100 |
def get_parent(self): |
|
101 |
"""See Branch.get_parent().""" |
|
102 |
return None |
|
103 |
||
|
0.200.175
by Jelmer Vernooij
Add optimized handling when fetching from git to git. |
104 |
def set_parent(self, url): |
105 |
pass
|
|
106 |
||
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
107 |
def lock_read(self): |
108 |
self.control_files.lock_read() |
|
109 |
||
110 |
def unlock(self): |
|
111 |
self.control_files.unlock() |
|
112 |
||
113 |
def get_physical_lock_status(self): |
|
114 |
return False |
|
115 |
||
116 |
||
117 |
class LocalGitBranch(GitBranch): |
|
118 |
||
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
119 |
@needs_read_lock
|
120 |
def last_revision(self): |
|
121 |
# perhaps should escape this ?
|
|
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
122 |
if self.head is None: |
|
0.200.19
by John Arbash Meinel
More refactoring. Add some direct tests for GitModel. |
123 |
return revision.NULL_REVISION |
|
0.200.112
by Jelmer Vernooij
Fix the build. |
124 |
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. |
125 |
|
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
126 |
def _make_tags(self): |
|
0.200.89
by Jelmer Vernooij
Support sprouting branches. |
127 |
return GitTagDict(self) |
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
128 |
|
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
129 |
def _gen_revision_history(self): |
|
0.200.58
by Jelmer Vernooij
Fix remaining tests. |
130 |
if self.head is None: |
131 |
return [] |
|
|
0.200.131
by Jelmer Vernooij
Fix all tests but two, use rich roots by default. |
132 |
ret = list(self.repository.iter_reverse_revision_history(self.last_revision())) |
|
0.200.59
by Jelmer Vernooij
Add more tests, fix revision history. |
133 |
ret.reverse() |
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
134 |
return ret |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
135 |
|
136 |
def get_config(self): |
|
137 |
return GitBranchConfig(self) |
|
138 |
||
139 |
def get_push_location(self): |
|
140 |
"""See Branch.get_push_location.""" |
|
141 |
push_loc = self.get_config().get_user_option('push_location') |
|
142 |
return push_loc |
|
143 |
||
144 |
def set_push_location(self, location): |
|
145 |
"""See Branch.set_push_location.""" |
|
|
0.200.19
by John Arbash Meinel
More refactoring. Add some direct tests for GitModel. |
146 |
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. |
147 |
local=True) |
|
0.200.43
by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity. |
148 |
|
149 |
def supports_tags(self): |
|
|
0.200.82
by Jelmer Vernooij
Support listing tags. |
150 |
return True |
|
0.200.96
by Jelmer Vernooij
Fix branch. |
151 |
|
152 |
def sprout(self, to_bzrdir, revision_id=None): |
|
153 |
"""See Branch.sprout().""" |
|
154 |
result = to_bzrdir.create_branch() |
|
155 |
self.copy_content_into(result, revision_id=revision_id) |
|
156 |
result.set_parent(self.bzrdir.root_transport.base) |
|
157 |
return result |
|
158 |