cat-file-cmd: migrate to internal bup.cmd.cat_file

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

diff --git a/lib/bup/cmd/cat_file.py b/lib/bup/cmd/cat_file.py
index 50a210effe3ff470d60149a73bb3d925fc8ae548..911fe51e8208609fa36fb83e742105f06f4f9a95 100755 (executable)
--- a/lib/bup/cmd/cat_file.py
+++ b/lib/bup/cmd/cat_file.py
@@ -1,28 +1,9 @@
-#!/bin/sh
-"""": # -*-python-*-
-# https://sourceware.org/bugzilla/show_bug.cgi?id=26034
-export "BUP_ARGV_0"="$0"
-arg_i=1
-for arg in "$@"; do
-    export "BUP_ARGV_${arg_i}"="$arg"
-    shift
-    arg_i=$((arg_i + 1))
-done
-# Here to end of preamble replaced during install
-bup_python="$(dirname "$0")/../../../config/bin/python" || exit $?
-exec "$bup_python" "$0"
-"""
-# end of bup preamble
 
 from __future__ import absolute_import
 
-# Intentionally replace the dirname "$0" that python prepends
-import os, sys
-sys.path[0] = os.path.dirname(os.path.realpath(__file__)) + '/../..'
-
-import os.path, re, stat
+import re, stat, sys
 
-from bup import compat, options, git, vfs
+from bup import options, git, vfs
 from bup.compat import argv_bytes
 from bup.helpers import chunkyreader, handle_ctrl_c, log, saved_errors
 from bup.io import byte_stream
@@ -35,56 +16,55 @@ meta        print the target's metadata entry (decoded then reencoded) to stdout
 bupm        print the target directory's .bupm file directly to stdout
 """
 
-handle_ctrl_c()
-
-o = options.Options(optspec)
-opt, flags, extra = o.parse(compat.argv[1:])
-
-git.check_repo_or_die()
-
-if not extra:
-    o.fatal('must specify a target')
-if len(extra) > 1:
-    o.fatal('only one target file allowed')
-if opt.bupm and opt.meta:
-    o.fatal('--meta and --bupm are incompatible')
-
-target = argv_bytes(extra[0])
-
-if not re.match(br'/*[^/]+/[^/]+', target):
-    o.fatal("path %r doesn't include a branch and revision" % target)
-
-repo = LocalRepo()
-resolved = vfs.resolve(repo, target, follow=False)
-leaf_name, leaf_item = resolved[-1]
-if not leaf_item:
-    log('error: cannot access %r in %r\n'
-        % ('/'.join(name for name, item in resolved), path))
-    sys.exit(1)
-
-mode = vfs.item_mode(leaf_item)
-
-sys.stdout.flush()
-out = byte_stream(sys.stdout)
-
-if opt.bupm:
-    if not stat.S_ISDIR(mode):
-        o.fatal('%r is not a directory' % target)
-    _, bupm_oid = vfs.tree_data_and_bupm(repo, leaf_item.oid)
-    if bupm_oid:
-        with vfs.tree_data_reader(repo, bupm_oid) as meta_stream:
-            out.write(meta_stream.read())
-elif opt.meta:
-    augmented = vfs.augment_item_meta(repo, leaf_item, include_size=True)
-    out.write(augmented.meta.encode())
-else:
-    if stat.S_ISREG(mode):
-        with vfs.fopen(repo, leaf_item) as f:
-            for b in chunkyreader(f):
-                out.write(b)
+def main(argv):
+    o = options.Options(optspec)
+    opt, flags, extra = o.parse_bytes(argv[1:])
+
+    git.check_repo_or_die()
+
+    if not extra:
+        o.fatal('must specify a target')
+    if len(extra) > 1:
+        o.fatal('only one target file allowed')
+    if opt.bupm and opt.meta:
+        o.fatal('--meta and --bupm are incompatible')
+
+    target = argv_bytes(extra[0])
+
+    if not re.match(br'/*[^/]+/[^/]+', target):
+        o.fatal("path %r doesn't include a branch and revision" % target)
+
+    repo = LocalRepo()
+    resolved = vfs.resolve(repo, target, follow=False)
+    leaf_name, leaf_item = resolved[-1]
+    if not leaf_item:
+        log('error: cannot access %r in %r\n'
+            % ('/'.join(name for name, item in resolved), path))
+        sys.exit(1)
+
+    mode = vfs.item_mode(leaf_item)
+
+    sys.stdout.flush()
+    out = byte_stream(sys.stdout)
+
+    if opt.bupm:
+        if not stat.S_ISDIR(mode):
+            o.fatal('%r is not a directory' % target)
+        _, bupm_oid = vfs.tree_data_and_bupm(repo, leaf_item.oid)
+        if bupm_oid:
+            with vfs.tree_data_reader(repo, bupm_oid) as meta_stream:
+                out.write(meta_stream.read())
+    elif opt.meta:
+        augmented = vfs.augment_item_meta(repo, leaf_item, include_size=True)
+        out.write(augmented.meta.encode())
     else:
-        o.fatal('%r is not a plain file' % target)
-
-if saved_errors:
-    log('warning: %d errors encountered\n' % len(saved_errors))
-    sys.exit(1)
+        if stat.S_ISREG(mode):
+            with vfs.fopen(repo, leaf_item) as f:
+                for b in chunkyreader(f):
+                    out.write(b)
+        else:
+            o.fatal('%r is not a plain file' % target)
+
+    if saved_errors:
+        log('warning: %d errors encountered\n' % len(saved_errors))
+        sys.exit(1)

diff --git a/lib/cmd/bup b/lib/cmd/bup
index cc437f608b6a71bcc3b1d1be474ad3c89dc27a61..c4e7bc5f4c5a37af8c3afb02b0b2d1b0fae60b9b 100755 (executable)
--- a/lib/cmd/bup
+++ b/lib/cmd/bup
@@ -185,7 +185,7 @@ if not subcmd_name:
     usage()
 
 try:
-    if subcmd_name not in []:
+    if subcmd_name not in (b'cat-file',):
         raise ModuleNotFoundError()
     cmd_module = import_module('bup.cmd.'
                                + subcmd_name.decode('ascii').replace('-', '_'))