14
14
# You should have received a copy of the GNU General Public License
15
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
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
"""An adapter between a Git Repository and a Bazaar Branch"""
20
from __future__ import absolute_import
28
revision as _mod_revision,
27
from bzrlib.foreign import (
33
from ..decorators import only_raises
34
from ..foreign import (
37
from ..sixish import (
31
from bzrlib.plugins.git.commit import (
34
from bzrlib.plugins.git.mapping import (
45
from .filegraph import (
46
GitFileLastChangeScanner,
47
GitFileParentProvider,
49
from .mapping import (
39
from bzrlib.plugins.git.tree import (
42
from bzrlib.plugins.git.versionedfiles import (
59
from dulwich.errors import (
48
62
from dulwich.objects import (
66
from dulwich.object_store import (
71
class GitCheck(check.Check):
73
def __init__(self, repository, check_repo=True):
74
self.repository = repository
75
self.check_repo = check_repo
76
self.checked_rev_cnt = 0
77
self.object_count = None
80
def check(self, callback_refs=None, check_repo=True):
81
if callback_refs is None:
83
with self.repository.lock_read(), \
84
ui.ui_factory.nested_progress_bar() as self.progress:
85
shas = set(self.repository._git.object_store)
86
self.object_count = len(shas)
87
# TODO(jelmer): Check more things
88
for i, sha in enumerate(shas):
89
self.progress.update('checking objects', i, self.object_count)
90
o = self.repository._git.object_store[sha]
93
except Exception as e:
94
self.problems.append((sha, e))
96
def _report_repo_results(self, verbose):
97
trace.note('checked repository {0} format {1}'.format(
98
self.repository.user_url,
99
self.repository._format))
100
trace.note('%6d objects', self.object_count)
101
for sha, problem in self.problems:
102
trace.note('%s: %s', sha, problem)
104
def report_results(self, verbose):
106
self._report_repo_results(verbose)
109
_optimisers_loaded = False
112
def lazy_load_optimisers():
113
global _optimisers_loaded
114
if _optimisers_loaded:
116
from . import interrepo
117
for optimiser in [interrepo.InterRemoteGitNonGitRepository,
118
interrepo.InterLocalGitNonGitRepository,
119
interrepo.InterLocalGitLocalGitRepository,
120
interrepo.InterRemoteGitLocalGitRepository,
121
interrepo.InterToLocalGitRepository,
122
interrepo.InterToRemoteGitRepository,
124
repository.InterRepository.register_optimiser(optimiser)
125
_optimisers_loaded = True
53
128
class GitRepository(ForeignRepository):
54
129
"""An adapter to git repositories for bzr."""
56
131
_serializer = None
57
_commit_builder_class = GitCommitBuilder
60
def __init__(self, gitdir, lockfiles):
61
ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
63
from bzrlib.plugins.git import fetch, push
64
for optimiser in [fetch.InterRemoteGitNonGitRepository,
65
fetch.InterLocalGitNonGitRepository,
66
fetch.InterGitGitRepository,
67
push.InterToLocalGitRepository,
68
push.InterToRemoteGitRepository]:
69
repository.InterRepository.register_optimiser(optimiser)
132
vcs = foreign_vcs_git
135
def __init__(self, gitdir):
136
self._transport = gitdir.root_transport
137
super(GitRepository, self).__init__(GitRepositoryFormat(),
138
gitdir, control_files=None)
139
self.base = gitdir.root_transport.base
140
lazy_load_optimisers()
141
self._lock_mode = None
144
def add_fallback_repository(self, basis_url):
145
raise errors.UnstackableRepositoryFormat(self._format,
146
self.control_transport.base)
71
148
def is_shared(self):
151
def get_physical_lock_status(self):
154
def lock_write(self):
155
"""See Branch.lock_write()."""
157
if self._lock_mode != 'w':
158
raise errors.ReadOnlyError(self)
159
self._lock_count += 1
161
self._lock_mode = 'w'
163
self._transaction = transactions.WriteTransaction()
164
return repository.RepositoryWriteLockResult(self.unlock, None)
166
def break_lock(self):
167
raise NotImplementedError(self.break_lock)
169
def dont_leave_lock_in_place(self):
170
raise NotImplementedError(self.dont_leave_lock_in_place)
172
def leave_lock_in_place(self):
173
raise NotImplementedError(self.leave_lock_in_place)
177
if self._lock_mode not in ('r', 'w'):
179
self._lock_count += 1
181
self._lock_mode = 'r'
183
self._transaction = transactions.ReadOnlyTransaction()
184
return lock.LogicalLockResult(self.unlock)
186
@only_raises(errors.LockNotHeld, errors.LockBroken)
188
if self._lock_count == 0:
189
raise errors.LockNotHeld(self)
190
if self._lock_count == 1 and self._lock_mode == 'w':
191
if self._write_group is not None:
192
self.abort_write_group()
193
self._lock_count -= 1
194
self._lock_mode = None
195
raise errors.BzrError(
196
'Must end write groups before releasing write locks.')
197
self._lock_count -= 1
198
if self._lock_count == 0:
199
self._lock_mode = None
200
transaction = self._transaction
201
self._transaction = None
204
def is_write_locked(self):
205
return (self._lock_mode == 'w')
208
return (self._lock_mode is not None)
210
def get_transaction(self):
211
"""See Repository.get_transaction()."""
212
if self._transaction is None:
213
return transactions.PassThroughTransaction()
215
return self._transaction
217
def reconcile(self, other=None, thorough=False):
218
"""Reconcile this repository."""
219
from ..reconcile import ReconcileResult
220
ret = ReconcileResult()
74
224
def supports_rich_root(self):
77
def _warn_if_deprecated(self, branch=None):
78
# This class isn't deprecated
81
227
def get_mapping(self):
82
228
return default_mapping
84
230
def make_working_trees(self):
85
return not self._git.bare
231
return not self._git.get_config().get_boolean(("core", ), "bare")
87
233
def revision_graph_can_have_wrong_parents(self):
90
def dfetch(self, source, stop_revision):
91
interrepo = repository.InterRepository.get(source, self)
92
return interrepo.dfetch(stop_revision)
236
def add_signature_text(self, revid, signature):
237
raise errors.UnsupportedOperation(self.add_signature_text, self)
239
def sign_revision(self, revision_id, gpg_strategy):
240
raise errors.UnsupportedOperation(self.add_signature_text, self)
95
243
class LocalGitRepository(GitRepository):
96
244
"""Git repository on the file system."""
98
def __init__(self, gitdir, lockfiles):
99
GitRepository.__init__(self, gitdir, lockfiles)
100
self.base = gitdir.root_transport.base
246
def __init__(self, gitdir):
247
GitRepository.__init__(self, gitdir)
101
248
self._git = gitdir._git
102
self.signatures = None
103
self.revisions = GitRevisions(self, self._git.object_store)
104
self.inventories = None
105
self.texts = GitTexts(self)
249
self._file_change_scanner = GitFileLastChangeScanner(self)
250
self._transaction = None
252
def get_commit_builder(self, branch, parents, config, timestamp=None,
253
timezone=None, committer=None, revprops=None,
254
revision_id=None, lossy=False):
255
"""Obtain a CommitBuilder for this repository.
257
:param branch: Branch to commit to.
258
:param parents: Revision ids of the parents of the new revision.
259
:param config: Configuration to use.
260
:param timestamp: Optional timestamp recorded for commit.
261
:param timezone: Optional timezone for timestamp.
262
:param committer: Optional committer to set for commit.
263
:param revprops: Optional dictionary of revision properties.
264
:param revision_id: Optional revision id.
265
:param lossy: Whether to discard data that can not be natively
266
represented, when pushing to a foreign VCS
268
builder = GitCommitBuilder(
269
self, parents, config, timestamp, timezone, committer, revprops,
271
self.start_write_group()
274
def get_file_graph(self):
275
return _mod_graph.Graph(GitFileParentProvider(
276
self._file_change_scanner))
278
def iter_files_bytes(self, desired_files):
279
"""Iterate through file versions.
281
Files will not necessarily be returned in the order they occur in
282
desired_files. No specific order is guaranteed.
284
Yields pairs of identifier, bytes_iterator. identifier is an opaque
285
value supplied by the caller as part of desired_files. It should
286
uniquely identify the file version in the caller's context. (Examples:
287
an index number or a TreeTransform trans_id.)
289
bytes_iterator is an iterable of bytestrings for the file. The
290
kind of iterable and length of the bytestrings are unspecified, but for
291
this implementation, it is a list of bytes produced by
292
VersionedFile.get_record_stream().
294
:param desired_files: a list of (file_id, revision_id, identifier)
298
for (file_id, revision_id, identifier) in desired_files:
299
per_revision.setdefault(revision_id, []).append(
300
(file_id, identifier))
301
for revid, files in viewitems(per_revision):
303
(commit_id, mapping) = self.lookup_bzr_revision_id(revid)
304
except errors.NoSuchRevision:
305
raise errors.RevisionNotPresent(revid, self)
307
commit = self._git.object_store[commit_id]
309
raise errors.RevisionNotPresent(revid, self)
310
root_tree = commit.tree
311
for fileid, identifier in files:
313
path = mapping.parse_file_id(fileid)
315
raise errors.RevisionNotPresent((fileid, revid), self)
317
obj = tree_lookup_path(
318
self._git.object_store.__getitem__, root_tree,
319
path.encode('utf-8'))
320
if isinstance(obj, tuple):
321
(mode, item_id) = obj
322
obj = self._git.object_store[item_id]
324
raise errors.RevisionNotPresent((fileid, revid), self)
326
if obj.type_name == b"tree":
327
yield (identifier, [])
328
elif obj.type_name == b"blob":
329
yield (identifier, obj.chunked)
331
raise AssertionError("file text resolved to %r" % obj)
333
def gather_stats(self, revid=None, committers=None):
334
"""See Repository.gather_stats()."""
335
result = super(LocalGitRepository, self).gather_stats(
338
for sha in self._git.object_store:
339
o = self._git.object_store[sha]
340
if o.type_name == b"commit":
342
result['revisions'] = len(revs)
107
345
def _iter_revision_ids(self):
108
346
mapping = self.get_mapping()
110
348
o = self._git.object_store[sha]
111
349
if not isinstance(o, Commit):
113
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
114
self.lookup_foreign_revision_id)
115
yield o.id, rev.revision_id, roundtrip_revid
351
revid = mapping.revision_id_foreign_to_bzr(o)
352
roundtrip_revid = mapping.get_revision_id(o)
353
yield o.id, revid, (roundtrip_revid if revid != roundtrip_revid else None)
117
355
def all_revision_ids(self):
119
357
for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
121
358
if roundtrip_revid:
122
359
ret.add(roundtrip_revid)
364
def _get_parents(self, revid, no_alternates=False):
365
if type(revid) != bytes:
368
(hexsha, mapping) = self.lookup_bzr_revision_id(revid)
369
except errors.NoSuchRevision:
371
# FIXME: Honor no_alternates setting
373
commit = self._git.object_store[hexsha]
377
for p in commit.parents:
379
ret.append(self.lookup_foreign_revision_id(p, mapping))
381
ret.append(mapping.revision_id_foreign_to_bzr(p))
125
def get_parent_map(self, revids):
384
def _get_parent_map_no_fallbacks(self, revids):
385
return self.get_parent_map(revids, no_alternates=True)
387
def get_parent_map(self, revids, no_alternates=False):
127
389
for revision_id in revids:
128
assert isinstance(revision_id, str)
129
if revision_id == revision.NULL_REVISION:
390
parents = self._get_parents(
391
revision_id, no_alternates=no_alternates)
392
if revision_id == _mod_revision.NULL_REVISION:
130
393
parent_map[revision_id] = ()
132
hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
134
commit = self._git[hexsha]
137
parent_map[revision_id] = [
138
self.lookup_foreign_revision_id(p, mapping)
139
for p in commit.parents]
397
if len(parents) == 0:
398
parents = [_mod_revision.NULL_REVISION]
399
parent_map[revision_id] = tuple(parents)
140
400
return parent_map
142
def get_ancestry(self, revision_id, topo_sorted=True):
143
"""See Repository.get_ancestry().
402
def get_known_graph_ancestry(self, revision_ids):
403
"""Return the known graph for a set of revision ids and their ancestors.
145
if revision_id is None:
146
return [None, revision.NULL_REVISION] + self._all_revision_ids()
147
assert isinstance(revision_id, str)
149
graph = self.get_graph()
150
for rev, parents in graph.iter_ancestry([revision_id]):
153
return [None] + ancestry
405
pending = set(revision_ids)
409
for revid in pending:
410
if revid == _mod_revision.NULL_REVISION:
412
parents = self._get_parents(revid)
413
if parents is not None:
414
this_parent_map[revid] = parents
415
parent_map.update(this_parent_map)
417
for values in viewvalues(this_parent_map):
418
pending.update(values)
419
pending = pending.difference(parent_map)
420
return _mod_graph.KnownGraph(parent_map)
155
422
def get_signature_text(self, revision_id):
156
raise errors.NoSuchRevision(self, revision_id)
423
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
425
commit = self._git.object_store[git_commit_id]
427
raise errors.NoSuchRevision(self, revision_id)
428
if commit.gpgsig is None:
429
raise errors.NoSuchRevision(self, revision_id)
432
def check(self, revision_ids=None, callback_refs=None, check_repo=True):
433
result = GitCheck(self, check_repo=check_repo)
434
result.check(callback_refs)
158
437
def pack(self, hint=None, clean_obsolete_packs=False):
159
438
self._git.object_store.pack_loose_objects()
161
440
def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
162
441
"""Lookup a revision id.
443
:param foreign_revid: Foreign revision id to look up
444
:param mapping: Mapping to use (use default mapping if not specified)
445
:raise KeyError: If foreign revision was not found
446
:return: bzr revision id
165
assert type(foreign_revid) is str
448
if not isinstance(foreign_revid, bytes):
449
raise TypeError(foreign_revid)
166
450
if mapping is None:
167
451
mapping = self.get_mapping()
168
from dulwich.protocol import (
171
452
if foreign_revid == ZERO_SHA:
172
return revision.NULL_REVISION
173
commit = self._git[foreign_revid]
174
rev, roundtrip_revid, verifiers = mapping.import_commit(commit,
453
return _mod_revision.NULL_REVISION
454
commit = self._git.object_store.peel_sha(foreign_revid)
455
if not isinstance(commit, Commit):
456
raise NotCommitError(commit.id)
457
revid = mapping.get_revision_id(commit)
176
458
# FIXME: check testament before doing this?
178
return roundtrip_revid
180
return rev.revision_id
182
461
def has_signature_for_revision_id(self, revision_id):
462
"""Check whether a GPG signature is present for this revision.
464
This is never the case for Git repositories.
467
self.get_signature_text(revision_id)
468
except errors.NoSuchRevision:
473
def verify_revision_signature(self, revision_id, gpg_strategy):
474
"""Verify the signature on a revision.
476
:param revision_id: the revision to verify
477
:gpg_strategy: the GPGStrategy object to used
479
:return: gpg.SIGNATURE_VALID or a failed SIGNATURE_ value
481
from breezy import gpg
482
with self.lock_read():
483
git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
485
commit = self._git.object_store[git_commit_id]
487
raise errors.NoSuchRevision(self, revision_id)
489
if commit.gpgsig is None:
490
return gpg.SIGNATURE_NOT_SIGNED, None
492
without_sig = Commit.from_string(commit.as_raw_string())
493
without_sig.gpgsig = None
495
(result, key, plain_text) = gpg_strategy.verify(
496
without_sig.as_raw_string(), commit.gpgsig)
185
499
def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
500
"""Lookup a bzr revision id in a Git repository.
502
:param bzr_revid: Bazaar revision id
503
:param mapping: Optional mapping to use
504
:return: Tuple with git commit id, mapping that was used and supplement
187
return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
508
(git_sha, mapping) = mapping_registry.revision_id_bzr_to_foreign(
188
510
except errors.InvalidRevisionId:
189
511
if mapping is None:
190
512
mapping = self.get_mapping()
225
561
return (git_commit_id in self._git)
227
563
def has_revisions(self, revision_ids):
564
"""See Repository.has_revisions."""
228
565
return set(filter(self.has_revision, revision_ids))
230
def get_revisions(self, revids):
231
return [self.get_revision(r) for r in revids]
567
def iter_revisions(self, revision_ids):
568
"""See Repository.get_revisions."""
569
for revid in revision_ids:
571
rev = self.get_revision(revid)
572
except errors.NoSuchRevision:
233
576
def revision_trees(self, revids):
577
"""See Repository.revision_trees."""
234
578
for revid in revids:
235
579
yield self.revision_tree(revid)
237
581
def revision_tree(self, revision_id):
238
revision_id = revision.ensure_null(revision_id)
239
if revision_id == revision.NULL_REVISION:
240
inv = inventory.Inventory(root_id=None)
241
inv.revision_id = revision_id
242
return revisiontree.RevisionTree(self, inv, revision_id)
582
"""See Repository.revision_tree."""
583
if revision_id is None:
584
raise ValueError('invalid revision id %s' % revision_id)
243
585
return GitRevisionTree(self, revision_id)
245
def get_inventory(self, revision_id):
246
assert revision_id != None
247
return self.revision_tree(revision_id).inventory
587
def get_deltas_for_revisions(self, revisions, specific_fileids=None):
588
"""Produce a generator of revision deltas.
590
Note that the input is a sequence of REVISIONS, not revision_ids.
591
Trees will be held in memory until the generator exits.
592
Each delta is relative to the revision's lefthand predecessor.
594
:param specific_fileids: if not None, the result is filtered
595
so that only those file-ids, their parents and their
596
children are included.
598
# Get the revision-ids of interest
599
required_trees = set()
600
for revision in revisions:
601
required_trees.add(revision.revision_id)
602
required_trees.update(revision.parent_ids[:1])
604
trees = dict((t.get_revision_id(), t) for
605
t in self.revision_trees(required_trees))
607
# Calculate the deltas
608
for revision in revisions:
609
if not revision.parent_ids:
610
old_tree = self.revision_tree(_mod_revision.NULL_REVISION)
612
old_tree = trees[revision.parent_ids[0]]
613
new_tree = trees[revision.revision_id]
614
if specific_fileids is not None:
615
specific_files = [new_tree.id2path(
616
fid) for fid in specific_fileids]
618
specific_files = None
619
yield new_tree.changes_from(
620
old_tree, specific_files=specific_files)
249
622
def set_make_working_trees(self, trees):
623
raise errors.UnsupportedOperation(self.set_make_working_trees, self)
252
625
def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
254
return self._git.fetch_objects(determine_wants, graph_walker, progress)
256
def _get_versioned_file_checker(self, text_key_references=None,
258
return GitVersionedFileChecker(self,
259
text_key_references=text_key_references, ancestors=ancestors)
262
class GitVersionedFileChecker(repository._VersionedFileChecker):
266
def _check_file_version_parents(self, texts, progress_bar):
626
progress=None, limit=None):
627
return self._git.fetch_objects(determine_wants, graph_walker, progress,
270
631
class GitRepositoryFormat(repository.RepositoryFormat):
271
632
"""Git repository format."""
273
supports_tree_reference = False
634
supports_versioned_directories = False
635
supports_tree_reference = True
274
636
rich_root_data = True
637
supports_leaving_lock = False
639
supports_funky_characters = True
640
supports_external_lookups = False
641
supports_full_versioned_files = False
642
supports_revision_signatures = False
643
supports_nesting_repositories = False
644
revision_graph_can_have_wrong_parents = False
645
supports_unreferenced_revisions = True
646
supports_setting_revision_ids = False
647
supports_storing_branch_nick = False
648
supports_overriding_transport = False
649
supports_custom_revision_properties = False
650
records_per_file_revision = False
653
def _matchingcontroldir(self):
654
from .dir import LocalGitControlDirFormat
655
return LocalGitControlDirFormat()
276
657
def get_format_description(self):
277
658
return "Git Repository"
279
def initialize(self, url, shared=False, _internal=False):
280
raise errors.UninitializableFormat(self)
660
def initialize(self, controldir, shared=False, _internal=False):
661
from .dir import GitDir
662
if not isinstance(controldir, GitDir):
663
raise errors.UninitializableFormat(self)
664
return controldir.open_repository()
282
666
def check_conversion_target(self, target_repo_format):
283
667
return target_repo_format.rich_root_data
285
669
def get_foreign_tests_repository_factory(self):
286
from bzrlib.plugins.git.tests.test_repository import (
670
from .tests.test_repository import (
287
671
ForeignTestsRepositoryFactory,
289
673
return ForeignTestsRepositoryFactory()
291
675
def network_name(self):
679
def get_extra_interrepo_test_combinations():
680
from ..bzr.groupcompress_repo import RepositoryFormat2a
681
from . import interrepo
683
(interrepo.InterLocalGitNonGitRepository,
684
GitRepositoryFormat(), RepositoryFormat2a()),
685
(interrepo.InterLocalGitLocalGitRepository,
686
GitRepositoryFormat(), GitRepositoryFormat()),
687
(interrepo.InterToLocalGitRepository,
688
RepositoryFormat2a(), GitRepositoryFormat()),
added
removed
breezy/git/repository.py
