Mercurial > public > mercurial-scm > hg

comparison mercurial/testing/storage.py @ 46712:e8c11a2c96c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delta: add sidedata field to revision delta When emitting revision delta, we need to also emit the sidedata information just added in the revlogv2 format if appropriate. Differential Revision: https://phab.mercurial-scm.org/D10027
author Rapha?l Gom?s <rgomes@octobus.net>
date Thu, 18 Feb 2021 18:18:35 +0100
parents 7a93b7b3dc2d
children d55b71393907
comparison
equal deleted inserted replaced
46711:a41565bef69f 46712:e8c11a2c96c0
1156 node0 = f.add(fulltext0, None, tr, 0, nullid, nullid) 1156 node0 = f.add(fulltext0, None, tr, 0, nullid, nullid)
1157 1157
1158 f = self._makefilefn() 1158 f = self._makefilefn()
1159 1159
1160 deltas = [ 1160 deltas = [
1161 (node0, nullid, nullid, nullid, nullid, delta0, 0), 1161 (node0, nullid, nullid, nullid, nullid, delta0, 0, {}),
1162 ] 1162 ]
1163 1163
1164 with self._maketransactionfn() as tr: 1164 with self._maketransactionfn() as tr:
1165 nodes = [] 1165 nodes = []
1166 1166
1212 f = self._makefilefn() 1212 f = self._makefilefn()
1213 deltas = [] 1213 deltas = []
1214 for i, fulltext in enumerate(fulltexts): 1214 for i, fulltext in enumerate(fulltexts):
1215 delta = mdiff.trivialdiffheader(len(fulltext)) + fulltext 1215 delta = mdiff.trivialdiffheader(len(fulltext)) + fulltext
1216 1216
1217 deltas.append((nodes[i], nullid, nullid, nullid, nullid, delta, 0)) 1217 deltas.append(
1218 (nodes[i], nullid, nullid, nullid, nullid, delta, 0, {})
1219 )
1218 1220
1219 with self._maketransactionfn() as tr: 1221 with self._maketransactionfn() as tr:
1220 newnodes = [] 1222 newnodes = []
1221 1223
1222 def onchangeset(cl, rev): 1224 def onchangeset(cl, rev):
1260 self._addrawrevisionfn( 1262 self._addrawrevisionfn(
1261 f, tr, node1, node0, nullid, 1, stored1, censored=True 1263 f, tr, node1, node0, nullid, 1, stored1, censored=True
1262 ) 1264 )
1263 1265
1264 delta = mdiff.textdiff(b'bar\n' * 30, (b'bar\n' * 30) + b'baz\n') 1266 delta = mdiff.textdiff(b'bar\n' * 30, (b'bar\n' * 30) + b'baz\n')
1265 deltas = [(b'\xcc' * 20, node1, nullid, b'\x01' * 20, node1, delta, 0)] 1267 deltas = [
1268 (b'\xcc' * 20, node1, nullid, b'\x01' * 20, node1, delta, 0, {})
1269 ]
1266 1270
1267 with self._maketransactionfn() as tr: 1271 with self._maketransactionfn() as tr:
1268 with self.assertRaises(error.CensoredBaseError): 1272 with self.assertRaises(error.CensoredBaseError):
1269 f.addgroup(deltas, lambda x: 0, tr) 1273 f.addgroup(deltas, lambda x: 0, tr)
1270 1274