History - Kiln » Dependencies » Dulwich

Kiln »

Dependencies »

Dulwich Read More

Clone URL:

Pushed to one repository ·

View In Graph Contained in master

Make ShaFiles created from files trust their filenames.

This adds a dummy FixedSha class that implements the read-only part
of hashlib's hash interface but does not actually compute a SHA-1
digest. This allows us to assign ids to file objects based on their
filename rather than requiring a read of the whole file; SHA-1s will
soon be checked during check().

Added a filename_to_sha helper function to objects.py; refactored the
opposite sha_to_filename functionality into this file as well for
parallelism and testing. As a side effect, reorganized some files in
tests/data to have the normal 2/38 filename structure.

Change-Id: Ic459628aec32a92e29ea49cfd6cbe685053971ef

Changeset c866eded426f …

Parent 79b760a98784 …

committed by Jelmer Vernooij Apr 12 10 at 3:07 PM

authored by Dave Borowitz Mar 4 10 at 11:37 PM

Changes to 11 files · Browse files at c866eded426f Showing diff from parent 79b760a98784 Diff from another changeset...

Change 1 of 2 Show Changes Only Show Entire File Loading... 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 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 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748	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 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747	`# 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.` `"""Git object store interfaces and implementation."""` `import errno` `import itertools` `import os` `import posixpath` `import stat` `import tempfile` `import urllib2` `from dulwich.errors import (` `NotTreeError,` `)` `from dulwich.file import GitFile` `from dulwich.objects import (` `Commit,` `ShaFile,` `Tag,` `Tree,` `hex_to_sha,` `sha_to_hex,`+`hex_to_filename,` `S_ISGITLINK,` `)` `from dulwich.pack import (` `Pack,` `PackData,` `iter_sha1,` `load_pack_index,` `write_pack,` `write_pack_data,` `write_pack_index_v2,` `)` `PACKDIR = 'pack'` `class BaseObjectStore(object):` `"""Object store interface."""` `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: Object iterator` `"""` `return ObjectStoreIterator(self, shas)` `def contains_loose(self, sha):` `"""Check if a particular object is present by SHA1 and is loose."""` `raise NotImplementedError(self.contains_loose)` `def contains_packed(self, sha):` `"""Check if a particular object is present by SHA1 and is packed."""` `raise NotImplementedError(self.contains_packed)` `def __contains__(self, sha):` `"""Check if a particular object is present by SHA1.` `This method makes no distinction between loose and packed objects.` `"""` `return self.contains_packed(sha) or self.contains_loose(sha)` `@property` `def packs(self):` `"""Iterable of pack objects."""` `raise NotImplementedError` `def get_raw(self, name):` `"""Obtain the raw text for an object.` `:param name: sha for the object.` `:return: tuple with numeric type and object contents.` `"""` `raise NotImplementedError(self.get_raw)` `def __getitem__(self, sha):` `"""Obtain an object by SHA1."""` `type_num, uncomp = self.get_raw(sha)` `return ShaFile.from_raw_string(type_num, uncomp)` `def __iter__(self):` `"""Iterate over the SHAs that are present in this store."""` `raise NotImplementedError(self.__iter__)` `def add_object(self, obj):` `"""Add a single object to this object store.` `"""` `raise NotImplementedError(self.add_object)` `def add_objects(self, objects):` `"""Add a set of objects to this object store.` `:param objects: Iterable over a list of objects.` `"""` `raise NotImplementedError(self.add_objects)` `def tree_changes(self, source, target, want_unchanged=False):` `"""Find the differences between the contents of two trees` `:param object_store: Object store to use for retrieving tree contents` `:param tree: SHA1 of the root tree` `:param want_unchanged: Whether unchanged files should be reported` `:return: Iterator over tuples with (oldpath, newpath), (oldmode, newmode), (oldsha, newsha)` `"""` `todo = set([(source, target, "")])` `while todo:` `(sid, tid, path) = todo.pop()` `if sid is not None:` `stree = self[sid]` `else:` `stree = {}` `if tid is not None:` `ttree = self[tid]` `else:` `ttree = {}` `for name, oldmode, oldhexsha in stree.iteritems():` `oldchildpath = posixpath.join(path, name)` `try:` `(newmode, newhexsha) = ttree[name]` `newchildpath = oldchildpath` `except KeyError:` `newmode = None` `newhexsha = None` `newchildpath = None` `if (want_unchanged or oldmode != newmode or` `oldhexsha != newhexsha):` `if stat.S_ISDIR(oldmode):` `if newmode is None or stat.S_ISDIR(newmode):` `todo.add((oldhexsha, newhexsha, oldchildpath))` `else:` `# entry became a file` `todo.add((oldhexsha, None, oldchildpath))` `yield ((None, newchildpath), (None, newmode), (None, newhexsha))` `else:` `if newmode is not None and stat.S_ISDIR(newmode):` `# entry became a dir` `yield ((oldchildpath, None), (oldmode, None), (oldhexsha, None))` `todo.add((None, newhexsha, newchildpath))` `else:` `yield ((oldchildpath, newchildpath), (oldmode, newmode), (oldhexsha, newhexsha))` `for name, newmode, newhexsha in ttree.iteritems():` `childpath = posixpath.join(path, name)` `if not name in stree:` `if not stat.S_ISDIR(newmode):` `yield ((None, childpath), (None, newmode), (None, newhexsha))` `else:` `todo.add((None, newhexsha, childpath))` `def iter_tree_contents(self, tree):` `"""Yield (path, mode, hexsha) tuples for all non-Tree objects in a tree.` `:param tree: SHA1 of the root of the tree` `"""` `todo = set([(tree, "")])` `while todo:` `(tid, tpath) = todo.pop()` `tree = self[tid]` `for name, mode, hexsha in tree.iteritems():` `path = posixpath.join(tpath, name)` `if stat.S_ISDIR(mode):` `todo.add((hexsha, path))` `else:` `yield path, mode, hexsha` `def find_missing_objects(self, haves, wants, progress=None,` `get_tagged=None):` `"""Find the missing objects required for a set of revisions.` `:param haves: Iterable over SHAs already in common.` `:param wants: Iterable over SHAs of objects to fetch.` `:param progress: Simple progress function that will be called with` `updated progress strings.` `:param get_tagged: Function that returns a dict of pointed-to sha -> tag` `sha for including tags.` `:return: Iterator over (sha, path) pairs.` `"""` `finder = MissingObjectFinder(self, haves, wants, progress, get_tagged)` `return iter(finder.next, None)` `def find_common_revisions(self, graphwalker):` `"""Find which revisions this store has in common using graphwalker.` `:param graphwalker: A graphwalker object.` `:return: List of SHAs that are in common` `"""` `haves = []` `sha = graphwalker.next()` `while sha:` `if sha in self:` `haves.append(sha)` `graphwalker.ack(sha)` `sha = graphwalker.next()` `return haves` `def get_graph_walker(self, heads):` `"""Obtain a graph walker for this object store.` `:param heads: Local heads to start search with` `:return: GraphWalker object` `"""` `return ObjectStoreGraphWalker(heads, lambda sha: self[sha].parents)` `def generate_pack_contents(self, have, want, progress=None):` `"""Iterate over the contents of a pack file.` `:param have: List of SHA1s of objects that should not be sent` `:param want: List of SHA1s of objects that should be sent` `:param progress: Optional progress reporting method` `"""` `return self.iter_shas(self.find_missing_objects(have, want, progress))` `class PackBasedObjectStore(BaseObjectStore):` `def __init__(self):` `self._pack_cache = None` `def contains_packed(self, sha):` `"""Check if a particular object is present by SHA1 and is packed."""` `for pack in self.packs:` `if sha in pack:` `return True` `return False` `def _load_packs(self):` `raise NotImplementedError(self._load_packs)` `def _pack_cache_stale(self):` `"""Check whether the pack cache is stale."""` `raise NotImplementedError(self._pack_cache_stale)` `def _add_known_pack(self, pack):` `"""Add a newly appeared pack to the cache by path.` `"""` `if self._pack_cache is not None:` `self._pack_cache.append(pack)` `@property` `def packs(self):` `"""List with pack objects."""` `if self._pack_cache is None or self._pack_cache_stale():` `self._pack_cache = self._load_packs()` `return self._pack_cache` `def _iter_loose_objects(self):` `raise NotImplementedError(self._iter_loose_objects)` `def _get_loose_object(self, sha):` `raise NotImplementedError(self._get_loose_object)` `def __iter__(self):` `"""Iterate over the SHAs that are present in this store."""` `iterables = self.packs + [self._iter_loose_objects()]` `return itertools.chain(*iterables)` `def contains_loose(self, sha):` `"""Check if a particular object is present by SHA1 and is loose."""` `return self._get_loose_object(sha) is not None` `def get_raw(self, name):` `"""Obtain the raw text for an object.` `:param name: sha for the object.` `:return: tuple with numeric 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_loose_object(hexsha)` `if ret is not None:` `return ret.type_num, ret.as_raw_string()` `raise KeyError(hexsha)` `def add_objects(self, objects):` `"""Add a set of objects to this object store.` `:param objects: Iterable over objects, should support __len__.` `"""` `if len(objects) == 0:` `# Don't bother writing an empty pack file` `return` `f, commit = self.add_pack()` `write_pack_data(f, objects, len(objects))` `commit()` `class DiskObjectStore(PackBasedObjectStore):` `"""Git-style object store that exists on disk."""` `def __init__(self, path):` `"""Open an object store.` `:param path: Path of the object store.` `"""` `super(DiskObjectStore, self).__init__()` `self.path = path` `self.pack_dir = os.path.join(self.path, PACKDIR)` `self._pack_cache_time = 0` `def _load_packs(self):` `pack_files = []` `try:` `self._pack_cache_time = os.stat(self.pack_dir).st_mtime` `pack_dir_contents = os.listdir(self.pack_dir)` `for name in pack_dir_contents:` `# TODO: verify that idx exists first` `if name.startswith("pack-") and name.endswith(".pack"):` `filename = os.path.join(self.pack_dir, name)` `pack_files.append((os.stat(filename).st_mtime, filename))` `except OSError, e:` `if e.errno == errno.ENOENT:` `return []` `raise` `pack_files.sort(reverse=True)` `suffix_len = len(".pack")` `return [Pack(f[:-suffix_len]) for _, f in pack_files]` `def _pack_cache_stale(self):` `try:` `return os.stat(self.pack_dir).st_mtime > self._pack_cache_time` `except OSError, e:` `if e.errno == errno.ENOENT:` `return True` `raise` `def _get_shafile_path(self, sha):`-`dir = sha[:2]`-`file = sha[2:]` `# Check from object dir`-`return os.path.join(self.path, dir, file)`+`return hex_to_filename(self.path, sha)` `def _iter_loose_objects(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_loose_object(self, sha):` `path = self._get_shafile_path(sha)` `try:` `return ShaFile.from_file(path)` `except (OSError, IOError), e:` `if e.errno == errno.ENOENT:` `return None` `raise` `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(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())` `p.close()` `os.rename(path, basename + ".pack")` `self._add_known_pack(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, 'wb')` `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, 'wb')` `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.` `:param obj: Object to add` `"""` `dir = os.path.join(self.path, obj.id[:2])` `try:` `os.mkdir(dir)` `except OSError, e:` `if e.errno != errno.EEXIST:` `raise` `path = os.path.join(dir, obj.id[2:])` `if os.path.exists(path):` `return # Already there, no need to write again` `f = GitFile(path, 'wb')` `try:` `f.write(obj.as_legacy_object())` `finally:` `f.close()` `@classmethod` `def init(cls, path):` `try:` `os.mkdir(path)` `except OSError, e:` `if e.errno != errno.EEXIST:` `raise` `os.mkdir(os.path.join(path, "info"))` `os.mkdir(os.path.join(path, PACKDIR))` `return cls(path)` `class MemoryObjectStore(BaseObjectStore):` `"""Object store that keeps all objects in memory."""` `def __init__(self):` `super(MemoryObjectStore, self).__init__()` `self._data = {}` `def contains_loose(self, sha):` `"""Check if a particular object is present by SHA1 and is loose."""` `return sha in self._data` `def contains_packed(self, sha):` `"""Check if a particular object is present by SHA1 and is packed."""` `return False` `def __iter__(self):` `"""Iterate over the SHAs that are present in this store."""` `return self._data.iterkeys()` `@property` `def packs(self):` `"""List with pack objects."""` `return []` `def get_raw(self, name):` `"""Obtain the raw text for an object.` `:param name: sha for the object.` `:return: tuple with numeric type and object contents.` `"""` `return self[name].as_raw_string()` `def __getitem__(self, name):` `return self._data[name]` `def add_object(self, obj):` `"""Add a single object to this object store.` `"""` `self._data[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.` `"""` `for obj, path in objects:` `self._data[obj.id] = obj` `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):` `"""Create a new ObjectIterator.` `:param store: Object store to retrieve from` `:param sha_iter: Iterator over (sha, path) tuples` `"""` `self.store = store` `self.sha_iter = sha_iter` `self._shas = []` `def __iter__(self):` `"""Yield tuple with next object and path."""` `for sha, path in self.itershas():` `yield self.store[sha], path` `def iterobjects(self):` `"""Iterate over just the objects."""` `for o, path in self:` `yield o` `def itershas(self):` `"""Iterate over the SHAs."""` `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.` `:note: This checks if the object is present in` `the underlying object store, not if it would` `be yielded by the iterator.` `:param needle: SHA1 of the object to check for` `"""` `return needle in self.store` `def __getitem__(self, key):` `"""Find an object by SHA1.` `:note: This retrieves the object from the underlying` `object store. It will also succeed if the object would` `not be returned by the iterator.` `"""` `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):` `"""Lookup an object in a Git tree.` `:param lookup_obj: Callback for retrieving object by SHA1` `:param root_sha: SHA1 of the root tree` `:param path: Path to lookup` `"""` `parts = path.split("/")` `sha = root_sha` `mode = None` `for p in parts:` `obj = lookup_obj(sha)` `if not isinstance(obj, Tree):` `raise NotTreeError(sha)` `if p == '':` `continue` `mode, sha = obj[p]` `return mode, 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 haves: SHA1s of commits not to send (already present in target)` `:param wants: SHA1s of commits to send` `:param progress: Optional function to report progress to.` `:param get_tagged: Function that returns a dict of pointed-to sha -> tag` `sha for including tags.` `:param tagged: dict of pointed-to sha -> tag sha for including tags` `"""` `def __init__(self, object_store, haves, wants, progress=None,` `get_tagged=None):` `self.sha_done = set(haves)` `self.objects_to_send = set([(w, None, False) for w in wants if w not in haves])` `self.object_store = object_store` `if progress is None:` `self.progress = lambda x: None` `else:` `self.progress = progress` `self._tagged = get_tagged and get_tagged() or {}` `def add_todo(self, entries):` `self.objects_to_send.update([e for e in entries if not e[0] in self.sha_done])` `def parse_tree(self, tree):` `self.add_todo([(sha, name, not stat.S_ISDIR(mode)) for (mode, name, sha) in tree.entries() if not S_ISGITLINK(mode)])` `def parse_commit(self, commit):` `self.add_todo([(commit.tree, "", False)])` `self.add_todo([(p, None, False) for p in commit.parents])` `def parse_tag(self, tag):` `self.add_todo([(tag.object[1], None, False)])` `def next(self):` `if not self.objects_to_send:` `return None` `(sha, name, leaf) = self.objects_to_send.pop()` `if not leaf:` `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)` `if sha in self._tagged:` `self.add_todo([(self._tagged[sha], None, True)])` `self.sha_done.add(sha)` `self.progress("counting objects: %d\r" % len(self.sha_done))` `return (sha, name)` `class ObjectStoreGraphWalker(object):` `"""Graph walker that finds out what commits are missing from an object` `store.` `:ivar heads: Revisions without descendants in the local repo` `:ivar get_parents: Function to retrieve parents in the local repo` `"""` `def __init__(self, local_heads, get_parents):` `"""Create a new instance.` `:param local_heads: Heads to start search with` `:param get_parents: Function for finding the parents of a SHA1.` `"""` `self.heads = set(local_heads)` `self.get_parents = get_parents` `self.parents = {}` `def ack(self, sha):` `"""Ack that a revision and its ancestors are present in the source."""` `ancestors = set([sha])` `# stop if we run out of heads to remove` `while self.heads:` `for a in ancestors:` `if a in self.heads:` `self.heads.remove(a)` `# collect all ancestors` `new_ancestors = set()` `for a in ancestors:` `if a in self.parents:` `new_ancestors.update(self.parents[a])` `# no more ancestors; stop` `if not new_ancestors:` `break` `ancestors = new_ancestors` `def next(self):` `"""Iterate over ancestors of heads in the target."""` `if self.heads:` `ret = self.heads.pop()` `ps = self.get_parents(ret)` `self.parents[ret] = ps` `self.heads.update(ps)` `return ret` `return None`

Change 1 of 3 Show Changes Only Show Entire File Loading... dulwich/objects.py Stacked
84 85 86 87 88 89 120 121 122 123 124 125 282 283 284 285 286 287	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 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 317 318 319 320 321 322 323	@@ -84,6 +84,27 @@ `return binascii.unhexlify(hex)` +`def hex_to_filename(path, hex):`+`"""Takes a hex sha and returns its filename relative to the given path."""`+`dir = hex[:2]`+`file = hex[2:]`+`# Check from object dir`+`return os.path.join(path, dir, file)`+++`def filename_to_hex(filename):`+`"""Takes an object filename and returns its corresponding hex sha."""`+`# grab the last (up to) two path components`+`names = filename.rsplit(os.path.sep, 2)[-2:]`+`errmsg = "Invalid object filename: %s" % filename`+`assert len(names) == 2, errmsg`+`base, rest = names`+`assert len(base) == 2 and len(rest) == 38, errmsg`+`hex = base + rest`+`hex_to_sha(hex)`+`return hex`++ `def serializable_property(name, docstring=None):` `def set(obj, value):` `obj._ensure_parsed()`@@ -120,6 +141,20 @@ `or identity.find(">", email_end + 1) >= 0` `or not identity.endswith(">")):` `raise ObjectFormatException(error_msg)`+++`class FixedSha(object):`+`"""SHA object that behaves like hashlib's but is given a fixed value."""`++`def __init__(self, hexsha):`+`self._hexsha = hexsha`+`self._sha = hex_to_sha(hexsha)`++`def digest(self):`+`return self._sha`++`def hexdigest(self):`+`return self._hexsha` `class ShaFile(object):`@@ -282,6 +317,7 @@ `try:` `try:` `obj = cls._parse_file_header(f)`+`obj._sha = FixedSha(filename_to_hex(filename))` `obj._needs_parsing = True` `obj._needs_serialization = True` `return obj`

Show Entire File dulwich/tests/data/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8 Stacked renamed from dulwich/tests/data/blobs/6f670c0fb53f9463760b7295fbb814e965fb20c8
		(No changes)

Show Entire File dulwich/tests/data/blobs/95/4a536f7819d40e6f637f849ee187dd10066349 Stacked renamed from dulwich/tests/data/blobs/954a536f7819d40e6f637f849ee187dd10066349
		(No changes)

Show Entire File dulwich/tests/data/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 Stacked renamed from dulwich/tests/data/blobs/e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
		(No changes)

Show Entire File dulwich/tests/data/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 Stacked renamed from dulwich/tests/data/commits/0d89f20333fbb1d2f3a94da77f4981373d8f4310
		(No changes)

Show Entire File dulwich/tests/data/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc Stacked renamed from dulwich/tests/data/commits/5dac377bdded4c9aeb8dff595f0faeebcc8498cc
		(No changes)

Show Entire File dulwich/tests/data/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e Stacked renamed from dulwich/tests/data/commits/60dacdc733de308bb77bb76ce0fb0f9b44c9769e
		(No changes)

Show Entire File dulwich/tests/data/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023 Stacked renamed from dulwich/tests/data/tags/71033db03a03c6a36721efcf1968dd8f8e0cf023
		(No changes)

Show Entire File dulwich/tests/data/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 Stacked renamed from dulwich/tests/data/trees/70c190eb48fa8bbb50ddc692a17b44cb781af7f6
		(No changes)

Change 1 of 3 Show Changes Only Show Entire File Loading... dulwich/tests/test_objects.py Stacked
38 39 40 41 42 43 89 90 91 92 93 94 95 96 97 98 99 406 407 408 409 410 411 412 413	38 39 40 41 42 43 44 90 91 92 93 94 95 96 97 98 99 100 407 408 409 410 411 412 413 414	@@ -38,6 +38,7 @@ `Tag,` `format_timezone,` `hex_to_sha,`+`hex_to_filename,` `check_hexsha,` `check_identity,` `parse_timezone,`@@ -89,11 +90,11 @@ `class BlobReadTests(unittest.TestCase):` `"""Test decompression of blobs"""`--`def get_sha_file(self, obj, base, sha):`-`return obj.from_file(os.path.join(os.path.dirname(__file__),`-`'data', base, sha))`-++`def get_sha_file(self, cls, base, sha):`+`dir = os.path.join(os.path.dirname(__file__), 'data', base)`+`return cls.from_file(hex_to_filename(dir, sha))`+ `def get_blob(self, sha):` `"""Return the blob named sha from the test data dir"""` `return self.get_sha_file(Blob, 'blobs', sha)`@@ -406,8 +407,8 @@ `self.assertEquals(["a.c", "a", "a/c"], [p[0] for p in x.iteritems()])` `def _do_test_parse_tree(self, parse_tree):`-`o = Tree.from_file(os.path.join(os.path.dirname(__file__), 'data',`-`'trees', tree_sha))`+`dir = os.path.join(os.path.dirname(__file__), 'data', 'trees')`+`o = Tree.from_file(hex_to_filename(dir, tree_sha))` `o._parse_file()` `self.assertEquals([('a', 0100644, a_sha), ('b', 0100644, b_sha)],` `list(parse_tree(o.as_raw_string())))`

Diff Options

Attach a Trello Card

Your session has expired

Diff Options

Create a branch

Diff to c866eded426f

Attach a Trello Card

Add a tag

Your session has expired