vfs2._tree_data_and_bupm: make public

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/t/tvfs.py b/lib/bup/t/tvfs.py
index c4ac57d15a070c7907b7400fd4658f9dc4c8f1ac..b8f813de302d8ae0ec410e1938691c4b46957076 100644 (file)
--- a/lib/bup/t/tvfs.py
+++ b/lib/bup/t/tvfs.py
@@ -35,7 +35,7 @@ def tree_items(repo, oid):
     """
     # This is a simpler approach than the one in the vfs, used to
     # cross-check its behavior.
-    tree_data, bupm_oid = vfs._tree_data_and_bupm(repo, oid)
+    tree_data, bupm_oid = vfs.tree_data_and_bupm(repo, oid)
     bupm = vfs._FileReader(repo, bupm_oid) if bupm_oid else None
     try:
         maybe_meta = lambda : Metadata.read(bupm) if bupm else None

diff --git a/lib/bup/vfs2.py b/lib/bup/vfs2.py
index b74fc6ce58f8d575885aad17324b6a14001e42c4..06266b58ed2c14d8c4016e4be3b388742761dcf2 100644 (file)
--- a/lib/bup/vfs2.py
+++ b/lib/bup/vfs2.py
@@ -244,7 +244,7 @@ def _read_dir_meta(bupm):
         m.size = 0
     return m
 
-def _tree_data_and_bupm(repo, oid):
+def tree_data_and_bupm(repo, oid):
     """Return (tree_bytes, bupm_oid) where bupm_oid will be None if the
     tree has no metadata (i.e. older bup save, or non-bup tree).
 
@@ -273,7 +273,7 @@ def _find_dir_item_metadata(repo, item):
     tree has no metadata (i.e. older bup save, or non-bup tree).
 
     """
-    tree_data, bupm_oid = _tree_data_and_bupm(repo, item.oid)
+    tree_data, bupm_oid = tree_data_and_bupm(repo, item.oid)
     if bupm_oid:
         with _FileReader(repo, bupm_oid) as meta_stream:
             return _read_dir_meta(meta_stream)