16
16
string_types ,
17
17
force_bytes ,
18
18
defenc ,
19
- mviter ,
20
19
)
21
20
from git .exc import (
22
21
GitCommandError ,
@@ -442,7 +441,7 @@ def iter_blobs(self, predicate=lambda t: True):
442
441
Function(t) returning True if tuple(stage, Blob) should be yielded by the
443
442
iterator. A default filter, the BlobFilter, allows you to yield blobs
444
443
only if they match a given list of paths. """
445
- for entry in mviter ( self .entries ):
444
+ for entry in self .entries . values ( ):
446
445
blob = entry .to_blob (self .repo )
447
446
blob .size = entry .size
448
447
output = (entry .stage , blob )
@@ -467,7 +466,7 @@ def unmerged_blobs(self):
467
466
for stage , blob in self .iter_blobs (is_unmerged_blob ):
468
467
path_map .setdefault (blob .path , []).append ((stage , blob ))
469
468
# END for each unmerged blob
470
- for l in mviter ( path_map ):
469
+ for l in path_map . values ( ):
471
470
l .sort ()
472
471
return path_map
473
472
@@ -1086,7 +1085,7 @@ def handle_stderr(proc, iter_checked_out_files):
1086
1085
proc = self .repo .git .checkout_index (* args , ** kwargs )
1087
1086
proc .wait ()
1088
1087
fprogress (None , True , None )
1089
- rval_iter = (e .path for e in mviter ( self .entries ))
1088
+ rval_iter = (e .path for e in self .entries . values ( ))
1090
1089
handle_stderr (proc , rval_iter )
1091
1090
return rval_iter
1092
1091
else :
@@ -1117,7 +1116,7 @@ def handle_stderr(proc, iter_checked_out_files):
1117
1116
folder = co_path
1118
1117
if not folder .endswith ('/' ):
1119
1118
folder += '/'
1120
- for entry in mviter ( self .entries ):
1119
+ for entry in self .entries . values ( ):
1121
1120
if entry .path .startswith (folder ):
1122
1121
p = entry .path
1123
1122
self ._write_path_to_stdin (proc , p , p , make_exc ,
0 commit comments