/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
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
0.200.1594 by Jelmer Vernooij
Use absolute_import everywhere.
20
from __future__ import absolute_import
21
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
22
from ... import (
0.200.1244 by Jelmer Vernooij
Implement GitRepository.check.
23
    check,
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
24
    errors,
0.200.1281 by Jelmer Vernooij
Provide Repository.get_known_graph_ancestry.
25
    graph as _mod_graph,
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
26
    lock,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
27
    repository,
0.285.5 by Jelmer Vernooij
Fix import.
28
    revision as _mod_revision,
0.200.1411 by Jelmer Vernooij
Fix control files.
29
    transactions,
0.200.1601 by Jelmer Vernooij
remove compatibility code for bzr < 2.5.
30
    ui,
0.200.1646 by Jelmer Vernooij
Rename bzrlib to breezy.
31
    version_info as breezy_version,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
32
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
33
from ...decorators import only_raises
34
from ...foreign import (
0.200.292 by Jelmer Vernooij
Fix formatting.
35
    ForeignRepository,
36
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
37
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
38
from .commit import (
0.200.387 by Jelmer Vernooij
Initial work on supporting commit in git trees.
39
    GitCommitBuilder,
40
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
41
from .filegraph import (
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
42
    GitFileLastChangeScanner,
43
    GitFileParentProvider,
44
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
45
from .mapping import (
0.200.256 by Jelmer Vernooij
Add tests for import_revision_gist.
46
    default_mapping,
0.200.1263 by Jelmer Vernooij
Fix foreign_vcs_git.
47
    foreign_vcs_git,
0.200.256 by Jelmer Vernooij
Add tests for import_revision_gist.
48
    mapping_registry,
49
    )
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
50
from .tree import (
0.200.617 by Jelmer Vernooij
Add custom InterTree for use between git revision trees.
51
    GitRevisionTree,
52
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
53
54
0.200.1636 by Jelmer Vernooij
Some formatting fixes.
55
from dulwich.errors import (
56
    NotCommitError,
57
    )
0.252.21 by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions.
58
from dulwich.objects import (
59
    Commit,
0.200.1153 by Jelmer Vernooij
Import ZERO_SHA from dulwich.objects.
60
    ZERO_SHA,
0.252.21 by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions.
61
    )
0.200.1233 by Jelmer Vernooij
Implement Repository.iter_files_bytes.
62
from dulwich.object_store import (
63
    tree_lookup_path,
64
    )
0.252.21 by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions.
65
66
0.200.1246 by Jelmer Vernooij
Provide GitRepository.reconcile.
67
class RepoReconciler(object):
68
    """Reconciler that reconciles a repository.
69
70
    """
71
72
    def __init__(self, repo, other=None, thorough=False):
73
        """Construct a RepoReconciler.
74
75
        :param thorough: perform a thorough check which may take longer but
76
                         will correct non-data loss issues such as incorrect
77
                         cached data.
78
        """
79
        self.repo = repo
80
81
    def reconcile(self):
82
        """Perform reconciliation.
83
84
        After reconciliation the following attributes document found issues:
85
        inconsistent_parents: The number of revisions in the repository whose
86
                              ancestry was being reported incorrectly.
87
        garbage_inventories: The number of inventory objects without revisions
88
                             that were garbage collected.
89
        """
90
91
0.200.1244 by Jelmer Vernooij
Implement GitRepository.check.
92
class GitCheck(check.Check):
93
94
    def __init__(self, repository, check_repo=True):
95
        self.repository = repository
96
        self.checked_rev_cnt = 0
97
98
    def check(self, callback_refs=None, check_repo=True):
99
        if callback_refs is None:
100
            callback_refs = {}
0.200.1680 by Jelmer Vernooij
Fix repo locks.
101
        with self.repository.lock_read():
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
102
            # TODO(jelmer): Check some things
103
            pass
0.200.1244 by Jelmer Vernooij
Implement GitRepository.check.
104
105
    def report_results(self, verbose):
106
        pass
107
108
0.200.1447 by Jelmer Vernooij
Load optimisers at most once.
109
_optimisers_loaded = False
110
111
def lazy_load_optimisers():
112
    global _optimisers_loaded
113
    if _optimisers_loaded:
114
        return
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
115
    from . import fetch, push
0.200.1447 by Jelmer Vernooij
Load optimisers at most once.
116
    for optimiser in [fetch.InterRemoteGitNonGitRepository,
117
                      fetch.InterLocalGitNonGitRepository,
118
                      fetch.InterGitGitRepository,
119
                      push.InterToLocalGitRepository,
120
                      push.InterToRemoteGitRepository]:
121
        repository.InterRepository.register_optimiser(optimiser)
122
    _optimisers_loaded = True
123
124
0.200.115 by Jelmer Vernooij
Pass mapping object.
125
class GitRepository(ForeignRepository):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
126
    """An adapter to git repositories for bzr."""
127
0.200.41 by David Allouche
Define _serializer = None in GitRepository.
128
    _serializer = None
0.200.1263 by Jelmer Vernooij
Fix foreign_vcs_git.
129
    vcs = foreign_vcs_git
0.200.1086 by Jelmer Vernooij
Provide chk_bytes attribute.
130
    chk_bytes = None
0.200.41 by David Allouche
Define _serializer = None in GitRepository.
131
0.200.1411 by Jelmer Vernooij
Fix control files.
132
    def __init__(self, gitdir):
0.200.1447 by Jelmer Vernooij
Load optimisers at most once.
133
        self._transport = gitdir.root_transport
0.200.1307 by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions.
134
        super(GitRepository, self).__init__(GitRepositoryFormat(),
0.200.1601 by Jelmer Vernooij
remove compatibility code for bzr < 2.5.
135
            gitdir, control_files=None)
0.200.1449 by Jelmer Vernooij
Fix compatibility with bzr < 2.5 when used with remote repositories.
136
        self.base = gitdir.root_transport.base
0.200.1447 by Jelmer Vernooij
Load optimisers at most once.
137
        lazy_load_optimisers()
0.200.1411 by Jelmer Vernooij
Fix control files.
138
        self._lock_mode = None
139
        self._lock_count = 0
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
140
0.200.1231 by Jelmer Vernooij
Implement GitRepository.add_fallback_repository.
141
    def add_fallback_repository(self, basis_url):
0.200.1307 by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions.
142
        raise errors.UnstackableRepositoryFormat(self._format,
143
            self.control_transport.base)
0.200.1231 by Jelmer Vernooij
Implement GitRepository.add_fallback_repository.
144
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
145
    def is_shared(self):
0.200.886 by Jelmer Vernooij
Git repositories are not shared.
146
        return False
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
147
0.200.1411 by Jelmer Vernooij
Fix control files.
148
    def get_physical_lock_status(self):
149
        return False
150
151
    def lock_write(self):
152
        """See Branch.lock_write()."""
153
        if self._lock_mode:
154
            assert self._lock_mode == 'w'
155
            self._lock_count += 1
156
        else:
157
            self._lock_mode = 'w'
158
            self._lock_count = 1
0.200.1680 by Jelmer Vernooij
Fix repo locks.
159
        return repository.RepositoryWriteLockResult(self.unlock, None)
0.200.1411 by Jelmer Vernooij
Fix control files.
160
0.200.1454 by Jelmer Vernooij
Provide Repository.break_lock.
161
    def break_lock(self):
162
        raise NotImplementedError(self.break_lock)
163
0.200.1411 by Jelmer Vernooij
Fix control files.
164
    def dont_leave_lock_in_place(self):
165
        raise NotImplementedError(self.dont_leave_lock_in_place)
166
167
    def leave_lock_in_place(self):
168
        raise NotImplementedError(self.leave_lock_in_place)
169
170
    def lock_read(self):
171
        if self._lock_mode:
172
            assert self._lock_mode in ('r', 'w')
173
            self._lock_count += 1
174
        else:
175
            self._lock_mode = 'r'
176
            self._lock_count = 1
0.200.1670 by Jelmer Vernooij
Fix compatibility with newer versions of bzr.
177
        return lock.LogicalLockResult(self.unlock)
0.200.1411 by Jelmer Vernooij
Fix control files.
178
179
    @only_raises(errors.LockNotHeld, errors.LockBroken)
180
    def unlock(self):
181
        if self._lock_count == 0:
182
            raise errors.LockNotHeld(self)
183
        if self._lock_count == 1 and self._lock_mode == 'w':
184
            if self._write_group is not None:
185
                self.abort_write_group()
186
                self._lock_count -= 1
187
                self._lock_mode = None
188
                raise errors.BzrError(
189
                    'Must end write groups before releasing write locks.')
190
        self._lock_count -= 1
191
        if self._lock_count == 0:
192
            self._lock_mode = None
193
194
    def is_write_locked(self):
195
        return (self._lock_mode == 'w')
196
197
    def is_locked(self):
198
        return (self._lock_mode is not None)
199
200
    def get_transaction(self):
201
        """See Repository.get_transaction()."""
202
        if self._write_group is None:
203
            return transactions.PassThroughTransaction()
204
        else:
205
            return self._write_group
206
0.200.1246 by Jelmer Vernooij
Provide GitRepository.reconcile.
207
    def reconcile(self, other=None, thorough=False):
208
        """Reconcile this repository."""
209
        reconciler = RepoReconciler(self, thorough=thorough)
210
        reconciler.reconcile()
211
        return reconciler
212
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
213
    def supports_rich_root(self):
214
        return True
215
216
    def get_mapping(self):
217
        return default_mapping
218
0.200.147 by Jelmer Vernooij
Merge new dulwich; fetching objects from local repository works now; they aren't converted yet though.
219
    def make_working_trees(self):
0.200.1546 by Jelmer Vernooij
Provide get_config.
220
        return not self._git.get_config().get_boolean(("core", ), "bare")
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
221
0.200.557 by Jelmer Vernooij
Implement GitRepository.revision_graph_can_have_wrong_parents().
222
    def revision_graph_can_have_wrong_parents(self):
223
        return False
224
0.200.1158 by Jelmer Vernooij
Implement stub Repositor.add_signature_text.
225
    def add_signature_text(self, revid, signature):
226
        raise errors.UnsupportedOperation(self.add_signature_text, self)
227
0.200.1467 by Jelmer Vernooij
Implement GitRepository.sign_revision.
228
    def sign_revision(self, revision_id, gpg_strategy):
229
        raise errors.UnsupportedOperation(self.add_signature_text, self)
230
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
231
232
class LocalGitRepository(GitRepository):
0.200.276 by Jelmer Vernooij
Improve formatting.
233
    """Git repository on the file system."""
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
234
0.200.1411 by Jelmer Vernooij
Fix control files.
235
    def __init__(self, gitdir):
236
        GitRepository.__init__(self, gitdir)
0.200.90 by Jelmer Vernooij
Basic support for opening working trees.
237
        self._git = gitdir._git
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
238
        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.
239
0.200.1224 by Jelmer Vernooij
provide explicit GitRepository.get_commit_builder.
240
    def get_commit_builder(self, branch, parents, config, timestamp=None,
241
                           timezone=None, committer=None, revprops=None,
242
                           revision_id=None, lossy=False):
243
        """Obtain a CommitBuilder for this repository.
244
245
        :param branch: Branch to commit to.
246
        :param parents: Revision ids of the parents of the new revision.
247
        :param config: Configuration to use.
248
        :param timestamp: Optional timestamp recorded for commit.
249
        :param timezone: Optional timezone for timestamp.
250
        :param committer: Optional committer to set for commit.
251
        :param revprops: Optional dictionary of revision properties.
252
        :param revision_id: Optional revision id.
253
        :param lossy: Whether to discard data that can not be natively
254
            represented, when pushing to a foreign VCS
255
        """
0.294.1 by Jelmer Vernooij
Fix write group handling when creating commit builder fails.
256
        builder = GitCommitBuilder(self, parents, config,
257
                timestamp, timezone, committer, revprops, revision_id,
258
                lossy)
0.200.1229 by Jelmer Vernooij
Provide CommitBuilder.any_changes.
259
        self.start_write_group()
0.294.1 by Jelmer Vernooij
Fix write group handling when creating commit builder fails.
260
        return builder
0.200.1224 by Jelmer Vernooij
provide explicit GitRepository.get_commit_builder.
261
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
262
    def get_file_graph(self):
0.200.1307 by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions.
263
        return _mod_graph.Graph(GitFileParentProvider(
264
            self._file_change_scanner))
0.200.1283 by Jelmer Vernooij
Provide Repository.get_file_graph() and Tree.get_file_revision().
265
0.200.1233 by Jelmer Vernooij
Implement Repository.iter_files_bytes.
266
    def iter_files_bytes(self, desired_files):
267
        """Iterate through file versions.
268
269
        Files will not necessarily be returned in the order they occur in
270
        desired_files.  No specific order is guaranteed.
271
272
        Yields pairs of identifier, bytes_iterator.  identifier is an opaque
273
        value supplied by the caller as part of desired_files.  It should
274
        uniquely identify the file version in the caller's context.  (Examples:
275
        an index number or a TreeTransform trans_id.)
276
277
        bytes_iterator is an iterable of bytestrings for the file.  The
278
        kind of iterable and length of the bytestrings are unspecified, but for
279
        this implementation, it is a list of bytes produced by
280
        VersionedFile.get_record_stream().
281
282
        :param desired_files: a list of (file_id, revision_id, identifier)
283
            triples
284
        """
285
        per_revision = {}
286
        for (file_id, revision_id, identifier) in desired_files:
0.200.1307 by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions.
287
            per_revision.setdefault(revision_id, []).append(
288
                (file_id, identifier))
0.200.1233 by Jelmer Vernooij
Implement Repository.iter_files_bytes.
289
        for revid, files in per_revision.iteritems():
0.200.1745 by Jelmer Vernooij
Fix iter_files_bytes.
290
            try:
291
                (commit_id, mapping) = self.lookup_bzr_revision_id(revid)
292
            except errors.NoSuchRevision:
293
                raise errors.RevisionNotPresent(revid, self)
0.200.1233 by Jelmer Vernooij
Implement Repository.iter_files_bytes.
294
            try:
295
                commit = self._git.object_store[commit_id]
296
            except KeyError:
297
                raise errors.RevisionNotPresent(revid, self)
298
            root_tree = commit.tree
299
            for fileid, identifier in files:
0.200.1715 by Jelmer Vernooij
Fix some more tests.
300
                try:
301
                    path = mapping.parse_file_id(fileid)
302
                except ValueError:
303
                    raise errors.RevisionNotPresent((fileid, revid), self)
0.200.1233 by Jelmer Vernooij
Implement Repository.iter_files_bytes.
304
                try:
305
                    obj = tree_lookup_path(
306
                        self._git.object_store.__getitem__, root_tree, path)
307
                    if isinstance(obj, tuple):
308
                        (mode, item_id) = obj
309
                        obj = self._git.object_store[item_id]
310
                except KeyError:
311
                    raise errors.RevisionNotPresent((fileid, revid), self)
312
                else:
313
                    if obj.type_name == "tree":
314
                        yield (identifier, [])
315
                    elif obj.type_name == "blob":
316
                        yield (identifier, obj.chunked)
317
                    else:
318
                        raise AssertionError("file text resolved to %r" % obj)
319
0.200.1533 by Jelmer Vernooij
Improve gather_stats.
320
    def gather_stats(self, revid=None, committers=None):
321
        """See Repository.gather_stats()."""
322
        result = super(LocalGitRepository, self).gather_stats(revid, committers)
323
        revs = []
324
        for sha in self._git.object_store:
325
            o = self._git.object_store[sha]
326
            if o.type_name == "commit":
327
                revs.append(o.id)
328
        result['revisions'] = len(revs)
329
        return result
330
0.252.46 by Jelmer Vernooij
Generate refs/bzr/* if not set yet.
331
    def _iter_revision_ids(self):
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
332
        mapping = self.get_mapping()
0.252.21 by Jelmer Vernooij
Fix GitRepository.all_revision_ids() to find all revisions.
333
        for sha in self._git.object_store:
334
            o = self._git.object_store[sha]
335
            if not isinstance(o, Commit):
336
                continue
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
337
            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.
338
                mapping.revision_id_foreign_to_bzr)
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
339
            yield o.id, rev.revision_id, roundtrip_revid
0.252.46 by Jelmer Vernooij
Generate refs/bzr/* if not set yet.
340
341
    def all_revision_ids(self):
0.200.1727 by Jelmer Vernooij
Change all_revision_ids type to list.
342
        ret = set()
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
343
        for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
344
            if roundtrip_revid:
345
                ret.add(roundtrip_revid)
0.200.1325 by Jelmer Vernooij
More test fixes.
346
            else:
347
                ret.add(revid)
0.200.1727 by Jelmer Vernooij
Change all_revision_ids type to list.
348
        return list(ret)
0.200.74 by Jelmer Vernooij
Implement Repository.all_revision_ids().
349
0.200.1552 by Jelmer Vernooij
Claim to support nested trees.
350
    def _get_parents(self, revid, no_alternates=False):
0.200.1756 by Jelmer Vernooij
Initial work on annotate support.
351
        if type(revid) != bytes:
0.200.1328 by Jelmer Vernooij
More test fixes.
352
            raise ValueError
353
        try:
0.200.1343 by Jelmer Vernooij
Update docstrings.
354
            (hexsha, mapping) = self.lookup_bzr_revision_id(revid)
0.200.1328 by Jelmer Vernooij
More test fixes.
355
        except errors.NoSuchRevision:
356
            return None
0.200.1552 by Jelmer Vernooij
Claim to support nested trees.
357
        # FIXME: Honor no_alternates setting
0.200.1328 by Jelmer Vernooij
More test fixes.
358
        try:
0.200.1553 by Jelmer Vernooij
Avoid using nonexistant method.
359
            commit = self._git.object_store[hexsha]
0.200.1328 by Jelmer Vernooij
More test fixes.
360
        except KeyError:
361
            return None
362
        return [
363
            self.lookup_foreign_revision_id(p, mapping)
364
            for p in commit.parents]
365
0.200.1552 by Jelmer Vernooij
Claim to support nested trees.
366
    def _get_parent_map_no_fallbacks(self, revids):
367
        return self.get_parent_map(revids, no_alternates=True)
368
369
    def get_parent_map(self, revids, no_alternates=False):
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
370
        parent_map = {}
371
        for revision_id in revids:
0.200.1552 by Jelmer Vernooij
Claim to support nested trees.
372
            parents = self._get_parents(revision_id, no_alternates=no_alternates)
0.285.5 by Jelmer Vernooij
Fix import.
373
            if revision_id == _mod_revision.NULL_REVISION:
0.200.1329 by Jelmer Vernooij
Fix more tests.
374
                parent_map[revision_id] = ()
375
                continue
0.200.1328 by Jelmer Vernooij
More test fixes.
376
            if parents is None:
377
                continue
0.200.1324 by Jelmer Vernooij
More work on roundtripping support.
378
            if len(parents) == 0:
0.285.5 by Jelmer Vernooij
Fix import.
379
                parents = [_mod_revision.NULL_REVISION]
0.200.1094 by Jelmer Vernooij
Fix test_get_no_parents.
380
            parent_map[revision_id] = tuple(parents)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
381
        return parent_map
382
0.200.1281 by Jelmer Vernooij
Provide Repository.get_known_graph_ancestry.
383
    def get_known_graph_ancestry(self, revision_ids):
384
        """Return the known graph for a set of revision ids and their ancestors.
385
        """
386
        pending = set(revision_ids)
387
        parent_map = {}
388
        while pending:
0.200.1328 by Jelmer Vernooij
More test fixes.
389
            this_parent_map = {}
390
            for revid in pending:
0.285.5 by Jelmer Vernooij
Fix import.
391
                if revid == _mod_revision.NULL_REVISION:
0.200.1328 by Jelmer Vernooij
More test fixes.
392
                    continue
393
                parents = self._get_parents(revid)
394
                if parents is not None:
395
                    this_parent_map[revid] = parents
0.200.1281 by Jelmer Vernooij
Provide Repository.get_known_graph_ancestry.
396
            parent_map.update(this_parent_map)
397
            pending = set()
398
            map(pending.update, this_parent_map.itervalues())
399
            pending = pending.difference(parent_map)
400
        return _mod_graph.KnownGraph(parent_map)
401
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
402
    def get_signature_text(self, revision_id):
403
        raise errors.NoSuchRevision(self, revision_id)
404
0.200.1244 by Jelmer Vernooij
Implement GitRepository.check.
405
    def check(self, revision_ids=None, callback_refs=None, check_repo=True):
406
        result = GitCheck(self, check_repo=check_repo)
407
        result.check(callback_refs)
408
        return result
409
0.257.1 by Jelmer Vernooij
use transport repo objects even for local access.
410
    def pack(self, hint=None, clean_obsolete_packs=False):
411
        self._git.object_store.pack_loose_objects()
412
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
413
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
414
        """Lookup a revision id.
0.200.676 by Jelmer Vernooij
Avoid iterating over all keys in the tdb database.
415
0.200.1508 by Jelmer Vernooij
Add docstring, use peel_sha.
416
        :param foreign_revid: Foreign revision id to look up
417
        :param mapping: Mapping to use (use default mapping if not specified)
418
        :raise KeyError: If foreign revision was not found
419
        :return: bzr revision id
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
420
        """
0.200.1033 by Jelmer Vernooij
Don't claim to support working trees for bare repositories.
421
        assert type(foreign_revid) is str
0.200.649 by Jelmer Vernooij
Make GitRevisions VF implementation behave as the interface expects.
422
        if mapping is None:
423
            mapping = self.get_mapping()
0.200.914 by Jelmer Vernooij
Fix tests.
424
        if foreign_revid == ZERO_SHA:
0.285.5 by Jelmer Vernooij
Fix import.
425
            return _mod_revision.NULL_REVISION
0.200.1508 by Jelmer Vernooij
Add docstring, use peel_sha.
426
        commit = self._git.object_store.peel_sha(foreign_revid)
0.200.1403 by Jelmer Vernooij
Cope with tags pointing at tree objects when cloning local git repositories.
427
        if not isinstance(commit, Commit):
428
            raise NotCommitError(commit.id)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
429
        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.
430
            mapping.revision_id_foreign_to_bzr)
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
431
        # FIXME: check testament before doing this?
432
        if roundtrip_revid:
433
            return roundtrip_revid
434
        else:
435
            return rev.revision_id
0.200.124 by Jelmer Vernooij
Add lookup_revision_id stub.
436
0.200.60 by Jelmer Vernooij
Support signature functions.
437
    def has_signature_for_revision_id(self, revision_id):
0.200.1343 by Jelmer Vernooij
Update docstrings.
438
        """Check whether a GPG signature is present for this revision.
439
440
        This is never the case for Git repositories.
441
        """
0.200.60 by Jelmer Vernooij
Support signature functions.
442
        return False
443
0.200.913 by Jelmer Vernooij
Fix tests.
444
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
0.200.1343 by Jelmer Vernooij
Update docstrings.
445
        """Lookup a bzr revision id in a Git repository.
446
447
        :param bzr_revid: Bazaar revision id
448
        :param mapping: Optional mapping to use
449
        :return: Tuple with git commit id, mapping that was used and supplement
450
            details
451
        """
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
452
        try:
0.200.1343 by Jelmer Vernooij
Update docstrings.
453
            (git_sha, mapping) = 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.
454
        except errors.InvalidRevisionId:
0.200.913 by Jelmer Vernooij
Fix tests.
455
            if mapping is None:
456
                mapping = self.get_mapping()
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
457
            try:
0.200.1307 by Jelmer Vernooij
Formatting fixes, specify path to a couple more functions.
458
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
459
                        mapping)
0.252.6 by Jelmer Vernooij
Roundtripping support for revision ids works.
460
            except KeyError:
0.252.46 by Jelmer Vernooij
Generate refs/bzr/* if not set yet.
461
                # Update refs from Git commit objects
462
                # FIXME: Hitting this a lot will be very inefficient...
0.200.1601 by Jelmer Vernooij
remove compatibility code for bzr < 2.5.
463
                pb = ui.ui_factory.nested_progress_bar()
464
                try:
465
                    for i, (git_sha, revid, roundtrip_revid) in enumerate(self._iter_revision_ids()):
466
                        if not roundtrip_revid:
467
                            continue
468
                        pb.update("resolving revision id", i)
469
                        refname = mapping.revid_as_refname(roundtrip_revid)
470
                        self._git.refs[refname] = git_sha
471
                        if roundtrip_revid == bzr_revid:
472
                            return git_sha, mapping
473
                finally:
474
                    pb.finished()
0.200.913 by Jelmer Vernooij
Fix tests.
475
                raise errors.NoSuchRevision(self, bzr_revid)
0.200.1343 by Jelmer Vernooij
Update docstrings.
476
        else:
477
            return (git_sha, mapping)
0.200.105 by Jelmer Vernooij
Add common function for finding git commit by bzr revid.
478
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
479
    def get_revision(self, revision_id):
0.200.1101 by Jelmer Vernooij
Raise InvalidRevisionId on invalid type being specified to Repository.get_revision.
480
        if not isinstance(revision_id, str):
481
            raise errors.InvalidRevisionId(revision_id, self)
0.200.650 by Jelmer Vernooij
Use standard names for lookup functions.
482
        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.
483
        try:
0.200.1552 by Jelmer Vernooij
Claim to support nested trees.
484
            commit = self._git.object_store[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.
485
        except KeyError:
486
            raise errors.NoSuchRevision(self, revision_id)
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
487
        revision, roundtrip_revid, verifiers = mapping.import_commit(
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
488
            commit, self.lookup_foreign_revision_id)
0.200.131 by Jelmer Vernooij
Fix all tests but two, use rich roots by default.
489
        assert revision is not None
0.200.1029 by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.
490
        # FIXME: check verifiers ?
0.200.1021 by Jelmer Vernooij
Put testament sha1 in revisions.
491
        if roundtrip_revid:
492
            revision.revision_id = roundtrip_revid
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
493
        return revision
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
494
495
    def has_revision(self, revision_id):
0.200.1119 by Jelmer Vernooij
Refactor repository initialization.
496
        """See Repository.has_revision."""
0.285.5 by Jelmer Vernooij
Fix import.
497
        if revision_id == _mod_revision.NULL_REVISION:
0.200.1122 by Jelmer Vernooij
has_revision(null:) should always return True.
498
            return True
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
499
        try:
0.200.902 by Jelmer Vernooij
Fix Repository.has_revision{s,}.
500
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
0.200.130 by Jelmer Vernooij
Make most tree inspection tests succeed.
501
        except errors.NoSuchRevision:
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
502
            return False
0.200.902 by Jelmer Vernooij
Fix Repository.has_revision{s,}.
503
        return (git_commit_id in self._git)
504
505
    def has_revisions(self, revision_ids):
0.200.1119 by Jelmer Vernooij
Refactor repository initialization.
506
        """See Repository.has_revisions."""
0.200.913 by Jelmer Vernooij
Fix tests.
507
        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.
508
0.200.1657 by Jelmer Vernooij
Implement iter_revisions.
509
    def iter_revisions(self, revision_ids):
0.200.1119 by Jelmer Vernooij
Refactor repository initialization.
510
        """See Repository.get_revisions."""
0.200.1657 by Jelmer Vernooij
Implement iter_revisions.
511
        for revid in revision_ids:
512
            try:
513
                rev = self.get_revision(revid)
514
            except errors.NoSuchRevision:
515
                rev = None
516
            yield (revid, rev)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
517
518
    def revision_trees(self, revids):
0.200.1119 by Jelmer Vernooij
Refactor repository initialization.
519
        """See Repository.revision_trees."""
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
520
        for revid in revids:
521
            yield self.revision_tree(revid)
522
523
    def revision_tree(self, revision_id):
0.200.1119 by Jelmer Vernooij
Refactor repository initialization.
524
        """See Repository.revision_tree."""
0.287.6 by Jelmer Vernooij
Fix some more tests.
525
        if revision_id is None:
526
            raise ValueError('invalid revision id %s' % revision_id)
0.200.195 by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface.
527
        return GitRevisionTree(self, revision_id)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
528
0.285.4 by Jelmer Vernooij
Add get_deltas_for_revisoins implementation.
529
    def get_deltas_for_revisions(self, revisions, specific_fileids=None):
530
        """Produce a generator of revision deltas.
531
532
        Note that the input is a sequence of REVISIONS, not revision_ids.
533
        Trees will be held in memory until the generator exits.
534
        Each delta is relative to the revision's lefthand predecessor.
535
536
        :param specific_fileids: if not None, the result is filtered
537
          so that only those file-ids, their parents and their
538
          children are included.
539
        """
540
        # Get the revision-ids of interest
541
        required_trees = set()
542
        for revision in revisions:
543
            required_trees.add(revision.revision_id)
544
            required_trees.update(revision.parent_ids[:1])
545
0.200.1743 by Jelmer Vernooij
Fix some revision delta filtering.
546
        trees = dict((t.get_revision_id(), t) for
547
            t in self.revision_trees(required_trees))
0.285.4 by Jelmer Vernooij
Add get_deltas_for_revisoins implementation.
548
549
        # Calculate the deltas
550
        for revision in revisions:
551
            if not revision.parent_ids:
552
                old_tree = self.revision_tree(_mod_revision.NULL_REVISION)
553
            else:
554
                old_tree = trees[revision.parent_ids[0]]
0.200.1743 by Jelmer Vernooij
Fix some revision delta filtering.
555
            new_tree = trees[revision.revision_id]
556
            if specific_fileids is not None:
557
                specific_files = [new_tree.id2path(fid) for fid in specific_fileids]
558
            else:
559
                specific_files = None
560
            yield new_tree.changes_from(old_tree, specific_files=specific_files)
0.285.4 by Jelmer Vernooij
Add get_deltas_for_revisoins implementation.
561
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
562
    def get_inventory(self, revision_id):
0.264.4 by Jelmer Vernooij
No longer implement Repository.get_inventory.
563
        raise NotImplementedError(self.get_inventory)
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
564
0.200.108 by Jelmer Vernooij
Support bzr init --git.
565
    def set_make_working_trees(self, trees):
0.287.6 by Jelmer Vernooij
Fix some more tests.
566
        raise errors.UnsupportedOperation(self.set_make_working_trees, self)
0.200.108 by Jelmer Vernooij
Support bzr init --git.
567
0.200.276 by Jelmer Vernooij
Improve formatting.
568
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
0.286.6 by Jelmer Vernooij
Pass through limit argument.
569
        progress=None, limit=None):
570
        return self._git.fetch_objects(determine_wants, graph_walker, progress,
571
            limit=limit)
0.200.138 by Jelmer Vernooij
Add initial infrastructure for accessing remote git repositories.
572
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
573
0.200.289 by Jelmer Vernooij
Cope with new member variables in RepositoryFormat.
574
class GitRepositoryFormat(repository.RepositoryFormat):
0.200.429 by Jelmer Vernooij
get remote dpush to a point where we now what to send.
575
    """Git repository format."""
0.203.1 by Aaron Bentley
Make checkouts work
576
0.200.1294 by Jelmer Vernooij
Mark as not supporting versioned directories.
577
    supports_versioned_directories = False
0.203.1 by Aaron Bentley
Make checkouts work
578
    supports_tree_reference = False
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
579
    rich_root_data = True
0.200.1105 by Jelmer Vernooij
Don't claim to support leaving locks.
580
    supports_leaving_lock = False
0.200.1106 by Jelmer Vernooij
Claim to support fast deltas.
581
    fast_deltas = True
0.200.1123 by Jelmer Vernooij
Set more repository format flags.
582
    supports_funky_characters = True
0.200.1560 by Jelmer Vernooij
stacking is not supported.
583
    supports_external_lookups = False
0.200.1135 by Jelmer Vernooij
Set supports_full_versioned_files=False.
584
    supports_full_versioned_files = False
0.200.1162 by Jelmer Vernooij
Set RepositoryFormat.supports_revision_signatures.
585
    supports_revision_signatures = False
0.200.1383 by Jelmer Vernooij
Claim to not support nested repositories.
586
    supports_nesting_repositories = False
0.200.1166 by Jelmer Vernooij
Set GitRepositoryFormat.revision_graph_can_have_wrong_parents.
587
    revision_graph_can_have_wrong_parents = False
0.200.1493 by Jelmer Vernooij
Test fixes.
588
    supports_unreferenced_revisions = True
0.200.1665 by Jelmer Vernooij
Rename _matchingbzrdir to _matchingcnotroldir.
589
    supports_setting_revision_ids = False
0.200.1698 by Jelmer Vernooij
Update xfail.
590
    supports_storing_branch_nick = False
591
    supports_overriding_transport = False
0.200.1746 by Jelmer Vernooij
Mark as not supporting custom revision properties.
592
    supports_custom_revision_properties = False
0.200.71 by Jelmer Vernooij
Implement GitRepositoryFormat.get_format_description.
593
0.200.1083 by Jelmer Vernooij
Register repository format.
594
    @property
0.200.1665 by Jelmer Vernooij
Rename _matchingbzrdir to _matchingcnotroldir.
595
    def _matchingcontroldir(self):
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
596
        from .dir import LocalGitControlDirFormat
0.200.1083 by Jelmer Vernooij
Register repository format.
597
        return LocalGitControlDirFormat()
598
0.200.71 by Jelmer Vernooij
Implement GitRepositoryFormat.get_format_description.
599
    def get_format_description(self):
600
        return "Git Repository"
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
601
0.200.1084 by Jelmer Vernooij
Support 'initializing' repositories in control directories.
602
    def initialize(self, controldir, shared=False, _internal=False):
0.200.1641 by Jelmer Vernooij
Use relative imports where possible.
603
        from .dir import GitDir
0.200.1084 by Jelmer Vernooij
Support 'initializing' repositories in control directories.
604
        if not isinstance(controldir, GitDir):
605
            raise errors.UninitializableFormat(self)
606
        return controldir.open_repository()
0.200.133 by Jelmer Vernooij
Unmark as deprecated.
607
608
    def check_conversion_target(self, target_repo_format):
609
        return target_repo_format.rich_root_data
0.200.536 by Jelmer Vernooij
Implement network name.
610
0.200.658 by Jelmer Vernooij
Provide right infrastructure for foreign repository tests from bzrlib.
611
    def get_foreign_tests_repository_factory(self):
0.200.1654 by Jelmer Vernooij
Fix test import.
612
        from .tests.test_repository import (
0.200.713 by Jelmer Vernooij
Improve formatting.
613
            ForeignTestsRepositoryFactory,
614
            )
0.200.658 by Jelmer Vernooij
Provide right infrastructure for foreign repository tests from bzrlib.
615
        return ForeignTestsRepositoryFactory()
616
0.200.536 by Jelmer Vernooij
Implement network name.
617
    def network_name(self):
618
        return "git"