Show More
@@ -8,6 +8,7 b'' | |||
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | import heapq |
|
11 | import itertools | |
|
11 | 12 | import os |
|
12 | 13 | import struct |
|
13 | 14 | |
@@ -779,7 +780,8 b' class treemanifest(object):' | |||
|
779 | 780 | |
|
780 | 781 | def iterentries(self): |
|
781 | 782 | self._load() |
|
782 |
for p, n in sorted(self._dirs.items() |
|
|
783 | for p, n in sorted(itertools.chain(self._dirs.items(), | |
|
784 | self._files.items())): | |
|
783 | 785 | if p in self._files: |
|
784 | 786 | yield self._subpath(p), n, self._flags.get(p, '') |
|
785 | 787 | else: |
@@ -788,7 +790,8 b' class treemanifest(object):' | |||
|
788 | 790 | |
|
789 | 791 | def iteritems(self): |
|
790 | 792 | self._load() |
|
791 |
for p, n in sorted(self._dirs.items() |
|
|
793 | for p, n in sorted(itertools.chain(self._dirs.items(), | |
|
794 | self._files.items())): | |
|
792 | 795 | if p in self._files: |
|
793 | 796 | yield self._subpath(p), n |
|
794 | 797 | else: |
@@ -797,7 +800,7 b' class treemanifest(object):' | |||
|
797 | 800 | |
|
798 | 801 | def iterkeys(self): |
|
799 | 802 | self._load() |
|
800 |
for p in sorted(self._dirs |
|
|
803 | for p in sorted(itertools.chain(self._dirs, self._files)): | |
|
801 | 804 | if p in self._files: |
|
802 | 805 | yield self._subpath(p) |
|
803 | 806 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now