##// END OF EJS Templates
changegroup: emit delta group close chunk outside of deltagroup()...
Gregory Szorc -
r39046:fcdab662 default
parent child Browse files
Show More
@@ -700,7 +700,6 b' def deltagroup(repo, revs, store, ischan'
700 """
700 """
701 # if we don't have any revisions touched by these changesets, bail
701 # if we don't have any revisions touched by these changesets, bail
702 if len(revs) == 0:
702 if len(revs) == 0:
703 yield closechunk()
704 return
703 return
705
704
706 cl = repo.changelog
705 cl = repo.changelog
@@ -753,8 +752,6 b' def deltagroup(repo, revs, store, ischan'
753 if progress:
752 if progress:
754 progress.complete()
753 progress.complete()
755
754
756 yield closechunk()
757
758 class cgpacker(object):
755 class cgpacker(object):
759 def __init__(self, repo, filematcher, version, allowreorder,
756 def __init__(self, repo, filematcher, version, allowreorder,
760 deltaparentfn, builddeltaheader, manifestsend,
757 deltaparentfn, builddeltaheader, manifestsend,
@@ -839,6 +836,10 b' class cgpacker(object):'
839 size += len(chunk)
836 size += len(chunk)
840 yield chunk
837 yield chunk
841
838
839 close = closechunk()
840 size += len(close)
841 yield closechunk()
842
842 self._verbosenote(_('%8.i (changelog)\n') % size)
843 self._verbosenote(_('%8.i (changelog)\n') % size)
843
844
844 clrevorder = clstate['clrevorder']
845 clrevorder = clstate['clrevorder']
@@ -1067,6 +1068,10 b' class cgpacker(object):'
1067 size += len(chunk)
1068 size += len(chunk)
1068 yield chunk
1069 yield chunk
1069
1070
1071 close = closechunk()
1072 size += len(close)
1073 yield close
1074
1070 self._verbosenote(_('%8.i (manifests)\n') % size)
1075 self._verbosenote(_('%8.i (manifests)\n') % size)
1071 yield self._manifestsend
1076 yield self._manifestsend
1072
1077
@@ -1165,6 +1170,11 b' class cgpacker(object):'
1165 for chunk in it:
1170 for chunk in it:
1166 size += len(chunk)
1171 size += len(chunk)
1167 yield chunk
1172 yield chunk
1173
1174 close = closechunk()
1175 size += len(close)
1176 yield close
1177
1168 self._verbosenote(_('%8.i %s\n') % (size, fname))
1178 self._verbosenote(_('%8.i %s\n') % (size, fname))
1169 progress.complete()
1179 progress.complete()
1170
1180
General Comments 0
You need to be logged in to leave comments. Login now