comparison mercurial/testing/storage.py @ 39878:2ac4f3e97813

filelog: stop proxying flags() (API) Per-revision storage flags are kinda a revlog-centric API. (Except for the fact that changegroup uses the same integer flags as revlog does and there's minimal verification that the server's flags map to the client's storage flags - but that's another problem.) The last user of flags() was in verify.py and that code was just moved into revlog.py and is accessed behind the verifyintegrity() file storage API. Since there are no more consumers, let's drop the proxy and remove the method from the file storage interface. This commit only drops the dedicated API for reading a single revision's storage flags: we still support reading and writing flags through the bulk data retrieval and add revision APIs. And since changegroups encode revlog integer flags over the wire, we'll always need to support flags at some level. The removal of individual storage flags may be too premature. But since flags() is now unused, I'd like to see how far we can get without that dedicated API - especially since it uses revision numbers instead of nodes. Differential Revision: https://phab.mercurial-scm.org/D4746
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 24 Sep 2018 11:16:33 -0700
parents 14e500b58263
children d909c44d29e1
comparison
equal deleted inserted replaced
39877:733db72f0f54 39878:2ac4f3e97813
94 continue 94 continue
95 95
96 with self.assertRaises(IndexError): 96 with self.assertRaises(IndexError):
97 f.linkrev(i) 97 f.linkrev(i)
98 98
99 self.assertEqual(f.flags(nullrev), 0)
100
101 for i in range(-5, 5):
102 if i == nullrev:
103 continue
104
105 with self.assertRaises(IndexError):
106 f.flags(i)
107
108 self.assertFalse(f.iscensored(nullrev)) 99 self.assertFalse(f.iscensored(nullrev))
109 100
110 for i in range(-5, 5): 101 for i in range(-5, 5):
111 if i == nullrev: 102 if i == nullrev:
112 continue 103 continue
190 181
191 self.assertEqual(f.linkrev(0), 0) 182 self.assertEqual(f.linkrev(0), 0)
192 183
193 with self.assertRaises(IndexError): 184 with self.assertRaises(IndexError):
194 f.linkrev(1) 185 f.linkrev(1)
195
196 self.assertEqual(f.flags(0), 0)
197
198 with self.assertRaises(IndexError):
199 f.flags(1)
200 186
201 self.assertFalse(f.iscensored(0)) 187 self.assertFalse(f.iscensored(0))
202 188
203 with self.assertRaises(IndexError): 189 with self.assertRaises(IndexError):
204 f.iscensored(1) 190 f.iscensored(1)
288 self.assertEqual(f.linkrev(2), 3) 274 self.assertEqual(f.linkrev(2), 3)
289 275
290 with self.assertRaises(IndexError): 276 with self.assertRaises(IndexError):
291 f.linkrev(3) 277 f.linkrev(3)
292 278
293 self.assertEqual(f.flags(0), 0)
294 self.assertEqual(f.flags(1), 0)
295 self.assertEqual(f.flags(2), 0)
296
297 with self.assertRaises(IndexError):
298 f.flags(3)
299
300 self.assertFalse(f.iscensored(0)) 279 self.assertFalse(f.iscensored(0))
301 self.assertFalse(f.iscensored(1)) 280 self.assertFalse(f.iscensored(1))
302 self.assertFalse(f.iscensored(2)) 281 self.assertFalse(f.iscensored(2))
303 282
304 with self.assertRaises(IndexError): 283 with self.assertRaises(IndexError):
955 with self._maketransactionfn() as tr: 934 with self._maketransactionfn() as tr:
956 node0 = f.add(b'foo', None, tr, 0, nullid, nullid) 935 node0 = f.add(b'foo', None, tr, 0, nullid, nullid)
957 f.addrevision(stored1, tr, 1, node0, nullid, 936 f.addrevision(stored1, tr, 1, node0, nullid,
958 flags=revlog.REVIDX_ISCENSORED) 937 flags=revlog.REVIDX_ISCENSORED)
959 938
960 self.assertEqual(f.flags(1), revlog.REVIDX_ISCENSORED)
961 self.assertTrue(f.iscensored(1)) 939 self.assertTrue(f.iscensored(1))
962 940
963 self.assertEqual(f.revision(1), stored1) 941 self.assertEqual(f.revision(1), stored1)
964 self.assertEqual(f.revision(1, raw=True), stored1) 942 self.assertEqual(f.revision(1, raw=True), stored1)
965 943