diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -607,7 +607,6 @@ class cgpacker(object):
         if self._nextclrevtolocalrev is not None:
             self._clrevtolocalrev = self._nextclrevtolocalrev
             self._nextclrevtolocalrev = None
-        self._changelogdone = True
 
         return closechunk()
 
@@ -730,6 +729,8 @@ class cgpacker(object):
 
         self._verbosenote(_('%8.i (changelog)\n') % size)
 
+        self._changelogdone = True
+
         clrevorder = clstate['clrevorder']
         mfs = clstate['mfs']
         changedfiles = clstate['changedfiles']