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
|
|
0.200.252
by Jelmer Vernooij
Clarify history, copyright. |
2 |
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
3 |
#
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
18 |
"""An adapter between a Git Repository and a Bazaar Branch"""
|
|
19 |
||
20 |
from bzrlib import ( |
|
|
0.200.1244
by Jelmer Vernooij
Implement GitRepository.check. |
21 |
check, |
|
0.200.43
by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity. |
22 |
errors, |
|
0.200.1281
by Jelmer Vernooij
Provide Repository.get_known_graph_ancestry. |
23 |
graph as _mod_graph, |
|
0.200.38
by David Allouche
Reimplement GitRepository.get_inventory, simpler and faster. |
24 |
inventory, |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
25 |
repository, |
|
0.200.29
by David Allouche
Smoke test for GitRepository.get_revision, and corresponding fixes. |
26 |
revision, |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
27 |
)
|
|
0.200.1186
by Jelmer Vernooij
Cope with InventoryRevisionTree. |
28 |
try: |
29 |
from bzrlib.revisiontree import InventoryRevisionTree |
|
30 |
except ImportError: # bzr < 2.4 |
|
31 |
from bzrlib.revisiontree import RevisionTree as InventoryRevisionTree |
|
|
0.200.115
by Jelmer Vernooij
Pass mapping object. |
32 |
from bzrlib.foreign import ( |
|
0.200.292
by Jelmer Vernooij
Fix formatting. |
33 |
ForeignRepository, |
34 |
)
|
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
35 |
|
|
0.200.387
by Jelmer Vernooij
Initial work on supporting commit in git trees. |
36 |
from bzrlib.plugins.git.commit import ( |
37 |
GitCommitBuilder, |
|
38 |
)
|
|
|
0.200.1283
by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision(). |
39 |
from bzrlib.plugins.git.filegraph import ( |
40 |
GitFileLastChangeScanner, |
|
41 |
GitFileParentProvider, |
|
42 |
)
|
|
|
0.200.256
by Jelmer Vernooij
Add tests for import_revision_gist. |
43 |
from bzrlib.plugins.git.mapping import ( |
44 |
default_mapping, |
|
|
0.200.1263
by Jelmer Vernooij
Fix foreign_vcs_git. |
45 |
foreign_vcs_git, |
|
0.200.256
by Jelmer Vernooij
Add tests for import_revision_gist. |
46 |
mapping_registry, |
47 |
)
|
|
|
0.200.617
by Jelmer Vernooij
Add custom InterTree for use between git revision trees. |
48 |
from bzrlib.plugins.git.tree import ( |
49 |
GitRevisionTree, |
|
50 |
)
|
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
51 |
|
52 |
||
|
0.252.21
by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions. |
53 |
from dulwich.objects import ( |
54 |
Commit, |
|
|
0.200.1080
by Jelmer Vernooij
Fix handling of annotated tags when cloning from local repo. |
55 |
Tag, |
|
0.200.1153
by Jelmer Vernooij
Import ZERO_SHA from dulwich.objects. |
56 |
ZERO_SHA, |
|
0.252.21
by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions. |
57 |
)
|
|
0.200.1233
by Jelmer Vernooij
Implement Repository.iter_files_bytes. |
58 |
from dulwich.object_store import ( |
59 |
tree_lookup_path, |
|
60 |
)
|
|
|
0.252.21
by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions. |
61 |
|
62 |
||
|
0.200.1246
by Jelmer Vernooij
Provide GitRepository.reconcile. |
63 |
class RepoReconciler(object): |
64 |
"""Reconciler that reconciles a repository. |
|
65 |
||
66 |
"""
|
|
67 |
||
68 |
def __init__(self, repo, other=None, thorough=False): |
|
69 |
"""Construct a RepoReconciler. |
|
70 |
||
71 |
:param thorough: perform a thorough check which may take longer but
|
|
72 |
will correct non-data loss issues such as incorrect
|
|
73 |
cached data.
|
|
74 |
"""
|
|
75 |
self.repo = repo |
|
76 |
||
77 |
def reconcile(self): |
|
78 |
"""Perform reconciliation. |
|
79 |
||
80 |
After reconciliation the following attributes document found issues:
|
|
81 |
inconsistent_parents: The number of revisions in the repository whose
|
|
82 |
ancestry was being reported incorrectly.
|
|
83 |
garbage_inventories: The number of inventory objects without revisions
|
|
84 |
that were garbage collected.
|
|
85 |
"""
|
|
86 |
||
87 |
||
|
0.200.1244
by Jelmer Vernooij
Implement GitRepository.check. |
88 |
class GitCheck(check.Check): |
89 |
||
90 |
def __init__(self, repository, check_repo=True): |
|
91 |
self.repository = repository |
|
92 |
self.checked_rev_cnt = 0 |
|
93 |
||
94 |
def check(self, callback_refs=None, check_repo=True): |
|
95 |
if callback_refs is None: |
|
96 |
callback_refs = {} |
|
97 |
self.repository.lock_read() |
|
98 |
self.repository.unlock() |
|
99 |
||
100 |
def report_results(self, verbose): |
|
101 |
pass
|
|
102 |
||
103 |
||
|
0.200.115
by Jelmer Vernooij
Pass mapping object. |
104 |
class GitRepository(ForeignRepository): |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
105 |
"""An adapter to git repositories for bzr.""" |
106 |
||
|
0.200.41
by David Allouche
Define _serializer = None in GitRepository. |
107 |
_serializer = None |
|
0.200.1263
by Jelmer Vernooij
Fix foreign_vcs_git. |
108 |
vcs = foreign_vcs_git |
|
0.200.1086
by Jelmer Vernooij
Provide chk_bytes attribute. |
109 |
chk_bytes = None |
|
0.200.41
by David Allouche
Define _serializer = None in GitRepository. |
110 |
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
111 |
def __init__(self, gitdir, lockfiles): |
|
0.200.1307
by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions. |
112 |
super(GitRepository, self).__init__(GitRepositoryFormat(), |
113 |
gitdir, lockfiles) |
|
|
0.200.291
by Jelmer Vernooij
Print proper error about not supporting push. |
114 |
from bzrlib.plugins.git import fetch, push |
|
0.200.676
by Jelmer Vernooij
Avoid iterating over all keys in the tdb database. |
115 |
for optimiser in [fetch.InterRemoteGitNonGitRepository, |
|
0.200.306
by Jelmer Vernooij
Fix tests, split up InterGitNonGitRepository. |
116 |
fetch.InterLocalGitNonGitRepository, |
|
0.200.456
by Jelmer Vernooij
Fix git -> git fetching. |
117 |
fetch.InterGitGitRepository, |
|
0.200.425
by Jelmer Vernooij
Split out push to remote git repositories. |
118 |
push.InterToLocalGitRepository, |
119 |
push.InterToRemoteGitRepository]: |
|
|
0.200.276
by Jelmer Vernooij
Improve formatting. |
120 |
repository.InterRepository.register_optimiser(optimiser) |
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
121 |
|
|
0.200.1231
by Jelmer Vernooij
Implement GitRepository.add_fallback_repository. |
122 |
def add_fallback_repository(self, basis_url): |
|
0.200.1307
by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions. |
123 |
raise errors.UnstackableRepositoryFormat(self._format, |
124 |
self.control_transport.base) |
|
|
0.200.1231
by Jelmer Vernooij
Implement GitRepository.add_fallback_repository. |
125 |
|
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
126 |
def is_shared(self): |
|
0.200.886
by Jelmer Vernooij
Git repositories are not shared. |
127 |
return False |
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
128 |
|
|
0.200.1246
by Jelmer Vernooij
Provide GitRepository.reconcile. |
129 |
def reconcile(self, other=None, thorough=False): |
130 |
"""Reconcile this repository.""" |
|
131 |
reconciler = RepoReconciler(self, thorough=thorough) |
|
132 |
reconciler.reconcile() |
|
133 |
return reconciler |
|
134 |
||
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
135 |
def supports_rich_root(self): |
136 |
return True |
|
137 |
||
|
0.200.1111
by Jelmer Vernooij
Drop support for Bazaar < 2.3. |
138 |
def _warn_if_deprecated(self, branch=None): # for bzr < 2.4 |
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
139 |
# This class isn't deprecated
|
140 |
pass
|
|
141 |
||
142 |
def get_mapping(self): |
|
143 |
return default_mapping |
|
144 |
||
|
0.200.147
by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though. |
145 |
def make_working_trees(self): |
|
0.200.1033
by Jelmer Vernooij
Don't claim to support working trees for bare repositories. |
146 |
return not self._git.bare |
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
147 |
|
|
0.200.557
by Jelmer Vernooij
Implement GitRepository.revision_graph_can_have_wrong_parents(). |
148 |
def revision_graph_can_have_wrong_parents(self): |
149 |
return False |
|
150 |
||
|
0.200.425
by Jelmer Vernooij
Split out push to remote git repositories. |
151 |
def dfetch(self, source, stop_revision): |
152 |
interrepo = repository.InterRepository.get(source, self) |
|
153 |
return interrepo.dfetch(stop_revision) |
|
154 |
||
|
0.200.1158
by Jelmer Vernooij
Implement stub Repositor.add_signature_text. |
155 |
def add_signature_text(self, revid, signature): |
156 |
raise errors.UnsupportedOperation(self.add_signature_text, self) |
|
157 |
||
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
158 |
|
159 |
class LocalGitRepository(GitRepository): |
|
|
0.200.276
by Jelmer Vernooij
Improve formatting. |
160 |
"""Git repository on the file system.""" |
|
0.200.139
by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches. |
161 |
|
162 |
def __init__(self, gitdir, lockfiles): |
|
163 |
GitRepository.__init__(self, gitdir, lockfiles) |
|
|
0.200.61
by Jelmer Vernooij
Fix tests. |
164 |
self.base = gitdir.root_transport.base |
|
0.200.90
by Jelmer Vernooij
Basic support for opening working trees. |
165 |
self._git = gitdir._git |
|
0.200.1283
by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision(). |
166 |
self._file_change_scanner = GitFileLastChangeScanner(self) |
|
0.200.45
by David Allouche
More performance hacking, introduce sqlite cache, escape characters in commits that break serializers. |
167 |
|
|
0.200.1224
by Jelmer Vernooij
provide explicit GitRepository.get_commit_builder. |
168 |
def get_commit_builder(self, branch, parents, config, timestamp=None, |
169 |
timezone=None, committer=None, revprops=None, |
|
170 |
revision_id=None, lossy=False): |
|
171 |
"""Obtain a CommitBuilder for this repository. |
|
172 |
||
173 |
:param branch: Branch to commit to.
|
|
174 |
:param parents: Revision ids of the parents of the new revision.
|
|
175 |
:param config: Configuration to use.
|
|
176 |
:param timestamp: Optional timestamp recorded for commit.
|
|
177 |
:param timezone: Optional timezone for timestamp.
|
|
178 |
:param committer: Optional committer to set for commit.
|
|
179 |
:param revprops: Optional dictionary of revision properties.
|
|
180 |
:param revision_id: Optional revision id.
|
|
181 |
:param lossy: Whether to discard data that can not be natively
|
|
182 |
represented, when pushing to a foreign VCS
|
|
183 |
"""
|
|
|
0.200.1229
by Jelmer Vernooij
Provide CommitBuilder.any_changes. |
184 |
self.start_write_group() |
|
0.200.1224
by Jelmer Vernooij
provide explicit GitRepository.get_commit_builder. |
185 |
return GitCommitBuilder(self, parents, config, |
186 |
timestamp, timezone, committer, revprops, revision_id, |
|
187 |
lossy) |
|
188 |
||
|
0.200.1283
by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision(). |
189 |
def get_file_graph(self): |
|
0.200.1307
by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions. |
190 |
return _mod_graph.Graph(GitFileParentProvider( |
191 |
self._file_change_scanner)) |
|
|
0.200.1283
by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision(). |
192 |
|
|
0.200.1233
by Jelmer Vernooij
Implement Repository.iter_files_bytes. |
193 |
def iter_files_bytes(self, desired_files): |
194 |
"""Iterate through file versions. |
|
195 |
||
196 |
Files will not necessarily be returned in the order they occur in
|
|
197 |
desired_files. No specific order is guaranteed.
|
|
198 |
||
199 |
Yields pairs of identifier, bytes_iterator. identifier is an opaque
|
|
200 |
value supplied by the caller as part of desired_files. It should
|
|
201 |
uniquely identify the file version in the caller's context. (Examples:
|
|
202 |
an index number or a TreeTransform trans_id.)
|
|
203 |
||
204 |
bytes_iterator is an iterable of bytestrings for the file. The
|
|
205 |
kind of iterable and length of the bytestrings are unspecified, but for
|
|
206 |
this implementation, it is a list of bytes produced by
|
|
207 |
VersionedFile.get_record_stream().
|
|
208 |
||
209 |
:param desired_files: a list of (file_id, revision_id, identifier)
|
|
210 |
triples
|
|
211 |
"""
|
|
212 |
per_revision = {} |
|
213 |
for (file_id, revision_id, identifier) in desired_files: |
|
|
0.200.1307
by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions. |
214 |
per_revision.setdefault(revision_id, []).append( |
215 |
(file_id, identifier)) |
|
|
0.200.1233
by Jelmer Vernooij
Implement Repository.iter_files_bytes. |
216 |
for revid, files in per_revision.iteritems(): |
217 |
(commit_id, mapping) = self.lookup_bzr_revision_id(revid) |
|
218 |
try: |
|
219 |
commit = self._git.object_store[commit_id] |
|
220 |
except KeyError: |
|
221 |
raise errors.RevisionNotPresent(revid, self) |
|
222 |
root_tree = commit.tree |
|
223 |
for fileid, identifier in files: |
|
224 |
path = mapping.parse_file_id(fileid) |
|
225 |
try: |
|
226 |
obj = tree_lookup_path( |
|
227 |
self._git.object_store.__getitem__, root_tree, path) |
|
228 |
if isinstance(obj, tuple): |
|
229 |
(mode, item_id) = obj |
|
230 |
obj = self._git.object_store[item_id] |
|
231 |
except KeyError: |
|
232 |
raise errors.RevisionNotPresent((fileid, revid), self) |
|
233 |
else: |
|
234 |
if obj.type_name == "tree": |
|
235 |
yield (identifier, []) |
|
236 |
elif obj.type_name == "blob": |
|
237 |
yield (identifier, obj.chunked) |
|
238 |
else: |
|
239 |
raise AssertionError("file text resolved to %r" % obj) |
|
240 |
||
241 |
||
|
0.252.46
by Jelmer Vernooij
Generate refs/bzr/* if not set yet. |
242 |
def _iter_revision_ids(self): |
|
0.200.1021
by Jelmer Vernooij
Put testament sha1 in revisions. |
243 |
mapping = self.get_mapping() |
|
0.252.21
by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions. |
244 |
for sha in self._git.object_store: |
245 |
o = self._git.object_store[sha] |
|
246 |
if not isinstance(o, Commit): |
|
247 |
continue
|
|
|
0.200.1029
by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere. |
248 |
rev, roundtrip_revid, verifiers = mapping.import_commit(o, |
|
0.261.6
by Jelmer Vernooij
Use mapping.revision_id_foreign_to_bzr to find parents everywhere. |
249 |
mapping.revision_id_foreign_to_bzr) |
|
0.200.1021
by Jelmer Vernooij
Put testament sha1 in revisions. |
250 |
yield o.id, rev.revision_id, roundtrip_revid |
|
0.252.46
by Jelmer Vernooij
Generate refs/bzr/* if not set yet. |
251 |
|
252 |
def all_revision_ids(self): |
|
253 |
ret = set([]) |
|
|
0.200.1021
by Jelmer Vernooij
Put testament sha1 in revisions. |
254 |
for git_sha, revid, roundtrip_revid in self._iter_revision_ids(): |
|
0.252.46
by Jelmer Vernooij
Generate refs/bzr/* if not set yet. |
255 |
ret.add(revid) |
|
0.200.1021
by Jelmer Vernooij
Put testament sha1 in revisions. |
256 |
if roundtrip_revid: |
257 |
ret.add(roundtrip_revid) |
|
|
0.200.74
by Jelmer Vernooij
Implement Repository.all_revision_ids(). |
258 |
return ret |
259 |
||
|
0.200.131
by Jelmer Vernooij
Fix all tests but two, use rich roots by default. |
260 |
def get_parent_map(self, revids): |
261 |
parent_map = {} |
|
262 |
for revision_id in revids: |
|
263 |
assert isinstance(revision_id, str) |
|
264 |
if revision_id == revision.NULL_REVISION: |
|
265 |
parent_map[revision_id] = () |
|
266 |
continue
|
|
|
0.200.650
by Jelmer Vernooij
Use standard names for lookup functions. |
267 |
hexsha, mapping = self.lookup_bzr_revision_id(revision_id) |
|
0.200.612
by Jelmer Vernooij
Cope with Dulwich returning KeyError when a commit is not found. |
268 |
try: |
|
0.200.832
by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names. |
269 |
commit = self._git[hexsha] |
|
0.200.612
by Jelmer Vernooij
Cope with Dulwich returning KeyError when a commit is not found. |
270 |
except KeyError: |
271 |
continue
|
|
|
0.200.1094
by Jelmer Vernooij
Fix test_get_no_parents. |
272 |
parents = [ |
|
0.200.1022
by Jelmer Vernooij
Fix formatting. |
273 |
self.lookup_foreign_revision_id(p, mapping) |
274 |
for p in commit.parents] |
|
|
0.200.1094
by Jelmer Vernooij
Fix test_get_no_parents. |
275 |
if parents == []: |
276 |
parents = [revision.NULL_REVISION] |
|
277 |
parent_map[revision_id] = tuple(parents) |
|
|
0.200.131
by Jelmer Vernooij
Fix all tests but two, use rich roots by default. |
278 |
return parent_map |
279 |
||
|
0.200.1281
by Jelmer Vernooij
Provide Repository.get_known_graph_ancestry. |
280 |
def get_known_graph_ancestry(self, revision_ids): |
281 |
"""Return the known graph for a set of revision ids and their ancestors. |
|
282 |
"""
|
|
283 |
pending = set(revision_ids) |
|
284 |
parent_map = {} |
|
285 |
while pending: |
|
286 |
this_parent_map = self.get_parent_map(pending) |
|
287 |
parent_map.update(this_parent_map) |
|
288 |
pending = set() |
|
289 |
map(pending.update, this_parent_map.itervalues()) |
|
290 |
pending = pending.difference(parent_map) |
|
291 |
return _mod_graph.KnownGraph(parent_map) |
|
292 |
||
|
0.200.43
by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity. |
293 |
def get_signature_text(self, revision_id): |
294 |
raise errors.NoSuchRevision(self, revision_id) |
|
295 |
||
|
0.200.1244
by Jelmer Vernooij
Implement GitRepository.check. |
296 |
def check(self, revision_ids=None, callback_refs=None, check_repo=True): |
297 |
result = GitCheck(self, check_repo=check_repo) |
|
298 |
result.check(callback_refs) |
|
299 |
return result |
|
300 |
||
|
0.257.1
by Jelmer Vernooij
use transport repo objects even for local access. |
301 |
def pack(self, hint=None, clean_obsolete_packs=False): |
302 |
self._git.object_store.pack_loose_objects() |
|
303 |
||
|
0.200.650
by Jelmer Vernooij
Use standard names for lookup functions. |
304 |
def lookup_foreign_revision_id(self, foreign_revid, mapping=None): |
|
0.200.124
by Jelmer Vernooij
Add lookup_revision_id stub. |
305 |
"""Lookup a revision id. |
|
0.200.676
by Jelmer Vernooij
Avoid iterating over all keys in the tdb database. |
306 |
|
|
0.200.124
by Jelmer Vernooij
Add lookup_revision_id stub. |
307 |
"""
|
|
0.200.1033
by Jelmer Vernooij
Don't claim to support working trees for bare repositories. |
308 |
assert type(foreign_revid) is str |
|
0.200.649
by Jelmer Vernooij
Make GitRevisions VF implementation behave as the interface expects. |
309 |
if mapping is None: |
310 |
mapping = self.get_mapping() |
|
|
0.200.914
by Jelmer Vernooij
Fix tests. |
311 |
if foreign_revid == ZERO_SHA: |
312 |
return revision.NULL_REVISION |
|
|
0.200.1268
by Jelmer Vernooij
Look in object store directly when something can't be a ref. |
313 |
commit = self._git.object_store[foreign_revid] |
|
0.200.1080
by Jelmer Vernooij
Fix handling of annotated tags when cloning from local repo. |
314 |
while isinstance(commit, Tag): |
315 |
commit = self._git[commit.object[1]] |
|
|
0.200.1029
by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere. |
316 |
rev, roundtrip_revid, verifiers = mapping.import_commit(commit, |
|
0.261.6
by Jelmer Vernooij
Use mapping.revision_id_foreign_to_bzr to find parents everywhere. |
317 |
mapping.revision_id_foreign_to_bzr) |
|
0.200.1021
by Jelmer Vernooij
Put testament sha1 in revisions. |
318 |
# FIXME: check testament before doing this?
|
319 |
if roundtrip_revid: |
|
320 |
return roundtrip_revid |
|
321 |
else: |
|
322 |
return rev.revision_id |
|
|
0.200.124
by Jelmer Vernooij
Add lookup_revision_id stub. |
323 |
|
|
0.200.60
by Jelmer Vernooij
Support signature functions. |
324 |
def has_signature_for_revision_id(self, revision_id): |
325 |
return False |
|
326 |
||
|
0.200.913
by Jelmer Vernooij
Fix tests. |
327 |
def lookup_bzr_revision_id(self, bzr_revid, mapping=None): |
|
0.200.105
by Jelmer Vernooij
Add common function for finding git commit by bzr revid. |
328 |
try: |
|
0.200.195
by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface. |
329 |
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid) |
|
0.200.105
by Jelmer Vernooij
Add common function for finding git commit by bzr revid. |
330 |
except errors.InvalidRevisionId: |
|
0.200.913
by Jelmer Vernooij
Fix tests. |
331 |
if mapping is None: |
332 |
mapping = self.get_mapping() |
|
|
0.252.6
by Jelmer Vernooij
Roundtripping support for revision ids works. |
333 |
try: |
|
0.200.1307
by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions. |
334 |
return (self._git.refs[mapping.revid_as_refname(bzr_revid)], |
335 |
mapping) |
|
|
0.252.6
by Jelmer Vernooij
Roundtripping support for revision ids works. |
336 |
except KeyError: |
|
0.252.46
by Jelmer Vernooij
Generate refs/bzr/* if not set yet. |
337 |
# Update refs from Git commit objects
|
338 |
# FIXME: Hitting this a lot will be very inefficient...
|
|
|
0.200.1021
by Jelmer Vernooij
Put testament sha1 in revisions. |
339 |
for git_sha, revid, roundtrip_revid in self._iter_revision_ids(): |
340 |
if not roundtrip_revid: |
|
341 |
continue
|
|
|
0.200.1022
by Jelmer Vernooij
Fix formatting. |
342 |
refname = mapping.revid_as_refname(roundtrip_revid) |
343 |
self._git.refs[refname] = git_sha |
|
|
0.200.1021
by Jelmer Vernooij
Put testament sha1 in revisions. |
344 |
if roundtrip_revid == bzr_revid: |
|
0.200.913
by Jelmer Vernooij
Fix tests. |
345 |
return git_sha, mapping |
346 |
raise errors.NoSuchRevision(self, bzr_revid) |
|
|
0.200.105
by Jelmer Vernooij
Add common function for finding git commit by bzr revid. |
347 |
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
348 |
def get_revision(self, revision_id): |
|
0.200.1101
by Jelmer Vernooij
Raise InvalidRevisionId on invalid type being specified to Repository.get_revision. |
349 |
if not isinstance(revision_id, str): |
350 |
raise errors.InvalidRevisionId(revision_id, self) |
|
|
0.200.650
by Jelmer Vernooij
Use standard names for lookup functions. |
351 |
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id) |
|
0.200.147
by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though. |
352 |
try: |
|
0.200.832
by Jelmer Vernooij
Update to newer version of Dulwich, saner branch names. |
353 |
commit = self._git[git_commit_id] |
|
0.200.147
by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though. |
354 |
except KeyError: |
355 |
raise errors.NoSuchRevision(self, revision_id) |
|
|
0.200.1029
by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere. |
356 |
revision, roundtrip_revid, verifiers = mapping.import_commit( |
|
0.200.1021
by Jelmer Vernooij
Put testament sha1 in revisions. |
357 |
commit, self.lookup_foreign_revision_id) |
|
0.200.131
by Jelmer Vernooij
Fix all tests but two, use rich roots by default. |
358 |
assert revision is not None |
|
0.200.1029
by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere. |
359 |
# FIXME: check verifiers ?
|
|
0.200.1021
by Jelmer Vernooij
Put testament sha1 in revisions. |
360 |
if roundtrip_revid: |
361 |
revision.revision_id = roundtrip_revid |
|
|
0.200.43
by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity. |
362 |
return revision |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
363 |
|
364 |
def has_revision(self, revision_id): |
|
|
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
365 |
"""See Repository.has_revision.""" |
|
0.200.1122
by Jelmer Vernooij
has_revision(null:) should always return True. |
366 |
if revision_id == revision.NULL_REVISION: |
367 |
return True |
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
368 |
try: |
|
0.200.902
by Jelmer Vernooij
Fix Repository.has_revision{s,}. |
369 |
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id) |
|
0.200.130
by Jelmer Vernooij
Make most tree inspection tests succeed. |
370 |
except errors.NoSuchRevision: |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
371 |
return False |
|
0.200.902
by Jelmer Vernooij
Fix Repository.has_revision{s,}. |
372 |
return (git_commit_id in self._git) |
373 |
||
374 |
def has_revisions(self, revision_ids): |
|
|
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
375 |
"""See Repository.has_revisions.""" |
|
0.200.913
by Jelmer Vernooij
Fix tests. |
376 |
return set(filter(self.has_revision, revision_ids)) |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
377 |
|
|
0.200.131
by Jelmer Vernooij
Fix all tests but two, use rich roots by default. |
378 |
def get_revisions(self, revids): |
|
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
379 |
"""See Repository.get_revisions.""" |
|
0.200.134
by Jelmer Vernooij
Fix get_revisions(). |
380 |
return [self.get_revision(r) for r in revids] |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
381 |
|
382 |
def revision_trees(self, revids): |
|
|
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
383 |
"""See Repository.revision_trees.""" |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
384 |
for revid in revids: |
385 |
yield self.revision_tree(revid) |
|
386 |
||
387 |
def revision_tree(self, revision_id): |
|
|
0.200.1119
by Jelmer Vernooij
Refactor repository initialization. |
388 |
"""See Repository.revision_tree.""" |
|
0.200.57
by Jelmer Vernooij
Fix more tests. |
389 |
revision_id = revision.ensure_null(revision_id) |
390 |
if revision_id == revision.NULL_REVISION: |
|
391 |
inv = inventory.Inventory(root_id=None) |
|
392 |
inv.revision_id = revision_id |
|
|
0.200.1186
by Jelmer Vernooij
Cope with InventoryRevisionTree. |
393 |
return InventoryRevisionTree(self, inv, revision_id) |
|
0.200.195
by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface. |
394 |
return GitRevisionTree(self, revision_id) |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
395 |
|
396 |
def get_inventory(self, revision_id): |
|
|
0.264.4
by Jelmer Vernooij
No longer implement Repository.get_inventory. |
397 |
raise NotImplementedError(self.get_inventory) |
|
0.200.43
by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity. |
398 |
|
|
0.200.108
by Jelmer Vernooij
Support bzr init --git. |
399 |
def set_make_working_trees(self, trees): |
|
0.200.1321
by Jelmer Vernooij
More fixes for compatibility with bzr.dev testsuite. |
400 |
raise errors.UnsupportedOperation(self.set_make_working_trees, self) |
|
0.200.1216
by Jelmer Vernooij
Add note about set_make_working_trees. |
401 |
# TODO: Set bare= in the configuration bug=777065
|
|
0.200.108
by Jelmer Vernooij
Support bzr init --git. |
402 |
|
|
0.200.276
by Jelmer Vernooij
Improve formatting. |
403 |
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, |
404 |
progress=None): |
|
|
0.200.146
by Jelmer Vernooij
Merge dulwich. |
405 |
return self._git.fetch_objects(determine_wants, graph_walker, progress) |
|
0.200.138
by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories. |
406 |
|
|
0.200.43
by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity. |
407 |
|
|
0.200.289
by Jelmer Vernooij
Cope with new member variables in RepositoryFormat. |
408 |
class GitRepositoryFormat(repository.RepositoryFormat): |
|
0.200.429
by Jelmer Vernooij
get remote dpush to a point where we now what to send. |
409 |
"""Git repository format.""" |
|
0.203.1
by Aaron Bentley
Make checkouts work |
410 |
|
|
0.200.1294
by Jelmer Vernooij
Mark as not supporting versioned directories. |
411 |
supports_versioned_directories = False |
|
0.203.1
by Aaron Bentley
Make checkouts work |
412 |
supports_tree_reference = False |
|
0.200.133
by Jelmer Vernooij
Unmark as deprecated. |
413 |
rich_root_data = True |
|
0.200.1105
by Jelmer Vernooij
Don't claim to support leaving locks. |
414 |
supports_leaving_lock = False |
|
0.200.1106
by Jelmer Vernooij
Claim to support fast deltas. |
415 |
fast_deltas = True |
|
0.200.1123
by Jelmer Vernooij
Set more repository format flags. |
416 |
supports_funky_characters = True |
|
0.200.1134
by Jelmer Vernooij
Set RepositoryFormat.supports_external_lookups. |
417 |
supports_external_lookups = False |
|
0.200.1135
by Jelmer Vernooij
Set supports_full_versioned_files=False. |
418 |
supports_full_versioned_files = False |
|
0.200.1162
by Jelmer Vernooij
Set RepositoryFormat.supports_revision_signatures. |
419 |
supports_revision_signatures = False |
|
0.200.1166
by Jelmer Vernooij
Set GitRepositoryFormat.revision_graph_can_have_wrong_parents. |
420 |
revision_graph_can_have_wrong_parents = False |
|
0.200.71
by Jelmer Vernooij
Implement GitRepositoryFormat.get_format_description. |
421 |
|
|
0.200.1083
by Jelmer Vernooij
Register repository format. |
422 |
@property
|
423 |
def _matchingbzrdir(self): |
|
424 |
from bzrlib.plugins.git.dir import LocalGitControlDirFormat |
|
425 |
return LocalGitControlDirFormat() |
|
426 |
||
|
0.200.71
by Jelmer Vernooij
Implement GitRepositoryFormat.get_format_description. |
427 |
def get_format_description(self): |
428 |
return "Git Repository" |
|
|
0.200.133
by Jelmer Vernooij
Unmark as deprecated. |
429 |
|
|
0.200.1084
by Jelmer Vernooij
Support 'initializing' repositories in control directories. |
430 |
def initialize(self, controldir, shared=False, _internal=False): |
431 |
from bzrlib.plugins.git.dir import GitDir |
|
432 |
if not isinstance(controldir, GitDir): |
|
433 |
raise errors.UninitializableFormat(self) |
|
434 |
return controldir.open_repository() |
|
|
0.200.133
by Jelmer Vernooij
Unmark as deprecated. |
435 |
|
436 |
def check_conversion_target(self, target_repo_format): |
|
437 |
return target_repo_format.rich_root_data |
|
|
0.200.536
by Jelmer Vernooij
Implement network name. |
438 |
|
|
0.200.658
by Jelmer Vernooij
Provide right infrastructure for foreign repository tests from bzrlib. |
439 |
def get_foreign_tests_repository_factory(self): |
|
0.200.713
by Jelmer Vernooij
Improve formatting. |
440 |
from bzrlib.plugins.git.tests.test_repository import ( |
441 |
ForeignTestsRepositoryFactory, |
|
442 |
)
|
|
|
0.200.658
by Jelmer Vernooij
Provide right infrastructure for foreign repository tests from bzrlib. |
443 |
return ForeignTestsRepositoryFactory() |
444 |
||
|
0.200.536
by Jelmer Vernooij
Implement network name. |
445 |
def network_name(self): |
446 |
return "git" |