mercurial: comparison mercurial/revlog.py

equal deleted inserted replaced

-:81eb7091c494
+:27f1191b1305
 stringutil,
 )
 # blanked usage of all the name to prevent pyflakes constraints
 # We need these name available in the module for extensions.
 REVLOGV0
 REVLOGV1
 REVLOGV2
 FLAG_INLINE_DATA
 FLAG_GENERALDELTA
 _(b"attempted to add linkrev -1 to %s") % self.indexfile
 )
 if sidedata is None:
 sidedata = {}
-elif not self.hassidedata:
+elif sidedata and not self.hassidedata:
 raise error.ProgrammingError(
 _(b"trying to add sidedata to a revlog who don't support them")
 )
 if flags:
 tr,
 destrevlog,
 addrevisioncb=None,
 deltareuse=DELTAREUSESAMEREVS,
 forcedeltabothparents=None,
-sidedatacompanion=None,
+sidedata_helpers=None,
 ):
 """Copy this revlog to another, possibly with format changes.
 The destination revlog will contain the same revisions and nodes.
 However, it may not be bit-for-bit identical due to e.g. delta encoding
 In addition to the delta policy, the ``forcedeltabothparents``
 argument controls whether to force compute deltas against both parents
 for merges. By default, the current default is used.
-If not None, the `sidedatacompanion` is callable that accept two
+See `storageutil.emitrevisions` for the doc on `sidedata_helpers`.
-arguments:
-(srcrevlog, rev)
-and return a quintet that control changes to sidedata content from the
-old revision to the new clone result:
-(dropall, filterout, update, new_flags, dropped_flags)
-* if `dropall` is True, all sidedata should be dropped
-* `filterout` is a set of sidedata keys that should be dropped
-* `update` is a mapping of additionnal/new key -> value
-* new_flags is a bitfields of new flags that the revision should get
-* dropped_flags is a bitfields of new flags that the revision shoudl not longer have
 """
 if deltareuse not in self.DELTAREUSEALL:
 raise ValueError(
 _(b'value for deltareuse invalid: %s') % deltareuse
 )
 tr,
 destrevlog,
 addrevisioncb,
 deltareuse,
 forcedeltabothparents,
-sidedatacompanion,
+sidedata_helpers,
 )
 finally:
 destrevlog._lazydelta = oldlazydelta
 destrevlog._lazydeltabase = oldlazydeltabase
 tr,
 destrevlog,
 addrevisioncb,
 deltareuse,
 forcedeltabothparents,
-sidedatacompanion,
+sidedata_helpers,
 ):
 """perform the core duty of `revlog.clone` after parameter processing"""
 deltacomputer = deltautil.deltacomputer(destrevlog)
 index = self.index
 for rev in self:
 linkrev = entry[4]
 p1 = index[entry[5]][7]
 p2 = index[entry[6]][7]
 node = entry[7]
-sidedataactions = (False, [], {}, 0, 0)
-if sidedatacompanion is not None:
-sidedataactions = sidedatacompanion(self, rev)
 # (Possibly) reuse the delta from the revlog if allowed and
 # the revlog chunk is a delta.
 cachedelta = None
 rawtext = None
-if any(sidedataactions) or deltareuse == self.DELTAREUSEFULLADD:
+if deltareuse == self.DELTAREUSEFULLADD:
-dropall = sidedataactions[0]
-filterout = sidedataactions[1]
-update = sidedataactions[2]
-new_flags = sidedataactions[3]
-dropped_flags = sidedataactions[4]
 text, sidedata = self._revisiondata(rev)
-if dropall:
-sidedata = {}
+if sidedata_helpers is not None:
-for key in filterout:
+(sidedata, new_flags) = storageutil.run_sidedata_helpers(
-sidedata.pop(key, None)
+self, sidedata_helpers, sidedata, rev
-sidedata.update(update)
+)
-if not sidedata:
+flags = flags | new_flags[0] & ~new_flags[1]
-sidedata = None
-flags |= new_flags
-flags &= ~dropped_flags
 destrevlog.addrevision(
 text,
 tr,
 linkrev,
 if destrevlog._lazydelta:
 dp = self.deltaparent(rev)
 if dp != nullrev:
 cachedelta = (dp, bytes(self._chunk(rev)))
+sidedata = None
 if not cachedelta:
-rawtext = self.rawdata(rev)
+rawtext, sidedata = self._revisiondata(rev)
+if sidedata is None:
+sidedata = self.sidedata(rev)
+if sidedata_helpers is not None:
+(sidedata, new_flags) = storageutil.run_sidedata_helpers(
+self, sidedata_helpers, sidedata, rev
+)
+flags = flags | new_flags[0] & ~new_flags[1]
 ifh = destrevlog.opener(
 destrevlog.indexfile, b'a+', checkambig=False
 )
 dfh = None
 flags,
 cachedelta,
 ifh,
 dfh,
 deltacomputer=deltacomputer,
+sidedata=sidedata,
 )
 finally:
 if dfh:
 dfh.close()
 ifh.close()

changeset 47084	27f1191b1305
parent 47078	223b47235d1c
child 47085	3aab2330b7d3