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
|
# index.py
# Copyright (C) 2008, 2009 Michael Trier (mtrier@gmail.com) and contributors
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
"""
Module containing Index implementation, allowing to perform all kinds of index
manipulations such as querying and merging.
"""
import struct
import binascii
import mmap
import objects
import tempfile
import os
import stat
from git.objects import Blob, Tree
from git.utils import SHA1Writer, LazyMixin, ConcurrentWriteOperation
from git.diff import Diffable
class _TemporaryFileSwap(object):
"""
Utility class moving a file to a temporary location within the same directory
and moving it back on to where on object deletion.
"""
__slots__ = ("file_path", "tmp_file_path")
def __init__(self, file_path):
self.file_path = file_path
self.tmp_file_path = self.file_path + tempfile.mktemp('','','')
os.rename(self.file_path, self.tmp_file_path)
def __del__(self):
if os.path.isfile(self.tmp_file_path):
os.rename(self.tmp_file_path, self.file_path)
class IndexEntry(tuple):
"""
Allows convenient access to IndexEntry data without completely unpacking it.
Attributes usully accessed often are cached in the tuple whereas others are
unpacked on demand.
See the properties for a mapping between names and tuple indices.
"""
@property
def ctime(self):
"""
Returns
Tuple(int_time_seconds_since_epoch, int_nano_seconds) of the
file's creation time
"""
return struct.unpack(">LL", self[0])
@property
def mtime(self):
"""
See ctime property, but returns modification time
"""
return struct.unpack(">LL", self[1])
@property
def dev(self):
"""
Device ID
"""
return self[2]
@property
def inode(self):
"""
Inode ID
"""
return self[3]
@property
def mode(self):
"""
File Mode, compatible to stat module constants
"""
return self[4]
@property
def uid(self):
"""
User ID
"""
return self[5]
@property
def gid(self):
"""
Group ID
"""
return self[6]
@property
def size(self):
"""
Uncompressed size of the blob
Note
Will be 0 if the stage is not 0 ( hence it is an unmerged entry )
"""
return self[7]
@property
def sha(self):
"""
hex sha of the blob
"""
return self[8]
@property
def stage(self):
"""
Stage of the entry, either:
0 = default stage
1 = stage before a merge or common ancestor entry in case of a 3 way merge
2 = stage of entries from the 'left' side of the merge
3 = stage of entries from the right side of the merge
Note:
For more information, see http://www.kernel.org/pub/software/scm/git/docs/git-read-tree.html
"""
return self[9]
@property
def path(self):
return self[10]
@classmethod
def from_blob(cls, blob):
"""
Returns
Minimal entry resembling the given blob objecft
"""
time = struct.pack(">LL", 0, 0)
return IndexEntry((time, time, 0, 0, blob.mode, 0, 0, blob.size, blob.id, 0, blob.path))
class Index(LazyMixin):
"""
Implements an Index that can be manipulated using a native implementation in
order to save git command function calls wherever possible.
It provides custom merging facilities allowing to merge without actually changing
your index or your working tree. This way you can perform own test-merges based
on the index only without having to deal with the working copy. This is useful
in case of partial working trees.
``Entries``
The index contains an entries dict whose keys are tuples of type IndexEntry
to facilitate access.
"""
__slots__ = ( "repo", "version", "entries", "_extension_data" )
_VERSION = 2 # latest version we support
S_IFGITLINK = 0160000
def __init__(self, repo, stream = None):
"""
Initialize this Index instance, optionally from the given ``stream``
If a stream is not given, the stream will be initialized from the current
repository's index on demand.
"""
self.repo = repo
self.version = self._VERSION
self._extension_data = ''
if stream is not None:
self._read_from_stream(stream)
# END read from stream immediatly
def _set_cache_(self, attr):
if attr == "entries":
# read the current index
fp = open(self._index_path(), "r")
try:
self._read_from_stream(fp)
finally:
fp.close()
# END read from default index on demand
else:
super(Index, self)._set_cache_(attr)
def _index_path(self):
return os.path.join(self.repo.path, "index")
@classmethod
def _read_entry(cls, stream):
"""Return: One entry of the given stream"""
beginoffset = stream.tell()
ctime = struct.unpack(">8s", stream.read(8))[0]
mtime = struct.unpack(">8s", stream.read(8))[0]
(dev, ino, mode, uid, gid, size, sha, flags) = \
struct.unpack(">LLLLLL20sH", stream.read(20 + 4 * 6 + 2))
path_size = flags & 0x0fff
path = stream.read(path_size)
real_size = ((stream.tell() - beginoffset + 8) & ~7)
data = stream.read((beginoffset + real_size) - stream.tell())
return IndexEntry((ctime, mtime, dev, ino, mode, uid, gid, size,
binascii.hexlify(sha), flags >> 12, path))
@classmethod
def _read_header(cls, stream):
"""Return tuple(version_long, num_entries) from the given stream"""
type_id = stream.read(4)
if type_id != "DIRC":
raise AssertionError("Invalid index file header: %r" % type_id)
version, num_entries = struct.unpack(">LL", stream.read(4 * 2))
assert version in (1, 2)
return version, num_entries
def _read_from_stream(self, stream):
"""
Initialize this instance with index values read from the given stream
"""
self.version, num_entries = self._read_header(stream)
count = 0
self.entries = dict()
while count < num_entries:
entry = self._read_entry(stream)
self.entries[(entry.path, entry.stage)] = entry
count += 1
# END for each entry
# the footer contains extension data and a sha on the content so far
# Keep the extension footer,and verify we have a sha in the end
self._extension_data = stream.read(~0)
assert len(self._extension_data) > 19, "Index Footer was not at least a sha on content as it was only %i bytes in size" % len(self._extension_data)
content_sha = self._extension_data[-20:]
# truncate the sha in the end as we will dynamically create it anyway
self._extension_data = self._extension_data[:-20]
@classmethod
def from_file(cls, repo, file_path):
"""
Returns
Index instance as recreated from the given stream.
``repo``
Repository the index is related to
``file_pa ``
File path pointing to git index file
Note
Reading is based on the dulwich project.
"""
fp = open(file_path, "r")
# try memory map for speed
stream = fp
try:
stream = mmap.mmap(fp.fileno(), 0, access=mmap.ACCESS_READ)
except Exception:
pass
# END memory mapping
try:
return cls(repo, stream)
finally:
fp.close()
@classmethod
def to_file(cls, index, file_path):
"""
Write the index data to the given file path.
``index``
Index you wish to write.
``file_path``
Path at which to write the index data. Please note that missing directories
will lead to an exception to be thrown.
Raise
IOError if the file could not be written
"""
fp = open(file_path, "w")
try:
return index.write(fp)
finally:
fp.close()
# END exception handling
@classmethod
def _write_cache_entry(cls, stream, entry):
"""
Write an IndexEntry to a stream
"""
beginoffset = stream.tell()
stream.write(entry[0]) # ctime
stream.write(entry[1]) # mtime
path = entry[10]
plen = len(path) & 0x0fff # path length
assert plen == len(path), "Path %s too long to fit into index" % entry[10]
flags = plen | (entry[9] << 12)# stage and path length are 2 byte flags
stream.write(struct.pack(">LLLLLL20sH", entry[2], entry[3], entry[4],
entry[5], entry[6], entry[7], binascii.unhexlify(entry[8]), flags))
stream.write(path)
real_size = ((stream.tell() - beginoffset + 8) & ~7)
stream.write("\0" * ((beginoffset + real_size) - stream.tell()))
def write(self, stream=None):
"""
Write the current state to the given stream or to the default repository
index.
``stream``
File-like object or None.
If None, the default repository index will be overwritten.
Returns
self
Note
Index writing based on the dulwich implementation
"""
write_op = None
if stream is None:
write_op = ConcurrentWriteOperation(self._index_path())
stream = write_op._begin_writing()
# stream = open(self._index_path()
# END stream handling
stream = SHA1Writer(stream)
# header
stream.write("DIRC")
stream.write(struct.pack(">LL", self.version, len(self.entries)))
# body
entries_sorted = self.entries.values()
entries_sorted.sort(key=lambda e: (e[10], e[9])) # use path/stage as sort key
for entry in entries_sorted:
self._write_cache_entry(stream, entry)
# END for each entry
# write previously cached extensions data
stream.write(self._extension_data)
# write the sha over the content
stream.write_sha()
if write_op is not None:
write_op._end_writing()
@classmethod
def from_tree(cls, repo, *treeish, **kwargs):
"""
Merge the given treeish revisions into a new index which is returned.
The original index will remain unaltered
``repo``
The repository treeish are located in.
``*treeish``
One, two or three Tree Objects or Commits. The result changes according to the
amount of trees.
If 1 Tree is given, it will just be read into a new index
If 2 Trees are given, they will be merged into a new index using a
two way merge algorithm. Tree 1 is the 'current' tree, tree 2 is the 'other'
one. It behaves like a fast-forward.
If 3 Trees are given, a 3-way merge will be performed with the first tree
being the common ancestor of tree 2 and tree 3. Tree 2 is the 'current' tree,
tree 3 is the 'other' one
``**kwargs``
Additional arguments passed to git-read-tree
Note:
In the three-way merge case, --aggressive will be specified to automatically
resolve more cases in a commonly correct manner. Specify trivial=True as kwarg
to override that.
As the underlying git-read-tree command takes into account the current index,
it will be temporarily moved out of the way to assure there are no unsuspected
interferences.
"""
if len(treeish) == 0 or len(treeish) > 3:
raise ValueError("Please specify between 1 and 3 treeish, got %i" % len(treeish))
arg_list = list()
# ignore that working tree and index possibly are out of date
if len(treeish)>1:
# drop unmerged entries when reading our index and merging
arg_list.append("--reset")
# handle non-trivial cases the way a real merge does
arg_list.append("--aggressive")
# END merge handling
# tmp file created in git home directory to be sure renaming
# works - /tmp/ dirs could be on another device
tmp_index = tempfile.mktemp('','',repo.path)
arg_list.append("--index-output=%s" % tmp_index)
arg_list.extend(treeish)
# move current index out of the way - otherwise the merge may fail
# as it considers existing entries. moving it essentially clears the index.
# Unfortunately there is no 'soft' way to do it.
# The _TemporaryFileSwap assure the original file get put back
index_handler = _TemporaryFileSwap(os.path.join(repo.path, 'index'))
try:
repo.git.read_tree(*arg_list, **kwargs)
index = cls.from_file(repo, tmp_index)
finally:
if os.path.exists(tmp_index):
os.remove(tmp_index)
# END index merge handling
return index
@classmethod
def _index_mode_to_tree_index_mode(cls, index_mode):
"""
Cleanup a index_mode value.
This will return a index_mode that can be stored in a tree object.
``index_mode``
Index_mode to clean up.
"""
if stat.S_ISLNK(index_mode):
return stat.S_IFLNK
elif stat.S_ISDIR(index_mode):
return stat.S_IFDIR
elif stat.S_IFMT(index_mode) == cls.S_IFGITLINK:
return cls.S_IFGITLINK
ret = stat.S_IFREG | 0644
ret |= (index_mode & 0111)
return ret
def iter_blobs(self, predicate = lambda t: True):
"""
Returns
Iterator yielding tuples of Blob objects and stages, tuple(stage, Blob)
``predicate``
Function(t) returning True if tuple(stage, Blob) should be yielded by the
iterator
"""
for entry in self.entries.itervalues():
mode = self._index_mode_to_tree_index_mode(entry.mode)
blob = Blob(self.repo, entry.sha, mode, entry.path)
blob.size = entry.size
output = (entry.stage, blob)
if predicate(output):
yield output
# END for each entry
def unmerged_blobs(self):
"""
Returns
Iterator yielding dict(path : list( tuple( stage, Blob, ...))), being
a dictionary associating a path in the index with a list containing
stage/blob pairs
Note:
Blobs that have been removed in one side simply do not exist in the
given stage. I.e. a file removed on the 'other' branch whose entries
are at stage 3 will not have a stage 3 entry.
"""
is_unmerged_blob = lambda t: t[0] != 0
path_map = dict()
for stage, blob in self.iter_blobs(is_unmerged_blob):
path_map.setdefault(blob.path, list()).append((stage, blob))
# END for each unmerged blob
return path_map
def resolve_blobs(self, iter_blobs):
"""
Resolve the blobs given in blob iterator. This will effectively remove the
index entries of the respective path at all non-null stages and add the given
blob as new stage null blob.
For each path there may only be one blob, otherwise a ValueError will be raised
claiming the path is already at stage 0.
Raise
ValueError if one of the blobs already existed at stage 0
Returns:
self
"""
for blob in iter_blobs:
stage_null_key = (blob.path, 0)
if stage_null_key in self.entries:
raise ValueError( "Blob %r already at stage 0" % blob )
# END assert blob is not stage 0 already
# delete all possible stages
for stage in (1, 2, 3):
try:
del( self.entries[(blob.path, stage)] )
except KeyError:
pass
# END ignore key errors
# END for each possible stage
self.entries[stage_null_key] = IndexEntry.from_blob(blob)
# END for each blob
return self
def write_tree(self):
"""
Writes the Index in self to a corresponding Tree file into the repository
object database and returns it as corresponding Tree object.
Returns
Tree object representing this index
"""
index_path = self._index_path()
tmp_index_mover = _TemporaryFileSwap(index_path)
self.to_file(self, index_path)
try:
tree_sha = self.repo.git.write_tree()
finally:
# remove our index file so that the original index can move back into place
# On linux it will silently overwrite, on windows it won't
if os.path.isfile(index_path):
os.remove(index_path)
# END remove our own index file beforehand
# END write tree handling
return Tree(self.repo, tree_sha, 0, '')
|