Use absolute_import from the __future__ everywhere

[bup.git] / cmd / join-cmd.py

diff --git a/cmd/join-cmd.py b/cmd/join-cmd.py
index 0e1e1ffbc8108b3404d0dd3fdc3379b0d8dac72f..68c31eedcb7e24f7d54927d40017f5dedfc20c77 100755 (executable)
--- a/cmd/join-cmd.py
+++ b/cmd/join-cmd.py
@@ -1,16 +1,25 @@
-#!/usr/bin/env python
-import sys, time, struct
-from bup import hashsplit, git, options, client
-from bup.helpers import *
-from subprocess import PIPE
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
+
+from __future__ import absolute_import
+import sys
+
+from bup import git, options
+from bup.helpers import linereader, log
+from bup.repo import LocalRepo, RemoteRepo
 
 
 optspec = """
 bup join [-r host:path] [refs or hashes...]
 --
 r,remote=  remote repository path
+o=         output filename
 """
-o = options.Options('bup join', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 git.check_repo_or_die()
@@ -19,20 +28,19 @@ if not extra:
     extra = linereader(sys.stdin)
 
 ret = 0
+repo = RemoteRepo(opt.remote) if opt.remote else LocalRepo()
 
-if opt.remote:
-    cli = client.Client(opt.remote)
-    cat = cli.cat
+if opt.o:
+    outfile = open(opt.o, 'wb')
 else:
-    cp = git.CatPipe()
-    cat = cp.join
+    outfile = sys.stdout
 
-for id in extra:
+for ref in extra:
     try:
-        for blob in cat(id):
-            sys.stdout.write(blob)
-    except KeyError, e:
-        sys.stdout.flush()
+        for blob in repo.join(ref):
+            outfile.write(blob)
+    except KeyError as e:
+        outfile.flush()
         log('error: %s\n' % e)
         ret = 1