D4750: filelog: stop proxying rawsize() (API)
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Wed Sep 26 17:06:11 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd909c44d29e1: filelog: stop proxying rawsize() (API) (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4750?vs=11405&id=11426
REVISION DETAIL
https://phab.mercurial-scm.org/D4750
AFFECTED FILES
mercurial/filelog.py
mercurial/repository.py
mercurial/testing/storage.py
tests/simplestorerepo.py
tests/test-lfs.t
CHANGE DETAILS
diff --git a/tests/test-lfs.t b/tests/test-lfs.t
--- a/tests/test-lfs.t
+++ b/tests/test-lfs.t
@@ -690,7 +690,7 @@
> fl = repo.file(name)
> if len(fl) == 0:
> continue
- > sizes = [fl.rawsize(i) for i in fl]
+ > sizes = [fl._revlog.rawsize(i) for i in fl]
> texts = [fl.revision(i, raw=True) for i in fl]
> flags = [int(fl._revlog.flags(i)) for i in fl]
> hashes = [hash(t) for t in texts]
diff --git a/tests/simplestorerepo.py b/tests/simplestorerepo.py
--- a/tests/simplestorerepo.py
+++ b/tests/simplestorerepo.py
@@ -249,11 +249,6 @@
return True
- def rawsize(self, rev):
- validaterev(rev)
- node = self.node(rev)
- return len(self.revision(node, raw=True))
-
def _processflags(self, text, flags, operation, raw=False):
if flags == 0:
return text, True
diff --git a/mercurial/testing/storage.py b/mercurial/testing/storage.py
--- a/mercurial/testing/storage.py
+++ b/mercurial/testing/storage.py
@@ -371,15 +371,6 @@
self.assertEqual(f.storageinfo(revisionscount=True, trackedsize=True),
{'revisionscount': 0, 'trackedsize': 0})
- self.assertEqual(f.rawsize(nullrev), 0)
-
- for i in range(-5, 5):
- if i == nullrev:
- continue
-
- with self.assertRaises(IndexError):
- f.rawsize(i)
-
self.assertEqual(f.size(nullrev), 0)
for i in range(-5, 5):
@@ -453,11 +444,6 @@
self.assertEqual(f.storageinfo(revisionscount=True, trackedsize=True),
{'revisionscount': 1, 'trackedsize': len(fulltext)})
- self.assertEqual(f.rawsize(0), len(fulltext))
-
- with self.assertRaises(IndexError):
- f.rawsize(1)
-
self.assertEqual(f.size(0), len(fulltext))
with self.assertRaises(IndexError):
@@ -548,13 +534,6 @@
'trackedsize': len(fulltext0) + len(fulltext1) + len(fulltext2),
})
- self.assertEqual(f.rawsize(0), len(fulltext0))
- self.assertEqual(f.rawsize(1), len(fulltext1))
- self.assertEqual(f.rawsize(2), len(fulltext2))
-
- with self.assertRaises(IndexError):
- f.rawsize(3)
-
self.assertEqual(f.size(0), len(fulltext0))
self.assertEqual(f.size(1), len(fulltext1))
self.assertEqual(f.size(2), len(fulltext2))
@@ -853,9 +832,6 @@
node1 = f.add(fulltext1, meta1, tr, 1, node0, nullid)
node2 = f.add(fulltext2, meta2, tr, 2, nullid, nullid)
- self.assertEqual(f.rawsize(1), len(stored1))
- self.assertEqual(f.rawsize(2), len(stored2))
-
# Metadata header isn't recognized when parent isn't nullid.
self.assertEqual(f.size(1), len(stored1))
self.assertEqual(f.size(2), len(fulltext2))
@@ -898,9 +874,6 @@
node0 = f.add(fulltext0, {}, tr, 0, nullid, nullid)
node1 = f.add(fulltext1, meta1, tr, 1, nullid, nullid)
- self.assertEqual(f.rawsize(0), len(stored0))
- self.assertEqual(f.rawsize(1), len(stored1))
-
# TODO this is buggy.
self.assertEqual(f.size(0), len(fulltext0) + 4)
diff --git a/mercurial/repository.py b/mercurial/repository.py
--- a/mercurial/repository.py
+++ b/mercurial/repository.py
@@ -542,14 +542,10 @@
This complements ``ifileindex`` and provides an interface for accessing
data for a tracked file.
"""
- def rawsize(rev):
- """The size of the fulltext data for a revision as stored."""
-
def size(rev):
"""Obtain the fulltext size of file data.
- Any metadata is excluded from size measurements. Use ``rawsize()`` if
- metadata size is important.
+ Any metadata is excluded from size measurements.
"""
def checkhash(fulltext, node, p1=None, p2=None, rev=None):
diff --git a/mercurial/filelog.py b/mercurial/filelog.py
--- a/mercurial/filelog.py
+++ b/mercurial/filelog.py
@@ -73,10 +73,6 @@
def iscensored(self, rev):
return self._revlog.iscensored(rev)
- # Unused.
- def rawsize(self, rev):
- return self._revlog.rawsize(rev)
-
# Might be unused.
def checkhash(self, text, node, p1=None, p2=None, rev=None):
return self._revlog.checkhash(text, node, p1=p1, p2=p2, rev=rev)
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list