Kiln » Dependencies » Dulwich Read More
Clone URL:  
Pushed to one repository · View In Graph Contained in master

Move some of the finding missing objects code to object_store.

Changeset c34d66fd9445…

Parent 86f2e56a9792…

by Jelmer Vernooij

Changes to 2 files · Browse files at c34d66fd9445 Showing diff from parent 86f2e56a9792 Diff from another changeset...

Change 1 of 5 Show Changes Only dulwich/​object_store.py Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
 
69
70
71
72
73
74
75
76
77
 
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
 
 
 
229
230
231
232
233
234
235
236
237
238
239
240
 
 
 
 
 
 
 
 
 
 
 
 
 
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
 # object_store.py -- Object store for git objects  # Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>  #  # This program is free software; you can redistribute it and/or  # modify it under the terms of the GNU General Public License  # as published by the Free Software Foundation; either version 2  # or (at your option) a later version of the License.  #  # This program is distributed in the hope that it will be useful,  # but WITHOUT ANY WARRANTY; without even the implied warranty of  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  # GNU General Public License for more details.  #  # You should have received a copy of the GNU General Public License  # along with this program; if not, write to the Free Software  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,  # MA 02110-1301, USA.    import itertools  import os  import tempfile  import urllib2    from dulwich.errors import (   NotTreeError,   )  from dulwich.objects import (   ShaFile,   Tree,   hex_to_sha,   sha_to_hex,   )  from dulwich.pack import (   Pack,   PackData,   iter_sha1,   load_packs,   load_pack_index,   write_pack,   write_pack_data,   write_pack_index_v2,   )    PACKDIR = 'pack'    class ObjectStore(object):   """Object store."""     def __init__(self, path):   """Open an object store.     :param path: Path of the object store.   """   self.path = path   self._pack_cache = None   self.pack_dir = os.path.join(self.path, PACKDIR)     def determine_wants_all(self, refs):   return [sha for (ref, sha) in refs.iteritems() if not sha in self and not ref.endswith("^{}")]     def iter_shas(self, shas):   """Iterate over the objects for the specified shas.     :param shas: Iterable object with SHAs   """   return ObjectStoreIterator(self, shas)     def __contains__(self, sha): + """Check if a particular object is present by SHA1."""   for pack in self.packs:   if sha in pack:   return True   ret = self._get_shafile(sha)   if ret is not None:   return True   return False     def __iter__(self): + """Iterate over the SHAs that are present in this store."""   iterables = self.packs + [self._iter_shafile_shas()]   return itertools.chain(*iterables)     @property   def packs(self):   """List with pack objects."""   if self._pack_cache is None:   self._pack_cache = list(load_packs(self.pack_dir))   return self._pack_cache     def _add_known_pack(self, path):   """Add a newly appeared pack to the cache by path.     """   if self._pack_cache is not None:   self._pack_cache.append(Pack(path))     def _get_shafile_path(self, sha):   dir = sha[:2]   file = sha[2:]   # Check from object dir   return os.path.join(self.path, dir, file)     def _iter_shafile_shas(self):   for base in os.listdir(self.path):   if len(base) != 2:   continue   for rest in os.listdir(os.path.join(self.path, base)):   yield base+rest     def _get_shafile(self, sha):   path = self._get_shafile_path(sha)   if os.path.exists(path):   return ShaFile.from_file(path)   return None     def _add_shafile(self, sha, o):   dir = os.path.join(self.path, sha[:2])   if not os.path.isdir(dir):   os.mkdir(dir)   path = os.path.join(dir, sha[2:])   f = open(path, 'w+')   try:   f.write(o.as_legacy_object())   finally:   f.close()     def get_raw(self, name):   """Obtain the raw text for an object.     :param name: sha for the object.   :return: tuple with object type and object contents.   """   if len(name) == 40:   sha = hex_to_sha(name)   hexsha = name   elif len(name) == 20:   sha = name   hexsha = None   else:   raise AssertionError   for pack in self.packs:   try:   return pack.get_raw(sha)   except KeyError:   pass   if hexsha is None:   hexsha = sha_to_hex(name)   ret = self._get_shafile(hexsha)   if ret is not None:   return ret.type, ret.as_raw_string()   raise KeyError(hexsha)     def __getitem__(self, sha):   type, uncomp = self.get_raw(sha)   return ShaFile.from_raw_string(type, uncomp)     def move_in_thin_pack(self, path):   """Move a specific file containing a pack into the pack directory.     :note: The file should be on the same file system as the   packs directory.     :param path: Path to the pack file.   """   data = PackData(path)     # Write index for the thin pack (do we really need this?)   temppath = os.path.join(self.pack_dir,   sha_to_hex(urllib2.randombytes(20))+".tempidx")   data.create_index_v2(temppath, self.get_raw)   p = Pack.from_objects(data, load_pack_index(temppath))     # Write a full pack version   temppath = os.path.join(self.pack_dir,   sha_to_hex(urllib2.randombytes(20))+".temppack")   write_pack(temppath, ((o, None) for o in p.iterobjects(self.get_raw)),   len(p))   pack_sha = load_pack_index(temppath+".idx").objects_sha1()   newbasename = os.path.join(self.pack_dir, "pack-%s" % pack_sha)   os.rename(temppath+".pack", newbasename+".pack")   os.rename(temppath+".idx", newbasename+".idx")   self._add_known_pack(newbasename)     def move_in_pack(self, path):   """Move a specific file containing a pack into the pack directory.     :note: The file should be on the same file system as the   packs directory.     :param path: Path to the pack file.   """   p = PackData(path)   entries = p.sorted_entries()   basename = os.path.join(self.pack_dir,   "pack-%s" % iter_sha1(entry[0] for entry in entries))   write_pack_index_v2(basename+".idx", entries, p.get_stored_checksum())   os.rename(path, basename + ".pack")   self._add_known_pack(basename)     def add_thin_pack(self):   """Add a new thin pack to this object store.     Thin packs are packs that contain deltas with parents that exist   in a different pack.   """   fd, path = tempfile.mkstemp(dir=self.pack_dir, suffix=".pack")   f = os.fdopen(fd, 'w')   def commit():   os.fsync(fd)   f.close()   if os.path.getsize(path) > 0:   self.move_in_thin_pack(path)   return f, commit     def add_pack(self):   """Add a new pack to this object store.     :return: Fileobject to write to and a commit function to   call when the pack is finished.   """   fd, path = tempfile.mkstemp(dir=self.pack_dir, suffix=".pack")   f = os.fdopen(fd, 'w')   def commit():   os.fsync(fd)   f.close()   if os.path.getsize(path) > 0:   self.move_in_pack(path)   return f, commit     def add_object(self, obj): + """Add a single object to this object store. + + """   self._add_shafile(obj.id, obj)     def add_objects(self, objects):   """Add a set of objects to this object store.     :param objects: Iterable over a list of objects.   """   if len(objects) == 0:   return   f, commit = self.add_pack()   write_pack_data(f, objects, len(objects))   commit() + + def find_missing_objects(self, wants, graph_walker, progress): + """Find the missing objects required for a set of revisions. + + :param wants: Iterable over SHAs of objects to fetch. + :param graph_walker: Object that can iterate over the list of revisions + to fetch and has an "ack" method that will be called to acknowledge + that a revision is present. + :param progress: Simple progress function that will be called with + updated progress strings. + :return: Iterator over (sha, path) pairs. + """ + return iter(MissingObjectFinder(self, wants, graph_walker, progress).next, None)      class ObjectImporter(object):   """Interface for importing objects."""     def __init__(self, count):   """Create a new ObjectImporter.     :param count: Number of objects that's going to be imported.   """   self.count = count     def add_object(self, object):   """Add an object."""   raise NotImplementedError(self.add_object)     def finish(self, object):   """Finish the imoprt and write objects to disk."""   raise NotImplementedError(self.finish)      class ObjectIterator(object):   """Interface for iterating over objects."""     def iterobjects(self):   raise NotImplementedError(self.iterobjects)      class ObjectStoreIterator(ObjectIterator):   """ObjectIterator that works on top of an ObjectStore."""     def __init__(self, store, sha_iter):   self.store = store   self.sha_iter = sha_iter   self._shas = []     def __iter__(self):   for sha, path in self.itershas():   yield self.store[sha], path     def iterobjects(self):   for o, path in self:   yield o     def itershas(self):   for sha in self._shas:   yield sha   for sha in self.sha_iter:   self._shas.append(sha)   yield sha     def __contains__(self, needle):   """Check if an object is present.     :param needle: SHA1 of the object to check for   """   return needle in self.store     def __getitem__(self, key):   """Find an object by SHA1."""   return self.store[key]     def __len__(self):   """Return the number of objects."""   return len(list(self.itershas()))      def tree_lookup_path(lookup_obj, root_sha, path):   parts = path.split("/")   sha = root_sha   for p in parts:   obj = lookup_obj(sha)   if type(obj) is not Tree:   raise NotTreeError(sha)   if p == '':   continue   mode, sha = obj[p]   return lookup_obj(sha) + + +class MissingObjectFinder(object): + """Find the objects missing from another object store. + + :param object_store: Object store containing at least all objects to be + sent + :param wants: SHA1s of commits to send + :param graph_walker: graph walker object used to see what the remote + repo has and misses + :param progress: Optional function to report progress to. + """ + + def __init__(self, object_store, wants, graph_walker, progress=None): + self.sha_done = set() + self.objects_to_send = set([(w, None) for w in wants]) + self.object_store = object_store + if progress is None: + self.progress = lambda x: None + else: + self.progress = progress + ref = graph_walker.next() + while ref: + if ref in self.object_store: + graph_walker.ack(ref) + ref = graph_walker.next() + + def add_todo(self, entries): + self.objects_to_send.update([e for e in entries if not e in self.sha_done]) + + def parse_tree(self, tree): + self.add_todo([(sha, name) for (mode, name, sha) in tree.entries()]) + + def parse_commit(self, commit): + self.add_todo([(commit.tree, "")]) + self.add_todo([(p, None) for p in commit.parents]) + + def parse_tag(self, tag): + self.add_todo([(tag.object[1], None)]) + + def next(self): + if not self.objects_to_send: + return None + (sha, name) = self.objects_to_send.pop() + o = self.object_store[sha] + if isinstance(o, Commit): + self.parse_commit(o) + elif isinstance(o, Tree): + self.parse_tree(o) + elif isinstance(o, Tag): + self.parse_tag(o) + self.sha_done.add((sha, name)) + self.progress("counting objects: %d\r" % len(self.sha_done)) + return (sha, name) + + +
Change 1 of 2 Show Entire File dulwich/​repo.py Stacked
 
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
 
186
187
188
 
189
190
191
192
 
 
193
194
195
 
88
89
90
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
91
92
93
 
132
133
134
135
136
137
 
 
138
139
140
141
142
@@ -88,60 +88,6 @@
  yield tuple(l.rstrip("\n").split(" ", 2))     -class MissingObjectFinder(object): - """Find the objects missing from another git repository. - - :param object_store: Object store containing at least all objects to be - sent - :param wants: SHA1s of commits to send - :param graph_walker: graph walker object used to see what the remote - repo has and misses - :param progress: Optional function to report progress to. - """ - - def __init__(self, object_store, wants, graph_walker, progress=None): - self.sha_done = set() - self.objects_to_send = set([(w, None) for w in wants]) - self.object_store = object_store - if progress is None: - self.progress = lambda x: None - else: - self.progress = progress - ref = graph_walker.next() - while ref: - if ref in self.object_store: - graph_walker.ack(ref) - ref = graph_walker.next() - - def add_todo(self, entries): - self.objects_to_send.update([e for e in entries if not e in self.sha_done]) - - def parse_tree(self, tree): - self.add_todo([(sha, name) for (mode, name, sha) in tree.entries()]) - - def parse_commit(self, commit): - self.add_todo([(commit.tree, "")]) - self.add_todo([(p, None) for p in commit.parents]) - - def parse_tag(self, tag): - self.add_todo([(tag.object[1], None)]) - - def next(self): - if not self.objects_to_send: - return None - (sha, name) = self.objects_to_send.pop() - o = self.object_store[sha] - if isinstance(o, Commit): - self.parse_commit(o) - elif isinstance(o, Tree): - self.parse_tree(o) - elif isinstance(o, Tag): - self.parse_tag(o) - self.sha_done.add((sha, name)) - self.progress("counting objects: %d\r" % len(self.sha_done)) - return (sha, name) - -  class Repo(object):   """A local git repository."""   @@ -186,10 +132,11 @@
  that a revision is present.   :param progress: Simple progress function that will be called with   updated progress strings. + :return: Iterator over (sha, path) pairs.   """   wants = determine_wants(self.get_refs()) - return iter(MissingObjectFinder(self.object_store, wants, graph_walker, - progress).next, None) + return self.object_store.find_missing_objects(wants, + graph_walker, progress)     def fetch_objects(self, determine_wants, graph_walker, progress):   """Fetch the missing objects required for a set of revisions.