Show More
@@ -1058,7 +1058,7 b' class revlog(object):' | |||||
1058 | self._cache = (node, curr, text) |
|
1058 | self._cache = (node, curr, text) | |
1059 | return node |
|
1059 | return node | |
1060 |
|
1060 | |||
1061 |
def group(self, nodelist, lookup, infocollect=None |
|
1061 | def group(self, nodelist, lookup, infocollect=None): | |
1062 | """Calculate a delta group, yielding a sequence of changegroup chunks |
|
1062 | """Calculate a delta group, yielding a sequence of changegroup chunks | |
1063 | (strings). |
|
1063 | (strings). | |
1064 |
|
1064 | |||
@@ -1068,9 +1068,6 b' class revlog(object):' | |||||
1068 | guaranteed to have this parent as it has all history before |
|
1068 | guaranteed to have this parent as it has all history before | |
1069 | these changesets. In the case firstparent is nullrev the |
|
1069 | these changesets. In the case firstparent is nullrev the | |
1070 | changegroup starts with a full revision. |
|
1070 | changegroup starts with a full revision. | |
1071 | fullrev forces the insertion of the full revision, necessary |
|
|||
1072 | in the case of shallow clones where the first parent might |
|
|||
1073 | not exist at the reciever. |
|
|||
1074 | """ |
|
1071 | """ | |
1075 |
|
1072 | |||
1076 | revs = [self.rev(n) for n in nodelist] |
|
1073 | revs = [self.rev(n) for n in nodelist] | |
@@ -1083,8 +1080,6 b' class revlog(object):' | |||||
1083 | # add the parent of the first rev |
|
1080 | # add the parent of the first rev | |
1084 | p = self.parentrevs(revs[0])[0] |
|
1081 | p = self.parentrevs(revs[0])[0] | |
1085 | revs.insert(0, p) |
|
1082 | revs.insert(0, p) | |
1086 | if p == nullrev: |
|
|||
1087 | fullrev = True |
|
|||
1088 |
|
1083 | |||
1089 | # build deltas |
|
1084 | # build deltas | |
1090 | for r in xrange(len(revs) - 1): |
|
1085 | for r in xrange(len(revs) - 1): | |
@@ -1096,10 +1091,9 b' class revlog(object):' | |||||
1096 |
|
1091 | |||
1097 | p = self.parents(nb) |
|
1092 | p = self.parents(nb) | |
1098 | meta = nb + p[0] + p[1] + lookup(nb) |
|
1093 | meta = nb + p[0] + p[1] + lookup(nb) | |
1099 |
if |
|
1094 | if a == nullrev: | |
1100 | d = self.revision(nb) |
|
1095 | d = self.revision(nb) | |
1101 | meta += mdiff.trivialdiffheader(len(d)) |
|
1096 | meta += mdiff.trivialdiffheader(len(d)) | |
1102 | fullrev = False |
|
|||
1103 | else: |
|
1097 | else: | |
1104 | d = self.revdiff(a, b) |
|
1098 | d = self.revdiff(a, b) | |
1105 | yield changegroup.chunkheader(len(meta) + len(d)) |
|
1099 | yield changegroup.chunkheader(len(meta) + len(d)) |
General Comments 0
You need to be logged in to leave comments.
Login now