Show More
@@ -1073,10 +1073,7 b' class cgpacker(object):' | |||||
1073 | if not self._filematcher.visitdir(store.tree[:-1] or '.'): |
|
1073 | if not self._filematcher.visitdir(store.tree[:-1] or '.'): | |
1074 | prunednodes = [] |
|
1074 | prunednodes = [] | |
1075 | else: |
|
1075 | else: | |
1076 | frev, flr = store.rev, store.linkrev |
|
1076 | prunednodes = self._prunemanifests(store, nodes, commonrevs) | |
1077 | prunednodes = [n for n in nodes |
|
|||
1078 | if flr(frev(n)) not in commonrevs] |
|
|||
1079 |
|
||||
1080 | if tree and not prunednodes: |
|
1077 | if tree and not prunednodes: | |
1081 | continue |
|
1078 | continue | |
1082 |
|
1079 | |||
@@ -1093,6 +1090,16 b' class cgpacker(object):' | |||||
1093 |
|
1090 | |||
1094 | yield tree, deltas |
|
1091 | yield tree, deltas | |
1095 |
|
1092 | |||
|
1093 | def _prunemanifests(self, store, nodes, commonrevs): | |||
|
1094 | # This is split out as a separate method to allow filtering | |||
|
1095 | # commonrevs in extension code. | |||
|
1096 | # | |||
|
1097 | # TODO(augie): this shouldn't be required, instead we should | |||
|
1098 | # make filtering of revisions to send delegated to the store | |||
|
1099 | # layer. | |||
|
1100 | frev, flr = store.rev, store.linkrev | |||
|
1101 | return [n for n in nodes if flr(frev(n)) not in commonrevs] | |||
|
1102 | ||||
1096 | # The 'source' parameter is useful for extensions |
|
1103 | # The 'source' parameter is useful for extensions | |
1097 | def generatefiles(self, changedfiles, commonrevs, source, |
|
1104 | def generatefiles(self, changedfiles, commonrevs, source, | |
1098 | mfdicts, fastpathlinkrev, fnodes, clrevs): |
|
1105 | mfdicts, fastpathlinkrev, fnodes, clrevs): |
General Comments 0
You need to be logged in to leave comments.
Login now