-#!/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, division, print_function
-
-# Intentionally replace the dirname "$0" that python prepends
-import os, sys
-sys.path[0] = os.path.dirname(os.path.realpath(__file__)) + '/../..'
-
from binascii import hexlify
-import time
+import sys, time
from bup import compat, hashsplit, git, options, client
from bup.compat import argv_bytes, environ
bwlimit= maximum bytes/sec to transmit to server
#,compress= set compression level to # (0-9, 9 is highest) [1]
"""
-handle_ctrl_c()
-
-o = options.Options(optspec)
-opt, flags, extra = o.parse(compat.argv[1:])
-if opt.name: opt.name = argv_bytes(opt.name)
-if opt.remote: opt.remote = argv_bytes(opt.remote)
-if opt.verbose is None: opt.verbose = 0
-
-if not (opt.blobs or opt.tree or opt.commit or opt.name or
- opt.noop or opt.copy):
- o.fatal("use one or more of -b, -t, -c, -n, --noop, --copy")
-if opt.copy and (opt.blobs or opt.tree):
- o.fatal('--copy is incompatible with -b, -t')
-if (opt.noop or opt.copy) and (opt.commit or opt.name):
- o.fatal('--noop and --copy are incompatible with -c, -n')
-if opt.blobs and (opt.tree or opt.commit or opt.name):
- o.fatal('-b is incompatible with -t, -c, -n')
-if extra and opt.git_ids:
- o.fatal("don't provide filenames when using --git-ids")
-
-if opt.verbose >= 2:
- git.verbose = opt.verbose - 1
- opt.bench = 1
-max_pack_size = None
-if opt.max_pack_size:
- max_pack_size = parse_num(opt.max_pack_size)
-max_pack_objects = None
-if opt.max_pack_objects:
- max_pack_objects = parse_num(opt.max_pack_objects)
-
-if opt.fanout:
- hashsplit.fanout = parse_num(opt.fanout)
-if opt.blobs:
- hashsplit.fanout = 0
-if opt.bwlimit:
- client.bwlimit = parse_num(opt.bwlimit)
-if opt.date:
- date = parse_date_or_fatal(opt.date, o.fatal)
-else:
- date = time.time()
-
-total_bytes = 0
-def prog(filenum, nbytes):
- global total_bytes
- total_bytes += nbytes
- if filenum > 0:
- qprogress('Splitting: file #%d, %d kbytes\r'
- % (filenum+1, total_bytes // 1024))
+def main(argv):
+ o = options.Options(optspec)
+ opt, flags, extra = o.parse_bytes(argv[1:])
+ if opt.name: opt.name = argv_bytes(opt.name)
+ if opt.remote: opt.remote = argv_bytes(opt.remote)
+ if opt.verbose is None: opt.verbose = 0
+
+ if not (opt.blobs or opt.tree or opt.commit or opt.name or
+ opt.noop or opt.copy):
+ o.fatal("use one or more of -b, -t, -c, -n, --noop, --copy")
+ if opt.copy and (opt.blobs or opt.tree):
+ o.fatal('--copy is incompatible with -b, -t')
+ if (opt.noop or opt.copy) and (opt.commit or opt.name):
+ o.fatal('--noop and --copy are incompatible with -c, -n')
+ if opt.blobs and (opt.tree or opt.commit or opt.name):
+ o.fatal('-b is incompatible with -t, -c, -n')
+ if extra and opt.git_ids:
+ o.fatal("don't provide filenames when using --git-ids")
+
+ if opt.verbose >= 2:
+ git.verbose = opt.verbose - 1
+ opt.bench = 1
+
+ max_pack_size = None
+ if opt.max_pack_size:
+ max_pack_size = parse_num(opt.max_pack_size)
+ max_pack_objects = None
+ if opt.max_pack_objects:
+ max_pack_objects = parse_num(opt.max_pack_objects)
+
+ if opt.fanout:
+ hashsplit.fanout = parse_num(opt.fanout)
+ if opt.blobs:
+ hashsplit.fanout = 0
+ if opt.bwlimit:
+ client.bwlimit = parse_num(opt.bwlimit)
+ if opt.date:
+ date = parse_date_or_fatal(opt.date, o.fatal)
else:
- qprogress('Splitting: %d kbytes\r' % (total_bytes // 1024))
-
-
-is_reverse = environ.get(b'BUP_SERVER_REVERSE')
-if is_reverse and opt.remote:
- o.fatal("don't use -r in reverse mode; it's automatic")
-start_time = time.time()
-
-if opt.name and not valid_save_name(opt.name):
- o.fatal("'%r' is not a valid branch name." % opt.name)
-refname = opt.name and b'refs/heads/%s' % opt.name or None
-
-if opt.noop or opt.copy:
- cli = pack_writer = oldref = None
-elif opt.remote or is_reverse:
- git.check_repo_or_die()
- cli = client.Client(opt.remote)
- oldref = refname and cli.read_ref(refname) or None
- pack_writer = cli.new_packwriter(compression_level=opt.compress,
+ date = time.time()
+
+ # Hack around lack of nonlocal vars in python 2
+ total_bytes = [0]
+ def prog(filenum, nbytes):
+ total_bytes[0] += nbytes
+ if filenum > 0:
+ qprogress('Splitting: file #%d, %d kbytes\r'
+ % (filenum+1, total_bytes[0] // 1024))
+ else:
+ qprogress('Splitting: %d kbytes\r' % (total_bytes[0] // 1024))
+
+
+ is_reverse = environ.get(b'BUP_SERVER_REVERSE')
+ if is_reverse and opt.remote:
+ o.fatal("don't use -r in reverse mode; it's automatic")
+ start_time = time.time()
+
+ if opt.name and not valid_save_name(opt.name):
+ o.fatal("'%r' is not a valid branch name." % opt.name)
+ refname = opt.name and b'refs/heads/%s' % opt.name or None
+
+ if opt.noop or opt.copy:
+ cli = pack_writer = oldref = None
+ elif opt.remote or is_reverse:
+ git.check_repo_or_die()
+ cli = client.Client(opt.remote)
+ oldref = refname and cli.read_ref(refname) or None
+ pack_writer = cli.new_packwriter(compression_level=opt.compress,
+ max_pack_size=max_pack_size,
+ max_pack_objects=max_pack_objects)
+ else:
+ git.check_repo_or_die()
+ cli = None
+ oldref = refname and git.read_ref(refname) or None
+ pack_writer = git.PackWriter(compression_level=opt.compress,
max_pack_size=max_pack_size,
max_pack_objects=max_pack_objects)
-else:
- git.check_repo_or_die()
- cli = None
- oldref = refname and git.read_ref(refname) or None
- pack_writer = git.PackWriter(compression_level=opt.compress,
- max_pack_size=max_pack_size,
- max_pack_objects=max_pack_objects)
-
-input = byte_stream(sys.stdin)
-
-if opt.git_ids:
- # the input is actually a series of git object ids that we should retrieve
- # and split.
- #
- # This is a bit messy, but basically it converts from a series of
- # CatPipe.get() iterators into a series of file-type objects.
- # It would be less ugly if either CatPipe.get() returned a file-like object
- # (not very efficient), or split_to_shalist() expected an iterator instead
- # of a file.
- cp = git.CatPipe()
- class IterToFile:
- def __init__(self, it):
- self.it = iter(it)
- def read(self, size):
- v = next(self.it, None)
- return v or b''
- def read_ids():
- while 1:
- line = input.readline()
- if not line:
- break
- if line:
- line = line.strip()
- try:
- it = cp.get(line.strip())
- next(it, None) # skip the file info
- except KeyError as e:
- add_error('error: %s' % e)
- continue
- yield IterToFile(it)
- files = read_ids()
-else:
- # the input either comes from a series of files or from stdin.
- files = extra and (open(argv_bytes(fn), 'rb') for fn in extra) or [input]
-
-if pack_writer:
- new_blob = pack_writer.new_blob
- new_tree = pack_writer.new_tree
-elif opt.blobs or opt.tree:
- # --noop mode
- new_blob = lambda content: git.calc_hash(b'blob', content)
- new_tree = lambda shalist: git.calc_hash(b'tree', git.tree_encode(shalist))
-
-sys.stdout.flush()
-out = byte_stream(sys.stdout)
-if opt.blobs:
- shalist = hashsplit.split_to_blobs(new_blob, files,
- keep_boundaries=opt.keep_boundaries,
- progress=prog)
- for (sha, size, level) in shalist:
- out.write(hexlify(sha) + b'\n')
- reprogress()
-elif opt.tree or opt.commit or opt.name:
- if opt.name: # insert dummy_name which may be used as a restore target
- mode, sha = \
- hashsplit.split_to_blob_or_tree(new_blob, new_tree, files,
- keep_boundaries=opt.keep_boundaries,
- progress=prog)
- splitfile_name = git.mangle_name(b'data', hashsplit.GIT_MODE_FILE, mode)
- shalist = [(mode, splitfile_name, sha)]
+ input = byte_stream(sys.stdin)
+
+ if opt.git_ids:
+ # the input is actually a series of git object ids that we should retrieve
+ # and split.
+ #
+ # This is a bit messy, but basically it converts from a series of
+ # CatPipe.get() iterators into a series of file-type objects.
+ # It would be less ugly if either CatPipe.get() returned a file-like object
+ # (not very efficient), or split_to_shalist() expected an iterator instead
+ # of a file.
+ cp = git.CatPipe()
+ class IterToFile:
+ def __init__(self, it):
+ self.it = iter(it)
+ def read(self, size):
+ v = next(self.it, None)
+ return v or b''
+ def read_ids():
+ while 1:
+ line = input.readline()
+ if not line:
+ break
+ if line:
+ line = line.strip()
+ try:
+ it = cp.get(line.strip())
+ next(it, None) # skip the file info
+ except KeyError as e:
+ add_error('error: %s' % e)
+ continue
+ yield IterToFile(it)
+ files = read_ids()
else:
- shalist = hashsplit.split_to_shalist(
- new_blob, new_tree, files,
- keep_boundaries=opt.keep_boundaries, progress=prog)
- tree = new_tree(shalist)
-else:
- last = 0
- it = hashsplit.hashsplit_iter(files,
- keep_boundaries=opt.keep_boundaries,
- progress=prog)
- for (blob, level) in it:
- hashsplit.total_split += len(blob)
- if opt.copy:
- sys.stdout.write(str(blob))
- megs = hashsplit.total_split // 1024 // 1024
- if not opt.quiet and last != megs:
- last = megs
-
-if opt.verbose:
- log('\n')
-if opt.tree:
- out.write(hexlify(tree) + b'\n')
-if opt.commit or opt.name:
- msg = b'bup split\n\nGenerated by command:\n%r\n' % compat.argvb
- ref = opt.name and (b'refs/heads/%s' % opt.name) or None
- userline = b'%s <%s@%s>' % (userfullname(), username(), hostname())
- commit = pack_writer.new_commit(tree, oldref, userline, date, None,
- userline, date, None, msg)
- if opt.commit:
- out.write(hexlify(commit) + b'\n')
-
-if pack_writer:
- pack_writer.close() # must close before we can update the ref
-
-if opt.name:
- if cli:
- cli.update_ref(refname, commit, oldref)
+ # the input either comes from a series of files or from stdin.
+ files = extra and (open(argv_bytes(fn), 'rb') for fn in extra) or [input]
+
+ if pack_writer:
+ new_blob = pack_writer.new_blob
+ new_tree = pack_writer.new_tree
+ elif opt.blobs or opt.tree:
+ # --noop mode
+ new_blob = lambda content: git.calc_hash(b'blob', content)
+ new_tree = lambda shalist: git.calc_hash(b'tree', git.tree_encode(shalist))
+
+ sys.stdout.flush()
+ out = byte_stream(sys.stdout)
+
+ if opt.blobs:
+ shalist = hashsplit.split_to_blobs(new_blob, files,
+ keep_boundaries=opt.keep_boundaries,
+ progress=prog)
+ for (sha, size, level) in shalist:
+ out.write(hexlify(sha) + b'\n')
+ reprogress()
+ elif opt.tree or opt.commit or opt.name:
+ if opt.name: # insert dummy_name which may be used as a restore target
+ mode, sha = \
+ hashsplit.split_to_blob_or_tree(new_blob, new_tree, files,
+ keep_boundaries=opt.keep_boundaries,
+ progress=prog)
+ splitfile_name = git.mangle_name(b'data', hashsplit.GIT_MODE_FILE, mode)
+ shalist = [(mode, splitfile_name, sha)]
+ else:
+ shalist = hashsplit.split_to_shalist(
+ new_blob, new_tree, files,
+ keep_boundaries=opt.keep_boundaries, progress=prog)
+ tree = new_tree(shalist)
else:
- git.update_ref(refname, commit, oldref)
+ last = 0
+ it = hashsplit.hashsplit_iter(files,
+ keep_boundaries=opt.keep_boundaries,
+ progress=prog)
+ for (blob, level) in it:
+ hashsplit.total_split += len(blob)
+ if opt.copy:
+ sys.stdout.write(str(blob))
+ megs = hashsplit.total_split // 1024 // 1024
+ if not opt.quiet and last != megs:
+ last = megs
+
+ if opt.verbose:
+ log('\n')
+ if opt.tree:
+ out.write(hexlify(tree) + b'\n')
+ if opt.commit or opt.name:
+ msg = b'bup split\n\nGenerated by command:\n%r\n' % compat.argvb
+ ref = opt.name and (b'refs/heads/%s' % opt.name) or None
+ userline = b'%s <%s@%s>' % (userfullname(), username(), hostname())
+ commit = pack_writer.new_commit(tree, oldref, userline, date, None,
+ userline, date, None, msg)
+ if opt.commit:
+ out.write(hexlify(commit) + b'\n')
+
+ if pack_writer:
+ pack_writer.close() # must close before we can update the ref
+
+ if opt.name:
+ if cli:
+ cli.update_ref(refname, commit, oldref)
+ else:
+ git.update_ref(refname, commit, oldref)
-if cli:
- cli.close()
+ if cli:
+ cli.close()
-secs = time.time() - start_time
-size = hashsplit.total_split
-if opt.bench:
- log('bup: %.2f kbytes in %.2f secs = %.2f kbytes/sec\n'
- % (size / 1024, secs, size / 1024 / secs))
+ secs = time.time() - start_time
+ size = hashsplit.total_split
+ if opt.bench:
+ log('bup: %.2f kbytes in %.2f secs = %.2f kbytes/sec\n'
+ % (size / 1024, secs, size / 1024 / secs))
-if saved_errors:
- log('WARNING: %d errors encountered while saving.\n' % len(saved_errors))
- sys.exit(1)
+ if saved_errors:
+ log('WARNING: %d errors encountered while saving.\n' % len(saved_errors))
+ sys.exit(1)
projects / bup.git / blobdiff