Mercurial > public > mercurial-scm > hg-stable
diff mercurial/changegroup.py @ 45811:a5206e71c536
revlog: extend addgroup() with callback for duplicates
The addgroup() interface currently doesn't allow the caller to keep
track of duplicated nodes except by looking at the returned node list.
Add an optional second callback for this purpose and change the return
type to a boolean. This allows follow-up changes to use more efficient
storage for the node list in places that are memory-sensitive.
Differential Revision: https://phab.mercurial-scm.org/D9231
| author | Joerg Sonnenberger <joerg@bec.de> |
|---|---|
| date | Sun, 18 Oct 2020 22:18:02 +0200 |
| parents | 44d84b726c8a |
| children | 09735cde6275 |
line wrap: on
line diff
--- a/mercurial/changegroup.py Wed Oct 07 14:26:47 2020 +0530 +++ b/mercurial/changegroup.py Sun Oct 18 22:18:02 2020 +0200 @@ -316,20 +316,29 @@ self.callback = progress.increment efilesset = set() + cgnodes = [] def onchangelog(cl, node): efilesset.update(cl.readfiles(node)) + cgnodes.append(node) + + def ondupchangelog(cl, node): + cgnodes.append(node) self.changelogheader() deltas = self.deltaiter() - cgnodes = cl.addgroup(deltas, csmap, trp, addrevisioncb=onchangelog) - efiles = len(efilesset) - - if not cgnodes: + if not cl.addgroup( + deltas, + csmap, + trp, + addrevisioncb=onchangelog, + duplicaterevisioncb=ondupchangelog, + ): repo.ui.develwarn( b'applied empty changelog from changegroup', config=b'warn-empty-changegroup', ) + efiles = len(efilesset) clend = len(cl) changesets = clend - clstart progress.complete()