Show More
@@ -579,13 +579,17 b' class cgpacker(object):' | |||||
579 | else: |
|
579 | else: | |
580 | self._verbosenote = lambda s: None |
|
580 | self._verbosenote = lambda s: None | |
581 |
|
581 | |||
|
582 | # TODO the functionality keyed off of this should probably be | |||
|
583 | # controlled via arguments to group() that influence behavior. | |||
|
584 | self._changelogdone = False | |||
|
585 | ||||
582 | def _close(self): |
|
586 | def _close(self): | |
583 | # Ellipses serving mode. |
|
587 | # Ellipses serving mode. | |
584 | getattr(self, '_clrev_to_localrev', {}).clear() |
|
588 | getattr(self, '_clrev_to_localrev', {}).clear() | |
585 | if getattr(self, '_next_clrev_to_localrev', {}): |
|
589 | if getattr(self, '_next_clrev_to_localrev', {}): | |
586 | self._clrev_to_localrev = self._next_clrev_to_localrev |
|
590 | self._clrev_to_localrev = self._next_clrev_to_localrev | |
587 | del self._next_clrev_to_localrev |
|
591 | del self._next_clrev_to_localrev | |
588 |
self._changelog |
|
592 | self._changelogdone = True | |
589 |
|
593 | |||
590 | return closechunk() |
|
594 | return closechunk() | |
591 |
|
595 | |||
@@ -1058,7 +1062,7 b' class cgpacker(object):' | |||||
1058 | def _revisiondeltanarrow(self, store, rev, prev, linknode): |
|
1062 | def _revisiondeltanarrow(self, store, rev, prev, linknode): | |
1059 | # build up some mapping information that's useful later. See |
|
1063 | # build up some mapping information that's useful later. See | |
1060 | # the local() nested function below. |
|
1064 | # the local() nested function below. | |
1061 |
if not self._changelog |
|
1065 | if not self._changelogdone: | |
1062 | self._clnode_to_rev[linknode] = rev |
|
1066 | self._clnode_to_rev[linknode] = rev | |
1063 | linkrev = rev |
|
1067 | linkrev = rev | |
1064 | self._clrev_to_localrev[linkrev] = rev |
|
1068 | self._clrev_to_localrev[linkrev] = rev | |
@@ -1090,7 +1094,7 b' class cgpacker(object):' | |||||
1090 | if clrev == nullrev: |
|
1094 | if clrev == nullrev: | |
1091 | return nullrev |
|
1095 | return nullrev | |
1092 |
|
1096 | |||
1093 |
if not self._changelog |
|
1097 | if not self._changelogdone: | |
1094 | # If we're doing the changelog, it's possible that we |
|
1098 | # If we're doing the changelog, it's possible that we | |
1095 | # have a parent that is already on the client, and we |
|
1099 | # have a parent that is already on the client, and we | |
1096 | # need to store some extra mapping information so that |
|
1100 | # need to store some extra mapping information so that | |
@@ -1403,6 +1407,5 b' def _packellipsischangegroup(repo, commo' | |||||
1403 | # Maps changelog nodes to changelog revs. Filled in once |
|
1407 | # Maps changelog nodes to changelog revs. Filled in once | |
1404 | # during changelog stage and then left unmodified. |
|
1408 | # during changelog stage and then left unmodified. | |
1405 | packer._clnode_to_rev = {} |
|
1409 | packer._clnode_to_rev = {} | |
1406 | packer._changelog_done = False |
|
|||
1407 |
|
1410 | |||
1408 | return packer.generate(common, visitnodes, False, source) |
|
1411 | return packer.generate(common, visitnodes, False, source) |
General Comments 0
You need to be logged in to leave comments.
Login now