# HG changeset patch # User Pierre-Yves David # Date 2021-05-30 18:42:51 # Node ID 24ea3ef352388fc7d70d123ab2292c81d46a9d89 # Parent 3f00665bbea06f55e48956408fcc640db02589a5 censor: do not process sidedata of censored revision while bundling The revision is censored, we should ignore it. Differential Revision: https://phab.mercurial-scm.org/D10801 diff --git a/mercurial/utils/storageutil.py b/mercurial/utils/storageutil.py --- a/mercurial/utils/storageutil.py +++ b/mercurial/utils/storageutil.py @@ -481,13 +481,18 @@ def emitrevisions( serialized_sidedata = None sidedata_flags = (0, 0) if sidedata_helpers: - old_sidedata = store.sidedata(rev) - sidedata, sidedata_flags = sidedatamod.run_sidedata_helpers( - store=store, - sidedata_helpers=sidedata_helpers, - sidedata=old_sidedata, - rev=rev, - ) + try: + old_sidedata = store.sidedata(rev) + except error.CensoredNodeError: + # skip any potential sidedata of the censored revision + sidedata = {} + else: + sidedata, sidedata_flags = sidedatamod.run_sidedata_helpers( + store=store, + sidedata_helpers=sidedata_helpers, + sidedata=old_sidedata, + rev=rev, + ) if sidedata: serialized_sidedata = sidedatamod.serialize_sidedata(sidedata)