/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 push.py

Clean up trailing whitespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
30
30
from bzrlib.plugins.git.errors import (
31
31
    NoPushSupport,
32
32
    )
 
33
from bzrlib.plugins.git.mapping import (
 
34
    extract_unusual_modes,
 
35
    )
33
36
from bzrlib.plugins.git.object_store import (
34
37
    BazaarObjectStore,
35
38
    )
54
57
        """
55
58
        self.source = source
56
59
        self._object_store = store
 
60
        self._revids = set()
 
61
        self._sent_shas = set()
57
62
        self._pending = []
58
63
        self.pb = pb
59
64
 
60
65
    def import_revisions(self, revids):
 
66
        self._revids.update(revids)
61
67
        for i, revid in enumerate(revids):
62
68
            if self.pb:
63
69
                self.pb.update("pushing revisions", i, len(revids))
64
70
            git_commit = self.import_revision(revid)
65
71
            yield (revid, git_commit)
66
72
 
 
73
    def need_sha(self, sha):
 
74
        if sha is None or sha in self._sent_shas:
 
75
            return False
 
76
        (type, (fileid, revid)) = self._object_store._idmap.lookup_git_sha(sha)
 
77
        assert type in ("blob", "tree")
 
78
        if revid in self._revids:
 
79
            # Not sent yet, and part of the set of revisions to send
 
80
            return True
 
81
        # Not changed in the revisions to send, so either not necessary
 
82
        # or already present remotely (as git doesn't do ghosts)
 
83
        return False
 
84
 
 
85
    def queue(self, sha, obj, path, ie=None, inv=None, unusual_modes=None):
 
86
        if obj is None:
 
87
            # Can't lazy-evaluate directories, since they might be eliminated
 
88
            if ie.kind == "directory":
 
89
                obj = self._object_store._get_ie_object(ie, inv, unusual_modes)
 
90
                if obj is None:
 
91
                    return
 
92
            else:
 
93
                obj = (ie, inv, unusual_modes)
 
94
        self._pending.append((obj, path))
 
95
        self._sent_shas.add(sha)
 
96
 
67
97
    def import_revision(self, revid):
68
98
        """Import the gist of a revision into this Git repository.
69
99
 
70
100
        """
71
 
        inv = self._object_store.parent_invs_cache.get_inventory(revid)
 
101
        inv = self.source.get_inventory(revid)
72
102
        rev = self.source.get_revision(revid)
73
 
        commit = None
74
 
        for path, obj, ie in self._object_store._revision_to_objects(rev, inv):
75
 
            if obj.type_name == "commit":
76
 
                commit = obj
77
 
            self._pending.append((obj, path))
 
103
        unusual_modes = extract_unusual_modes(rev)
 
104
        todo = [inv.root]
 
105
        tree_sha = None
 
106
        while todo:
 
107
            ie = todo.pop()
 
108
            (sha, object) = self._object_store._get_ie_object_or_sha1(ie, inv, unusual_modes)
 
109
            if ie.parent_id is None:
 
110
                tree_sha = sha
 
111
            if not self.need_sha(sha):
 
112
                continue
 
113
            self.queue(sha, object, inv.id2path(ie.file_id), ie, inv, unusual_modes)
 
114
            if ie.kind == "directory":
 
115
                todo.extend(ie.children.values())
 
116
        assert tree_sha is not None
 
117
        commit = self._object_store._get_commit(rev, tree_sha)
 
118
        self.queue(commit.id, commit, None, None)
78
119
        return commit.id
79
120
 
80
121
    def __len__(self):
81
122
        return len(self._pending)
82
123
 
83
124
    def __iter__(self):
84
 
        return iter(self._pending)
 
125
        for i, (object, path) in enumerate(self._pending):
 
126
            if self.pb:
 
127
                self.pb.update("writing pack objects", i, len(self))
 
128
            if isinstance(object, tuple):
 
129
                object = self._object_store._get_ie_object(*object)
 
130
            yield (object, path)
85
131
 
86
132
 
87
133
class InterToGitRepository(InterRepository):
123
169
            pb.finished()
124
170
 
125
171
    def dfetch_refs(self, refs):
126
 
        old_refs = self.target._git.get_refs()
127
172
        new_refs = {}
128
173
        revidmap, gitidmap = self.dfetch(refs.values())
129
174
        for name, revid in refs.iteritems():
133
178
                gitid = self.source_store._lookup_revision_sha1(revid)
134
179
            self.target._git.refs[name] = gitid
135
180
            new_refs[name] = gitid
136
 
        return revidmap, old_refs, new_refs
 
181
        return revidmap, new_refs
137
182
 
138
183
    def dfetch(self, stop_revisions):
139
184
        """Import the gist of the ancestry of a particular revision."""
178
223
    def dfetch_refs(self, new_refs):
179
224
        """Import the gist of the ancestry of a particular revision."""
180
225
        revidmap = {}
181
 
        old_refs = {}
182
226
        def determine_wants(refs):
183
227
            ret = {}
184
 
            old_refs.update(new_refs)
185
228
            for name, revid in new_refs.iteritems():
186
229
                ret[name] = self.source_store._lookup_revision_sha1(revid)
187
230
            return ret
191
234
                    self.source_store.generate_pack_contents)
192
235
        finally:
193
236
            self.source.unlock()
194
 
        return revidmap, old_refs, new_refs
 
237
        return revidmap, new_refs
195
238
 
196
239
    @staticmethod
197
240
    def is_compatible(source, target):