/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/push.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/push.py
1
 
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
"""Basic push implementation."""
18
 
 
19
 
from ..push import (
20
 
    PushResult,
21
 
    )
22
 
from .errors import (
23
 
    GitSmartRemoteNotSupported,
24
 
    )
25
 
 
26
 
 
27
 
class GitPushResult(PushResult):
28
 
 
29
 
    def _lookup_revno(self, revid):
30
 
        from .branch import _quick_lookup_revno
31
 
        try:
32
 
            return _quick_lookup_revno(self.source_branch, self.target_branch,
33
 
                                       revid)
34
 
        except GitSmartRemoteNotSupported:
35
 
            return None
36
 
 
37
 
    @property
38
 
    def old_revno(self):
39
 
        return self._lookup_revno(self.old_revid)
40
 
 
41
 
    @property
42
 
    def new_revno(self):
43
 
        return self._lookup_revno(self.new_revid)
44
 
 
45
 
 
46
 
class MissingObjectsIterator(object):
47
 
    """Iterate over git objects that are missing from a target repository.
48
 
 
49
 
    """
50
 
 
51
 
    def __init__(self, store, source, pb=None):
52
 
        """Create a new missing objects iterator.
53
 
 
54
 
        """
55
 
        self.source = source
56
 
        self._object_store = store
57
 
        self._pending = []
58
 
        self.pb = pb
59
 
 
60
 
    def import_revisions(self, revids, lossy):
61
 
        """Import a set of revisions into this git repository.
62
 
 
63
 
        :param revids: Revision ids of revisions to import
64
 
        :param lossy: Whether to not roundtrip bzr metadata
65
 
        """
66
 
        for i, revid in enumerate(revids):
67
 
            if self.pb:
68
 
                self.pb.update("pushing revisions", i, len(revids))
69
 
            git_commit = self.import_revision(revid, lossy)
70
 
            yield (revid, git_commit)
71
 
 
72
 
    def import_revision(self, revid, lossy):
73
 
        """Import a revision into this Git repository.
74
 
 
75
 
        :param revid: Revision id of the revision
76
 
        :param roundtrip: Whether to roundtrip bzr metadata
77
 
        """
78
 
        tree = self._object_store.tree_cache.revision_tree(revid)
79
 
        rev = self.source.get_revision(revid)
80
 
        commit = None
81
 
        for path, obj in self._object_store._revision_to_objects(
82
 
                rev, tree, lossy):
83
 
            if obj.type_name == b"commit":
84
 
                commit = obj
85
 
            self._pending.append((obj, path))
86
 
        if commit is None:
87
 
            raise AssertionError("no commit object generated for revision %s" %
88
 
                                 revid)
89
 
        return commit.id
90
 
 
91
 
    def __len__(self):
92
 
        return len(self._pending)
93
 
 
94
 
    def __iter__(self):
95
 
        return iter(self._pending)
96
 
 
97
 
 
98
 
class ObjectStoreParentsProvider(object):
99
 
 
100
 
    def __init__(self, store):
101
 
        self._store = store
102
 
 
103
 
    def get_parent_map(self, shas):
104
 
        ret = {}
105
 
        for sha in shas:
106
 
            if sha is None:
107
 
                parents = []
108
 
            else:
109
 
                try:
110
 
                    parents = self._store[sha].parents
111
 
                except KeyError:
112
 
                    parents = None
113
 
            ret[sha] = parents
114
 
        return ret
115
 
 
116
 
 
117
 
def remote_divergence(old_sha, new_sha, store):
118
 
    if old_sha is None:
119
 
        return False
120
 
    if not isinstance(old_sha, bytes):
121
 
        raise TypeError(old_sha)
122
 
    if not isinstance(new_sha, bytes):
123
 
        raise TypeError(new_sha)
124
 
    from breezy.graph import Graph
125
 
    graph = Graph(ObjectStoreParentsProvider(store))
126
 
    return not graph.is_ancestor(old_sha, new_sha)