mercurial: comparison mercurial/obsolete.py

equal deleted inserted replaced

-:26d6a6a78c1d
+:26fbf07482b2
 _fm1parentshift = 14
 _fm1parentmask = (_fm1parentnone << _fm1parentshift)
 _fm1metapair = 'BB'
 _fm1metapairsize = _calcsize('BB')
-def _fm1readmarkers(data, off):
+def _fm1purereadmarkers(data, off):
 # make some global constants local for performance
 noneflag = _fm1parentnone
 sha2flag = usingsha256
 sha1size = _fm1nodesha1size
 sha2size = _fm1nodesha256size
 unpack = _unpack
 # Loop on markers
 stop = len(data) - _fm1fsize
 ufixed = util.unpacker(_fm1fixed)
-fast = getattr(parsers, 'fm1readmarker', None)
-if fast is not None:
-while off <= stop:
-ret = fast(data, off)
-yield ret[1:]
-off += ret[0]
-return
 while off <= stop:
 # read fixed part
 o1 = off + fsize
 t, secs, tz, flags, numsuc, numpar, nummeta, prec = ufixed(data[off:o1])
 data = [_pack(format, *data)]
 for key, value in metadata:
 data.append(key)
 data.append(value)
 return ''.join(data)
+def _fm1readmarkers(data, off):
+native = getattr(parsers, 'fm1readmarkers', None)
+if not native:
+return _fm1purereadmarkers(data, off)
+stop = len(data) - _fm1fsize
+return native(data, off, stop)
 # mapping to read/write various marker formats
 # <version> -> (decoder, encoder)
 formats = {_fm0version: (_fm0readmarkers, _fm0encodeonemarker),
 _fm1version: (_fm1readmarkers, _fm1encodeonemarker)}