History - Kiln » Dependencies » Dulwich - Kiln

We are currently indexing your data, so search results may be incomplete until we finish.

This is a Git-only repository.

Dependencies »

Dulwich Read More

Clone URL:

Copy to Clipboard

Pushed to one repository ·

View In Graph Contained in master

fix writing of legacy objects.

Changeset ed7e2be820a4 …

Parent 9baa924242e6 …

by Jelmer Vernooij Apr 19 09 at 3:10 PM

Changes to 3 files · Browse files at ed7e2be820a4 Showing diff from parent 9baa924242e6 Diff from another changeset...

Change 1 of 3 Show Changes Only Show Entire File Loading... dulwich/index.py Stacked
59 60 61 62 63 64 65 142 143 144 145 146 147 149 150 151	59 60 61 62 63 64 65 142 143 144 145 146 147 148 149 150 151 152 153 154 156 157 158 159 160 161 162	@@ -59,7 +59,7 @@ `f.write(struct.pack(">LLLLLL20sH", ino, dev, mode, uid, gid, size, sha, flags))` `f.write(name)` `f.write(chr(0))`-`real_size = ((f.tell() - beginoffset + 8) & ~7)`+`real_size = ((f.tell() - beginoffset + 7) & ~7)` `f.write(chr(0) * (f.tell() - (beginoffset + real_size)))` `return` @@ -142,6 +142,13 @@ `def __getitem__(self, name):` `return self._byname[name]` +`def get_sha1(self, path):`+`return self[path][-2]`++`def clear(self):`+`self._byname = {}`+`self._entries = []`+ `def __setitem__(self, name, x):` `# Remove the old entry if any` `old_entry = self._byname.get(x[0])`@@ -149,3 +156,7 @@ `self._entries.remove(old_entry)` `self._entries.append(x)` `self._byname[x[0]] = x`++`def update(self, entries):`+`for name, value in entries.iteritems():`+`self[name] = value`

Change 1 of 2 Show Changes Only Show Entire File Loading... dulwich/object_store.py Stacked
100 101 102 103 104 105 106 107 108 109 110 211 212 213 214 215 216	100 101 102 103 104 105 106 107 108 109 110 111 112 213 214 215 216 217 218 219 220 221	@@ -100,11 +100,13 @@ `return None` `def _add_shafile(self, sha, o):`-`path = self._get_shafile_path(sha)`-`f = os.path.open(path, 'w')`+`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._header())`-`f.write(o._text)`+`f.write(o.as_legacy_object())` `finally:` `f.close()` @@ -211,6 +213,9 @@ `self.move_in_pack(path)` `return f, commit` +`def add_object(self, obj):`+`self._add_shafile(obj.id, obj)`+ `def add_objects(self, objects):` `"""Add a set of objects to this object store.`

Change 1 of 2 Show Changes Only Show Entire File Loading... dulwich/objects.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	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	`# objects.py -- Access to base git objects` `# Copyright (C) 2007 James Westby <jw+debian@jameswestby.net>` `# Copyright (C) 2008 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; version 2` `# of the License 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.` `"""Access to base git objects."""` `import mmap` `import os` `import sha` `import zlib` `from dulwich.errors import (` `NotBlobError,` `NotCommitError,` `NotTreeError,` `)` `BLOB_ID = "blob"` `TAG_ID = "tag"` `TREE_ID = "tree"` `COMMIT_ID = "commit"` `PARENT_ID = "parent"` `AUTHOR_ID = "author"` `COMMITTER_ID = "committer"` `OBJECT_ID = "object"` `TYPE_ID = "type"` `TAGGER_ID = "tagger"` `def _decompress(string):` `dcomp = zlib.decompressobj()` `dcomped = dcomp.decompress(string)` `dcomped += dcomp.flush()` `return dcomped` `def sha_to_hex(sha):` `"""Takes a string and returns the hex of the sha within"""` `hexsha = "".join(["%02x" % ord(c) for c in sha])` `assert len(hexsha) == 40, "Incorrect length of sha1 string: %d" % hexsha` `return hexsha` `def hex_to_sha(hex):` `"""Takes a hex sha and returns a binary sha"""` `assert len(hex) == 40, "Incorrent length of hexsha: %s" % hex` `return ''.join([chr(int(hex[i:i+2], 16)) for i in xrange(0, len(hex), 2)])` `class ShaFile(object):` `"""A git SHA file."""` `@classmethod` `def _parse_legacy_object(cls, map):` `"""Parse a legacy object, creating it and setting object._text"""` `text = _decompress(map)` `object = None` `for posstype in type_map.keys():` `if text.startswith(posstype):` `object = type_map[posstype]()` `text = text[len(posstype):]` `break` `assert object is not None, "%s is not a known object type" % text[:9]` `assert text[0] == ' ', "%s is not a space" % text[0]` `text = text[1:]` `size = 0` `i = 0` `while text[0] >= '0' and text[0] <= '9':` `if i > 0 and size == 0:` `assert False, "Size is not in canonical format"` `size = (size * 10) + int(text[0])` `text = text[1:]` `i += 1` `object._size = size` `assert text[0] == "\0", "Size not followed by null"` `text = text[1:]` `object._text = text` `return object`++`def as_legacy_object(self):`+`return zlib.compress("%s %d\0%s" % (self._type, len(self._text), self._text))` `def as_raw_string(self):` `return self._num_type, self._text` `@classmethod` `def _parse_object(cls, map):` `"""Parse a new style object , creating it and setting object._text"""` `used = 0` `byte = ord(map[used])` `used += 1` `num_type = (byte >> 4) & 7` `try:` `object = num_type_map[num_type]()` `except KeyError:`-`assert False, "Not a known type: %d" % num_type`-`while((byte & 0x80) != 0):`+`raise AssertionError("Not a known type: %d" % num_type)`+`while (byte & 0x80) != 0:` `byte = ord(map[used])` `used += 1` `raw = map[used:]` `object._text = _decompress(raw)` `return object` `@classmethod` `def _parse_file(cls, map):` `word = (ord(map[0]) << 8) + ord(map[1])` `if ord(map[0]) == 0x78 and (word % 31) == 0:` `return cls._parse_legacy_object(map)` `else:` `return cls._parse_object(map)` `def __init__(self):` `"""Don't call this directly"""` `def _parse_text(self):` `"""For subclasses to do initialisation time parsing"""` `@classmethod` `def from_file(cls, filename):` `"""Get the contents of a SHA file on disk"""` `size = os.path.getsize(filename)` `f = open(filename, 'rb')` `try:` `map = mmap.mmap(f.fileno(), size, access=mmap.ACCESS_READ)` `shafile = cls._parse_file(map)` `shafile._parse_text()` `return shafile` `finally:` `f.close()` `@classmethod` `def from_raw_string(cls, type, string):` `"""Creates an object of the indicated type from the raw string given.` `Type is the numeric type of an object. String is the raw uncompressed` `contents.` `"""` `real_class = num_type_map[type]` `obj = real_class()` `obj._num_type = type` `obj._text = string` `obj._parse_text()` `return obj` `def _header(self):` `return "%s %lu\0" % (self._type, len(self._text))` `def sha(self):` `"""The SHA1 object that is the name of this object."""` `ressha = sha.new()` `ressha.update(self._header())` `ressha.update(self._text)` `return ressha` `@property` `def id(self):` `return self.sha().hexdigest()` `@property` `def type(self):` `return self._num_type` `def __repr__(self):` `return "<%s %s>" % (self.__class__.__name__, self.id)` `def __eq__(self, other):` `"""Return true id the sha of the two objects match.` `The __le__ etc methods aren't overriden as they make no sense,` `certainly at this level.` `"""` `return self.sha().digest() == other.sha().digest()` `class Blob(ShaFile):` `"""A Git Blob object."""` `_type = BLOB_ID` `_num_type = 3` `@property` `def data(self):` `"""The text contained within the blob object."""` `return self._text` `@classmethod` `def from_file(cls, filename):` `blob = ShaFile.from_file(filename)` `if blob._type != cls._type:` `raise NotBlobError(filename)` `return blob` `@classmethod` `def from_string(cls, string):` `"""Create a blob from a string."""` `shafile = cls()` `shafile._text = string` `return shafile` `class Tag(ShaFile):` `"""A Git Tag object."""` `_type = TAG_ID` `_num_type = 4` `@classmethod` `def from_file(cls, filename):` `blob = ShaFile.from_file(filename)` `if blob._type != cls._type:` `raise NotBlobError(filename)` `return blob` `@classmethod` `def from_string(cls, string):` `"""Create a blob from a string."""` `shafile = cls()` `shafile._text = string` `return shafile` `def _parse_text(self):` `"""Grab the metadata attached to the tag"""` `text = self._text` `count = 0` `assert text.startswith(OBJECT_ID), "Invalid tag object, " \` `"must start with %s" % OBJECT_ID` `count += len(OBJECT_ID)` `assert text[count] == ' ', "Invalid tag object, " \` `"%s must be followed by space not %s" % (OBJECT_ID, text[count])` `count += 1` `self._object_sha = text[count:count+40]` `count += 40` `assert text[count] == '\n', "Invalid tag object, " \` `"%s sha must be followed by newline" % OBJECT_ID` `count += 1` `assert text[count:].startswith(TYPE_ID), "Invalid tag object, " \` `"%s sha must be followed by %s" % (OBJECT_ID, TYPE_ID)` `count += len(TYPE_ID)` `assert text[count] == ' ', "Invalid tag object, " \` `"%s must be followed by space not %s" % (TAG_ID, text[count])` `count += 1` `self._object_type = ""` `while text[count] != '\n':` `self._object_type += text[count]` `count += 1` `count += 1` `assert self._object_type in (COMMIT_ID, BLOB_ID, TREE_ID, TAG_ID), "Invalid tag object, " \` `"unexpected object type %s" % self._object_type` `self._object_type = type_map[self._object_type]` `assert text[count:].startswith(TAG_ID), "Invalid tag object, " \` `"object type must be followed by %s" % (TAG_ID)` `count += len(TAG_ID)` `assert text[count] == ' ', "Invalid tag object, " \` `"%s must be followed by space not %s" % (TAG_ID, text[count])` `count += 1` `self._name = ""` `while text[count] != '\n':` `self._name += text[count]` `count += 1` `count += 1` `assert text[count:].startswith(TAGGER_ID), "Invalid tag object, " \` `"%s must be followed by %s" % (TAG_ID, TAGGER_ID)` `count += len(TAGGER_ID)` `assert text[count] == ' ', "Invalid tag object, " \` `"%s must be followed by space not %s" % (TAGGER_ID, text[count])` `count += 1` `self._tagger = ""` `while text[count] != '>':` `assert text[count] != '\n', "Malformed tagger information"` `self._tagger += text[count]` `count += 1` `self._tagger += text[count]` `count += 1` `assert text[count] == ' ', "Invalid tag object, " \` `"tagger information must be followed by space not %s" % text[count]` `count += 1` `self._tag_time = int(text[count:count+10])` `while text[count] != '\n':` `count += 1` `count += 1` `assert text[count] == '\n', "There must be a new line after the headers"` `count += 1` `self._message = text[count:]` `@property` `def object(self):` `"""Returns the object pointed by this tag, represented as a tuple(type, sha)"""` `return (self._object_type, self._object_sha)` `@property` `def name(self):` `"""Returns the name of this tag"""` `return self._name` `@property` `def tagger(self):` `"""Returns the name of the person who created this tag"""` `return self._tagger` `@property` `def tag_time(self):` `"""Returns the creation timestamp of the tag.` `Returns it as the number of seconds since the epoch"""` `return self._tag_time` `@property` `def message(self):` `"""Returns the message attached to this tag"""` `return self._message` `class Tree(ShaFile):` `"""A Git tree object"""` `_type = TREE_ID` `_num_type = 2` `def __init__(self):` `self._entries = {}` `@classmethod` `def from_file(cls, filename):` `tree = ShaFile.from_file(filename)` `if tree._type != cls._type:` `raise NotTreeError(filename)` `return tree` `def __getitem__(self, name):` `return self._entries[name]` `def add(self, mode, name, hexsha):` `self._entries[name] = mode, hexsha` `def entries(self):` `"""Return a list of tuples describing the tree entries"""` `return [(mode, name, hexsha) for (name, (mode, hexsha)) in self._entries.iteritems()]` `def iteritems(self):` `for name in sorted(self._entries.keys()):` `yield name, self_entries[name][0], self._entries[name][1]` `def _parse_text(self):` `"""Grab the entries in the tree"""` `count = 0` `while count < len(self._text):` `mode = 0` `chr = self._text[count]` `while chr != ' ':` `assert chr >= '0' and chr <= '7', "%s is not a valid mode char" % chr` `mode = (mode << 3) + (ord(chr) - ord('0'))` `count += 1` `chr = self._text[count]` `count += 1` `chr = self._text[count]` `name = ''` `while chr != '\0':` `name += chr` `count += 1` `chr = self._text[count]` `count += 1` `chr = self._text[count]` `sha = self._text[count:count+20]` `hexsha = sha_to_hex(sha)` `self.add(mode, name, hexsha)` `count = count + 20` `def serialize(self):` `self._text = ""` `for name, mode, hexsha in self.iteritems():` `self._text += "%04o %s\0%s" % (mode, name, hex_to_sha(hexsha))` `class Commit(ShaFile):` `"""A git commit object"""` `_type = COMMIT_ID` `_num_type = 1` `def __init__(self):` `self._parents = []` `@classmethod` `def from_file(cls, filename):` `commit = ShaFile.from_file(filename)` `if commit._type != cls._type:` `raise NotCommitError(filename)` `return commit` `def _parse_text(self):` `text = self._text` `count = 0` `assert text.startswith(TREE_ID), "Invalid commit object, " \` `"must start with %s" % TREE_ID` `count += len(TREE_ID)` `assert text[count] == ' ', "Invalid commit object, " \` `"%s must be followed by space not %s" % (TREE_ID, text[count])` `count += 1` `self._tree = text[count:count+40]` `count = count + 40` `assert text[count] == "\n", "Invalid commit object, " \` `"tree sha must be followed by newline"` `count += 1` `self._parents = []` `while text[count:].startswith(PARENT_ID):` `count += len(PARENT_ID)` `assert text[count] == ' ', "Invalid commit object, " \` `"%s must be followed by space not %s" % (PARENT_ID, text[count])` `count += 1` `self._parents.append(text[count:count+40])` `count += 40` `assert text[count] == "\n", "Invalid commit object, " \` `"parent sha must be followed by newline"` `count += 1` `self._author = None` `if text[count:].startswith(AUTHOR_ID):` `count += len(AUTHOR_ID)` `assert text[count] == ' ', "Invalid commit object, " \` `"%s must be followed by space not %s" % (AUTHOR_ID, text[count])` `count += 1` `self._author = ''` `while text[count] != '>':` `assert text[count] != '\n', "Malformed author information"` `self._author += text[count]` `count += 1` `self._author += text[count]` `count += 1` `assert text[count] == ' ', "Invalid commit object, " \` `"author information must be followed by space not %s" % text[count]` `count += 1` `self._author_time = int(text[count:count+10])` `while text[count] != ' ':` `count += 1` `self._author_timezone = int(text[count:count+6])` `count += 1` `while text[count] != '\n':` `count += 1` `count += 1` `self._committer = None` `if text[count:].startswith(COMMITTER_ID):` `count += len(COMMITTER_ID)` `assert text[count] == ' ', "Invalid commit object, " \` `"%s must be followed by space not %s" % (COMMITTER_ID, text[count])` `count += 1` `self._committer = ''` `while text[count] != '>':` `assert text[count] != '\n', "Malformed committer information"` `self._committer += text[count]` `count += 1` `self._committer += text[count]` `count += 1` `assert text[count] == ' ', "Invalid commit object, " \` `"commiter information must be followed by space not %s" % text[count]` `count += 1` `self._commit_time = int(text[count:count+10])` `while text[count] != ' ':` `count += 1` `self._commit_timezone = int(text[count:count+6])` `count += 1` `while text[count] != '\n':` `count += 1` `count += 1` `assert text[count] == '\n', "There must be a new line after the headers"` `count += 1` `# XXX: There can be an encoding field.` `self._message = text[count:]` `def serialize(self):` `self._text = ""` `self._text += "%s %s\n" % (TREE_ID, self._tree)` `for p in self._parents:` `self._text += "%s %s\n" % (PARENT_ID, p)` `self._text += "%s %s %s %+05d\n" % (AUTHOR_ID, self._author, str(self._author_time), self._author_timezone)` `self._text += "%s %s %s %+05d\n" % (COMMITTER_ID, self._committer, str(self._commit_time), self._commit_timezone)` `self._text += "\n" # There must be a new line after the headers` `self._text += self._message` `@property` `def tree(self):` `"""Returns the tree that is the state of this commit"""` `return self._tree` `@property` `def parents(self):` `"""Return a list of parents of this commit."""` `return self._parents` `@property` `def author(self):` `"""Returns the name of the author of the commit"""` `return self._author` `@property` `def committer(self):` `"""Returns the name of the committer of the commit"""` `return self._committer` `@property` `def message(self):` `"""Returns the commit message"""` `return self._message` `@property` `def commit_time(self):` `"""Returns the timestamp of the commit.` `Returns it as the number of seconds since the epoch.` `"""` `return self._commit_time` `@property` `def commit_timezone(self):` `"""Returns the zone the commit time is in` `"""` `return self._commit_timezone` `@property` `def author_time(self):` `"""Returns the timestamp the commit was written.` `Returns it as the number of seconds since the epoch.` `"""` `return self._author_time` `@property` `def author_timezone(self):` `"""Returns the zone the author time is in` `"""` `return self._author_timezone` `type_map = {` `BLOB_ID : Blob,` `TREE_ID : Tree,` `COMMIT_ID : Commit,` `TAG_ID: Tag,` `}` `num_type_map = {` `0: None,` `1: Commit,` `2: Tree,` `3: Blob,` `4: Tag,` `# 5 Is reserved for further expansion` `}` `try:` `# Try to import C versions` `from dulwich._objects import hex_to_sha, sha_to_hex` `except ImportError:` `pass`