Combine one entry, explain difference between entries better.

Author: pythonspeed

src/pip/_internal/commands/cache.py

@@ -96,18 +96,19 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None:
         http_cache_location = self._cache_dir(options, "http-v2")
         old_http_cache_location = self._cache_dir(options, "http")
         wheels_cache_location = self._cache_dir(options, "wheels")
-        http_cache_size = filesystem.format_directory_size(http_cache_location)
-        old_http_cache_size = filesystem.format_directory_size(old_http_cache_location)
+        http_cache_size = (
+            filesystem.format_directory_size(http_cache_location) +
+            filesystem.format_directory_size(old_http_cache_location)
+        )
         wheels_cache_size = filesystem.format_directory_size(wheels_cache_location)
 
         message = (
             textwrap.dedent(
                 """
-                    Package index page cache location (new): {http_cache_location}
-                    Package index page cache location (old): {old_http_cache_location}
-                    Package index page cache size (new): {http_cache_size}
-                    Package index page cache size (old): {old_http_cache_size}
-                    Number of HTTP files (old+new cache): {num_http_files}
+                    Package index page cache location (pip v23.3+): {http_cache_location}
+                    Package index page cache location (older pips): {old_http_cache_location}
+                    Package index page cache size: {http_cache_size}
+                    Number of HTTP files: {num_http_files}
                     Locally built wheels location: {wheels_cache_location}
                     Locally built wheels size: {wheels_cache_size}
                     Number of locally built wheels: {package_count}
@@ -117,7 +118,6 @@ def get_cache_info(self, options: Values, args: List[Any]) -> None:
                 http_cache_location=http_cache_location,
                 old_http_cache_location=old_http_cache_location,
                 http_cache_size=http_cache_size,
-                old_http_cache_size=old_http_cache_size,
                 num_http_files=num_http_files,
                 wheels_cache_location=wheels_cache_location,
                 package_count=num_packages,

tests/functional/test_cache.py

@@ -203,7 +203,7 @@ def test_cache_info(
 ) -> None:
     result = script.pip("cache", "info")
 
-    assert f"Package index page cache location (new): {http_cache_dir}" in result.stdout
+    assert f"Package index page cache location (pip v23.3+): {http_cache_dir}" in result.stdout
     assert f"Locally built wheels location: {wheel_cache_dir}" in result.stdout
     num_wheels = len(wheel_cache_files)
     assert f"Number of locally built wheels: {num_wheels}" in result.stdout