-#!/usr/bin/env python
-import sys, time
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
+
+import os, sys, time
+
from bup import hashsplit, git, options, client
-from bup.helpers import *
+from bup.helpers import (handle_ctrl_c, hostname, log, parse_num, qprogress,
+ reprogress, saved_errors, userfullname, username)
optspec = """
def __init__(self, it):
self.it = iter(it)
def read(self, size):
- v = next(self.it)
+ v = next(self.it, None)
return v or ''
def read_ids():
while 1:
line = line.strip()
try:
it = cp.get(line.strip())
- next(it) # skip the file type
- except KeyError, e:
+ next(it, None) # skip the file type
+ except KeyError as e:
add_error('error: %s' % e)
continue
yield IterToFile(it)
print sha.encode('hex')
reprogress()
elif pack_writer: # tree or commit or name
- shalist = hashsplit.split_to_shalist(pack_writer.new_blob,
- pack_writer.new_tree,
- files,
- keep_boundaries=opt.keep_boundaries,
- progress=prog)
+ if opt.name: # insert dummy_name which may be used as a restore target
+ mode, sha = \
+ hashsplit.split_to_blob_or_tree(pack_writer.new_blob,
+ pack_writer.new_tree,
+ files,
+ keep_boundaries=opt.keep_boundaries,
+ progress=prog)
+ splitfile_name = git.mangle_name('data', hashsplit.GIT_MODE_FILE, mode)
+ shalist = [(mode, splitfile_name, sha)]
+ else:
+ shalist = hashsplit.split_to_shalist(
+ pack_writer.new_blob, pack_writer.new_tree, files,
+ keep_boundaries=opt.keep_boundaries, progress=prog)
tree = pack_writer.new_tree(shalist)
else:
last = 0
if opt.commit or opt.name:
msg = 'bup split\n\nGenerated by command:\n%r\n' % sys.argv
ref = opt.name and ('refs/heads/%s' % opt.name) or None
- commit = pack_writer.new_commit(oldref, tree, date, msg)
+ userline = '%s <%s@%s>' % (userfullname(), username(), hostname())
+ commit = pack_writer.new_commit(tree, oldref, userline, date, None,
+ userline, date, None, msg)
if opt.commit:
print commit.encode('hex')